From 2cf017f9dfb61b1f017d97831b04a9154b3053a8 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 24 May 2023 16:08:39 +0200 Subject: [PATCH 1/4] move builders --- code/.eslintrc.js | 9 ++++++++- .../storyshots-core/src/frameworks/configure.ts | 2 +- code/{lib => builders}/builder-manager/README.md | 0 .../{lib => builders}/builder-manager/jest.config.js | 0 code/{lib => builders}/builder-manager/package.json | 4 ++-- code/{lib => builders}/builder-manager/project.json | 0 code/{lib => builders}/builder-manager/src/index.ts | 0 code/{lib => builders}/builder-manager/src/types.ts | 0 .../builder-manager/src/utils/data.ts | 0 .../builder-manager/src/utils/files.test.ts | 0 .../builder-manager/src/utils/files.ts | 0 .../builder-manager/src/utils/globals.ts | 0 .../builder-manager/src/utils/managerEntries.ts | 0 .../builder-manager/src/utils/safeResolve.ts | 0 .../builder-manager/src/utils/template.ts | 0 .../builder-manager/templates/addon.tsconfig.json | 0 .../builder-manager/templates/template.ejs | 0 code/{lib => builders}/builder-manager/tsconfig.json | 0 code/{lib => builders}/builder-vite/README.md | 0 .../{lib => builders}/builder-vite/input/iframe.html | 0 code/{lib => builders}/builder-vite/jest.config.js | 0 code/{lib => builders}/builder-vite/package.json | 4 ++-- code/{lib => builders}/builder-vite/project.json | 0 code/{lib => builders}/builder-vite/src/build.ts | 0 .../builder-vite/src/codegen-entries.ts | 0 .../builder-vite/src/codegen-iframe-script.ts | 0 .../builder-vite/src/codegen-importfn-script.ts | 0 .../builder-vite/src/codegen-modern-iframe-script.ts | 2 +- .../builder-vite/src/codegen-set-addon-channel.ts | 0 code/{lib => builders}/builder-vite/src/envs.ts | 0 code/{lib => builders}/builder-vite/src/index.ts | 0 .../builder-vite/src/list-stories.ts | 0 .../builder-vite/src/optimizeDeps.ts | 0 .../src/plugins/code-generator-plugin.ts | 0 .../builder-vite/src/plugins/csf-plugin.ts | 0 .../src/plugins/external-globals-plugin.test.ts | 0 .../src/plugins/external-globals-plugin.ts | 0 .../builder-vite/src/plugins/index.ts | 0 .../src/plugins/inject-export-order-plugin.ts | 0 .../builder-vite/src/plugins/mdx-plugin.ts | 0 .../builder-vite/src/plugins/mdx-plugin.types.d.ts | 0 .../src/plugins/strip-story-hmr-boundaries.ts | 0 .../builder-vite/src/transform-iframe-html.ts | 0 code/{lib => builders}/builder-vite/src/types.ts | 0 .../builder-vite/src/utils/has-vite-plugins.test.ts | 0 .../builder-vite/src/utils/has-vite-plugins.ts | 0 .../src/utils/process-preview-annotation.test.ts | 0 .../src/utils/process-preview-annotation.ts | 0 .../src/utils/without-vite-plugins.test.ts | 0 .../builder-vite/src/utils/without-vite-plugins.ts | 0 .../builder-vite/src/virtual-file-names.ts | 0 .../builder-vite/src/vite-config.test.ts | 0 .../builder-vite/src/vite-config.ts | 0 .../builder-vite/src/vite-server.ts | 0 code/{lib => builders}/builder-vite/tsconfig.json | 0 code/{lib => builders}/builder-webpack5/README.md | 0 .../builder-webpack5/jest.config.js | 0 code/{lib => builders}/builder-webpack5/package.json | 4 ++-- code/{lib => builders}/builder-webpack5/project.json | 0 code/{lib => builders}/builder-webpack5/src/index.ts | 0 .../src/presets/custom-webpack-preset.ts | 0 .../builder-webpack5/src/presets/preview-preset.ts | 0 .../src/preview/base-webpack.config.ts | 0 .../src/preview/iframe-webpack.config.ts | 0 .../builder-webpack5/src/preview/loaders.ts | 0 code/{lib => builders}/builder-webpack5/src/types.ts | 0 .../builder-webpack5/templates/preview.ejs | 0 .../templates/virtualModuleEntry.template.js | 0 .../templates/virtualModuleModernEntry.js.handlebars | 0 .../templates/virtualModuleStory.template.js | 0 .../{lib => builders}/builder-webpack5/tsconfig.json | 0 code/{lib => builders}/builder-webpack5/typings.d.ts | 0 code/jest.config.js | 1 + code/package.json | 1 + code/presets/create-react-app/src/index.ts | 2 +- code/presets/react-webpack/src/types.ts | 2 +- code/yarn.lock | 12 ++++++------ test-storybooks/ember-cli/package.json | 6 +++--- test-storybooks/external-docs/package.json | 6 +++--- test-storybooks/server-kitchen-sink/package.json | 6 +++--- test-storybooks/standalone-preview/package.json | 6 +++--- 81 files changed, 38 insertions(+), 29 deletions(-) rename code/{lib => builders}/builder-manager/README.md (100%) rename code/{lib => builders}/builder-manager/jest.config.js (100%) rename code/{lib => builders}/builder-manager/package.json (95%) rename code/{lib => builders}/builder-manager/project.json (100%) rename code/{lib => builders}/builder-manager/src/index.ts (100%) rename code/{lib => builders}/builder-manager/src/types.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/data.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/files.test.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/files.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/globals.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/managerEntries.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/safeResolve.ts (100%) rename code/{lib => builders}/builder-manager/src/utils/template.ts (100%) rename code/{lib => builders}/builder-manager/templates/addon.tsconfig.json (100%) rename code/{lib => builders}/builder-manager/templates/template.ejs (100%) rename code/{lib => builders}/builder-manager/tsconfig.json (100%) rename code/{lib => builders}/builder-vite/README.md (100%) rename code/{lib => builders}/builder-vite/input/iframe.html (100%) rename code/{lib => builders}/builder-vite/jest.config.js (100%) rename code/{lib => builders}/builder-vite/package.json (96%) rename code/{lib => builders}/builder-vite/project.json (100%) rename code/{lib => builders}/builder-vite/src/build.ts (100%) rename code/{lib => builders}/builder-vite/src/codegen-entries.ts (100%) rename code/{lib => builders}/builder-vite/src/codegen-iframe-script.ts (100%) rename code/{lib => builders}/builder-vite/src/codegen-importfn-script.ts (100%) rename code/{lib => builders}/builder-vite/src/codegen-modern-iframe-script.ts (96%) rename code/{lib => builders}/builder-vite/src/codegen-set-addon-channel.ts (100%) rename code/{lib => builders}/builder-vite/src/envs.ts (100%) rename code/{lib => builders}/builder-vite/src/index.ts (100%) rename code/{lib => builders}/builder-vite/src/list-stories.ts (100%) rename code/{lib => builders}/builder-vite/src/optimizeDeps.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/code-generator-plugin.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/csf-plugin.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/external-globals-plugin.test.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/external-globals-plugin.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/index.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/inject-export-order-plugin.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/mdx-plugin.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/mdx-plugin.types.d.ts (100%) rename code/{lib => builders}/builder-vite/src/plugins/strip-story-hmr-boundaries.ts (100%) rename code/{lib => builders}/builder-vite/src/transform-iframe-html.ts (100%) rename code/{lib => builders}/builder-vite/src/types.ts (100%) rename code/{lib => builders}/builder-vite/src/utils/has-vite-plugins.test.ts (100%) rename code/{lib => builders}/builder-vite/src/utils/has-vite-plugins.ts (100%) rename code/{lib => builders}/builder-vite/src/utils/process-preview-annotation.test.ts (100%) rename code/{lib => builders}/builder-vite/src/utils/process-preview-annotation.ts (100%) rename code/{lib => builders}/builder-vite/src/utils/without-vite-plugins.test.ts (100%) rename code/{lib => builders}/builder-vite/src/utils/without-vite-plugins.ts (100%) rename code/{lib => builders}/builder-vite/src/virtual-file-names.ts (100%) rename code/{lib => builders}/builder-vite/src/vite-config.test.ts (100%) rename code/{lib => builders}/builder-vite/src/vite-config.ts (100%) rename code/{lib => builders}/builder-vite/src/vite-server.ts (100%) rename code/{lib => builders}/builder-vite/tsconfig.json (100%) rename code/{lib => builders}/builder-webpack5/README.md (100%) rename code/{lib => builders}/builder-webpack5/jest.config.js (100%) rename code/{lib => builders}/builder-webpack5/package.json (98%) rename code/{lib => builders}/builder-webpack5/project.json (100%) rename code/{lib => builders}/builder-webpack5/src/index.ts (100%) rename code/{lib => builders}/builder-webpack5/src/presets/custom-webpack-preset.ts (100%) rename code/{lib => builders}/builder-webpack5/src/presets/preview-preset.ts (100%) rename code/{lib => builders}/builder-webpack5/src/preview/base-webpack.config.ts (100%) rename code/{lib => builders}/builder-webpack5/src/preview/iframe-webpack.config.ts (100%) rename code/{lib => builders}/builder-webpack5/src/preview/loaders.ts (100%) rename code/{lib => builders}/builder-webpack5/src/types.ts (100%) rename code/{lib => builders}/builder-webpack5/templates/preview.ejs (100%) rename code/{lib => builders}/builder-webpack5/templates/virtualModuleEntry.template.js (100%) rename code/{lib => builders}/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars (100%) rename code/{lib => builders}/builder-webpack5/templates/virtualModuleStory.template.js (100%) rename code/{lib => builders}/builder-webpack5/tsconfig.json (100%) rename code/{lib => builders}/builder-webpack5/typings.d.ts (100%) diff --git a/code/.eslintrc.js b/code/.eslintrc.js index c8c7127d5c26..1a4bbc5c8308 100644 --- a/code/.eslintrc.js +++ b/code/.eslintrc.js @@ -69,7 +69,14 @@ module.exports = { }, { // these packages use pre-bundling, dependencies will be bundled, and will be in devDepenencies - files: ['addons/**/*', 'frameworks/**/*', 'lib/**/*', 'renderers/**/*', 'ui/**/*'], + files: [ + 'addons/**/*', + 'frameworks/**/*', + 'lib/**/*', + 'builders/**/*', + 'renderers/**/*', + 'ui/**/*', + ], excludedFiles: ['frameworks/angular/**/*', 'frameworks/ember/**/*', 'lib/core-server/**/*'], rules: { 'import/no-extraneous-dependencies': [ diff --git a/code/addons/storyshots-core/src/frameworks/configure.ts b/code/addons/storyshots-core/src/frameworks/configure.ts index aa1a1733c776..4a1d89918751 100644 --- a/code/addons/storyshots-core/src/frameworks/configure.ts +++ b/code/addons/storyshots-core/src/frameworks/configure.ts @@ -114,7 +114,7 @@ function configure( })); if (preview) { - // This is essentially the same code as lib/builder-webpack5/templates/virtualModuleEntry.template + // This is essentially the same code as builders/builder-webpack5/templates/virtualModuleEntry.template const { parameters, decorators, diff --git a/code/lib/builder-manager/README.md b/code/builders/builder-manager/README.md similarity index 100% rename from code/lib/builder-manager/README.md rename to code/builders/builder-manager/README.md diff --git a/code/lib/builder-manager/jest.config.js b/code/builders/builder-manager/jest.config.js similarity index 100% rename from code/lib/builder-manager/jest.config.js rename to code/builders/builder-manager/jest.config.js diff --git a/code/lib/builder-manager/package.json b/code/builders/builder-manager/package.json similarity index 95% rename from code/lib/builder-manager/package.json rename to code/builders/builder-manager/package.json index 71a3a3ab6c3b..64db4de78b89 100644 --- a/code/lib/builder-manager/package.json +++ b/code/builders/builder-manager/package.json @@ -5,14 +5,14 @@ "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/builder-manager", + "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-manager", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "code/lib/builder-manager" + "directory": "code/builders/builder-manager" }, "funding": { "type": "opencollective", diff --git a/code/lib/builder-manager/project.json b/code/builders/builder-manager/project.json similarity index 100% rename from code/lib/builder-manager/project.json rename to code/builders/builder-manager/project.json diff --git a/code/lib/builder-manager/src/index.ts b/code/builders/builder-manager/src/index.ts similarity index 100% rename from code/lib/builder-manager/src/index.ts rename to code/builders/builder-manager/src/index.ts diff --git a/code/lib/builder-manager/src/types.ts b/code/builders/builder-manager/src/types.ts similarity index 100% rename from code/lib/builder-manager/src/types.ts rename to code/builders/builder-manager/src/types.ts diff --git a/code/lib/builder-manager/src/utils/data.ts b/code/builders/builder-manager/src/utils/data.ts similarity index 100% rename from code/lib/builder-manager/src/utils/data.ts rename to code/builders/builder-manager/src/utils/data.ts diff --git a/code/lib/builder-manager/src/utils/files.test.ts b/code/builders/builder-manager/src/utils/files.test.ts similarity index 100% rename from code/lib/builder-manager/src/utils/files.test.ts rename to code/builders/builder-manager/src/utils/files.test.ts diff --git a/code/lib/builder-manager/src/utils/files.ts b/code/builders/builder-manager/src/utils/files.ts similarity index 100% rename from code/lib/builder-manager/src/utils/files.ts rename to code/builders/builder-manager/src/utils/files.ts diff --git a/code/lib/builder-manager/src/utils/globals.ts b/code/builders/builder-manager/src/utils/globals.ts similarity index 100% rename from code/lib/builder-manager/src/utils/globals.ts rename to code/builders/builder-manager/src/utils/globals.ts diff --git a/code/lib/builder-manager/src/utils/managerEntries.ts b/code/builders/builder-manager/src/utils/managerEntries.ts similarity index 100% rename from code/lib/builder-manager/src/utils/managerEntries.ts rename to code/builders/builder-manager/src/utils/managerEntries.ts diff --git a/code/lib/builder-manager/src/utils/safeResolve.ts b/code/builders/builder-manager/src/utils/safeResolve.ts similarity index 100% rename from code/lib/builder-manager/src/utils/safeResolve.ts rename to code/builders/builder-manager/src/utils/safeResolve.ts diff --git a/code/lib/builder-manager/src/utils/template.ts b/code/builders/builder-manager/src/utils/template.ts similarity index 100% rename from code/lib/builder-manager/src/utils/template.ts rename to code/builders/builder-manager/src/utils/template.ts diff --git a/code/lib/builder-manager/templates/addon.tsconfig.json b/code/builders/builder-manager/templates/addon.tsconfig.json similarity index 100% rename from code/lib/builder-manager/templates/addon.tsconfig.json rename to code/builders/builder-manager/templates/addon.tsconfig.json diff --git a/code/lib/builder-manager/templates/template.ejs b/code/builders/builder-manager/templates/template.ejs similarity index 100% rename from code/lib/builder-manager/templates/template.ejs rename to code/builders/builder-manager/templates/template.ejs diff --git a/code/lib/builder-manager/tsconfig.json b/code/builders/builder-manager/tsconfig.json similarity index 100% rename from code/lib/builder-manager/tsconfig.json rename to code/builders/builder-manager/tsconfig.json diff --git a/code/lib/builder-vite/README.md b/code/builders/builder-vite/README.md similarity index 100% rename from code/lib/builder-vite/README.md rename to code/builders/builder-vite/README.md diff --git a/code/lib/builder-vite/input/iframe.html b/code/builders/builder-vite/input/iframe.html similarity index 100% rename from code/lib/builder-vite/input/iframe.html rename to code/builders/builder-vite/input/iframe.html diff --git a/code/lib/builder-vite/jest.config.js b/code/builders/builder-vite/jest.config.js similarity index 100% rename from code/lib/builder-vite/jest.config.js rename to code/builders/builder-vite/jest.config.js diff --git a/code/lib/builder-vite/package.json b/code/builders/builder-vite/package.json similarity index 96% rename from code/lib/builder-vite/package.json rename to code/builders/builder-vite/package.json index 8376065c5ab9..9d52f218757f 100644 --- a/code/lib/builder-vite/package.json +++ b/code/builders/builder-vite/package.json @@ -2,14 +2,14 @@ "name": "@storybook/builder-vite", "version": "7.1.0-alpha.24", "description": "A plugin to run and build Storybooks with Vite", - "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/builder-vite/#readme", + "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "code/lib/builder-vite" + "directory": "code/builders/builder-vite" }, "funding": { "type": "opencollective", diff --git a/code/lib/builder-vite/project.json b/code/builders/builder-vite/project.json similarity index 100% rename from code/lib/builder-vite/project.json rename to code/builders/builder-vite/project.json diff --git a/code/lib/builder-vite/src/build.ts b/code/builders/builder-vite/src/build.ts similarity index 100% rename from code/lib/builder-vite/src/build.ts rename to code/builders/builder-vite/src/build.ts diff --git a/code/lib/builder-vite/src/codegen-entries.ts b/code/builders/builder-vite/src/codegen-entries.ts similarity index 100% rename from code/lib/builder-vite/src/codegen-entries.ts rename to code/builders/builder-vite/src/codegen-entries.ts diff --git a/code/lib/builder-vite/src/codegen-iframe-script.ts b/code/builders/builder-vite/src/codegen-iframe-script.ts similarity index 100% rename from code/lib/builder-vite/src/codegen-iframe-script.ts rename to code/builders/builder-vite/src/codegen-iframe-script.ts diff --git a/code/lib/builder-vite/src/codegen-importfn-script.ts b/code/builders/builder-vite/src/codegen-importfn-script.ts similarity index 100% rename from code/lib/builder-vite/src/codegen-importfn-script.ts rename to code/builders/builder-vite/src/codegen-importfn-script.ts diff --git a/code/lib/builder-vite/src/codegen-modern-iframe-script.ts b/code/builders/builder-vite/src/codegen-modern-iframe-script.ts similarity index 96% rename from code/lib/builder-vite/src/codegen-modern-iframe-script.ts rename to code/builders/builder-vite/src/codegen-modern-iframe-script.ts index 8c64e1b4b427..5bc163fba5fa 100644 --- a/code/lib/builder-vite/src/codegen-modern-iframe-script.ts +++ b/code/builders/builder-vite/src/codegen-modern-iframe-script.ts @@ -54,7 +54,7 @@ export async function generateModernIframeScriptCode(options: Options, projectRo }; /** - * This code is largely taken from https://github.com/storybookjs/storybook/blob/d1195cbd0c61687f1720fefdb772e2f490a46584/lib/builder-webpack4/src/preview/virtualModuleModernEntry.js.handlebars + * This code is largely taken from https://github.com/storybookjs/storybook/blob/d1195cbd0c61687f1720fefdb772e2f490a46584/builders/builder-webpack4/src/preview/virtualModuleModernEntry.js.handlebars * Some small tweaks were made to `getProjectAnnotations` (since `import()` needs to be resolved asynchronously) * and the HMR implementation has been tweaked to work with Vite. * @todo Inline variable and remove `noinspection` diff --git a/code/lib/builder-vite/src/codegen-set-addon-channel.ts b/code/builders/builder-vite/src/codegen-set-addon-channel.ts similarity index 100% rename from code/lib/builder-vite/src/codegen-set-addon-channel.ts rename to code/builders/builder-vite/src/codegen-set-addon-channel.ts diff --git a/code/lib/builder-vite/src/envs.ts b/code/builders/builder-vite/src/envs.ts similarity index 100% rename from code/lib/builder-vite/src/envs.ts rename to code/builders/builder-vite/src/envs.ts diff --git a/code/lib/builder-vite/src/index.ts b/code/builders/builder-vite/src/index.ts similarity index 100% rename from code/lib/builder-vite/src/index.ts rename to code/builders/builder-vite/src/index.ts diff --git a/code/lib/builder-vite/src/list-stories.ts b/code/builders/builder-vite/src/list-stories.ts similarity index 100% rename from code/lib/builder-vite/src/list-stories.ts rename to code/builders/builder-vite/src/list-stories.ts diff --git a/code/lib/builder-vite/src/optimizeDeps.ts b/code/builders/builder-vite/src/optimizeDeps.ts similarity index 100% rename from code/lib/builder-vite/src/optimizeDeps.ts rename to code/builders/builder-vite/src/optimizeDeps.ts diff --git a/code/lib/builder-vite/src/plugins/code-generator-plugin.ts b/code/builders/builder-vite/src/plugins/code-generator-plugin.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/code-generator-plugin.ts rename to code/builders/builder-vite/src/plugins/code-generator-plugin.ts diff --git a/code/lib/builder-vite/src/plugins/csf-plugin.ts b/code/builders/builder-vite/src/plugins/csf-plugin.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/csf-plugin.ts rename to code/builders/builder-vite/src/plugins/csf-plugin.ts diff --git a/code/lib/builder-vite/src/plugins/external-globals-plugin.test.ts b/code/builders/builder-vite/src/plugins/external-globals-plugin.test.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/external-globals-plugin.test.ts rename to code/builders/builder-vite/src/plugins/external-globals-plugin.test.ts diff --git a/code/lib/builder-vite/src/plugins/external-globals-plugin.ts b/code/builders/builder-vite/src/plugins/external-globals-plugin.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/external-globals-plugin.ts rename to code/builders/builder-vite/src/plugins/external-globals-plugin.ts diff --git a/code/lib/builder-vite/src/plugins/index.ts b/code/builders/builder-vite/src/plugins/index.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/index.ts rename to code/builders/builder-vite/src/plugins/index.ts diff --git a/code/lib/builder-vite/src/plugins/inject-export-order-plugin.ts b/code/builders/builder-vite/src/plugins/inject-export-order-plugin.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/inject-export-order-plugin.ts rename to code/builders/builder-vite/src/plugins/inject-export-order-plugin.ts diff --git a/code/lib/builder-vite/src/plugins/mdx-plugin.ts b/code/builders/builder-vite/src/plugins/mdx-plugin.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/mdx-plugin.ts rename to code/builders/builder-vite/src/plugins/mdx-plugin.ts diff --git a/code/lib/builder-vite/src/plugins/mdx-plugin.types.d.ts b/code/builders/builder-vite/src/plugins/mdx-plugin.types.d.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/mdx-plugin.types.d.ts rename to code/builders/builder-vite/src/plugins/mdx-plugin.types.d.ts diff --git a/code/lib/builder-vite/src/plugins/strip-story-hmr-boundaries.ts b/code/builders/builder-vite/src/plugins/strip-story-hmr-boundaries.ts similarity index 100% rename from code/lib/builder-vite/src/plugins/strip-story-hmr-boundaries.ts rename to code/builders/builder-vite/src/plugins/strip-story-hmr-boundaries.ts diff --git a/code/lib/builder-vite/src/transform-iframe-html.ts b/code/builders/builder-vite/src/transform-iframe-html.ts similarity index 100% rename from code/lib/builder-vite/src/transform-iframe-html.ts rename to code/builders/builder-vite/src/transform-iframe-html.ts diff --git a/code/lib/builder-vite/src/types.ts b/code/builders/builder-vite/src/types.ts similarity index 100% rename from code/lib/builder-vite/src/types.ts rename to code/builders/builder-vite/src/types.ts diff --git a/code/lib/builder-vite/src/utils/has-vite-plugins.test.ts b/code/builders/builder-vite/src/utils/has-vite-plugins.test.ts similarity index 100% rename from code/lib/builder-vite/src/utils/has-vite-plugins.test.ts rename to code/builders/builder-vite/src/utils/has-vite-plugins.test.ts diff --git a/code/lib/builder-vite/src/utils/has-vite-plugins.ts b/code/builders/builder-vite/src/utils/has-vite-plugins.ts similarity index 100% rename from code/lib/builder-vite/src/utils/has-vite-plugins.ts rename to code/builders/builder-vite/src/utils/has-vite-plugins.ts diff --git a/code/lib/builder-vite/src/utils/process-preview-annotation.test.ts b/code/builders/builder-vite/src/utils/process-preview-annotation.test.ts similarity index 100% rename from code/lib/builder-vite/src/utils/process-preview-annotation.test.ts rename to code/builders/builder-vite/src/utils/process-preview-annotation.test.ts diff --git a/code/lib/builder-vite/src/utils/process-preview-annotation.ts b/code/builders/builder-vite/src/utils/process-preview-annotation.ts similarity index 100% rename from code/lib/builder-vite/src/utils/process-preview-annotation.ts rename to code/builders/builder-vite/src/utils/process-preview-annotation.ts diff --git a/code/lib/builder-vite/src/utils/without-vite-plugins.test.ts b/code/builders/builder-vite/src/utils/without-vite-plugins.test.ts similarity index 100% rename from code/lib/builder-vite/src/utils/without-vite-plugins.test.ts rename to code/builders/builder-vite/src/utils/without-vite-plugins.test.ts diff --git a/code/lib/builder-vite/src/utils/without-vite-plugins.ts b/code/builders/builder-vite/src/utils/without-vite-plugins.ts similarity index 100% rename from code/lib/builder-vite/src/utils/without-vite-plugins.ts rename to code/builders/builder-vite/src/utils/without-vite-plugins.ts diff --git a/code/lib/builder-vite/src/virtual-file-names.ts b/code/builders/builder-vite/src/virtual-file-names.ts similarity index 100% rename from code/lib/builder-vite/src/virtual-file-names.ts rename to code/builders/builder-vite/src/virtual-file-names.ts diff --git a/code/lib/builder-vite/src/vite-config.test.ts b/code/builders/builder-vite/src/vite-config.test.ts similarity index 100% rename from code/lib/builder-vite/src/vite-config.test.ts rename to code/builders/builder-vite/src/vite-config.test.ts diff --git a/code/lib/builder-vite/src/vite-config.ts b/code/builders/builder-vite/src/vite-config.ts similarity index 100% rename from code/lib/builder-vite/src/vite-config.ts rename to code/builders/builder-vite/src/vite-config.ts diff --git a/code/lib/builder-vite/src/vite-server.ts b/code/builders/builder-vite/src/vite-server.ts similarity index 100% rename from code/lib/builder-vite/src/vite-server.ts rename to code/builders/builder-vite/src/vite-server.ts diff --git a/code/lib/builder-vite/tsconfig.json b/code/builders/builder-vite/tsconfig.json similarity index 100% rename from code/lib/builder-vite/tsconfig.json rename to code/builders/builder-vite/tsconfig.json diff --git a/code/lib/builder-webpack5/README.md b/code/builders/builder-webpack5/README.md similarity index 100% rename from code/lib/builder-webpack5/README.md rename to code/builders/builder-webpack5/README.md diff --git a/code/lib/builder-webpack5/jest.config.js b/code/builders/builder-webpack5/jest.config.js similarity index 100% rename from code/lib/builder-webpack5/jest.config.js rename to code/builders/builder-webpack5/jest.config.js diff --git a/code/lib/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json similarity index 98% rename from code/lib/builder-webpack5/package.json rename to code/builders/builder-webpack5/package.json index 759eebb0f845..04fb6c5225d2 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -5,14 +5,14 @@ "keywords": [ "storybook" ], - "homepage": "https://github.com/storybookjs/storybook/tree/next/code/lib/builder-webpack5", + "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-webpack5", "bugs": { "url": "https://github.com/storybookjs/storybook/issues" }, "repository": { "type": "git", "url": "https://github.com/storybookjs/storybook.git", - "directory": "code/lib/builder-webpack5" + "directory": "code/builders/builder-webpack5" }, "funding": { "type": "opencollective", diff --git a/code/lib/builder-webpack5/project.json b/code/builders/builder-webpack5/project.json similarity index 100% rename from code/lib/builder-webpack5/project.json rename to code/builders/builder-webpack5/project.json diff --git a/code/lib/builder-webpack5/src/index.ts b/code/builders/builder-webpack5/src/index.ts similarity index 100% rename from code/lib/builder-webpack5/src/index.ts rename to code/builders/builder-webpack5/src/index.ts diff --git a/code/lib/builder-webpack5/src/presets/custom-webpack-preset.ts b/code/builders/builder-webpack5/src/presets/custom-webpack-preset.ts similarity index 100% rename from code/lib/builder-webpack5/src/presets/custom-webpack-preset.ts rename to code/builders/builder-webpack5/src/presets/custom-webpack-preset.ts diff --git a/code/lib/builder-webpack5/src/presets/preview-preset.ts b/code/builders/builder-webpack5/src/presets/preview-preset.ts similarity index 100% rename from code/lib/builder-webpack5/src/presets/preview-preset.ts rename to code/builders/builder-webpack5/src/presets/preview-preset.ts diff --git a/code/lib/builder-webpack5/src/preview/base-webpack.config.ts b/code/builders/builder-webpack5/src/preview/base-webpack.config.ts similarity index 100% rename from code/lib/builder-webpack5/src/preview/base-webpack.config.ts rename to code/builders/builder-webpack5/src/preview/base-webpack.config.ts diff --git a/code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts similarity index 100% rename from code/lib/builder-webpack5/src/preview/iframe-webpack.config.ts rename to code/builders/builder-webpack5/src/preview/iframe-webpack.config.ts diff --git a/code/lib/builder-webpack5/src/preview/loaders.ts b/code/builders/builder-webpack5/src/preview/loaders.ts similarity index 100% rename from code/lib/builder-webpack5/src/preview/loaders.ts rename to code/builders/builder-webpack5/src/preview/loaders.ts diff --git a/code/lib/builder-webpack5/src/types.ts b/code/builders/builder-webpack5/src/types.ts similarity index 100% rename from code/lib/builder-webpack5/src/types.ts rename to code/builders/builder-webpack5/src/types.ts diff --git a/code/lib/builder-webpack5/templates/preview.ejs b/code/builders/builder-webpack5/templates/preview.ejs similarity index 100% rename from code/lib/builder-webpack5/templates/preview.ejs rename to code/builders/builder-webpack5/templates/preview.ejs diff --git a/code/lib/builder-webpack5/templates/virtualModuleEntry.template.js b/code/builders/builder-webpack5/templates/virtualModuleEntry.template.js similarity index 100% rename from code/lib/builder-webpack5/templates/virtualModuleEntry.template.js rename to code/builders/builder-webpack5/templates/virtualModuleEntry.template.js diff --git a/code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars b/code/builders/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars similarity index 100% rename from code/lib/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars rename to code/builders/builder-webpack5/templates/virtualModuleModernEntry.js.handlebars diff --git a/code/lib/builder-webpack5/templates/virtualModuleStory.template.js b/code/builders/builder-webpack5/templates/virtualModuleStory.template.js similarity index 100% rename from code/lib/builder-webpack5/templates/virtualModuleStory.template.js rename to code/builders/builder-webpack5/templates/virtualModuleStory.template.js diff --git a/code/lib/builder-webpack5/tsconfig.json b/code/builders/builder-webpack5/tsconfig.json similarity index 100% rename from code/lib/builder-webpack5/tsconfig.json rename to code/builders/builder-webpack5/tsconfig.json diff --git a/code/lib/builder-webpack5/typings.d.ts b/code/builders/builder-webpack5/typings.d.ts similarity index 100% rename from code/lib/builder-webpack5/typings.d.ts rename to code/builders/builder-webpack5/typings.d.ts diff --git a/code/jest.config.js b/code/jest.config.js index 2e7ab7cee982..a3527914bcb8 100644 --- a/code/jest.config.js +++ b/code/jest.config.js @@ -3,6 +3,7 @@ module.exports = { '/addons/*', '/frameworks/*', '/lib/*', + '/builders/*', '/renderers/*', '/ui/!(node_modules)*', ], diff --git a/code/package.json b/code/package.json index adaae979bb74..d7c4e73330bd 100644 --- a/code/package.json +++ b/code/package.json @@ -17,6 +17,7 @@ "addons/*", "frameworks/*", "lib/*", + "builders/*", "ui/*", "presets/*", "renderers/*" diff --git a/code/presets/create-react-app/src/index.ts b/code/presets/create-react-app/src/index.ts index c772598f74a4..e480e438ef91 100644 --- a/code/presets/create-react-app/src/index.ts +++ b/code/presets/create-react-app/src/index.ts @@ -108,7 +108,7 @@ const webpack = async ( : []; // NOTE: This is code replicated from - // https://github.com/storybookjs/storybook/blob/89830ad76384faeaeb0c19df3cb44232cdde261b/lib/builder-webpack5/src/preview/base-webpack.config.ts#L45-L53 + // https://github.com/storybookjs/storybook/blob/89830ad76384faeaeb0c19df3cb44232cdde261b/builders/builder-webpack5/src/preview/base-webpack.config.ts#L45-L53 // as we are not applying SB's default webpack config here. // We need to figure out a better way to apply various layers of webpack config; perhaps // these options need to be in a separate preset. diff --git a/code/presets/react-webpack/src/types.ts b/code/presets/react-webpack/src/types.ts index fd9f5e0cd37f..fb3b0d4a7db7 100644 --- a/code/presets/react-webpack/src/types.ts +++ b/code/presets/react-webpack/src/types.ts @@ -31,7 +31,7 @@ export type TypescriptOptions = TypescriptOptionsBase & { * Configures `react-docgen-typescript-plugin` * * @default - * @see https://github.com/storybookjs/storybook/blob/next/code/lib/builder-webpack5/src/config/defaults.js#L4-L6 + * @see https://github.com/storybookjs/storybook/blob/next/code/builders/builder-webpack5/src/config/defaults.js#L4-L6 */ reactDocgenTypescriptOptions: ReactDocgenTypescriptOptions; }; diff --git a/code/yarn.lock b/code/yarn.lock index 31de03243317..7b9ba22a0052 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5615,9 +5615,9 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-manager@7.1.0-alpha.24, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:lib/builder-manager": +"@storybook/builder-manager@7.1.0-alpha.24, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:builders/builder-manager": version: 0.0.0-use.local - resolution: "@storybook/builder-manager@workspace:lib/builder-manager" + resolution: "@storybook/builder-manager@workspace:builders/builder-manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 "@storybook/core-common": 7.1.0-alpha.24 @@ -5640,9 +5640,9 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-vite@7.1.0-alpha.24, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:lib/builder-vite": +"@storybook/builder-vite@7.1.0-alpha.24, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:builders/builder-vite": version: 0.0.0-use.local - resolution: "@storybook/builder-vite@workspace:lib/builder-vite" + resolution: "@storybook/builder-vite@workspace:builders/builder-vite" dependencies: "@storybook/channel-postmessage": 7.1.0-alpha.24 "@storybook/channel-websocket": 7.1.0-alpha.24 @@ -5683,9 +5683,9 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-webpack5@7.1.0-alpha.24, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:lib/builder-webpack5": +"@storybook/builder-webpack5@7.1.0-alpha.24, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:builders/builder-webpack5": version: 0.0.0-use.local - resolution: "@storybook/builder-webpack5@workspace:lib/builder-webpack5" + resolution: "@storybook/builder-webpack5@workspace:builders/builder-webpack5" dependencies: "@babel/core": ^7.12.10 "@storybook/addons": 7.1.0-alpha.24 diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json index 40f27a6398f9..a99b0b5cc133 100644 --- a/test-storybooks/ember-cli/package.json +++ b/test-storybooks/ember-cli/package.json @@ -100,9 +100,9 @@ "@storybook/addons": "portal:../../code/lib/addons", "@storybook/api": "portal:../../code/lib/api", "@storybook/blocks": "portal:../../code/lib/blocks", - "@storybook/builder-manager": "portal:../../code/lib/builder-manager", - "@storybook/builder-vite": "portal:../../code/lib/builder-vite", - "@storybook/builder-webpack5": "portal:../../code/lib/builder-webpack5", + "@storybook/builder-manager": "portal:../../code/builders/builder-manager", + "@storybook/builder-vite": "portal:../../code/builders/builder-vite", + "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json index 69518c0e76d3..562c2192b68d 100644 --- a/test-storybooks/external-docs/package.json +++ b/test-storybooks/external-docs/package.json @@ -78,9 +78,9 @@ "@storybook/addons": "portal:../../code/lib/addons", "@storybook/manager-api": "portal:../../code/lib/manager-api", "@storybook/blocks": "portal:../../code/ui/blocks", - "@storybook/builder-manager": "portal:../../code/lib/builder-manager", - "@storybook/builder-vite": "portal:../../code/lib/builder-vite", - "@storybook/builder-webpack5": "portal:../../code/lib/builder-webpack5", + "@storybook/builder-manager": "portal:../../code/builders/builder-manager", + "@storybook/builder-vite": "portal:../../code/builders/builder-vite", + "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json index aa4bc2a005be..004fa7bfc96c 100644 --- a/test-storybooks/server-kitchen-sink/package.json +++ b/test-storybooks/server-kitchen-sink/package.json @@ -69,9 +69,9 @@ "@storybook/addons": "portal:../../code/lib/addons", "@storybook/api": "portal:../../code/lib/api", "@storybook/blocks": "portal:../../code/lib/blocks", - "@storybook/builder-manager": "portal:../../code/lib/builder-manager", - "@storybook/builder-vite": "portal:../../code/lib/builder-vite", - "@storybook/builder-webpack5": "portal:../../code/lib/builder-webpack5", + "@storybook/builder-manager": "portal:../../code/builders/builder-manager", + "@storybook/builder-vite": "portal:../../code/builders/builder-vite", + "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json index 8151fa542cfd..c40cd27f6164 100644 --- a/test-storybooks/standalone-preview/package.json +++ b/test-storybooks/standalone-preview/package.json @@ -54,9 +54,9 @@ "@storybook/addons": "portal:../../code/lib/addons", "@storybook/api": "portal:../../code/lib/api", "@storybook/blocks": "portal:../../code/lib/blocks", - "@storybook/builder-manager": "portal:../../code/lib/builder-manager", - "@storybook/builder-vite": "portal:../../code/lib/builder-vite", - "@storybook/builder-webpack5": "portal:../../code/lib/builder-webpack5", + "@storybook/builder-manager": "portal:../../code/builders/builder-manager", + "@storybook/builder-vite": "portal:../../code/builders/builder-vite", + "@storybook/builder-webpack5": "portal:../../code/builders/builder-webpack5", "@storybook/channel-postmessage": "portal:../../code/lib/channel-postmessage", "@storybook/channel-websocket": "portal:../../code/lib/channel-websocket", "@storybook/channels": "portal:../../code/lib/channels", From 1241545cff62957f73da41c6cf316ebcbb21ee1e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 24 May 2023 16:38:38 +0200 Subject: [PATCH 2/4] add to workspace --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index ebe29c134aea..3376f0587ec1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -145,6 +145,7 @@ jobs: - code/addons - code/frameworks - code/lib + - code/builders - code/ui - code/renderers - code/presets From bd3ea70611620971623c9266d312ccf74b80fb40 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 26 May 2023 16:41:08 +0200 Subject: [PATCH 3/4] pin test-storybook package.json files with newer version --- test-storybooks/ember-cli/package.json | 28 +++++++++---------- test-storybooks/external-docs/package.json | 20 ++++++------- .../server-kitchen-sink/package.json | 22 +++++++-------- .../standalone-preview/package.json | 12 ++++---- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json index a99b0b5cc133..3f58dc653de4 100644 --- a/test-storybooks/ember-cli/package.json +++ b/test-storybooks/ember-cli/package.json @@ -1,6 +1,6 @@ { "name": "ember-example", - "version": "7.0.0-alpha.43", + "version": "7.1.0-alpha.24", "private": true, "scripts": { "--build-storybook": "yarn storybook-prebuild && NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" storybook build", @@ -17,19 +17,19 @@ "devDependencies": { "@babel/core": "^7.12.10", "@ember/optional-features": "^2.0.0", - "@storybook/addon-a11y": "7.0.0-alpha.43", - "@storybook/addon-actions": "7.0.0-alpha.43", - "@storybook/addon-backgrounds": "7.0.0-alpha.43", - "@storybook/addon-controls": "7.0.0-alpha.43", - "@storybook/addon-docs": "7.0.0-alpha.43", - "@storybook/addon-highlight": "7.0.0-alpha.43", - "@storybook/addon-links": "7.0.0-alpha.43", - "@storybook/addon-storysource": "7.0.0-alpha.43", - "@storybook/addon-viewport": "7.0.0-alpha.43", - "@storybook/addons": "7.0.0-alpha.43", - "@storybook/ember": "7.0.0-alpha.43", + "@storybook/addon-a11y": "7.1.0-alpha.24", + "@storybook/addon-actions": "7.1.0-alpha.24", + "@storybook/addon-backgrounds": "7.1.0-alpha.24", + "@storybook/addon-controls": "7.1.0-alpha.24", + "@storybook/addon-docs": "7.1.0-alpha.24", + "@storybook/addon-highlight": "7.1.0-alpha.24", + "@storybook/addon-links": "7.1.0-alpha.24", + "@storybook/addon-storysource": "7.1.0-alpha.24", + "@storybook/addon-viewport": "7.1.0-alpha.24", + "@storybook/addons": "7.1.0-alpha.24", + "@storybook/ember": "7.1.0-alpha.24", "@storybook/ember-cli-storybook": "^0.2.1", - "@storybook/source-loader": "7.0.0-alpha.43", + "@storybook/source-loader": "7.1.0-alpha.24", "babel-loader": "^8.2.5", "broccoli-asset-rev": "^3.0.0", "browserify-zlib": "^0.2.0", @@ -49,7 +49,7 @@ "loader.js": "^4.7.0", "os-browserify": "^0.3.0", "shx": "^0.3.2", - "storybook": "7.0.0-alpha.43", + "storybook": "7.1.0-alpha.24", "stream-browserify": "^3.0.0", "vm-browserify": "^1.1.2", "webpack": "5", diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json index 562c2192b68d..ca01ae2991bb 100644 --- a/test-storybooks/external-docs/package.json +++ b/test-storybooks/external-docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/external-docs", - "version": "7.0.0-alpha.43", + "version": "7.1.0-alpha.24", "private": true, "scripts": { "build": "next build", @@ -11,14 +11,14 @@ "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" storybook dev -p 9011 -c .storybook" }, "dependencies": { - "@storybook/addon-docs": "7.0.0-alpha.43", - "@storybook/addon-essentials": "7.0.0-alpha.43", - "@storybook/blocks": "7.0.0-alpha.43", - "@storybook/components": "7.0.0-alpha.43", - "@storybook/preview-web": "7.0.0-alpha.43", - "@storybook/react": "7.0.0-alpha.43", - "@storybook/react-webpack5": "7.0.0-alpha.43", - "@storybook/theming": "7.0.0-alpha.43", + "@storybook/addon-docs": "7.1.0-alpha.24", + "@storybook/addon-essentials": "7.1.0-alpha.24", + "@storybook/blocks": "7.1.0-alpha.24", + "@storybook/components": "7.1.0-alpha.24", + "@storybook/preview-web": "7.1.0-alpha.24", + "@storybook/react": "7.1.0-alpha.24", + "@storybook/react-webpack5": "7.1.0-alpha.24", + "@storybook/theming": "7.1.0-alpha.24", "formik": "^2.2.9", "next": "^12.1.0", "nextra": "^1.1.0", @@ -37,7 +37,7 @@ "cross-env": "^7.0.3", "eslint": "8.7.0", "eslint-config-next": "12.0.8", - "storybook": "7.0.0-alpha.43", + "storybook": "7.1.0-alpha.24", "typescript": "~4.9.3", "webpack": "5" }, diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json index 004fa7bfc96c..98b5db8eca16 100644 --- a/test-storybooks/server-kitchen-sink/package.json +++ b/test-storybooks/server-kitchen-sink/package.json @@ -1,6 +1,6 @@ { "name": "server-kitchen-sink", - "version": "7.0.0-alpha.43", + "version": "7.1.0-alpha.24", "private": true, "description": "", "keywords": [], @@ -14,15 +14,15 @@ "storybook": "SERVER_PORT=1137 NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" storybook dev -p 9006 --quiet" }, "devDependencies": { - "@storybook/addon-a11y": "7.0.0-alpha.43", - "@storybook/addon-actions": "7.0.0-alpha.43", - "@storybook/addon-backgrounds": "7.0.0-alpha.43", - "@storybook/addon-controls": "7.0.0-alpha.43", - "@storybook/addon-highlight": "7.0.0-alpha.43", - "@storybook/addon-links": "7.0.0-alpha.43", - "@storybook/node-logger": "7.0.0-alpha.43", - "@storybook/server": "7.0.0-alpha.43", - "@storybook/server-webpack5": "7.0.0-alpha.43", + "@storybook/addon-a11y": "7.1.0-alpha.24", + "@storybook/addon-actions": "7.1.0-alpha.24", + "@storybook/addon-backgrounds": "7.1.0-alpha.24", + "@storybook/addon-controls": "7.1.0-alpha.24", + "@storybook/addon-highlight": "7.1.0-alpha.24", + "@storybook/addon-links": "7.1.0-alpha.24", + "@storybook/node-logger": "7.1.0-alpha.24", + "@storybook/server": "7.1.0-alpha.24", + "@storybook/server-webpack5": "7.1.0-alpha.24", "concurrently": "^5.3.0", "cors": "^2.8.5", "express": "^4.17.3", @@ -30,7 +30,7 @@ "nodemon": "^2.0.7", "pug": "^3.0.0", "safe-identifier": "^0.4.1", - "storybook": "7.0.0-alpha.43" + "storybook": "7.1.0-alpha.24" }, "resolutions": { "@storybook/addon-a11y": "portal:../../code/addons/a11y", diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json index c40cd27f6164..c84d6b3f60c1 100644 --- a/test-storybooks/standalone-preview/package.json +++ b/test-storybooks/standalone-preview/package.json @@ -1,21 +1,21 @@ { "name": "standalone-preview", - "version": "7.0.0-alpha.43", + "version": "7.1.0-alpha.24", "private": true, "scripts": { "storybook": "cross-env STORYBOOK_DISPLAY_WARNING=true DISPLAY_WARNING=true NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" storybook dev -p 9011 -c ../official-storybook --preview-url=http://localhost:1337/external-iframe.html", "storybook-preview": "cross-env PREVIEW_URL=external-iframe.html NODE_OPTIONS=\"--preserve-symlinks --preserve-symlinks-main\" parcel ./storybook.html --port 1337" }, "devDependencies": { - "@storybook/addon-docs": "7.0.0-alpha.43", - "@storybook/cli": "7.0.0-alpha.43", - "@storybook/react": "7.0.0-alpha.43", - "@storybook/react-webpack5": "7.0.0-alpha.43", + "@storybook/addon-docs": "7.1.0-alpha.24", + "@storybook/cli": "7.1.0-alpha.24", + "@storybook/react": "7.1.0-alpha.24", + "@storybook/react-webpack5": "7.1.0-alpha.24", "cross-env": "^7.0.3", "parcel": "2.0.1", "react": "16.14.0", "react-dom": "16.14.0", - "storybook": "7.0.0-alpha.43" + "storybook": "7.1.0-alpha.24" }, "resolutions": { "@storybook/addon-a11y": "portal:../../code/addons/a11y", From 5ba0574571cb30d239297984fa69e763774bd1bd Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 26 May 2023 22:23:03 +0200 Subject: [PATCH 4/4] update links in the docs page --- docs/builders/builder-api.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/builders/builder-api.md b/docs/builders/builder-api.md index d21444883388..ae71323218a0 100644 --- a/docs/builders/builder-api.md +++ b/docs/builders/builder-api.md @@ -154,7 +154,7 @@ While running in development mode, the builder's development server must be able ### More information -This area is under rapid development, so the documented is still in progress and subject to change. If you are interested in writing your builder, we encourage you to check [webpack](https://github.com/storybookjs/storybook/tree/next/code/lib/builder-webpack5), [Vite](https://github.com/storybookjs/builder-vite), and Modern Web's [dev-server-storybook](https://github.com/modernweb-dev/web/blob/master/packages/dev-server-storybook/src/serve/storybookPlugin.ts) source code. In addition, we have a wonderful contributor community on [Storybook Discord](https://discord.gg/storybook) if you have questions. Ping us in the [#contributing](https://discord.com/channels/486522875931656193/839297503446695956) channel. +This area is under rapid development, so the documented is still in progress and subject to change. If you are interested in writing your builder, we encourage you to check [webpack](https://github.com/storybookjs/storybook/tree/next/code/builders/builder-webpack5), [Vite](https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite), and Modern Web's [dev-server-storybook](https://github.com/modernweb-dev/web/blob/master/packages/dev-server-storybook/src/serve/storybookPlugin.ts) source code. In addition, we have a wonderful contributor community on [Storybook Discord](https://discord.gg/storybook) if you have questions. Ping us in the [#contributing](https://discord.com/channels/486522875931656193/839297503446695956) channel. #### Learn more about builders