upgrade everything in the monorepo to webpack5

storybookjs · Apr 22, 2022 · 38fa196 · 38fa196
1 parent e57f6c8
commit 38fa196
Show file tree

Hide file tree

Showing 80 changed files with 92 additions and 2,067 deletions.
diff --git a/.babelrc.js b/.babelrc.js
@@ -103,7 +103,6 @@ module.exports = {
         './lib/core',
         './lib/core-common',
         './lib/core-server',
-        './lib/builder-webpack4',
         './lib/builder-webpack5',
         './lib/codemod',
         './addons/storyshots',

diff --git a/.eslintignore b/.eslintignore
@@ -7,7 +7,6 @@ docs/public
 storybook-static
 built-storybooks
 lib/cli/test
-lib/manager-webpack4/prebuilt
 lib/manager-webpack5/prebuilt
 lib/core-server/prebuilt
 lib/codemod/src/transforms/__testfixtures__

diff --git a/app/angular/package.json b/app/angular/package.json
@@ -96,7 +96,7 @@
     "jest-preset-angular": "^8.3.2",
     "jest-specific-snapshot": "^4.0.0",
     "tmp": "^0.2.1",
-    "webpack": "4"
+    "webpack": "5"
   },
   "peerDependencies": {
     "@angular-devkit/architect": ">=0.8.9",

diff --git a/docs/snippets/common/storybook-main-default-setup.ts.mdx b/docs/snippets/common/storybook-main-default-setup.ts.mdx
@@ -24,7 +24,7 @@ const config: StorybookConfig = {
   },
   framework: '@storybook/react',
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   features: {
     postcss: false,

diff --git a/examples/angular-cli/.storybook/main.js b/examples/angular-cli/.storybook/main.js
@@ -15,7 +15,7 @@ module.exports = {
     '@storybook/addon-toolbars',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   angularOptions: {
     enableIvy: true,

diff --git a/examples/cra-kitchen-sink/.storybook/main.js b/examples/cra-kitchen-sink/.storybook/main.js
@@ -31,7 +31,7 @@ module.exports = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   features: {

diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
@@ -35,7 +35,7 @@
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "6.5.0-alpha.64",
     "@storybook/theming": "6.5.0-alpha.64",
-    "webpack": "4"
+    "webpack": "5"
   },
   "storybook": {
     "chromatic": {

diff --git a/examples/cra-react15/.storybook/main.js b/examples/cra-react15/.storybook/main.js
@@ -19,7 +19,7 @@ module.exports = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   framework: '@storybook/react',

diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json
@@ -30,7 +30,7 @@
     "@storybook/theming": "6.5.0-alpha.64",
     "babel-core": "6",
     "babel-runtime": "6",
-    "webpack": "4"
+    "webpack": "5"
   },
   "storybook": {
     "chromatic": {

diff --git a/examples/cra-ts-essentials/.storybook/main.ts b/examples/cra-ts-essentials/.storybook/main.ts
@@ -25,7 +25,7 @@ const mainConfig: StorybookConfig = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   features: {

diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json
@@ -45,7 +45,7 @@
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "6.5.0-alpha.64",
     "@storybook/testing-library": "^0.0.9",
-    "webpack": "4"
+    "webpack": "5"
   },
   "storybook": {
     "chromatic": {

diff --git a/examples/cra-ts-kitchen-sink/.storybook/main.ts b/examples/cra-ts-kitchen-sink/.storybook/main.ts
@@ -27,7 +27,7 @@ module.exports = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   features: {

diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json
@@ -51,7 +51,7 @@
     "fork-ts-checker-webpack-plugin": "^6.0.4",
     "react-moment-proptypes": "^1.7.0",
     "ts-node": "^9.1.0",
-    "webpack": "4"
+    "webpack": "5"
   },
   "storybook": {
     "chromatic": {

diff --git a/examples/ember-cli/.storybook/main.js b/examples/ember-cli/.storybook/main.js
@@ -28,7 +28,7 @@ module.exports = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../ember-output'],
   features: {

diff --git a/examples/ember-cli/package.json b/examples/ember-cli/package.json
@@ -47,7 +47,7 @@
     "ember-source": "~3.24.0",
     "loader.js": "^4.7.0",
     "shx": "^0.3.2",
-    "webpack": "4",
+    "webpack": "5",
     "webpack-cli": "^4.2.0"
   },
   "engines": {

diff --git a/examples/external-docs/package.json b/examples/external-docs/package.json
@@ -34,6 +34,6 @@
     "@types/react-dom": "^16.9.14",
     "cross-env": "^7.0.3",
     "typescript": "^3.9.7",
-    "webpack": "4"
+    "webpack": "5"
   }
 }
diff --git a/examples/external-docs/src/.storybook/main.ts b/examples/external-docs/src/.storybook/main.ts
@@ -17,7 +17,7 @@ const config: StorybookConfig = {
     },
   },
   core: {
-    builder: { name: 'webpack4' },
+    builder: { builderName: '@storybook/builder-webpack5' },
     channelOptions: { allowFunction: false, maxDepth: 10 },
   },
   features: {

diff --git a/examples/html-kitchen-sink/.storybook/main.js b/examples/html-kitchen-sink/.storybook/main.js
@@ -22,7 +22,7 @@ module.exports = {
     '@storybook/addon-viewport',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   features: {
     buildStoriesJson: true,

diff --git a/examples/official-storybook/main.ts b/examples/official-storybook/main.ts
@@ -32,7 +32,7 @@ const config: StorybookConfig = {
     '@storybook/addon-a11y',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   logLevel: 'debug',
   features: {

diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
@@ -56,7 +56,7 @@
     "react-dom": "16.14.0",
     "terser-webpack-plugin": "^5.0.3",
     "uuid-browser": "^3.1.0",
-    "webpack": "4"
+    "webpack": "5"
   },
   "peerDependencies": {
     "puppeteer": "^2.0.0 || ^3.0.0"

diff --git a/examples/preact-kitchen-sink/.storybook/main.js b/examples/preact-kitchen-sink/.storybook/main.js
@@ -22,7 +22,7 @@ module.exports = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   features: {

diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json
@@ -39,7 +39,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "svg-url-loader": "^7.1.1",
-    "webpack": "4",
+    "webpack": "5",
     "webpack-dev-server": "^3.11.2"
   },
   "storybook": {

diff --git a/examples/react-ts/.storybook/main.ts b/examples/react-ts/.storybook/main.ts
@@ -22,7 +22,7 @@ const config: StorybookConfig = {
     },
   },
   core: {
-    builder: { name: 'webpack4' },
+    builder: { builderName: '@storybook/builder-webpack5' },
     channelOptions: { allowFunction: false, maxDepth: 10 },
   },
   features: {

diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json
@@ -33,6 +33,6 @@
     "@types/react-dom": "^16.9.14",
     "cross-env": "^7.0.3",
     "typescript": "^3.9.7",
-    "webpack": "4"
+    "webpack": "5"
   }
 }
diff --git a/examples/svelte-kitchen-sink/.storybook/main.js b/examples/svelte-kitchen-sink/.storybook/main.js
@@ -34,7 +34,7 @@ module.exports = {
     return config;
   },
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   features: {

diff --git a/examples/vue-3-cli/.storybook/main.js b/examples/vue-3-cli/.storybook/main.js
@@ -6,7 +6,7 @@ module.exports = {
     '@storybook/addon-interactions',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   features: {
     buildStoriesJson: true,

diff --git a/examples/vue-cli/.storybook/main.js b/examples/vue-cli/.storybook/main.js
@@ -8,7 +8,7 @@ module.exports = {
     '@storybook/preset-scss',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   features: {
     buildStoriesJson: true,

diff --git a/examples/vue-kitchen-sink/.storybook/main.js b/examples/vue-kitchen-sink/.storybook/main.js
@@ -13,7 +13,7 @@ module.exports = {
     '@storybook/addon-a11y',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   staticDirs: ['../public'],
   features: {

diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
@@ -38,7 +38,7 @@
     "svg-url-loader": "^7.1.1",
     "vue-loader": "^15.9.6",
     "vue-style-loader": "^4.1.2",
-    "webpack": "4",
+    "webpack": "5",
     "webpack-dev-server": "^3.11.2"
   },
   "storybook": {

diff --git a/examples/web-components-kitchen-sink/.storybook/main.js b/examples/web-components-kitchen-sink/.storybook/main.js
@@ -14,7 +14,7 @@ module.exports = {
     '@storybook/addon-toolbars',
   ],
   core: {
-    builder: 'webpack4',
+    builder: '@storybook/builder-webpack5',
   },
   features: {
     interactionsDebugger: true,

diff --git a/lib/builder-webpack4/README.md b/lib/builder-webpack4/README.md
diff --git a/lib/builder-webpack4/package.json b/lib/builder-webpack4/package.json