Merge branch 'future/minimize-webpack-deps' into future/modern-esm

# Conflicts: # lib/core-server/src/cli/dev.ts # lib/core-server/src/cli/prod.ts # renderers/server/package.json
storybookjs · Apr 22, 2022 · e57f6c8 · e57f6c8
2 parents 394547c + 483d265
commit e57f6c8
Show file tree

Hide file tree

Showing 718 changed files with 4,334 additions and 4,468 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -106,6 +106,8 @@ jobs:
             - addons
             - app
             - lib
+            - renderers
+            - presets
   chromatic:
     executor: sb_node_14_browsers
     parallelism: 4
@@ -122,7 +124,7 @@ jobs:
     executor:
       class: medium+
       name: sb_node_14_browsers
-    parallelism: 17
+    parallelism: 16
     steps:
       - git-shallow-clone/checkout_advanced:
           clone_options: '--depth 1 --verbose'

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -1,5 +1,8 @@
 <h1>Migration</h1>
 
+- [From version 6.5.x to 7.0.0](#from-version-65x-to-700)
+  - [Breaking changes](#breaking-changes)
+    - [Framework field mandatory](#framework-field-mandatory)
 - [From version 6.4.x to 6.5.0](#from-version-64x-to-650)
   - [React18 new root API](#react18-new-root-api)
   - [Deprecated register.js](#deprecated-registerjs)
@@ -198,6 +201,14 @@
   - [Packages renaming](#packages-renaming)
   - [Deprecated embedded addons](#deprecated-embedded-addons)
 
+## From version 6.5.x to 7.0.0
+
+### Breaking changes
+
+#### Framework field mandatory
+
+In 6.4 we introduced a new `main.js` field called [`framework`](#mainjs-framework-field). Starting in 7.0, this field is mandatory.
+
 ## From version 6.4.x to 6.5.0
 
 ### React18 new root API

diff --git a/addons/a11y/package.json b/addons/a11y/package.json
@@ -63,8 +63,7 @@
     "util-deprecate": "^1.0.2"
   },
   "devDependencies": {
-    "@testing-library/react": "^11.2.2",
-    "@types/webpack-env": "^1.16.0"
+    "@testing-library/react": "^11.2.2"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

diff --git a/addons/a11y/tsconfig.json b/addons/a11y/tsconfig.json
@@ -2,20 +2,15 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "types": [
-      "webpack-env",
-      "jest"
-    ],
+    "types": ["jest"],
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -24,4 +19,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/actions/package.json b/addons/actions/package.json
@@ -62,8 +62,7 @@
     "uuid-browser": "^3.1.0"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.167",
-    "@types/webpack-env": "^1.16.0"
+    "@types/lodash": "^4.14.167"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",

diff --git a/addons/actions/tsconfig.json b/addons/actions/tsconfig.json
@@ -2,14 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "types": [
-      "webpack-env",
-      "jest"
-    ]
+    "types": ["jest"]
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -18,4 +13,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/backgrounds/package.json b/addons/backgrounds/package.json
@@ -59,9 +59,6 @@
     "ts-dedent": "^2.0.0",
     "util-deprecate": "^1.0.2"
   },
-  "devDependencies": {
-    "@types/webpack-env": "^1.16.0"
-  },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

diff --git a/addons/backgrounds/tsconfig.json b/addons/backgrounds/tsconfig.json
@@ -1,14 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src",
-    "types": [
-      "webpack-env"
-    ]
+    "rootDir": "./src"
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -17,4 +12,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/controls/tsconfig.json b/addons/controls/tsconfig.json
@@ -2,15 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "types": [
-      "webpack-env",
-      "jest",
-      "node"
-    ]
+    "types": ["jest", "node"]
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -19,4 +13,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/docs/src/typings.d.ts b/addons/docs/src/typings.d.ts
@@ -4,7 +4,6 @@ declare module '@egoist/vue-to-react';
 declare module 'remark-slug';
 declare module 'remark-external-links';
 declare module 'babel-plugin-react-docgen';
-declare module 'require-from-string';
 declare module 'styled-components';
 declare module 'acorn-jsx';
 declare module 'vue/dist/vue';

diff --git a/addons/docs/tsconfig.json b/addons/docs/tsconfig.json
@@ -3,20 +3,14 @@
   "compilerOptions": {
     "rootDir": "./src",
     "skipLibCheck": true,
-    "types": [
-      "webpack-env",
-      "jest",
-      "node"
-    ]
+    "types": ["jest", "node"]
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/__tests__/**/*",
     "src/**/*.stories.*",
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/essentials/package.json b/addons/essentials/package.json
@@ -58,8 +58,7 @@
   "devDependencies": {
     "@babel/core": "^7.12.10",
     "@storybook/vue": "6.5.0-alpha.64",
-    "@types/jest": "^26.0.16",
-    "@types/webpack-env": "^1.16.0"
+    "@types/jest": "^26.0.16"
   },
   "peerDependencies": {
     "@babel/core": "^7.9.6"
@@ -68,18 +67,6 @@
     "@storybook/angular": {
       "optional": true
     },
-    "@storybook/builder-manager4": {
-      "optional": true
-    },
-    "@storybook/builder-manager5": {
-      "optional": true
-    },
-    "@storybook/builder-webpack4": {
-      "optional": true
-    },
-    "@storybook/builder-webpack5": {
-      "optional": true
-    },
     "@storybook/html": {
       "optional": true
     },
@@ -112,9 +99,6 @@
     },
     "vue": {
       "optional": true
-    },
-    "webpack": {
-      "optional": true
     }
   },
   "publishConfig": {

diff --git a/addons/essentials/tsconfig.json b/addons/essentials/tsconfig.json
@@ -2,15 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "types": [
-      "webpack-env",
-      "jest",
-      "node"
-    ]
+    "types": ["jest", "node"]
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -19,4 +13,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/interactions/tsconfig.json b/addons/interactions/tsconfig.json
@@ -1,14 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src",
-    "types": [
-      "webpack-env"
-    ]
+    "rootDir": "./src"
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -17,4 +12,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/jest/package.json b/addons/jest/package.json
@@ -59,9 +59,6 @@
     "regenerator-runtime": "^0.13.7",
     "upath": "^1.2.0"
   },
-  "devDependencies": {
-    "@types/webpack-env": "^1.16.0"
-  },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

diff --git a/addons/jest/tsconfig.json b/addons/jest/tsconfig.json
@@ -2,14 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "types": [
-      "webpack-env",
-      "jest"
-    ]
+    "types": ["jest"]
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -18,4 +13,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/links/package.json b/addons/links/package.json
@@ -54,9 +54,6 @@
     "regenerator-runtime": "^0.13.7",
     "ts-dedent": "^2.0.0"
   },
-  "devDependencies": {
-    "@types/webpack-env": "^1.16.0"
-  },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

diff --git a/addons/links/tsconfig.json b/addons/links/tsconfig.json
@@ -2,14 +2,9 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
-    "types": [
-      "webpack-env",
-      "@testing-library/jest-dom"
-    ]
+    "types": ["@testing-library/jest-dom"]
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -18,4 +13,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}
diff --git a/addons/measure/package.json b/addons/measure/package.json
@@ -53,9 +53,6 @@
     "core-js": "^3.8.2",
     "global": "^4.4.0"
   },
-  "devDependencies": {
-    "@types/webpack-env": "^1.16.0"
-  },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"

diff --git a/addons/measure/tsconfig.json b/addons/measure/tsconfig.json
@@ -1,14 +1,9 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "rootDir": "./src",
-    "types": [
-      "webpack-env"
-    ]
+    "rootDir": "./src"
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "exclude": [
     "src/**/*.test.*",
     "src/**/tests/**/*",
@@ -17,4 +12,4 @@
     "src/**/*.mockdata.*",
     "src/**/__testfixtures__/**"
   ]
-}
+}