storybookjs · ndelangen · May 26, 2023 · May 24, 2023 · May 24, 2023 · May 26, 2023
diff --git 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

diff --git 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
@@ -114,7 +114,7 @@ function configure<TRenderer extends Renderer>(
   }));
 
   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 → code/builders/builder-manager/README.md b/code/lib/builder-manager/README.md → code/builders/builder-manager/README.md
diff --git a/code/lib/builder-manager/jest.config.js → code/builders/builder-manager/jest.config.js b/code/lib/builder-manager/jest.config.js → code/builders/builder-manager/jest.config.js
diff --git a/code/lib/builder-manager/package.json → code/builders/builder-manager/package.json b/code/lib/builder-manager/package.json → 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 → code/builders/builder-manager/project.json b/code/lib/builder-manager/project.json → code/builders/builder-manager/project.json
diff --git a/code/lib/builder-manager/src/index.ts → code/builders/builder-manager/src/index.ts b/code/lib/builder-manager/src/index.ts → code/builders/builder-manager/src/index.ts
diff --git a/code/lib/builder-manager/src/types.ts → code/builders/builder-manager/src/types.ts b/code/lib/builder-manager/src/types.ts → code/builders/builder-manager/src/types.ts
diff --git a/code/lib/builder-manager/src/utils/data.ts → ...uilders/builder-manager/src/utils/data.ts b/code/lib/builder-manager/src/utils/data.ts → ...uilders/builder-manager/src/utils/data.ts
diff --git a/...b/builder-manager/src/utils/files.test.ts → ...s/builder-manager/src/utils/files.test.ts b/...b/builder-manager/src/utils/files.test.ts → ...s/builder-manager/src/utils/files.test.ts
diff --git a/code/lib/builder-manager/src/utils/files.ts → ...ilders/builder-manager/src/utils/files.ts b/code/lib/builder-manager/src/utils/files.ts → ...ilders/builder-manager/src/utils/files.ts
diff --git a/.../lib/builder-manager/src/utils/globals.ts → ...ders/builder-manager/src/utils/globals.ts b/.../lib/builder-manager/src/utils/globals.ts → ...ders/builder-manager/src/utils/globals.ts
diff --git a/...ilder-manager/src/utils/managerEntries.ts → ...ilder-manager/src/utils/managerEntries.ts b/...ilder-manager/src/utils/managerEntries.ts → ...ilder-manager/src/utils/managerEntries.ts
diff --git a/.../builder-manager/src/utils/safeResolve.ts → .../builder-manager/src/utils/safeResolve.ts b/.../builder-manager/src/utils/safeResolve.ts → .../builder-manager/src/utils/safeResolve.ts
diff --git a/...lib/builder-manager/src/utils/template.ts → ...ers/builder-manager/src/utils/template.ts b/...lib/builder-manager/src/utils/template.ts → ...ers/builder-manager/src/utils/template.ts
diff --git a/...der-manager/templates/addon.tsconfig.json → ...der-manager/templates/addon.tsconfig.json b/...der-manager/templates/addon.tsconfig.json → ...der-manager/templates/addon.tsconfig.json
diff --git a/...ib/builder-manager/templates/template.ejs → ...rs/builder-manager/templates/template.ejs b/...ib/builder-manager/templates/template.ejs → ...rs/builder-manager/templates/template.ejs
diff --git a/code/lib/builder-manager/tsconfig.json → code/builders/builder-manager/tsconfig.json b/code/lib/builder-manager/tsconfig.json → code/builders/builder-manager/tsconfig.json
diff --git a/code/lib/builder-vite/README.md → code/builders/builder-vite/README.md b/code/lib/builder-vite/README.md → code/builders/builder-vite/README.md
diff --git a/code/lib/builder-vite/input/iframe.html → code/builders/builder-vite/input/iframe.html b/code/lib/builder-vite/input/iframe.html → code/builders/builder-vite/input/iframe.html
diff --git a/code/lib/builder-vite/jest.config.js → code/builders/builder-vite/jest.config.js b/code/lib/builder-vite/jest.config.js → code/builders/builder-vite/jest.config.js
diff --git a/code/lib/builder-vite/package.json → code/builders/builder-vite/package.json b/code/lib/builder-vite/package.json → code/builders/builder-vite/package.json
@@ -2,14 +2,14 @@
   "name": "@storybook/builder-vite",
   "version": "7.1.0-alpha.25",
   "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 → code/builders/builder-vite/project.json b/code/lib/builder-vite/project.json → code/builders/builder-vite/project.json
diff --git a/code/lib/builder-vite/src/build.ts → code/builders/builder-vite/src/build.ts b/code/lib/builder-vite/src/build.ts → code/builders/builder-vite/src/build.ts
diff --git a/code/lib/builder-vite/src/codegen-entries.ts → ...lders/builder-vite/src/codegen-entries.ts b/code/lib/builder-vite/src/codegen-entries.ts → ...lders/builder-vite/src/codegen-entries.ts
diff --git a/...builder-vite/src/codegen-iframe-script.ts → ...builder-vite/src/codegen-iframe-script.ts b/...builder-vite/src/codegen-iframe-script.ts → ...builder-vite/src/codegen-iframe-script.ts
diff --git a/...ilder-vite/src/codegen-importfn-script.ts → ...ilder-vite/src/codegen-importfn-script.ts b/...ilder-vite/src/codegen-importfn-script.ts → ...ilder-vite/src/codegen-importfn-script.ts
diff --git a/...-vite/src/codegen-modern-iframe-script.ts → ...-vite/src/codegen-modern-iframe-script.ts b/...-vite/src/codegen-modern-iframe-script.ts → ...-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/...der-vite/src/codegen-set-addon-channel.ts → ...der-vite/src/codegen-set-addon-channel.ts b/...der-vite/src/codegen-set-addon-channel.ts → ...der-vite/src/codegen-set-addon-channel.ts
diff --git a/code/lib/builder-vite/src/envs.ts → code/builders/builder-vite/src/envs.ts b/code/lib/builder-vite/src/envs.ts → code/builders/builder-vite/src/envs.ts
diff --git a/code/lib/builder-vite/src/index.ts → code/builders/builder-vite/src/index.ts b/code/lib/builder-vite/src/index.ts → code/builders/builder-vite/src/index.ts
diff --git a/code/lib/builder-vite/src/list-stories.ts → ...builders/builder-vite/src/list-stories.ts b/code/lib/builder-vite/src/list-stories.ts → ...builders/builder-vite/src/list-stories.ts
diff --git a/code/lib/builder-vite/src/optimizeDeps.ts → ...builders/builder-vite/src/optimizeDeps.ts b/code/lib/builder-vite/src/optimizeDeps.ts → ...builders/builder-vite/src/optimizeDeps.ts
diff --git a/...vite/src/plugins/code-generator-plugin.ts → ...vite/src/plugins/code-generator-plugin.ts b/...vite/src/plugins/code-generator-plugin.ts → ...vite/src/plugins/code-generator-plugin.ts
diff --git a/...ib/builder-vite/src/plugins/csf-plugin.ts → ...rs/builder-vite/src/plugins/csf-plugin.ts b/...ib/builder-vite/src/plugins/csf-plugin.ts → ...rs/builder-vite/src/plugins/csf-plugin.ts
diff --git a/...c/plugins/external-globals-plugin.test.ts → ...c/plugins/external-globals-plugin.test.ts b/...c/plugins/external-globals-plugin.test.ts → ...c/plugins/external-globals-plugin.test.ts
diff --git a/...te/src/plugins/external-globals-plugin.ts → ...te/src/plugins/external-globals-plugin.ts b/...te/src/plugins/external-globals-plugin.ts → ...te/src/plugins/external-globals-plugin.ts
diff --git a/code/lib/builder-vite/src/plugins/index.ts → ...uilders/builder-vite/src/plugins/index.ts b/code/lib/builder-vite/src/plugins/index.ts → ...uilders/builder-vite/src/plugins/index.ts
diff --git a/...src/plugins/inject-export-order-plugin.ts → ...src/plugins/inject-export-order-plugin.ts b/...src/plugins/inject-export-order-plugin.ts → ...src/plugins/inject-export-order-plugin.ts
diff --git a/...ib/builder-vite/src/plugins/mdx-plugin.ts → ...rs/builder-vite/src/plugins/mdx-plugin.ts b/...ib/builder-vite/src/plugins/mdx-plugin.ts → ...rs/builder-vite/src/plugins/mdx-plugin.ts
diff --git a/...er-vite/src/plugins/mdx-plugin.types.d.ts → ...er-vite/src/plugins/mdx-plugin.types.d.ts b/...er-vite/src/plugins/mdx-plugin.types.d.ts → ...er-vite/src/plugins/mdx-plugin.types.d.ts
diff --git a/...src/plugins/strip-story-hmr-boundaries.ts → ...src/plugins/strip-story-hmr-boundaries.ts b/...src/plugins/strip-story-hmr-boundaries.ts → ...src/plugins/strip-story-hmr-boundaries.ts
diff --git a/...builder-vite/src/transform-iframe-html.ts → ...builder-vite/src/transform-iframe-html.ts b/...builder-vite/src/transform-iframe-html.ts → ...builder-vite/src/transform-iframe-html.ts
diff --git a/code/lib/builder-vite/src/types.ts → code/builders/builder-vite/src/types.ts b/code/lib/builder-vite/src/types.ts → code/builders/builder-vite/src/types.ts
diff --git a/...r-vite/src/utils/has-vite-plugins.test.ts → ...r-vite/src/utils/has-vite-plugins.test.ts b/...r-vite/src/utils/has-vite-plugins.test.ts → ...r-vite/src/utils/has-vite-plugins.test.ts
diff --git a/...uilder-vite/src/utils/has-vite-plugins.ts → ...uilder-vite/src/utils/has-vite-plugins.ts b/...uilder-vite/src/utils/has-vite-plugins.ts → ...uilder-vite/src/utils/has-vite-plugins.ts
diff --git a/.../utils/process-preview-annotation.test.ts → .../utils/process-preview-annotation.test.ts b/.../utils/process-preview-annotation.test.ts → .../utils/process-preview-annotation.test.ts
diff --git a/...e/src/utils/process-preview-annotation.ts → ...e/src/utils/process-preview-annotation.ts b/...e/src/utils/process-preview-annotation.ts → ...e/src/utils/process-preview-annotation.ts
diff --git a/...te/src/utils/without-vite-plugins.test.ts → ...te/src/utils/without-vite-plugins.test.ts b/...te/src/utils/without-vite-plugins.test.ts → ...te/src/utils/without-vite-plugins.test.ts
diff --git a/...er-vite/src/utils/without-vite-plugins.ts → ...er-vite/src/utils/without-vite-plugins.ts b/...er-vite/src/utils/without-vite-plugins.ts → ...er-vite/src/utils/without-vite-plugins.ts
diff --git a/...ib/builder-vite/src/virtual-file-names.ts → ...rs/builder-vite/src/virtual-file-names.ts b/...ib/builder-vite/src/virtual-file-names.ts → ...rs/builder-vite/src/virtual-file-names.ts
diff --git a/.../lib/builder-vite/src/vite-config.test.ts → ...ders/builder-vite/src/vite-config.test.ts b/.../lib/builder-vite/src/vite-config.test.ts → ...ders/builder-vite/src/vite-config.test.ts
diff --git a/code/lib/builder-vite/src/vite-config.ts → .../builders/builder-vite/src/vite-config.ts b/code/lib/builder-vite/src/vite-config.ts → .../builders/builder-vite/src/vite-config.ts
diff --git a/code/lib/builder-vite/src/vite-server.ts → .../builders/builder-vite/src/vite-server.ts b/code/lib/builder-vite/src/vite-server.ts → .../builders/builder-vite/src/vite-server.ts
diff --git a/code/lib/builder-vite/tsconfig.json → code/builders/builder-vite/tsconfig.json b/code/lib/builder-vite/tsconfig.json → code/builders/builder-vite/tsconfig.json
diff --git a/code/lib/builder-webpack5/README.md → code/builders/builder-webpack5/README.md b/code/lib/builder-webpack5/README.md → code/builders/builder-webpack5/README.md
diff --git a/code/lib/builder-webpack5/jest.config.js → .../builders/builder-webpack5/jest.config.js b/code/lib/builder-webpack5/jest.config.js → .../builders/builder-webpack5/jest.config.js
diff --git a/code/lib/builder-webpack5/package.json → code/builders/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json → 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 → code/builders/builder-webpack5/project.json b/code/lib/builder-webpack5/project.json → code/builders/builder-webpack5/project.json
diff --git a/code/lib/builder-webpack5/src/index.ts → code/builders/builder-webpack5/src/index.ts b/code/lib/builder-webpack5/src/index.ts → code/builders/builder-webpack5/src/index.ts
diff --git a/...ack5/src/presets/custom-webpack-preset.ts → ...ack5/src/presets/custom-webpack-preset.ts b/...ack5/src/presets/custom-webpack-preset.ts → ...ack5/src/presets/custom-webpack-preset.ts
diff --git a/...er-webpack5/src/presets/preview-preset.ts → ...er-webpack5/src/presets/preview-preset.ts b/...er-webpack5/src/presets/preview-preset.ts → ...er-webpack5/src/presets/preview-preset.ts
diff --git a/...bpack5/src/preview/base-webpack.config.ts → ...bpack5/src/preview/base-webpack.config.ts b/...bpack5/src/preview/base-webpack.config.ts → ...bpack5/src/preview/base-webpack.config.ts
diff --git a/...ack5/src/preview/iframe-webpack.config.ts → ...ack5/src/preview/iframe-webpack.config.ts b/...ack5/src/preview/iframe-webpack.config.ts → ...ack5/src/preview/iframe-webpack.config.ts
diff --git a/...b/builder-webpack5/src/preview/loaders.ts → ...s/builder-webpack5/src/preview/loaders.ts b/...b/builder-webpack5/src/preview/loaders.ts → ...s/builder-webpack5/src/preview/loaders.ts
diff --git a/code/lib/builder-webpack5/src/types.ts → code/builders/builder-webpack5/src/types.ts b/code/lib/builder-webpack5/src/types.ts → code/builders/builder-webpack5/src/types.ts
diff --git a/...ib/builder-webpack5/templates/preview.ejs → ...rs/builder-webpack5/templates/preview.ejs b/...ib/builder-webpack5/templates/preview.ejs → ...rs/builder-webpack5/templates/preview.ejs
diff --git a/.../templates/virtualModuleEntry.template.js → .../templates/virtualModuleEntry.template.js b/.../templates/virtualModuleEntry.template.js → .../templates/virtualModuleEntry.template.js
diff --git a/...es/virtualModuleModernEntry.js.handlebars → ...es/virtualModuleModernEntry.js.handlebars b/...es/virtualModuleModernEntry.js.handlebars → ...es/virtualModuleModernEntry.js.handlebars
diff --git a/.../templates/virtualModuleStory.template.js → .../templates/virtualModuleStory.template.js b/.../templates/virtualModuleStory.template.js → .../templates/virtualModuleStory.template.js
diff --git a/code/lib/builder-webpack5/tsconfig.json → code/builders/builder-webpack5/tsconfig.json b/code/lib/builder-webpack5/tsconfig.json → code/builders/builder-webpack5/tsconfig.json
diff --git a/code/lib/builder-webpack5/typings.d.ts → code/builders/builder-webpack5/typings.d.ts b/code/lib/builder-webpack5/typings.d.ts → code/builders/builder-webpack5/typings.d.ts
diff --git a/code/jest.config.js b/code/jest.config.js
@@ -3,6 +3,7 @@ module.exports = {
     '<rootDir>/addons/*',
     '<rootDir>/frameworks/*',
     '<rootDir>/lib/*',
+    '<rootDir>/builders/*',
     '<rootDir>/renderers/*',
     '<rootDir>/ui/!(node_modules)*',
   ],

diff --git 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
@@ -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
@@ -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
@@ -5615,9 +5615,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/[email protected], @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:lib/builder-manager":
+"@storybook/[email protected], @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.25
@@ -5640,9 +5640,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/[email protected], @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:lib/builder-vite":
+"@storybook/[email protected], @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.25
     "@storybook/channel-websocket": 7.1.0-alpha.25
@@ -5683,9 +5683,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@storybook/[email protected], @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:lib/builder-webpack5":
+"@storybook/[email protected], @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.25

@@ -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
 

diff --git 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",
@@ -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
@@ -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"
   },
@@ -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
@@ -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,23 +14,23 @@
     "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",
     "morgan": "^1.10.0",
     "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",
@@ -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
@@ -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",
@@ -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",