diff --git a/.circleci/config.yml b/.circleci/config.yml index 41ebb832b69d..6e9b5110d484 100644 --- 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 deleted file mode 100644 index 6eadd1970d34..000000000000 --- a/app/html/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-html'; diff --git a/app/preact/src/client/index.ts b/app/preact/src/client/index.ts deleted file mode 100644 index b0374cabc336..000000000000 --- a/app/preact/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-preact'; diff --git a/app/react/src/client/index.ts b/app/react/src/client/index.ts deleted file mode 100644 index 7d6e4ae9d6d7..000000000000 --- a/app/react/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-react'; diff --git a/app/react/src/server/preset.ts b/app/react/src/server/preset.ts deleted file mode 100644 index 2f9de9bc575e..000000000000 --- a/app/react/src/server/preset.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { StorybookConfig } from '@storybook/core-common'; - -export const addons: StorybookConfig['addons'] = [ - '@storybook/preset-react-webpack', - '@storybook/renderer-react', -]; diff --git a/app/react/src/types.ts b/app/react/src/types.ts deleted file mode 100644 index f9286eea6f3f..000000000000 --- a/app/react/src/types.ts +++ /dev/null @@ -1,26 +0,0 @@ -import type { StorybookConfig as BaseConfig } from '@storybook/core-common'; - -export interface ReactOptions { - fastRefresh?: boolean; - strictMode?: boolean; - /** - * Use React's legacy root API to mount components - * @description - * React has introduced a new root API with React 18.x to enable a whole set of new features (e.g. concurrent features) - * If this flag is true, the legacy Root API is used to mount components to make it easier to migrate step by step to React 18. - * @default false - */ - legacyRootApi?: boolean; -} - -/** - * The interface for Storybook configuration in `main.ts` files. - */ -export interface StorybookConfig extends BaseConfig { - framework: - | string - | { - name: '@storybook/react'; - options: ReactOptions; - }; -} diff --git a/app/server/src/client/index.ts b/app/server/src/client/index.ts deleted file mode 100644 index 16e7fdbacf12..000000000000 --- a/app/server/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-server'; diff --git a/app/svelte/src/client/index.ts b/app/svelte/src/client/index.ts deleted file mode 100644 index 9b48813943ee..000000000000 --- a/app/svelte/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-svelte'; diff --git a/app/vue/src/client/index.ts b/app/vue/src/client/index.ts deleted file mode 100644 index 281c0a2af520..000000000000 --- a/app/vue/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-vue'; diff --git a/app/vue3/src/client/index.ts b/app/vue3/src/client/index.ts deleted file mode 100644 index 2d687b57f660..000000000000 --- a/app/vue3/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-vue3'; diff --git a/app/web-components/src/client/index.ts b/app/web-components/src/client/index.ts deleted file mode 100644 index c90b9d19c452..000000000000 --- a/app/web-components/src/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from '@storybook/renderer-web-components'; diff --git a/examples/cra-kitchen-sink/.storybook/main.js b/examples/cra-kitchen-sink/.storybook/main.js index 80caddf1aada..b3f46eafc744 100644 --- 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 index b15736a8e2ad..4e1b3542cad0 100644 --- 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 index 5dcfe1c14703..83ad06629d8f 100644 --- 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 index 890592444194..1a80968f912d 100644 --- 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 index 87ba4fdb8c16..afce513e0624 100644 --- 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 index 74a8af35adc3..819ccd43e83d 100644 --- 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 index c01b533bda87..6e0e56bff0b2 100644 --- 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 index 6f1ba6bc9fd6..aa6061f0f72c 100644 --- 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 index e8456a98b6ca..81c328d6fa08 100644 --- 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 index 9f740f221992..f849b9e6fcd3 100644 --- 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 index 947e117dfb56..33e7a6205b67 100644 --- a/examples/official-storybook/main.ts +++ b/examples/official-storybook/main.ts @@ -1,5 +1,5 @@ /// -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 index 095915bf2e80..5d74fd33c99a 100644 --- 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 index fc55fe5cbaf3..1916c313fb2d 100644 --- 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 index ed5a7e5a9a76..47b5cdddcef6 100644 --- 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 index cc7211808692..eb539fe00a29 100644 --- 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 index a4bbf2ee8484..dfe275c5b476 100644 --- 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 index 4fc57fd701b5..1983229a5384 100644 --- 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 index a36a251580dc..255f2bf5f892 100644 --- 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 index fea025cc4de6..3717fe8e7724 100644 --- 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 index eed15d3472c4..130902d3498f 100644 --- 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 index 5be1fa51b5a1..3015dc33f589 100644 --- 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 index 1532ab994b2d..266819efc219 100644 --- 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 index 441049051ec8..e33c02288283 100644 --- 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 index 757747f589b3..2dcc03547c7b 100644 --- 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 index 4e948034fd08..45a00c97fb18 100644 --- 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 index e5cb37430282..a2704789a210 100644 --- 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 index 51a2fd5db2c8..02f90ca484dc 100644 --- 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 index 6affdd0900fc..9269d3c89fd2 100644 --- 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 index 554350dd54e3..96e1ba99edf6 100644 --- 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,7 +48,6 @@ "@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", @@ -55,7 +55,8 @@ "@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 b/frameworks/angular/README.md similarity index 100% rename from app/angular/README.md rename to frameworks/angular/README.md diff --git a/app/angular/jest.config.js b/frameworks/angular/jest.config.js similarity index 100% rename from app/angular/jest.config.js rename to frameworks/angular/jest.config.js diff --git a/app/angular/package.json b/frameworks/angular/package.json similarity index 95% rename from app/angular/package.json rename to frameworks/angular/package.json index 03d47e1aa3ba..71f05cbefe7f 100644 --- a/app/angular/package.json +++ b/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 b/frameworks/angular/preset.js similarity index 100% rename from app/angular/preset.js rename to frameworks/angular/preset.js diff --git a/app/angular/renderer.d.ts b/frameworks/angular/renderer.d.ts similarity index 100% rename from app/angular/renderer.d.ts rename to frameworks/angular/renderer.d.ts diff --git a/app/angular/renderer.js b/frameworks/angular/renderer.js similarity index 100% rename from app/angular/renderer.js rename to frameworks/angular/renderer.js diff --git a/app/angular/setup-jest.ts b/frameworks/angular/setup-jest.ts similarity index 100% rename from app/angular/setup-jest.ts rename to frameworks/angular/setup-jest.ts diff --git a/app/angular/src/builders/build-storybook/index.spec.ts b/frameworks/angular/src/builders/build-storybook/index.spec.ts similarity index 100% rename from app/angular/src/builders/build-storybook/index.spec.ts rename to frameworks/angular/src/builders/build-storybook/index.spec.ts diff --git a/app/angular/src/builders/build-storybook/index.ts b/frameworks/angular/src/builders/build-storybook/index.ts similarity index 100% rename from app/angular/src/builders/build-storybook/index.ts rename to frameworks/angular/src/builders/build-storybook/index.ts diff --git a/app/angular/src/builders/build-storybook/schema.json b/frameworks/angular/src/builders/build-storybook/schema.json similarity index 100% rename from app/angular/src/builders/build-storybook/schema.json rename to frameworks/angular/src/builders/build-storybook/schema.json diff --git a/app/angular/src/builders/builders.json b/frameworks/angular/src/builders/builders.json similarity index 100% rename from app/angular/src/builders/builders.json rename to frameworks/angular/src/builders/builders.json diff --git a/app/angular/src/builders/start-storybook/index.spec.ts b/frameworks/angular/src/builders/start-storybook/index.spec.ts similarity index 100% rename from app/angular/src/builders/start-storybook/index.spec.ts rename to frameworks/angular/src/builders/start-storybook/index.spec.ts diff --git a/app/angular/src/builders/start-storybook/index.ts b/frameworks/angular/src/builders/start-storybook/index.ts similarity index 100% rename from app/angular/src/builders/start-storybook/index.ts rename to frameworks/angular/src/builders/start-storybook/index.ts diff --git a/app/angular/src/builders/start-storybook/schema.json b/frameworks/angular/src/builders/start-storybook/schema.json similarity index 100% rename from app/angular/src/builders/start-storybook/schema.json rename to frameworks/angular/src/builders/start-storybook/schema.json diff --git a/app/angular/src/builders/utils/build-standalone-errors-handler.ts b/frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts similarity index 100% rename from app/angular/src/builders/utils/build-standalone-errors-handler.ts rename to frameworks/angular/src/builders/utils/build-standalone-errors-handler.ts diff --git a/app/angular/src/builders/utils/run-compodoc.spec.ts b/frameworks/angular/src/builders/utils/run-compodoc.spec.ts similarity index 100% rename from app/angular/src/builders/utils/run-compodoc.spec.ts rename to frameworks/angular/src/builders/utils/run-compodoc.spec.ts diff --git a/app/angular/src/builders/utils/run-compodoc.ts b/frameworks/angular/src/builders/utils/run-compodoc.ts similarity index 100% rename from app/angular/src/builders/utils/run-compodoc.ts rename to frameworks/angular/src/builders/utils/run-compodoc.ts diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/argtypes.snapshot b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/argtypes.snapshot similarity index 100% rename from app/angular/src/client/docs/__testfixtures__/doc-button/argtypes.snapshot rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/argtypes.snapshot diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-posix.snapshot b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-posix.snapshot similarity index 100% rename from app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-posix.snapshot rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-posix.snapshot diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-undefined.snapshot b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-undefined.snapshot similarity index 96% rename from app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-undefined.snapshot rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-undefined.snapshot index 1bddf9b75503..012aeb4a1651 100644 --- a/app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-undefined.snapshot +++ b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-undefined.snapshot @@ -137,7 +137,7 @@ like bold, italic, and inline code.

", "encapsulation": Array [], "entryComponents": Array [], - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "hostBindings": Array [ Object { "decorators": Array [], @@ -937,7 +937,7 @@ export class InputComponent { Object { "coverageCount": "16/25", "coveragePercent": 64, - "filePath": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "filePath": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "linktype": "component", "name": "InputComponent", "status": "good", @@ -946,7 +946,7 @@ export class InputComponent { Object { "coverageCount": "0/4", "coveragePercent": 0, - "filePath": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "filePath": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "linktype": "interface", "name": "ISomeInterface", "status": "low", @@ -955,7 +955,7 @@ export class InputComponent { Object { "coverageCount": "0/1", "coveragePercent": 0, - "filePath": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "filePath": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "linksubtype": "variable", "linktype": "miscellaneous", "name": "exportedConstant", @@ -973,7 +973,7 @@ export class InputComponent { Object { "deprecated": false, "deprecationMessage": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "id": "interface-ISomeInterface-d145da25329b094ee29610c45a9e46387cb39eddb2a67b4c9fadb84bcec76eacd60d131e48d98b2ee5725dedd25f2eb299b704e8e0a34307d6e84f6e57d57044", "indexSignatures": Array [], "kind": 165, @@ -1230,14 +1230,14 @@ export class InputComponent { "deprecated": false, "deprecationMessage": "", "description": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "name": "ButtonAccent", "subtype": "enum", }, ], "functions": Array [], "groupedEnumerations": Object { - "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts": Array [ + "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts": Array [ Object { "childs": Array [ Object { @@ -1257,7 +1257,7 @@ export class InputComponent { "deprecated": false, "deprecationMessage": "", "description": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "name": "ButtonAccent", "subtype": "enum", }, @@ -1265,13 +1265,13 @@ export class InputComponent { }, "groupedFunctions": Object {}, "groupedTypeAliases": Object { - "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts": Array [ + "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts": Array [ Object { "ctype": "miscellaneous", "deprecated": false, "deprecationMessage": "", "description": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "kind": 186, "name": "ButtonSize", "rawtype": "\\"small\\" | \\"medium\\" | \\"large\\" | \\"xlarge\\"", @@ -1280,13 +1280,13 @@ export class InputComponent { ], }, "groupedVariables": Object { - "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts": Array [ + "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts": Array [ Object { "ctype": "miscellaneous", "defaultValue": "'An exported constant'", "deprecated": false, "deprecationMessage": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "name": "exportedConstant", "subtype": "variable", "type": "string", @@ -1299,7 +1299,7 @@ export class InputComponent { "deprecated": false, "deprecationMessage": "", "description": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "kind": 186, "name": "ButtonSize", "rawtype": "\\"small\\" | \\"medium\\" | \\"large\\" | \\"xlarge\\"", @@ -1312,7 +1312,7 @@ export class InputComponent { "defaultValue": "'An exported constant'", "deprecated": false, "deprecationMessage": "", - "file": "app/angular/src/client/docs/__testfixtures__/doc-button/input.ts", + "file": "frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts", "name": "exportedConstant", "subtype": "variable", "type": "string", diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-windows.snapshot b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-windows.snapshot similarity index 100% rename from app/angular/src/client/docs/__testfixtures__/doc-button/compodoc-windows.snapshot rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/compodoc-windows.snapshot diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/input.ts b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts similarity index 100% rename from app/angular/src/client/docs/__testfixtures__/doc-button/input.ts rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/input.ts diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/properties.snapshot b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/properties.snapshot similarity index 100% rename from app/angular/src/client/docs/__testfixtures__/doc-button/properties.snapshot rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/properties.snapshot diff --git a/app/angular/src/client/docs/__testfixtures__/doc-button/tsconfig.json b/frameworks/angular/src/client/docs/__testfixtures__/doc-button/tsconfig.json similarity index 100% rename from app/angular/src/client/docs/__testfixtures__/doc-button/tsconfig.json rename to frameworks/angular/src/client/docs/__testfixtures__/doc-button/tsconfig.json diff --git a/app/angular/src/client/docs/angular-properties.test.ts b/frameworks/angular/src/client/docs/angular-properties.test.ts similarity index 100% rename from app/angular/src/client/docs/angular-properties.test.ts rename to frameworks/angular/src/client/docs/angular-properties.test.ts diff --git a/app/angular/src/client/docs/compodoc.test.ts b/frameworks/angular/src/client/docs/compodoc.test.ts similarity index 100% rename from app/angular/src/client/docs/compodoc.test.ts rename to frameworks/angular/src/client/docs/compodoc.test.ts diff --git a/app/angular/src/client/docs/compodoc.ts b/frameworks/angular/src/client/docs/compodoc.ts similarity index 100% rename from app/angular/src/client/docs/compodoc.ts rename to frameworks/angular/src/client/docs/compodoc.ts diff --git a/app/angular/src/client/docs/config.ts b/frameworks/angular/src/client/docs/config.ts similarity index 100% rename from app/angular/src/client/docs/config.ts rename to frameworks/angular/src/client/docs/config.ts diff --git a/app/angular/src/client/docs/index.ts b/frameworks/angular/src/client/docs/index.ts similarity index 100% rename from app/angular/src/client/docs/index.ts rename to frameworks/angular/src/client/docs/index.ts diff --git a/app/angular/src/client/docs/prepareForInline.ts b/frameworks/angular/src/client/docs/prepareForInline.ts similarity index 100% rename from app/angular/src/client/docs/prepareForInline.ts rename to frameworks/angular/src/client/docs/prepareForInline.ts diff --git a/app/angular/src/client/docs/sourceDecorator.ts b/frameworks/angular/src/client/docs/sourceDecorator.ts similarity index 100% rename from app/angular/src/client/docs/sourceDecorator.ts rename to frameworks/angular/src/client/docs/sourceDecorator.ts diff --git a/app/angular/src/client/docs/types.ts b/frameworks/angular/src/client/docs/types.ts similarity index 100% rename from app/angular/src/client/docs/types.ts rename to frameworks/angular/src/client/docs/types.ts diff --git a/app/angular/src/client/index.ts b/frameworks/angular/src/client/index.ts similarity index 100% rename from app/angular/src/client/index.ts rename to frameworks/angular/src/client/index.ts diff --git a/app/angular/src/client/preview/angular-beta/AbstractRenderer.ts b/frameworks/angular/src/client/preview/angular-beta/AbstractRenderer.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/AbstractRenderer.ts rename to frameworks/angular/src/client/preview/angular-beta/AbstractRenderer.ts diff --git a/app/angular/src/client/preview/angular-beta/CanvasRenderer.ts b/frameworks/angular/src/client/preview/angular-beta/CanvasRenderer.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/CanvasRenderer.ts rename to frameworks/angular/src/client/preview/angular-beta/CanvasRenderer.ts diff --git a/app/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.test.ts b/frameworks/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.test.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.test.ts rename to frameworks/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.test.ts diff --git a/app/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.ts b/frameworks/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.ts rename to frameworks/angular/src/client/preview/angular-beta/ComputesTemplateFromComponent.ts diff --git a/app/angular/src/client/preview/angular-beta/DocsRenderer.ts b/frameworks/angular/src/client/preview/angular-beta/DocsRenderer.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/DocsRenderer.ts rename to frameworks/angular/src/client/preview/angular-beta/DocsRenderer.ts diff --git a/app/angular/src/client/preview/angular-beta/RendererFactory.test.ts b/frameworks/angular/src/client/preview/angular-beta/RendererFactory.test.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/RendererFactory.test.ts rename to frameworks/angular/src/client/preview/angular-beta/RendererFactory.test.ts diff --git a/app/angular/src/client/preview/angular-beta/RendererFactory.ts b/frameworks/angular/src/client/preview/angular-beta/RendererFactory.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/RendererFactory.ts rename to frameworks/angular/src/client/preview/angular-beta/RendererFactory.ts diff --git a/app/angular/src/client/preview/angular-beta/StorybookModule.test.ts b/frameworks/angular/src/client/preview/angular-beta/StorybookModule.test.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/StorybookModule.test.ts rename to frameworks/angular/src/client/preview/angular-beta/StorybookModule.test.ts diff --git a/app/angular/src/client/preview/angular-beta/StorybookModule.ts b/frameworks/angular/src/client/preview/angular-beta/StorybookModule.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/StorybookModule.ts rename to frameworks/angular/src/client/preview/angular-beta/StorybookModule.ts diff --git a/app/angular/src/client/preview/angular-beta/StorybookProvider.ts b/frameworks/angular/src/client/preview/angular-beta/StorybookProvider.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/StorybookProvider.ts rename to frameworks/angular/src/client/preview/angular-beta/StorybookProvider.ts diff --git a/app/angular/src/client/preview/angular-beta/StorybookWrapperComponent.ts b/frameworks/angular/src/client/preview/angular-beta/StorybookWrapperComponent.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/StorybookWrapperComponent.ts rename to frameworks/angular/src/client/preview/angular-beta/StorybookWrapperComponent.ts diff --git a/app/angular/src/client/preview/angular-beta/__testfixtures__/input.component.ts b/frameworks/angular/src/client/preview/angular-beta/__testfixtures__/input.component.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/__testfixtures__/input.component.ts rename to frameworks/angular/src/client/preview/angular-beta/__testfixtures__/input.component.ts diff --git a/app/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.test.ts b/frameworks/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.test.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.test.ts rename to frameworks/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.test.ts diff --git a/app/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.ts b/frameworks/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.ts rename to frameworks/angular/src/client/preview/angular-beta/utils/NgComponentAnalyzer.ts diff --git a/app/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.test.ts b/frameworks/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.test.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.test.ts rename to frameworks/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.test.ts diff --git a/app/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.ts b/frameworks/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.ts similarity index 100% rename from app/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.ts rename to frameworks/angular/src/client/preview/angular-beta/utils/NgModulesAnalyzer.ts diff --git a/app/angular/src/client/preview/angular-polyfills.ts b/frameworks/angular/src/client/preview/angular-polyfills.ts similarity index 100% rename from app/angular/src/client/preview/angular-polyfills.ts rename to frameworks/angular/src/client/preview/angular-polyfills.ts diff --git a/app/angular/src/client/preview/angular/app.token.ts b/frameworks/angular/src/client/preview/angular/app.token.ts similarity index 100% rename from app/angular/src/client/preview/angular/app.token.ts rename to frameworks/angular/src/client/preview/angular/app.token.ts diff --git a/app/angular/src/client/preview/angular/components/app.component.ts b/frameworks/angular/src/client/preview/angular/components/app.component.ts similarity index 100% rename from app/angular/src/client/preview/angular/components/app.component.ts rename to frameworks/angular/src/client/preview/angular/components/app.component.ts diff --git a/app/angular/src/client/preview/angular/helpers.ts b/frameworks/angular/src/client/preview/angular/helpers.ts similarity index 100% rename from app/angular/src/client/preview/angular/helpers.ts rename to frameworks/angular/src/client/preview/angular/helpers.ts diff --git a/app/angular/src/client/preview/config.ts b/frameworks/angular/src/client/preview/config.ts similarity index 100% rename from app/angular/src/client/preview/config.ts rename to frameworks/angular/src/client/preview/config.ts diff --git a/app/angular/src/client/preview/decorateStory.test.ts b/frameworks/angular/src/client/preview/decorateStory.test.ts similarity index 100% rename from app/angular/src/client/preview/decorateStory.test.ts rename to frameworks/angular/src/client/preview/decorateStory.test.ts diff --git a/app/angular/src/client/preview/decorateStory.ts b/frameworks/angular/src/client/preview/decorateStory.ts similarity index 100% rename from app/angular/src/client/preview/decorateStory.ts rename to frameworks/angular/src/client/preview/decorateStory.ts diff --git a/app/angular/src/client/preview/decorators.test.ts b/frameworks/angular/src/client/preview/decorators.test.ts similarity index 100% rename from app/angular/src/client/preview/decorators.test.ts rename to frameworks/angular/src/client/preview/decorators.test.ts diff --git a/app/angular/src/client/preview/decorators.ts b/frameworks/angular/src/client/preview/decorators.ts similarity index 100% rename from app/angular/src/client/preview/decorators.ts rename to frameworks/angular/src/client/preview/decorators.ts diff --git a/app/angular/src/client/preview/globals.ts b/frameworks/angular/src/client/preview/globals.ts similarity index 100% rename from app/angular/src/client/preview/globals.ts rename to frameworks/angular/src/client/preview/globals.ts diff --git a/app/angular/src/client/preview/index.ts b/frameworks/angular/src/client/preview/index.ts similarity index 100% rename from app/angular/src/client/preview/index.ts rename to frameworks/angular/src/client/preview/index.ts diff --git a/app/angular/src/client/preview/render.ts b/frameworks/angular/src/client/preview/render.ts similarity index 100% rename from app/angular/src/client/preview/render.ts rename to frameworks/angular/src/client/preview/render.ts diff --git a/app/angular/src/client/preview/types-6-0.ts b/frameworks/angular/src/client/preview/types-6-0.ts similarity index 100% rename from app/angular/src/client/preview/types-6-0.ts rename to frameworks/angular/src/client/preview/types-6-0.ts diff --git a/app/angular/src/client/preview/types-7-0.ts b/frameworks/angular/src/client/preview/types-7-0.ts similarity index 100% rename from app/angular/src/client/preview/types-7-0.ts rename to frameworks/angular/src/client/preview/types-7-0.ts diff --git a/app/angular/src/client/preview/types.ts b/frameworks/angular/src/client/preview/types.ts similarity index 100% rename from app/angular/src/client/preview/types.ts rename to frameworks/angular/src/client/preview/types.ts diff --git a/app/angular/src/public_api.ts b/frameworks/angular/src/public_api.ts similarity index 100% rename from app/angular/src/public_api.ts rename to frameworks/angular/src/public_api.ts diff --git a/app/angular/src/renderer.ts b/frameworks/angular/src/renderer.ts similarity index 100% rename from app/angular/src/renderer.ts rename to frameworks/angular/src/renderer.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/empty-projects-entry/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/empty-projects-entry/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/empty-projects-entry/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/empty-projects-entry/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/minimal-config/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/minimal-config/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/minimal-config/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/minimal-config/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/minimal-config/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/minimal-config/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/minimal-config/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/minimal-config/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/minimal-config/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/some-config/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/some-config/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/some-config/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/some-config/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/some-config/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/some-config/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/some-config/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/some-config/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/some-config/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/some-config/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/some-config/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/some-config/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/some-config/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/some-config/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/some-config/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/some-config/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/styles.css b/frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/styles.css similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/styles.css rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/styles.css diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-angularBrowserTarget/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-lib/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-lib/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/projects/pattern-lib/tsconfig.lib.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-lib/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-lib/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-lib/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/nx.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/nx.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/nx.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/nx.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.css b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.css similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.css rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.css diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.scss b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.scss similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.scss rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/styles.scss diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/workspace.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/workspace.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/workspace.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx-workspace/workspace.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/nx.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/nx.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/nx.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/nx.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.css b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.css similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.css rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.css diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.scss b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.scss similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.scss rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/styles.scss diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-nx/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-nx/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-nx/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-options-styles/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-options-styles/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.css b/frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.css similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.css rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.css diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.scss b/frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.scss similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.scss rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/styles.scss diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/with-options-styles/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/with-options-styles/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/with-options-styles/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-architect-build-options/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-architect-build-options/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-architect-build-options/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-architect-build-options/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-architect-build/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-architect-build/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-architect-build/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-architect-build/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-compatible-projects/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-compatible-projects/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-compatible-projects/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-compatible-projects/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/tsconfig.lib.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/tsconfig.lib.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/tsconfig.lib.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/projects/pattern-lib/tsconfig.lib.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-projects-entry/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-projects-entry/tsconfig.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/angular.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/angular.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/angular.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/angular.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/main.ts b/frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/main.ts similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/main.ts rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/main.ts diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/tsconfig.app.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/tsconfig.app.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/tsconfig.app.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/src/tsconfig.app.json diff --git a/app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/tsconfig.json b/frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/tsconfig.json similarity index 100% rename from app/angular/src/server/__mocks-ng-workspace__/without-tsConfig/tsconfig.json rename to frameworks/angular/src/server/__mocks-ng-workspace__/without-tsConfig/tsconfig.json diff --git a/app/angular/src/server/__tests__/angular.json b/frameworks/angular/src/server/__tests__/angular.json similarity index 100% rename from app/angular/src/server/__tests__/angular.json rename to frameworks/angular/src/server/__tests__/angular.json diff --git a/app/angular/src/server/__tests__/create-fork-ts-checker-plugin.test.ts b/frameworks/angular/src/server/__tests__/create-fork-ts-checker-plugin.test.ts similarity index 100% rename from app/angular/src/server/__tests__/create-fork-ts-checker-plugin.test.ts rename to frameworks/angular/src/server/__tests__/create-fork-ts-checker-plugin.test.ts diff --git a/app/angular/src/server/__tests__/ts_config.test.ts b/frameworks/angular/src/server/__tests__/ts_config.test.ts similarity index 100% rename from app/angular/src/server/__tests__/ts_config.test.ts rename to frameworks/angular/src/server/__tests__/ts_config.test.ts diff --git a/app/angular/src/server/angular-cli-webpack-12.2.x.d.ts b/frameworks/angular/src/server/angular-cli-webpack-12.2.x.d.ts similarity index 100% rename from app/angular/src/server/angular-cli-webpack-12.2.x.d.ts rename to frameworks/angular/src/server/angular-cli-webpack-12.2.x.d.ts diff --git a/app/angular/src/server/angular-cli-webpack-12.2.x.js b/frameworks/angular/src/server/angular-cli-webpack-12.2.x.js similarity index 100% rename from app/angular/src/server/angular-cli-webpack-12.2.x.js rename to frameworks/angular/src/server/angular-cli-webpack-12.2.x.js diff --git a/app/angular/src/server/angular-cli-webpack-13.x.x.d.ts b/frameworks/angular/src/server/angular-cli-webpack-13.x.x.d.ts similarity index 100% rename from app/angular/src/server/angular-cli-webpack-13.x.x.d.ts rename to frameworks/angular/src/server/angular-cli-webpack-13.x.x.d.ts diff --git a/app/angular/src/server/angular-cli-webpack-13.x.x.js b/frameworks/angular/src/server/angular-cli-webpack-13.x.x.js similarity index 100% rename from app/angular/src/server/angular-cli-webpack-13.x.x.js rename to frameworks/angular/src/server/angular-cli-webpack-13.x.x.js diff --git a/app/angular/src/server/angular-cli-webpack-older.ts b/frameworks/angular/src/server/angular-cli-webpack-older.ts similarity index 100% rename from app/angular/src/server/angular-cli-webpack-older.ts rename to frameworks/angular/src/server/angular-cli-webpack-older.ts diff --git a/app/angular/src/server/angular-devkit-build-webpack.ts b/frameworks/angular/src/server/angular-devkit-build-webpack.ts similarity index 100% rename from app/angular/src/server/angular-devkit-build-webpack.ts rename to frameworks/angular/src/server/angular-devkit-build-webpack.ts diff --git a/app/angular/src/server/angular-read-workspace.ts b/frameworks/angular/src/server/angular-read-workspace.ts similarity index 100% rename from app/angular/src/server/angular-read-workspace.ts rename to frameworks/angular/src/server/angular-read-workspace.ts diff --git a/app/angular/src/server/create-fork-ts-checker-plugin.ts b/frameworks/angular/src/server/create-fork-ts-checker-plugin.ts similarity index 100% rename from app/angular/src/server/create-fork-ts-checker-plugin.ts rename to frameworks/angular/src/server/create-fork-ts-checker-plugin.ts diff --git a/app/angular/src/server/framework-preset-angular-cli.test.ts b/frameworks/angular/src/server/framework-preset-angular-cli.test.ts similarity index 100% rename from app/angular/src/server/framework-preset-angular-cli.test.ts rename to frameworks/angular/src/server/framework-preset-angular-cli.test.ts diff --git a/app/angular/src/server/framework-preset-angular-cli.ts b/frameworks/angular/src/server/framework-preset-angular-cli.ts similarity index 100% rename from app/angular/src/server/framework-preset-angular-cli.ts rename to frameworks/angular/src/server/framework-preset-angular-cli.ts diff --git a/app/angular/src/server/framework-preset-angular-docs.ts b/frameworks/angular/src/server/framework-preset-angular-docs.ts similarity index 100% rename from app/angular/src/server/framework-preset-angular-docs.ts rename to frameworks/angular/src/server/framework-preset-angular-docs.ts diff --git a/app/angular/src/server/framework-preset-angular-ivy.ts b/frameworks/angular/src/server/framework-preset-angular-ivy.ts similarity index 100% rename from app/angular/src/server/framework-preset-angular-ivy.ts rename to frameworks/angular/src/server/framework-preset-angular-ivy.ts diff --git a/app/angular/src/server/framework-preset-angular.ts b/frameworks/angular/src/server/framework-preset-angular.ts similarity index 100% rename from app/angular/src/server/framework-preset-angular.ts rename to frameworks/angular/src/server/framework-preset-angular.ts diff --git a/app/angular/src/server/ngx-template-loader/index.ts b/frameworks/angular/src/server/ngx-template-loader/index.ts similarity index 100% rename from app/angular/src/server/ngx-template-loader/index.ts rename to frameworks/angular/src/server/ngx-template-loader/index.ts diff --git a/app/angular/src/server/preset-options.ts b/frameworks/angular/src/server/preset-options.ts similarity index 100% rename from app/angular/src/server/preset-options.ts rename to frameworks/angular/src/server/preset-options.ts diff --git a/app/angular/src/server/preset.ts b/frameworks/angular/src/server/preset.ts similarity index 100% rename from app/angular/src/server/preset.ts rename to frameworks/angular/src/server/preset.ts diff --git a/app/angular/src/server/ts_config.ts b/frameworks/angular/src/server/ts_config.ts similarity index 100% rename from app/angular/src/server/ts_config.ts rename to frameworks/angular/src/server/ts_config.ts diff --git a/app/angular/src/server/utils/filter-out-styling-rules.ts b/frameworks/angular/src/server/utils/filter-out-styling-rules.ts similarity index 100% rename from app/angular/src/server/utils/filter-out-styling-rules.ts rename to frameworks/angular/src/server/utils/filter-out-styling-rules.ts diff --git a/app/angular/src/server/utils/module-is-available.ts b/frameworks/angular/src/server/utils/module-is-available.ts similarity index 100% rename from app/angular/src/server/utils/module-is-available.ts rename to frameworks/angular/src/server/utils/module-is-available.ts diff --git a/app/angular/src/server/utils/normalize-asset-patterns.ts b/frameworks/angular/src/server/utils/normalize-asset-patterns.ts similarity index 100% rename from app/angular/src/server/utils/normalize-asset-patterns.ts rename to frameworks/angular/src/server/utils/normalize-asset-patterns.ts diff --git a/app/angular/src/server/utils/normalize-optimization.ts b/frameworks/angular/src/server/utils/normalize-optimization.ts similarity index 100% rename from app/angular/src/server/utils/normalize-optimization.ts rename to frameworks/angular/src/server/utils/normalize-optimization.ts diff --git a/app/angular/src/types/index.ts b/frameworks/angular/src/types/index.ts similarity index 100% rename from app/angular/src/types/index.ts rename to frameworks/angular/src/types/index.ts diff --git a/app/angular/src/typings.d.ts b/frameworks/angular/src/typings.d.ts similarity index 100% rename from app/angular/src/typings.d.ts rename to frameworks/angular/src/typings.d.ts diff --git a/app/angular/standalone.d.ts b/frameworks/angular/standalone.d.ts similarity index 100% rename from app/angular/standalone.d.ts rename to frameworks/angular/standalone.d.ts diff --git a/app/angular/standalone.js b/frameworks/angular/standalone.js similarity index 100% rename from app/angular/standalone.js rename to frameworks/angular/standalone.js diff --git a/app/angular/tsconfig.json b/frameworks/angular/tsconfig.json similarity index 100% rename from app/angular/tsconfig.json rename to frameworks/angular/tsconfig.json diff --git a/app/angular/tsconfig.spec.json b/frameworks/angular/tsconfig.spec.json similarity index 100% rename from app/angular/tsconfig.spec.json rename to frameworks/angular/tsconfig.spec.json diff --git a/app/angular/types-6-0.d.ts b/frameworks/angular/types-6-0.d.ts similarity index 100% rename from app/angular/types-6-0.d.ts rename to frameworks/angular/types-6-0.d.ts diff --git a/app/angular/types-7-0.d.ts b/frameworks/angular/types-7-0.d.ts similarity index 100% rename from app/angular/types-7-0.d.ts rename to frameworks/angular/types-7-0.d.ts diff --git a/app/ember/README.md b/frameworks/ember/README.md similarity index 100% rename from app/ember/README.md rename to frameworks/ember/README.md diff --git a/app/ember/package.json b/frameworks/ember/package.json similarity index 96% rename from app/ember/package.json rename to frameworks/ember/package.json index a582dd0be660..9016fca871fe 100644 --- a/app/ember/package.json +++ b/frameworks/ember/package.json @@ -2,14 +2,14 @@ "name": "@storybook/ember", "version": "6.5.0-beta.4", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/ember", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/ember", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/ember" + "directory": "frameworks/ember" }, "funding": { "type": "opencollective", diff --git a/app/ember/preset.js b/frameworks/ember/preset.js similarity index 100% rename from app/ember/preset.js rename to frameworks/ember/preset.js diff --git a/app/ember/src/client/docs/config.js b/frameworks/ember/src/client/docs/config.js similarity index 100% rename from app/ember/src/client/docs/config.js rename to frameworks/ember/src/client/docs/config.js diff --git a/app/ember/src/client/docs/index.js b/frameworks/ember/src/client/docs/index.js similarity index 100% rename from app/ember/src/client/docs/index.js rename to frameworks/ember/src/client/docs/index.js diff --git a/app/ember/src/client/docs/jsondoc.js b/frameworks/ember/src/client/docs/jsondoc.js similarity index 100% rename from app/ember/src/client/docs/jsondoc.js rename to frameworks/ember/src/client/docs/jsondoc.js diff --git a/app/ember/src/client/index.ts b/frameworks/ember/src/client/index.ts similarity index 100% rename from app/ember/src/client/index.ts rename to frameworks/ember/src/client/index.ts diff --git a/app/ember/src/client/preview/config.ts b/frameworks/ember/src/client/preview/config.ts similarity index 100% rename from app/ember/src/client/preview/config.ts rename to frameworks/ember/src/client/preview/config.ts diff --git a/app/ember/src/client/preview/docs/config.js b/frameworks/ember/src/client/preview/docs/config.js similarity index 100% rename from app/ember/src/client/preview/docs/config.js rename to frameworks/ember/src/client/preview/docs/config.js diff --git a/app/ember/src/client/preview/docs/index.js b/frameworks/ember/src/client/preview/docs/index.js similarity index 100% rename from app/ember/src/client/preview/docs/index.js rename to frameworks/ember/src/client/preview/docs/index.js diff --git a/app/ember/src/client/preview/docs/jsondoc.js b/frameworks/ember/src/client/preview/docs/jsondoc.js similarity index 100% rename from app/ember/src/client/preview/docs/jsondoc.js rename to frameworks/ember/src/client/preview/docs/jsondoc.js diff --git a/app/ember/src/client/preview/globals.ts b/frameworks/ember/src/client/preview/globals.ts similarity index 100% rename from app/ember/src/client/preview/globals.ts rename to frameworks/ember/src/client/preview/globals.ts diff --git a/app/ember/src/client/preview/index.ts b/frameworks/ember/src/client/preview/index.ts similarity index 100% rename from app/ember/src/client/preview/index.ts rename to frameworks/ember/src/client/preview/index.ts diff --git a/app/ember/src/client/preview/render.ts b/frameworks/ember/src/client/preview/render.ts similarity index 100% rename from app/ember/src/client/preview/render.ts rename to frameworks/ember/src/client/preview/render.ts diff --git a/app/ember/src/client/preview/types.ts b/frameworks/ember/src/client/preview/types.ts similarity index 100% rename from app/ember/src/client/preview/types.ts rename to frameworks/ember/src/client/preview/types.ts diff --git a/app/ember/src/server/framework-preset-babel-ember.ts b/frameworks/ember/src/server/framework-preset-babel-ember.ts similarity index 100% rename from app/ember/src/server/framework-preset-babel-ember.ts rename to frameworks/ember/src/server/framework-preset-babel-ember.ts diff --git a/app/ember/src/server/framework-preset-ember-docs.ts b/frameworks/ember/src/server/framework-preset-ember-docs.ts similarity index 100% rename from app/ember/src/server/framework-preset-ember-docs.ts rename to frameworks/ember/src/server/framework-preset-ember-docs.ts diff --git a/app/ember/src/server/preset.ts b/frameworks/ember/src/server/preset.ts similarity index 100% rename from app/ember/src/server/preset.ts rename to frameworks/ember/src/server/preset.ts diff --git a/app/ember/src/typings.d.ts b/frameworks/ember/src/typings.d.ts similarity index 100% rename from app/ember/src/typings.d.ts rename to frameworks/ember/src/typings.d.ts diff --git a/app/ember/standalone.js b/frameworks/ember/standalone.js similarity index 100% rename from app/ember/standalone.js rename to frameworks/ember/standalone.js diff --git a/app/ember/tsconfig.json b/frameworks/ember/tsconfig.json similarity index 100% rename from app/ember/tsconfig.json rename to frameworks/ember/tsconfig.json diff --git a/app/html/README.md b/frameworks/html-webpack4/README.md similarity index 100% rename from app/html/README.md rename to frameworks/html-webpack4/README.md diff --git a/app/html/package.json b/frameworks/html-webpack4/package.json similarity index 90% rename from app/html/package.json rename to frameworks/html-webpack4/package.json index 17941f5908cf..d5ddb7b0a001 100644 --- a/app/html/package.json +++ b/frameworks/html-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/html", + "name": "@storybook/html-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/html", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/html-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/html" + "directory": "frameworks/html-webpack4" }, "funding": { "type": "opencollective", @@ -41,8 +41,8 @@ "dependencies": { "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", + "@storybook/html": "6.5.0-beta.4", "@storybook/preset-html-webpack": "6.5.0-beta.4", - "@storybook/renderer-html": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "global": "^4.4.0", diff --git a/app/html/preset.js b/frameworks/html-webpack4/preset.js similarity index 100% rename from app/html/preset.js rename to frameworks/html-webpack4/preset.js diff --git a/frameworks/html-webpack4/src/client/index.ts b/frameworks/html-webpack4/src/client/index.ts new file mode 100644 index 000000000000..512c806bd022 --- /dev/null +++ b/frameworks/html-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/html'; diff --git a/app/html/src/server/preset.ts b/frameworks/html-webpack4/src/server/preset.ts similarity index 83% rename from app/html/src/server/preset.ts rename to frameworks/html-webpack4/src/server/preset.ts index 3948e2714a72..f48ea7d0f6b1 100644 --- a/app/html/src/server/preset.ts +++ b/frameworks/html-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-html-webpack', - '@storybook/renderer-html', + '@storybook/html', ]; diff --git a/app/html/src/typings.d.ts b/frameworks/html-webpack4/src/typings.d.ts similarity index 100% rename from app/html/src/typings.d.ts rename to frameworks/html-webpack4/src/typings.d.ts diff --git a/app/html/standalone.js b/frameworks/html-webpack4/standalone.js similarity index 100% rename from app/html/standalone.js rename to frameworks/html-webpack4/standalone.js diff --git a/app/html/tsconfig.json b/frameworks/html-webpack4/tsconfig.json similarity index 100% rename from app/html/tsconfig.json rename to frameworks/html-webpack4/tsconfig.json diff --git a/app/html/types-7-0.d.ts b/frameworks/html-webpack4/types-7-0.d.ts similarity index 100% rename from app/html/types-7-0.d.ts rename to frameworks/html-webpack4/types-7-0.d.ts diff --git a/app/preact/README.md b/frameworks/preact-webpack4/README.md similarity index 100% rename from app/preact/README.md rename to frameworks/preact-webpack4/README.md diff --git a/app/preact/package.json b/frameworks/preact-webpack4/package.json similarity index 90% rename from app/preact/package.json rename to frameworks/preact-webpack4/package.json index 1d744f1cb2a6..6437c63edb8a 100644 --- a/app/preact/package.json +++ b/frameworks/preact-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/preact", + "name": "@storybook/preact-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/preact", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/preact-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/preact" + "directory": "frameworks/preact-webpack4" }, "funding": { "type": "opencollective", @@ -41,8 +41,8 @@ "dependencies": { "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", + "@storybook/preact": "6.5.0-beta.4", "@storybook/preset-preact-webpack": "6.5.0-beta.4", - "@storybook/renderer-preact": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "react": "16.14.0", diff --git a/app/preact/preset.js b/frameworks/preact-webpack4/preset.js similarity index 100% rename from app/preact/preset.js rename to frameworks/preact-webpack4/preset.js diff --git a/frameworks/preact-webpack4/src/client/index.ts b/frameworks/preact-webpack4/src/client/index.ts new file mode 100644 index 000000000000..6b5d05231731 --- /dev/null +++ b/frameworks/preact-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/preact'; diff --git a/app/preact/src/server/preset.ts b/frameworks/preact-webpack4/src/server/preset.ts similarity index 82% rename from app/preact/src/server/preset.ts rename to frameworks/preact-webpack4/src/server/preset.ts index 43a2056fea79..4d782484e0af 100644 --- a/app/preact/src/server/preset.ts +++ b/frameworks/preact-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-preact-webpack', - '@storybook/renderer-preact', + '@storybook/preact', ]; diff --git a/app/preact/src/typings.d.ts b/frameworks/preact-webpack4/src/typings.d.ts similarity index 100% rename from app/preact/src/typings.d.ts rename to frameworks/preact-webpack4/src/typings.d.ts diff --git a/app/preact/standalone.js b/frameworks/preact-webpack4/standalone.js similarity index 100% rename from app/preact/standalone.js rename to frameworks/preact-webpack4/standalone.js diff --git a/app/preact/tsconfig.json b/frameworks/preact-webpack4/tsconfig.json similarity index 100% rename from app/preact/tsconfig.json rename to frameworks/preact-webpack4/tsconfig.json diff --git a/app/preact/types-6-0.d.ts b/frameworks/preact-webpack4/types-6-0.d.ts similarity index 100% rename from app/preact/types-6-0.d.ts rename to frameworks/preact-webpack4/types-6-0.d.ts diff --git a/app/preact/types-7-0.d.ts b/frameworks/preact-webpack4/types-7-0.d.ts similarity index 100% rename from app/preact/types-7-0.d.ts rename to frameworks/preact-webpack4/types-7-0.d.ts diff --git a/app/react/README.md b/frameworks/react-webpack4/README.md similarity index 100% rename from app/react/README.md rename to frameworks/react-webpack4/README.md diff --git a/app/react/package.json b/frameworks/react-webpack4/package.json similarity index 90% rename from app/react/package.json rename to frameworks/react-webpack4/package.json index a70ae12252c6..ed792f995824 100644 --- a/app/react/package.json +++ b/frameworks/react-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/react", + "name": "@storybook/react-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/react", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/react-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/react" + "directory": "frameworks/react-webpack4" }, "funding": { "type": "opencollective", @@ -40,10 +40,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", "@storybook/preset-react-webpack": "6.5.0-beta.4", - "@storybook/renderer-react": "6.5.0-beta.4", + "@storybook/react": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "regenerator-runtime": "^0.13.7" diff --git a/app/react/preset.js b/frameworks/react-webpack4/preset.js similarity index 100% rename from app/react/preset.js rename to frameworks/react-webpack4/preset.js diff --git a/frameworks/react-webpack4/src/client/index.ts b/frameworks/react-webpack4/src/client/index.ts new file mode 100644 index 000000000000..da28051ed337 --- /dev/null +++ b/frameworks/react-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/react'; diff --git a/frameworks/react-webpack4/src/server/preset.ts b/frameworks/react-webpack4/src/server/preset.ts new file mode 100644 index 000000000000..5596e6e5200a --- /dev/null +++ b/frameworks/react-webpack4/src/server/preset.ts @@ -0,0 +1,6 @@ +import type { StorybookConfig } from '@storybook/preset-react-webpack'; + +export const addons: StorybookConfig['addons'] = [ + '@storybook/preset-react-webpack', + '@storybook/react', +]; diff --git a/frameworks/react-webpack4/src/types.ts b/frameworks/react-webpack4/src/types.ts new file mode 100644 index 000000000000..1a146fa460d4 --- /dev/null +++ b/frameworks/react-webpack4/src/types.ts @@ -0,0 +1,49 @@ +import type ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; +import type { Configuration } from 'webpack'; + +import type { StorybookConfig as BaseStorybookConfig } from '@storybook/preset-react-webpack'; + +export type { BuilderResult } from '@storybook/preset-react-webpack'; + +/** + * Options for TypeScript usage within Storybook. + */ +export type TypescriptOptions = BaseStorybookConfig['typescript'] & { + /** + * Configures `fork-ts-checker-webpack-plugin` + */ + checkOptions: ForkTsCheckerWebpackPlugin['options']; +}; + +export interface StorybookTypescriptConfig { + typescript?: Partial; +} + +export interface ReactOptions { + fastRefresh?: boolean; + strictMode?: boolean; + /** + * Use React's legacy root API to mount components + * @description + * React has introduced a new root API with React 18.x to enable a whole set of new features (e.g. concurrent features) + * If this flag is true, the legacy Root API is used to mount components to make it easier to migrate step by step to React 18. + * @default false + */ + legacyRootApi?: boolean; +} + +export interface StorybookReactConfig { + framework: + | string + | { + name: '@storybook/react'; + options: ReactOptions; + }; +} + +/** + * The interface for Storybook configuration in `main.ts` files. + */ +export type StorybookConfig = BaseStorybookConfig & + StorybookReactConfig & + StorybookTypescriptConfig; diff --git a/app/react/src/typings.d.ts b/frameworks/react-webpack4/src/typings.d.ts similarity index 100% rename from app/react/src/typings.d.ts rename to frameworks/react-webpack4/src/typings.d.ts diff --git a/app/react/standalone.js b/frameworks/react-webpack4/standalone.js similarity index 100% rename from app/react/standalone.js rename to frameworks/react-webpack4/standalone.js diff --git a/app/react/tsconfig.json b/frameworks/react-webpack4/tsconfig.json similarity index 100% rename from app/react/tsconfig.json rename to frameworks/react-webpack4/tsconfig.json diff --git a/app/react/types-6-0.d.ts b/frameworks/react-webpack4/types-6-0.d.ts similarity index 100% rename from app/react/types-6-0.d.ts rename to frameworks/react-webpack4/types-6-0.d.ts diff --git a/app/react/types-7-0.d.ts b/frameworks/react-webpack4/types-7-0.d.ts similarity index 100% rename from app/react/types-7-0.d.ts rename to frameworks/react-webpack4/types-7-0.d.ts diff --git a/app/react/types.d.ts b/frameworks/react-webpack4/types.d.ts similarity index 100% rename from app/react/types.d.ts rename to frameworks/react-webpack4/types.d.ts diff --git a/app/server/README.md b/frameworks/server-webpack4/README.md similarity index 100% rename from app/server/README.md rename to frameworks/server-webpack4/README.md diff --git a/app/server/package.json b/frameworks/server-webpack4/package.json similarity index 89% rename from app/server/package.json rename to frameworks/server-webpack4/package.json index 8066421344b4..4aca55317f6f 100644 --- a/app/server/package.json +++ b/frameworks/server-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/server", + "name": "@storybook/server-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/server", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/server-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/server" + "directory": "frameworks/server-webpack4" }, "funding": { "type": "opencollective", @@ -42,7 +42,7 @@ "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", "@storybook/preset-server-webpack": "6.5.0-beta.4", - "@storybook/renderer-server": "6.5.0-beta.4", + "@storybook/server": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "react": "16.14.0", diff --git a/app/server/preset.js b/frameworks/server-webpack4/preset.js similarity index 100% rename from app/server/preset.js rename to frameworks/server-webpack4/preset.js diff --git a/frameworks/server-webpack4/src/client/index.ts b/frameworks/server-webpack4/src/client/index.ts new file mode 100644 index 000000000000..39e64100851f --- /dev/null +++ b/frameworks/server-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/server'; diff --git a/app/server/src/server/preset.ts b/frameworks/server-webpack4/src/server/preset.ts similarity index 82% rename from app/server/src/server/preset.ts rename to frameworks/server-webpack4/src/server/preset.ts index cfdc2240edfe..1c58e0ef6e0a 100644 --- a/app/server/src/server/preset.ts +++ b/frameworks/server-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-server-webpack', - '@storybook/renderer-server', + '@storybook/server', ]; diff --git a/app/server/standalone.js b/frameworks/server-webpack4/standalone.js similarity index 100% rename from app/server/standalone.js rename to frameworks/server-webpack4/standalone.js diff --git a/app/server/tsconfig.json b/frameworks/server-webpack4/tsconfig.json similarity index 100% rename from app/server/tsconfig.json rename to frameworks/server-webpack4/tsconfig.json diff --git a/app/standalone.test.ts b/frameworks/standalone.test.ts similarity index 71% rename from app/standalone.test.ts rename to frameworks/standalone.test.ts index cc4d74af969c..beacd021e0f0 100644 --- a/app/standalone.test.ts +++ b/frameworks/standalone.test.ts @@ -5,14 +5,14 @@ jest.mock('@storybook/core-server/standalone'); describe.each([ ['angular'], ['ember'], - ['html'], - ['preact'], - ['react'], - ['server'], - ['svelte'], - ['vue'], - ['vue3'], - ['web-components'], + ['html-webpack4'], + ['preact-webpack4'], + ['react-webpack4'], + ['server-webpack4'], + ['svelte-webpack4'], + ['vue-webpack4'], + ['vue3-webpack4'], + ['web-components-webpack4'], ])('%s', (app) => { it('should run standalone', async () => { // eslint-disable-next-line import/no-dynamic-require, global-require diff --git a/app/svelte/README.md b/frameworks/svelte-webpack4/README.md similarity index 100% rename from app/svelte/README.md rename to frameworks/svelte-webpack4/README.md diff --git a/app/svelte/package.json b/frameworks/svelte-webpack4/package.json similarity index 90% rename from app/svelte/package.json rename to frameworks/svelte-webpack4/package.json index 02cf2e9ecbce..1194d067558c 100644 --- a/app/svelte/package.json +++ b/frameworks/svelte-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/svelte", + "name": "@storybook/svelte-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/svelte", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/svelte-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/svelte" + "directory": "frameworks/svelte-webpack4" }, "funding": { "type": "opencollective", @@ -43,7 +43,7 @@ "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", "@storybook/preset-svelte-webpack": "6.5.0-beta.4", - "@storybook/renderer-svelte": "6.5.0-beta.4", + "@storybook/svelte": "6.5.0-beta.4", "core-js": "^3.8.2", "react": "16.14.0", "react-dom": "16.14.0", diff --git a/app/svelte/preset.js b/frameworks/svelte-webpack4/preset.js similarity index 100% rename from app/svelte/preset.js rename to frameworks/svelte-webpack4/preset.js diff --git a/frameworks/svelte-webpack4/src/client/index.ts b/frameworks/svelte-webpack4/src/client/index.ts new file mode 100644 index 000000000000..8c3b8d3c0b7b --- /dev/null +++ b/frameworks/svelte-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/svelte'; diff --git a/app/svelte/src/server/preset.ts b/frameworks/svelte-webpack4/src/server/preset.ts similarity index 82% rename from app/svelte/src/server/preset.ts rename to frameworks/svelte-webpack4/src/server/preset.ts index 24963e348ea4..ed3eb7826601 100644 --- a/app/svelte/src/server/preset.ts +++ b/frameworks/svelte-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-svelte-webpack', - '@storybook/renderer-svelte', + '@storybook/svelte', ]; diff --git a/app/svelte/src/typings.d.ts b/frameworks/svelte-webpack4/src/typings.d.ts similarity index 100% rename from app/svelte/src/typings.d.ts rename to frameworks/svelte-webpack4/src/typings.d.ts diff --git a/app/svelte/standalone.js b/frameworks/svelte-webpack4/standalone.js similarity index 100% rename from app/svelte/standalone.js rename to frameworks/svelte-webpack4/standalone.js diff --git a/app/svelte/templates/HOC.svelte b/frameworks/svelte-webpack4/templates/HOC.svelte similarity index 100% rename from app/svelte/templates/HOC.svelte rename to frameworks/svelte-webpack4/templates/HOC.svelte diff --git a/app/svelte/templates/PreviewRender.svelte b/frameworks/svelte-webpack4/templates/PreviewRender.svelte similarity index 100% rename from app/svelte/templates/PreviewRender.svelte rename to frameworks/svelte-webpack4/templates/PreviewRender.svelte diff --git a/app/svelte/templates/SlotDecorator.svelte b/frameworks/svelte-webpack4/templates/SlotDecorator.svelte similarity index 100% rename from app/svelte/templates/SlotDecorator.svelte rename to frameworks/svelte-webpack4/templates/SlotDecorator.svelte diff --git a/app/svelte/tsconfig.json b/frameworks/svelte-webpack4/tsconfig.json similarity index 100% rename from app/svelte/tsconfig.json rename to frameworks/svelte-webpack4/tsconfig.json diff --git a/app/vue/README.md b/frameworks/vue-webpack4/README.md similarity index 100% rename from app/vue/README.md rename to frameworks/vue-webpack4/README.md diff --git a/app/vue/package.json b/frameworks/vue-webpack4/package.json similarity index 92% rename from app/vue/package.json rename to frameworks/vue-webpack4/package.json index 0401f150273a..5c666a569fc8 100644 --- a/app/vue/package.json +++ b/frameworks/vue-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/vue", + "name": "@storybook/vue-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/vue", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/vue-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/vue" + "directory": "frameworks/vue-webpack4" }, "funding": { "type": "opencollective", @@ -42,7 +42,7 @@ "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", "@storybook/preset-vue-webpack": "6.5.0-beta.4", - "@storybook/renderer-vue": "6.5.0-beta.4", + "@storybook/vue": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "react": "16.14.0", diff --git a/app/vue/preset.js b/frameworks/vue-webpack4/preset.js similarity index 100% rename from app/vue/preset.js rename to frameworks/vue-webpack4/preset.js diff --git a/frameworks/vue-webpack4/src/client/index.ts b/frameworks/vue-webpack4/src/client/index.ts new file mode 100644 index 000000000000..12ce4f50a71a --- /dev/null +++ b/frameworks/vue-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/vue'; diff --git a/app/vue/src/server/preset.ts b/frameworks/vue-webpack4/src/server/preset.ts similarity index 84% rename from app/vue/src/server/preset.ts rename to frameworks/vue-webpack4/src/server/preset.ts index e84e659d4dfa..5f8b8ed7022c 100644 --- a/app/vue/src/server/preset.ts +++ b/frameworks/vue-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-vue-webpack', - '@storybook/renderer-vue', + '@storybook/vue', ]; diff --git a/app/vue/src/typings.d.ts b/frameworks/vue-webpack4/src/typings.d.ts similarity index 100% rename from app/vue/src/typings.d.ts rename to frameworks/vue-webpack4/src/typings.d.ts diff --git a/app/vue/standalone.js b/frameworks/vue-webpack4/standalone.js similarity index 100% rename from app/vue/standalone.js rename to frameworks/vue-webpack4/standalone.js diff --git a/app/vue/tsconfig.json b/frameworks/vue-webpack4/tsconfig.json similarity index 100% rename from app/vue/tsconfig.json rename to frameworks/vue-webpack4/tsconfig.json diff --git a/app/vue/types-6-0.d.ts b/frameworks/vue-webpack4/types-6-0.d.ts similarity index 100% rename from app/vue/types-6-0.d.ts rename to frameworks/vue-webpack4/types-6-0.d.ts diff --git a/app/vue/types-7-0.d.ts b/frameworks/vue-webpack4/types-7-0.d.ts similarity index 100% rename from app/vue/types-7-0.d.ts rename to frameworks/vue-webpack4/types-7-0.d.ts diff --git a/app/vue3/README.md b/frameworks/vue3-webpack4/README.md similarity index 100% rename from app/vue3/README.md rename to frameworks/vue3-webpack4/README.md diff --git a/app/vue3/package.json b/frameworks/vue3-webpack4/package.json similarity index 91% rename from app/vue3/package.json rename to frameworks/vue3-webpack4/package.json index 281573c016fe..475df01effd6 100644 --- a/app/vue3/package.json +++ b/frameworks/vue3-webpack4/package.json @@ -1,18 +1,18 @@ { - "name": "@storybook/vue3", + "name": "@storybook/vue3-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/vue3", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/vue3-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/vue3" + "directory": "frameworks/vue3-webpack4" }, "funding": { "type": "opencollective", @@ -42,7 +42,7 @@ "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", "@storybook/preset-vue3-webpack": "6.5.0-beta.4", - "@storybook/renderer-vue3": "6.5.0-beta.4", + "@storybook/vue3": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "react": "16.14.0", diff --git a/app/vue3/preset.js b/frameworks/vue3-webpack4/preset.js similarity index 100% rename from app/vue3/preset.js rename to frameworks/vue3-webpack4/preset.js diff --git a/frameworks/vue3-webpack4/src/client/index.ts b/frameworks/vue3-webpack4/src/client/index.ts new file mode 100644 index 000000000000..cf9a0c07e407 --- /dev/null +++ b/frameworks/vue3-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/vue3'; diff --git a/app/vue3/src/server/preset.ts b/frameworks/vue3-webpack4/src/server/preset.ts similarity index 83% rename from app/vue3/src/server/preset.ts rename to frameworks/vue3-webpack4/src/server/preset.ts index 8a5a7d6630a3..59376fe7aebd 100644 --- a/app/vue3/src/server/preset.ts +++ b/frameworks/vue3-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-vue3-webpack', - '@storybook/renderer-vue3', + '@storybook/vue3', ]; diff --git a/app/vue3/src/typings.d.ts b/frameworks/vue3-webpack4/src/typings.d.ts similarity index 100% rename from app/vue3/src/typings.d.ts rename to frameworks/vue3-webpack4/src/typings.d.ts diff --git a/app/vue3/standalone.js b/frameworks/vue3-webpack4/standalone.js similarity index 100% rename from app/vue3/standalone.js rename to frameworks/vue3-webpack4/standalone.js diff --git a/app/vue3/tsconfig.json b/frameworks/vue3-webpack4/tsconfig.json similarity index 100% rename from app/vue3/tsconfig.json rename to frameworks/vue3-webpack4/tsconfig.json diff --git a/app/vue3/types-6-0.d.ts b/frameworks/vue3-webpack4/types-6-0.d.ts similarity index 100% rename from app/vue3/types-6-0.d.ts rename to frameworks/vue3-webpack4/types-6-0.d.ts diff --git a/app/vue3/types-7-0.d.ts b/frameworks/vue3-webpack4/types-7-0.d.ts similarity index 100% rename from app/vue3/types-7-0.d.ts rename to frameworks/vue3-webpack4/types-7-0.d.ts diff --git a/app/web-components/README.md b/frameworks/web-components-webpack4/README.md similarity index 100% rename from app/web-components/README.md rename to frameworks/web-components-webpack4/README.md diff --git a/app/web-components/package.json b/frameworks/web-components-webpack4/package.json similarity index 89% rename from app/web-components/package.json rename to frameworks/web-components-webpack4/package.json index 9264f8ef1737..56cbfb56483e 100644 --- a/app/web-components/package.json +++ b/frameworks/web-components-webpack4/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/web-components", + "name": "@storybook/web-components-webpack4", "version": "6.5.0-beta.4", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ @@ -7,14 +7,14 @@ "storybook", "web-components" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/app/web-components", + "homepage": "https://github.com/storybookjs/storybook/tree/main/frameworks/web-components-webpack4", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "app/web-components" + "directory": "frameworks/web-components-webpack4" }, "funding": { "type": "opencollective", @@ -45,7 +45,7 @@ "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", "@storybook/preset-web-components-webpack": "6.5.0-beta.4", - "@storybook/renderer-web-components": "6.5.0-beta.4", + "@storybook/web-components": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "react": "16.14.0", diff --git a/app/web-components/preset.js b/frameworks/web-components-webpack4/preset.js similarity index 100% rename from app/web-components/preset.js rename to frameworks/web-components-webpack4/preset.js diff --git a/frameworks/web-components-webpack4/src/client/index.ts b/frameworks/web-components-webpack4/src/client/index.ts new file mode 100644 index 000000000000..9d1e091abcc8 --- /dev/null +++ b/frameworks/web-components-webpack4/src/client/index.ts @@ -0,0 +1 @@ +export * from '@storybook/web-components'; diff --git a/app/web-components/src/server/preset.ts b/frameworks/web-components-webpack4/src/server/preset.ts similarity index 80% rename from app/web-components/src/server/preset.ts rename to frameworks/web-components-webpack4/src/server/preset.ts index 1becb388a33b..c569c24c0367 100644 --- a/app/web-components/src/server/preset.ts +++ b/frameworks/web-components-webpack4/src/server/preset.ts @@ -2,5 +2,5 @@ import type { StorybookConfig } from '@storybook/core-common'; export const addons: StorybookConfig['addons'] = [ '@storybook/preset-web-components-webpack', - '@storybook/renderer-web-components', + '@storybook/web-components', ]; diff --git a/app/web-components/src/typings.d.ts b/frameworks/web-components-webpack4/src/typings.d.ts similarity index 100% rename from app/web-components/src/typings.d.ts rename to frameworks/web-components-webpack4/src/typings.d.ts diff --git a/app/web-components/standalone.js b/frameworks/web-components-webpack4/standalone.js similarity index 100% rename from app/web-components/standalone.js rename to frameworks/web-components-webpack4/standalone.js diff --git a/app/web-components/tsconfig.json b/frameworks/web-components-webpack4/tsconfig.json similarity index 100% rename from app/web-components/tsconfig.json rename to frameworks/web-components-webpack4/tsconfig.json diff --git a/app/web-components/types-6-0.d.ts b/frameworks/web-components-webpack4/types-6-0.d.ts similarity index 100% rename from app/web-components/types-6-0.d.ts rename to frameworks/web-components-webpack4/types-6-0.d.ts diff --git a/app/web-components/types-7-0.d.ts b/frameworks/web-components-webpack4/types-7-0.d.ts similarity index 100% rename from app/web-components/types-7-0.d.ts rename to frameworks/web-components-webpack4/types-7-0.d.ts diff --git a/jest.config.js b/jest.config.js index 4217cf3638d6..297fceb6e24c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -40,7 +40,7 @@ module.exports = { ], roots: [ '/addons', - '/app', + '/frameworks', '/lib', '/examples/official-storybook', '/examples/react-ts', @@ -57,14 +57,14 @@ module.exports = { '/dist/', '/prebuilt/', 'addon-jest.test.js', - '/app/angular/*', + '/frameworks/angular/*', '/examples/*/src/*.*', '/examples/*/src/*/*.*', '/examples/*/src/*/*/*.*', ], collectCoverage: false, collectCoverageFrom: [ - 'app/**/*.{js,jsx,ts,tsx}', + 'frameworks/**/*.{js,jsx,ts,tsx}', 'lib/**/*.{js,jsx,ts,tsx}', 'addons/**/*.{js,jsx,ts,tsx}', ], diff --git a/lib/builder-webpack5/package.json b/lib/builder-webpack5/package.json index 6f03d5e81730..2e40f92da82d 100644 --- a/lib/builder-webpack5/package.json +++ b/lib/builder-webpack5/package.json @@ -49,6 +49,7 @@ "@storybook/components": "6.5.0-beta.4", "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-events": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@storybook/node-logger": "6.5.0-beta.4", "@storybook/preview-web": "6.5.0-beta.4", "@storybook/router": "6.5.0-beta.4", @@ -62,7 +63,7 @@ "case-sensitive-paths-webpack-plugin": "^2.4.0", "core-js": "^3.8.2", "css-loader": "^6.7.1", - "fork-ts-checker-webpack-plugin": "^7.2.6", + "fork-ts-checker-webpack-plugin": "^7.2.8", "glob": "^7.1.6", "glob-promise": "^3.4.0", "html-webpack-plugin": "^5.5.0", diff --git a/lib/builder-webpack5/src/index.ts b/lib/builder-webpack5/src/index.ts index 41d0a918c8a4..abcd1fa6fddd 100644 --- a/lib/builder-webpack5/src/index.ts +++ b/lib/builder-webpack5/src/index.ts @@ -2,8 +2,11 @@ import webpack, { Stats, Configuration, ProgressPlugin, StatsOptions } from 'web import webpackDevMiddleware from 'webpack-dev-middleware'; import webpackHotMiddleware from 'webpack-hot-middleware'; import { logger } from '@storybook/node-logger'; -import { useProgressReporting, checkWebpackVersion } from '@storybook/core-common'; +import { useProgressReporting } from '@storybook/core-common'; import type { Builder, Options } from '@storybook/core-common'; +import { checkWebpackVersion } from '@storybook/core-webpack'; + +export * from './types'; let compilation: ReturnType; let reject: (reason?: any) => void; diff --git a/lib/builder-webpack5/src/presets/custom-webpack-preset.ts b/lib/builder-webpack5/src/presets/custom-webpack-preset.ts index 0686f9c3ca9b..4e90f7bcea03 100644 --- a/lib/builder-webpack5/src/presets/custom-webpack-preset.ts +++ b/lib/builder-webpack5/src/presets/custom-webpack-preset.ts @@ -1,9 +1,10 @@ import * as webpackReal from 'webpack'; import { logger } from '@storybook/node-logger'; -import { loadCustomWebpackConfig, Options, CoreConfig } from '@storybook/core-common'; +import type { Options, CoreConfig } from '@storybook/core-common'; import type { Configuration } from 'webpack'; import deprecate from 'util-deprecate'; import dedent from 'ts-dedent'; +import { loadCustomWebpackConfig } from '@storybook/core-webpack'; import { createDefaultWebpackConfig } from '../preview/base-webpack.config'; export async function webpack(config: Configuration, options: Options) { diff --git a/lib/builder-webpack5/src/types.ts b/lib/builder-webpack5/src/types.ts new file mode 100644 index 000000000000..69b7e67ea8e4 --- /dev/null +++ b/lib/builder-webpack5/src/types.ts @@ -0,0 +1,51 @@ +import type ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; +import type { PluginOptions } from '@storybook/react-docgen-typescript-plugin'; +import type { Configuration, Stats } from 'webpack'; +import type { + Options, + TypescriptOptions as BaseTypescriptOptions, + BuilderResult as BaseBuilderResult, +} from '@storybook/core-common'; + +/** + * Options for TypeScript usage within Storybook. + */ +export interface TypescriptOptions extends BaseTypescriptOptions { + /** + * Configures `fork-ts-checker-webpack-plugin` + */ + checkOptions?: ForkTsCheckerWebpackPlugin['options']; + /** + * Sets the type of Docgen when working with React and TypeScript + * + * @default `'react-docgen-typescript'` + */ + reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false; + /** + * Configures `react-docgen-typescript-plugin` + * + * @default + * @see https://github.com/storybookjs/storybook/blob/next/lib/builder-webpack5/src/config/defaults.js#L4-L6 + */ + reactDocgenTypescriptOptions: PluginOptions; +} + +export interface StorybookWebpackConfig { + /** + * Modify or return a custom Webpack config after the Storybook's default configuration + * has run (mostly used by addons). + */ + webpack?: (config: Configuration, options: Options) => Configuration | Promise; + + /** + * Modify or return a custom Webpack config after every addon has run. + */ + webpackFinal?: ( + config: Configuration, + options: Options + ) => Configuration | Promise; +} + +export interface BuilderResult extends BaseBuilderResult { + stats?: Stats; +} diff --git a/lib/cli/scripts/generate-sb-packages-versions.js b/lib/cli/scripts/generate-sb-packages-versions.js index aab6c42ccb0e..36a94b258925 100755 --- a/lib/cli/scripts/generate-sb-packages-versions.js +++ b/lib/cli/scripts/generate-sb-packages-versions.js @@ -17,7 +17,7 @@ const run = async () => { if (!semver.valid(updatedVersion)) throw new Error(`Invalid version: ${updatedVersion}`); const storybookPackagesPaths = await globby( - `${rootDirectory}/@(app|addons|lib)/**/package.json`, + `${rootDirectory}/@(frameworks|addons|lib|renderers|presets)/**/package.json`, { ignore: '**/node_modules/**/*', } diff --git a/lib/core-common/package.json b/lib/core-common/package.json index 7864a5332a85..fa279a20908b 100644 --- a/lib/core-common/package.json +++ b/lib/core-common/package.json @@ -5,14 +5,14 @@ "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/main/lib/core", + "homepage": "https://github.com/storybookjs/storybook/tree/main/lib/core-common", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "lib/core" + "directory": "lib/core-common" }, "funding": { "type": "opencollective", @@ -74,7 +74,6 @@ "express": "^4.17.1", "file-system-cache": "^1.0.5", "find-up": "^5.0.0", - "fork-ts-checker-webpack-plugin": "^7.2.6", "fs-extra": "^9.0.1", "glob": "^7.1.6", "handlebars": "^4.7.7", @@ -88,11 +87,9 @@ "slash": "^3.0.0", "telejson": "^5.3.3", "ts-dedent": "^2.0.0", - "util-deprecate": "^1.0.2", - "webpack": "5" + "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", "@types/compression": "^1.7.0", "@types/interpret": "^1.1.1", "@types/mock-fs": "^4.13.0", diff --git a/lib/core-common/src/index.ts b/lib/core-common/src/index.ts index a8b436226534..82c04e7c3781 100644 --- a/lib/core-common/src/index.ts +++ b/lib/core-common/src/index.ts @@ -1,21 +1,18 @@ export * from './presets'; export * from './utils/babel'; -export * from './utils/check-webpack-version'; export * from './utils/check-addon-order'; export * from './utils/envs'; export * from './utils/handlebars'; export * from './utils/interpret-files'; export * from './utils/interpret-require'; export * from './utils/load-custom-presets'; -export * from './utils/load-custom-webpack-config'; export * from './utils/load-main-config'; export * from './utils/get-storybook-configuration'; export * from './utils/get-storybook-info'; export * from './utils/load-manager-or-addons-file'; export * from './utils/load-preview-or-config-file'; export * from './utils/log-config'; -export * from './utils/merge-webpack-config'; export * from './utils/paths'; export * from './utils/progress-reporting'; export * from './utils/resolve-path-in-sb-cache'; diff --git a/lib/core-common/src/types.ts b/lib/core-common/src/types.ts index e3be04d94f55..854ac5e3b29c 100644 --- a/lib/core-common/src/types.ts +++ b/lib/core-common/src/types.ts @@ -1,7 +1,4 @@ -import type ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; import type { Options as TelejsonOptions } from 'telejson'; -import type { PluginOptions } from '@storybook/react-docgen-typescript-plugin'; -import type { Configuration, Stats } from 'webpack'; import type { TransformOptions } from '@babel/core'; import { Router } from 'express'; import { Server } from 'http'; @@ -11,21 +8,7 @@ import { FileSystemCache } from './utils/file-cache'; * ⚠️ This file contains internal WIP types they MUST NOT be exported outside this package for now! */ -export interface TypescriptConfig { - check: boolean; - reactDocgen: false | string; - reactDocgenTypescriptOptions: { - shouldExtractLiteralValuesFromEnum: boolean; - shouldRemoveUndefinedFromOptional: boolean; - propFilter: (prop: any) => boolean; - }; -} - -export type BuilderName = - | '@storybook/builder-webpack4' - | '@storybook/builder-webpack5' - | '@storybook/builder-vite' - | string; +export type BuilderName = 'webpack5' | '@storybook/builder-webpack5' | string; export type BuilderConfigObject = { name: BuilderName; @@ -86,27 +69,16 @@ interface DirectoryMapping { export interface Presets { apply( extension: 'typescript', - config: TypescriptConfig, + config: TypescriptOptions, args?: Options - ): Promise; + ): Promise; apply(extension: 'babel', config: {}, args: any): Promise; apply(extension: 'entries', config: [], args: any): Promise; apply(extension: 'stories', config: [], args: any): Promise; - apply( - extension: 'webpack', - config: {}, - args: { babelOptions?: TransformOptions } & any - ): Promise; apply(extension: 'managerEntries', config: [], args: any): Promise; apply(extension: 'refs', config: [], args: any): Promise; apply(extension: 'core', config: {}, args: any): Promise; - apply( - extension: 'managerWebpack', - config: {}, - args: Options & { babelOptions?: TransformOptions } & ManagerWebpackOptions - ): Promise; - // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-constraint - apply(extension: string, config?: T, args?: unknown): Promise; + apply(extension: string, config?: T, args?: unknown): Promise; } export interface LoadedPreset { @@ -149,9 +121,13 @@ export interface ReleaseNotesData { showOnFirstLaunch: boolean; } +export interface Stats { + toJson: () => any; +} + export interface BuilderResult { - stats?: Stats; totalTime?: ReturnType; + stats?: Stats; } // TODO: this is a generic interface that we can share across multiple SB packages (like @storybook/cli) @@ -267,23 +243,6 @@ export interface TypescriptOptions { * @default `false` */ check: boolean; - /** - * Configures `fork-ts-checker-webpack-plugin` - */ - checkOptions?: ForkTsCheckerWebpackPlugin['options']; - /** - * Sets the type of Docgen when working with React and TypeScript - * - * @default `'react-docgen-typescript'` - */ - reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false; - /** - * Configures `react-docgen-typescript-plugin` - * - * @default - * @see https://github.com/storybookjs/storybook/blob/next/lib/builder-webpack5/src/config/defaults.js#L4-L6 - */ - reactDocgenTypescriptOptions: PluginOptions; } interface StoriesSpecifier { @@ -431,7 +390,7 @@ export interface StorybookConfig { /** * References external Storybooks */ - refs?: StorybookRefs | ((config: Configuration, options: Options) => StorybookRefs); + refs?: StorybookRefs | ((config: any, options: Options) => StorybookRefs); /** * Modify or return babel config. @@ -449,20 +408,6 @@ export interface StorybookConfig { options: Options ) => TransformOptions | Promise; - /** - * Modify or return a custom Webpack config after the Storybook's default configuration - * has run (mostly used by addons). - */ - webpack?: (config: Configuration, options: Options) => Configuration | Promise; - - /** - * Modify or return a custom Webpack config after every addon has run. - */ - webpackFinal?: ( - config: Configuration, - options: Options - ) => Configuration | Promise; - /** * Add additional scripts to run in the preview a la `.storybook/preview.js` * diff --git a/lib/core-common/types/index.ts b/lib/core-common/types/index.ts deleted file mode 100644 index c4dffbd85d00..000000000000 --- a/lib/core-common/types/index.ts +++ /dev/null @@ -1 +0,0 @@ -export type { StorybookConfig } from '../dist/ts3.9/types'; diff --git a/lib/core-server/src/utils/output-stats.ts b/lib/core-server/src/utils/output-stats.ts index d701947f75ce..9df80f6c65d3 100644 --- a/lib/core-server/src/utils/output-stats.ts +++ b/lib/core-server/src/utils/output-stats.ts @@ -1,9 +1,9 @@ import { stringifyStream } from '@discoveryjs/json-ext'; import { logger } from '@storybook/node-logger'; +import type { Stats } from '@storybook/core-common'; import chalk from 'chalk'; import fs from 'fs-extra'; import path from 'path'; -import { Stats } from 'webpack'; export async function outputStats(directory: string, previewStats?: any, managerStats?: any) { if (previewStats) { diff --git a/lib/core-webpack/README.md b/lib/core-webpack/README.md new file mode 100644 index 000000000000..3fc05c4c32c8 --- /dev/null +++ b/lib/core-webpack/README.md @@ -0,0 +1,9 @@ +# Storybook Core-Common + +Common utilities used across `@storybook/core-server` (manager UI configuration) and `@storybook/builder-webpack{4,5}` (preview configuration). + +This is a lot of code extracted for convenience, not because it made sense. + +Supporting multiple version of webpack and this duplicating a large portion of code that was never meant to be generic caused this. + +At some point we'll refactor this, it's likely a lot of this code is dead or barely used. diff --git a/lib/core-webpack/package.json b/lib/core-webpack/package.json new file mode 100644 index 000000000000..d76547a51127 --- /dev/null +++ b/lib/core-webpack/package.json @@ -0,0 +1,53 @@ +{ + "name": "@storybook/core-webpack", + "version": "6.5.0-beta.4", + "description": "Storybook framework-agnostic API", + "keywords": [ + "storybook" + ], + "homepage": "https://github.com/storybookjs/storybook/tree/main/lib/core-webpack", + "bugs": { + "url": "https://github.com/storybookjs/storybook/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/storybookjs/storybook.git", + "directory": "lib/core-webpack" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/storybook" + }, + "license": "MIT", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", + "types": "dist/ts3.9/index.d.ts", + "typesVersions": { + "<3.8": { + "dist/ts3.9/*": [ + "dist/ts3.4/*" + ] + } + }, + "files": [ + "dist/**/*", + "types/**/*", + "templates/**/*", + "*.js", + "*.d.ts" + ], + "scripts": { + "prepare": "node ../../scripts/prepare.js" + }, + "dependencies": { + "@storybook/core-common": "6.5.0-beta.4", + "@storybook/node-logger": "6.5.0-beta.4", + "@types/node": "^14.0.10 || ^16.0.0", + "core-js": "^3.8.2", + "ts-dedent": "^2.0.0" + }, + "publishConfig": { + "access": "public" + }, + "gitHead": "b2e85f3599c043815b18bbfc5ca563bf1c6e4add" +} diff --git a/lib/core-common/src/utils/__tests__/__snapshots__/merge-webpack-config.test.ts.snap b/lib/core-webpack/src/__snapshots__/merge-webpack-config.test.ts.snap similarity index 100% rename from lib/core-common/src/utils/__tests__/__snapshots__/merge-webpack-config.test.ts.snap rename to lib/core-webpack/src/__snapshots__/merge-webpack-config.test.ts.snap diff --git a/lib/core-common/src/utils/check-webpack-version.ts b/lib/core-webpack/src/check-webpack-version.ts similarity index 100% rename from lib/core-common/src/utils/check-webpack-version.ts rename to lib/core-webpack/src/check-webpack-version.ts diff --git a/lib/core-webpack/src/index.ts b/lib/core-webpack/src/index.ts new file mode 100644 index 000000000000..b83264813e8a --- /dev/null +++ b/lib/core-webpack/src/index.ts @@ -0,0 +1,4 @@ +export * from './types'; +export * from './load-custom-webpack-config'; +export * from './check-webpack-version'; +export * from './merge-webpack-config'; diff --git a/lib/core-common/src/utils/load-custom-webpack-config.ts b/lib/core-webpack/src/load-custom-webpack-config.ts similarity index 80% rename from lib/core-common/src/utils/load-custom-webpack-config.ts rename to lib/core-webpack/src/load-custom-webpack-config.ts index cf29ee712745..52a74eccb1ea 100644 --- a/lib/core-common/src/utils/load-custom-webpack-config.ts +++ b/lib/core-webpack/src/load-custom-webpack-config.ts @@ -1,5 +1,5 @@ import path from 'path'; -import { serverRequire } from './interpret-require'; +import { serverRequire } from '@storybook/core-common'; const webpackConfigs = ['webpack.config', 'webpackfile']; diff --git a/lib/core-common/src/utils/__tests__/merge-webpack-config.test.ts b/lib/core-webpack/src/merge-webpack-config.test.ts similarity index 97% rename from lib/core-common/src/utils/__tests__/merge-webpack-config.test.ts rename to lib/core-webpack/src/merge-webpack-config.test.ts index 38aa0ee035aa..b93f38e8539f 100644 --- a/lib/core-common/src/utils/__tests__/merge-webpack-config.test.ts +++ b/lib/core-webpack/src/merge-webpack-config.test.ts @@ -1,5 +1,5 @@ import type { Configuration } from 'webpack'; -import { mergeConfigs } from '../merge-webpack-config'; +import { mergeConfigs } from './merge-webpack-config'; const config: Configuration = { devtool: 'source-map', diff --git a/lib/core-common/src/utils/merge-webpack-config.ts b/lib/core-webpack/src/merge-webpack-config.ts similarity index 96% rename from lib/core-common/src/utils/merge-webpack-config.ts rename to lib/core-webpack/src/merge-webpack-config.ts index 92c41a16f787..b95f97b87aec 100644 --- a/lib/core-common/src/utils/merge-webpack-config.ts +++ b/lib/core-webpack/src/merge-webpack-config.ts @@ -1,4 +1,4 @@ -import type { Configuration } from 'webpack'; +import type { CommonWebpackConfiguration as Configuration } from './types'; function plugins( { plugins: defaultPlugins = [] }: Configuration, diff --git a/lib/core-webpack/src/types.ts b/lib/core-webpack/src/types.ts new file mode 100644 index 000000000000..7ae50b020a76 --- /dev/null +++ b/lib/core-webpack/src/types.ts @@ -0,0 +1,37 @@ +import type { Options, StorybookConfig as BaseStorybookConfig } from '@storybook/core-common'; + +export type { Options, Preset, BuilderResult, TypescriptOptions } from '@storybook/core-common'; + +export interface CommonWebpackConfiguration { + plugins?: any[]; + module?: { + rules?: any[]; + }; + resolve?: { + extensions?: string[]; + mainFields?: string[] | string[][]; + alias?: any; + }; + optimization?: any; + devtool?: boolean | string; +} + +export interface StorybookWebpackConfig { + /** + * Modify or return a custom Webpack config after the Storybook's default configuration + * has run (mostly used by addons). + */ + webpack?: (config: TConfiguration, options: Options) => TConfiguration | Promise; + + /** + * Modify or return a custom Webpack config after every addon has run. + */ + webpackFinal?: ( + config: TConfiguration, + options: Options + ) => TConfiguration | Promise; +} + +export type StorybookConfig< + TWebpackConfiguration extends CommonWebpackConfiguration = CommonWebpackConfiguration +> = BaseStorybookConfig & StorybookWebpackConfig; diff --git a/lib/core-webpack/tsconfig.json b/lib/core-webpack/tsconfig.json new file mode 100644 index 000000000000..4fbf90df5267 --- /dev/null +++ b/lib/core-webpack/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "rootDir": "./src", + "types": [ + "jest", + "node" + ] + }, + "include": [ + "src/**/*" + ], + "exclude": [ + "src/**.test.ts" + ] +} \ No newline at end of file diff --git a/lib/csf-tools/src/ConfigFile.test.ts b/lib/csf-tools/src/ConfigFile.test.ts index 76b6ccb38d55..21d8bc25e966 100644 --- a/lib/csf-tools/src/ConfigFile.test.ts +++ b/lib/csf-tools/src/ConfigFile.test.ts @@ -131,7 +131,7 @@ describe('ConfigFile', () => { getField( ['stories'], dedent` - import type { StorybookConfig } from '@storybook/react/types'; + import type { StorybookConfig } from '@storybook/react-webpack4/types'; const config: StorybookConfig = { stories: [{ directory: '../src', titlePrefix: 'Demo' }], diff --git a/lib/manager-webpack5/package.json b/lib/manager-webpack5/package.json index 147fadfbd1ea..15814041bd71 100644 --- a/lib/manager-webpack5/package.json +++ b/lib/manager-webpack5/package.json @@ -48,6 +48,7 @@ "@storybook/addons": "6.5.0-beta.4", "@storybook/core-client": "6.5.0-beta.4", "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@storybook/node-logger": "6.5.0-beta.4", "@storybook/theming": "6.5.0-beta.4", "@storybook/ui": "6.5.0-beta.4", diff --git a/lib/manager-webpack5/src/index.ts b/lib/manager-webpack5/src/index.ts index dd2905cb47c9..67df89c8d411 100644 --- a/lib/manager-webpack5/src/index.ts +++ b/lib/manager-webpack5/src/index.ts @@ -2,8 +2,9 @@ import webpack, { ProgressPlugin } from 'webpack'; import type { Stats, Configuration } from 'webpack'; import webpackDevMiddleware from 'webpack-dev-middleware'; import { logger } from '@storybook/node-logger'; -import { useProgressReporting, checkWebpackVersion } from '@storybook/core-common'; +import { useProgressReporting } from '@storybook/core-common'; import type { Builder, Options } from '@storybook/core-common'; +import { checkWebpackVersion } from '@storybook/core-webpack'; import findUp from 'find-up'; import fs from 'fs-extra'; diff --git a/lib/telemetry/package.json b/lib/telemetry/package.json index f64d4bfbbe35..8a77e8a3f908 100644 --- a/lib/telemetry/package.json +++ b/lib/telemetry/package.json @@ -56,6 +56,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/index.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/nx.json b/nx.json index d432e5d19f71..e9c5b23b4493 100644 --- a/nx.json +++ b/nx.json @@ -109,30 +109,6 @@ "@storybook/preset-web-components-webpack": { "implicitDependencies": [] }, - "@storybook/renderer-html": { - "implicitDependencies": [] - }, - "@storybook/renderer-preact": { - "implicitDependencies": [] - }, - "@storybook/renderer-react": { - "implicitDependencies": [] - }, - "@storybook/renderer-server": { - "implicitDependencies": [] - }, - "@storybook/renderer-svelte": { - "implicitDependencies": [] - }, - "@storybook/renderer-vue": { - "implicitDependencies": [] - }, - "@storybook/renderer-vue3": { - "implicitDependencies": [] - }, - "@storybook/renderer-web-components": { - "implicitDependencies": [] - }, "@storybook/react": { "implicitDependencies": [] }, @@ -151,6 +127,9 @@ "@storybook/web-components": { "implicitDependencies": [] }, + "@storybook/core-webpack": { + "implicitDependencies": [] + }, "angular-cli": { "implicitDependencies": [] }, @@ -285,6 +264,30 @@ }, "@storybook/preview-web": { "implicitDependencies": [] + }, + "@storybook/html-webpack4": { + "implicitDependencies": [] + }, + "@storybook/preact-webpack4": { + "implicitDependencies": [] + }, + "@storybook/react-webpack4": { + "implicitDependencies": [] + }, + "@storybook/server-webpack4": { + "implicitDependencies": [] + }, + "@storybook/svelte-webpack4": { + "implicitDependencies": [] + }, + "@storybook/vue-webpack4": { + "implicitDependencies": [] + }, + "@storybook/vue3-webpack4": { + "implicitDependencies": [] + }, + "@storybook/web-components-webpack4": { + "implicitDependencies": [] } }, "affected": { diff --git a/package.json b/package.json index bd9049830fe7..20fd489e30d8 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "packages": [ "addons/*", "addons/storyshots/*", - "app/*", + "frameworks/*", "renderers/*", "presets/*", "examples-native/*", @@ -169,17 +169,20 @@ "@storybook/codemod": "workspace:*", "@storybook/components": "workspace:*", "@storybook/core-events": "workspace:*", + "@storybook/core-webpack": "workspace:*", "@storybook/csf-tools": "workspace:*", "@storybook/docs-tools": "workspace:*", "@storybook/ember": "workspace:*", "@storybook/eslint-config-storybook": "^2.4.0", "@storybook/html": "workspace:*", + "@storybook/html-webpack4": "workspace:*", "@storybook/instrumenter": "workspace:*", "@storybook/jest": "^0.0.5", "@storybook/linter-config": "^2.5.0", "@storybook/node-logger": "workspace:*", "@storybook/postinstall": "workspace:*", "@storybook/preact": "workspace:*", + "@storybook/preact-webpack4": "workspace:*", "@storybook/preset-html-webpack": "workspace:*", "@storybook/preset-preact-webpack": "workspace:*", "@storybook/preset-react-webpack": "workspace:*", @@ -190,26 +193,25 @@ "@storybook/preset-web-components-webpack": "workspace:*", "@storybook/preview-web": "workspace:*", "@storybook/react": "workspace:*", - "@storybook/renderer-html": "workspace:*", - "@storybook/renderer-preact": "workspace:*", - "@storybook/renderer-react": "workspace:*", - "@storybook/renderer-server": "workspace:*", - "@storybook/renderer-svelte": "workspace:*", - "@storybook/renderer-vue": "workspace:*", - "@storybook/renderer-vue3": "workspace:*", - "@storybook/renderer-web-components": "workspace:*", + "@storybook/react-webpack4": "workspace:*", "@storybook/router": "workspace:*", "@storybook/semver": "^7.3.2", "@storybook/server": "workspace:*", + "@storybook/server-webpack4": "workspace:*", "@storybook/source-loader": "workspace:*", "@storybook/store": "workspace:*", "@storybook/svelte": "workspace:*", + "@storybook/svelte-webpack4": "workspace:*", "@storybook/telemetry": "workspace:*", "@storybook/testing-library": "^0.0.7", "@storybook/theming": "workspace:*", "@storybook/ui": "workspace:*", "@storybook/vue": "workspace:*", + "@storybook/vue-webpack4": "workspace:*", + "@storybook/vue3": "workspace:*", + "@storybook/vue3-webpack4": "workspace:*", "@storybook/web-components": "workspace:*", + "@storybook/web-components-webpack4": "workspace:*", "@testing-library/dom": "^7.29.4", "@testing-library/jest-dom": "^5.11.9", "@testing-library/react": "^11.2.2", diff --git a/presets/html-webpack/package.json b/presets/html-webpack/package.json index bed1ff6a21e3..673588bdd984 100644 --- a/presets/html-webpack/package.json +++ b/presets/html-webpack/package.json @@ -39,17 +39,12 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "html-loader": "^3.1.0", "react": "16.14.0", - "react-dom": "16.14.0", - "regenerator-runtime": "^0.13.7", - "webpack": ">=4.0.0 <6.0.0" - }, - "devDependencies": { - "webpack": "5" + "react-dom": "16.14.0" }, "peerDependencies": { "@babel/core": "*" @@ -60,6 +55,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/client/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/presets/html-webpack/src/preset.ts b/presets/html-webpack/src/preset.ts index c185773b64c2..91fcbec914c5 100644 --- a/presets/html-webpack/src/preset.ts +++ b/presets/html-webpack/src/preset.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpack: StorybookConfig['webpack'] = (config) => { config.module.rules.push({ diff --git a/presets/preact-webpack/package.json b/presets/preact-webpack/package.json index 770e01f8df53..ee529fc532d5 100644 --- a/presets/preact-webpack/package.json +++ b/presets/preact-webpack/package.json @@ -40,18 +40,15 @@ }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", - "@storybook/core-common": "6.5.0-beta.4", - "@storybook/renderer-preact": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "react": "16.14.0", "react-dom": "16.14.0", - "regenerator-runtime": "^0.13.7", - "webpack": ">=4.0.0 <6.0.0" + "regenerator-runtime": "^0.13.7" }, "devDependencies": { - "preact": "^10.5.13", - "webpack": "5" + "preact": "^10.5.13" }, "peerDependencies": { "@babel/core": "*", @@ -63,6 +60,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/client/index.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/presets/preact-webpack/src/framework-preset-preact.ts b/presets/preact-webpack/src/framework-preset-preact.ts index 12a5fb38abbc..a01d2f862404 100644 --- a/presets/preact-webpack/src/framework-preset-preact.ts +++ b/presets/preact-webpack/src/framework-preset-preact.ts @@ -1,5 +1,5 @@ import path from 'path'; -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const babelDefault: StorybookConfig['babelDefault'] = (config) => { return { diff --git a/presets/react-webpack/package.json b/presets/react-webpack/package.json index e1d4a83d3393..247ecf068f35 100644 --- a/presets/react-webpack/package.json +++ b/presets/react-webpack/package.json @@ -19,9 +19,9 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/index.js", - "module": "dist/esm/index.js", - "types": "dist/ts3.9/index.d.ts", + "main": "dist/cjs/preset.js", + "module": "dist/esm/preset.js", + "types": "dist/ts3.9/preset.d.ts", "typesVersions": { "<3.8": { "dist/ts3.9/*": [ @@ -43,11 +43,11 @@ "@babel/preset-flow": "^7.12.1", "@babel/preset-react": "^7.12.10", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5", - "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@storybook/docs-tools": "6.5.0-beta.4", "@storybook/node-logger": "6.5.0-beta.4", + "@storybook/react": "6.5.0-beta.4", "@storybook/react-docgen-typescript-plugin": "1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0", - "@storybook/renderer-react": "6.5.0-beta.4", "@storybook/semver": "^7.3.2", "@types/node": "^14.14.20 || ^16.0.0", "babel-plugin-add-react-displayname": "^0.0.5", @@ -55,19 +55,18 @@ "core-js": "^3.8.2", "fs-extra": "^9.0.1", "react-refresh": "^0.11.0", - "regenerator-runtime": "^0.13.7", - "webpack": ">=4.43.0 <6.0.0" + "regenerator-runtime": "^0.13.7" }, "devDependencies": { - "@types/util-deprecate": "^1.0.0", - "webpack": "5" + "@types/util-deprecate": "^1.0.0" }, "peerDependencies": { "@babel/core": "^7.11.5", "jest-specific-snapshot": "^4.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", - "require-from-string": "^2.0.2" + "require-from-string": "^2.0.2", + "webpack": "4 || 5" }, "peerDependenciesMeta": { "@babel/core": { @@ -83,6 +82,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/client/index.js" + "gitHead": "7417a230d67b54d65caedcfb584f924b879ac9f5" } diff --git a/presets/react-webpack/src/framework-preset-cra.ts b/presets/react-webpack/src/framework-preset-cra.ts index b5023958a682..63d47ac6df29 100644 --- a/presets/react-webpack/src/framework-preset-cra.ts +++ b/presets/react-webpack/src/framework-preset-cra.ts @@ -1,5 +1,5 @@ import { logger } from '@storybook/node-logger'; -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; import { isReactScriptsInstalled } from './cra-config'; type Preset = string | { name: string }; diff --git a/presets/react-webpack/src/framework-preset-react-docs.test.ts b/presets/react-webpack/src/framework-preset-react-docs.test.ts index bd86e13da568..39dad43e104d 100644 --- a/presets/react-webpack/src/framework-preset-react-docs.test.ts +++ b/presets/react-webpack/src/framework-preset-react-docs.test.ts @@ -1,5 +1,5 @@ import ReactDocgenTypescriptPlugin from '@storybook/react-docgen-typescript-plugin'; -import type { TypescriptConfig } from '@storybook/core-common'; +import type { TypescriptConfig } from '@storybook/core-webpack'; import * as preset from './framework-preset-react-docs'; describe('framework-preset-react-docgen', () => { diff --git a/presets/react-webpack/src/framework-preset-react-docs.ts b/presets/react-webpack/src/framework-preset-react-docs.ts index 59d254941226..84882b5489e5 100644 --- a/presets/react-webpack/src/framework-preset-react-docs.ts +++ b/presets/react-webpack/src/framework-preset-react-docs.ts @@ -1,11 +1,15 @@ -import type { StorybookConfig, TypescriptConfig } from '@storybook/core-common'; import ReactDocgenTypescriptPlugin from '@storybook/react-docgen-typescript-plugin'; import { hasDocsOrControls } from '@storybook/docs-tools'; +import type { StorybookConfig } from './types'; + export const babel: StorybookConfig['babel'] = async (config, options) => { if (!hasDocsOrControls(options)) return config; - const typescriptOptions = await options.presets.apply('typescript', {} as any); + const typescriptOptions = await options.presets.apply( + 'typescript', + {} as any + ); const { reactDocgen } = typescriptOptions; @@ -34,7 +38,10 @@ export const babel: StorybookConfig['babel'] = async (config, options) => { export const webpackFinal: StorybookConfig['webpackFinal'] = async (config, options) => { if (!hasDocsOrControls(options)) return config; - const typescriptOptions = await options.presets.apply('typescript', {} as any); + const typescriptOptions = await options.presets.apply( + 'typescript', + {} as any + ); const { reactDocgen, reactDocgenTypescriptOptions } = typescriptOptions; diff --git a/presets/react-webpack/src/framework-preset-react-dom-hack.ts b/presets/react-webpack/src/framework-preset-react-dom-hack.ts index 9e44dc74b405..209e61a27a17 100644 --- a/presets/react-webpack/src/framework-preset-react-dom-hack.ts +++ b/presets/react-webpack/src/framework-preset-react-dom-hack.ts @@ -1,6 +1,6 @@ import { readJSON } from 'fs-extra'; import { IgnorePlugin } from 'webpack'; -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; // this is a hack to allow importing react-dom/client even when it's not available // this should be removed once we drop support for react-dom < 18 @@ -17,7 +17,7 @@ export const webpackFinal: StorybookConfig['webpackFinal'] = async (config) => { : new IgnorePlugin({ resourceRegExp: /react-dom\/client$/, contextRegExp: - /(renderers\/react|renderers\\react|@storybook\/renderer-react|@storybook\\renderer-react)/, // TODO this needs to work for both in our MONOREPO and in the user's NODE_MODULES + /(renderers\/react|renderers\\react|@storybook\/react|@storybook\\react)/, // TODO this needs to work for both in our MONOREPO and in the user's NODE_MODULES }), ].filter(Boolean), }; diff --git a/presets/react-webpack/src/framework-preset-react.test.ts b/presets/react-webpack/src/framework-preset-react.test.ts index b6a0abdb9d35..eef1b1039580 100644 --- a/presets/react-webpack/src/framework-preset-react.test.ts +++ b/presets/react-webpack/src/framework-preset-react.test.ts @@ -1,6 +1,6 @@ import type { Configuration } from 'webpack'; import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin'; -import type { Options } from '@storybook/core-common'; +import type { Options } from '@storybook/core-webpack'; import * as preset from './framework-preset-react'; const mockApply = jest.fn(); diff --git a/presets/react-webpack/src/framework-preset-react.ts b/presets/react-webpack/src/framework-preset-react.ts index 7141ef7219e5..7490f0e9ca5e 100644 --- a/presets/react-webpack/src/framework-preset-react.ts +++ b/presets/react-webpack/src/framework-preset-react.ts @@ -3,7 +3,7 @@ import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin'; import { logger } from '@storybook/node-logger'; -import type { StorybookConfig, Options, Preset } from '@storybook/core-common'; +import type { StorybookConfig, Options, Preset } from '@storybook/core-webpack'; import type { ReactOptions } from './types'; const useFastRefresh = async (options: Options) => { diff --git a/presets/react-webpack/src/preset.ts b/presets/react-webpack/src/preset.ts index b57cf57c3fe5..2a50951a2aa6 100644 --- a/presets/react-webpack/src/preset.ts +++ b/presets/react-webpack/src/preset.ts @@ -1,4 +1,6 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from './types'; + +export * from './types'; export const addons: StorybookConfig['addons'] = [ require.resolve('./framework-preset-react'), diff --git a/presets/react-webpack/src/types.ts b/presets/react-webpack/src/types.ts index f9286eea6f3f..6d288e7b0ed0 100644 --- a/presets/react-webpack/src/types.ts +++ b/presets/react-webpack/src/types.ts @@ -1,4 +1,11 @@ -import type { StorybookConfig as BaseConfig } from '@storybook/core-common'; +import type { + CommonWebpackConfiguration, + StorybookConfig as BaseStorybookConfig, + TypescriptOptions as BaseTypescriptOptions, +} from '@storybook/core-webpack'; +import type { PluginOptions as ReactDocgenTypescriptOptions } from '@storybook/react-docgen-typescript-plugin'; + +export type { BuilderResult } from '@storybook/core-webpack'; export interface ReactOptions { fastRefresh?: boolean; @@ -16,7 +23,7 @@ export interface ReactOptions { /** * The interface for Storybook configuration in `main.ts` files. */ -export interface StorybookConfig extends BaseConfig { +export interface ReactConfig { framework: | string | { @@ -24,3 +31,25 @@ export interface StorybookConfig extends BaseConfig { options: ReactOptions; }; } + +export type TypescriptOptions = BaseTypescriptOptions & { + /** + * Sets the type of Docgen when working with React and TypeScript + * + * @default `'react-docgen-typescript'` + */ + reactDocgen: 'react-docgen-typescript' | 'react-docgen' | false; + /** + * Configures `react-docgen-typescript-plugin` + * + * @default + * @see https://github.com/storybookjs/storybook/blob/next/lib/builder-webpack5/src/config/defaults.js#L4-L6 + */ + reactDocgenTypescriptOptions: ReactDocgenTypescriptOptions; +}; + +export type StorybookConfig = + BaseStorybookConfig & + ReactConfig & { + typescript?: Partial; + }; diff --git a/presets/server-webpack/package.json b/presets/server-webpack/package.json index 5c133d4c93a0..d16d4fdaf250 100644 --- a/presets/server-webpack/package.json +++ b/presets/server-webpack/package.json @@ -39,9 +39,9 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core-common": "6.5.0-beta.4", "@storybook/core-server": "6.5.0-beta.4", - "@storybook/renderer-server": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", + "@storybook/server": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", "global": "^4.4.0", @@ -62,6 +62,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/client/index.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/presets/server-webpack/src/framework-preset-server.ts b/presets/server-webpack/src/framework-preset-server.ts index 52a4c1a362c5..230a4b5cd5fd 100644 --- a/presets/server-webpack/src/framework-preset-server.ts +++ b/presets/server-webpack/src/framework-preset-server.ts @@ -1,5 +1,5 @@ import path from 'path'; -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpack: StorybookConfig['webpack'] = (config) => { config.module.rules.push({ diff --git a/presets/svelte-webpack/package.json b/presets/svelte-webpack/package.json index bf271234f6c0..42239a0488ac 100644 --- a/presets/svelte-webpack/package.json +++ b/presets/svelte-webpack/package.json @@ -40,20 +40,18 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@storybook/node-logger": "6.5.0-beta.4", "core-js": "^3.8.2", "react": "16.14.0", "react-dom": "16.14.0", "regenerator-runtime": "^0.13.7", "sveltedoc-parser": "4.1.0", - "ts-dedent": "^2.0.0", - "webpack": ">=4.0.0 <6.0.0" + "ts-dedent": "^2.0.0" }, "devDependencies": { "svelte": "^3.31.2", - "svelte-loader": "^3.1.2", - "webpack": "5" + "svelte-loader": "^3.1.2" }, "peerDependencies": { "@babel/core": "*", @@ -66,6 +64,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/client/index.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/presets/svelte-webpack/src/framework-preset-svelte-docs.ts b/presets/svelte-webpack/src/framework-preset-svelte-docs.ts index ae6a0df9769e..f582a611ec41 100644 --- a/presets/svelte-webpack/src/framework-preset-svelte-docs.ts +++ b/presets/svelte-webpack/src/framework-preset-svelte-docs.ts @@ -1,5 +1,5 @@ import path from 'path'; -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpackFinal: StorybookConfig['webpackFinal'] = async (config, options) => { const svelteOptions = await options.presets.apply('svelteOptions', {} as any, options); diff --git a/presets/svelte-webpack/src/framework-preset-svelte.ts b/presets/svelte-webpack/src/framework-preset-svelte.ts index f812ed0ddc93..eebb44c871e4 100644 --- a/presets/svelte-webpack/src/framework-preset-svelte.ts +++ b/presets/svelte-webpack/src/framework-preset-svelte.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpack: StorybookConfig['webpack'] = async (config, options) => { const { preprocess = undefined, loader = {} } = await options.presets.apply( diff --git a/presets/svelte-webpack/src/preset.ts b/presets/svelte-webpack/src/preset.ts index 5746855d89a0..239989b09098 100644 --- a/presets/svelte-webpack/src/preset.ts +++ b/presets/svelte-webpack/src/preset.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const addons: StorybookConfig['addons'] = [ require.resolve('./framework-preset-svelte'), diff --git a/presets/vue-webpack/package.json b/presets/vue-webpack/package.json index fb5a17525c86..d2aca749bccb 100644 --- a/presets/vue-webpack/package.json +++ b/presets/vue-webpack/package.json @@ -39,7 +39,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@storybook/docs-tools": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", @@ -71,6 +71,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/preset.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/presets/vue-webpack/src/framework-preset-vue-docs.ts b/presets/vue-webpack/src/framework-preset-vue-docs.ts index e8f2264c2225..1d1f6d541612 100644 --- a/presets/vue-webpack/src/framework-preset-vue-docs.ts +++ b/presets/vue-webpack/src/framework-preset-vue-docs.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; import { hasDocsOrControls } from '@storybook/docs-tools'; export const webpackFinal: StorybookConfig['webpackFinal'] = (config, options) => { diff --git a/presets/vue-webpack/src/framework-preset-vue.ts b/presets/vue-webpack/src/framework-preset-vue.ts index 052af46a4d20..21e035db663d 100644 --- a/presets/vue-webpack/src/framework-preset-vue.ts +++ b/presets/vue-webpack/src/framework-preset-vue.ts @@ -1,10 +1,13 @@ /* eslint-disable no-param-reassign */ import { VueLoaderPlugin } from 'vue-loader'; -import type { TypescriptConfig, StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpack: StorybookConfig['webpack'] = async (config, { presets }) => { - const typescriptOptions = await presets.apply('typescript', {} as any); + const typescriptOptions = await presets.apply( + 'typescript', + {} as any + ); config.plugins.push(new VueLoaderPlugin()); config.module.rules.push({ diff --git a/presets/vue-webpack/src/preset.ts b/presets/vue-webpack/src/preset.ts index 89288293223c..8dbe2d361d90 100644 --- a/presets/vue-webpack/src/preset.ts +++ b/presets/vue-webpack/src/preset.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const addons: StorybookConfig['addons'] = [ require.resolve('./framework-preset-vue'), diff --git a/presets/vue3-webpack/package.json b/presets/vue3-webpack/package.json index 236dbc899054..94986dbb81e7 100644 --- a/presets/vue3-webpack/package.json +++ b/presets/vue3-webpack/package.json @@ -40,7 +40,7 @@ "prepare": "node ../../scripts/prepare.js" }, "dependencies": { - "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@storybook/docs-tools": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "core-js": "^3.8.2", @@ -70,6 +70,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/preset.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/presets/vue3-webpack/src/framework-preset-vue3-docs.ts b/presets/vue3-webpack/src/framework-preset-vue3-docs.ts index a0667d60b6b2..5bdbd97ff75d 100644 --- a/presets/vue3-webpack/src/framework-preset-vue3-docs.ts +++ b/presets/vue3-webpack/src/framework-preset-vue3-docs.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; import { hasDocsOrControls } from '@storybook/docs-tools'; export const webpackFinal: StorybookConfig['webpackFinal'] = (config, options) => { diff --git a/presets/vue3-webpack/src/framework-preset-vue3.ts b/presets/vue3-webpack/src/framework-preset-vue3.ts index d716137b109b..b09b4182b8e0 100644 --- a/presets/vue3-webpack/src/framework-preset-vue3.ts +++ b/presets/vue3-webpack/src/framework-preset-vue3.ts @@ -1,6 +1,6 @@ import { VueLoaderPlugin } from 'vue-loader'; import { DefinePlugin } from 'webpack'; -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpack: StorybookConfig['webpack'] = (config) => { return { diff --git a/presets/vue3-webpack/src/preset.ts b/presets/vue3-webpack/src/preset.ts index 16c9fbcfde38..e2abb85db7cb 100644 --- a/presets/vue3-webpack/src/preset.ts +++ b/presets/vue3-webpack/src/preset.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const addons: StorybookConfig['addons'] = [ require.resolve('./framework-preset-vue3'), diff --git a/presets/web-components-webpack/package.json b/presets/web-components-webpack/package.json index f984521168d7..e2e38eeef490 100644 --- a/presets/web-components-webpack/package.json +++ b/presets/web-components-webpack/package.json @@ -44,7 +44,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/preset-env": "^7.12.11", - "@storybook/core-common": "6.5.0-beta.4", + "@storybook/core-webpack": "6.5.0-beta.4", "@types/node": "^14.14.20 || ^16.0.0", "babel-plugin-bundled-import-meta": "^0.3.1", "core-js": "^3.8.2", @@ -64,6 +64,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04", - "sbmodern": "dist/modern/preset.js" + "gitHead": "55247a8e36da7061bfced80c588a539d3fda3f04" } diff --git a/presets/web-components-webpack/src/preset.ts b/presets/web-components-webpack/src/preset.ts index 642222f0e02c..32fdbf290651 100644 --- a/presets/web-components-webpack/src/preset.ts +++ b/presets/web-components-webpack/src/preset.ts @@ -1,4 +1,4 @@ -import type { StorybookConfig } from '@storybook/core-common'; +import type { StorybookConfig } from '@storybook/core-webpack'; export const webpack: StorybookConfig['webpack'] = (config, options) => { const babelrcOptions = options.features?.babelModeV7 ? null : { babelrc: false }; diff --git a/renderers/html/package.json b/renderers/html/package.json index 9b5a0da3db5c..093dfd9029ba 100644 --- a/renderers/html/package.json +++ b/renderers/html/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-html", + "name": "@storybook/html", "version": "6.5.0-beta.4", "description": "Storybook HTML renderer", "keywords": [ @@ -61,6 +61,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/renderers/preact/package.json b/renderers/preact/package.json index d89e540d1567..75762e0343f4 100644 --- a/renderers/preact/package.json +++ b/renderers/preact/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-preact", + "name": "@storybook/preact", "version": "6.5.0-beta.4", "description": "Storybook Preact renderer", "keywords": [ @@ -62,6 +62,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/renderers/react/package.json b/renderers/react/package.json index ea1995d2b26c..f5dd22f9ec72 100644 --- a/renderers/react/package.json +++ b/renderers/react/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-react", + "name": "@storybook/react", "version": "6.5.0-beta.4", "description": "Storybook React renderer", "keywords": [ @@ -83,6 +83,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/renderers/server/package.json b/renderers/server/package.json index 66ae504e318b..a0048b027afd 100644 --- a/renderers/server/package.json +++ b/renderers/server/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-server", + "name": "@storybook/server", "version": "6.5.0-beta.4", "description": "Storybook Server renderer", "keywords": [ diff --git a/renderers/svelte/package.json b/renderers/svelte/package.json index be791849268e..f02ee9097855 100644 --- a/renderers/svelte/package.json +++ b/renderers/svelte/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-svelte", + "name": "@storybook/svelte", "version": "6.5.0-beta.4", "description": "Storybook Svelte renderer", "keywords": [ @@ -66,6 +66,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/renderers/vue/package.json b/renderers/vue/package.json index 1f4c639778f3..7074bee406b9 100644 --- a/renderers/vue/package.json +++ b/renderers/vue/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-vue", + "name": "@storybook/vue", "version": "6.5.0-beta.4", "description": "Storybook Vue renderer", "keywords": [ @@ -67,6 +67,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/renderers/vue3/package.json b/renderers/vue3/package.json index b09089913003..87985ab15677 100644 --- a/renderers/vue3/package.json +++ b/renderers/vue3/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-vue3", + "name": "@storybook/vue3", "version": "6.5.0-beta.4", "description": "Storybook Vue 3 renderer", "keywords": [ @@ -66,6 +66,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/renderers/web-components/package.json b/renderers/web-components/package.json index 1a045f154adf..d80e5787f6e8 100644 --- a/renderers/web-components/package.json +++ b/renderers/web-components/package.json @@ -1,5 +1,5 @@ { - "name": "@storybook/renderer-web-components", + "name": "@storybook/web-components", "version": "6.5.0-beta.4", "description": "Storybook web-components renderer", "keywords": [ @@ -68,6 +68,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21", - "sbmodern": "dist/modern/index.js" + "gitHead": "416f87dc715cae299c7b4f37f1c9db7f686d4d21" } diff --git a/scripts/utils/compile-babel.js b/scripts/utils/compile-babel.js index aa2d0873dfda..ffaa4f877698 100644 --- a/scripts/utils/compile-babel.js +++ b/scripts/utils/compile-babel.js @@ -5,7 +5,7 @@ const execa = require('execa'); function getCommand(watch, dir) { // Compile angular with tsc - if (process.cwd().includes(path.join('app', 'angular'))) { + if (process.cwd().includes(path.join('frameworks', 'angular'))) { return ''; } if (process.cwd().includes(path.join('addons', 'storyshots'))) { diff --git a/scripts/utils/compile-tsc.js b/scripts/utils/compile-tsc.js index 327e555c154d..1d745d6f69ad 100644 --- a/scripts/utils/compile-tsc.js +++ b/scripts/utils/compile-tsc.js @@ -17,7 +17,7 @@ function getCommand(watch) { * Currently, angular and storyshots (that contains an angular component) need to be compiled * with tsc. (see comments in compile-babel.js) */ - const isAngular = process.cwd().includes(path.join('app', 'angular')); + const isAngular = process.cwd().includes(path.join('frameworks', 'angular')); const isStoryshots = process.cwd().includes(path.join('addons', 'storyshots')); if (!isAngular && !isStoryshots) { args.push('--emitDeclarationOnly'); diff --git a/workspace.json b/workspace.json index 3ce7fbbb873c..b0657cf04a6c 100644 --- a/workspace.json +++ b/workspace.json @@ -66,7 +66,7 @@ "type": "library" }, "@storybook/angular": { - "root": "app/angular", + "root": "frameworks/angular", "type": "library" }, "@storybook/docs-tools": { @@ -74,43 +74,47 @@ "type": "library" }, "@storybook/ember": { - "root": "app/ember", + "root": "frameworks/ember", "type": "library" }, - "@storybook/html": { - "root": "app/html", + "@storybook/html-webpack4": { + "root": "frameworks/html-webpack4", "type": "library" }, "@storybook/manager-webpack5": { "root": "lib/manager-webpack5", "type": "library" }, - "@storybook/preact": { - "root": "app/preact", + "@storybook/preact-webpack4": { + "root": "frameworks/preact-webpack4", "type": "library" }, - "@storybook/react": { - "root": "app/react", + "@storybook/react-webpack4": { + "root": "frameworks/react-webpack4", "type": "library" }, - "@storybook/server": { - "root": "app/server", + "@storybook/server-webpack4": { + "root": "frameworks/server-webpack4", "type": "library" }, - "@storybook/svelte": { - "root": "app/svelte", + "@storybook/svelte-webpack4": { + "root": "frameworks/svelte-webpack4", "type": "library" }, - "@storybook/vue": { - "root": "app/vue", + "@storybook/vue-webpack4": { + "root": "frameworks/vue-webpack4", "type": "library" }, - "@storybook/vue3": { - "root": "app/vue3", + "@storybook/vue3-webpack4": { + "root": "frameworks/vue3-webpack4", "type": "library" }, - "@storybook/web-components": { - "root": "app/web-components", + "@storybook/web-components-webpack4": { + "root": "frameworks/web-components-webpack4", + "type": "library" + }, + "@storybook/core-webpack": { + "root": "lib/core-webpack", "type": "library" }, "angular-cli": { @@ -325,35 +329,35 @@ "root": "presets/web-components-webpack", "type": "library" }, - "@storybook/renderer-html": { + "@storybook/html": { "root": "renderers/html", "type": "library" }, - "@storybook/renderer-preact": { + "@storybook/preact": { "root": "renderers/preact", "type": "library" }, - "@storybook/renderer-react": { + "@storybook/react": { "root": "renderers/react", "type": "library" }, - "@storybook/renderer-server": { + "@storybook/server": { "root": "renderers/server", "type": "library" }, - "@storybook/renderer-svelte": { + "@storybook/svelte": { "root": "renderers/svelte", "type": "library" }, - "@storybook/renderer-vue": { + "@storybook/vue": { "root": "renderers/vue", "type": "library" }, - "@storybook/renderer-vue3": { + "@storybook/vue3": { "root": "renderers/vue3", "type": "library" }, - "@storybook/renderer-web-components": { + "@storybook/web-components": { "root": "renderers/web-components", "type": "library" } diff --git a/yarn.lock b/yarn.lock index 712a88c9322b..a9ea1743a9db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7086,9 +7086,9 @@ __metadata: languageName: node linkType: hard -"@storybook/angular@6.5.0-beta.4, @storybook/angular@workspace:*, @storybook/angular@workspace:app/angular": +"@storybook/angular@6.5.0-beta.4, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": version: 0.0.0-use.local - resolution: "@storybook/angular@workspace:app/angular" + resolution: "@storybook/angular@workspace:frameworks/angular" dependencies: "@angular-devkit/architect": ~0.1102.0 "@angular-devkit/build-angular": ~0.1102.13 @@ -7253,6 +7253,7 @@ __metadata: "@storybook/components": 6.5.0-beta.4 "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-events": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@storybook/node-logger": 6.5.0-beta.4 "@storybook/preview-web": 6.5.0-beta.4 "@storybook/router": 6.5.0-beta.4 @@ -7270,7 +7271,7 @@ __metadata: case-sensitive-paths-webpack-plugin: ^2.4.0 core-js: ^3.8.2 css-loader: ^6.7.1 - fork-ts-checker-webpack-plugin: ^7.2.6 + fork-ts-checker-webpack-plugin: ^7.2.8 glob: ^7.1.6 glob-promise: ^3.4.0 html-webpack-plugin: ^5.5.0 @@ -7557,7 +7558,6 @@ __metadata: "@babel/preset-typescript": ^7.12.7 "@babel/register": ^7.12.1 "@storybook/node-logger": 6.5.0-beta.4 - "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0 "@storybook/semver": ^7.3.2 "@types/compression": ^1.7.0 "@types/interpret": ^1.1.1 @@ -7573,7 +7573,6 @@ __metadata: express: ^4.17.1 file-system-cache: ^1.0.5 find-up: ^5.0.0 - fork-ts-checker-webpack-plugin: ^7.2.6 fs-extra: ^9.0.1 glob: ^7.1.6 handlebars: ^4.7.7 @@ -7589,7 +7588,6 @@ __metadata: telejson: ^5.3.3 ts-dedent: ^2.0.0 util-deprecate: ^1.0.2 - webpack: 5 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7683,6 +7681,18 @@ __metadata: languageName: unknown linkType: soft +"@storybook/core-webpack@6.5.0-beta.4, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": + version: 0.0.0-use.local + resolution: "@storybook/core-webpack@workspace:lib/core-webpack" + dependencies: + "@storybook/core-common": 6.5.0-beta.4 + "@storybook/node-logger": 6.5.0-beta.4 + "@types/node": ^14.0.10 || ^16.0.0 + core-js: ^3.8.2 + ts-dedent: ^2.0.0 + languageName: unknown + linkType: soft + "@storybook/csf-tools@6.5.0-beta.4, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": version: 0.0.0-use.local resolution: "@storybook/csf-tools@workspace:lib/csf-tools" @@ -7790,9 +7800,9 @@ __metadata: languageName: node linkType: hard -"@storybook/ember@6.5.0-beta.4, @storybook/ember@workspace:*, @storybook/ember@workspace:app/ember": +"@storybook/ember@6.5.0-beta.4, @storybook/ember@workspace:*, @storybook/ember@workspace:frameworks/ember": version: 0.0.0-use.local - resolution: "@storybook/ember@workspace:app/ember" + resolution: "@storybook/ember@workspace:frameworks/ember" dependencies: "@storybook/core-client": 6.5.0-beta.4 "@storybook/core-common": 6.5.0-beta.4 @@ -7837,6 +7847,7 @@ __metadata: "@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 @@ -7877,6 +7888,7 @@ __metadata: "@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 "@testing-library/dom": ^7.31.2 @@ -7896,14 +7908,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/html@6.5.0-beta.4, @storybook/html@workspace:*, @storybook/html@workspace:app/html": +"@storybook/html-webpack4@6.5.0-beta.4, @storybook/html-webpack4@workspace:*, @storybook/html-webpack4@workspace:frameworks/html-webpack4": version: 0.0.0-use.local - resolution: "@storybook/html@workspace:app/html" + resolution: "@storybook/html-webpack4@workspace:frameworks/html-webpack4" dependencies: "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 + "@storybook/html": 6.5.0-beta.4 "@storybook/preset-html-webpack": 6.5.0-beta.4 - "@storybook/renderer-html": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 global: ^4.4.0 @@ -7915,6 +7927,27 @@ __metadata: languageName: unknown linkType: soft +"@storybook/html@6.5.0-beta.4, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": + version: 0.0.0-use.local + resolution: "@storybook/html@workspace:renderers/html" + dependencies: + "@storybook/addons": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/docs-tools": 6.5.0-beta.4 + "@storybook/preview-web": 6.5.0-beta.4 + "@storybook/store": 6.5.0-beta.4 + core-js: ^3.8.2 + global: ^4.4.0 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + ts-dedent: ^2.0.0 + peerDependencies: + "@babel/core": "*" + languageName: unknown + linkType: soft + "@storybook/instrumenter@6.5.0-beta.4, @storybook/instrumenter@^6.4.0 || >=6.5.0-0, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": version: 0.0.0-use.local resolution: "@storybook/instrumenter@workspace:lib/instrumenter" @@ -7988,6 +8021,7 @@ __metadata: "@storybook/addons": 6.5.0-beta.4 "@storybook/core-client": 6.5.0-beta.4 "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@storybook/node-logger": 6.5.0-beta.4 "@storybook/theming": 6.5.0-beta.4 "@storybook/ui": 6.5.0-beta.4 @@ -8099,14 +8133,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preact@6.5.0-beta.4, @storybook/preact@workspace:*, @storybook/preact@workspace:app/preact": +"@storybook/preact-webpack4@6.5.0-beta.4, @storybook/preact-webpack4@workspace:*, @storybook/preact-webpack4@workspace:frameworks/preact-webpack4": version: 0.0.0-use.local - resolution: "@storybook/preact@workspace:app/preact" + resolution: "@storybook/preact-webpack4@workspace:frameworks/preact-webpack4" dependencies: "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 + "@storybook/preact": 6.5.0-beta.4 "@storybook/preset-preact-webpack": 6.5.0-beta.4 - "@storybook/renderer-preact": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 preact: ^10.5.13 @@ -8119,6 +8153,26 @@ __metadata: languageName: unknown linkType: soft +"@storybook/preact@6.5.0-beta.4, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": + version: 0.0.0-use.local + resolution: "@storybook/preact@workspace:renderers/preact" + dependencies: + "@storybook/addons": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/store": 6.5.0-beta.4 + core-js: ^3.8.2 + global: ^4.4.0 + preact: ^10.5.13 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + ts-dedent: ^2.0.0 + peerDependencies: + preact: ^8.0.0||^10.0.0 + languageName: unknown + linkType: soft + "@storybook/preset-create-react-app@npm:^4.1.0": version: 4.1.0 resolution: "@storybook/preset-create-react-app@npm:4.1.0" @@ -8142,14 +8196,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preset-html-webpack@workspace:presets/html-webpack" dependencies: - "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 html-loader: ^3.1.0 react: 16.14.0 react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - webpack: 5 peerDependencies: "@babel/core": "*" languageName: unknown @@ -8160,15 +8212,13 @@ __metadata: resolution: "@storybook/preset-preact-webpack@workspace:presets/preact-webpack" dependencies: "@babel/plugin-transform-react-jsx": ^7.12.12 - "@storybook/core-common": 6.5.0-beta.4 - "@storybook/renderer-preact": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 preact: ^10.5.13 react: 16.14.0 react-dom: 16.14.0 regenerator-runtime: ^0.13.7 - webpack: 5 peerDependencies: "@babel/core": "*" preact: ^8.0.0||^10.0.0 @@ -8182,11 +8232,11 @@ __metadata: "@babel/preset-flow": ^7.12.1 "@babel/preset-react": ^7.12.10 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5 - "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@storybook/docs-tools": 6.5.0-beta.4 "@storybook/node-logger": 6.5.0-beta.4 + "@storybook/react": 6.5.0-beta.4 "@storybook/react-docgen-typescript-plugin": 1.0.2-canary.6.9d540b91e815f8fc2f8829189deb00553559ff63.0 - "@storybook/renderer-react": 6.5.0-beta.4 "@storybook/semver": ^7.3.2 "@types/node": ^14.14.20 || ^16.0.0 "@types/util-deprecate": ^1.0.0 @@ -8196,13 +8246,13 @@ __metadata: fs-extra: ^9.0.1 react-refresh: ^0.11.0 regenerator-runtime: ^0.13.7 - webpack: 5 peerDependencies: "@babel/core": ^7.11.5 jest-specific-snapshot: ^4.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 require-from-string: ^2.0.2 + webpack: 4 || 5 peerDependenciesMeta: "@babel/core": optional: true @@ -8226,9 +8276,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preset-server-webpack@workspace:presets/server-webpack" dependencies: - "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 - "@storybook/renderer-server": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 + "@storybook/server": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 fs-extra: ^9.0.1 @@ -8247,7 +8297,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preset-svelte-webpack@workspace:presets/svelte-webpack" dependencies: - "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@storybook/node-logger": 6.5.0-beta.4 core-js: ^3.8.2 react: 16.14.0 @@ -8257,7 +8307,6 @@ __metadata: svelte-loader: ^3.1.2 sveltedoc-parser: 4.1.0 ts-dedent: ^2.0.0 - webpack: 5 peerDependencies: "@babel/core": "*" svelte: ^3.1.0 @@ -8269,7 +8318,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preset-vue-webpack@workspace:presets/vue-webpack" dependencies: - "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@storybook/docs-tools": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 @@ -8297,7 +8346,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preset-vue3-webpack@workspace:presets/vue3-webpack" dependencies: - "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@storybook/docs-tools": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 "@vue/compiler-sfc": 3.0.0 @@ -8326,7 +8375,7 @@ __metadata: "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/preset-env": ^7.12.11 - "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-webpack": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 babel-plugin-bundled-import-meta: ^0.3.1 core-js: ^3.8.2 @@ -8383,14 +8432,13 @@ __metadata: languageName: node linkType: hard -"@storybook/react@6.5.0-beta.4, @storybook/react@workspace:*, @storybook/react@workspace:app/react": +"@storybook/react-webpack4@6.5.0-beta.4, @storybook/react-webpack4@workspace:*, @storybook/react-webpack4@workspace:frameworks/react-webpack4": version: 0.0.0-use.local - resolution: "@storybook/react@workspace:app/react" + resolution: "@storybook/react-webpack4@workspace:frameworks/react-webpack4" dependencies: - "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 "@storybook/preset-react-webpack": 6.5.0-beta.4 - "@storybook/renderer-react": 6.5.0-beta.4 + "@storybook/react": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 jest-specific-snapshot: ^4.0.0 @@ -8407,50 +8455,9 @@ __metadata: languageName: unknown linkType: soft -"@storybook/renderer-html@6.5.0-beta.4, @storybook/renderer-html@workspace:*, @storybook/renderer-html@workspace:renderers/html": - version: 0.0.0-use.local - resolution: "@storybook/renderer-html@workspace:renderers/html" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/docs-tools": 6.5.0-beta.4 - "@storybook/preview-web": 6.5.0-beta.4 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - ts-dedent: ^2.0.0 - peerDependencies: - "@babel/core": "*" - languageName: unknown - linkType: soft - -"@storybook/renderer-preact@6.5.0-beta.4, @storybook/renderer-preact@workspace:*, @storybook/renderer-preact@workspace:renderers/preact": +"@storybook/react@6.5.0-beta.4, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": version: 0.0.0-use.local - resolution: "@storybook/renderer-preact@workspace:renderers/preact" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - preact: ^10.5.13 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - ts-dedent: ^2.0.0 - peerDependencies: - preact: ^8.0.0||^10.0.0 - languageName: unknown - linkType: soft - -"@storybook/renderer-react@6.5.0-beta.4, @storybook/renderer-react@workspace:*, @storybook/renderer-react@workspace:renderers/react": - version: 0.0.0-use.local - resolution: "@storybook/renderer-react@workspace:renderers/react" + resolution: "@storybook/react@workspace:renderers/react" dependencies: "@babel/core": ^7.11.5 "@storybook/addons": 6.5.0-beta.4 @@ -8486,119 +8493,6 @@ __metadata: languageName: unknown linkType: soft -"@storybook/renderer-server@6.5.0-beta.4, @storybook/renderer-server@workspace:*, @storybook/renderer-server@workspace:renderers/server": - version: 0.0.0-use.local - resolution: "@storybook/renderer-server@workspace:renderers/server" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/preview-web": 6.5.0-beta.4 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - ts-dedent: ^2.0.0 - languageName: unknown - linkType: soft - -"@storybook/renderer-svelte@6.5.0-beta.4, @storybook/renderer-svelte@workspace:*, @storybook/renderer-svelte@workspace:renderers/svelte": - version: 0.0.0-use.local - resolution: "@storybook/renderer-svelte@workspace:renderers/svelte" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/client-logger": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/docs-tools": 6.5.0-beta.4 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - svelte: ^3.31.2 - sveltedoc-parser: 4.1.0 - peerDependencies: - "@babel/core": "*" - svelte: ^3.1.0 - languageName: unknown - linkType: soft - -"@storybook/renderer-vue3@6.5.0-beta.4, @storybook/renderer-vue3@workspace:*, @storybook/renderer-vue3@workspace:renderers/vue3": - version: 0.0.0-use.local - resolution: "@storybook/renderer-vue3@workspace:renderers/vue3" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/docs-tools": 6.5.0-beta.4 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - ts-dedent: ^2.0.0 - vue: 3.0.0 - peerDependencies: - "@babel/core": "*" - babel-loader: ^7.0.0 || ^8.0.0 - vue: ^3.0.0 - languageName: unknown - linkType: soft - -"@storybook/renderer-vue@6.5.0-beta.4, @storybook/renderer-vue@workspace:*, @storybook/renderer-vue@workspace:renderers/vue": - version: 0.0.0-use.local - resolution: "@storybook/renderer-vue@workspace:renderers/vue" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/client-logger": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/docs-tools": 6.5.0-beta.4 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - ts-dedent: ^2.0.0 - vue: ^2.6.12 - peerDependencies: - "@babel/core": "*" - babel-loader: ^7.0.0 || ^8.0.0 - css-loader: "*" - vue: ^2.6.8 - languageName: unknown - linkType: soft - -"@storybook/renderer-web-components@6.5.0-beta.4, @storybook/renderer-web-components@workspace:*, @storybook/renderer-web-components@workspace:renderers/web-components": - version: 0.0.0-use.local - resolution: "@storybook/renderer-web-components@workspace:renderers/web-components" - dependencies: - "@storybook/addons": 6.5.0-beta.4 - "@storybook/api": 6.5.0-beta.4 - "@storybook/client-logger": 6.5.0-beta.4 - "@storybook/core-client": 6.5.0-beta.4 - "@storybook/csf": 0.0.2--canary.4566f4d.1 - "@storybook/docs-tools": 6.5.0-beta.4 - "@storybook/preview-web": 6.5.0-beta.4 - "@storybook/store": 6.5.0-beta.4 - core-js: ^3.8.2 - global: ^4.4.0 - lit-html: 2.0.2 - react: 16.14.0 - react-dom: 16.14.0 - regenerator-runtime: ^0.13.7 - ts-dedent: ^2.0.0 - peerDependencies: - lit-html: ^1.4.1 || ^2.0.0 - languageName: unknown - linkType: soft - "@storybook/root@workspace:.": version: 0.0.0-use.local resolution: "@storybook/root@workspace:." @@ -8665,17 +8559,20 @@ __metadata: "@storybook/codemod": "workspace:*" "@storybook/components": "workspace:*" "@storybook/core-events": "workspace:*" + "@storybook/core-webpack": "workspace:*" "@storybook/csf-tools": "workspace:*" "@storybook/docs-tools": "workspace:*" "@storybook/ember": "workspace:*" "@storybook/eslint-config-storybook": ^2.4.0 "@storybook/html": "workspace:*" + "@storybook/html-webpack4": "workspace:*" "@storybook/instrumenter": "workspace:*" "@storybook/jest": ^0.0.5 "@storybook/linter-config": ^2.5.0 "@storybook/node-logger": "workspace:*" "@storybook/postinstall": "workspace:*" "@storybook/preact": "workspace:*" + "@storybook/preact-webpack4": "workspace:*" "@storybook/preset-html-webpack": "workspace:*" "@storybook/preset-preact-webpack": "workspace:*" "@storybook/preset-react-webpack": "workspace:*" @@ -8686,26 +8583,25 @@ __metadata: "@storybook/preset-web-components-webpack": "workspace:*" "@storybook/preview-web": "workspace:*" "@storybook/react": "workspace:*" - "@storybook/renderer-html": "workspace:*" - "@storybook/renderer-preact": "workspace:*" - "@storybook/renderer-react": "workspace:*" - "@storybook/renderer-server": "workspace:*" - "@storybook/renderer-svelte": "workspace:*" - "@storybook/renderer-vue": "workspace:*" - "@storybook/renderer-vue3": "workspace:*" - "@storybook/renderer-web-components": "workspace:*" + "@storybook/react-webpack4": "workspace:*" "@storybook/router": "workspace:*" "@storybook/semver": ^7.3.2 "@storybook/server": "workspace:*" + "@storybook/server-webpack4": "workspace:*" "@storybook/source-loader": "workspace:*" "@storybook/store": "workspace:*" "@storybook/svelte": "workspace:*" + "@storybook/svelte-webpack4": "workspace:*" "@storybook/telemetry": "workspace:*" "@storybook/testing-library": ^0.0.7 "@storybook/theming": "workspace:*" "@storybook/ui": "workspace:*" "@storybook/vue": "workspace:*" + "@storybook/vue-webpack4": "workspace:*" + "@storybook/vue3": "workspace:*" + "@storybook/vue3-webpack4": "workspace:*" "@storybook/web-components": "workspace:*" + "@storybook/web-components-webpack4": "workspace:*" "@testing-library/dom": ^7.29.4 "@testing-library/jest-dom": ^5.11.9 "@testing-library/react": ^11.2.2 @@ -8923,14 +8819,14 @@ __metadata: languageName: node linkType: hard -"@storybook/server@6.5.0-beta.4, @storybook/server@workspace:*, @storybook/server@workspace:app/server": +"@storybook/server-webpack4@6.5.0-beta.4, @storybook/server-webpack4@workspace:*, @storybook/server-webpack4@workspace:frameworks/server-webpack4": version: 0.0.0-use.local - resolution: "@storybook/server@workspace:app/server" + resolution: "@storybook/server-webpack4@workspace:frameworks/server-webpack4" dependencies: "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 "@storybook/preset-server-webpack": 6.5.0-beta.4 - "@storybook/renderer-server": 6.5.0-beta.4 + "@storybook/server": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 react: 16.14.0 @@ -8939,6 +8835,24 @@ __metadata: languageName: unknown linkType: soft +"@storybook/server@6.5.0-beta.4, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": + version: 0.0.0-use.local + resolution: "@storybook/server@workspace:renderers/server" + dependencies: + "@storybook/addons": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/preview-web": 6.5.0-beta.4 + "@storybook/store": 6.5.0-beta.4 + core-js: ^3.8.2 + global: ^4.4.0 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + ts-dedent: ^2.0.0 + languageName: unknown + linkType: soft + "@storybook/source-loader@6.5.0-beta.4, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": version: 0.0.0-use.local resolution: "@storybook/source-loader@workspace:lib/source-loader" @@ -8983,14 +8897,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/svelte@6.5.0-beta.4, @storybook/svelte@workspace:*, @storybook/svelte@workspace:app/svelte": +"@storybook/svelte-webpack4@6.5.0-beta.4, @storybook/svelte-webpack4@workspace:*, @storybook/svelte-webpack4@workspace:frameworks/svelte-webpack4": version: 0.0.0-use.local - resolution: "@storybook/svelte@workspace:app/svelte" + resolution: "@storybook/svelte-webpack4@workspace:frameworks/svelte-webpack4" dependencies: "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 "@storybook/preset-svelte-webpack": 6.5.0-beta.4 - "@storybook/renderer-svelte": 6.5.0-beta.4 + "@storybook/svelte": 6.5.0-beta.4 core-js: ^3.8.2 react: 16.14.0 react-dom: 16.14.0 @@ -9004,6 +8918,29 @@ __metadata: languageName: unknown linkType: soft +"@storybook/svelte@6.5.0-beta.4, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": + version: 0.0.0-use.local + resolution: "@storybook/svelte@workspace:renderers/svelte" + dependencies: + "@storybook/addons": 6.5.0-beta.4 + "@storybook/client-logger": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/docs-tools": 6.5.0-beta.4 + "@storybook/store": 6.5.0-beta.4 + core-js: ^3.8.2 + global: ^4.4.0 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + svelte: ^3.31.2 + sveltedoc-parser: 4.1.0 + peerDependencies: + "@babel/core": "*" + svelte: ^3.1.0 + languageName: unknown + linkType: soft + "@storybook/telemetry@6.5.0-beta.4, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": version: 0.0.0-use.local resolution: "@storybook/telemetry@workspace:lib/telemetry" @@ -9137,14 +9074,40 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue3@6.5.0-beta.4, @storybook/vue3@workspace:app/vue3": +"@storybook/vue-webpack4@6.5.0-beta.4, @storybook/vue-webpack4@workspace:*, @storybook/vue-webpack4@workspace:frameworks/vue-webpack4": version: 0.0.0-use.local - resolution: "@storybook/vue3@workspace:app/vue3" + resolution: "@storybook/vue-webpack4@workspace:frameworks/vue-webpack4" + dependencies: + "@storybook/core-common": 6.5.0-beta.4 + "@storybook/core-server": 6.5.0-beta.4 + "@storybook/preset-vue-webpack": 6.5.0-beta.4 + "@storybook/vue": 6.5.0-beta.4 + "@types/node": ^14.14.20 || ^16.0.0 + core-js: ^3.8.2 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + vue: ^2.6.12 + vue-loader: ^17.0.0 + vue-template-compiler: ^2.6.14 + peerDependencies: + "@babel/core": "*" + babel-loader: ^7.0.0 || ^8.0.0 + css-loader: "*" + vue: ^2.6.8 + vue-loader: ^15.7.0 + vue-template-compiler: ^2.6.8 + languageName: unknown + linkType: soft + +"@storybook/vue3-webpack4@6.5.0-beta.4, @storybook/vue3-webpack4@workspace:*, @storybook/vue3-webpack4@workspace:frameworks/vue3-webpack4": + version: 0.0.0-use.local + resolution: "@storybook/vue3-webpack4@workspace:frameworks/vue3-webpack4" dependencies: "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 "@storybook/preset-vue3-webpack": 6.5.0-beta.4 - "@storybook/renderer-vue3": 6.5.0-beta.4 + "@storybook/vue3": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 "@vue/compiler-sfc": 3.0.0 core-js: ^3.8.2 @@ -9160,41 +9123,63 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue@6.5.0-beta.4, @storybook/vue@workspace:*, @storybook/vue@workspace:app/vue": +"@storybook/vue3@6.5.0-beta.4, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": version: 0.0.0-use.local - resolution: "@storybook/vue@workspace:app/vue" + resolution: "@storybook/vue3@workspace:renderers/vue3" dependencies: - "@storybook/core-common": 6.5.0-beta.4 - "@storybook/core-server": 6.5.0-beta.4 - "@storybook/preset-vue-webpack": 6.5.0-beta.4 - "@storybook/renderer-vue": 6.5.0-beta.4 - "@types/node": ^14.14.20 || ^16.0.0 + "@storybook/addons": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/docs-tools": 6.5.0-beta.4 + "@storybook/store": 6.5.0-beta.4 + core-js: ^3.8.2 + global: ^4.4.0 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + ts-dedent: ^2.0.0 + vue: 3.0.0 + peerDependencies: + "@babel/core": "*" + babel-loader: ^7.0.0 || ^8.0.0 + vue: ^3.0.0 + languageName: unknown + linkType: soft + +"@storybook/vue@6.5.0-beta.4, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": + version: 0.0.0-use.local + resolution: "@storybook/vue@workspace:renderers/vue" + dependencies: + "@storybook/addons": 6.5.0-beta.4 + "@storybook/client-logger": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/docs-tools": 6.5.0-beta.4 + "@storybook/store": 6.5.0-beta.4 core-js: ^3.8.2 + global: ^4.4.0 react: 16.14.0 react-dom: 16.14.0 regenerator-runtime: ^0.13.7 + ts-dedent: ^2.0.0 vue: ^2.6.12 - vue-loader: ^17.0.0 - vue-template-compiler: ^2.6.14 peerDependencies: "@babel/core": "*" babel-loader: ^7.0.0 || ^8.0.0 css-loader: "*" vue: ^2.6.8 - vue-loader: ^15.7.0 - vue-template-compiler: ^2.6.8 languageName: unknown linkType: soft -"@storybook/web-components@workspace:*, @storybook/web-components@workspace:app/web-components": +"@storybook/web-components-webpack4@workspace:*, @storybook/web-components-webpack4@workspace:frameworks/web-components-webpack4": version: 0.0.0-use.local - resolution: "@storybook/web-components@workspace:app/web-components" + resolution: "@storybook/web-components-webpack4@workspace:frameworks/web-components-webpack4" dependencies: "@babel/preset-env": ^7.12.11 "@storybook/core-common": 6.5.0-beta.4 "@storybook/core-server": 6.5.0-beta.4 "@storybook/preset-web-components-webpack": 6.5.0-beta.4 - "@storybook/renderer-web-components": 6.5.0-beta.4 + "@storybook/web-components": 6.5.0-beta.4 "@types/node": ^14.14.20 || ^16.0.0 core-js: ^3.8.2 lit-html: 2.0.2 @@ -9206,6 +9191,30 @@ __metadata: languageName: unknown linkType: soft +"@storybook/web-components@6.5.0-beta.4, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": + version: 0.0.0-use.local + resolution: "@storybook/web-components@workspace:renderers/web-components" + dependencies: + "@storybook/addons": 6.5.0-beta.4 + "@storybook/api": 6.5.0-beta.4 + "@storybook/client-logger": 6.5.0-beta.4 + "@storybook/core-client": 6.5.0-beta.4 + "@storybook/csf": 0.0.2--canary.4566f4d.1 + "@storybook/docs-tools": 6.5.0-beta.4 + "@storybook/preview-web": 6.5.0-beta.4 + "@storybook/store": 6.5.0-beta.4 + core-js: ^3.8.2 + global: ^4.4.0 + lit-html: 2.0.2 + react: 16.14.0 + react-dom: 16.14.0 + regenerator-runtime: ^0.13.7 + ts-dedent: ^2.0.0 + peerDependencies: + lit-html: ^1.4.1 || ^2.0.0 + languageName: unknown + linkType: soft + "@stroncium/procfs@npm:^1.2.1": version: 1.2.1 resolution: "@stroncium/procfs@npm:1.2.1" @@ -17459,6 +17468,7 @@ __metadata: "@storybook/client-logger": 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 global: ^4.4.0 prop-types: ^15.7.2 @@ -17482,6 +17492,7 @@ __metadata: "@storybook/components": 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 "@storybook/theming": 6.5.0-beta.4 "@types/jest": ^26.0.16 @@ -17513,6 +17524,7 @@ __metadata: "@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 "@types/jest": 25.2.3 "@types/node": ^14.14.20 || ^16.0.0 @@ -22825,6 +22837,32 @@ __metadata: languageName: node linkType: hard +"fork-ts-checker-webpack-plugin@npm:^7.2.8": + version: 7.2.8 + resolution: "fork-ts-checker-webpack-plugin@npm:7.2.8" + dependencies: + "@babel/code-frame": ^7.16.7 + chalk: ^4.1.2 + chokidar: ^3.5.3 + cosmiconfig: ^7.0.1 + deepmerge: ^4.2.2 + fs-extra: ^10.0.0 + memfs: ^3.4.1 + minimatch: ^3.0.4 + schema-utils: ^3.1.1 + semver: ^7.3.5 + tapable: ^2.2.1 + peerDependencies: + typescript: ">3.6.0" + vue-template-compiler: "*" + webpack: ^5.11.0 + peerDependenciesMeta: + vue-template-compiler: + optional: true + checksum: a142888a4eb5846ec7f837b039a866121476f002a86fa981ae91c6bcf57986f3d330bcfe07eb38a4c97002c3332a3069a40f602ffa3f3f393b14cbfa24737d31 + languageName: node + linkType: hard + "form-data@npm:^2.5.0": version: 2.5.1 resolution: "form-data@npm:2.5.1" @@ -24646,6 +24684,7 @@ __metadata: "@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 @@ -33077,6 +33116,7 @@ __metadata: "@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 @@ -35815,6 +35855,7 @@ __metadata: "@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 @@ -39836,6 +39877,7 @@ __metadata: "@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 @@ -40784,6 +40826,7 @@ __metadata: "@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 @@ -41625,6 +41668,7 @@ __metadata: "@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 global: ^4.4.0 sb: 6.5.0-beta.4 @@ -44544,6 +44588,7 @@ __metadata: "@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 @@ -44576,6 +44621,7 @@ __metadata: "@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 @@ -44643,6 +44689,7 @@ __metadata: "@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