Merge pull request #18201 from storybookjs/future/simplified-frameworks

Create frameworks & rename renderers
storybookjs · Jun 6, 2022 · 9020934 · 9020934
2 parents c6fd95a + f339e77
commit 9020934
Show file tree

Hide file tree

Showing 309 changed files with 773 additions and 599 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/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-webpack4": "6.5.0-rc.1",
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@storybook/theming": "6.5.0-rc.1",
     "sb": "6.5.0-rc.1",
     "webpack": "4"

diff --git a/examples/cra-react15/.storybook/main.js b/examples/cra-react15/.storybook/main.js
@@ -24,5 +24,5 @@ module.exports = {
     disableTelemetry: true,
   },
   staticDirs: ['../public'],
-  framework: '@storybook/react',
+  framework: '@storybook/react-webpack4',
 };
diff --git a/examples/cra-react15/package.json b/examples/cra-react15/package.json
@@ -26,6 +26,7 @@
     "@storybook/builder-webpack4": "6.5.0-rc.1",
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@storybook/theming": "6.5.0-rc.1",
     "babel-core": "6",
     "babel-runtime": "6",

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');
 
@@ -34,6 +34,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-webpack4": "6.5.0-rc.1",
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@storybook/testing-library": "^0.0.9",
     "sb": "6.5.0-rc.1",
     "webpack": "4"

diff --git a/examples/cra-ts-kitchen-sink/.storybook/main.ts b/examples/cra-ts-kitchen-sink/.storybook/main.ts
@@ -36,5 +36,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-webpack4": "6.5.0-rc.1",
     "@storybook/preset-create-react-app": "^3.1.6",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@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.87bc651.0",
     "@storybook/preview-web": "6.5.0-rc.1",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@storybook/store": "6.5.0-rc.1",
     "@storybook/theming": "6.5.0-rc.1",
     "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
@@ -40,5 +40,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-rc.1",
     "@storybook/core-events": "6.5.0-rc.1",
     "@storybook/html": "6.5.0-rc.1",
+    "@storybook/html-webpack4": "6.5.0-rc.1",
     "@storybook/source-loader": "6.5.0-rc.1",
     "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: [
@@ -54,7 +54,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-rc.1",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@storybook/router": "6.5.0-rc.1",
     "@storybook/source-loader": "6.5.0-rc.1",
     "@storybook/testing-library": "^0.0.7",

diff --git a/examples/preact-kitchen-sink/.storybook/main.js b/examples/preact-kitchen-sink/.storybook/main.js
@@ -31,5 +31,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-rc.1",
     "@storybook/addons": "6.5.0-rc.1",
     "@storybook/preact": "6.5.0-rc.1",
+    "@storybook/preact-webpack4": "6.5.0-rc.1",
     "@storybook/source-loader": "6.5.0-rc.1",
     "@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: [
@@ -45,6 +45,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-rc.1",
     "@storybook/components": "6.5.0-rc.1",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "@storybook/theming": "6.5.0-rc.1",
     "@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-rc.1",
     "@storybook/node-logger": "6.5.0-rc.1",
     "@storybook/server": "6.5.0-rc.1",
+    "@storybook/server-webpack4": "6.5.0-rc.1",
     "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-rc.1",
     "@storybook/cli": "6.5.0-rc.1",
     "@storybook/react": "6.5.0-rc.1",
+    "@storybook/react-webpack4": "6.5.0-rc.1",
     "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
@@ -42,5 +42,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-rc.1",
     "@storybook/svelte": "6.5.0-rc.1",
+    "@storybook/svelte-webpack4": "6.5.0-rc.1",
     "@storybook/testing-library": "^0.0.7",
     "sb": "6.5.0-rc.1",
     "svelte-jester": "1.3.0",

diff --git a/examples/vue-3-cli/.storybook/main.js b/examples/vue-3-cli/.storybook/main.js
@@ -15,5 +15,5 @@ module.exports = {
     breakingChangesV7: true,
     channelOptions: { allowFunction: false, maxDepth: 10 },
   },
-  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-rc.1",
+    "@storybook/vue3-webpack4": "6.5.0-rc.1",
     "@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
@@ -17,5 +17,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-rc.1",
     "@storybook/vue": "6.5.0-rc.1",
+    "@storybook/vue-webpack4": "6.5.0-rc.1",
     "@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
@@ -22,5 +22,5 @@ module.exports = {
     buildStoriesJson: true,
     storyStoreV7: !global.navigator?.userAgent?.match?.('jsdom'),
   },
-  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-rc.1",
     "@storybook/testing-library": "^0.0.7",
     "@storybook/vue": "6.5.0-rc.1",
+    "@storybook/vue-webpack4": "6.5.0-rc.1",
     "@vue/babel-preset-jsx": "^1.2.4",
     "babel-loader": "^8.0.0",
     "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
@@ -23,5 +23,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
@@ -48,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": "6.2.13",
     "sb": "portal:../../lib/cli-sb",
@@ -78,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": "*",