Merge branch 'next' into vite/plugin-cleanup

2025-04-06 00:41:05 +08:00 · 2022-09-02 18:41:42 +08:00 · 2022-09-02 18:41:42 +08:00 · bc41d6666c
commit bc41d6666c
parent 9a5adca82e 4786264378
93 changed files with 420 additions and 147 deletions
--- a/code/addons/a11y/package.json
+++ b/code/addons/a11y/package.json
@ -59,7 +59,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addon-highlight": "7.0.0-alpha.28",
--- a/code/addons/actions/package.json
+++ b/code/addons/actions/package.json
@ -32,7 +32,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/backgrounds/package.json
+++ b/code/addons/backgrounds/package.json
@ -59,7 +59,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/controls/package.json
+++ b/code/addons/controls/package.json
@ -54,7 +54,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/docs/package.json
+++ b/code/addons/docs/package.json
@ -46,7 +46,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@babel/plugin-transform-react-jsx": "^7.12.12",
--- a/code/addons/essentials/package.json
+++ b/code/addons/essentials/package.json
@ -30,7 +30,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addon-actions": "7.0.0-alpha.28",
--- a/code/addons/highlight/package.json
+++ b/code/addons/highlight/package.json
@ -34,7 +34,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/interactions/package.json
+++ b/code/addons/interactions/package.json
@ -32,7 +32,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@devtools-ds/object-inspector": "^1.1.2",
--- a/code/addons/jest/package.json
+++ b/code/addons/jest/package.json
@ -56,7 +56,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/links/package.json
+++ b/code/addons/links/package.json
@ -60,7 +60,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/measure/package.json
+++ b/code/addons/measure/package.json
@ -58,7 +58,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/outline/package.json
+++ b/code/addons/outline/package.json
@ -61,7 +61,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/storyshots/storyshots-core/package.json
+++ b/code/addons/storyshots/storyshots-core/package.json
@ -33,7 +33,7 @@
  "scripts": {
    "build-storybook": "sb build",
    "example": "jest storyshot.test",
-    "prep": "node ../../../../scripts/prepare.js",
+    "prepare": "node ../../../../scripts/prepare.js",
    "storybook": "yarn sb dev -p 6006"
  },
  "dependencies": {
--- a/code/addons/storyshots/storyshots-puppeteer/package.json
+++ b/code/addons/storyshots/storyshots-puppeteer/package.json
@ -30,7 +30,7 @@
    "*.d.ts"
  ],
  "scripts": {
-    "prep": "node ../../../../scripts/prepare.js"
+    "prepare": "node ../../../../scripts/prepare.js"
  },
  "dependencies": {
    "@axe-core/puppeteer": "^4.2.0",
--- a/code/addons/storysource/package.json
+++ b/code/addons/storysource/package.json
@ -32,7 +32,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/toolbars/package.json
+++ b/code/addons/toolbars/package.json
@ -54,7 +54,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/addons/viewport/package.json
+++ b/code/addons/viewport/package.json
@ -56,7 +56,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/frameworks/angular/package.json
+++ b/code/frameworks/angular/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/frameworks/ember/package.json
+++ b/code/frameworks/ember/package.json
@ -27,7 +27,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/html-webpack5/package.json
+++ b/code/frameworks/html-webpack5/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/preact-webpack5/package.json
+++ b/code/frameworks/preact-webpack5/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/react-vite/package.json
+++ b/code/frameworks/react-vite/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@joshwooding/vite-plugin-react-docgen-typescript": "^0.0.5",
--- a/code/frameworks/react-webpack5/package.json
+++ b/code/frameworks/react-webpack5/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/server-webpack5/package.json
+++ b/code/frameworks/server-webpack5/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/svelte-vite/package.json
+++ b/code/frameworks/svelte-vite/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addon-svelte-csf": "^2.0.0",
--- a/code/frameworks/svelte-webpack5/package.json
+++ b/code/frameworks/svelte-webpack5/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/vue-webpack5/package.json
+++ b/code/frameworks/vue-webpack5/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/vue3-vite/package.json
+++ b/code/frameworks/vue3-vite/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-vite": "7.0.0-alpha.28",
--- a/code/frameworks/vue3-webpack5/package.json
+++ b/code/frameworks/vue3-webpack5/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/builder-webpack5": "7.0.0-alpha.28",
--- a/code/frameworks/web-components-webpack5/package.json
+++ b/code/frameworks/web-components-webpack5/package.json
@ -49,7 +49,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@babel/preset-env": "^7.12.11",
--- a/code/lib/addons/package.json
+++ b/code/lib/addons/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/api": "7.0.0-alpha.28",
--- a/code/lib/api/package.json
+++ b/code/lib/api/package.json
@ -29,7 +29,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/channels": "7.0.0-alpha.28",
--- a/code/lib/blocks/package.json
+++ b/code/lib/blocks/package.json
@ -38,7 +38,7 @@
    "*.d.ts"
  ],
  "scripts": {
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/api": "7.0.0-alpha.28",
--- a/code/lib/builder-manager/package.json
+++ b/code/lib/builder-manager/package.json
@ -38,7 +38,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
--- a/code/lib/builder-vite/package.json
+++ b/code/lib/builder-vite/package.json
@ -15,7 +15,7 @@
  "types": "dist/types/index.d.ts",
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@joshwooding/vite-plugin-react-docgen-typescript": "0.0.5",
--- a/code/lib/builder-webpack5/package.json
+++ b/code/lib/builder-webpack5/package.json
@ -30,7 +30,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@babel/core": "^7.12.10",
--- a/code/lib/channel-postmessage/package.json
+++ b/code/lib/channel-postmessage/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/channels": "7.0.0-alpha.28",
--- a/code/lib/channel-websocket/package.json
+++ b/code/lib/channel-websocket/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/channels": "7.0.0-alpha.28",
--- a/code/lib/channels/package.json
+++ b/code/lib/channels/package.json
@ -39,7 +39,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "core-js": "^3.8.2",
--- a/code/lib/cli-sb/package.json
+++ b/code/lib/cli-sb/package.json
@ -22,7 +22,7 @@
  "bin": "./index.js",
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/cli": "7.0.0-alpha.28"
--- a/code/lib/cli-storybook/package.json
+++ b/code/lib/cli-storybook/package.json
@ -25,7 +25,7 @@
  },
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/cli": "7.0.0-alpha.28"
--- a/code/lib/cli/package.json
+++ b/code/lib/cli/package.json
@ -35,7 +35,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js",
+    "prepare": "node ../../../scripts/prepare.js",
    "test": "jest test/**/*.test.js"
  },
  "dependencies": {
--- a/code/lib/client-api/package.json
+++ b/code/lib/client-api/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/lib/client-logger/package.json
+++ b/code/lib/client-logger/package.json
@ -39,7 +39,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "core-js": "^3.8.2",
--- a/code/lib/codemod/package.json
+++ b/code/lib/codemod/package.json
@ -32,7 +32,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@babel/types": "^7.12.11",
--- a/code/lib/components/package.json
+++ b/code/lib/components/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/client-logger": "7.0.0-alpha.28",
--- a/code/lib/core-client/package.json
+++ b/code/lib/core-client/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/lib/core-common/package.json
+++ b/code/lib/core-common/package.json
@ -43,7 +43,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@babel/core": "^7.12.10",
--- a/code/lib/core-events/package.json
+++ b/code/lib/core-events/package.json
@ -39,7 +39,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "core-js": "^3.8.2"
--- a/code/lib/core-server/package.json
+++ b/code/lib/core-server/package.json
@ -30,7 +30,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@aw-web-design/x-default-browser": "1.4.88",
--- a/code/lib/core-webpack/package.json
+++ b/code/lib/core-webpack/package.json
@ -39,7 +39,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/core-common": "7.0.0-alpha.28",
--- a/code/lib/csf-tools/package.json
+++ b/code/lib/csf-tools/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@babel/core": "^7.12.10",
--- a/code/lib/docs-tools/package.json
+++ b/code/lib/docs-tools/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@babel/core": "^7.12.10",
--- a/code/lib/instrumenter/package.json
+++ b/code/lib/instrumenter/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/lib/node-logger/package.json
+++ b/code/lib/node-logger/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@types/npmlog": "^4.1.2",
--- a/code/lib/postinstall/package.json
+++ b/code/lib/postinstall/package.json
@ -32,7 +32,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "core-js": "^3.8.2"
--- a/code/lib/preview-web/package.json
+++ b/code/lib/preview-web/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/lib/preview-web/src/PreviewWeb.test.ts
+++ b/code/lib/preview-web/src/PreviewWeb.test.ts
@ -1,5 +1,5 @@
 /// <reference types="@types/jest" />;
-
+import { jest, jest as mockJest, it, describe, beforeEach, afterEach, expect } from '@jest/globals';
 import global from 'global';
 import merge from 'lodash/merge';
 import {
@ -31,7 +31,6 @@ import { logger } from '@storybook/client-logger';
 import { addons, mockChannel as createMockChannel } from '@storybook/addons';
 import type { AnyFramework } from '@storybook/csf';
 import type { ModuleImportFn, WebProjectAnnotations } from '@storybook/store';
-import { expect } from '@jest/globals';
 import { mocked } from 'ts-jest/utils';

 import { PreviewWeb } from './PreviewWeb';
@ -60,8 +59,8 @@ const mockStoryIndex = jest.fn(() => storyIndex);

 let mockFetchResult;
 jest.mock('global', () => ({
-  ...(jest.requireActual('global') as any),
-  history: { replaceState: jest.fn() },
+  ...(mockJest.requireActual('global') as any),
+  history: { replaceState: mockJest.fn() },
  document: {
    location: {
      pathname: 'pathname',
@ -70,7 +69,7 @@ jest.mock('global', () => ({
  },
  window: {
    location: {
-      reload: jest.fn(),
+      reload: mockJest.fn(),
    },
  },
  FEATURES: {
@ -349,8 +348,12 @@ describe('PreviewWeb', () => {
      });

      describe('after selection changes', () => {
-        beforeEach(() => jest.useFakeTimers());
-        afterEach(() => jest.useRealTimers());
+        beforeEach(() => {
+          jest.useFakeTimers();
+        });
+        afterEach(() => {
+          jest.useRealTimers();
+        });

        it('DOES NOT try again if CSF file changes', async () => {
          document.location.search = '?id=component-one--missing';
@ -1563,49 +1566,140 @@ describe('PreviewWeb', () => {
        expect(teardownRenderToDOM).not.toHaveBeenCalled();
      });

-      // For https://github.com/storybookjs/storybook/issues/17214
-      it('does NOT render a second time if preparing', async () => {
-        document.location.search = '?id=component-one--a';
+      describe('while preparing', () => {
+        // For https://github.com/storybookjs/storybook/issues/17214
+        it('does NOT render a second time in story mode', async () => {
+          document.location.search = '?id=component-one--a';

-        const [gate, openGate] = createGate();
-        const [importedGate, openImportedGate] = createGate();
-        importFn
-          .mockImplementationOnce(async (...args) => {
-            await gate;
-            return importFn(...args);
-          })
-          .mockImplementationOnce(async (...args) => {
-            // The second time we `import()` we open the "imported" gate
-            openImportedGate();
-            await gate;
-            return importFn(...args);
+          const [gate, openGate] = createGate();
+          const [importedGate, openImportedGate] = createGate();
+          importFn
+            .mockImplementationOnce(async (...args) => {
+              await gate;
+              return importFn(...args);
+            })
+            .mockImplementationOnce(async (...args) => {
+              // The second time we `import()` we open the "imported" gate
+              openImportedGate();
+              await gate;
+              return importFn(...args);
+            });
+
+          const preview = new PreviewWeb();
+          // We can't wait for the initialize function, as it waits for `renderSelection()`
+          // which prepares, but it does emit `CURRENT_STORY_WAS_SET` right before that
+          preview.initialize({ importFn, getProjectAnnotations });
+          await waitForEvents([CURRENT_STORY_WAS_SET]);
+
+          mockChannel.emit.mockClear();
+          projectAnnotations.renderToDOM.mockClear();
+          emitter.emit(SET_CURRENT_STORY, {
+            storyId: 'component-one--a',
+            viewMode: 'story',
          });
+          await importedGate;
+          // We are blocking import so this won't render yet
+          expect(projectAnnotations.renderToDOM).not.toHaveBeenCalled();

-        const preview = new PreviewWeb();
-        // We can't wait for the initialize function, as it waits for `renderSelection()`
-        // which prepares, but it does emit `CURRENT_STORY_WAS_SET` right before that
-        preview.initialize({ importFn, getProjectAnnotations });
-        await waitForEvents([CURRENT_STORY_WAS_SET]);
+          mockChannel.emit.mockClear();
+          openGate();
+          await waitForRender();

-        mockChannel.emit.mockClear();
-        projectAnnotations.renderToDOM.mockClear();
-        emitter.emit(SET_CURRENT_STORY, {
-          storyId: 'component-one--a',
-          viewMode: 'story',
+          // We should only render *once*
+          expect(projectAnnotations.renderToDOM).toHaveBeenCalledTimes(1);
+
+          // We should not show an error either
+          expect(preview.view.showErrorDisplay).not.toHaveBeenCalled();
        });
-        await importedGate;
-        // We are blocking import so this won't render yet
-        expect(projectAnnotations.renderToDOM).not.toHaveBeenCalled();

-        mockChannel.emit.mockClear();
-        openGate();
-        await waitForRender();
+        // For https://github.com/storybookjs/storybook/issues/19015
+        it('does NOT render a second time in template docs mode', async () => {
+          document.location.search = '?id=component-one--docs&viewMode=docs';

-        // We should only render *once*
-        expect(projectAnnotations.renderToDOM).toHaveBeenCalledTimes(1);
+          const [gate, openGate] = createGate();
+          const [importedGate, openImportedGate] = createGate();
+          importFn
+            .mockImplementationOnce(async (...args) => {
+              await gate;
+              return importFn(...args);
+            })
+            .mockImplementationOnce(async (...args) => {
+              // The second time we `import()` we open the "imported" gate
+              openImportedGate();
+              await gate;
+              return importFn(...args);
+            });

-        // We should not show an error either
-        expect(preview.view.showErrorDisplay).not.toHaveBeenCalled();
+          const preview = new PreviewWeb();
+          // We can't wait for the initialize function, as it waits for `renderSelection()`
+          // which prepares, but it does emit `CURRENT_STORY_WAS_SET` right before that
+          preview.initialize({ importFn, getProjectAnnotations });
+          await waitForEvents([CURRENT_STORY_WAS_SET]);
+
+          mockChannel.emit.mockClear();
+          projectAnnotations.renderToDOM.mockClear();
+          emitter.emit(SET_CURRENT_STORY, {
+            storyId: 'component-one--docs',
+            viewMode: 'docs',
+          });
+          await importedGate;
+          // We are blocking import so this won't render yet
+          expect(docsRenderer.render).not.toHaveBeenCalled();
+
+          mockChannel.emit.mockClear();
+          openGate();
+          await waitForRender();
+
+          // We should only render *once*
+          expect(docsRenderer.render).toHaveBeenCalledTimes(1);
+
+          // We should not show an error either
+          expect(preview.view.showErrorDisplay).not.toHaveBeenCalled();
+        });
+
+        it('does NOT render a second time in standalone docs mode', async () => {
+          document.location.search = '?id=introduction--docs&viewMode=docs';
+
+          const [gate, openGate] = createGate();
+          const [importedGate, openImportedGate] = createGate();
+          importFn
+            .mockImplementationOnce(async (...args) => {
+              await gate;
+              return importFn(...args);
+            })
+            .mockImplementationOnce(async (...args) => {
+              // The second time we `import()` we open the "imported" gate
+              openImportedGate();
+              await gate;
+              return importFn(...args);
+            });
+
+          const preview = new PreviewWeb();
+          // We can't wait for the initialize function, as it waits for `renderSelection()`
+          // which prepares, but it does emit `CURRENT_STORY_WAS_SET` right before that
+          preview.initialize({ importFn, getProjectAnnotations });
+          await waitForEvents([CURRENT_STORY_WAS_SET]);
+
+          mockChannel.emit.mockClear();
+          projectAnnotations.renderToDOM.mockClear();
+          emitter.emit(SET_CURRENT_STORY, {
+            storyId: 'introduction--docs',
+            viewMode: 'docs',
+          });
+          await importedGate;
+          // We are blocking import so this won't render yet
+          expect(docsRenderer.render).not.toHaveBeenCalled();
+
+          mockChannel.emit.mockClear();
+          openGate();
+          await waitForRender();
+
+          // We should only render *once*
+          expect(docsRenderer.render).toHaveBeenCalledTimes(1);
+
+          // We should not show an error either
+          expect(preview.view.showErrorDisplay).not.toHaveBeenCalled();
+        });
      });
    });

@ -2715,8 +2809,12 @@ describe('PreviewWeb', () => {
      });

      describe('if it was previously rendered', () => {
-        beforeEach(() => jest.useFakeTimers());
-        afterEach(() => jest.useRealTimers());
+        beforeEach(() => {
+          jest.useFakeTimers();
+        });
+        afterEach(() => {
+          jest.useRealTimers();
+        });
        it('is reloaded when it is re-selected', async () => {
          document.location.search = '?id=component-one--a';
          const preview = await createAndRenderPreview();
--- a/code/lib/preview-web/src/PreviewWeb.tsx
+++ b/code/lib/preview-web/src/PreviewWeb.tsx
@ -34,7 +34,8 @@ import { MaybePromise, Preview } from './Preview';

 import { UrlStore } from './UrlStore';
 import { WebView } from './WebView';
-import { PREPARE_ABORTED, StoryRender } from './render/StoryRender';
+import { PREPARE_ABORTED } from './render/Render';
+import { StoryRender } from './render/StoryRender';
 import { TemplateDocsRender } from './render/TemplateDocsRender';
 import { StandaloneDocsRender } from './render/StandaloneDocsRender';

--- a/code/lib/preview-web/src/render/Render.ts
+++ b/code/lib/preview-web/src/render/Render.ts
@ -19,3 +19,5 @@ export interface Render<TFramework extends AnyFramework> {
  torndown: boolean;
  renderToElement: (canvasElement: HTMLElement, renderStoryToElement?: any) => Promise<void>;
 }
+
+export const PREPARE_ABORTED = new Error('prepareAborted');
--- a/code/lib/preview-web/src/render/StandaloneDocsRender.test.ts
+++ b/code/lib/preview-web/src/render/StandaloneDocsRender.test.ts
@ -0,0 +1,52 @@
+import { jest, describe, it, expect } from '@jest/globals';
+import { Channel } from '@storybook/channels';
+import { AnyFramework } from '@storybook/csf';
+import { StoryStore } from '@storybook/store';
+import type { StandaloneDocsIndexEntry } from '@storybook/store';
+import { PREPARE_ABORTED } from './Render';
+
+import { StandaloneDocsRender } from './StandaloneDocsRender';
+
+const entry = {
+  type: 'docs',
+  id: 'introduction--docs',
+  name: 'Docs',
+  title: 'Introduction',
+  importPath: './Introduction.mdx',
+  storiesImports: [],
+  standalone: true,
+} as StandaloneDocsIndexEntry;
+
+const createGate = (): [Promise<any | undefined>, (_?: any) => void] => {
+  let openGate = (_?: any) => {};
+  const gate = new Promise<any | undefined>((resolve) => {
+    openGate = resolve;
+  });
+  return [gate, openGate];
+};
+
+describe('StandaloneDocsRender', () => {
+  it('throws PREPARE_ABORTED if torndown during prepare', async () => {
+    const [importGate, openImportGate] = createGate();
+    const mockStore = {
+      loadEntry: jest.fn(async () => {
+        await importGate;
+        return {};
+      }),
+    };
+
+    const render = new StandaloneDocsRender(
+      new Channel(),
+      mockStore as unknown as StoryStore<AnyFramework>,
+      entry
+    );
+
+    const preparePromise = render.prepare();
+
+    render.teardown();
+
+    openImportGate();
+
+    await expect(preparePromise).rejects.toThrowError(PREPARE_ABORTED);
+  });
+});
--- a/code/lib/preview-web/src/render/StandaloneDocsRender.ts
+++ b/code/lib/preview-web/src/render/StandaloneDocsRender.ts
@ -3,7 +3,7 @@ import { CSFFile, ModuleExports, StoryStore } from '@storybook/store';
 import { Channel, IndexEntry } from '@storybook/addons';
 import { DOCS_RENDERED } from '@storybook/core-events';

-import { Render, RenderType } from './Render';
+import { Render, RenderType, PREPARE_ABORTED } from './Render';
 import type { DocsContextProps } from '../docs-context/DocsContextProps';
 import type { DocsRenderFunction } from '../docs-context/DocsRenderFunction';
 import { DocsContext } from '../docs-context/DocsContext';
@ -26,7 +26,7 @@ export class StandaloneDocsRender<TFramework extends AnyFramework> implements Re

  public rerender?: () => Promise<void>;

-  public teardown?: (options: { viewModeChanged?: boolean }) => Promise<void>;
+  public teardownRender?: (options: { viewModeChanged?: boolean }) => Promise<void>;

  public torndown = false;

@ -51,6 +51,8 @@ export class StandaloneDocsRender<TFramework extends AnyFramework> implements Re
  async prepare() {
    this.preparing = true;
    const { entryExports, csfFiles = [] } = await this.store.loadEntry(this.id);
+    if (this.torndown) throw PREPARE_ABORTED;
+
    this.csfFiles = csfFiles;
    this.exports = entryExports;

@ -96,7 +98,7 @@ export class StandaloneDocsRender<TFramework extends AnyFramework> implements Re
    };

    this.rerender = async () => renderDocs();
-    this.teardown = async ({ viewModeChanged }: { viewModeChanged?: boolean } = {}) => {
+    this.teardownRender = async ({ viewModeChanged }: { viewModeChanged?: boolean } = {}) => {
      if (!viewModeChanged || !canvasElement) return;
      renderer.unmount(canvasElement);
      this.torndown = true;
@ -104,4 +106,9 @@ export class StandaloneDocsRender<TFramework extends AnyFramework> implements Re

    return renderDocs();
  }
+
+  async teardown({ viewModeChanged }: { viewModeChanged?: boolean } = {}) {
+    this.teardownRender?.({ viewModeChanged });
+    this.torndown = true;
+  }
 }
--- a/code/lib/preview-web/src/render/StoryRender.test.ts
+++ b/code/lib/preview-web/src/render/StoryRender.test.ts
@ -0,0 +1,54 @@
+import { jest, describe, it, expect } from '@jest/globals';
+import { Channel } from '@storybook/channels';
+import { AnyFramework } from '@storybook/csf';
+import { StoryStore } from '@storybook/store';
+import type { StoryIndexEntry } from '@storybook/store';
+import { PREPARE_ABORTED } from './Render';
+
+import { StoryRender } from './StoryRender';
+
+const entry = {
+  type: 'story',
+  id: 'component--a',
+  name: 'A',
+  title: 'component',
+  importPath: './component.stories.ts',
+} as StoryIndexEntry;
+
+const createGate = (): [Promise<any | undefined>, (_?: any) => void] => {
+  let openGate = (_?: any) => {};
+  const gate = new Promise<any | undefined>((resolve) => {
+    openGate = resolve;
+  });
+  return [gate, openGate];
+};
+
+describe('StoryRender', () => {
+  it('throws PREPARE_ABORTED if torndown during prepare', async () => {
+    const [importGate, openImportGate] = createGate();
+    const mockStore = {
+      loadStory: jest.fn(async () => {
+        await importGate;
+        return {};
+      }),
+      cleanupStory: jest.fn(),
+    };
+
+    const render = new StoryRender(
+      new Channel(),
+      mockStore as unknown as StoryStore<AnyFramework>,
+      jest.fn(),
+      {} as any,
+      entry.id,
+      'story'
+    );
+
+    const preparePromise = render.prepare();
+
+    render.teardown();
+
+    openImportGate();
+
+    await expect(preparePromise).rejects.toThrowError(PREPARE_ABORTED);
+  });
+});
--- a/code/lib/preview-web/src/render/StoryRender.ts
+++ b/code/lib/preview-web/src/render/StoryRender.ts
@ -20,7 +20,7 @@ import {
  STORY_RENDERED,
  PLAY_FUNCTION_THREW_EXCEPTION,
 } from '@storybook/core-events';
-import { Render, RenderType } from './Render';
+import { Render, RenderType, PREPARE_ABORTED } from './Render';

 const { AbortController } = global;

@ -60,8 +60,6 @@ export type RenderContextCallbacks<TFramework extends AnyFramework> = Pick<
  'showMain' | 'showError' | 'showException'
 >;

-export const PREPARE_ABORTED = new Error('prepareAborted');
-
 export class StoryRender<TFramework extends AnyFramework> implements Render<TFramework> {
  public type: RenderType = 'story';

@ -275,7 +273,7 @@ export class StoryRender<TFramework extends AnyFramework> implements Render<TFra
    this.abortController?.abort();
  }

-  async teardown(options: {} = {}) {
+  async teardown() {
    this.torndown = true;
    this.cancelRender();

--- a/code/lib/preview-web/src/render/TemplateDocsRender.test.ts
+++ b/code/lib/preview-web/src/render/TemplateDocsRender.test.ts
@ -0,0 +1,52 @@
+import { jest, describe, it, expect } from '@jest/globals';
+import { Channel } from '@storybook/channels';
+import { AnyFramework } from '@storybook/csf';
+import { StoryStore } from '@storybook/store';
+import type { TemplateDocsIndexEntry } from '@storybook/store';
+import { PREPARE_ABORTED } from './Render';
+
+import { TemplateDocsRender } from './TemplateDocsRender';
+
+const entry = {
+  type: 'docs',
+  id: 'component--docs',
+  name: 'Docs',
+  title: 'Component',
+  importPath: './Component.stories.ts',
+  storiesImports: [],
+  standalone: false,
+} as TemplateDocsIndexEntry;
+
+const createGate = (): [Promise<any | undefined>, (_?: any) => void] => {
+  let openGate = (_?: any) => {};
+  const gate = new Promise<any | undefined>((resolve) => {
+    openGate = resolve;
+  });
+  return [gate, openGate];
+};
+
+describe('TemplateDocsRender', () => {
+  it('throws PREPARE_ABORTED if torndown during prepare', async () => {
+    const [importGate, openImportGate] = createGate();
+    const mockStore = {
+      loadEntry: jest.fn(async () => {
+        await importGate;
+        return {};
+      }),
+    };
+
+    const render = new TemplateDocsRender(
+      new Channel(),
+      mockStore as unknown as StoryStore<AnyFramework>,
+      entry
+    );
+
+    const preparePromise = render.prepare();
+
+    render.teardown();
+
+    openImportGate();
+
+    await expect(preparePromise).rejects.toThrowError(PREPARE_ABORTED);
+  });
+});
--- a/code/lib/preview-web/src/render/TemplateDocsRender.ts
+++ b/code/lib/preview-web/src/render/TemplateDocsRender.ts
@ -3,7 +3,7 @@ import { CSFFile, Story, StoryStore } from '@storybook/store';
 import { Channel, IndexEntry } from '@storybook/addons';
 import { DOCS_RENDERED } from '@storybook/core-events';

-import { Render, RenderType } from './Render';
+import { Render, RenderType, PREPARE_ABORTED } from './Render';
 import type { DocsContextProps } from '../docs-context/DocsContextProps';
 import type { DocsRenderFunction } from '../docs-context/DocsRenderFunction';
 import { DocsContext } from '../docs-context/DocsContext';
@ -29,7 +29,7 @@ export class TemplateDocsRender<TFramework extends AnyFramework> implements Rend

  public rerender?: () => Promise<void>;

-  public teardown?: (options: { viewModeChanged?: boolean }) => Promise<void>;
+  public teardownRender?: (options: { viewModeChanged?: boolean }) => Promise<void>;

  public torndown = false;

@ -54,9 +54,10 @@ export class TemplateDocsRender<TFramework extends AnyFramework> implements Rend
  async prepare() {
    this.preparing = true;
    const { entryExports, csfFiles = [] } = await this.store.loadEntry(this.id);
+    if (this.torndown) throw PREPARE_ABORTED;

    const { importPath, title } = this.entry;
-    const primaryCsfFile = await this.store.processCSFFileWithCache<TFramework>(
+    const primaryCsfFile = this.store.processCSFFileWithCache<TFramework>(
      entryExports,
      importPath,
      title
@ -112,12 +113,16 @@ export class TemplateDocsRender<TFramework extends AnyFramework> implements Rend
    };

    this.rerender = async () => renderDocs();
-    this.teardown = async ({ viewModeChanged }: { viewModeChanged?: boolean } = {}) => {
+    this.teardownRender = async ({ viewModeChanged }: { viewModeChanged?: boolean }) => {
      if (!viewModeChanged || !canvasElement) return;
      renderer.unmount(canvasElement);
-      this.torndown = true;
    };

    return renderDocs();
  }
+
+  async teardown({ viewModeChanged }: { viewModeChanged?: boolean } = {}) {
+    this.teardownRender?.({ viewModeChanged });
+    this.torndown = true;
+  }
 }
--- a/code/lib/router/package.json
+++ b/code/lib/router/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "ts-node ../../../scripts/prebundle.ts"
+    "prepare": "ts-node ../../../scripts/prebundle.ts"
  },
  "dependencies": {
    "@storybook/client-logger": "7.0.0-alpha.28",
--- a/code/lib/source-loader/package.json
+++ b/code/lib/source-loader/package.json
@ -32,7 +32,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/lib/store/package.json
+++ b/code/lib/store/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/lib/telemetry/package.json
+++ b/code/lib/telemetry/package.json
@ -31,7 +31,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "node ../../../scripts/prepare.js"
+    "prepare": "node ../../../scripts/prepare.js"
  },
  "dependencies": {
    "@storybook/client-logger": "7.0.0-alpha.28",
--- a/code/lib/theming/package.json
+++ b/code/lib/theming/package.json
@ -44,7 +44,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/client-logger": "7.0.0-alpha.28",
--- a/code/lib/ui/package.json
+++ b/code/lib/ui/package.json
@ -49,7 +49,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "devDependencies": {
    "@babel/core": "^7.12.10",
--- a/code/nx.json
+++ b/code/nx.json
@ -10,8 +10,8 @@
    "default": {
      "runner": "@nrwl/nx-cloud",
      "options": {
-        "cacheableOperations": ["build", "test", "lint", "package", "prep"],
-        "strictlyOrderedTargets": ["build", "package", "prep"],
+        "cacheableOperations": ["build", "test", "lint", "package", "prepare"],
+        "strictlyOrderedTargets": ["build", "package", "prepare"],
        "accessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=",
        "canTrackAnalytics": false,
        "showUsageWarnings": true
--- a/code/presets/html-webpack/package.json
+++ b/code/presets/html-webpack/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/core-webpack": "7.0.0-alpha.28",
--- a/code/presets/preact-webpack/package.json
+++ b/code/presets/preact-webpack/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@babel/plugin-transform-react-jsx": "^7.12.12",
--- a/code/presets/react-webpack/package.json
+++ b/code/presets/react-webpack/package.json
@ -68,7 +68,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@babel/preset-flow": "^7.12.1",
--- a/code/presets/server-webpack/package.json
+++ b/code/presets/server-webpack/package.json
@ -52,7 +52,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/core-server": "7.0.0-alpha.28",
--- a/code/presets/svelte-webpack/package.json
+++ b/code/presets/svelte-webpack/package.json
@ -62,7 +62,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/core-webpack": "7.0.0-alpha.28",
--- a/code/presets/vue-webpack/package.json
+++ b/code/presets/vue-webpack/package.json
@ -57,7 +57,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/core-webpack": "7.0.0-alpha.28",
--- a/code/presets/vue3-webpack/package.json
+++ b/code/presets/vue3-webpack/package.json
@ -57,7 +57,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/core-webpack": "7.0.0-alpha.28",
--- a/code/presets/web-components-webpack/package.json
+++ b/code/presets/web-components-webpack/package.json
@ -49,7 +49,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
--- a/code/renderers/html/package.json
+++ b/code/renderers/html/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/preact/package.json
+++ b/code/renderers/preact/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/react/package.json
+++ b/code/renderers/react/package.json
@ -48,7 +48,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/server/package.json
+++ b/code/renderers/server/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/svelte/package.json
+++ b/code/renderers/svelte/package.json
@ -51,7 +51,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/vue/package.json
+++ b/code/renderers/vue/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/vue3/package.json
+++ b/code/renderers/vue3/package.json
@ -47,7 +47,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/code/renderers/web-components/package.json
+++ b/code/renderers/web-components/package.json
@ -49,7 +49,7 @@
  ],
  "scripts": {
    "check": "tsc --noEmit",
-    "prep": "../../../scripts/prepare/bundle.ts"
+    "prepare": "../../../scripts/prepare/bundle.ts"
  },
  "dependencies": {
    "@storybook/addons": "7.0.0-alpha.28",
--- a/scripts/bootstrap.js
+++ b/scripts/bootstrap.js
@ -74,9 +74,9 @@ function run() {
      defaultValue: true,
      option: '--prep',
      command: () => {
-        log.info(prefix, 'prep');
+        log.info(prefix, 'prepare');
        spawn(
-          `nx run-many --target="prep" --all --parallel --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer -- --reset`
+          `nx run-many --target="prepare" --all --parallel --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer -- --reset`
        );
      },
      order: 2,
@ -86,9 +86,9 @@ function run() {
      defaultValue: true,
      option: '--retry',
      command: () => {
-        log.info(prefix, 'prep');
+        log.info(prefix, 'prepare');
        spawn(
-          `nx run-many --target=prep --all --parallel --only-failed ${
+          `nx run-many --target=prepare --all --parallel --only-failed ${
            process.env.CI ? `--max-parallel=${maxConcurrentTasks}` : ''
          }`
        );
@ -122,7 +122,7 @@ function run() {
      command: () => {
        log.info(prefix, 'build');
        spawn(
-          `nx run-many --target="prep" --all --parallel=8 ${
+          `nx run-many --target="prepare" --all --parallel=8 ${
            process.env.CI ? `--max-parallel=${maxConcurrentTasks}` : ''
          } -- --reset --optimized`
        );
--- a/scripts/build-package.js
+++ b/scripts/build-package.js
@ -113,7 +113,7 @@ async function run() {
  }

  selection?.filter(Boolean).forEach(async (v) => {
-    const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prep;
+    const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prepare;
    const cwd = resolve(__dirname, '..', 'code', v.location);
    const sub = require('execa').command(
      `${commmand}${watchMode ? ' --watch' : ''}${prodMode ? ' --optimized' : ''}`,
--- a/scripts/prepare.js
+++ b/scripts/prepare.js
@ -68,7 +68,7 @@ const hasFlag = (flags, name) => !!flags.find((s) => s.startsWith(`--${name}`));

 const modules = true;

-async function prep({ cwd, flags }) {
+async function prepare({ cwd, flags }) {
  const { packageJson } = await readPkgUp(cwd);
  const message = chalk.gray(`Built: ${chalk.bold(`${packageJson.name}@${packageJson.version}`)}`);
  console.time(message);
@ -101,4 +101,4 @@ async function prep({ cwd, flags }) {
 const flags = process.argv.slice(2);
 const cwd = process.cwd();

-prep({ cwd, flags });
+prepare({ cwd, flags });
--- a/scripts/sandbox.ts
+++ b/scripts/sandbox.ts
@ -267,7 +267,11 @@ async function addStories(paths: string[], { mainConfig }: { mainConfig: ConfigF
  const relativeCodeDir = path.join('..', '..', '..', 'code');
  const extraStories = extraStoryDirsAndExistence
    .filter(([, exists]) => exists)
-    .map(([p]) => path.join(relativeCodeDir, p, '*.stories.@(js|jsx|ts|tsx)'));
+    .map(([p]) => ({
+      directory: path.join(relativeCodeDir, p),
+      titlePrefix: p.split('/').slice(-4, -2).join('/'),
+      files: '*.stories.@(js|jsx|ts|tsx)',
+    }));
  mainConfig.setFieldValue(['stories'], [...stories, ...extraStories]);
 }