Merge commit 'd3ea4267c874b009a58d7b62c505389dd335e01d' into future/m…

…odern-frameworks # Conflicts: # examples/cra-react15/.storybook/main.js # examples/cra-react15/package.json # examples/web-components-kitchen-sink/yarn.lock # jest.config.js # lib/builder-webpack4/package.json # lib/builder-webpack4/src/index.ts # lib/builder-webpack4/src/presets/custom-webpack-preset.ts # lib/builder-webpack4/src/preview/base-webpack.config.ts # lib/builder-webpack5/package.json # lib/core-common/package.json # lib/core-common/src/types.ts # lib/manager-webpack4/package.json # lib/manager-webpack4/src/index.ts # presets/html-webpack/package.json # presets/preact-webpack/package.json # presets/react-webpack/package.json # presets/svelte-webpack/package.json # presets/svelte-webpack/src/framework-preset-svelte-docs.ts # presets/vue-webpack/src/framework-preset-vue-docs.ts # yarn.lock
storybookjs · May 12, 2022 · efd1cf2 · efd1cf2
2 parents f5e87c9 + d3ea426
commit efd1cf2
Show file tree

Hide file tree

Showing 356 changed files with 822 additions and 598 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -104,7 +104,7 @@ jobs:
             - examples
             - node_modules
             - addons
-            - app
+            - frameworks
             - lib
             - renderers
             - presets

diff --git a/app/html/src/client/index.ts b/app/html/src/client/index.ts
diff --git a/app/preact/src/client/index.ts b/app/preact/src/client/index.ts
diff --git a/app/react/src/client/index.ts b/app/react/src/client/index.ts
diff --git a/app/react/src/server/preset.ts b/app/react/src/server/preset.ts
diff --git a/app/react/src/types.ts b/app/react/src/types.ts
diff --git a/app/server/src/client/index.ts b/app/server/src/client/index.ts
diff --git a/app/svelte/src/client/index.ts b/app/svelte/src/client/index.ts
diff --git a/app/vue/src/client/index.ts b/app/vue/src/client/index.ts
diff --git a/app/vue3/src/client/index.ts b/app/vue3/src/client/index.ts
diff --git a/app/web-components/src/client/index.ts b/app/web-components/src/client/index.ts
diff --git a/examples/cra-kitchen-sink/.storybook/main.js b/examples/cra-kitchen-sink/.storybook/main.js
@@ -37,7 +37,7 @@ module.exports = {
     breakingChangesV7: true,
   },
   framework: {
-    name: '@storybook/react',
+    name: '@storybook/react-webpack4',
     options: { fastRefresh: true },
   },
 };
diff --git a/examples/cra-kitchen-sink/package.json b/examples/cra-kitchen-sink/package.json
@@ -33,6 +33,7 @@
     "@storybook/builder-webpack5": "6.5.0-beta.4",
     "@storybook/preset-create-react-app": "^4.1.0",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
     "sb": "6.5.0-beta.4",
     "webpack": "5"

diff --git a/examples/cra-ts-essentials/.storybook/main.ts b/examples/cra-ts-essentials/.storybook/main.ts
@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/react/types';
+import type { StorybookConfig } from '@storybook/react-webpack4/types';
 
 const path = require('path');
 
@@ -33,6 +33,6 @@ const mainConfig: StorybookConfig = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/react',
+  framework: '@storybook/react-webpack4',
 };
 module.exports = mainConfig;
diff --git a/examples/cra-ts-essentials/package.json b/examples/cra-ts-essentials/package.json
@@ -43,6 +43,7 @@
     "@storybook/builder-webpack5": "6.5.0-beta.4",
     "@storybook/preset-create-react-app": "^4.1.0",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "@storybook/testing-library": "^0.0.9",
     "sb": "6.5.0-beta.4",
     "ts-node": "^10.4.0",

diff --git a/examples/cra-ts-kitchen-sink/.storybook/main.ts b/examples/cra-ts-kitchen-sink/.storybook/main.ts
@@ -35,5 +35,5 @@ module.exports = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/react',
+  framework: '@storybook/react-webpack4',
 };
diff --git a/examples/cra-ts-kitchen-sink/package.json b/examples/cra-ts-kitchen-sink/package.json
@@ -43,6 +43,7 @@
     "@storybook/builder-webpack5": "6.5.0-beta.4",
     "@storybook/preset-create-react-app": "^4.1.0",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "@types/enzyme": "^3.10.8",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.9.1",

diff --git a/examples/external-docs/package.json b/examples/external-docs/package.json
@@ -14,6 +14,7 @@
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
     "@storybook/preview-web": "6.5.0-beta.4",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "@storybook/store": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
     "formik": "^2.2.9",

diff --git a/examples/external-docs/src/.storybook/main.ts b/examples/external-docs/src/.storybook/main.ts
@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/react/types';
+import type { StorybookConfig } from '@storybook/react-webpack4/types';
 
 const config: StorybookConfig = {
   stories: [
@@ -29,6 +29,6 @@ const config: StorybookConfig = {
     warnOnLegacyHierarchySeparator: false,
     previewMdx2: true,
   },
-  framework: '@storybook/react',
+  framework: '@storybook/react-webpack4',
 };
 module.exports = config;
diff --git a/examples/html-kitchen-sink/.storybook/main.js b/examples/html-kitchen-sink/.storybook/main.js
@@ -39,5 +39,5 @@ module.exports = {
   //     // url: 'http://localhost:8080',
   //   },
   // },
-  framework: '@storybook/html',
+  framework: '@storybook/html-webpack4',
 };
diff --git a/examples/html-kitchen-sink/package.json b/examples/html-kitchen-sink/package.json
@@ -28,6 +28,7 @@
     "@storybook/client-api": "6.5.0-beta.4",
     "@storybook/core-events": "6.5.0-beta.4",
     "@storybook/html": "6.5.0-beta.4",
+    "@storybook/html-webpack4": "6.5.0-beta.4",
     "@storybook/source-loader": "6.5.0-beta.4",
     "autoprefixer": "^10.0.1",
     "eventemitter3": "^4.0.7",

diff --git a/examples/official-storybook/main.ts b/examples/official-storybook/main.ts
@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import type { StorybookConfig } from '@storybook/react/types';
+import type { StorybookConfig } from '@storybook/react-webpack4/types';
 
 const config: StorybookConfig = {
   stories: [
@@ -49,7 +49,7 @@ const config: StorybookConfig = {
     },
   ],
   framework: {
-    name: '@storybook/react',
+    name: '@storybook/react-webpack4',
     options: {
       fastRefresh: true,
       strictMode: true,

diff --git a/examples/official-storybook/package.json b/examples/official-storybook/package.json
@@ -34,6 +34,7 @@
     "@storybook/jest": "^0.0.5",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "@storybook/router": "6.5.0-beta.4",
     "@storybook/source-loader": "6.5.0-beta.4",
     "@storybook/testing-library": "^0.0.7",

diff --git a/examples/preact-kitchen-sink/.storybook/main.js b/examples/preact-kitchen-sink/.storybook/main.js
@@ -30,5 +30,5 @@ module.exports = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/preact',
+  framework: '@storybook/preact-webpack4',
 };
diff --git a/examples/preact-kitchen-sink/package.json b/examples/preact-kitchen-sink/package.json
@@ -24,6 +24,7 @@
     "@storybook/addon-viewport": "6.5.0-beta.4",
     "@storybook/addons": "6.5.0-beta.4",
     "@storybook/preact": "6.5.0-beta.4",
+    "@storybook/preact-webpack4": "6.5.0-beta.4",
     "@storybook/source-loader": "6.5.0-beta.4",
     "@types/prop-types": "^15.7.3",
     "@types/react": "^17",

diff --git a/examples/react-ts/.storybook/main.ts b/examples/react-ts/.storybook/main.ts
@@ -1,4 +1,4 @@
-import type { StorybookConfig } from '@storybook/react/types';
+import type { StorybookConfig } from '@storybook/react-webpack4/types';
 
 const config: StorybookConfig = {
   stories: [
@@ -36,6 +36,6 @@ const config: StorybookConfig = {
     previewMdx2: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/react',
+  framework: '@storybook/react-webpack4',
 };
 module.exports = config;
diff --git a/examples/react-ts/package.json b/examples/react-ts/package.json
@@ -24,6 +24,7 @@
     "@storybook/cli": "6.5.0-beta.4",
     "@storybook/components": "6.5.0-beta.4",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "@storybook/theming": "6.5.0-beta.4",
     "@testing-library/dom": "^7.31.2",
     "@testing-library/react": "12.1.2",

diff --git a/examples/server-kitchen-sink/.storybook/main.js b/examples/server-kitchen-sink/.storybook/main.js
@@ -9,5 +9,5 @@ module.exports = {
     '@storybook/addon-links',
     '@storybook/addon-controls',
   ],
-  framework: '@storybook/server',
+  framework: '@storybook/server-webpack4',
 };
diff --git a/examples/server-kitchen-sink/package.json b/examples/server-kitchen-sink/package.json
@@ -21,6 +21,7 @@
     "@storybook/addon-links": "6.5.0-beta.4",
     "@storybook/node-logger": "6.5.0-beta.4",
     "@storybook/server": "6.5.0-beta.4",
+    "@storybook/server-webpack4": "6.5.0-beta.4",
     "concurrently": "^5.3.0",
     "cors": "^2.8.5",
     "express": "~4.17.1",

diff --git a/examples/standalone-preview/package.json b/examples/standalone-preview/package.json
@@ -10,6 +10,7 @@
     "@storybook/addon-docs": "6.5.0-beta.4",
     "@storybook/cli": "6.5.0-beta.4",
     "@storybook/react": "6.5.0-beta.4",
+    "@storybook/react-webpack4": "6.5.0-beta.4",
     "cross-env": "^7.0.3",
     "parcel": "2.0.1",
     "react": "16.14.0",

diff --git a/examples/svelte-kitchen-sink/.storybook/main.js b/examples/svelte-kitchen-sink/.storybook/main.js
@@ -41,5 +41,5 @@ module.exports = {
   features: {
     breakingChangesV7: true,
   },
-  framework: '@storybook/svelte',
+  framework: '@storybook/svelte-webpack4',
 };
diff --git a/examples/svelte-kitchen-sink/package.json b/examples/svelte-kitchen-sink/package.json
@@ -24,6 +24,7 @@
     "@storybook/jest": "^0.0.5",
     "@storybook/source-loader": "6.5.0-beta.4",
     "@storybook/svelte": "6.5.0-beta.4",
+    "@storybook/svelte-webpack4": "6.5.0-beta.4",
     "@storybook/testing-library": "^0.0.7",
     "sb": "6.5.0-beta.4",
     "svelte-jester": "1.3.0",

diff --git a/examples/vue-3-cli/.storybook/main.js b/examples/vue-3-cli/.storybook/main.js
@@ -13,5 +13,5 @@ module.exports = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/vue3',
+  framework: '@storybook/vue3-webpack4',
 };
diff --git a/examples/vue-3-cli/package.json b/examples/vue-3-cli/package.json
@@ -22,6 +22,7 @@
     "@storybook/jest": "^0.0.5",
     "@storybook/testing-library": "^0.0.7",
     "@storybook/vue3": "6.5.0-beta.4",
+    "@storybook/vue3-webpack4": "6.5.0-beta.4",
     "@vue/cli-plugin-babel": "~4.5.0",
     "@vue/cli-plugin-typescript": "~4.5.0",
     "@vue/cli-service": "~4.5.0",

diff --git a/examples/vue-cli/.storybook/main.js b/examples/vue-cli/.storybook/main.js
@@ -15,5 +15,5 @@ module.exports = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/vue',
+  framework: '@storybook/vue-webpack4',
 };
diff --git a/examples/vue-cli/package.json b/examples/vue-cli/package.json
@@ -20,6 +20,7 @@
     "@storybook/preset-scss": "^1.0.3",
     "@storybook/source-loader": "6.5.0-beta.4",
     "@storybook/vue": "6.5.0-beta.4",
+    "@storybook/vue-webpack4": "6.5.0-beta.4",
     "@vue/cli-plugin-babel": "~4.3.1",
     "@vue/cli-plugin-typescript": "~4.3.1",
     "@vue/cli-service": "~4.3.1",

diff --git a/examples/vue-kitchen-sink/.storybook/main.js b/examples/vue-kitchen-sink/.storybook/main.js
@@ -21,5 +21,5 @@ module.exports = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/vue',
+  framework: '@storybook/vue-webpack4',
 };
diff --git a/examples/vue-kitchen-sink/package.json b/examples/vue-kitchen-sink/package.json
@@ -29,6 +29,7 @@
     "@storybook/source-loader": "6.5.0-beta.4",
     "@storybook/testing-library": "^0.0.7",
     "@storybook/vue": "6.5.0-beta.4",
+    "@storybook/vue-webpack4": "6.5.0-beta.4",
     "@vue/babel-preset-jsx": "^1.2.4",
     "babel-loader": "^8.2.5",
     "cross-env": "^7.0.3",

diff --git a/examples/web-components-kitchen-sink/.storybook/main.js b/examples/web-components-kitchen-sink/.storybook/main.js
@@ -22,5 +22,5 @@ module.exports = {
     buildStoriesJson: true,
     breakingChangesV7: true,
   },
-  framework: '@storybook/web-components',
+  framework: '@storybook/web-components-webpack4',
 };
diff --git a/examples/web-components-kitchen-sink/package.json b/examples/web-components-kitchen-sink/package.json
@@ -38,6 +38,7 @@
     "@storybook/core-common": "portal:../../lib/core-common",
     "@storybook/core-events": "portal:../../lib/core-events",
     "@storybook/core-server": "portal:../../lib/core-server",
+    "@storybook/core-webpack": "portal:../../lib/core-webpack",
     "@storybook/csf": "0.0.2--canary.4566f4d.1",
     "@storybook/csf-tools": "portal:../../lib/csf-tools",
     "@storybook/docs-tools": "portal:../../lib/docs-tools",
@@ -47,15 +48,15 @@
     "@storybook/postinstall": "portal:../../lib/postinstall",
     "@storybook/preset-web-components-webpack": "portal:../../presets/web-components-webpack",
     "@storybook/preview-web": "portal:../../lib/preview-web",
-    "@storybook/renderer-web-components": "portal:../../renderers/web-components",
     "@storybook/router": "portal:../../lib/router",
     "@storybook/source-loader": "portal:../../lib/source-loader",
     "@storybook/store": "portal:../../lib/store",
     "@storybook/telemetry": "portal:../../lib/telemetry",
     "@storybook/testing-library": "^0.0.7",
     "@storybook/theming": "portal:../../lib/theming",
     "@storybook/ui": "portal:../../lib/ui",
-    "@storybook/web-components": "portal:../../app/web-components",
+    "@storybook/web-components": "portal:../../renderers/web-components",
+    "@storybook/web-components-webpack4": "portal:../../frameworks/web-components-webpack4",
     "babel-plugin-macros": "3.1.0",
     "fork-ts-checker-webpack-plugin": "^7.2.6",
     "sb": "portal:../../lib/cli-sb",
@@ -77,6 +78,7 @@
     "@storybook/addon-storysource": "*",
     "@storybook/addon-viewport": "*",
     "@storybook/web-components": "*",
+    "@storybook/web-components-webpack4": "*",
     "global": "^4.4.0",
     "jest": "^27.3.1",
     "sb": "*",

diff --git a/app/angular/README.md → frameworks/angular/README.md b/app/angular/README.md → frameworks/angular/README.md
diff --git a/app/angular/jest.config.js → frameworks/angular/jest.config.js b/app/angular/jest.config.js → frameworks/angular/jest.config.js
diff --git a/app/angular/package.json → frameworks/angular/package.json b/app/angular/package.json → frameworks/angular/package.json
@@ -1,18 +1,19 @@
 {
   "name": "@storybook/angular",
   "version": "6.5.0-beta.4",
-  "description": "Storybook for Angular: Develop Angular Components in isolation with Hot Reloading.",
+  "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.",
   "keywords": [
-    "storybook"
+    "storybook",
+    "angular"
   ],
-  "homepage": "https://github.com/storybookjs/storybook/tree/main/app/angular",
+  "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/angular",
   "bugs": {
     "url": "https://github.com/storybookjs/storybook/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/storybookjs/storybook.git",
-    "directory": "app/angular"
+    "directory": "frameworks/angular"
   },
   "funding": {
     "type": "opencollective",

diff --git a/app/angular/preset.js → frameworks/angular/preset.js b/app/angular/preset.js → frameworks/angular/preset.js
diff --git a/app/angular/renderer.d.ts → frameworks/angular/renderer.d.ts b/app/angular/renderer.d.ts → frameworks/angular/renderer.d.ts
diff --git a/app/angular/renderer.js → frameworks/angular/renderer.js b/app/angular/renderer.js → frameworks/angular/renderer.js
diff --git a/app/angular/setup-jest.ts → frameworks/angular/setup-jest.ts b/app/angular/setup-jest.ts → frameworks/angular/setup-jest.ts
diff --git a/...rc/builders/build-storybook/index.spec.ts → ...rc/builders/build-storybook/index.spec.ts b/...rc/builders/build-storybook/index.spec.ts → ...rc/builders/build-storybook/index.spec.ts
diff --git a/...lar/src/builders/build-storybook/index.ts → ...lar/src/builders/build-storybook/index.ts b/...lar/src/builders/build-storybook/index.ts → ...lar/src/builders/build-storybook/index.ts
diff --git a/.../src/builders/build-storybook/schema.json → .../src/builders/build-storybook/schema.json b/.../src/builders/build-storybook/schema.json → .../src/builders/build-storybook/schema.json
diff --git a/app/angular/src/builders/builders.json → ...eworks/angular/src/builders/builders.json b/app/angular/src/builders/builders.json → ...eworks/angular/src/builders/builders.json
diff --git a/...rc/builders/start-storybook/index.spec.ts → ...rc/builders/start-storybook/index.spec.ts b/...rc/builders/start-storybook/index.spec.ts → ...rc/builders/start-storybook/index.spec.ts
diff --git a/...lar/src/builders/start-storybook/index.ts → ...lar/src/builders/start-storybook/index.ts b/...lar/src/builders/start-storybook/index.ts → ...lar/src/builders/start-storybook/index.ts
diff --git a/.../src/builders/start-storybook/schema.json → .../src/builders/start-storybook/schema.json b/.../src/builders/start-storybook/schema.json → .../src/builders/start-storybook/schema.json
diff --git a/.../utils/build-standalone-errors-handler.ts → .../utils/build-standalone-errors-handler.ts b/.../utils/build-standalone-errors-handler.ts → .../utils/build-standalone-errors-handler.ts
diff --git a/...r/src/builders/utils/run-compodoc.spec.ts → ...r/src/builders/utils/run-compodoc.spec.ts b/...r/src/builders/utils/run-compodoc.spec.ts → ...r/src/builders/utils/run-compodoc.spec.ts
diff --git a/...ngular/src/builders/utils/run-compodoc.ts → ...ngular/src/builders/utils/run-compodoc.ts b/...ngular/src/builders/utils/run-compodoc.ts → ...ngular/src/builders/utils/run-compodoc.ts
diff --git a/...stfixtures__/doc-button/argtypes.snapshot → ...stfixtures__/doc-button/argtypes.snapshot b/...stfixtures__/doc-button/argtypes.snapshot → ...stfixtures__/doc-button/argtypes.snapshot
diff --git a/...ures__/doc-button/compodoc-posix.snapshot → ...ures__/doc-button/compodoc-posix.snapshot b/...ures__/doc-button/compodoc-posix.snapshot → ...ures__/doc-button/compodoc-posix.snapshot