Merge branch 'main' into release/6.0

.storybook/main.js

@@ -3,9 +3,12 @@ const getEnv = require('../packages/core/config/env');
 const proxyPassthrough = require('../packages/core/config/proxyPassthrough');
 
 module.exports = {
+  core: {
+    builder: 'webpack5',
+  },
   stories: [
-    '../stories/**/*.stories.(js|mdx)',
-    '../packages/styled-components/components/**/*.stories.(js|mdx)',
+    '../stories/**/*.stories.@(js|mdx)',
+    '../packages/styled-components/components/**/*.stories.@(js|mdx)',
   ],
   addons: [
     '@storybook/addon-a11y',
@@ -23,10 +26,11 @@ module.exports = {
         proxyPassthrough: JSON.stringify(proxyPassthrough),
       }),
     ]);
-    config.module.rules[0].exclude.push([
+    config.module.rules[0].exclude = [
       /\bcore-js\b/,
-      /\bwebpack\/buildin\b/
-    ]);
+      /\bwebpack\/buildin\b/,
+      /\bnode_modules\b/,
+    ];
     return config;
   },
 };

package.json

@@ -48,13 +48,14 @@
   "devDependencies": {
     "@babel/core": "^7.10.4",
     "@irvingjs/babel-preset-irving": "^5.5.0-alpha.0",
-    "@storybook/addon-a11y": "^5.3.19",
-    "@storybook/addon-actions": "^5.3.18",
-    "@storybook/addon-docs": "^5.3.18",
-    "@storybook/addon-info": "^5.3.21",
-    "@storybook/addon-links": "^5.3.18",
-    "@storybook/addons": "^5.3.18",
-    "@storybook/react": "^5.3.18",
+    "@storybook/addon-a11y": "^6.3.0-alpha.12",
+    "@storybook/addon-actions": "^6.3.0-alpha.12",
+    "@storybook/addon-docs": "^6.3.0-alpha.12",
+    "@storybook/addon-info": "^6.0.0-alpha.2",
+    "@storybook/addon-links": "^6.3.0-alpha.12",
+    "@storybook/addons": "^6.3.0-alpha.12",
+    "@storybook/builder-webpack5": "~6.3.0-alpha.12",
+    "@storybook/react": "^6.3.0-alpha.12",
     "@testing-library/jest-dom": "~5.11.9",
     "@testing-library/react": "~11.2.5",
     "@testing-library/react-hooks": "~3.7.0",