From 7aff6dfbe28e840a73efc8f8b3b0f7ef8976bb1c Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 10:27:04 +0100 Subject: [PATCH 01/46] rename /register to /manager --- addons/a11y/preset.js | 2 +- addons/a11y/register.js | 2 +- addons/a11y/src/{register.tsx => manager.tsx} | 0 addons/actions/preset.js | 2 +- addons/actions/register.js | 2 +- .../actions/src/{register.tsx => manager.tsx} | 0 addons/backgrounds/preset.js | 2 +- addons/backgrounds/register.js | 2 +- .../src/{register.tsx => manager.tsx} | 0 addons/controls/manager.js | 1 + addons/controls/package.json | 6 +-- addons/controls/preset.js | 2 +- addons/controls/register.js | 3 +- .../src/{register.tsx => manager.tsx} | 0 addons/docs/register.js | 2 +- addons/docs/src/{register.ts => manager.ts} | 0 addons/interactions/package.json | 4 +- addons/interactions/preset.js | 2 +- addons/interactions/register.js | 2 +- .../src/{register.tsx => manager.tsx} | 0 addons/jest/register.js | 2 +- addons/jest/src/{register.tsx => manager.tsx} | 0 addons/links/preset.js | 2 +- addons/links/register.js | 2 +- addons/links/src/{register.ts => manager.ts} | 0 addons/measure/preset.js | 2 +- addons/measure/register.js | 2 +- .../measure/src/{register.tsx => manager.tsx} | 0 addons/outline/preset.js | 2 +- addons/outline/register.js | 2 +- .../outline/src/{register.tsx => manager.tsx} | 0 addons/storysource/preset.js | 2 +- addons/storysource/register.js | 2 +- .../src/{register.tsx => manager.tsx} | 0 addons/toolbars/package.json | 8 ++-- addons/toolbars/preset.js | 2 +- addons/toolbars/register.js | 2 +- .../src/{register.tsx => manager.tsx} | 0 addons/viewport/preset.js | 2 +- addons/viewport/register.js | 2 +- .../src/{register.tsx => manager.tsx} | 0 .../common/args-usage-with-addons.js.mdx | 2 +- .../my-addon-initial-panel-state.js.mdx | 2 +- .../my-addon-preset-implementation.js.mdx | 2 +- .../storybook-addon-change-panel.js.mdx | 2 +- .../storybook-addon-disable-addon.js.mdx | 2 +- ...k-addon-load-external-addons-preset.js.mdx | 2 +- .../storybook-addon-panel-example.js.mdx | 2 +- .../storybook-addon-panel-initial.js.mdx | 2 +- .../storybook-addon-preset-example.js.mdx | 2 +- .../common/storybook-addon-tab-example.js.mdx | 2 +- .../storybook-addon-toolbar-example.js.mdx | 2 +- ...ybook-addons-api-disablequeryparams.js.mdx | 2 +- .../storybook-addons-api-getqueryparam.js.mdx | 2 +- .../storybook-addons-api-geturlstate.js.mdx | 2 +- .../storybook-addons-api-imports.js.mdx | 2 +- .../storybook-addons-api-makedecorator.js.mdx | 2 +- .../common/storybook-addons-api-on.js.mdx | 2 +- .../storybook-addons-api-register.js.mdx | 2 +- ...book-addons-api-selectincurrentkind.js.mdx | 2 +- .../storybook-addons-api-selectstory.js.mdx | 2 +- ...storybook-addons-api-setqueryparams.js.mdx | 2 +- .../storybook-addons-api-useaddonstate.js.mdx | 2 +- .../common/storybook-addons-api-useapi.js.mdx | 2 +- .../storybook-addons-api-usechannel.js.mdx | 2 +- .../storybook-addons-api-useglobal.js.mdx | 2 +- .../storybook-addons-api-useparameter.js.mdx | 2 +- ...rybook-addons-api-usestorybookstate.js.mdx | 2 +- .../storybook-argtypes-with-addon.js.mdx | 2 +- .../storybook-main-register-addon.js.mdx | 2 +- ...-main-register-presets-managerentry.js.mdx | 2 +- .../storybook-main-use-manager-entries.js.mdx | 2 +- ...orybook-storysource-manager-entries.js.mdx | 2 +- .../localAddon/{register.tsx => manager.tsx} | 0 .../cra-ts-kitchen-sink/.storybook/main.ts | 2 +- lib/cli/src/add.test.ts | 46 +++++++++---------- lib/cli/src/add.ts | 4 +- .../template-csf/storybook/addons.js | 6 +-- .../template-csf/storybook/rn-addons.js | 4 +- lib/core-common/src/presets.test.ts | 9 ++++ lib/core-common/src/presets.ts | 20 ++++++-- .../cra-ts-essentials_manager-dev-posix | 12 ++--- .../cra-ts-essentials_manager-prod-posix | 12 ++--- .../html-kitchen-sink_manager-dev-posix | 14 +++--- .../html-kitchen-sink_manager-prod-posix | 14 +++--- .../__snapshots__/vue-3-cli_manager-dev-posix | 18 ++++---- .../vue-3-cli_manager-prod-posix | 18 ++++---- ...-components-kitchen-sink_manager-dev-posix | 18 ++++---- ...components-kitchen-sink_manager-prod-posix | 18 ++++---- 89 files changed, 184 insertions(+), 163 deletions(-) rename addons/a11y/src/{register.tsx => manager.tsx} (100%) rename addons/actions/src/{register.tsx => manager.tsx} (100%) rename addons/backgrounds/src/{register.tsx => manager.tsx} (100%) create mode 100644 addons/controls/manager.js rename addons/controls/src/{register.tsx => manager.tsx} (100%) rename addons/docs/src/{register.ts => manager.ts} (100%) rename addons/interactions/src/{register.tsx => manager.tsx} (100%) rename addons/jest/src/{register.tsx => manager.tsx} (100%) rename addons/links/src/{register.ts => manager.ts} (100%) rename addons/measure/src/{register.tsx => manager.tsx} (100%) rename addons/outline/src/{register.tsx => manager.tsx} (100%) rename addons/storysource/src/{register.tsx => manager.tsx} (100%) rename addons/toolbars/src/{register.tsx => manager.tsx} (100%) rename addons/viewport/src/{register.tsx => manager.tsx} (100%) rename examples/cra-ts-kitchen-sink/.storybook/localAddon/{register.tsx => manager.tsx} (100%) diff --git a/addons/a11y/preset.js b/addons/a11y/preset.js index fc6884de55c6..8dbfe7a60831 100644 --- a/addons/a11y/preset.js +++ b/addons/a11y/preset.js @@ -1,5 +1,5 @@ function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } function config(entry = []) { diff --git a/addons/a11y/register.js b/addons/a11y/register.js index f209c0eb3703..81964d78c606 100755 --- a/addons/a11y/register.js +++ b/addons/a11y/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/a11y/src/register.tsx b/addons/a11y/src/manager.tsx similarity index 100% rename from addons/a11y/src/register.tsx rename to addons/a11y/src/manager.tsx diff --git a/addons/actions/preset.js b/addons/actions/preset.js index ba70abe968e6..2047730404c4 100644 --- a/addons/actions/preset.js +++ b/addons/actions/preset.js @@ -1,5 +1,5 @@ function managerEntries(entry, options) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } function config(entry = [], { addDecorator = true } = {}) { diff --git a/addons/actions/register.js b/addons/actions/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/actions/register.js +++ b/addons/actions/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/actions/src/register.tsx b/addons/actions/src/manager.tsx similarity index 100% rename from addons/actions/src/register.tsx rename to addons/actions/src/manager.tsx diff --git a/addons/backgrounds/preset.js b/addons/backgrounds/preset.js index a80aaefb5b30..7a0ed685b003 100644 --- a/addons/backgrounds/preset.js +++ b/addons/backgrounds/preset.js @@ -7,7 +7,7 @@ function config(entry = []) { } function managerEntries(entry = [], options) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { diff --git a/addons/backgrounds/register.js b/addons/backgrounds/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/backgrounds/register.js +++ b/addons/backgrounds/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/backgrounds/src/register.tsx b/addons/backgrounds/src/manager.tsx similarity index 100% rename from addons/backgrounds/src/register.tsx rename to addons/backgrounds/src/manager.tsx diff --git a/addons/controls/manager.js b/addons/controls/manager.js new file mode 100644 index 000000000000..4e287d25b151 --- /dev/null +++ b/addons/controls/manager.js @@ -0,0 +1 @@ +import './dist/esm/manager'; diff --git a/addons/controls/package.json b/addons/controls/package.json index df0bac754587..2101dcae8a4c 100644 --- a/addons/controls/package.json +++ b/addons/controls/package.json @@ -25,8 +25,8 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/register.js", - "module": "dist/esm/register.js", + "main": "dist/cjs/manager.js", + "module": "dist/esm/manager.js", "types": "dist/ts3.9/index.d.ts", "typesVersions": { "<3.8": { @@ -74,7 +74,7 @@ "access": "public" }, "gitHead": "5cd3cd92ff4ab3dce81726f0d3913d7077926bee", - "sbmodern": "dist/modern/register.js", + "sbmodern": "dist/modern/manager.js", "storybook": { "displayName": "Controls", "icon": "https://user-images.githubusercontent.com/263385/101991669-479cc600-3c7c-11eb-93d9-38b67e8371f2.png", diff --git a/addons/controls/preset.js b/addons/controls/preset.js index 3dd9b66d3aa7..e4d018037bbe 100644 --- a/addons/controls/preset.js +++ b/addons/controls/preset.js @@ -2,7 +2,7 @@ function managerEntries(entry = [], options) { // eslint-disable-next-line global-require const { checkDocsLoaded } = require('./dist/cjs/preset/checkDocsLoaded'); checkDocsLoaded(options.configDir); - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { managerEntries }; diff --git a/addons/controls/register.js b/addons/controls/register.js index 681a5d09dcec..e6fe91b6dd65 100644 --- a/addons/controls/register.js +++ b/addons/controls/register.js @@ -1 +1,2 @@ -import './dist/esm/register'; +// @deprecated - please remove in 7.0 +import './dist/esm/manager'; diff --git a/addons/controls/src/register.tsx b/addons/controls/src/manager.tsx similarity index 100% rename from addons/controls/src/register.tsx rename to addons/controls/src/manager.tsx diff --git a/addons/docs/register.js b/addons/docs/register.js index 980200ade086..afaa5ae8ebd5 100644 --- a/addons/docs/register.js +++ b/addons/docs/register.js @@ -1,2 +1,2 @@ /* eslint-disable import/extensions */ -require('./dist/esm/register.js'); +require('./dist/esm/manager.js'); diff --git a/addons/docs/src/register.ts b/addons/docs/src/manager.ts similarity index 100% rename from addons/docs/src/register.ts rename to addons/docs/src/manager.ts diff --git a/addons/interactions/package.json b/addons/interactions/package.json index 7aa41cc8a891..33a8270bed7e 100644 --- a/addons/interactions/package.json +++ b/addons/interactions/package.json @@ -21,8 +21,8 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/register.js", - "module": "dist/esm/register.js", + "main": "dist/cjs/manager.js", + "module": "dist/esm/manager.js", "types": "dist/ts3.9/index.d.ts", "typesVersions": { "<3.8": { diff --git a/addons/interactions/preset.js b/addons/interactions/preset.js index d7d7f8fd24f9..aeb3255f85e8 100644 --- a/addons/interactions/preset.js +++ b/addons/interactions/preset.js @@ -6,7 +6,7 @@ function managerEntries(entry = [], options) { // eslint-disable-next-line global-require const { checkActionsLoaded } = require('./dist/cjs/preset/checkActionsLoaded'); checkActionsLoaded(options.configDir); - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { diff --git a/addons/interactions/register.js b/addons/interactions/register.js index 681a5d09dcec..4e287d25b151 100644 --- a/addons/interactions/register.js +++ b/addons/interactions/register.js @@ -1 +1 @@ -import './dist/esm/register'; +import './dist/esm/manager'; diff --git a/addons/interactions/src/register.tsx b/addons/interactions/src/manager.tsx similarity index 100% rename from addons/interactions/src/register.tsx rename to addons/interactions/src/manager.tsx diff --git a/addons/jest/register.js b/addons/jest/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/jest/register.js +++ b/addons/jest/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/jest/src/register.tsx b/addons/jest/src/manager.tsx similarity index 100% rename from addons/jest/src/register.tsx rename to addons/jest/src/manager.tsx diff --git a/addons/links/preset.js b/addons/links/preset.js index 2b5ed5ac00d6..3a98a99189c4 100644 --- a/addons/links/preset.js +++ b/addons/links/preset.js @@ -1,5 +1,5 @@ function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } function config(entry = [], { addDecorator = true } = {}) { diff --git a/addons/links/register.js b/addons/links/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/links/register.js +++ b/addons/links/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/links/src/register.ts b/addons/links/src/manager.ts similarity index 100% rename from addons/links/src/register.ts rename to addons/links/src/manager.ts diff --git a/addons/measure/preset.js b/addons/measure/preset.js index 459bbb650ccd..eb939722176b 100644 --- a/addons/measure/preset.js +++ b/addons/measure/preset.js @@ -3,7 +3,7 @@ function config(entry = []) { } function managerEntries(entry = [], options) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { diff --git a/addons/measure/register.js b/addons/measure/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/measure/register.js +++ b/addons/measure/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/measure/src/register.tsx b/addons/measure/src/manager.tsx similarity index 100% rename from addons/measure/src/register.tsx rename to addons/measure/src/manager.tsx diff --git a/addons/outline/preset.js b/addons/outline/preset.js index 459bbb650ccd..eb939722176b 100644 --- a/addons/outline/preset.js +++ b/addons/outline/preset.js @@ -3,7 +3,7 @@ function config(entry = []) { } function managerEntries(entry = [], options) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { diff --git a/addons/outline/register.js b/addons/outline/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/outline/register.js +++ b/addons/outline/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/outline/src/register.tsx b/addons/outline/src/manager.tsx similarity index 100% rename from addons/outline/src/register.tsx rename to addons/outline/src/manager.tsx diff --git a/addons/storysource/preset.js b/addons/storysource/preset.js index 9a53f8d68228..9ffb6ac993f5 100644 --- a/addons/storysource/preset.js +++ b/addons/storysource/preset.js @@ -25,7 +25,7 @@ function webpack(webpackConfig = {}, options = {}) { } function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { webpack, managerEntries }; diff --git a/addons/storysource/register.js b/addons/storysource/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/storysource/register.js +++ b/addons/storysource/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/storysource/src/register.tsx b/addons/storysource/src/manager.tsx similarity index 100% rename from addons/storysource/src/register.tsx rename to addons/storysource/src/manager.tsx diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json index 9bee5167a198..5445bbe01b31 100644 --- a/addons/toolbars/package.json +++ b/addons/toolbars/package.json @@ -25,9 +25,9 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/register.js", - "module": "dist/esm/register.js", - "types": "dist/ts3.9/register.d.ts", + "main": "dist/cjs/manager.js", + "module": "dist/esm/manager.js", + "types": "dist/ts3.9/manager.d.ts", "typesVersions": { "<3.8": { "dist/ts3.9/*": [ @@ -68,7 +68,7 @@ "access": "public" }, "gitHead": "5cd3cd92ff4ab3dce81726f0d3913d7077926bee", - "sbmodern": "dist/modern/register.js", + "sbmodern": "dist/modern/manager.js", "storybook": { "displayName": "Toolbars", "icon": "https://user-images.githubusercontent.com/263385/101991677-48cdf300-3c7c-11eb-93b4-19b0e3366959.png", diff --git a/addons/toolbars/preset.js b/addons/toolbars/preset.js index 656f27562a44..90d004664d16 100644 --- a/addons/toolbars/preset.js +++ b/addons/toolbars/preset.js @@ -1,5 +1,5 @@ function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { managerEntries }; diff --git a/addons/toolbars/register.js b/addons/toolbars/register.js index 681a5d09dcec..4e287d25b151 100644 --- a/addons/toolbars/register.js +++ b/addons/toolbars/register.js @@ -1 +1 @@ -import './dist/esm/register'; +import './dist/esm/manager'; diff --git a/addons/toolbars/src/register.tsx b/addons/toolbars/src/manager.tsx similarity index 100% rename from addons/toolbars/src/register.tsx rename to addons/toolbars/src/manager.tsx diff --git a/addons/viewport/preset.js b/addons/viewport/preset.js index 656f27562a44..90d004664d16 100644 --- a/addons/viewport/preset.js +++ b/addons/viewport/preset.js @@ -1,5 +1,5 @@ function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/register')]; + return [...entry, require.resolve('./dist/esm/manager')]; } module.exports = { managerEntries }; diff --git a/addons/viewport/register.js b/addons/viewport/register.js index f209c0eb3703..81964d78c606 100644 --- a/addons/viewport/register.js +++ b/addons/viewport/register.js @@ -1 +1 @@ -require('./dist/esm/register'); +require('./dist/esm/manager'); diff --git a/addons/viewport/src/register.tsx b/addons/viewport/src/manager.tsx similarity index 100% rename from addons/viewport/src/register.tsx rename to addons/viewport/src/manager.tsx diff --git a/docs/snippets/common/args-usage-with-addons.js.mdx b/docs/snippets/common/args-usage-with-addons.js.mdx index 7c1ccf730efd..77d833352065 100644 --- a/docs/snippets/common/args-usage-with-addons.js.mdx +++ b/docs/snippets/common/args-usage-with-addons.js.mdx @@ -1,5 +1,5 @@ ```js -// your-addon/register.js +// your-addon/manager.js import { useArgs } from '@storybook/api'; diff --git a/docs/snippets/common/my-addon-initial-panel-state.js.mdx b/docs/snippets/common/my-addon-initial-panel-state.js.mdx index 72c6f1e7cb00..8009d61ac4fd 100644 --- a/docs/snippets/common/my-addon-initial-panel-state.js.mdx +++ b/docs/snippets/common/my-addon-initial-panel-state.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/src/register.js +// /my-addon/src/manager.js import React from 'react'; diff --git a/docs/snippets/common/my-addon-preset-implementation.js.mdx b/docs/snippets/common/my-addon-preset-implementation.js.mdx index 2f31ec25ac35..6ad7df9ee3f1 100644 --- a/docs/snippets/common/my-addon-preset-implementation.js.mdx +++ b/docs/snippets/common/my-addon-preset-implementation.js.mdx @@ -2,7 +2,7 @@ // /my-addon/src/preset.js function managerEntries(entry = []) { - return [...entry, require.resolve("./register")]; //👈 Addon implementation + return [...entry, require.resolve("./manager")]; //👈 Addon implementation } module.exports = { managerEntries } diff --git a/docs/snippets/common/storybook-addon-change-panel.js.mdx b/docs/snippets/common/storybook-addon-change-panel.js.mdx index 8e4794320c1e..fc9f821e60c4 100644 --- a/docs/snippets/common/storybook-addon-change-panel.js.mdx +++ b/docs/snippets/common/storybook-addon-change-panel.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/src/register.js +// /my-addon/src/manager.js import { useParameter } from '@storybook/api'; diff --git a/docs/snippets/common/storybook-addon-disable-addon.js.mdx b/docs/snippets/common/storybook-addon-disable-addon.js.mdx index b8dc0b43b88e..f74d563d5366 100644 --- a/docs/snippets/common/storybook-addon-disable-addon.js.mdx +++ b/docs/snippets/common/storybook-addon-disable-addon.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register(ADDON_ID, () => { addons.add(PANEL_ID, { diff --git a/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx b/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx index b13c6841ec8d..9e2cac6af83f 100644 --- a/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx +++ b/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx @@ -2,7 +2,7 @@ // my-preset/index.js function managerEntries(entry = []) { - return [...entry, require.resolve('my-other-addon/register')]; + return [...entry, require.resolve('my-other-addon/manager')]; } const config = (entry = [], options) => { diff --git a/docs/snippets/common/storybook-addon-panel-example.js.mdx b/docs/snippets/common/storybook-addon-panel-example.js.mdx index 5f3898b61c67..29d8a1ab9d46 100644 --- a/docs/snippets/common/storybook-addon-panel-example.js.mdx +++ b/docs/snippets/common/storybook-addon-panel-example.js.mdx @@ -1,5 +1,5 @@ ```js -// addon-panel/register.js +// addon-panel/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addon-panel-initial.js.mdx b/docs/snippets/common/storybook-addon-panel-initial.js.mdx index fb4b80e7cff0..9f9e6b6c05f0 100644 --- a/docs/snippets/common/storybook-addon-panel-initial.js.mdx +++ b/docs/snippets/common/storybook-addon-panel-initial.js.mdx @@ -1,5 +1,5 @@ ```js -// .storybook/my-addon/register.js +// .storybook/my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addon-preset-example.js.mdx b/docs/snippets/common/storybook-addon-preset-example.js.mdx index a23a6ca04f31..db1a7c26b595 100644 --- a/docs/snippets/common/storybook-addon-preset-example.js.mdx +++ b/docs/snippets/common/storybook-addon-preset-example.js.mdx @@ -6,7 +6,7 @@ export function config(entry = []) { } export function managerEntries(entries) { - return [...entries, require.resolve('./register')]; + return [...entries, require.resolve('./manager')]; } export const parameters = { diff --git a/docs/snippets/common/storybook-addon-tab-example.js.mdx b/docs/snippets/common/storybook-addon-tab-example.js.mdx index bbfddd9627cd..dcfa1b41f92b 100644 --- a/docs/snippets/common/storybook-addon-tab-example.js.mdx +++ b/docs/snippets/common/storybook-addon-tab-example.js.mdx @@ -1,5 +1,5 @@ ```js -// addon-tab/register.js +// addon-tab/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addon-toolbar-example.js.mdx b/docs/snippets/common/storybook-addon-toolbar-example.js.mdx index 37ca2cfb2713..869c9df49ad4 100644 --- a/docs/snippets/common/storybook-addon-toolbar-example.js.mdx +++ b/docs/snippets/common/storybook-addon-toolbar-example.js.mdx @@ -1,5 +1,5 @@ ```js -// addon-toolbar/register.js +// addon-toolbar/manager.js import React from "react"; diff --git a/docs/snippets/common/storybook-addons-api-disablequeryparams.js.mdx b/docs/snippets/common/storybook-addons-api-disablequeryparams.js.mdx index 415edea16fd7..6f5f9e3845aa 100644 --- a/docs/snippets/common/storybook-addons-api-disablequeryparams.js.mdx +++ b/docs/snippets/common/storybook-addons-api-disablequeryparams.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { api.setQueryParams({ diff --git a/docs/snippets/common/storybook-addons-api-getqueryparam.js.mdx b/docs/snippets/common/storybook-addons-api-getqueryparam.js.mdx index 76513f992911..0c324ddd0d24 100644 --- a/docs/snippets/common/storybook-addons-api-getqueryparam.js.mdx +++ b/docs/snippets/common/storybook-addons-api-getqueryparam.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { api.getQueryParam('bbc'); diff --git a/docs/snippets/common/storybook-addons-api-geturlstate.js.mdx b/docs/snippets/common/storybook-addons-api-geturlstate.js.mdx index e7e9f13fe831..39321b7f1958 100644 --- a/docs/snippets/common/storybook-addons-api-geturlstate.js.mdx +++ b/docs/snippets/common/storybook-addons-api-geturlstate.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { const href = api.getUrlState({ diff --git a/docs/snippets/common/storybook-addons-api-imports.js.mdx b/docs/snippets/common/storybook-addons-api-imports.js.mdx index eb2af57b1a9a..e44d88ab048f 100644 --- a/docs/snippets/common/storybook-addons-api-imports.js.mdx +++ b/docs/snippets/common/storybook-addons-api-imports.js.mdx @@ -1,5 +1,5 @@ ```js -// .storybook/my-addon/register.js +// .storybook/my-addon/manager.js import { addons } from '@storybook/addons'; ``` \ No newline at end of file diff --git a/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx b/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx index 2f69823954b9..3c9617bfa19e 100644 --- a/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx +++ b/docs/snippets/common/storybook-addons-api-makedecorator.js.mdx @@ -1,5 +1,5 @@ ```js -// .storybook/my-addon/register.js +// .storybook/my-addon/manager.js import { makeDecorator } from '@storybook/addons'; diff --git a/docs/snippets/common/storybook-addons-api-on.js.mdx b/docs/snippets/common/storybook-addons-api-on.js.mdx index aa2e706c51c6..ac86c5e43918 100644 --- a/docs/snippets/common/storybook-addons-api-on.js.mdx +++ b/docs/snippets/common/storybook-addons-api-on.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { api.on('some-event', (eventData) => console.log(eventData)); diff --git a/docs/snippets/common/storybook-addons-api-register.js.mdx b/docs/snippets/common/storybook-addons-api-register.js.mdx index 009b2ea7e660..3c044eebd8c4 100644 --- a/docs/snippets/common/storybook-addons-api-register.js.mdx +++ b/docs/snippets/common/storybook-addons-api-register.js.mdx @@ -1,5 +1,5 @@ ```js -// .storybook/my-addon/register.js +// .storybook/my-addon/manager.js import { addons } from '@storybook/addons'; diff --git a/docs/snippets/common/storybook-addons-api-selectincurrentkind.js.mdx b/docs/snippets/common/storybook-addons-api-selectincurrentkind.js.mdx index 24b46cc3191b..46c89f25fa43 100644 --- a/docs/snippets/common/storybook-addons-api-selectincurrentkind.js.mdx +++ b/docs/snippets/common/storybook-addons-api-selectincurrentkind.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { api.selectInCurrentKind('Basic'); diff --git a/docs/snippets/common/storybook-addons-api-selectstory.js.mdx b/docs/snippets/common/storybook-addons-api-selectstory.js.mdx index bd1314b7ec4f..4af2f91bc3ad 100644 --- a/docs/snippets/common/storybook-addons-api-selectstory.js.mdx +++ b/docs/snippets/common/storybook-addons-api-selectstory.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { api.selectStory('Button', 'Basic'); diff --git a/docs/snippets/common/storybook-addons-api-setqueryparams.js.mdx b/docs/snippets/common/storybook-addons-api-setqueryparams.js.mdx index 988482dbd3ad..bbfaa727b722 100644 --- a/docs/snippets/common/storybook-addons-api-setqueryparams.js.mdx +++ b/docs/snippets/common/storybook-addons-api-setqueryparams.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js addons.register('my-organisation/my-addon', (api) => { api.setQueryParams({ diff --git a/docs/snippets/common/storybook-addons-api-useaddonstate.js.mdx b/docs/snippets/common/storybook-addons-api-useaddonstate.js.mdx index c0800d6d301b..6d6db143ba12 100644 --- a/docs/snippets/common/storybook-addons-api-useaddonstate.js.mdx +++ b/docs/snippets/common/storybook-addons-api-useaddonstate.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addons-api-useapi.js.mdx b/docs/snippets/common/storybook-addons-api-useapi.js.mdx index f88c1c1524a2..f6c05424dc6a 100644 --- a/docs/snippets/common/storybook-addons-api-useapi.js.mdx +++ b/docs/snippets/common/storybook-addons-api-useapi.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addons-api-usechannel.js.mdx b/docs/snippets/common/storybook-addons-api-usechannel.js.mdx index 7184c752dc05..f017c5cfccb0 100644 --- a/docs/snippets/common/storybook-addons-api-usechannel.js.mdx +++ b/docs/snippets/common/storybook-addons-api-usechannel.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addons-api-useglobal.js.mdx b/docs/snippets/common/storybook-addons-api-useglobal.js.mdx index 94f5a8b83313..ad33aef34253 100644 --- a/docs/snippets/common/storybook-addons-api-useglobal.js.mdx +++ b/docs/snippets/common/storybook-addons-api-useglobal.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addons-api-useparameter.js.mdx b/docs/snippets/common/storybook-addons-api-useparameter.js.mdx index 3c496cbb2a09..fdbc74301782 100644 --- a/docs/snippets/common/storybook-addons-api-useparameter.js.mdx +++ b/docs/snippets/common/storybook-addons-api-useparameter.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-addons-api-usestorybookstate.js.mdx b/docs/snippets/common/storybook-addons-api-usestorybookstate.js.mdx index 62f1605af9f1..4e1515a3b6b3 100644 --- a/docs/snippets/common/storybook-addons-api-usestorybookstate.js.mdx +++ b/docs/snippets/common/storybook-addons-api-usestorybookstate.js.mdx @@ -1,5 +1,5 @@ ```js -// /my-addon/register.js +// /my-addon/manager.js import React from 'react'; diff --git a/docs/snippets/common/storybook-argtypes-with-addon.js.mdx b/docs/snippets/common/storybook-argtypes-with-addon.js.mdx index 3187d5e6f3a4..f34c4859bfb9 100644 --- a/docs/snippets/common/storybook-argtypes-with-addon.js.mdx +++ b/docs/snippets/common/storybook-argtypes-with-addon.js.mdx @@ -1,5 +1,5 @@ ```js -// .storybook/my-addon/register.js +// .storybook/my-addon/manager.js import { useArgTypes } from '@storybook/api'; diff --git a/docs/snippets/common/storybook-main-register-addon.js.mdx b/docs/snippets/common/storybook-main-register-addon.js.mdx index 0f587017ee85..675a1d62c08a 100644 --- a/docs/snippets/common/storybook-main-register-addon.js.mdx +++ b/docs/snippets/common/storybook-main-register-addon.js.mdx @@ -2,6 +2,6 @@ // .storybook/main.js module.exports = { - addons: ['path/to/register.js'], + addons: ['path/to/manager.js'], }; ``` \ No newline at end of file diff --git a/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx b/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx index 4a913b4f8aa3..3673c58dd3da 100644 --- a/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx +++ b/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx @@ -3,7 +3,7 @@ module.exports = { addons: [ - '@storybook/addon-storysource/register', // A managerEntry registered here, in this case from the storysource addon. + '@storybook/addon-storysource/manager', // A managerEntry registered here, in this case from the storysource addon. '@storybook/addon-docs/preset', // A preset registered here, in this case from the addon-docs addon. ], }; diff --git a/docs/snippets/common/storybook-main-use-manager-entries.js.mdx b/docs/snippets/common/storybook-main-use-manager-entries.js.mdx index 5bbaa228a809..00b2730bf107 100644 --- a/docs/snippets/common/storybook-main-use-manager-entries.js.mdx +++ b/docs/snippets/common/storybook-main-use-manager-entries.js.mdx @@ -2,6 +2,6 @@ // .storybook/main.js module.exports = { - managerEntries: ['@storybook/addon-storysource/register'], + managerEntries: ['@storybook/addon-storysource/manager'], }; ``` \ No newline at end of file diff --git a/docs/snippets/common/storybook-storysource-manager-entries.js.mdx b/docs/snippets/common/storybook-storysource-manager-entries.js.mdx index 5e792ec1d298..4651d56bf565 100644 --- a/docs/snippets/common/storybook-storysource-manager-entries.js.mdx +++ b/docs/snippets/common/storybook-storysource-manager-entries.js.mdx @@ -2,6 +2,6 @@ // storysource/preset.js export function managerEntries(entry = []) { - return [...entry, require.resolve('@storybook/addon-storysource/register')]; + return [...entry, require.resolve('@storybook/addon-storysource/manager')]; } ``` \ No newline at end of file diff --git a/examples/cra-ts-kitchen-sink/.storybook/localAddon/register.tsx b/examples/cra-ts-kitchen-sink/.storybook/localAddon/manager.tsx similarity index 100% rename from examples/cra-ts-kitchen-sink/.storybook/localAddon/register.tsx rename to examples/cra-ts-kitchen-sink/.storybook/localAddon/manager.tsx diff --git a/examples/cra-ts-kitchen-sink/.storybook/main.ts b/examples/cra-ts-kitchen-sink/.storybook/main.ts index 048a7f5cefae..b225f343a8eb 100644 --- a/examples/cra-ts-kitchen-sink/.storybook/main.ts +++ b/examples/cra-ts-kitchen-sink/.storybook/main.ts @@ -12,7 +12,7 @@ module.exports = { '@storybook/addon-actions', '@storybook/addon-links', '@storybook/addon-a11y', - './localAddon/register.tsx', + './localAddon/manager.tsx', './localAddon/preset.ts', ], webpackFinal: (config: Configuration) => { diff --git a/lib/cli/src/add.test.ts b/lib/cli/src/add.test.ts index 261c6626b11b..d6632443ea49 100644 --- a/lib/cli/src/add.test.ts +++ b/lib/cli/src/add.test.ts @@ -9,13 +9,13 @@ import { describe('addStorybookAddonToFile should correctly register an Storybook addon', () => { test('to an empty array', () => { expect(addStorybookAddonToFile('addon-name', [], true)).toEqual([ - `import '${storybookAddonScope}addon-name/register';`, + `import '${storybookAddonScope}addon-name/manager';`, ]); }); test('to an empty file', () => { expect(addStorybookAddonToFile('addon-name', [''], true)).toEqual([ - `import '${storybookAddonScope}addon-name/register';`, + `import '${storybookAddonScope}addon-name/manager';`, '', ]); }); @@ -25,16 +25,16 @@ describe('addStorybookAddonToFile should correctly register an Storybook addon', addStorybookAddonToFile( 'addon-name', [ - "import '@storybook/addon-actions/register';", - "import '@storybook/addon-links/register';", + "import '@storybook/addon-actions/manager';", + "import '@storybook/addon-links/manager';", '', ], true ) ).toEqual([ - "import '@storybook/addon-actions/register';", - "import '@storybook/addon-links/register';", - `import '${storybookAddonScope}addon-name/register';`, + `import '${storybookAddonScope}addon-name/manager';`, + "import '@storybook/addon-actions/manager';", + "import '@storybook/addon-links/manager';", '', ]); }); @@ -44,8 +44,8 @@ describe('addStorybookAddonToFile should correctly register an Storybook addon', addStorybookAddonToFile( 'addon-name', [ - "import '@storybook/addon-links/register';", - "import '@storybook/addon-actions/register';", + "import '@storybook/addon-links/manager';", + "import '@storybook/addon-actions/manager';", '', '//some other stuff', '', @@ -55,9 +55,9 @@ describe('addStorybookAddonToFile should correctly register an Storybook addon', true ) ).toEqual([ - "import '@storybook/addon-links/register';", - "import '@storybook/addon-actions/register';", - `import '${storybookAddonScope}addon-name/register';`, + `import '${storybookAddonScope}addon-name/manager';`, + "import '@storybook/addon-links/manager';", + "import '@storybook/addon-actions/manager';", '', '//some other stuff', '', @@ -71,17 +71,17 @@ describe('addStorybookAddonToFile should correctly register an Storybook addon', addStorybookAddonToFile( 'addon-name', [ - "import '@storybook/addon-actions/register';", - "import '@storybook/addon-links/register';", - `import '${storybookAddonScope}addon-name/register';`, + "import '@storybook/addon-actions/manager';", + "import '@storybook/addon-links/manager';", + `import '${storybookAddonScope}addon-name/manager';`, '', ], true ) ).toEqual([ - "import '@storybook/addon-actions/register';", - "import '@storybook/addon-links/register';", - `import '${storybookAddonScope}addon-name/register';`, + "import '@storybook/addon-actions/manager';", + "import '@storybook/addon-links/manager';", + `import '${storybookAddonScope}addon-name/manager';`, '', ]); }); @@ -91,16 +91,16 @@ describe('addStorybookAddonToFile should correctly register an Storybook addon', addStorybookAddonToFile( 'addon-name', [ - "import '@storybook/addon-actions/register';", - "import '@storybook/addon-links/register';", + "import '@storybook/addon-actions/manager';", + "import '@storybook/addon-links/manager';", '', ], false ) ).toEqual([ - "import '@storybook/addon-actions/register';", - "import '@storybook/addon-links/register';", - `import 'addon-name/register';`, + `import 'addon-name/manager';`, + "import '@storybook/addon-actions/manager';", + "import '@storybook/addon-links/manager';", '', ]); }); diff --git a/lib/cli/src/add.ts b/lib/cli/src/add.ts index 300a23039668..f6fb63e3787b 100644 --- a/lib/cli/src/add.ts +++ b/lib/cli/src/add.ts @@ -79,7 +79,7 @@ export const addStorybookAddonToFile = ( isOfficialAddon: boolean ) => { const addonNameNoTag = addonName.split('@')[0]; - const alreadyRegistered = addonsFile.find((line) => line.includes(`${addonNameNoTag}/register`)); + const alreadyRegistered = addonsFile.find((line) => line.includes(`${addonNameNoTag}/manager`)); if (alreadyRegistered) { return addonsFile; @@ -93,7 +93,7 @@ export const addStorybookAddonToFile = ( return [ ...addonsFile.slice(0, latestImportIndex + 1), - `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/register';`, + `import '${getPackageName(addonNameNoTag, isOfficialAddon)}/manager';`, ...addonsFile.slice(latestImportIndex + 1), ]; }; diff --git a/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/addons.js b/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/addons.js index bc646c943eb4..c3f195bdf9ee 100644 --- a/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/addons.js +++ b/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/addons.js @@ -1,3 +1,3 @@ -import '@storybook/addon-actions/register'; -import '@storybook/addon-links/register'; -import '@storybook/addon-knobs/register'; +import '@storybook/addon-actions/manager'; +import '@storybook/addon-links/manager'; +import '@storybook/addon-knobs/manager'; diff --git a/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js b/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js index 4d30f923173b..18ce369c70b9 100644 --- a/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js +++ b/lib/cli/src/generators/REACT_NATIVE/template-csf/storybook/rn-addons.js @@ -1,2 +1,2 @@ -import '@storybook/addon-ondevice-actions/register'; -import '@storybook/addon-ondevice-knobs/register'; +import '@storybook/addon-ondevice-actions/manager'; +import '@storybook/addon-ondevice-knobs/manager'; diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index d9a26cbf12a2..eddb92705c14 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -19,6 +19,7 @@ jest.mock('@storybook/node-logger', () => ({ jest.mock('resolve-from', () => (l: any, name: string) => { const KNOWN_FILES = [ + '@storybook/addon-actions/manager', '@storybook/addon-actions/register', './local/preset', './local/addons', @@ -26,6 +27,7 @@ jest.mock('resolve-from', () => (l: any, name: string) => { '/absolute/addons', '@storybook/addon-docs/preset', '@storybook/addon-essentials', + '@storybook/addon-knobs/manager', '@storybook/addon-knobs/register', '@storybook/addon-notes/register-panel', '@storybook/preset-create-react-app', @@ -392,6 +394,13 @@ describe('resolveAddonName', () => { }); }); + it('should resolve managerEntries from new /manager path', () => { + expect(resolveAddonName({}, '@storybook/addon-actions/manager')).toEqual({ + name: '@storybook/addon-actions/manager', + type: 'managerEntries', + }); + }); + it('should resolve presets', () => { expect(resolveAddonName({}, '@storybook/addon-docs')).toEqual({ name: '@storybook/addon-docs/preset', diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index fdc8f48da238..9d5b8e3c5323 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -45,7 +45,7 @@ function resolvePresetFunction( * Parse an addon into either a managerEntries or a preset. Throw on invalid input. * * Valid inputs: - * - '@storybook/addon-actions/register' + * - '@storybook/addon-actions/manager' * => { type: 'managerEntries', item } * * - '@storybook/addon-docs/preset' @@ -64,7 +64,7 @@ export const resolveAddonName = (configDir: string, name: string) => { path = resolveFrom(configDir, name); } else if (name.startsWith('/')) { path = name; - } else if (name.match(/\/(preset|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { + } else if (name.match(/\/(preset|manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { path = name; } @@ -72,8 +72,10 @@ export const resolveAddonName = (configDir: string, name: string) => { if (path) { return { name: path, - // Accept `register`, `register.js`, `require.resolve('foo/register'), `register-panel` - type: path.match(/register(-panel)?(\.(js|ts|tsx|jsx))?$/) ? 'managerEntries' : 'presets', + // Accept `manager`, `register`, `register.js`, `require.resolve('foo/manager'), `register-panel` + type: path.match(/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/) + ? 'managerEntries' + : 'presets', }; } @@ -85,6 +87,14 @@ export const resolveAddonName = (configDir: string, name: string) => { // eslint-disable-next-line no-empty } catch (err) {} + try { + return { + name: resolveFrom(configDir, `${name}/manager`), + type: 'managerEntries', + }; + // eslint-disable-next-line no-empty + } catch (err) {} + try { return { name: resolveFrom(configDir, `${name}/register`), @@ -118,7 +128,7 @@ const map = return resolveAddonName(configDir, name); } catch (err) { logger.error( - `Addon value should end in /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}` + `Addon value should end in /manager or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}` ); } return undefined; diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index 51e1c74a02fa..25d44f7ba9fc 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -7,12 +7,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/toolbars/dist/esm/register.js", - "ROOT/addons/measure/dist/esm/register.js", - "ROOT/addons/outline/dist/esm/register.js", + "ROOT/addons/controls/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/toolbars/dist/esm/manager.js", + "ROOT/addons/measure/dist/esm/manager.js", + "ROOT/addons/outline/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index 28bb2d32108b..3a22bab507e1 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -7,12 +7,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/toolbars/dist/esm/register.js", - "ROOT/addons/measure/dist/esm/register.js", - "ROOT/addons/outline/dist/esm/register.js", + "ROOT/addons/controls/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/toolbars/dist/esm/manager.js", + "ROOT/addons/measure/dist/esm/manager.js", + "ROOT/addons/outline/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix index b0b601e85c6a..46efbf913044 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/a11y/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/controls/dist/esm/register.js", + "ROOT/addons/a11y/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/controls/dist/esm/manager.js", "ROOT/addons/jest/register.js", - "ROOT/addons/links/dist/esm/register.js", - "ROOT/addons/storysource/dist/esm/register.js", - "ROOT/addons/viewport/dist/esm/register.js", + "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/storysource/dist/esm/manager.js", + "ROOT/addons/viewport/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix index 6b9d055e21bd..332adc930693 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/a11y/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/controls/dist/esm/register.js", + "ROOT/addons/a11y/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/controls/dist/esm/manager.js", "ROOT/addons/jest/register.js", - "ROOT/addons/links/dist/esm/register.js", - "ROOT/addons/storysource/dist/esm/register.js", - "ROOT/addons/viewport/dist/esm/register.js", + "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/storysource/dist/esm/manager.js", + "ROOT/addons/viewport/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 891dad8796c8..664247064682 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -5,16 +5,16 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/links/dist/esm/register.js", + "ROOT/addons/links/dist/esm/manager.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/viewport/dist/esm/register.js", - "ROOT/addons/toolbars/dist/esm/register.js", - "ROOT/addons/measure/dist/esm/register.js", - "ROOT/addons/outline/dist/esm/register.js", - "ROOT/addons/interactions/dist/esm/register.js", + "ROOT/addons/controls/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/viewport/dist/esm/manager.js", + "ROOT/addons/toolbars/dist/esm/manager.js", + "ROOT/addons/measure/dist/esm/manager.js", + "ROOT/addons/outline/dist/esm/manager.js", + "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index 99eb742814ca..a4ab1bdd7746 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -5,16 +5,16 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/links/dist/esm/register.js", + "ROOT/addons/links/dist/esm/manager.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/viewport/dist/esm/register.js", - "ROOT/addons/toolbars/dist/esm/register.js", - "ROOT/addons/measure/dist/esm/register.js", - "ROOT/addons/outline/dist/esm/register.js", - "ROOT/addons/interactions/dist/esm/register.js", + "ROOT/addons/controls/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/viewport/dist/esm/manager.js", + "ROOT/addons/toolbars/dist/esm/manager.js", + "ROOT/addons/measure/dist/esm/manager.js", + "ROOT/addons/outline/dist/esm/manager.js", + "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix index 1c0d32d308b3..aed6bee6237e 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix @@ -6,15 +6,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/register.js", - "ROOT/addons/a11y/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/interactions/dist/esm/register.js", - "ROOT/addons/links/dist/esm/register.js", - "ROOT/addons/storysource/dist/esm/register.js", - "ROOT/addons/viewport/dist/esm/register.js", - "ROOT/addons/toolbars/dist/esm/register.js", + "ROOT/addons/controls/dist/esm/manager.js", + "ROOT/addons/a11y/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/interactions/dist/esm/manager.js", + "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/storysource/dist/esm/manager.js", + "ROOT/addons/viewport/dist/esm/manager.js", + "ROOT/addons/toolbars/dist/esm/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix index c090d10a5866..74f36faf447a 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix @@ -6,15 +6,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/register.js", - "ROOT/addons/a11y/dist/esm/register.js", - "ROOT/addons/actions/dist/esm/register.js", - "ROOT/addons/backgrounds/dist/esm/register.js", - "ROOT/addons/interactions/dist/esm/register.js", - "ROOT/addons/links/dist/esm/register.js", - "ROOT/addons/storysource/dist/esm/register.js", - "ROOT/addons/viewport/dist/esm/register.js", - "ROOT/addons/toolbars/dist/esm/register.js", + "ROOT/addons/controls/dist/esm/manager.js", + "ROOT/addons/a11y/dist/esm/manager.js", + "ROOT/addons/actions/dist/esm/manager.js", + "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/interactions/dist/esm/manager.js", + "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/storysource/dist/esm/manager.js", + "ROOT/addons/viewport/dist/esm/manager.js", + "ROOT/addons/toolbars/dist/esm/manager.js", ], "keys": Array [ "name", From f5e848353644193d5a4b63e3e1fd1e41d269d2a7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 11:47:37 +0100 Subject: [PATCH 02/46] change the presets resolutions so we can have preview & manager files separately replacing a single preset file. --- .../src/preview/iframe-webpack.config.ts | 1 + .../src/preview/iframe-webpack.config.ts | 1 + lib/core-common/src/presets.ts | 54 +++++++++++-------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts index 66c2fbee4def..6d14bafafa33 100644 --- a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts +++ b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts @@ -81,6 +81,7 @@ export default async (options: Options & Record): Promise): Promise { + try { + return resolveFrom(path, file); + } catch (e) { + return false; + } +}; + function resolvePresetFunction( input: T[] | Function, presetOptions: any, @@ -70,12 +78,17 @@ export const resolveAddonName = (configDir: string, name: string) => { // when user provides full path, we don't need to do anything if (path) { + // Accept `manager`, `manager.js`, `register`, `register.js`, `require.resolve('foo/manager'), `register-panel` + if (path.match(/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { + return { + name: path, + managerEntries: [path], + type: 'virtual', + }; + } return { name: path, - // Accept `manager`, `register`, `register.js`, `require.resolve('foo/manager'), `register-panel` - type: path.match(/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/) - ? 'managerEntries' - : 'presets', + type: 'presets', }; } @@ -87,21 +100,17 @@ export const resolveAddonName = (configDir: string, name: string) => { // eslint-disable-next-line no-empty } catch (err) {} - try { + const managerEntry = + safeResolveFrom(configDir, `${name}/manager`) || safeResolveFrom(configDir, `${name}/register`); + const previewAnnotation = safeResolveFrom(configDir, `${name}/preview`); + if (managerEntry || previewAnnotation) { return { - name: resolveFrom(configDir, `${name}/manager`), - type: 'managerEntries', + name: `${name}_virtual`, + managerEntries: [managerEntry], + previewAnnotations: [previewAnnotation], + type: 'virtual', }; - // eslint-disable-next-line no-empty - } catch (err) {} - - try { - return { - name: resolveFrom(configDir, `${name}/register`), - type: 'managerEntries', - }; - // eslint-disable-next-line no-empty - } catch (err) {} + } return { name: resolveFrom(configDir, name), @@ -117,12 +126,13 @@ const map = const { name } = resolveAddonName(configDir, item.name); return { ...item, name }; } - const { name, type } = resolveAddonName(configDir, item); - if (type === 'managerEntries') { + const { name, managerEntries, previewAnnotations, type } = resolveAddonName(configDir, item); + if (type === 'virtual') { return { - name: `${name}_additionalManagerEntries`, + name, type, - managerEntries: [name], + ...(managerEntries ? { managerEntries } : {}), + ...(previewAnnotations ? { previewAnnotations } : {}), }; } return resolveAddonName(configDir, name); @@ -145,7 +155,7 @@ function interopRequireDefault(filePath: string) { } function getContent(input: any) { - if (input.type === 'managerEntries') { + if (input.type === 'virtual') { const { type, name, ...rest } = input; return rest; } From 7300670586ea57c674ef24e9aa5292e9b180f74f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 12:07:15 +0100 Subject: [PATCH 03/46] change background to use new structure --- addons/backgrounds/manager.js | 1 + addons/backgrounds/preset.js | 16 ---------------- addons/backgrounds/preview.js | 1 + addons/backgrounds/register.js | 3 ++- addons/backgrounds/src/decorators/index.ts | 2 -- addons/backgrounds/src/preset/addDecorator.tsx | 3 --- .../src/{preset/addParameter.tsx => preview.tsx} | 4 ++++ 7 files changed, 8 insertions(+), 22 deletions(-) create mode 100644 addons/backgrounds/manager.js delete mode 100644 addons/backgrounds/preset.js create mode 100644 addons/backgrounds/preview.js delete mode 100644 addons/backgrounds/src/decorators/index.ts delete mode 100644 addons/backgrounds/src/preset/addDecorator.tsx rename addons/backgrounds/src/{preset/addParameter.tsx => preview.tsx} (58%) diff --git a/addons/backgrounds/manager.js b/addons/backgrounds/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/backgrounds/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/backgrounds/preset.js b/addons/backgrounds/preset.js deleted file mode 100644 index 7a0ed685b003..000000000000 --- a/addons/backgrounds/preset.js +++ /dev/null @@ -1,16 +0,0 @@ -function config(entry = []) { - return [ - ...entry, - require.resolve('./dist/esm/preset/addDecorator'), - require.resolve('./dist/esm/preset/addParameter'), - ]; -} - -function managerEntries(entry = [], options) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -module.exports = { - managerEntries, - config, -}; diff --git a/addons/backgrounds/preview.js b/addons/backgrounds/preview.js new file mode 100644 index 000000000000..354c508e47f5 --- /dev/null +++ b/addons/backgrounds/preview.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/preview'); diff --git a/addons/backgrounds/register.js b/addons/backgrounds/register.js index 81964d78c606..40e25f843272 100644 --- a/addons/backgrounds/register.js +++ b/addons/backgrounds/register.js @@ -1 +1,2 @@ -require('./dist/esm/manager'); +// TODO add deprecation warning +module.exports = require('./preview'); diff --git a/addons/backgrounds/src/decorators/index.ts b/addons/backgrounds/src/decorators/index.ts deleted file mode 100644 index cf4a28890479..000000000000 --- a/addons/backgrounds/src/decorators/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './withBackground'; -export * from './withGrid'; diff --git a/addons/backgrounds/src/preset/addDecorator.tsx b/addons/backgrounds/src/preset/addDecorator.tsx deleted file mode 100644 index 93ccff632339..000000000000 --- a/addons/backgrounds/src/preset/addDecorator.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import { withGrid, withBackground } from '../decorators'; - -export const decorators = [withGrid, withBackground]; diff --git a/addons/backgrounds/src/preset/addParameter.tsx b/addons/backgrounds/src/preview.tsx similarity index 58% rename from addons/backgrounds/src/preset/addParameter.tsx rename to addons/backgrounds/src/preview.tsx index ceb1d3b41203..cc67d00f6318 100644 --- a/addons/backgrounds/src/preset/addParameter.tsx +++ b/addons/backgrounds/src/preview.tsx @@ -1,3 +1,7 @@ +import { withBackground } from './decorators/withBackground'; +import { withGrid } from './decorators/withGrid'; + +export const decorators = [withGrid, withBackground]; export const parameters = { backgrounds: { grid: { From ec8796703953afe5584a02ac802cdb3b3d3e1211 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 12:17:57 +0100 Subject: [PATCH 04/46] add deprecation message to register file in addon-docs --- addons/backgrounds/register.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/backgrounds/register.js b/addons/backgrounds/register.js index 40e25f843272..9f9432e18eaf 100644 --- a/addons/backgrounds/register.js +++ b/addons/backgrounds/register.js @@ -1,2 +1,5 @@ -// TODO add deprecation warning -module.exports = require('./preview'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +module.exports = require('./manager'); From 2288a263020bcee60cd75ca470635b15cb69ecdb Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 12:25:58 +0100 Subject: [PATCH 05/46] change a11y to new structure --- addons/a11y/manager.js | 1 + addons/a11y/preset.js | 13 ------------- addons/a11y/preview.js | 1 + addons/a11y/register.js | 6 +++++- addons/a11y/src/addDecorator.ts | 3 --- addons/a11y/src/preview.tsx | 2 ++ 6 files changed, 9 insertions(+), 17 deletions(-) create mode 100644 addons/a11y/manager.js delete mode 100644 addons/a11y/preset.js create mode 100644 addons/a11y/preview.js delete mode 100644 addons/a11y/src/addDecorator.ts create mode 100644 addons/a11y/src/preview.tsx diff --git a/addons/a11y/manager.js b/addons/a11y/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/a11y/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/a11y/preset.js b/addons/a11y/preset.js deleted file mode 100644 index 8dbfe7a60831..000000000000 --- a/addons/a11y/preset.js +++ /dev/null @@ -1,13 +0,0 @@ -function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -function config(entry = []) { - return [ - ...entry, - require.resolve('./dist/esm/a11yRunner'), - require.resolve('./dist/esm/a11yHighlight'), - ]; -} - -module.exports = { managerEntries, config }; diff --git a/addons/a11y/preview.js b/addons/a11y/preview.js new file mode 100644 index 000000000000..354c508e47f5 --- /dev/null +++ b/addons/a11y/preview.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/preview'); diff --git a/addons/a11y/register.js b/addons/a11y/register.js index 81964d78c606..d6603f7c512d 100755 --- a/addons/a11y/register.js +++ b/addons/a11y/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); diff --git a/addons/a11y/src/addDecorator.ts b/addons/a11y/src/addDecorator.ts deleted file mode 100644 index 95dc140b157a..000000000000 --- a/addons/a11y/src/addDecorator.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { withA11y } from '.'; - -export const decorators = [withA11y]; diff --git a/addons/a11y/src/preview.tsx b/addons/a11y/src/preview.tsx new file mode 100644 index 000000000000..146feb51f50f --- /dev/null +++ b/addons/a11y/src/preview.tsx @@ -0,0 +1,2 @@ +import './a11yRunner'; +import './a11yHighlight'; From fd79ffb447f00044aa96d95a65b162668175d53d Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 12:30:24 +0100 Subject: [PATCH 06/46] change addon-actions to new structure --- addons/actions/manager.js | 1 + addons/actions/package.json | 1 + addons/actions/preset.js | 16 ---------------- addons/actions/preview.js | 1 + addons/actions/register.js | 6 +++++- addons/actions/src/preset/preview.tsx | 2 ++ 6 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 addons/actions/manager.js delete mode 100644 addons/actions/preset.js create mode 100644 addons/actions/preview.js create mode 100644 addons/actions/src/preset/preview.tsx diff --git a/addons/actions/manager.js b/addons/actions/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/actions/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/actions/package.json b/addons/actions/package.json index 6730a483519a..5934f9dbf810 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -43,6 +43,7 @@ "dependencies": { "@storybook/addons": "6.5.0-alpha.49", "@storybook/api": "6.5.0-alpha.49", + "@storybook/client-logger": "6.5.0-alpha.49", "@storybook/components": "6.5.0-alpha.49", "@storybook/core-events": "6.5.0-alpha.49", "@storybook/csf": "0.0.2--canary.87bc651.0", diff --git a/addons/actions/preset.js b/addons/actions/preset.js deleted file mode 100644 index 2047730404c4..000000000000 --- a/addons/actions/preset.js +++ /dev/null @@ -1,16 +0,0 @@ -function managerEntries(entry, options) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -function config(entry = [], { addDecorator = true } = {}) { - const actionConfig = []; - if (addDecorator) { - actionConfig.push(require.resolve('./dist/esm/preset/addDecorator')); - } - return [...entry, ...actionConfig, require.resolve('./dist/esm/preset/addArgs')]; -} - -module.exports = { - managerEntries, - config, -}; diff --git a/addons/actions/preview.js b/addons/actions/preview.js new file mode 100644 index 000000000000..8f96dc017616 --- /dev/null +++ b/addons/actions/preview.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/preset/preview'); diff --git a/addons/actions/register.js b/addons/actions/register.js index 81964d78c606..d6603f7c512d 100644 --- a/addons/actions/register.js +++ b/addons/actions/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); diff --git a/addons/actions/src/preset/preview.tsx b/addons/actions/src/preset/preview.tsx new file mode 100644 index 000000000000..117c34f7196b --- /dev/null +++ b/addons/actions/src/preset/preview.tsx @@ -0,0 +1,2 @@ +export * from './addDecorator'; +export * from './addArgs'; From ec120addb03d35ce3019bdaaa50ec083a21a7765 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 12:31:28 +0100 Subject: [PATCH 07/46] change addon-controls to new structure --- addons/controls/preset.js | 8 -------- addons/controls/register.js | 7 +++++-- 2 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 addons/controls/preset.js diff --git a/addons/controls/preset.js b/addons/controls/preset.js deleted file mode 100644 index e4d018037bbe..000000000000 --- a/addons/controls/preset.js +++ /dev/null @@ -1,8 +0,0 @@ -function managerEntries(entry = [], options) { - // eslint-disable-next-line global-require - const { checkDocsLoaded } = require('./dist/cjs/preset/checkDocsLoaded'); - checkDocsLoaded(options.configDir); - return [...entry, require.resolve('./dist/esm/manager')]; -} - -module.exports = { managerEntries }; diff --git a/addons/controls/register.js b/addons/controls/register.js index e6fe91b6dd65..d6603f7c512d 100644 --- a/addons/controls/register.js +++ b/addons/controls/register.js @@ -1,2 +1,5 @@ -// @deprecated - please remove in 7.0 -import './dist/esm/manager'; +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); From abf1b0bd8dc6f9dd1f622284133c0f7e285ee364 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:08:19 +0100 Subject: [PATCH 08/46] change addon-viewport to new structure --- addons/viewport/manager.js | 1 + addons/viewport/preset.js | 5 ----- addons/viewport/register.js | 6 +++++- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 addons/viewport/manager.js delete mode 100644 addons/viewport/preset.js diff --git a/addons/viewport/manager.js b/addons/viewport/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/viewport/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/viewport/preset.js b/addons/viewport/preset.js deleted file mode 100644 index 90d004664d16..000000000000 --- a/addons/viewport/preset.js +++ /dev/null @@ -1,5 +0,0 @@ -function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -module.exports = { managerEntries }; diff --git a/addons/viewport/register.js b/addons/viewport/register.js index 81964d78c606..d6603f7c512d 100644 --- a/addons/viewport/register.js +++ b/addons/viewport/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); From 5c1ffe79b0ae638934e4694345164faa34688c40 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:08:42 +0100 Subject: [PATCH 09/46] remove unused file --- addons/viewport/src/preview.ts | 1 - 1 file changed, 1 deletion(-) delete mode 100644 addons/viewport/src/preview.ts diff --git a/addons/viewport/src/preview.ts b/addons/viewport/src/preview.ts deleted file mode 100644 index 05f32144967d..000000000000 --- a/addons/viewport/src/preview.ts +++ /dev/null @@ -1 +0,0 @@ -export { INITIAL_VIEWPORTS, DEFAULT_VIEWPORT, MINIMAL_VIEWPORTS } from './defaults'; From f1220de0be905efacadfc9d500ad17fd4dc87a1a Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:11:46 +0100 Subject: [PATCH 10/46] change addon-jest to new structure --- addons/jest/manager.js | 1 + addons/jest/package.json | 1 + addons/jest/register.js | 6 +++++- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 addons/jest/manager.js diff --git a/addons/jest/manager.js b/addons/jest/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/jest/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/jest/package.json b/addons/jest/package.json index 4ecc3a4e1899..623c1707bae6 100644 --- a/addons/jest/package.json +++ b/addons/jest/package.json @@ -49,6 +49,7 @@ "dependencies": { "@storybook/addons": "6.5.0-alpha.49", "@storybook/api": "6.5.0-alpha.49", + "@storybook/client-logger": "6.5.0-alpha.49", "@storybook/components": "6.5.0-alpha.49", "@storybook/core-events": "6.5.0-alpha.49", "@storybook/theming": "6.5.0-alpha.49", diff --git a/addons/jest/register.js b/addons/jest/register.js index 81964d78c606..d6603f7c512d 100644 --- a/addons/jest/register.js +++ b/addons/jest/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); From 0953a47d5bed243f1c7bc9b306678e9bbbb750ed Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:15:22 +0100 Subject: [PATCH 11/46] change addon-toolbars to new structure --- addons/toolbars/manager.js | 1 + addons/toolbars/package.json | 1 + addons/toolbars/preset.js | 5 ----- addons/toolbars/register.js | 6 +++++- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 addons/toolbars/manager.js delete mode 100644 addons/toolbars/preset.js diff --git a/addons/toolbars/manager.js b/addons/toolbars/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/toolbars/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/toolbars/package.json b/addons/toolbars/package.json index 5445bbe01b31..6614f462aa8d 100644 --- a/addons/toolbars/package.json +++ b/addons/toolbars/package.json @@ -47,6 +47,7 @@ "dependencies": { "@storybook/addons": "6.5.0-alpha.49", "@storybook/api": "6.5.0-alpha.49", + "@storybook/client-logger": "6.5.0-alpha.49", "@storybook/components": "6.5.0-alpha.49", "@storybook/theming": "6.5.0-alpha.49", "core-js": "^3.8.2", diff --git a/addons/toolbars/preset.js b/addons/toolbars/preset.js deleted file mode 100644 index 90d004664d16..000000000000 --- a/addons/toolbars/preset.js +++ /dev/null @@ -1,5 +0,0 @@ -function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -module.exports = { managerEntries }; diff --git a/addons/toolbars/register.js b/addons/toolbars/register.js index 4e287d25b151..d6603f7c512d 100644 --- a/addons/toolbars/register.js +++ b/addons/toolbars/register.js @@ -1 +1,5 @@ -import './dist/esm/manager'; +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); From 3de6aa7d824131ed27716decbad1245335e71424 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:24:52 +0100 Subject: [PATCH 12/46] change addon-outline to new structure --- addons/outline/manager.js | 1 + addons/outline/preset.js | 12 ------------ addons/outline/preview.js | 1 + addons/outline/register.js | 6 +++++- .../src/preset/{addDecorator.tsx => preview.tsx} | 0 5 files changed, 7 insertions(+), 13 deletions(-) create mode 100644 addons/outline/manager.js delete mode 100644 addons/outline/preset.js create mode 100644 addons/outline/preview.js rename addons/outline/src/preset/{addDecorator.tsx => preview.tsx} (100%) diff --git a/addons/outline/manager.js b/addons/outline/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/outline/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/outline/preset.js b/addons/outline/preset.js deleted file mode 100644 index eb939722176b..000000000000 --- a/addons/outline/preset.js +++ /dev/null @@ -1,12 +0,0 @@ -function config(entry = []) { - return [...entry, require.resolve('./dist/esm/preset/addDecorator')]; -} - -function managerEntries(entry = [], options) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -module.exports = { - managerEntries, - config, -}; diff --git a/addons/outline/preview.js b/addons/outline/preview.js new file mode 100644 index 000000000000..8f96dc017616 --- /dev/null +++ b/addons/outline/preview.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/preset/preview'); diff --git a/addons/outline/register.js b/addons/outline/register.js index 81964d78c606..d6603f7c512d 100644 --- a/addons/outline/register.js +++ b/addons/outline/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); diff --git a/addons/outline/src/preset/addDecorator.tsx b/addons/outline/src/preset/preview.tsx similarity index 100% rename from addons/outline/src/preset/addDecorator.tsx rename to addons/outline/src/preset/preview.tsx From 2cbae9aa3963f885d42cb811ae320b009b1853e4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:32:57 +0100 Subject: [PATCH 13/46] change addon-links to new structure --- addons/links/manager.js | 1 + addons/links/preset.js | 13 --- addons/links/preview.js | 1 + addons/links/register.js | 6 +- addons/links/src/index.ts | 2 +- addons/links/src/preset/addDecorator.ts | 3 - addons/links/src/preview.ts | 92 +------------------ addons/links/src/react/components/link.tsx | 2 +- .../src/{preview.test.ts => utils.test.ts} | 2 +- addons/links/src/utils.ts | 91 ++++++++++++++++++ 10 files changed, 103 insertions(+), 110 deletions(-) create mode 100644 addons/links/manager.js delete mode 100644 addons/links/preset.js create mode 100644 addons/links/preview.js delete mode 100644 addons/links/src/preset/addDecorator.ts rename addons/links/src/{preview.test.ts => utils.test.ts} (97%) create mode 100644 addons/links/src/utils.ts diff --git a/addons/links/manager.js b/addons/links/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/links/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/links/preset.js b/addons/links/preset.js deleted file mode 100644 index 3a98a99189c4..000000000000 --- a/addons/links/preset.js +++ /dev/null @@ -1,13 +0,0 @@ -function managerEntries(entry = []) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -function config(entry = [], { addDecorator = true } = {}) { - const linkConfig = []; - if (addDecorator) { - linkConfig.push(require.resolve('./dist/esm/preset/addDecorator')); - } - return [...entry, ...linkConfig]; -} - -module.exports = { managerEntries, config }; diff --git a/addons/links/preview.js b/addons/links/preview.js new file mode 100644 index 000000000000..354c508e47f5 --- /dev/null +++ b/addons/links/preview.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/preview'); diff --git a/addons/links/register.js b/addons/links/register.js index 81964d78c606..d6603f7c512d 100644 --- a/addons/links/register.js +++ b/addons/links/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); diff --git a/addons/links/src/index.ts b/addons/links/src/index.ts index 239fae7ba1a8..a41227513de1 100644 --- a/addons/links/src/index.ts +++ b/addons/links/src/index.ts @@ -14,7 +14,7 @@ export function LinkTo(): null { return null; } -export { linkTo, hrefTo, withLinks, navigate } from './preview'; +export { linkTo, hrefTo, withLinks, navigate } from './utils'; if (module && module.hot && module.hot.decline) { module.hot.decline(); diff --git a/addons/links/src/preset/addDecorator.ts b/addons/links/src/preset/addDecorator.ts deleted file mode 100644 index ff68743b1a37..000000000000 --- a/addons/links/src/preset/addDecorator.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { withLinks } from '../index'; - -export const decorators = [withLinks]; diff --git a/addons/links/src/preview.ts b/addons/links/src/preview.ts index 3082bedc09bc..1527786e81af 100644 --- a/addons/links/src/preview.ts +++ b/addons/links/src/preview.ts @@ -1,91 +1,3 @@ -import global from 'global'; -import qs from 'qs'; -import { addons, makeDecorator } from '@storybook/addons'; -import { STORY_CHANGED, SELECT_STORY } from '@storybook/core-events'; -import type { StoryId, StoryName, ComponentTitle } from '@storybook/csf'; -import { toId } from '@storybook/csf'; -import { PARAM_KEY } from './constants'; +import { withLinks } from './index'; -const { document, HTMLElement } = global; - -interface ParamsId { - storyId: StoryId; -} -interface ParamsCombo { - kind?: ComponentTitle; - story?: StoryName; -} - -export const navigate = (params: ParamsId | ParamsCombo) => - addons.getChannel().emit(SELECT_STORY, params); - -export const hrefTo = (title: ComponentTitle, name: StoryName): Promise => { - return new Promise((resolve) => { - const { location } = document; - const query = qs.parse(location.search, { ignoreQueryPrefix: true }); - const existingId = [].concat(query.id)[0]; - const titleToLink = title || existingId.split('--', 2)[0]; - const id = toId(titleToLink, name); - const url = `${location.origin + location.pathname}?${qs.stringify( - { ...query, id }, - { encode: false } - )}`; - - resolve(url); - }); -}; - -const valueOrCall = (args: string[]) => (value: string | ((...args: string[]) => string)) => - typeof value === 'function' ? value(...args) : value; - -export const linkTo = - (idOrTitle: string, nameInput?: string | ((...args: any[]) => string)) => - (...args: any[]) => { - const resolver = valueOrCall(args); - const title = resolver(idOrTitle); - const name = resolver(nameInput); - - if (title?.match(/--/) && !name) { - navigate({ storyId: title }); - } else { - navigate({ kind: title, story: name }); - } - }; - -const linksListener = (e: Event) => { - const { target } = e; - if (!(target instanceof HTMLElement)) { - return; - } - const element = target as HTMLElement; - const { sbKind: kind, sbStory: story } = element.dataset; - if (kind || story) { - e.preventDefault(); - navigate({ kind, story }); - } -}; - -let hasListener = false; - -const on = () => { - if (!hasListener) { - hasListener = true; - document.addEventListener('click', linksListener); - } -}; -const off = () => { - if (hasListener) { - hasListener = false; - document.removeEventListener('click', linksListener); - } -}; - -export const withLinks = makeDecorator({ - name: 'withLinks', - parameterName: PARAM_KEY, - wrapper: (getStory, context) => { - on(); - addons.getChannel().once(STORY_CHANGED, off); - return getStory(context); - }, -}); +export const decorators = [withLinks]; diff --git a/addons/links/src/react/components/link.tsx b/addons/links/src/react/components/link.tsx index fccca70d04a5..aa6207eff75c 100644 --- a/addons/links/src/react/components/link.tsx +++ b/addons/links/src/react/components/link.tsx @@ -1,6 +1,6 @@ import React, { MouseEvent, PureComponent, ReactNode } from 'react'; -import { navigate, hrefTo } from '../../preview'; +import { navigate, hrefTo } from '../../utils'; // FIXME: copied from Typography.Link. Code is duplicated to // avoid emotion dependency which breaks React 15.x back-compat diff --git a/addons/links/src/preview.test.ts b/addons/links/src/utils.test.ts similarity index 97% rename from addons/links/src/preview.test.ts rename to addons/links/src/utils.test.ts index f5dd3af355f1..fb2126018bf6 100644 --- a/addons/links/src/preview.test.ts +++ b/addons/links/src/utils.test.ts @@ -1,7 +1,7 @@ import { addons } from '@storybook/addons'; import { SELECT_STORY } from '@storybook/core-events'; -import { linkTo, hrefTo } from './preview'; +import { linkTo, hrefTo } from './utils'; jest.mock('@storybook/addons'); jest.mock('global', () => ({ diff --git a/addons/links/src/utils.ts b/addons/links/src/utils.ts new file mode 100644 index 000000000000..3082bedc09bc --- /dev/null +++ b/addons/links/src/utils.ts @@ -0,0 +1,91 @@ +import global from 'global'; +import qs from 'qs'; +import { addons, makeDecorator } from '@storybook/addons'; +import { STORY_CHANGED, SELECT_STORY } from '@storybook/core-events'; +import type { StoryId, StoryName, ComponentTitle } from '@storybook/csf'; +import { toId } from '@storybook/csf'; +import { PARAM_KEY } from './constants'; + +const { document, HTMLElement } = global; + +interface ParamsId { + storyId: StoryId; +} +interface ParamsCombo { + kind?: ComponentTitle; + story?: StoryName; +} + +export const navigate = (params: ParamsId | ParamsCombo) => + addons.getChannel().emit(SELECT_STORY, params); + +export const hrefTo = (title: ComponentTitle, name: StoryName): Promise => { + return new Promise((resolve) => { + const { location } = document; + const query = qs.parse(location.search, { ignoreQueryPrefix: true }); + const existingId = [].concat(query.id)[0]; + const titleToLink = title || existingId.split('--', 2)[0]; + const id = toId(titleToLink, name); + const url = `${location.origin + location.pathname}?${qs.stringify( + { ...query, id }, + { encode: false } + )}`; + + resolve(url); + }); +}; + +const valueOrCall = (args: string[]) => (value: string | ((...args: string[]) => string)) => + typeof value === 'function' ? value(...args) : value; + +export const linkTo = + (idOrTitle: string, nameInput?: string | ((...args: any[]) => string)) => + (...args: any[]) => { + const resolver = valueOrCall(args); + const title = resolver(idOrTitle); + const name = resolver(nameInput); + + if (title?.match(/--/) && !name) { + navigate({ storyId: title }); + } else { + navigate({ kind: title, story: name }); + } + }; + +const linksListener = (e: Event) => { + const { target } = e; + if (!(target instanceof HTMLElement)) { + return; + } + const element = target as HTMLElement; + const { sbKind: kind, sbStory: story } = element.dataset; + if (kind || story) { + e.preventDefault(); + navigate({ kind, story }); + } +}; + +let hasListener = false; + +const on = () => { + if (!hasListener) { + hasListener = true; + document.addEventListener('click', linksListener); + } +}; +const off = () => { + if (hasListener) { + hasListener = false; + document.removeEventListener('click', linksListener); + } +}; + +export const withLinks = makeDecorator({ + name: 'withLinks', + parameterName: PARAM_KEY, + wrapper: (getStory, context) => { + on(); + addons.getChannel().once(STORY_CHANGED, off); + return getStory(context); + }, +}); From 61bcd00943651d200a2cbe0e1203a615f94c274f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:33:21 +0100 Subject: [PATCH 14/46] add migration info --- MIGRATION.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/MIGRATION.md b/MIGRATION.md index 6b8ea76261e9..4711ad4486aa 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -1,6 +1,8 @@

Migration

- [From version 6.4.x to 6.5.0](#from-version-64x-to-650) + - [Deprecated register.js](#deprecated-registerjs) + - [Dropped support for addon-actions addDecorators](#dropped-support-for-addon-actions-adddecorators) - [Docs framework refactor for React](#docs-framework-refactor-for-react) - [Opt-in MDX2 support](#opt-in-mdx2-support) - [CSF3 auto-title improvements](#csf3-auto-title-improvements) @@ -196,6 +198,26 @@ ## From version 6.4.x to 6.5.0 +### Deprecated register.js + +In ancient versions of Storybook, addons were registered by referring to `addon-name/register.js`. This is going away in SB7.0. Instead you should just add `addon-name` to the `addons` array in `.storybook/main.js`. + +Before: + +```js +module.exports = { addons: ['my-addon/register.js'] } +``` + +After: + +```js +module.exports = { addons: ['my-addon'] } +``` + +### Dropped support for addon-actions addDecorators + +Prior to SB6.5, `addon-actions` provided an option called `addDecorators`. In SB6.5, decorators are applied always. This is technically a breaking change, so if this affects you please file an issue in Github and we can consider reverting this in a patch release. + ### Docs framework refactor for React SB6.5 moves framework specializations (e.g. ArgType inference, dynamic snippet rendering) out of `@storybook/addon-docs` and into the specific framework packages to which they apply (e.g. `@storybook/react`). From 09ef0ebd1f0398eb933feffa20e503ef9fcd780c Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 18 Mar 2022 20:35:25 +0800 Subject: [PATCH 15/46] change addon-measure to new preview.js structure --- addons/measure/manager.js | 1 + addons/measure/preset.js | 12 ------------ addons/measure/preview.js | 1 + addons/measure/register.js | 6 +++++- .../src/{preset/addDecorator.tsx => preview.tsx} | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) create mode 100644 addons/measure/manager.js delete mode 100644 addons/measure/preset.js create mode 100644 addons/measure/preview.js rename addons/measure/src/{preset/addDecorator.tsx => preview.tsx} (51%) diff --git a/addons/measure/manager.js b/addons/measure/manager.js new file mode 100644 index 000000000000..1c43441b3bf7 --- /dev/null +++ b/addons/measure/manager.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/manager'); diff --git a/addons/measure/preset.js b/addons/measure/preset.js deleted file mode 100644 index eb939722176b..000000000000 --- a/addons/measure/preset.js +++ /dev/null @@ -1,12 +0,0 @@ -function config(entry = []) { - return [...entry, require.resolve('./dist/esm/preset/addDecorator')]; -} - -function managerEntries(entry = [], options) { - return [...entry, require.resolve('./dist/esm/manager')]; -} - -module.exports = { - managerEntries, - config, -}; diff --git a/addons/measure/preview.js b/addons/measure/preview.js new file mode 100644 index 000000000000..354c508e47f5 --- /dev/null +++ b/addons/measure/preview.js @@ -0,0 +1 @@ +module.exports = require('./dist/esm/preview'); diff --git a/addons/measure/register.js b/addons/measure/register.js index 81964d78c606..d6603f7c512d 100644 --- a/addons/measure/register.js +++ b/addons/measure/register.js @@ -1 +1,5 @@ -require('./dist/esm/manager'); +require('@storybook/client-logger').once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); + +require('./manager'); diff --git a/addons/measure/src/preset/addDecorator.tsx b/addons/measure/src/preview.tsx similarity index 51% rename from addons/measure/src/preset/addDecorator.tsx rename to addons/measure/src/preview.tsx index 8aabbd42a2da..c1433b927efa 100644 --- a/addons/measure/src/preset/addDecorator.tsx +++ b/addons/measure/src/preview.tsx @@ -1,5 +1,5 @@ -import { withMeasure } from '../withMeasure'; -import { PARAM_KEY } from '../constants'; +import { withMeasure } from './withMeasure'; +import { PARAM_KEY } from './constants'; export const decorators = [withMeasure]; From 784f773573973954236c98dbbf9b38ffe5ff3342 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 13:42:00 +0100 Subject: [PATCH 16/46] update test and lockfile --- addons/actions/package.json | 2 +- lib/core-common/src/presets.test.ts | 35 +------------------ .../cra-ts-essentials_manager-dev-posix | 12 +++---- .../cra-ts-essentials_manager-prod-posix | 12 +++---- .../cra-ts-essentials_preview-dev-posix | 6 ---- .../cra-ts-essentials_preview-prod-posix | 6 ---- .../html-kitchen-sink_manager-dev-posix | 14 ++++---- .../html-kitchen-sink_manager-prod-posix | 14 ++++---- .../html-kitchen-sink_preview-dev-posix | 11 +++--- .../html-kitchen-sink_preview-prod-posix | 11 +++--- .../__snapshots__/vue-3-cli_manager-dev-posix | 16 ++++----- .../vue-3-cli_manager-prod-posix | 16 ++++----- .../__snapshots__/vue-3-cli_preview-dev-posix | 8 +---- .../vue-3-cli_preview-prod-posix | 8 +---- ...-components-kitchen-sink_manager-dev-posix | 14 ++++---- ...components-kitchen-sink_manager-prod-posix | 14 ++++---- ...-components-kitchen-sink_preview-dev-posix | 11 +++--- ...components-kitchen-sink_preview-prod-posix | 11 +++--- yarn.lock | 3 ++ 19 files changed, 79 insertions(+), 145 deletions(-) diff --git a/addons/actions/package.json b/addons/actions/package.json index 5934f9dbf810..d8af9721347a 100644 --- a/addons/actions/package.json +++ b/addons/actions/package.json @@ -43,7 +43,7 @@ "dependencies": { "@storybook/addons": "6.5.0-alpha.49", "@storybook/api": "6.5.0-alpha.49", - "@storybook/client-logger": "6.5.0-alpha.49", + "@storybook/client-logger": "6.5.0-alpha.49", "@storybook/components": "6.5.0-alpha.49", "@storybook/core-events": "6.5.0-alpha.49", "@storybook/csf": "0.0.2--canary.87bc651.0", diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index eddb92705c14..c8cc14391f8f 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -444,40 +444,7 @@ describe('loadPreset', () => { 0, {} ); - expect(loaded).toMatchInlineSnapshot(` - Array [ - Object { - "name": "@storybook/react", - "options": Object {}, - "preset": Object {}, - }, - Object { - "name": "@storybook/preset-typescript", - "options": Object {}, - "preset": Object {}, - }, - Object { - "name": "@storybook/addon-docs/preset", - "options": Object {}, - "preset": Object {}, - }, - Object { - "name": Object { - "addons": Array [ - "@storybook/addon-docs", - ], - "framework": "@storybook/react", - "name": "", - "presets": Array [ - "@storybook/preset-typescript", - ], - "type": "managerEntries", - }, - "options": Object {}, - "preset": Object {}, - }, - ] - `); + expect(loaded).toMatchInlineSnapshot(`Array []`); }); it('should resolve all addons & presets in correct order', () => { diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index 25d44f7ba9fc..da0d8c3f8fb2 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -7,12 +7,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", - "ROOT/addons/toolbars/dist/esm/manager.js", - "ROOT/addons/measure/dist/esm/manager.js", - "ROOT/addons/outline/dist/esm/manager.js", + "ROOT/addons/controls/register.js", + "ROOT/addons/actions/register.js", + "ROOT/addons/backgrounds/register.js", + "ROOT/addons/toolbars/register.js", + "ROOT/addons/measure/register.js", + "ROOT/addons/outline/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index 3a22bab507e1..c9f625ad65e4 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -7,12 +7,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", - "ROOT/addons/toolbars/dist/esm/manager.js", - "ROOT/addons/measure/dist/esm/manager.js", - "ROOT/addons/outline/dist/esm/manager.js", + "ROOT/addons/controls/register.js", + "ROOT/addons/actions/register.js", + "ROOT/addons/backgrounds/register.js", + "ROOT/addons/toolbars/register.js", + "ROOT/addons/measure/register.js", + "ROOT/addons/outline/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index c0f5cd0feded..781786b1b9bb 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -11,12 +11,6 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", - "ROOT/addons/measure/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/outline/dist/esm/preset/addDecorator.js-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index e6371f7c088e..874f159b36f5 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -10,12 +10,6 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", - "ROOT/addons/measure/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/outline/dist/esm/preset/addDecorator.js-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix index 46efbf913044..246616553294 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/a11y/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/jest/register.js", - "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/a11y/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/jest/manager.js", + "ROOT/addons/links/manager.js", "ROOT/addons/storysource/dist/esm/manager.js", - "ROOT/addons/viewport/dist/esm/manager.js", + "ROOT/addons/viewport/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix index 332adc930693..92cd15e07c16 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/a11y/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/jest/register.js", - "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/a11y/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/jest/manager.js", + "ROOT/addons/links/manager.js", "ROOT/addons/storysource/dist/esm/manager.js", - "ROOT/addons/viewport/dist/esm/manager.js", + "ROOT/addons/viewport/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix index 97d781a3de9f..cca26595edde 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix @@ -10,13 +10,10 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yRunner.js-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yHighlight.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", - "ROOT/addons/links/dist/esm/preset/addDecorator.js-generated-config-entry.js", + "ROOT/addons/a11y/preview.js-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix index b70aaf539387..e345873a6152 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix @@ -9,13 +9,10 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yRunner.js-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yHighlight.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", - "ROOT/addons/links/dist/esm/preset/addDecorator.js-generated-config-entry.js", + "ROOT/addons/a11y/preview.js-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 664247064682..775c501d5b15 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -5,15 +5,15 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/links/manager.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", - "ROOT/addons/viewport/dist/esm/manager.js", - "ROOT/addons/toolbars/dist/esm/manager.js", - "ROOT/addons/measure/dist/esm/manager.js", - "ROOT/addons/outline/dist/esm/manager.js", + "ROOT/addons/controls/register.js", + "ROOT/addons/actions/register.js", + "ROOT/addons/backgrounds/register.js", + "ROOT/addons/viewport/register.js", + "ROOT/addons/toolbars/register.js", + "ROOT/addons/measure/register.js", + "ROOT/addons/outline/register.js", "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index a4ab1bdd7746..fcdac67026ac 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -5,15 +5,15 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/links/manager.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", - "ROOT/addons/viewport/dist/esm/manager.js", - "ROOT/addons/toolbars/dist/esm/manager.js", - "ROOT/addons/measure/dist/esm/manager.js", - "ROOT/addons/outline/dist/esm/manager.js", + "ROOT/addons/controls/register.js", + "ROOT/addons/actions/register.js", + "ROOT/addons/backgrounds/register.js", + "ROOT/addons/viewport/register.js", + "ROOT/addons/toolbars/register.js", + "ROOT/addons/measure/register.js", + "ROOT/addons/outline/register.js", "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index fe42332cf78f..cacff01b67b9 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -10,14 +10,8 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/links/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", - "ROOT/addons/measure/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/outline/dist/esm/preset/addDecorator.js-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", + "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index 4792caed2d1d..8be428c96640 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -9,14 +9,8 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/links/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", - "ROOT/addons/measure/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/outline/dist/esm/preset/addDecorator.js-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", + "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix index aed6bee6237e..a82fffba6288 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix @@ -6,15 +6,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/a11y/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/a11y/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", "ROOT/addons/interactions/dist/esm/manager.js", - "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/links/manager.js", "ROOT/addons/storysource/dist/esm/manager.js", - "ROOT/addons/viewport/dist/esm/manager.js", - "ROOT/addons/toolbars/dist/esm/manager.js", + "ROOT/addons/viewport/manager.js", + "ROOT/addons/toolbars/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix index 74f36faf447a..012d9acdd6e9 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix @@ -6,15 +6,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/dist/esm/manager.js", - "ROOT/addons/a11y/dist/esm/manager.js", - "ROOT/addons/actions/dist/esm/manager.js", - "ROOT/addons/backgrounds/dist/esm/manager.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/a11y/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", "ROOT/addons/interactions/dist/esm/manager.js", - "ROOT/addons/links/dist/esm/manager.js", + "ROOT/addons/links/manager.js", "ROOT/addons/storysource/dist/esm/manager.js", - "ROOT/addons/viewport/dist/esm/manager.js", - "ROOT/addons/toolbars/dist/esm/manager.js", + "ROOT/addons/viewport/manager.js", + "ROOT/addons/toolbars/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix index c816a27405c8..6bb1223590fd 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix @@ -10,14 +10,11 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yRunner.js-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yHighlight.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", - "ROOT/addons/links/dist/esm/preset/addDecorator.js-generated-config-entry.js", + "ROOT/addons/a11y/preview.js-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix index c7b0fb4ff3e9..3fae456f902d 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix @@ -9,14 +9,11 @@ Object { "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yRunner.js-generated-config-entry.js", - "ROOT/addons/a11y/dist/esm/a11yHighlight.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/actions/dist/esm/preset/addArgs.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addDecorator.js-generated-config-entry.js", - "ROOT/addons/backgrounds/dist/esm/preset/addParameter.js-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", - "ROOT/addons/links/dist/esm/preset/addDecorator.js-generated-config-entry.js", + "ROOT/addons/a11y/preview.js-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/yarn.lock b/yarn.lock index e5c24e26170d..9cf75a606876 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6231,6 +6231,7 @@ __metadata: dependencies: "@storybook/addons": 6.5.0-alpha.49 "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 "@storybook/components": 6.5.0-alpha.49 "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 @@ -6489,6 +6490,7 @@ __metadata: dependencies: "@storybook/addons": 6.5.0-alpha.49 "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 "@storybook/components": 6.5.0-alpha.49 "@storybook/core-events": 6.5.0-alpha.49 "@storybook/theming": 6.5.0-alpha.49 @@ -6749,6 +6751,7 @@ __metadata: dependencies: "@storybook/addons": 6.5.0-alpha.49 "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 "@storybook/components": 6.5.0-alpha.49 "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 From 0b151868ec09da062b83bf701e69c6b6798dacf4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 14:51:18 +0100 Subject: [PATCH 17/46] changes trying to fix the presets loading behavior --- addons/essentials/src/index.ts | 9 +- lib/core-common/src/presets.test.ts | 18 +- lib/core-common/src/presets.ts | 28 +++ .../cra-ts-essentials_manager-dev-posix | 14 +- .../cra-ts-essentials_manager-prod-posix | 14 +- .../cra-ts-essentials_preview-dev-posix | 139 +---------- .../cra-ts-essentials_preview-prod-posix | 139 +---------- .../__snapshots__/vue-3-cli_manager-dev-posix | 16 +- .../vue-3-cli_manager-prod-posix | 16 +- .../__snapshots__/vue-3-cli_preview-dev-posix | 217 +----------------- .../vue-3-cli_preview-prod-posix | 217 +----------------- 11 files changed, 86 insertions(+), 741 deletions(-) diff --git a/addons/essentials/src/index.ts b/addons/essentials/src/index.ts index 7441e9fb9160..7b5bc79e3741 100644 --- a/addons/essentials/src/index.ts +++ b/addons/essentials/src/index.ts @@ -1,4 +1,4 @@ -import path, { join } from 'path'; +import path, { dirname, join } from 'path'; import { logger } from '@storybook/node-logger'; import { serverRequire } from '@storybook/core-common'; @@ -50,12 +50,7 @@ export function addons(options: PresetOptions = {}) { // as it's done in `lib/core/src/server/presets.js`. .map((addon) => { try { - return require.resolve(join(addon, 'preset')); - // eslint-disable-next-line no-empty - } catch (err) {} - - try { - return require.resolve(join(addon, 'register')); + return dirname(require.resolve(join(addon, 'package.json'))); // eslint-disable-next-line no-empty } catch (err) {} diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index c8cc14391f8f..40d1e5975f58 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -390,14 +390,16 @@ describe('resolveAddonName', () => { it('should resolve managerEntries', () => { expect(resolveAddonName({}, '@storybook/addon-actions/register')).toEqual({ name: '@storybook/addon-actions/register', - type: 'managerEntries', + managerEntries: ['@storybook/addon-actions/register'], + type: 'virtual', }); }); it('should resolve managerEntries from new /manager path', () => { expect(resolveAddonName({}, '@storybook/addon-actions/manager')).toEqual({ name: '@storybook/addon-actions/manager', - type: 'managerEntries', + managerEntries: ['@storybook/addon-actions/manager'], + type: 'virtual', }); }); @@ -451,7 +453,7 @@ describe('loadPreset', () => { const loaded = loadPreset( { name: '', - type: 'managerEntries', + type: 'virtual', presets: ['@storybook/preset-typescript'], addons: [ '@storybook/addon-docs', @@ -477,14 +479,14 @@ describe('loadPreset', () => { preset: {}, }, { - name: '@storybook/addon-actions/register_additionalManagerEntries', + name: '@storybook/addon-actions/register', options: {}, preset: { managerEntries: ['@storybook/addon-actions/register'], }, }, { - name: 'addon-foo/register.js_additionalManagerEntries', + name: 'addon-foo/register.js', options: {}, preset: { managerEntries: ['addon-foo/register.js'], @@ -497,14 +499,14 @@ describe('loadPreset', () => { // preset: {}, // }, { - name: 'addon-baz/register.tsx_additionalManagerEntries', + name: 'addon-baz/register.tsx', options: {}, preset: { managerEntries: ['addon-baz/register.tsx'], }, }, { - name: '@storybook/addon-notes/register-panel_additionalManagerEntries', + name: '@storybook/addon-notes/register-panel', options: {}, preset: { managerEntries: ['@storybook/addon-notes/register-panel'], @@ -522,7 +524,7 @@ describe('loadPreset', () => { '@storybook/addon-notes/register-panel', ], name: '', - type: 'managerEntries', + type: 'virtual', }, options: {}, preset: {}, diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index aba86555fb46..79af59e71067 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -31,6 +31,13 @@ const safeResolveFrom = (path: string, file: string) => { return false; } }; +const safeResolve = (file: string) => { + try { + return require.resolve(file); + } catch (e) { + return false; + } +}; function resolvePresetFunction( input: T[] | Function, @@ -78,6 +85,18 @@ export const resolveAddonName = (configDir: string, name: string) => { // when user provides full path, we don't need to do anything if (path) { + const managerEntry = safeResolve(`${path}/manager`) || safeResolve(`${path}/register`); + const previewAnnotation = safeResolve(`${path}/preview`); + + if (managerEntry || previewAnnotation) { + return { + name: `${path}_virtual`, + managerEntries: [managerEntry], + previewAnnotations: [previewAnnotation], + type: 'virtual', + }; + } + // Accept `manager`, `manager.js`, `register`, `register.js`, `require.resolve('foo/manager'), `register-panel` if (path.match(/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { return { @@ -86,6 +105,15 @@ export const resolveAddonName = (configDir: string, name: string) => { type: 'virtual', }; } + + try { + return { + name: safeResolve(`${name}/preset`), + type: 'presets', + }; + // eslint-disable-next-line no-empty + } catch (err) {} + return { name: path, type: 'presets', diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index da0d8c3f8fb2..5771b4f2d78f 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -6,13 +6,13 @@ Object { "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/register.js", - "ROOT/addons/actions/register.js", - "ROOT/addons/backgrounds/register.js", - "ROOT/addons/toolbars/register.js", - "ROOT/addons/measure/register.js", - "ROOT/addons/outline/register.js", + "ROOT/addons/docs/register.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/toolbars/manager.js", + "ROOT/addons/measure/manager.js", + "ROOT/addons/outline/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index c9f625ad65e4..954e78835456 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -6,13 +6,13 @@ Object { "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/register.js", - "ROOT/addons/actions/register.js", - "ROOT/addons/backgrounds/register.js", - "ROOT/addons/toolbars/register.js", - "ROOT/addons/measure/register.js", - "ROOT/addons/outline/register.js", + "ROOT/addons/docs/register.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/toolbars/manager.js", + "ROOT/addons/measure/manager.js", + "ROOT/addons/outline/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index 781786b1b9bb..911669945784 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -8,9 +8,12 @@ Object { "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/measure/preview.js-generated-config-entry.js", + "ROOT/addons/outline/preview.js-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], @@ -318,140 +321,6 @@ Object { }, ], }, - Object { - "include": "NODE_MODULES\\\\/acorn-jsx/", - "test": "/\\\\.js$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "modules": "commonjs", - }, - ], - ], - }, - }, - ], - }, - Object { - "test": "/(stories|story)\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "overrides": Array [ - Object { - "plugins": Array [ - Array [ - "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", - Object { - "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", - }, - ], - ], - "test": "/\\\\.(mjs|jsx?)$/", - }, - ], - "plugins": Array [ - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "@babel/preset-env", - Object { - "targets": Object { - "ie": "11", - }, - }, - "storybook-addon-ie11", - ], - ], - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - }, - ], - }, - Object { - "exclude": "/(stories|story)\\\\.mdx$/", - "test": "/\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "overrides": Array [ - Object { - "plugins": Array [ - Array [ - "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", - Object { - "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", - }, - ], - ], - "test": "/\\\\.(mjs|jsx?)$/", - }, - ], - "plugins": Array [ - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "@babel/preset-env", - Object { - "targets": Object { - "ie": "11", - }, - }, - "storybook-addon-ie11", - ], - ], - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - "options": Object { - "remarkPlugins": Array [ - [Function], - [Function], - ], - "skipCsf": true, - }, - }, - ], - }, - Object { - "enforce": "pre", - "loader": "ROOT/lib/source-loader/dist/cjs/index.js", - "options": Object { - "injectStoryParameters": true, - "inspectLocalDependencies": true, - }, - "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", - }, ], }, "plugins": Array [ diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index 874f159b36f5..974025791863 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -7,9 +7,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/measure/preview.js-generated-config-entry.js", + "ROOT/addons/outline/preview.js-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], @@ -336,140 +339,6 @@ Object { }, ], }, - Object { - "include": "NODE_MODULES\\\\/acorn-jsx/", - "test": "/\\\\.js$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "modules": "commonjs", - }, - ], - ], - }, - }, - ], - }, - Object { - "test": "/(stories|story)\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "overrides": Array [ - Object { - "plugins": Array [ - Array [ - "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", - Object { - "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", - }, - ], - ], - "test": "/\\\\.(mjs|jsx?)$/", - }, - ], - "plugins": Array [ - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "@babel/preset-env", - Object { - "targets": Object { - "ie": "11", - }, - }, - "storybook-addon-ie11", - ], - ], - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - }, - ], - }, - Object { - "exclude": "/(stories|story)\\\\.mdx$/", - "test": "/\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "overrides": Array [ - Object { - "plugins": Array [ - Array [ - "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", - Object { - "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", - }, - ], - ], - "test": "/\\\\.(mjs|jsx?)$/", - }, - ], - "plugins": Array [ - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "@babel/preset-env", - Object { - "targets": Object { - "ie": "11", - }, - }, - "storybook-addon-ie11", - ], - ], - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - "options": Object { - "remarkPlugins": Array [ - [Function], - [Function], - ], - "skipCsf": true, - }, - }, - ], - }, - Object { - "enforce": "pre", - "loader": "ROOT/lib/source-loader/dist/cjs/index.js", - "options": Object { - "injectStoryParameters": true, - "inspectLocalDependencies": true, - }, - "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", - }, ], }, "plugins": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 775c501d5b15..0022ce46b810 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", - "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/register.js", - "ROOT/addons/actions/register.js", - "ROOT/addons/backgrounds/register.js", - "ROOT/addons/viewport/register.js", - "ROOT/addons/toolbars/register.js", - "ROOT/addons/measure/register.js", - "ROOT/addons/outline/register.js", + "ROOT/addons/docs/register.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/viewport/manager.js", + "ROOT/addons/toolbars/manager.js", + "ROOT/addons/measure/manager.js", + "ROOT/addons/outline/manager.js", "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index fcdac67026ac..a28ea31a3311 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", - "ROOT/addons/docs/dist/esm/register", - "ROOT/addons/controls/register.js", - "ROOT/addons/actions/register.js", - "ROOT/addons/backgrounds/register.js", - "ROOT/addons/viewport/register.js", - "ROOT/addons/toolbars/register.js", - "ROOT/addons/measure/register.js", - "ROOT/addons/outline/register.js", + "ROOT/addons/docs/register.js", + "ROOT/addons/controls/manager.js", + "ROOT/addons/actions/manager.js", + "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/viewport/manager.js", + "ROOT/addons/toolbars/manager.js", + "ROOT/addons/measure/manager.js", + "ROOT/addons/outline/manager.js", "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index cacff01b67b9..6724303aa12b 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -7,11 +7,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/measure/preview.js-generated-config-entry.js", + "ROOT/addons/outline/preview.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], @@ -217,218 +220,6 @@ Object { }, ], }, - Object { - "include": "NODE_MODULES\\\\/acorn-jsx/", - "test": "/\\\\.js$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "modules": "commonjs", - }, - ], - ], - }, - }, - ], - }, - Object { - "test": "/(stories|story)\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "plugins": Array [ - "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", - Object { - "legacy": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", - Object { - "loose": true, - }, - ], - "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", - "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", - Object { - "loose": true, - "useBuiltIns": true, - }, - ], - "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", - "NODE_MODULES/babel-plugin-macros/dist/index.js", - "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", - "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", - Array [ - "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", - Object { - "absoluteImports": "NODE_MODULES/core-js/index.js", - "method": "usage-global", - "version": "*", - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "loose": true, - "shippedProposals": true, - }, - ], - "NODE_MODULES/@babel/preset-typescript/lib/index.js", - ], - "sourceType": "unambiguous", - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - }, - ], - }, - Object { - "exclude": "/(stories|story)\\\\.mdx$/", - "test": "/\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "plugins": Array [ - "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", - Object { - "legacy": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", - Object { - "loose": true, - }, - ], - "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", - "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", - Object { - "loose": true, - "useBuiltIns": true, - }, - ], - "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", - "NODE_MODULES/babel-plugin-macros/dist/index.js", - "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", - "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", - Array [ - "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", - Object { - "absoluteImports": "NODE_MODULES/core-js/index.js", - "method": "usage-global", - "version": "*", - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "loose": true, - "shippedProposals": true, - }, - ], - "NODE_MODULES/@babel/preset-typescript/lib/index.js", - ], - "sourceType": "unambiguous", - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - "options": Object { - "remarkPlugins": Array [ - [Function], - [Function], - ], - "skipCsf": true, - }, - }, - ], - }, - Object { - "enforce": "pre", - "loader": "ROOT/lib/source-loader/dist/cjs/index.js", - "options": Object { - "injectStoryParameters": true, - "inspectLocalDependencies": true, - }, - "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", - }, Object { "sideEffects": true, "test": "/\\\\.css$/", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index 8be428c96640..2a09b8995fe3 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -6,11 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/actions/preview.js-generated-config-entry.js", + "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/measure/preview.js-generated-config-entry.js", + "ROOT/addons/outline/preview.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], @@ -216,218 +219,6 @@ Object { }, ], }, - Object { - "include": "NODE_MODULES\\\\/acorn-jsx/", - "test": "/\\\\.js$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "modules": "commonjs", - }, - ], - ], - }, - }, - ], - }, - Object { - "test": "/(stories|story)\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "plugins": Array [ - "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", - Object { - "legacy": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", - Object { - "loose": true, - }, - ], - "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", - "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", - Object { - "loose": true, - "useBuiltIns": true, - }, - ], - "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", - "NODE_MODULES/babel-plugin-macros/dist/index.js", - "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", - "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", - Array [ - "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", - Object { - "absoluteImports": "NODE_MODULES/core-js/index.js", - "method": "usage-global", - "version": "*", - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "loose": true, - "shippedProposals": true, - }, - ], - "NODE_MODULES/@babel/preset-typescript/lib/index.js", - ], - "sourceType": "unambiguous", - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - }, - ], - }, - Object { - "exclude": "/(stories|story)\\\\.mdx$/", - "test": "/\\\\.mdx$/", - "use": Array [ - Object { - "loader": "NODE_MODULES/babel-loader/lib/index.js", - "options": Object { - "babelrc": false, - "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", - "configFile": false, - "plugins": Array [ - "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", - Object { - "legacy": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", - Object { - "loose": true, - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", - Object { - "loose": true, - }, - ], - "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", - "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", - Array [ - "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", - Object { - "loose": true, - "useBuiltIns": true, - }, - ], - "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", - "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", - "NODE_MODULES/babel-plugin-macros/dist/index.js", - "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", - "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", - Array [ - "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", - Object { - "absoluteImports": "NODE_MODULES/core-js/index.js", - "method": "usage-global", - "version": "*", - }, - ], - Array [ - "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", - Object { - "pragma": "React.createElement", - "pragmaFrag": "React.Fragment", - }, - ], - ], - "presets": Array [ - Array [ - "NODE_MODULES/@babel/preset-env/lib/index.js", - Object { - "loose": true, - "shippedProposals": true, - }, - ], - "NODE_MODULES/@babel/preset-typescript/lib/index.js", - ], - "sourceType": "unambiguous", - }, - }, - Object { - "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", - "options": Object { - "remarkPlugins": Array [ - [Function], - [Function], - ], - "skipCsf": true, - }, - }, - ], - }, - Object { - "enforce": "pre", - "loader": "ROOT/lib/source-loader/dist/cjs/index.js", - "options": Object { - "injectStoryParameters": true, - "inspectLocalDependencies": true, - }, - "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", - }, Object { "sideEffects": true, "test": "/\\\\.css$/", From fe750f3ad5ca92b6655bd4ac9ca93fb97c6866c7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 14:57:39 +0100 Subject: [PATCH 18/46] fix trying to resolve something in a safe way when it should instead fail --- lib/core-common/src/presets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index 79af59e71067..adf8fe3193fa 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -108,7 +108,7 @@ export const resolveAddonName = (configDir: string, name: string) => { try { return { - name: safeResolve(`${name}/preset`), + name: require.resolve(`${name}/preset`), type: 'presets', }; // eslint-disable-next-line no-empty From a2ec44d5fc03da63e844c8a909de1ce0e36a7409 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 15:20:00 +0100 Subject: [PATCH 19/46] update snapshots and change behavior of presets resolutions code --- addons/docs/preset.js | 2 +- lib/core-common/src/presets.ts | 16 +- .../cra-ts-essentials_manager-dev-posix | 2 +- .../cra-ts-essentials_manager-prod-posix | 2 +- .../cra-ts-essentials_preview-dev-posix | 135 +++++++++++ .../cra-ts-essentials_preview-prod-posix | 135 +++++++++++ .../html-kitchen-sink_manager-dev-posix | 2 +- .../html-kitchen-sink_manager-prod-posix | 2 +- .../__snapshots__/vue-3-cli_manager-dev-posix | 2 +- .../vue-3-cli_manager-prod-posix | 2 +- .../__snapshots__/vue-3-cli_preview-dev-posix | 213 ++++++++++++++++++ .../vue-3-cli_preview-prod-posix | 213 ++++++++++++++++++ ...-components-kitchen-sink_manager-dev-posix | 2 +- ...components-kitchen-sink_manager-prod-posix | 2 +- 14 files changed, 713 insertions(+), 17 deletions(-) diff --git a/addons/docs/preset.js b/addons/docs/preset.js index c318823dc33a..44b529b1b7ff 100644 --- a/addons/docs/preset.js +++ b/addons/docs/preset.js @@ -2,7 +2,7 @@ const { findDistEsm } = require('@storybook/core-common'); const { webpack } = require('./dist/cjs/frameworks/common/preset'); function managerEntries(entry = [], options) { - return [...entry, findDistEsm(__dirname, 'register')]; + return [...entry, findDistEsm(__dirname, 'manager')]; } function config(entry = [], options = {}) { diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index adf8fe3193fa..c4870811b66a 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -85,6 +85,14 @@ export const resolveAddonName = (configDir: string, name: string) => { // when user provides full path, we don't need to do anything if (path) { + try { + return { + name: require.resolve(`${name}/preset`), + type: 'presets', + }; + // eslint-disable-next-line no-empty + } catch (err) {} + const managerEntry = safeResolve(`${path}/manager`) || safeResolve(`${path}/register`); const previewAnnotation = safeResolve(`${path}/preview`); @@ -106,14 +114,6 @@ export const resolveAddonName = (configDir: string, name: string) => { }; } - try { - return { - name: require.resolve(`${name}/preset`), - type: 'presets', - }; - // eslint-disable-next-line no-empty - } catch (err) {} - return { name: path, type: 'presets', diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index 5771b4f2d78f..0c8b12d3e714 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -6,7 +6,7 @@ Object { "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/register.js", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", "ROOT/addons/actions/manager.js", "ROOT/addons/backgrounds/manager.js", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index 954e78835456..e136932eb54b 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -6,7 +6,7 @@ Object { "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/register.js", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", "ROOT/addons/actions/manager.js", "ROOT/addons/backgrounds/manager.js", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index 911669945784..9dafbf6628f1 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -8,6 +8,7 @@ Object { "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", @@ -321,6 +322,140 @@ Object { }, ], }, + Object { + "include": "NODE_MODULES\\\\/acorn-jsx/", + "test": "/\\\\.js$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "modules": "commonjs", + }, + ], + ], + }, + }, + ], + }, + Object { + "test": "/(stories|story)\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "overrides": Array [ + Object { + "plugins": Array [ + Array [ + "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", + Object { + "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", + }, + ], + ], + "test": "/\\\\.(mjs|jsx?)$/", + }, + ], + "plugins": Array [ + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "@babel/preset-env", + Object { + "targets": Object { + "ie": "11", + }, + }, + "storybook-addon-ie11", + ], + ], + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + }, + ], + }, + Object { + "exclude": "/(stories|story)\\\\.mdx$/", + "test": "/\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "overrides": Array [ + Object { + "plugins": Array [ + Array [ + "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", + Object { + "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", + }, + ], + ], + "test": "/\\\\.(mjs|jsx?)$/", + }, + ], + "plugins": Array [ + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "@babel/preset-env", + Object { + "targets": Object { + "ie": "11", + }, + }, + "storybook-addon-ie11", + ], + ], + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + "options": Object { + "remarkPlugins": Array [ + [Function], + [Function], + ], + "skipCsf": true, + }, + }, + ], + }, + Object { + "enforce": "pre", + "loader": "ROOT/lib/source-loader/dist/cjs/index.js", + "options": Object { + "injectStoryParameters": true, + "inspectLocalDependencies": true, + }, + "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", + }, ], }, "plugins": Array [ diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index 974025791863..becf876d2a76 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -7,6 +7,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", @@ -339,6 +340,140 @@ Object { }, ], }, + Object { + "include": "NODE_MODULES\\\\/acorn-jsx/", + "test": "/\\\\.js$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "modules": "commonjs", + }, + ], + ], + }, + }, + ], + }, + Object { + "test": "/(stories|story)\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "overrides": Array [ + Object { + "plugins": Array [ + Array [ + "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", + Object { + "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", + }, + ], + ], + "test": "/\\\\.(mjs|jsx?)$/", + }, + ], + "plugins": Array [ + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "@babel/preset-env", + Object { + "targets": Object { + "ie": "11", + }, + }, + "storybook-addon-ie11", + ], + ], + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + }, + ], + }, + Object { + "exclude": "/(stories|story)\\\\.mdx$/", + "test": "/\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "overrides": Array [ + Object { + "plugins": Array [ + Array [ + "NODE_MODULES/babel-plugin-react-docgen/lib/index.js", + Object { + "DOC_GEN_COLLECTION_NAME": "STORYBOOK_REACT_CLASSES", + }, + ], + ], + "test": "/\\\\.(mjs|jsx?)$/", + }, + ], + "plugins": Array [ + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "@babel/preset-env", + Object { + "targets": Object { + "ie": "11", + }, + }, + "storybook-addon-ie11", + ], + ], + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + "options": Object { + "remarkPlugins": Array [ + [Function], + [Function], + ], + "skipCsf": true, + }, + }, + ], + }, + Object { + "enforce": "pre", + "loader": "ROOT/lib/source-loader/dist/cjs/index.js", + "options": Object { + "injectStoryParameters": true, + "inspectLocalDependencies": true, + }, + "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", + }, ], }, "plugins": Array [ diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix index 246616553294..8ec497376fcd 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/register", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/a11y/manager.js", "ROOT/addons/actions/manager.js", "ROOT/addons/backgrounds/manager.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix index 92cd15e07c16..da5dfc6d7c55 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/register", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/a11y/manager.js", "ROOT/addons/actions/manager.js", "ROOT/addons/backgrounds/manager.js", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 0022ce46b810..621077702598 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -6,7 +6,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", - "ROOT/addons/docs/register.js", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", "ROOT/addons/actions/manager.js", "ROOT/addons/backgrounds/manager.js", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index a28ea31a3311..ade62c505259 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -6,7 +6,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", - "ROOT/addons/docs/register.js", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", "ROOT/addons/actions/manager.js", "ROOT/addons/backgrounds/manager.js", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index 6724303aa12b..162709f06366 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -7,6 +7,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", @@ -220,6 +221,218 @@ Object { }, ], }, + Object { + "include": "NODE_MODULES\\\\/acorn-jsx/", + "test": "/\\\\.js$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "modules": "commonjs", + }, + ], + ], + }, + }, + ], + }, + Object { + "test": "/(stories|story)\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "plugins": Array [ + "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", + Object { + "legacy": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", + Object { + "loose": true, + }, + ], + "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", + "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", + Object { + "loose": true, + "useBuiltIns": true, + }, + ], + "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", + "NODE_MODULES/babel-plugin-macros/dist/index.js", + "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", + "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", + Array [ + "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", + Object { + "absoluteImports": "NODE_MODULES/core-js/index.js", + "method": "usage-global", + "version": "*", + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "loose": true, + "shippedProposals": true, + }, + ], + "NODE_MODULES/@babel/preset-typescript/lib/index.js", + ], + "sourceType": "unambiguous", + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + }, + ], + }, + Object { + "exclude": "/(stories|story)\\\\.mdx$/", + "test": "/\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "plugins": Array [ + "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", + Object { + "legacy": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", + Object { + "loose": true, + }, + ], + "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", + "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", + Object { + "loose": true, + "useBuiltIns": true, + }, + ], + "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", + "NODE_MODULES/babel-plugin-macros/dist/index.js", + "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", + "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", + Array [ + "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", + Object { + "absoluteImports": "NODE_MODULES/core-js/index.js", + "method": "usage-global", + "version": "*", + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "loose": true, + "shippedProposals": true, + }, + ], + "NODE_MODULES/@babel/preset-typescript/lib/index.js", + ], + "sourceType": "unambiguous", + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + "options": Object { + "remarkPlugins": Array [ + [Function], + [Function], + ], + "skipCsf": true, + }, + }, + ], + }, + Object { + "enforce": "pre", + "loader": "ROOT/lib/source-loader/dist/cjs/index.js", + "options": Object { + "injectStoryParameters": true, + "inspectLocalDependencies": true, + }, + "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", + }, Object { "sideEffects": true, "test": "/\\\\.css$/", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index 2a09b8995fe3..e414bfb77655 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -6,6 +6,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", @@ -219,6 +220,218 @@ Object { }, ], }, + Object { + "include": "NODE_MODULES\\\\/acorn-jsx/", + "test": "/\\\\.js$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "modules": "commonjs", + }, + ], + ], + }, + }, + ], + }, + Object { + "test": "/(stories|story)\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "plugins": Array [ + "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", + Object { + "legacy": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", + Object { + "loose": true, + }, + ], + "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", + "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", + Object { + "loose": true, + "useBuiltIns": true, + }, + ], + "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", + "NODE_MODULES/babel-plugin-macros/dist/index.js", + "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", + "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", + Array [ + "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", + Object { + "absoluteImports": "NODE_MODULES/core-js/index.js", + "method": "usage-global", + "version": "*", + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "loose": true, + "shippedProposals": true, + }, + ], + "NODE_MODULES/@babel/preset-typescript/lib/index.js", + ], + "sourceType": "unambiguous", + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + }, + ], + }, + Object { + "exclude": "/(stories|story)\\\\.mdx$/", + "test": "/\\\\.mdx$/", + "use": Array [ + Object { + "loader": "NODE_MODULES/babel-loader/lib/index.js", + "options": Object { + "babelrc": false, + "cacheDirectory": "NODE_MODULES/.cache/storybook/babel", + "configFile": false, + "plugins": Array [ + "NODE_MODULES/@babel/plugin-transform-shorthand-properties/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-block-scoping/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-decorators/lib/index.js", + Object { + "legacy": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-class-properties/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-property-in-object/lib/index.js", + Object { + "loose": true, + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-proposal-private-methods/lib/index.js", + Object { + "loose": true, + }, + ], + "NODE_MODULES/@babel/plugin-proposal-export-default-from/lib/index.js", + "NODE_MODULES/@babel/plugin-syntax-dynamic-import/lib/index.js", + Array [ + "NODE_MODULES/@babel/plugin-proposal-object-rest-spread/lib/index.js", + Object { + "loose": true, + "useBuiltIns": true, + }, + ], + "NODE_MODULES/@babel/plugin-transform-classes/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-arrow-functions/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-parameters/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-destructuring/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-spread/lib/index.js", + "NODE_MODULES/@babel/plugin-transform-for-of/lib/index.js", + "NODE_MODULES/babel-plugin-macros/dist/index.js", + "NODE_MODULES/@babel/plugin-proposal-optional-chaining/lib/index.js", + "NODE_MODULES/@babel/plugin-proposal-nullish-coalescing-operator/lib/index.js", + Array [ + "NODE_MODULES/babel-plugin-polyfill-corejs3/lib/index.js", + Object { + "absoluteImports": "NODE_MODULES/core-js/index.js", + "method": "usage-global", + "version": "*", + }, + ], + Array [ + "NODE_MODULES/@babel/plugin-transform-react-jsx/lib/index.js", + Object { + "pragma": "React.createElement", + "pragmaFrag": "React.Fragment", + }, + ], + ], + "presets": Array [ + Array [ + "NODE_MODULES/@babel/preset-env/lib/index.js", + Object { + "loose": true, + "shippedProposals": true, + }, + ], + "NODE_MODULES/@babel/preset-typescript/lib/index.js", + ], + "sourceType": "unambiguous", + }, + }, + Object { + "loader": "NODE_MODULES/@storybook/mdx1-csf/loader.js", + "options": Object { + "remarkPlugins": Array [ + [Function], + [Function], + ], + "skipCsf": true, + }, + }, + ], + }, + Object { + "enforce": "pre", + "loader": "ROOT/lib/source-loader/dist/cjs/index.js", + "options": Object { + "injectStoryParameters": true, + "inspectLocalDependencies": true, + }, + "test": "/\\\\.(stories|story)\\\\.[tj]sx?$/", + }, Object { "sideEffects": true, "test": "/\\\\.css$/", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix index a82fffba6288..9e42f671dcbe 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/register", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", "ROOT/addons/a11y/manager.js", "ROOT/addons/actions/manager.js", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix index 012d9acdd6e9..1d0aa8234e64 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/register", + "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", "ROOT/addons/a11y/manager.js", "ROOT/addons/actions/manager.js", From 7e845e1ee98aa9f4991359cce201b1efe312f90f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 15:30:01 +0100 Subject: [PATCH 20/46] fix snapshot --- lib/core-common/src/presets.test.ts | 37 +++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index 40d1e5975f58..42b862b74854 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -438,7 +438,7 @@ describe('loadPreset', () => { const loaded = loadPreset( { name: '', - type: 'managerEntries', + type: 'virtual', framework: '@storybook/react', presets: ['@storybook/preset-typescript'], addons: ['@storybook/addon-docs'], @@ -446,7 +446,40 @@ describe('loadPreset', () => { 0, {} ); - expect(loaded).toMatchInlineSnapshot(`Array []`); + expect(loaded).toMatchInlineSnapshot(` + Array [ + Object { + "name": "@storybook/react", + "options": Object {}, + "preset": Object {}, + }, + Object { + "name": "@storybook/preset-typescript", + "options": Object {}, + "preset": Object {}, + }, + Object { + "name": "@storybook/addon-docs/preset", + "options": Object {}, + "preset": Object {}, + }, + Object { + "name": Object { + "addons": Array [ + "@storybook/addon-docs", + ], + "framework": "@storybook/react", + "name": "", + "presets": Array [ + "@storybook/preset-typescript", + ], + "type": "virtual", + }, + "options": Object {}, + "preset": Object {}, + }, + ] + `); }); it('should resolve all addons & presets in correct order', () => { From 48efd4e01b6b5b91f4c6fd0cfa978444acfe1a49 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 15:33:07 +0100 Subject: [PATCH 21/46] fix example in comment --- lib/core-common/src/presets.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index c4870811b66a..37bdf6b3b923 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -61,7 +61,7 @@ function resolvePresetFunction( * * Valid inputs: * - '@storybook/addon-actions/manager' - * => { type: 'managerEntries', item } + * => { type: 'virtual', item } * * - '@storybook/addon-docs/preset' * => { type: 'presets', item } From 48442bed75fbc1799ee893c593df41799abba88f Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 18 Mar 2022 23:10:43 +0800 Subject: [PATCH 22/46] Fix viewport main/module/types settings --- addons/viewport/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/viewport/package.json b/addons/viewport/package.json index 4f78ec04fced..56b31576c201 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -22,9 +22,9 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/preview.js", - "module": "dist/esm/preview.js", - "types": "dist/ts3.9/preview.d.ts", + "main": "dist/cjs/manager.js", + "module": "dist/esm/manager.js", + "types": "dist/ts3.9/manager.d.ts", "typesVersions": { "<3.8": { "dist/ts3.9/*": [ From 4c50f40448cbc45dcbbf3435ab158272a3d877ce Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 16:14:38 +0100 Subject: [PATCH 23/46] Revert "remove unused file" This reverts commit 5c1ffe79b0ae638934e4694345164faa34688c40. --- addons/viewport/src/preview.ts | 1 + 1 file changed, 1 insertion(+) create mode 100644 addons/viewport/src/preview.ts diff --git a/addons/viewport/src/preview.ts b/addons/viewport/src/preview.ts new file mode 100644 index 000000000000..05f32144967d --- /dev/null +++ b/addons/viewport/src/preview.ts @@ -0,0 +1 @@ +export { INITIAL_VIEWPORTS, DEFAULT_VIEWPORT, MINIMAL_VIEWPORTS } from './defaults'; From 62efca6e929407cfbfcbd1c2a738859ab07a0a57 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 18 Mar 2022 16:15:13 +0100 Subject: [PATCH 24/46] Revert "Fix viewport main/module/types settings" This reverts commit 48442bed75fbc1799ee893c593df41799abba88f. --- addons/viewport/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/viewport/package.json b/addons/viewport/package.json index 56b31576c201..4f78ec04fced 100644 --- a/addons/viewport/package.json +++ b/addons/viewport/package.json @@ -22,9 +22,9 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/manager.js", - "module": "dist/esm/manager.js", - "types": "dist/ts3.9/manager.d.ts", + "main": "dist/cjs/preview.js", + "module": "dist/esm/preview.js", + "types": "dist/ts3.9/preview.d.ts", "typesVersions": { "<3.8": { "dist/ts3.9/*": [ From 140cc3dae2bf4053ff9acae59278414a29d19db2 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 21 Mar 2022 09:27:56 +0100 Subject: [PATCH 25/46] swap the spread of values from config & previewAnnotation so the newer comes last --- lib/builder-webpack4/src/preview/iframe-webpack.config.ts | 2 +- lib/builder-webpack5/src/preview/iframe-webpack.config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts index 6d14bafafa33..65c60050464d 100644 --- a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts +++ b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts @@ -80,8 +80,8 @@ export default async (options: Options & Record): Promise): Promise Date: Mon, 21 Mar 2022 13:51:23 +0100 Subject: [PATCH 26/46] change & simplify & fix the preset resolution --- lib/core-common/src/presets.test.ts | 94 ++++++++++--- lib/core-common/src/presets.ts | 125 ++++++------------ lib/core-common/src/utils/safeResolve.ts | 17 +++ .../cra-ts-essentials_manager-dev-posix | 6 + .../cra-ts-essentials_manager-prod-posix | 6 + .../cra-ts-essentials_preview-dev-posix | 6 +- .../cra-ts-essentials_preview-prod-posix | 6 +- .../html-kitchen-sink_manager-dev-posix | 7 + .../html-kitchen-sink_manager-prod-posix | 7 + .../html-kitchen-sink_preview-dev-posix | 6 +- .../html-kitchen-sink_preview-prod-posix | 6 +- .../__snapshots__/vue-3-cli_manager-dev-posix | 8 ++ .../vue-3-cli_manager-prod-posix | 8 ++ .../__snapshots__/vue-3-cli_preview-dev-posix | 8 +- .../vue-3-cli_preview-prod-posix | 8 +- ...-components-kitchen-sink_manager-dev-posix | 7 + ...components-kitchen-sink_manager-prod-posix | 7 + ...-components-kitchen-sink_preview-dev-posix | 8 +- ...components-kitchen-sink_preview-prod-posix | 8 +- 19 files changed, 217 insertions(+), 131 deletions(-) create mode 100644 lib/core-common/src/utils/safeResolve.ts diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index 42b862b74854..25a28c12d838 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -17,7 +17,7 @@ jest.mock('@storybook/node-logger', () => ({ }, })); -jest.mock('resolve-from', () => (l: any, name: string) => { +jest.mock('./utils/safeResolve', () => { const KNOWN_FILES = [ '@storybook/addon-actions/manager', '@storybook/addon-actions/register', @@ -25,6 +25,7 @@ jest.mock('resolve-from', () => (l: any, name: string) => { './local/addons', '/absolute/preset', '/absolute/addons', + '@storybook/addon-docs', '@storybook/addon-docs/preset', '@storybook/addon-essentials', '@storybook/addon-knobs/manager', @@ -33,14 +34,29 @@ jest.mock('resolve-from', () => (l: any, name: string) => { '@storybook/preset-create-react-app', '@storybook/preset-typescript', 'addon-bar/preset.js', + 'addon-bar', 'addon-baz/register.js', 'addon-foo/register.js', ]; - if (KNOWN_FILES.includes(name)) { - return name; - } - throw new Error(`cannot resolve ${name}`); + return { + safeResolveFrom: jest.fn((l: any, name: string) => { + if (KNOWN_FILES.includes(name)) { + return name; + } + return undefined; + }), + safeResolve: jest.fn((name: string) => { + if (KNOWN_FILES.includes(name)) { + return name; + } + try { + return require.resolve(name); + } catch (e) { + return undefined; + } + }), + }; }); describe('presets', () => { @@ -404,7 +420,7 @@ describe('resolveAddonName', () => { }); it('should resolve presets', () => { - expect(resolveAddonName({}, '@storybook/addon-docs')).toEqual({ + expect(resolveAddonName({}, '@storybook/addon-docs/preset')).toEqual({ name: '@storybook/addon-docs/preset', type: 'presets', }); @@ -428,7 +444,7 @@ describe('loadPreset', () => { mockPreset('@storybook/addon-docs/preset', {}); mockPreset('@storybook/addon-actions/register', {}); mockPreset('addon-foo/register.js', {}); - mockPreset('addon-bar/preset', {}); + mockPreset('addon-bar', {}); mockPreset('addon-baz/register.js', {}); mockPreset('@storybook/addon-notes/register-panel', {}); @@ -441,7 +457,7 @@ describe('loadPreset', () => { type: 'virtual', framework: '@storybook/react', presets: ['@storybook/preset-typescript'], - addons: ['@storybook/addon-docs'], + addons: ['@storybook/addon-docs/preset'], }, 0, {} @@ -458,6 +474,43 @@ describe('loadPreset', () => { "options": Object {}, "preset": Object {}, }, + Object { + "name": "/Users/me/Projects/Storybook/core/app/react/dist/cjs/server/framework-preset-react.js", + "options": Object {}, + "preset": Object { + "babel": [Function], + "babelDefault": [Function], + "webpackFinal": [Function], + }, + }, + Object { + "name": "/Users/me/Projects/Storybook/core/app/react/dist/cjs/server/framework-preset-cra.js", + "options": Object {}, + "preset": Object { + "webpackFinal": [Function], + }, + }, + Object { + "name": "/Users/me/Projects/Storybook/core/app/react/dist/cjs/server/framework-preset-react-docs.js", + "options": Object {}, + "preset": Object { + "babel": [Function], + "config": [Function], + "webpackFinal": [Function], + }, + }, + Object { + "name": "/Users/me/Projects/Storybook/core/app/react/preset.js", + "options": Object {}, + "preset": Object { + "config": [Function], + }, + }, + Object { + "name": "@storybook/react", + "options": Object {}, + "preset": Object {}, + }, Object { "name": "@storybook/addon-docs/preset", "options": Object {}, @@ -466,7 +519,7 @@ describe('loadPreset', () => { Object { "name": Object { "addons": Array [ - "@storybook/addon-docs", + "@storybook/addon-docs/preset", ], "framework": "@storybook/react", "name": "", @@ -489,11 +542,11 @@ describe('loadPreset', () => { type: 'virtual', presets: ['@storybook/preset-typescript'], addons: [ - '@storybook/addon-docs', + '@storybook/addon-docs/preset', '@storybook/addon-actions/register', 'addon-foo/register.js', 'addon-bar', - 'addon-baz/register.tsx', + 'addon-baz/register.js', '@storybook/addon-notes/register-panel', ], }, @@ -525,17 +578,16 @@ describe('loadPreset', () => { managerEntries: ['addon-foo/register.js'], }, }, - // should be there, but some file mocking problem is causing it to not resolve - // { - // name: 'addon-bar', - // options: {}, - // preset: {}, - // }, { - name: 'addon-baz/register.tsx', + name: 'addon-bar', + options: {}, + preset: {}, + }, + { + name: 'addon-baz/register.js', options: {}, preset: { - managerEntries: ['addon-baz/register.tsx'], + managerEntries: ['addon-baz/register.js'], }, }, { @@ -549,11 +601,11 @@ describe('loadPreset', () => { name: { presets: ['@storybook/preset-typescript'], addons: [ - '@storybook/addon-docs', + '@storybook/addon-docs/preset', '@storybook/addon-actions/register', 'addon-foo/register.js', 'addon-bar', - 'addon-baz/register.tsx', + 'addon-baz/register.js', '@storybook/addon-notes/register-panel', ], name: '', diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index 37bdf6b3b923..de52105fd995 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -1,7 +1,6 @@ import dedent from 'ts-dedent'; import { resolve } from 'path'; import { logger } from '@storybook/node-logger'; -import resolveFrom from 'resolve-from'; import { CLIOptions, LoadedPreset, @@ -12,6 +11,7 @@ import { } from './types'; import { loadCustomPresets } from './utils/load-custom-presets'; import { serverRequire } from './utils/interpret-require'; +import { safeResolve, safeResolveFrom } from './utils/safeResolve'; const isObject = (val: unknown): val is Record => val != null && typeof val === 'object' && Array.isArray(val) === false; @@ -24,21 +24,6 @@ export function filterPresetsConfig(presetsConfig: PresetConfig[]): PresetConfig }); } -const safeResolveFrom = (path: string, file: string) => { - try { - return resolveFrom(path, file); - } catch (e) { - return false; - } -}; -const safeResolve = (file: string) => { - try { - return require.resolve(file); - } catch (e) { - return false; - } -}; - function resolvePresetFunction( input: T[] | Function, presetOptions: any, @@ -72,77 +57,62 @@ function resolvePresetFunction( * - { name: '@storybook/addon-docs(/preset)?', options: { ... } } * => { type: 'presets', item: { name: '@storybook/addon-docs/preset', options } } */ -export const resolveAddonName = (configDir: string, name: string) => { - let path; - - if (name.startsWith('.')) { - path = resolveFrom(configDir, name); - } else if (name.startsWith('/')) { - path = name; - } else if (name.match(/\/(preset|manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { - path = name; - } - - // when user provides full path, we don't need to do anything - if (path) { - try { - return { - name: require.resolve(`${name}/preset`), - type: 'presets', - }; - // eslint-disable-next-line no-empty - } catch (err) {} - - const managerEntry = safeResolve(`${path}/manager`) || safeResolve(`${path}/register`); - const previewAnnotation = safeResolve(`${path}/preview`); - - if (managerEntry || previewAnnotation) { - return { - name: `${path}_virtual`, - managerEntries: [managerEntry], - previewAnnotations: [previewAnnotation], - type: 'virtual', - }; - } +interface ResolvedAddonPreset { + type: 'presets'; + name: string; +} +interface ResolvedAddonVirtual { + type: 'virtual'; + name: string; + managerEntries?: string[]; + previewAnnotations?: string[]; + presets?: string[]; +} - // Accept `manager`, `manager.js`, `register`, `register.js`, `require.resolve('foo/manager'), `register-panel` - if (path.match(/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { - return { - name: path, - managerEntries: [path], - type: 'virtual', - }; - } +export const resolveAddonName = ( + configDir: string, + name: string +): ResolvedAddonPreset | ResolvedAddonVirtual => { + const r = name.startsWith('/') ? safeResolve : safeResolveFrom.bind(null, configDir); + const resolved = r(name); + if (name.match(/\/(manager|register(-panel)?)(\.(js|ts|tsx|jsx))?$/)) { return { - name: path, - type: 'presets', + type: 'virtual', + name, + managerEntries: [resolved], }; } - - try { + if (name.match(/\/(preset)(\.(js|ts|tsx|jsx))?$/)) { return { - name: resolveFrom(configDir, `${name}/preset`), type: 'presets', + name: resolved, }; - // eslint-disable-next-line no-empty - } catch (err) {} + } + + const path = name; + // when user provides full path, we don't need to do anything + const managerFile = safeResolve(`${path}/manager`); + const registerFile = safeResolve(`${path}/register`) || safeResolve(`${path}/register-panel`); + const previewFile = safeResolve(`${path}/preview`); + const presetFile = safeResolve(`${path}/preset`); - const managerEntry = - safeResolveFrom(configDir, `${name}/manager`) || safeResolveFrom(configDir, `${name}/register`); - const previewAnnotation = safeResolveFrom(configDir, `${name}/preview`); - if (managerEntry || previewAnnotation) { + if (managerFile || registerFile || previewFile || presetFile) { return { - name: `${name}_virtual`, - managerEntries: [managerEntry], - previewAnnotations: [previewAnnotation], type: 'virtual', + name: path, + // register file is the old way of registering addons + ...(managerFile || registerFile + ? { managerEntries: [managerFile, !presetFile && registerFile].filter(Boolean) } + : {}), + ...(previewFile ? { previewAnnotations: [previewFile] } : {}), + ...(presetFile ? { presets: [presetFile] } : {}), }; } return { - name: resolveFrom(configDir, name), type: 'presets', + name: resolved, }; }; @@ -154,19 +124,10 @@ const map = const { name } = resolveAddonName(configDir, item.name); return { ...item, name }; } - const { name, managerEntries, previewAnnotations, type } = resolveAddonName(configDir, item); - if (type === 'virtual') { - return { - name, - type, - ...(managerEntries ? { managerEntries } : {}), - ...(previewAnnotations ? { previewAnnotations } : {}), - }; - } - return resolveAddonName(configDir, name); + return resolveAddonName(configDir, item); } catch (err) { logger.error( - `Addon value should end in /manager or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}` + `Addon value should end in /manager or /preview or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}` ); } return undefined; diff --git a/lib/core-common/src/utils/safeResolve.ts b/lib/core-common/src/utils/safeResolve.ts new file mode 100644 index 000000000000..a1d5684e45b5 --- /dev/null +++ b/lib/core-common/src/utils/safeResolve.ts @@ -0,0 +1,17 @@ +import resolveFrom from 'resolve-from'; + +export const safeResolveFrom = (path: string, file: string) => { + try { + return resolveFrom(path, file); + } catch (e) { + return undefined; + } +}; + +export const safeResolve = (file: string) => { + try { + return require.resolve(file); + } catch (e) { + return undefined; + } +}; diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index 0c8b12d3e714..a36ef6e6ff2e 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -8,11 +8,17 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/toolbars/manager.js", + "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", + "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", + "ROOT/addons/outline/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index e136932eb54b..786da535d7ab 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -8,11 +8,17 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/toolbars/manager.js", + "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", + "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", + "ROOT/addons/outline/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index 9dafbf6628f1..1bef212e13ba 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -8,13 +8,13 @@ Object { "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index becf876d2a76..b2aef3d488b5 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -7,13 +7,13 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix index 8ec497376fcd..197b1899749f 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix @@ -7,13 +7,20 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/a11y/manager.js", + "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/jest/manager.js", + "ROOT/addons/jest/register.js", "ROOT/addons/links/manager.js", + "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", + "ROOT/addons/viewport/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix index da5dfc6d7c55..1110f7a52182 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix @@ -7,13 +7,20 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/a11y/manager.js", + "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/jest/manager.js", + "ROOT/addons/jest/register.js", "ROOT/addons/links/manager.js", + "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", + "ROOT/addons/viewport/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix index cca26595edde..630f4f4a5dbe 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix @@ -7,13 +7,13 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix index e345873a6152..824d6a0adc93 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix @@ -6,13 +6,13 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 621077702598..3f744a82fffa 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -6,14 +6,22 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", + "ROOT/addons/links/register.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/viewport/manager.js", + "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", + "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", + "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", + "ROOT/addons/outline/register.js", "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index ade62c505259..66e1f6ba17c5 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -6,14 +6,22 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", + "ROOT/addons/links/register.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/viewport/manager.js", + "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", + "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", + "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", + "ROOT/addons/outline/register.js", "ROOT/addons/interactions/dist/esm/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index 162709f06366..bbfceacad44e 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -7,15 +7,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index e414bfb77655..f46a5e4ac8b2 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -6,15 +6,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix index 9e42f671dcbe..5657b085d56b 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix @@ -7,14 +7,21 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/a11y/manager.js", + "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/interactions/dist/esm/manager.js", "ROOT/addons/links/manager.js", + "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", + "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", + "ROOT/addons/toolbars/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix index 1d0aa8234e64..99207dd738a0 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix @@ -7,14 +7,21 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/dist/esm/manager", "ROOT/addons/controls/manager.js", + "ROOT/addons/controls/register.js", "ROOT/addons/a11y/manager.js", + "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", + "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", + "ROOT/addons/backgrounds/register.js", "ROOT/addons/interactions/dist/esm/manager.js", "ROOT/addons/links/manager.js", + "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", + "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", + "ROOT/addons/toolbars/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix index 6bb1223590fd..abc13e529023 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix @@ -7,14 +7,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix index 3fae456f902d..57c63cda4577 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], From 633679778b8b8dc8fac8e01f5c9b4cca89733038 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 21 Mar 2022 15:07:47 +0100 Subject: [PATCH 27/46] fix tests --- lib/core-common/src/presets.test.ts | 39 ++--------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index 25a28c12d838..ee2e13ba6f3b 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -19,6 +19,7 @@ jest.mock('@storybook/node-logger', () => ({ jest.mock('./utils/safeResolve', () => { const KNOWN_FILES = [ + '@storybook/react', '@storybook/addon-actions/manager', '@storybook/addon-actions/register', './local/preset', @@ -50,11 +51,7 @@ jest.mock('./utils/safeResolve', () => { if (KNOWN_FILES.includes(name)) { return name; } - try { - return require.resolve(name); - } catch (e) { - return undefined; - } + return undefined; }), }; }); @@ -474,38 +471,6 @@ describe('loadPreset', () => { "options": Object {}, "preset": Object {}, }, - Object { - "name": "/Users/me/Projects/Storybook/core/app/react/dist/cjs/server/framework-preset-react.js", - "options": Object {}, - "preset": Object { - "babel": [Function], - "babelDefault": [Function], - "webpackFinal": [Function], - }, - }, - Object { - "name": "/Users/me/Projects/Storybook/core/app/react/dist/cjs/server/framework-preset-cra.js", - "options": Object {}, - "preset": Object { - "webpackFinal": [Function], - }, - }, - Object { - "name": "/Users/me/Projects/Storybook/core/app/react/dist/cjs/server/framework-preset-react-docs.js", - "options": Object {}, - "preset": Object { - "babel": [Function], - "config": [Function], - "webpackFinal": [Function], - }, - }, - Object { - "name": "/Users/me/Projects/Storybook/core/app/react/preset.js", - "options": Object {}, - "preset": Object { - "config": [Function], - }, - }, Object { "name": "@storybook/react", "options": Object {}, From 657040d32e0e4918077689a7f847cebb697fea05 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 22 Mar 2022 12:17:00 +0100 Subject: [PATCH 28/46] apply resolveAddon to objects too --- lib/core-common/src/presets.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index de52105fd995..0af7d0c53dc7 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -119,12 +119,10 @@ export const resolveAddonName = ( const map = ({ configDir }: InterPresetOptions) => (item: any) => { + const options = isObject(item) ? item.options || {} : {}; + const name = isObject(item) ? item.name : item; try { - if (isObject(item)) { - const { name } = resolveAddonName(configDir, item.name); - return { ...item, name }; - } - return resolveAddonName(configDir, item); + return { options, ...resolveAddonName(configDir, name) }; } catch (err) { logger.error( `Addon value should end in /manager or /preview or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}` From bc5aa0ef106f346634c0a23d3ccfa5c9e10029ad Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 22 Mar 2022 13:03:57 +0100 Subject: [PATCH 29/46] improve tests --- lib/core-common/src/presets.test.ts | 19 ++++++++++++++++++- lib/core-common/src/presets.ts | 14 ++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/lib/core-common/src/presets.test.ts b/lib/core-common/src/presets.test.ts index ee2e13ba6f3b..ac19e6becbd1 100644 --- a/lib/core-common/src/presets.test.ts +++ b/lib/core-common/src/presets.test.ts @@ -27,7 +27,9 @@ jest.mock('./utils/safeResolve', () => { '/absolute/preset', '/absolute/addons', '@storybook/addon-docs', + '@storybook/addon-cool', '@storybook/addon-docs/preset', + '@storybook/addon-interactions/preset', '@storybook/addon-essentials', '@storybook/addon-knobs/manager', '@storybook/addon-knobs/register', @@ -441,7 +443,12 @@ describe('loadPreset', () => { mockPreset('@storybook/addon-docs/preset', {}); mockPreset('@storybook/addon-actions/register', {}); mockPreset('addon-foo/register.js', {}); - mockPreset('addon-bar', {}); + mockPreset('@storybook/addon-cool', {}); + mockPreset('@storybook/addon-interactions/preset', {}); + mockPreset('addon-bar', { + addons: ['@storybook/addon-cool'], + presets: ['@storybook/addon-interactions/preset'], + }); mockPreset('addon-baz/register.js', {}); mockPreset('@storybook/addon-notes/register-panel', {}); @@ -543,6 +550,16 @@ describe('loadPreset', () => { managerEntries: ['addon-foo/register.js'], }, }, + { + name: '@storybook/addon-interactions/preset', + options: {}, + preset: {}, + }, + { + name: '@storybook/addon-cool', + options: {}, + preset: {}, + }, { name: 'addon-bar', options: {}, diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index 0af7d0c53dc7..16cab9827bfe 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -97,6 +97,13 @@ export const resolveAddonName = ( const previewFile = safeResolve(`${path}/preview`); const presetFile = safeResolve(`${path}/preset`); + if (!(managerFile || previewFile) && presetFile) { + return { + type: 'presets', + name: presetFile, + }; + } + if (managerFile || registerFile || previewFile || presetFile) { return { type: 'virtual', @@ -119,10 +126,13 @@ export const resolveAddonName = ( const map = ({ configDir }: InterPresetOptions) => (item: any) => { - const options = isObject(item) ? item.options || {} : {}; + const options = isObject(item) ? item.options || undefined : undefined; const name = isObject(item) ? item.name : item; try { - return { options, ...resolveAddonName(configDir, name) }; + return { + ...(options ? { options } : {}), + ...resolveAddonName(configDir, name), + }; } catch (err) { logger.error( `Addon value should end in /manager or /preview or /register OR it should be a valid preset https://storybook.js.org/docs/react/addons/writing-presets/\n${item}` From 4de6affb10f80d9ce846a33d95680c87a7c0ed9a Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 22 Mar 2022 15:40:58 +0100 Subject: [PATCH 30/46] make builders backwards compatible --- lib/builder-webpack4/src/preview/iframe-webpack.config.ts | 1 - lib/builder-webpack5/src/preview/iframe-webpack.config.ts | 1 - lib/core-server/src/presets/common-preset.ts | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts index 65c60050464d..66c2fbee4def 100644 --- a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts +++ b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts @@ -80,7 +80,6 @@ export default async (options: Options & Record): Promise): Promise ({ }, }); +export const config = async (base: any, options: Options) => { + return [...(await options.presets.apply('previewAnnotations', [], options)), ...base]; +}; + export const features = async (existing: Record) => ({ ...existing, postcss: true, From e40463f4a161384ce9a0b57f8c7db1b4e9443bc1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 22 Mar 2022 18:31:40 +0100 Subject: [PATCH 31/46] fix snapshots --- .../src/__snapshots__/cra-ts-essentials_preview-dev-posix | 2 +- .../src/__snapshots__/cra-ts-essentials_preview-prod-posix | 2 +- .../src/__snapshots__/html-kitchen-sink_preview-dev-posix | 2 +- .../src/__snapshots__/html-kitchen-sink_preview-prod-posix | 2 +- lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix | 2 +- lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix | 2 +- .../__snapshots__/web-components-kitchen-sink_preview-dev-posix | 2 +- .../web-components-kitchen-sink_preview-prod-posix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index 1bef212e13ba..638c4088a724 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -8,11 +8,11 @@ Object { "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index b2aef3d488b5..31d204b48ff0 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -7,11 +7,11 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix index 630f4f4a5dbe..5ca122ce962c 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix @@ -7,11 +7,11 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix index 824d6a0adc93..543c87ed4294 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix @@ -6,11 +6,11 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index bbfceacad44e..5532938a537f 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -7,12 +7,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index f46a5e4ac8b2..d754c551e5ce 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -6,12 +6,12 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix index abc13e529023..0873007c4752 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix @@ -7,11 +7,11 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix index 57c63cda4577..7f5e7871f4e8 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix @@ -6,11 +6,11 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", From 14e3d8516aba1eba3bae09a8865a672461d455e2 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 03:30:37 +0800 Subject: [PATCH 32/46] clean up addons preview/manager refactor --- addons/a11y/manager.js | 2 +- addons/a11y/preview.js | 2 +- addons/a11y/register.js | 7 ++++--- addons/actions/manager.js | 2 +- addons/actions/preview.js | 2 +- addons/actions/register.js | 7 ++++--- addons/backgrounds/manager.js | 2 +- addons/backgrounds/preview.js | 2 +- addons/backgrounds/register.js | 7 ++++--- addons/controls/register.js | 7 ++++--- addons/jest/manager.js | 2 +- addons/jest/register.js | 7 ++++--- addons/links/manager.js | 2 +- addons/links/preview.js | 2 +- addons/links/register.js | 7 ++++--- addons/measure/manager.js | 2 +- addons/measure/preview.js | 2 +- addons/measure/register.js | 7 ++++--- addons/outline/manager.js | 2 +- addons/outline/preview.js | 2 +- addons/outline/register.js | 7 ++++--- addons/storysource/register.js | 2 +- addons/toolbars/manager.js | 2 +- addons/toolbars/register.js | 7 ++++--- addons/viewport/manager.js | 2 +- addons/viewport/register.js | 7 ++++--- 26 files changed, 56 insertions(+), 46 deletions(-) diff --git a/addons/a11y/manager.js b/addons/a11y/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/a11y/manager.js +++ b/addons/a11y/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/a11y/preview.js b/addons/a11y/preview.js index 354c508e47f5..e726cab5a1b6 100644 --- a/addons/a11y/preview.js +++ b/addons/a11y/preview.js @@ -1 +1 @@ -module.exports = require('./dist/esm/preview'); +export * from './dist/esm/preview'; diff --git a/addons/a11y/register.js b/addons/a11y/register.js index d6603f7c512d..2d916bea61a0 100755 --- a/addons/a11y/register.js +++ b/addons/a11y/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/actions/manager.js b/addons/actions/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/actions/manager.js +++ b/addons/actions/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/actions/preview.js b/addons/actions/preview.js index 8f96dc017616..7817e1d278d2 100644 --- a/addons/actions/preview.js +++ b/addons/actions/preview.js @@ -1 +1 @@ -module.exports = require('./dist/esm/preset/preview'); +export * from './dist/esm/preset/preview'; diff --git a/addons/actions/register.js b/addons/actions/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/actions/register.js +++ b/addons/actions/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/backgrounds/manager.js b/addons/backgrounds/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/backgrounds/manager.js +++ b/addons/backgrounds/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/backgrounds/preview.js b/addons/backgrounds/preview.js index 354c508e47f5..e726cab5a1b6 100644 --- a/addons/backgrounds/preview.js +++ b/addons/backgrounds/preview.js @@ -1 +1 @@ -module.exports = require('./dist/esm/preview'); +export * from './dist/esm/preview'; diff --git a/addons/backgrounds/register.js b/addons/backgrounds/register.js index 9f9432e18eaf..2d916bea61a0 100644 --- a/addons/backgrounds/register.js +++ b/addons/backgrounds/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -module.exports = require('./manager'); diff --git a/addons/controls/register.js b/addons/controls/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/controls/register.js +++ b/addons/controls/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/jest/manager.js b/addons/jest/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/jest/manager.js +++ b/addons/jest/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/jest/register.js b/addons/jest/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/jest/register.js +++ b/addons/jest/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/links/manager.js b/addons/links/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/links/manager.js +++ b/addons/links/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/links/preview.js b/addons/links/preview.js index 354c508e47f5..e726cab5a1b6 100644 --- a/addons/links/preview.js +++ b/addons/links/preview.js @@ -1 +1 @@ -module.exports = require('./dist/esm/preview'); +export * from './dist/esm/preview'; diff --git a/addons/links/register.js b/addons/links/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/links/register.js +++ b/addons/links/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/measure/manager.js b/addons/measure/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/measure/manager.js +++ b/addons/measure/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/measure/preview.js b/addons/measure/preview.js index 354c508e47f5..e726cab5a1b6 100644 --- a/addons/measure/preview.js +++ b/addons/measure/preview.js @@ -1 +1 @@ -module.exports = require('./dist/esm/preview'); +export * from './dist/esm/preview'; diff --git a/addons/measure/register.js b/addons/measure/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/measure/register.js +++ b/addons/measure/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/outline/manager.js b/addons/outline/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/outline/manager.js +++ b/addons/outline/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/outline/preview.js b/addons/outline/preview.js index 8f96dc017616..7817e1d278d2 100644 --- a/addons/outline/preview.js +++ b/addons/outline/preview.js @@ -1 +1 @@ -module.exports = require('./dist/esm/preset/preview'); +export * from './dist/esm/preset/preview'; diff --git a/addons/outline/register.js b/addons/outline/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/outline/register.js +++ b/addons/outline/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/storysource/register.js b/addons/storysource/register.js index 81964d78c606..4e287d25b151 100644 --- a/addons/storysource/register.js +++ b/addons/storysource/register.js @@ -1 +1 @@ -require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/toolbars/manager.js b/addons/toolbars/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/toolbars/manager.js +++ b/addons/toolbars/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/toolbars/register.js b/addons/toolbars/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/toolbars/register.js +++ b/addons/toolbars/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); diff --git a/addons/viewport/manager.js b/addons/viewport/manager.js index 1c43441b3bf7..4e287d25b151 100644 --- a/addons/viewport/manager.js +++ b/addons/viewport/manager.js @@ -1 +1 @@ -module.exports = require('./dist/esm/manager'); +import './dist/esm/manager'; diff --git a/addons/viewport/register.js b/addons/viewport/register.js index d6603f7c512d..2d916bea61a0 100644 --- a/addons/viewport/register.js +++ b/addons/viewport/register.js @@ -1,5 +1,6 @@ -require('@storybook/client-logger').once.warn( +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' ); - -require('./manager'); From b94875522b520f1ec048536911bcfd892d35960a Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 03:32:51 +0800 Subject: [PATCH 33/46] Addon-docs: manager/preview addon refactor --- addons/docs/manager.js | 1 + addons/docs/preset.js | 17 +---------------- addons/docs/preview.js | 1 + addons/docs/register.js | 8 ++++++-- addons/docs/src/frameworks/common/config.ts | 8 -------- .../docs/src/{frameworks/common => }/preset.ts | 0 addons/docs/src/preview.ts | 8 ++++++++ 7 files changed, 17 insertions(+), 26 deletions(-) create mode 100644 addons/docs/manager.js create mode 100644 addons/docs/preview.js delete mode 100644 addons/docs/src/frameworks/common/config.ts rename addons/docs/src/{frameworks/common => }/preset.ts (100%) create mode 100644 addons/docs/src/preview.ts diff --git a/addons/docs/manager.js b/addons/docs/manager.js new file mode 100644 index 000000000000..4e287d25b151 --- /dev/null +++ b/addons/docs/manager.js @@ -0,0 +1 @@ +import './dist/esm/manager'; diff --git a/addons/docs/preset.js b/addons/docs/preset.js index 44b529b1b7ff..e45ac5b4cec0 100644 --- a/addons/docs/preset.js +++ b/addons/docs/preset.js @@ -1,16 +1 @@ -const { findDistEsm } = require('@storybook/core-common'); -const { webpack } = require('./dist/cjs/frameworks/common/preset'); - -function managerEntries(entry = [], options) { - return [...entry, findDistEsm(__dirname, 'manager')]; -} - -function config(entry = [], options = {}) { - return [findDistEsm(__dirname, 'frameworks/common/config'), ...entry]; -} - -module.exports = { - webpack, - managerEntries, - config, -}; +module.exports = require('./dist/cjs/preset'); diff --git a/addons/docs/preview.js b/addons/docs/preview.js new file mode 100644 index 000000000000..e726cab5a1b6 --- /dev/null +++ b/addons/docs/preview.js @@ -0,0 +1 @@ +export * from './dist/esm/preview'; diff --git a/addons/docs/register.js b/addons/docs/register.js index afaa5ae8ebd5..2d916bea61a0 100644 --- a/addons/docs/register.js +++ b/addons/docs/register.js @@ -1,2 +1,6 @@ -/* eslint-disable import/extensions */ -require('./dist/esm/manager.js'); +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); diff --git a/addons/docs/src/frameworks/common/config.ts b/addons/docs/src/frameworks/common/config.ts deleted file mode 100644 index 20632390005a..000000000000 --- a/addons/docs/src/frameworks/common/config.ts +++ /dev/null @@ -1,8 +0,0 @@ -export const parameters = { - docs: { - inlineStories: false, - getContainer: async () => (await import('../../blocks')).DocsContainer, - getPage: async () => (await import('../../blocks')).DocsPage, - iframeHeight: 100, - }, -}; diff --git a/addons/docs/src/frameworks/common/preset.ts b/addons/docs/src/preset.ts similarity index 100% rename from addons/docs/src/frameworks/common/preset.ts rename to addons/docs/src/preset.ts diff --git a/addons/docs/src/preview.ts b/addons/docs/src/preview.ts new file mode 100644 index 000000000000..9f3d9b2d8c1e --- /dev/null +++ b/addons/docs/src/preview.ts @@ -0,0 +1,8 @@ +export const parameters = { + docs: { + inlineStories: false, + getContainer: async () => (await import('./blocks')).DocsContainer, + getPage: async () => (await import('./blocks')).DocsPage, + iframeHeight: 100, + }, +}; From ce6efb79b51f40801d7894f47b39c23a70a6a596 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 03:33:11 +0800 Subject: [PATCH 34/46] Addon-interactions: manager/preview addons refactor --- addons/interactions/manager.js | 1 + addons/interactions/package.json | 1 + addons/interactions/preset.js | 13 ++++--------- addons/interactions/preview.js | 1 + addons/interactions/register.js | 7 ++++++- .../src/preset/{argsEnhancers.ts => preview.ts} | 0 yarn.lock | 1 + 7 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 addons/interactions/manager.js create mode 100644 addons/interactions/preview.js rename addons/interactions/src/preset/{argsEnhancers.ts => preview.ts} (100%) diff --git a/addons/interactions/manager.js b/addons/interactions/manager.js new file mode 100644 index 000000000000..4e287d25b151 --- /dev/null +++ b/addons/interactions/manager.js @@ -0,0 +1 @@ +import './dist/esm/manager'; diff --git a/addons/interactions/package.json b/addons/interactions/package.json index 33a8270bed7e..5f8a270d96d5 100644 --- a/addons/interactions/package.json +++ b/addons/interactions/package.json @@ -43,6 +43,7 @@ "dependencies": { "@storybook/addons": "6.5.0-alpha.49", "@storybook/api": "6.5.0-alpha.49", + "@storybook/client-logger": "6.5.0-alpha.49", "@storybook/components": "6.5.0-alpha.49", "@storybook/core-common": "6.5.0-alpha.49", "@storybook/core-events": "6.5.0-alpha.49", diff --git a/addons/interactions/preset.js b/addons/interactions/preset.js index aeb3255f85e8..fb325c5b170b 100644 --- a/addons/interactions/preset.js +++ b/addons/interactions/preset.js @@ -1,15 +1,10 @@ -function config(entry = []) { - return [...entry, require.resolve('./dist/esm/preset/argsEnhancers')]; -} +const { checkActionsLoaded } = require('./dist/cjs/preset/checkActionsLoaded'); -function managerEntries(entry = [], options) { - // eslint-disable-next-line global-require - const { checkActionsLoaded } = require('./dist/cjs/preset/checkActionsLoaded'); +function previewAnnotations(entry = [], options) { checkActionsLoaded(options.configDir); - return [...entry, require.resolve('./dist/esm/manager')]; + return entry; } module.exports = { - config, - managerEntries, + previewAnnotations, }; diff --git a/addons/interactions/preview.js b/addons/interactions/preview.js new file mode 100644 index 000000000000..7817e1d278d2 --- /dev/null +++ b/addons/interactions/preview.js @@ -0,0 +1 @@ +export * from './dist/esm/preset/preview'; diff --git a/addons/interactions/register.js b/addons/interactions/register.js index 4e287d25b151..2d916bea61a0 100644 --- a/addons/interactions/register.js +++ b/addons/interactions/register.js @@ -1 +1,6 @@ -import './dist/esm/manager'; +import { once } from '@storybook/client-logger'; +import './manager'; + +once.warn( + 'register.js is deprecated see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#deprecated-registerjs' +); diff --git a/addons/interactions/src/preset/argsEnhancers.ts b/addons/interactions/src/preset/preview.ts similarity index 100% rename from addons/interactions/src/preset/argsEnhancers.ts rename to addons/interactions/src/preset/preview.ts diff --git a/yarn.lock b/yarn.lock index 9cf75a606876..92de508052a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6459,6 +6459,7 @@ __metadata: dependencies: "@storybook/addons": 6.5.0-alpha.49 "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 "@storybook/components": 6.5.0-alpha.49 "@storybook/core-common": 6.5.0-alpha.49 "@storybook/core-events": 6.5.0-alpha.49 From 3435932fe6636eb8182188cb2b8a4abb6f622681 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 03:44:48 +0800 Subject: [PATCH 35/46] Update snapshots --- .../src/__snapshots__/cra-ts-essentials_manager-dev-posix | 2 +- .../src/__snapshots__/cra-ts-essentials_manager-prod-posix | 2 +- .../src/__snapshots__/cra-ts-essentials_preview-dev-posix | 2 +- .../src/__snapshots__/cra-ts-essentials_preview-prod-posix | 2 +- .../src/__snapshots__/html-kitchen-sink_manager-dev-posix | 2 +- .../src/__snapshots__/html-kitchen-sink_manager-prod-posix | 2 +- .../src/__snapshots__/html-kitchen-sink_preview-dev-posix | 2 +- .../src/__snapshots__/html-kitchen-sink_preview-prod-posix | 2 +- lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix | 4 ++-- .../src/__snapshots__/vue-3-cli_manager-prod-posix | 4 ++-- lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix | 4 ++-- .../src/__snapshots__/vue-3-cli_preview-prod-posix | 4 ++-- .../web-components-kitchen-sink_manager-dev-posix | 4 ++-- .../web-components-kitchen-sink_manager-prod-posix | 4 ++-- .../web-components-kitchen-sink_preview-dev-posix | 4 ++-- .../web-components-kitchen-sink_preview-prod-posix | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index a36ef6e6ff2e..d4595ce3ec4f 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -6,7 +6,7 @@ Object { "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index 786da535d7ab..19a729b4c6cd 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -6,7 +6,7 @@ Object { "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index 638c4088a724..b176dda51d32 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -8,7 +8,7 @@ Object { "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index 31d204b48ff0..fac25ec22a22 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -7,7 +7,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix index 197b1899749f..ea35099f4de7 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/a11y/manager.js", "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix index 1110f7a52182..f0c8b118dbe9 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/a11y/manager.js", "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix index 5ca122ce962c..5d3a3fd02b3c 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix @@ -7,7 +7,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix index 543c87ed4294..72678b9f8f44 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix @@ -6,7 +6,7 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 3f744a82fffa..5c55aa8f4245 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -7,7 +7,7 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", "ROOT/addons/links/register.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", @@ -22,7 +22,7 @@ Object { "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", "ROOT/addons/outline/register.js", - "ROOT/addons/interactions/dist/esm/manager.js", + "ROOT/addons/interactions/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index 66e1f6ba17c5..2c96023c5cc6 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -7,7 +7,7 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", "ROOT/addons/links/register.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", @@ -22,7 +22,7 @@ Object { "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", "ROOT/addons/outline/register.js", - "ROOT/addons/interactions/dist/esm/manager.js", + "ROOT/addons/interactions/manager.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index 5532938a537f..ebd506ced967 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -7,15 +7,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", + "ROOT/addons/interactions/preview.js-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index d754c551e5ce..f6c3e181352a 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -6,15 +6,15 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", + "ROOT/addons/interactions/preview.js-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix index 5657b085d56b..a500abda4d3d 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", "ROOT/addons/controls/register.js", "ROOT/addons/a11y/manager.js", @@ -14,7 +14,7 @@ Object { "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", "ROOT/addons/backgrounds/register.js", - "ROOT/addons/interactions/dist/esm/manager.js", + "ROOT/addons/interactions/manager.js", "ROOT/addons/links/manager.js", "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix index 99207dd738a0..566d60a3f8a9 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix @@ -5,7 +5,7 @@ Object { "entry": Array [ "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", - "ROOT/addons/docs/dist/esm/manager", + "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", "ROOT/addons/controls/register.js", "ROOT/addons/a11y/manager.js", @@ -14,7 +14,7 @@ Object { "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", "ROOT/addons/backgrounds/register.js", - "ROOT/addons/interactions/dist/esm/manager.js", + "ROOT/addons/interactions/manager.js", "ROOT/addons/links/manager.js", "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix index 0873007c4752..3faa6ee6e674 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix @@ -7,14 +7,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/interactions/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix index 7f5e7871f4e8..7e9a725449d9 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", - "ROOT/addons/docs/dist/esm/frameworks/common/config-generated-config-entry.js", + "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", + "ROOT/addons/interactions/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/addons/interactions/dist/esm/preset/argsEnhancers.js-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], From d92eff6a3cc40ad782f3a2d37a029ca54bf3d65c Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 04:03:19 +0800 Subject: [PATCH 36/46] Fix interactions entry --- addons/interactions/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/interactions/package.json b/addons/interactions/package.json index 5f8a270d96d5..8394cccfba5c 100644 --- a/addons/interactions/package.json +++ b/addons/interactions/package.json @@ -21,8 +21,8 @@ "url": "https://opencollective.com/storybook" }, "license": "MIT", - "main": "dist/cjs/manager.js", - "module": "dist/esm/manager.js", + "main": "dist/cjs/index.js", + "module": "dist/esm/index.js", "types": "dist/ts3.9/index.d.ts", "typesVersions": { "<3.8": { From 6e3d51e718eb2e1b4e915b11d608f7ec193e0eca Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 10:21:19 +0800 Subject: [PATCH 37/46] Switch frameworks to use previewAnnotations --- app/angular/src/server/framework-preset-angular-docs.ts | 2 +- app/angular/src/server/preset.ts | 2 +- app/ember/src/server/framework-preset-babel-ember.ts | 2 +- app/ember/src/server/framework-preset-ember-docs.ts | 2 +- app/html/src/server/framework-preset-html-docs.ts | 2 +- app/html/src/server/framework-preset-html.ts | 2 +- app/preact/src/server/framework-preset-preact.ts | 2 +- app/react/src/server/framework-preset-react-docs.ts | 2 +- app/react/src/server/preset.ts | 2 +- app/server/src/server/framework-preset-server.ts | 2 +- app/svelte/src/server/framework-preset-svelte-docs.ts | 2 +- app/svelte/src/server/framework-preset-svelte.ts | 2 +- app/vue/src/server/framework-preset-vue-docs.ts | 2 +- app/vue/src/server/framework-preset-vue.ts | 2 +- app/vue3/src/server/framework-preset-vue3-docs.ts | 2 +- app/vue3/src/server/framework-preset-vue3.ts | 2 +- .../src/server/framework-preset-web-components-docs.ts | 2 +- .../src/server/framework-preset-web-components.ts | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/angular/src/server/framework-preset-angular-docs.ts b/app/angular/src/server/framework-preset-angular-docs.ts index 314ef6039f3f..1c2cac0c15eb 100644 --- a/app/angular/src/server/framework-preset-angular-docs.ts +++ b/app/angular/src/server/framework-preset-angular-docs.ts @@ -2,7 +2,7 @@ import path from 'path'; import { StorybookConfig } from '@storybook/core-common'; import { hasDocsOrControls } from '@storybook/docs-tools'; -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, path.join(__dirname, '../../../dist/ts3.9/client/docs/config')]; }; diff --git a/app/angular/src/server/preset.ts b/app/angular/src/server/preset.ts index ab7d7dd63059..65dc2fa28dc0 100644 --- a/app/angular/src/server/preset.ts +++ b/app/angular/src/server/preset.ts @@ -1,6 +1,6 @@ import type { StorybookConfig } from '@storybook/core-common'; -export const config: StorybookConfig['config'] = (entries = []) => [ +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entries = []) => [ ...entries, require.resolve('../client/preview/config'), ]; diff --git a/app/ember/src/server/framework-preset-babel-ember.ts b/app/ember/src/server/framework-preset-babel-ember.ts index 85bb723bee7b..da857b38fada 100644 --- a/app/ember/src/server/framework-preset-babel-ember.ts +++ b/app/ember/src/server/framework-preset-babel-ember.ts @@ -48,6 +48,6 @@ export function babel(config: TransformOptions, options: Options): TransformOpti }; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/ember/src/server/framework-preset-ember-docs.ts b/app/ember/src/server/framework-preset-ember-docs.ts index c2e6f69be8f2..2cdcc56e7cb8 100644 --- a/app/ember/src/server/framework-preset-ember-docs.ts +++ b/app/ember/src/server/framework-preset-ember-docs.ts @@ -2,7 +2,7 @@ import type { StorybookConfig } from '@storybook/core-common'; import { findDistEsm } from '@storybook/core-common'; import { hasDocsOrControls } from '@storybook/docs-tools'; -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/html/src/server/framework-preset-html-docs.ts b/app/html/src/server/framework-preset-html-docs.ts index c2e6f69be8f2..2cdcc56e7cb8 100644 --- a/app/html/src/server/framework-preset-html-docs.ts +++ b/app/html/src/server/framework-preset-html-docs.ts @@ -2,7 +2,7 @@ import type { StorybookConfig } from '@storybook/core-common'; import { findDistEsm } from '@storybook/core-common'; import { hasDocsOrControls } from '@storybook/docs-tools'; -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/html/src/server/framework-preset-html.ts b/app/html/src/server/framework-preset-html.ts index 10b69f8fafdc..481086898273 100644 --- a/app/html/src/server/framework-preset-html.ts +++ b/app/html/src/server/framework-preset-html.ts @@ -11,6 +11,6 @@ export function webpack(config: Configuration) { return config; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/preact/src/server/framework-preset-preact.ts b/app/preact/src/server/framework-preset-preact.ts index 034cd1f4f729..9a50492d3480 100644 --- a/app/preact/src/server/framework-preset-preact.ts +++ b/app/preact/src/server/framework-preset-preact.ts @@ -29,6 +29,6 @@ export function webpackFinal(config: Configuration): Configuration { }; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/react/src/server/framework-preset-react-docs.ts b/app/react/src/server/framework-preset-react-docs.ts index 723cf49a9f29..98f9c12145b9 100644 --- a/app/react/src/server/framework-preset-react-docs.ts +++ b/app/react/src/server/framework-preset-react-docs.ts @@ -58,7 +58,7 @@ export async function webpackFinal(config: Configuration, options: Options) { }; } -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/react/src/server/preset.ts b/app/react/src/server/preset.ts index b0807877e886..87f491ca3ae8 100644 --- a/app/react/src/server/preset.ts +++ b/app/react/src/server/preset.ts @@ -1,7 +1,7 @@ import { findDistEsm } from '@storybook/core-common'; import type { StorybookConfig } from '@storybook/core-common'; -export const config: StorybookConfig['config'] = (entries = []) => [ +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entries = []) => [ ...entries, findDistEsm(__dirname, 'client/preview/config'), ]; diff --git a/app/server/src/server/framework-preset-server.ts b/app/server/src/server/framework-preset-server.ts index ddde3f77f7d5..f4f552890b79 100644 --- a/app/server/src/server/framework-preset-server.ts +++ b/app/server/src/server/framework-preset-server.ts @@ -19,6 +19,6 @@ export function webpack(config: Configuration) { return config; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/svelte/src/server/framework-preset-svelte-docs.ts b/app/svelte/src/server/framework-preset-svelte-docs.ts index ba1a7fee0166..4160fc5d40db 100644 --- a/app/svelte/src/server/framework-preset-svelte-docs.ts +++ b/app/svelte/src/server/framework-preset-svelte-docs.ts @@ -17,6 +17,6 @@ export async function webpackFinal(webpackConfig: Configuration, options: Option return webpackConfig; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/svelte/src/server/framework-preset-svelte.ts b/app/svelte/src/server/framework-preset-svelte.ts index a9bec1dc6109..d3e10fbf7492 100644 --- a/app/svelte/src/server/framework-preset-svelte.ts +++ b/app/svelte/src/server/framework-preset-svelte.ts @@ -33,6 +33,6 @@ export async function webpack(config: Configuration, options: Options): Promise< }; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/vue/src/server/framework-preset-vue-docs.ts b/app/vue/src/server/framework-preset-vue-docs.ts index 478196fa0d8f..984fa07c49c5 100644 --- a/app/vue/src/server/framework-preset-vue-docs.ts +++ b/app/vue/src/server/framework-preset-vue-docs.ts @@ -30,7 +30,7 @@ export function webpackFinal(webpackConfig: any = {}, options: Options) { return webpackConfig; } -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/vue/src/server/framework-preset-vue.ts b/app/vue/src/server/framework-preset-vue.ts index 5ca2341d674f..8656d8d35060 100644 --- a/app/vue/src/server/framework-preset-vue.ts +++ b/app/vue/src/server/framework-preset-vue.ts @@ -45,6 +45,6 @@ export async function webpack(config: Configuration, { presets }: Options) { return config; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/vue3/src/server/framework-preset-vue3-docs.ts b/app/vue3/src/server/framework-preset-vue3-docs.ts index 34e755af3f17..b97af76f15ff 100644 --- a/app/vue3/src/server/framework-preset-vue3-docs.ts +++ b/app/vue3/src/server/framework-preset-vue3-docs.ts @@ -31,7 +31,7 @@ export function webpackFinal(webpackConfig: any = {}, options: Options) { return webpackConfig; } -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/vue3/src/server/framework-preset-vue3.ts b/app/vue3/src/server/framework-preset-vue3.ts index 0db63e4cd193..fb4dc76a2886 100644 --- a/app/vue3/src/server/framework-preset-vue3.ts +++ b/app/vue3/src/server/framework-preset-vue3.ts @@ -48,6 +48,6 @@ export function webpack(config: Configuration): Configuration { }; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; diff --git a/app/web-components/src/server/framework-preset-web-components-docs.ts b/app/web-components/src/server/framework-preset-web-components-docs.ts index 507496e74073..31ccb922f3f1 100644 --- a/app/web-components/src/server/framework-preset-web-components-docs.ts +++ b/app/web-components/src/server/framework-preset-web-components-docs.ts @@ -1,7 +1,7 @@ import { findDistEsm, StorybookConfig } from '@storybook/core-common'; import { hasDocsOrControls } from '@storybook/docs-tools'; -export const config: StorybookConfig['config'] = (entry = [], options) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = [], options) => { if (!hasDocsOrControls(options)) return entry; return [...entry, findDistEsm(__dirname, 'client/docs/config')]; }; diff --git a/app/web-components/src/server/framework-preset-web-components.ts b/app/web-components/src/server/framework-preset-web-components.ts index 44e273ff8f3c..19c537420947 100644 --- a/app/web-components/src/server/framework-preset-web-components.ts +++ b/app/web-components/src/server/framework-preset-web-components.ts @@ -41,6 +41,6 @@ export function webpack(config: Configuration, options: Options) { return config; } -export const config: StorybookConfig['config'] = (entry = []) => { +export const previewAnnotations: StorybookConfig['previewAnnotations'] = (entry = []) => { return [...entry, findDistEsm(__dirname, 'client/preview/config')]; }; From c60e104b74604af293111ac1f12153d45786cbe6 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 10:37:39 +0800 Subject: [PATCH 38/46] Update snapshots --- .../src/__snapshots__/cra-ts-essentials_preview-dev-posix | 4 ++-- .../src/__snapshots__/cra-ts-essentials_preview-prod-posix | 4 ++-- .../src/__snapshots__/html-kitchen-sink_preview-dev-posix | 4 ++-- .../src/__snapshots__/html-kitchen-sink_preview-prod-posix | 4 ++-- lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix | 4 ++-- .../src/__snapshots__/vue-3-cli_preview-prod-posix | 4 ++-- .../web-components-kitchen-sink_preview-dev-posix | 4 ++-- .../web-components-kitchen-sink_preview-prod-posix | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix index b176dda51d32..d0ace6293018 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-dev-posix @@ -8,13 +8,13 @@ Object { "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix index fac25ec22a22..19dc8beb34e6 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_preview-prod-posix @@ -7,13 +7,13 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/@storybook/addon-ie11/dist/event-source-polyfill.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", + "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/docs/config-generated-config-entry.js", - "ROOT/app/react/dist/esm/client/preview/config-generated-config-entry.js", "ROOT/examples/cra-ts-essentials/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix index 5d3a3fd02b3c..fef4e5b1e09b 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-dev-posix @@ -7,13 +7,13 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix index 72678b9f8f44..d1c67aacb001 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_preview-prod-posix @@ -6,13 +6,13 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/html/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/html-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix index ebd506ced967..64e4d88c7a94 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-dev-posix @@ -7,6 +7,8 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", @@ -14,8 +16,6 @@ Object { "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", "ROOT/addons/interactions/preview.js-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix index f6c3e181352a..9f1c9872be90 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_preview-prod-posix @@ -6,6 +6,8 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", @@ -13,8 +15,6 @@ Object { "ROOT/addons/measure/preview.js-generated-config-entry.js", "ROOT/addons/outline/preview.js-generated-config-entry.js", "ROOT/addons/interactions/preview.js-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/vue3/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/vue-3-cli/.storybook/preview.ts-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix index 3faa6ee6e674..12efbe2571e2 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-dev-posix @@ -7,14 +7,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/globals.js", "NODE_MODULES/webpack-hot-middleware/client.js?reload=true&quiet=false&noInfo=undefined", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/interactions/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix index 7e9a725449d9..0a9453609940 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_preview-prod-posix @@ -6,14 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/globals/globals.js", "ROOT/storybook-init-framework-entry.js", + "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", + "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/addons/docs/preview.js-generated-config-entry.js", "ROOT/addons/a11y/preview.js-generated-config-entry.js", "ROOT/addons/actions/preview.js-generated-config-entry.js", "ROOT/addons/backgrounds/preview.js-generated-config-entry.js", "ROOT/addons/interactions/preview.js-generated-config-entry.js", "ROOT/addons/links/preview.js-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/preview/config-generated-config-entry.js", - "ROOT/app/web-components/dist/esm/client/docs/config-generated-config-entry.js", "ROOT/examples/web-components-kitchen-sink/.storybook/preview.js-generated-config-entry.js", "ROOT/generated-stories-entry.js", ], From 30ee7a78bb8e3fbb063fb779980ded62363753b1 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 10:42:45 +0800 Subject: [PATCH 39/46] Ensure options get passed to virtual preset --- lib/core-common/src/presets.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index 16cab9827bfe..319f1a19504b 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -66,12 +66,13 @@ interface ResolvedAddonVirtual { name: string; managerEntries?: string[]; previewAnnotations?: string[]; - presets?: string[]; + presets?: (string | { name: string; options?: any })[]; } export const resolveAddonName = ( configDir: string, - name: string + name: string, + options: any ): ResolvedAddonPreset | ResolvedAddonVirtual => { const r = name.startsWith('/') ? safeResolve : safeResolveFrom.bind(null, configDir); const resolved = r(name); @@ -113,7 +114,7 @@ export const resolveAddonName = ( ? { managerEntries: [managerFile, !presetFile && registerFile].filter(Boolean) } : {}), ...(previewFile ? { previewAnnotations: [previewFile] } : {}), - ...(presetFile ? { presets: [presetFile] } : {}), + ...(presetFile ? { presets: [{ name: presetFile, options }] } : {}), }; } @@ -129,9 +130,10 @@ const map = const options = isObject(item) ? item.options || undefined : undefined; const name = isObject(item) ? item.name : item; try { + const resolved = resolveAddonName(configDir, name, options); return { ...(options ? { options } : {}), - ...resolveAddonName(configDir, name), + ...resolved, }; } catch (err) { logger.error( From 966ece81ab5d3226680dcfd4363f1e7b2e9f6e1b Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 10:51:29 +0800 Subject: [PATCH 40/46] Fix StorybookConfig type --- lib/core-common/src/types.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/core-common/src/types.ts b/lib/core-common/src/types.ts index 371878343cb5..b5c78a5cb368 100644 --- a/lib/core-common/src/types.ts +++ b/lib/core-common/src/types.ts @@ -412,6 +412,13 @@ export interface StorybookConfig { /** * Add additional scripts to run in the preview a la `.storybook/preview.js` + * + * @deprecated use `previewAnnotations` or `/preview.js` file instead */ config?: (entries: Entry[], options: Options) => Entry[]; + + /** + * Add additional scripts to run in the preview a la `.storybook/preview.js` + */ + previewAnnotations?: (entries: Entry[], options: Options) => Entry[]; } From 04b4954160a459560633e2dd1ceff90758fb8879 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 23 Mar 2022 13:44:17 +0800 Subject: [PATCH 41/46] Fix lockfile --- .../web-components-kitchen-sink/yarn.lock | 310 +++++++++--------- 1 file changed, 155 insertions(+), 155 deletions(-) diff --git a/examples/web-components-kitchen-sink/yarn.lock b/examples/web-components-kitchen-sink/yarn.lock index 879e095c6a80..0bdc897dd808 100644 --- a/examples/web-components-kitchen-sink/yarn.lock +++ b/examples/web-components-kitchen-sink/yarn.lock @@ -2114,14 +2114,14 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-a11y@portal:../../addons/a11y::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/theming": 6.5.0-alpha.49 axe-core: ^4.2.0 core-js: ^3.8.2 global: ^4.4.0 @@ -2145,12 +2145,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-actions@portal:../../addons/actions::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 global: ^4.4.0 @@ -2178,13 +2179,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-backgrounds@portal:../../addons/backgrounds::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 global: ^4.4.0 memoizerific: ^1.11.3 @@ -2206,15 +2207,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-controls@portal:../../addons/controls::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/node-logger": 6.5.0-alpha.47 - "@storybook/store": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/node-logger": 6.5.0-alpha.49 + "@storybook/store": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 lodash: ^4.17.21 ts-dedent: ^2.0.0 @@ -2237,20 +2238,20 @@ __metadata: "@babel/preset-env": ^7.12.11 "@jest/transform": ^26.6.2 "@mdx-js/react": ^1.6.22 - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/docs-tools": 6.5.0-alpha.47 + "@storybook/docs-tools": 6.5.0-alpha.49 "@storybook/mdx1-csf": canary - "@storybook/node-logger": 6.5.0-alpha.47 - "@storybook/postinstall": 6.5.0-alpha.47 - "@storybook/preview-web": 6.5.0-alpha.47 - "@storybook/source-loader": 6.5.0-alpha.47 - "@storybook/store": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/node-logger": 6.5.0-alpha.49 + "@storybook/postinstall": 6.5.0-alpha.49 + "@storybook/preview-web": 6.5.0-alpha.49 + "@storybook/source-loader": 6.5.0-alpha.49 + "@storybook/store": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 global: ^4.4.0 @@ -2310,11 +2311,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-links@portal:../../addons/links::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/router": 6.5.0-alpha.47 + "@storybook/router": 6.5.0-alpha.49 "@types/qs": ^6.9.5 core-js: ^3.8.2 global: ^4.4.0 @@ -2338,12 +2339,12 @@ __metadata: resolution: "@storybook/addon-storyshots@portal:../../addons/storyshots/storyshots-core::locator=web-components-kitchen-sink%40workspace%3A." dependencies: "@jest/transform": ^26.6.2 - "@storybook/addons": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 "@storybook/babel-plugin-require-context-hook": 1.0.1 - "@storybook/client-api": 6.5.0-alpha.47 - "@storybook/core": 6.5.0-alpha.47 - "@storybook/core-client": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 + "@storybook/client-api": 6.5.0-alpha.49 + "@storybook/core": 6.5.0-alpha.49 + "@storybook/core-client": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 "@types/glob": ^7.1.3 "@types/jest": ^26.0.16 @@ -2413,13 +2414,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-storysource@portal:../../addons/storysource::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/router": 6.5.0-alpha.47 - "@storybook/source-loader": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/router": 6.5.0-alpha.49 + "@storybook/source-loader": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 estraverse: ^5.2.0 loader-utils: ^2.0.0 @@ -2442,12 +2443,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-viewport@portal:../../addons/viewport::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 global: ^4.4.0 memoizerific: ^1.11.3 @@ -2468,13 +2469,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addons@portal:../../lib/addons::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/api": 6.5.0-alpha.47 - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/router": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/router": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 "@types/webpack-env": ^1.16.0 core-js: ^3.8.2 global: ^4.4.0 @@ -2489,13 +2490,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/api@portal:../../lib/api::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/router": 6.5.0-alpha.47 + "@storybook/router": 6.5.0-alpha.49 "@storybook/semver": ^7.3.2 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 global: ^4.4.0 @@ -2524,22 +2525,22 @@ __metadata: resolution: "@storybook/builder-webpack4@portal:../../lib/builder-webpack4::locator=web-components-kitchen-sink%40workspace%3A." dependencies: "@babel/core": ^7.12.10 - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/channel-postmessage": 6.5.0-alpha.47 - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 - "@storybook/node-logger": 6.5.0-alpha.47 - "@storybook/preview-web": 6.5.0-alpha.47 - "@storybook/router": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/channel-postmessage": 6.5.0-alpha.49 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 + "@storybook/node-logger": 6.5.0-alpha.49 + "@storybook/preview-web": 6.5.0-alpha.49 + "@storybook/router": 6.5.0-alpha.49 "@storybook/semver": ^7.3.2 - "@storybook/store": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 - "@storybook/ui": 6.5.0-alpha.47 + "@storybook/store": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 + "@storybook/ui": 6.5.0-alpha.49 "@types/node": ^14.0.10 || ^16.0.0 "@types/webpack": ^4.41.26 autoprefixer: ^9.8.6 @@ -2583,9 +2584,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/channel-postmessage@portal:../../lib/channel-postmessage::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 core-js: ^3.8.2 global: ^4.4.0 qs: ^6.10.0 @@ -2597,8 +2598,8 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/channel-websocket@portal:../../lib/channel-websocket::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 core-js: ^3.8.2 global: ^4.4.0 telejson: ^5.3.3 @@ -2619,13 +2620,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/client-api@portal:../../lib/client-api::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/channel-postmessage": 6.5.0-alpha.47 - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/channel-postmessage": 6.5.0-alpha.49 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/store": 6.5.0-alpha.47 + "@storybook/store": 6.5.0-alpha.49 "@types/qs": ^6.9.5 "@types/webpack-env": ^1.16.0 core-js: ^3.8.2 @@ -2658,9 +2659,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/components@portal:../../lib/components::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/client-logger": 6.5.0-alpha.47 + "@storybook/client-logger": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 regenerator-runtime: ^0.13.7 peerDependencies: @@ -2673,16 +2674,16 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/core-client@portal:../../lib/core-client::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/channel-postmessage": 6.5.0-alpha.47 - "@storybook/channel-websocket": 6.5.0-alpha.47 - "@storybook/client-api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/channel-postmessage": 6.5.0-alpha.49 + "@storybook/channel-websocket": 6.5.0-alpha.49 + "@storybook/client-api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/preview-web": 6.5.0-alpha.47 - "@storybook/store": 6.5.0-alpha.47 - "@storybook/ui": 6.5.0-alpha.47 + "@storybook/preview-web": 6.5.0-alpha.49 + "@storybook/store": 6.5.0-alpha.49 + "@storybook/ui": 6.5.0-alpha.49 airbnb-js-shims: ^2.2.1 ansi-to-html: ^0.6.11 core-js: ^3.8.2 @@ -2729,7 +2730,7 @@ __metadata: "@babel/preset-react": ^7.12.10 "@babel/preset-typescript": ^7.12.7 "@babel/register": ^7.12.1 - "@storybook/node-logger": 6.5.0-alpha.47 + "@storybook/node-logger": 6.5.0-alpha.49 "@storybook/semver": ^7.3.2 "@types/node": ^14.0.10 || ^16.0.0 "@types/pretty-hrtime": ^1.0.0 @@ -2779,16 +2780,16 @@ __metadata: resolution: "@storybook/core-server@portal:../../lib/core-server::locator=web-components-kitchen-sink%40workspace%3A." dependencies: "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-webpack4": 6.5.0-alpha.47 - "@storybook/core-client": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/builder-webpack4": 6.5.0-alpha.49 + "@storybook/core-client": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/csf-tools": 6.5.0-alpha.47 - "@storybook/manager-webpack4": 6.5.0-alpha.47 - "@storybook/node-logger": 6.5.0-alpha.47 + "@storybook/csf-tools": 6.5.0-alpha.49 + "@storybook/manager-webpack4": 6.5.0-alpha.49 + "@storybook/node-logger": 6.5.0-alpha.49 "@storybook/semver": ^7.3.2 - "@storybook/store": 6.5.0-alpha.47 + "@storybook/store": 6.5.0-alpha.49 "@types/node": ^14.0.10 || ^16.0.0 "@types/node-fetch": ^2.5.7 "@types/pretty-hrtime": ^1.0.0 @@ -2839,8 +2840,8 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/core@portal:../../lib/core::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/core-client": 6.5.0-alpha.47 - "@storybook/core-server": 6.5.0-alpha.47 + "@storybook/core-client": 6.5.0-alpha.49 + "@storybook/core-server": 6.5.0-alpha.49 peerDependencies: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 @@ -2896,8 +2897,7 @@ __metadata: dependencies: "@babel/core": ^7.12.10 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/node-logger": 6.5.0-alpha.47 - "@storybook/store": 6.5.0-alpha.47 + "@storybook/store": 6.5.0-alpha.49 core-js: ^3.8.2 doctrine: ^3.0.0 lodash: ^4.17.21 @@ -2912,12 +2912,12 @@ __metadata: "@babel/core": ^7.12.10 "@babel/plugin-transform-template-literals": ^7.12.1 "@babel/preset-react": ^7.12.10 - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/core-client": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 - "@storybook/node-logger": 6.5.0-alpha.47 - "@storybook/theming": 6.5.0-alpha.47 - "@storybook/ui": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/core-client": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 + "@storybook/node-logger": 6.5.0-alpha.49 + "@storybook/theming": 6.5.0-alpha.49 + "@storybook/ui": 6.5.0-alpha.49 "@types/node": ^14.0.10 || ^16.0.0 "@types/webpack": ^4.41.26 babel-loader: ^8.0.0 @@ -2996,12 +2996,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preview-web@portal:../../lib/preview-web::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/channel-postmessage": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/channel-postmessage": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/store": 6.5.0-alpha.47 + "@storybook/store": 6.5.0-alpha.49 ansi-to-html: ^0.6.11 core-js: ^3.8.2 global: ^4.4.0 @@ -3022,7 +3022,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/router@portal:../../lib/router::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/client-logger": 6.5.0-alpha.47 + "@storybook/client-logger": 6.5.0-alpha.49 core-js: ^3.8.2 regenerator-runtime: ^0.13.7 peerDependencies: @@ -3047,8 +3047,8 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/source-loader@portal:../../lib/source-loader::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 core-js: ^3.8.2 estraverse: ^5.2.0 @@ -3067,9 +3067,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/store@portal:../../lib/store::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 core-js: ^3.8.2 fast-deep-equal: ^3.1.3 @@ -3092,7 +3092,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/theming@portal:../../lib/theming::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/client-logger": 6.5.0-alpha.47 + "@storybook/client-logger": 6.5.0-alpha.49 core-js: ^3.8.2 regenerator-runtime: ^0.13.7 peerDependencies: @@ -3105,15 +3105,15 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/ui@portal:../../lib/ui::locator=web-components-kitchen-sink%40workspace%3A." dependencies: - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/api": 6.5.0-alpha.47 - "@storybook/channels": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/components": 6.5.0-alpha.47 - "@storybook/core-events": 6.5.0-alpha.47 - "@storybook/router": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/api": 6.5.0-alpha.49 + "@storybook/channels": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/components": 6.5.0-alpha.49 + "@storybook/core-events": 6.5.0-alpha.49 + "@storybook/router": 6.5.0-alpha.49 "@storybook/semver": ^7.3.2 - "@storybook/theming": 6.5.0-alpha.47 + "@storybook/theming": 6.5.0-alpha.49 core-js: ^3.8.2 regenerator-runtime: ^0.13.7 resolve-from: ^5.0.0 @@ -3130,15 +3130,15 @@ __metadata: "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/preset-env": ^7.12.11 - "@storybook/addons": 6.5.0-alpha.47 - "@storybook/client-api": 6.5.0-alpha.47 - "@storybook/client-logger": 6.5.0-alpha.47 - "@storybook/core": 6.5.0-alpha.47 - "@storybook/core-common": 6.5.0-alpha.47 + "@storybook/addons": 6.5.0-alpha.49 + "@storybook/client-api": 6.5.0-alpha.49 + "@storybook/client-logger": 6.5.0-alpha.49 + "@storybook/core": 6.5.0-alpha.49 + "@storybook/core-common": 6.5.0-alpha.49 "@storybook/csf": 0.0.2--canary.87bc651.0 - "@storybook/docs-tools": 6.5.0-alpha.47 - "@storybook/preview-web": 6.5.0-alpha.47 - "@storybook/store": 6.5.0-alpha.47 + "@storybook/docs-tools": 6.5.0-alpha.49 + "@storybook/preview-web": 6.5.0-alpha.49 + "@storybook/store": 6.5.0-alpha.49 "@types/node": ^14.14.20 || ^16.0.0 "@types/webpack-env": ^1.16.0 babel-plugin-bundled-import-meta: ^0.3.1 From b4c24689fc34129e4ea88d607e4e68cd15ecae45 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 25 Mar 2022 10:30:57 +0100 Subject: [PATCH 42/46] change some references back to register, and update a few docs --- .../common/my-addon-preset-implementation.js.mdx | 2 +- ...ybook-addon-load-external-addons-preset.js.mdx | 2 +- .../common/storybook-addon-preset-example.js.mdx | 2 +- ...book-main-register-presets-managerentry.js.mdx | 1 - .../storybook-main-use-manager-entries.js.mdx | 2 +- .../storybook-storysource-manager-entries.js.mdx | 4 +--- lib/core-common/src/presets.ts | 15 +++++++++++---- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/docs/snippets/common/my-addon-preset-implementation.js.mdx b/docs/snippets/common/my-addon-preset-implementation.js.mdx index 6ad7df9ee3f1..2f31ec25ac35 100644 --- a/docs/snippets/common/my-addon-preset-implementation.js.mdx +++ b/docs/snippets/common/my-addon-preset-implementation.js.mdx @@ -2,7 +2,7 @@ // /my-addon/src/preset.js function managerEntries(entry = []) { - return [...entry, require.resolve("./manager")]; //👈 Addon implementation + return [...entry, require.resolve("./register")]; //👈 Addon implementation } module.exports = { managerEntries } diff --git a/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx b/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx index 9e2cac6af83f..b13c6841ec8d 100644 --- a/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx +++ b/docs/snippets/common/storybook-addon-load-external-addons-preset.js.mdx @@ -2,7 +2,7 @@ // my-preset/index.js function managerEntries(entry = []) { - return [...entry, require.resolve('my-other-addon/manager')]; + return [...entry, require.resolve('my-other-addon/register')]; } const config = (entry = [], options) => { diff --git a/docs/snippets/common/storybook-addon-preset-example.js.mdx b/docs/snippets/common/storybook-addon-preset-example.js.mdx index db1a7c26b595..a23a6ca04f31 100644 --- a/docs/snippets/common/storybook-addon-preset-example.js.mdx +++ b/docs/snippets/common/storybook-addon-preset-example.js.mdx @@ -6,7 +6,7 @@ export function config(entry = []) { } export function managerEntries(entries) { - return [...entries, require.resolve('./manager')]; + return [...entries, require.resolve('./register')]; } export const parameters = { diff --git a/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx b/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx index 3673c58dd3da..18fa46acdf1f 100644 --- a/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx +++ b/docs/snippets/common/storybook-main-register-presets-managerentry.js.mdx @@ -3,7 +3,6 @@ module.exports = { addons: [ - '@storybook/addon-storysource/manager', // A managerEntry registered here, in this case from the storysource addon. '@storybook/addon-docs/preset', // A preset registered here, in this case from the addon-docs addon. ], }; diff --git a/docs/snippets/common/storybook-main-use-manager-entries.js.mdx b/docs/snippets/common/storybook-main-use-manager-entries.js.mdx index 00b2730bf107..024799320379 100644 --- a/docs/snippets/common/storybook-main-use-manager-entries.js.mdx +++ b/docs/snippets/common/storybook-main-use-manager-entries.js.mdx @@ -2,6 +2,6 @@ // .storybook/main.js module.exports = { - managerEntries: ['@storybook/addon-storysource/manager'], + managerEntries: ['some-storybook-addon/entry-point.js'], }; ``` \ No newline at end of file diff --git a/docs/snippets/common/storybook-storysource-manager-entries.js.mdx b/docs/snippets/common/storybook-storysource-manager-entries.js.mdx index 4651d56bf565..e9c5dec6d95e 100644 --- a/docs/snippets/common/storybook-storysource-manager-entries.js.mdx +++ b/docs/snippets/common/storybook-storysource-manager-entries.js.mdx @@ -1,7 +1,5 @@ ```js // storysource/preset.js -export function managerEntries(entry = []) { - return [...entry, require.resolve('@storybook/addon-storysource/manager')]; -} +/* nothing needed */ ``` \ No newline at end of file diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index 319f1a19504b..268468c8df28 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -106,13 +106,20 @@ export const resolveAddonName = ( } if (managerFile || registerFile || previewFile || presetFile) { + const managerEntries = []; + + if (managerFile) { + managerEntries.push(managerFile); + } + // register file is the old way of registering addons + if (!managerFile && registerFile && !presetFile) { + managerEntries.push(registerFile); + } + return { type: 'virtual', name: path, - // register file is the old way of registering addons - ...(managerFile || registerFile - ? { managerEntries: [managerFile, !presetFile && registerFile].filter(Boolean) } - : {}), + ...(managerEntries.length ? { managerEntries } : {}), ...(previewFile ? { previewAnnotations: [previewFile] } : {}), ...(presetFile ? { presets: [{ name: presetFile, options }] } : {}), }; From 0b9412de5109b7dc4c7a4889a50c210fc6f0a5d4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 25 Mar 2022 14:12:12 +0100 Subject: [PATCH 43/46] update snapshots --- .../src/__snapshots__/cra-ts-essentials_manager-dev-posix | 6 ------ .../__snapshots__/cra-ts-essentials_manager-prod-posix | 6 ------ .../src/__snapshots__/html-kitchen-sink_manager-dev-posix | 7 ------- .../__snapshots__/html-kitchen-sink_manager-prod-posix | 7 ------- .../src/__snapshots__/vue-3-cli_manager-dev-posix | 8 -------- .../src/__snapshots__/vue-3-cli_manager-prod-posix | 8 -------- .../web-components-kitchen-sink_manager-dev-posix | 7 ------- .../web-components-kitchen-sink_manager-prod-posix | 7 ------- 8 files changed, 56 deletions(-) diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix index d4595ce3ec4f..1937cd52a90a 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-dev-posix @@ -8,17 +8,11 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/toolbars/manager.js", - "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", - "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", - "ROOT/addons/outline/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix index 19a729b4c6cd..5327d847d2c6 100644 --- a/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/cra-ts-essentials_manager-prod-posix @@ -8,17 +8,11 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/toolbars/manager.js", - "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", - "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", - "ROOT/addons/outline/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix index ea35099f4de7..9fcbeaa6c249 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-dev-posix @@ -7,20 +7,13 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/manager.js", "ROOT/addons/a11y/manager.js", - "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/jest/manager.js", - "ROOT/addons/jest/register.js", "ROOT/addons/links/manager.js", - "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", - "ROOT/addons/viewport/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix index f0c8b118dbe9..348d29de932a 100644 --- a/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/html-kitchen-sink_manager-prod-posix @@ -7,20 +7,13 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/manager.js", "ROOT/addons/a11y/manager.js", - "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/jest/manager.js", - "ROOT/addons/jest/register.js", "ROOT/addons/links/manager.js", - "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", - "ROOT/addons/viewport/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix index 5c55aa8f4245..ec8992f03346 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-dev-posix @@ -6,22 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", - "ROOT/addons/links/register.js", "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/viewport/manager.js", - "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", - "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", - "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", - "ROOT/addons/outline/register.js", "ROOT/addons/interactions/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix index 2c96023c5cc6..a686af760a22 100644 --- a/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/vue-3-cli_manager-prod-posix @@ -6,22 +6,14 @@ Object { "ROOT/lib/core-client/dist/esm/globals/polyfills.js", "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/links/manager.js", - "ROOT/addons/links/register.js", "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/viewport/manager.js", - "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", - "ROOT/addons/toolbars/register.js", "ROOT/addons/measure/manager.js", - "ROOT/addons/measure/register.js", "ROOT/addons/outline/manager.js", - "ROOT/addons/outline/register.js", "ROOT/addons/interactions/manager.js", ], "keys": Array [ diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix index a500abda4d3d..0676e83166fe 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-dev-posix @@ -7,21 +7,14 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/a11y/manager.js", - "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/interactions/manager.js", "ROOT/addons/links/manager.js", - "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", - "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", - "ROOT/addons/toolbars/register.js", ], "keys": Array [ "name", diff --git a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix index 566d60a3f8a9..982723cbc1ac 100644 --- a/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix +++ b/lib/core-server/src/__snapshots__/web-components-kitchen-sink_manager-prod-posix @@ -7,21 +7,14 @@ Object { "ROOT/lib/core-client/dist/esm/manager/index.js", "ROOT/addons/docs/manager.js", "ROOT/addons/controls/manager.js", - "ROOT/addons/controls/register.js", "ROOT/addons/a11y/manager.js", - "ROOT/addons/a11y/register.js", "ROOT/addons/actions/manager.js", - "ROOT/addons/actions/register.js", "ROOT/addons/backgrounds/manager.js", - "ROOT/addons/backgrounds/register.js", "ROOT/addons/interactions/manager.js", "ROOT/addons/links/manager.js", - "ROOT/addons/links/register.js", "ROOT/addons/storysource/dist/esm/manager.js", "ROOT/addons/viewport/manager.js", - "ROOT/addons/viewport/register.js", "ROOT/addons/toolbars/manager.js", - "ROOT/addons/toolbars/register.js", ], "keys": Array [ "name", From 0a427112beabcae625bc2296ea4215ff3cc0227a Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 25 Mar 2022 14:57:09 +0100 Subject: [PATCH 44/46] bump --- lib/core-common/src/presets.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/core-common/src/presets.ts b/lib/core-common/src/presets.ts index 268468c8df28..24093df15337 100644 --- a/lib/core-common/src/presets.ts +++ b/lib/core-common/src/presets.ts @@ -92,7 +92,8 @@ export const resolveAddonName = ( } const path = name; - // when user provides full path, we don't need to do anything + + // when user provides full path, we don't need to do anything! const managerFile = safeResolve(`${path}/manager`); const registerFile = safeResolve(`${path}/register`) || safeResolve(`${path}/register-panel`); const previewFile = safeResolve(`${path}/preview`); From c8e7a0c30c7384d6e59338abc319d8dedf7608b9 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 25 Mar 2022 15:59:54 +0100 Subject: [PATCH 45/46] add storybook/csf as alias --- examples/web-components-kitchen-sink/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/web-components-kitchen-sink/package.json b/examples/web-components-kitchen-sink/package.json index 85c1f0ea5f99..1ef8e3106a58 100644 --- a/examples/web-components-kitchen-sink/package.json +++ b/examples/web-components-kitchen-sink/package.json @@ -39,6 +39,7 @@ "@storybook/core-common": "portal:../../lib/core-common", "@storybook/core-events": "portal:../../lib/core-events", "@storybook/core-server": "portal:../../lib/core-server", + "@storybook/csf": "0.0.2--canary.87bc651.0", "@storybook/csf-tools": "portal:../../lib/csf-tools", "@storybook/docs-tools": "portal:../../lib/docs-tools", "@storybook/jest": "^0.0.5", From 8f8f90382ea75f05dbf4ab566761c9f892c99be4 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 29 Mar 2022 17:22:24 +0200 Subject: [PATCH 46/46] =?UTF-8?q?fix=20thanks=20to=20shilman=20?= =?UTF-8?q?=F0=9F=98=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/docs/src/preview.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/docs/src/preview.ts b/addons/docs/src/preview.ts index 9f3d9b2d8c1e..a6269505f285 100644 --- a/addons/docs/src/preview.ts +++ b/addons/docs/src/preview.ts @@ -1,8 +1,6 @@ export const parameters = { docs: { - inlineStories: false, getContainer: async () => (await import('./blocks')).DocsContainer, getPage: async () => (await import('./blocks')).DocsPage, - iframeHeight: 100, }, };