ADD some better upgrade messages

storybookjs · Mar 4, 2019 · 6dfa51a · 6dfa51a
1 parent c2d55a4
commit 6dfa51a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/addons/viewport/preview.js b/addons/viewport/preview.js
@@ -4,4 +4,3 @@ exports.configureViewport = preview.configureViewport;
 exports.DEFAULT_VIEWPORT = preview.DEFAULT_VIEWPORT;
 exports.INITIAL_VIEWPORTS = preview.INITIAL_VIEWPORTS;
 exports.withViewport = preview.withViewport;
-exports.Viewport = preview.Viewport;
diff --git a/addons/viewport/src/Tool.js b/addons/viewport/src/Tool.js
@@ -32,6 +32,7 @@ const getState = memoize(10)((props, state, change) => {
   const parameters = data && data.parameters && data.parameters[PARAM_KEY];
 
   if (typeof parameters !== 'object') {
+    // eslint-disable-next-line no-console
     console.warn(
       'The viewport parameter must be an object with keys `viewports` and `defaultViewport`'
     );

diff --git a/addons/viewport/src/legacy_preview/index.js b/addons/viewport/src/legacy_preview/index.js
@@ -1,7 +1,7 @@
 import deprecate from 'util-deprecate';
 
 export { INITIAL_VIEWPORTS, DEFAULT_VIEWPORT } from '../defaults';
-export { default as withViewport, Viewport } from './withViewport';
+export { default as withViewport } from './withViewport';
 
 export const configureViewport = deprecate(() => {},
-'usage is deprecated, use .addParameters({ viewport }) instead');
+'configureViewport is no longer supported, use .addParameters({ viewport }) instead');
diff --git a/addons/viewport/src/legacy_preview/withViewport.js b/addons/viewport/src/legacy_preview/withViewport.js
@@ -3,17 +3,11 @@ import deprecate from 'util-deprecate';
 
 const withViewport = makeDecorator({
   name: 'withViewport',
-  parameterName: 'viewports',
-  allowDeprecatedUsage: true,
+  parameterName: 'viewport',
   wrapper: deprecate(
     (getStory, context) => getStory(context),
-    'usage is deprecated, use .addParameters({ viewport }) instead'
+    'withViewport is no longer supported, use .addParameters({ viewport }) instead'
   ),
 });
 
 export default withViewport;
-
-export const Viewport = deprecate(
-  ({ children }) => children,
-  `<Viewport> usage is deprecated, use .addParameters({ viewport }) instead`
-);