storybookjs · ndelangen · Mar 31, 2020 · Mar 26, 2020 · Mar 26, 2020 · Mar 26, 2020
diff --git a/addons/contexts/src/index.ts b/addons/contexts/src/index.ts
@@ -32,7 +32,6 @@ export const createAddonDecorator: CreateAddonDecorator = render => {
     name: ID,
     parameterName: PARAM,
     skipIfNoParametersOrOptions: true,
-    allowDeprecatedUsage: false,
     wrapper,
   });
 };
diff --git a/addons/cssresources/src/index.ts b/addons/cssresources/src/index.ts
@@ -65,7 +65,6 @@ export const withCssResources = makeDecorator({
   name: 'withCssResources',
   parameterName: PARAM_KEY,
   skipIfNoParametersOrOptions: true,
-  allowDeprecatedUsage: false,
 
   wrapper: (getStory, context, { options, parameters }) => {
     const storyOptions = parameters || options;

diff --git a/addons/events/package.json b/addons/events/package.json
@@ -43,8 +43,7 @@
     "react": "^16.8.3",
     "react-lifecycles-compat": "^3.0.4",
     "react-textarea-autosize": "^7.0.4",
-    "regenerator-runtime": "^0.13.3",
-    "util-deprecate": "^1.0.2"
+    "regenerator-runtime": "^0.13.3"
   },
   "devDependencies": {
     "@types/webpack-env": "^1.15.1"

diff --git a/addons/events/src/deprecated.js b/addons/events/src/deprecated.js
diff --git a/addons/events/src/index.ts b/addons/events/src/index.ts
@@ -2,7 +2,6 @@ import { ReactNode } from 'react';
 
 import addons from '@storybook/addons';
 import CoreEvents from '@storybook/core-events';
-import deprecate from 'util-deprecate';
 
 import { EVENTS } from './constants';
 
@@ -49,15 +48,7 @@ interface Options {
   events: Event[];
 }
 
-const WithEvents = deprecate(({ children, ...options }: Options) => {
-  addEvents(options);
-  return children;
-}, `<WithEvents> usage is deprecated, use .addDecorator(withEvents({emit, events})) instead`);
-
 export default (options: Options) => {
-  if (options.children) {
-    return WithEvents(options);
-  }
   return (storyFn: () => ReactNode) => {
     addEvents(options);
     return storyFn();

diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -45,8 +45,7 @@
     "react": "^16.8.3",
     "react-sizeme": "^2.5.2",
     "regenerator-runtime": "^0.13.3",
-    "upath": "^1.1.0",
-    "util-deprecate": "^1.0.2"
+    "upath": "^1.1.0"
   },
   "devDependencies": {
     "@types/webpack-env": "^1.15.1"

diff --git a/addons/jest/src/index.ts b/addons/jest/src/index.ts
@@ -1,5 +1,4 @@
-import addons, { Parameters, StoryFn } from '@storybook/addons';
-import deprecate from 'util-deprecate';
+import addons, { Parameters } from '@storybook/addons';
 import { normalize, sep } from 'upath';
 import { ADD_TESTS } from './shared';
 
@@ -55,14 +54,6 @@ export const withTests = (userOptions: { results: any; filesExt?: string }) => {
   const options = { ...defaultOptions, ...userOptions };
 
   return (...args: any[]) => {
-    if (typeof args[0] === 'string') {
-      return deprecate((storyFn: StoryFn<any>, { kind }: Parameters) => {
-        emitAddTests({ kind, story: storyFn, testFiles: (args as any) as string[], options });
-
-        return storyFn();
-      }, 'Passing component filenames to the `@storybook/addon-jest` via `withTests` is deprecated. Instead, use the `jest` story parameter');
-    }
-
     const [storyFn, { kind, parameters = {} }] = args;
     let { jest: testFiles } = parameters;
 

diff --git a/addons/knobs/angular.js b/addons/knobs/angular.js
diff --git a/addons/knobs/html.js b/addons/knobs/html.js
diff --git a/addons/knobs/marko.js b/addons/knobs/marko.js
diff --git a/addons/knobs/mithril.js b/addons/knobs/mithril.js
diff --git a/addons/knobs/polymer.js b/addons/knobs/polymer.js
diff --git a/addons/knobs/react.js b/addons/knobs/react.js
diff --git a/addons/knobs/src/deprecated.js b/addons/knobs/src/deprecated.js
diff --git a/addons/knobs/src/index.ts b/addons/knobs/src/index.ts
@@ -128,7 +128,6 @@ export const withKnobs = makeDecorator({
   name: 'withKnobs',
   parameterName: 'knobs',
   skipIfNoParametersOrOptions: false,
-  allowDeprecatedUsage: true,
   wrapper: (getStory, context, { options, parameters }) => {
     const storyOptions = parameters || options;
     const allOptions = { ...defaultOptions, ...storyOptions };

diff --git a/addons/knobs/vue.js b/addons/knobs/vue.js
diff --git a/addons/options/README.md b/addons/options/README.md
diff --git a/addons/options/docs/screenshot.png b/addons/options/docs/screenshot.png
diff --git a/addons/options/package.json b/addons/options/package.json
diff --git a/addons/options/register.js b/addons/options/register.js
diff --git a/addons/options/src/constants.ts b/addons/options/src/constants.ts
diff --git a/addons/options/src/index.ts b/addons/options/src/index.ts
diff --git a/addons/options/src/public_api.ts b/addons/options/src/public_api.ts
diff --git a/addons/options/src/register.ts b/addons/options/src/register.ts
diff --git a/addons/options/src/typings.d.ts b/addons/options/src/typings.d.ts
diff --git a/addons/options/tsconfig.json b/addons/options/tsconfig.json
diff --git a/addons/viewport/package.json b/addons/viewport/package.json
@@ -39,11 +39,7 @@
     "global": "^4.3.2",
     "memoizerific": "^1.11.3",
     "prop-types": "^15.7.2",
-    "regenerator-runtime": "^0.13.3",
-    "util-deprecate": "^1.0.2"
-  },
-  "devDependencies": {
-    "@types/util-deprecate": "^1.0.0"
+    "regenerator-runtime": "^0.13.3"
   },
   "peerDependencies": {
     "react": "*",

diff --git a/addons/viewport/src/legacy_preview/index.ts b/addons/viewport/src/legacy_preview/index.ts
diff --git a/addons/viewport/src/models/Viewport.ts b/addons/viewport/src/models/Viewport.ts
@@ -4,11 +4,6 @@ export interface Viewport {
   name: string;
   styles: Styles;
   type: 'desktop' | 'mobile' | 'tablet' | 'other';
-  /*
-   * @deprecated
-   * Deprecated option?
-   */
-  default?: boolean;
 }
 
 export interface ViewportStyles {

diff --git a/addons/viewport/src/models/ViewportAddonParameter.ts b/addons/viewport/src/models/ViewportAddonParameter.ts
@@ -4,9 +4,4 @@ export interface ViewportAddonParameter {
   disable?: boolean;
   defaultViewport?: string;
   viewports?: ViewportMap;
-  /*
-   * @deprecated
-   * The viewport parameter `onViewportChange` is no longer supported
-   */
-  onViewportChange?: never;
 }
diff --git a/addons/viewport/src/preview.ts b/addons/viewport/src/preview.ts
@@ -1,6 +1 @@
-export {
-  configureViewport,
-  DEFAULT_VIEWPORT,
-  INITIAL_VIEWPORTS,
-  MINIMAL_VIEWPORTS,
-} from './legacy_preview';
+export { INITIAL_VIEWPORTS, DEFAULT_VIEWPORT, MINIMAL_VIEWPORTS } from './defaults';