From 857e692c08f2f3cb1b3facb39f247c09e6a3a402 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 11:21:54 +0800 Subject: [PATCH 1/7] CLI: Fix local repro publishing --- .../src/js-package-manager/JsPackageManager.ts | 15 +++++++++++++-- code/lib/cli/src/js-package-manager/NPMProxy.ts | 13 ------------- code/lib/cli/src/js-package-manager/Yarn1Proxy.ts | 13 ------------- code/lib/cli/src/js-package-manager/Yarn2Proxy.ts | 13 ------------- 4 files changed, 13 insertions(+), 41 deletions(-) diff --git a/code/lib/cli/src/js-package-manager/JsPackageManager.ts b/code/lib/cli/src/js-package-manager/JsPackageManager.ts index 4f7e553a5dea..46414f43b483 100644 --- a/code/lib/cli/src/js-package-manager/JsPackageManager.ts +++ b/code/lib/cli/src/js-package-manager/JsPackageManager.ts @@ -39,9 +39,20 @@ export abstract class JsPackageManager { public abstract getRunCommand(command: string): string; - public abstract setRegistryURL(url: string): void; + // NOTE: for some reason yarn prefers the npm registry in + // local development, so always use npm + setRegistryURL(url: string) { + if (url) { + this.executeCommand('npm', ['config', 'set', 'registry', url]); + } else { + this.executeCommand('npm', ['config', 'delete', 'registry']); + } + } - public abstract getRegistryURL(): string; + getRegistryURL() { + const url = this.executeCommand('npm', ['config', 'get', 'registry']).trim(); + return url === 'undefined' ? undefined : url; + } public readonly cwd?: string; diff --git a/code/lib/cli/src/js-package-manager/NPMProxy.ts b/code/lib/cli/src/js-package-manager/NPMProxy.ts index 64edffa7a6b7..d89726f9d7dc 100644 --- a/code/lib/cli/src/js-package-manager/NPMProxy.ts +++ b/code/lib/cli/src/js-package-manager/NPMProxy.ts @@ -61,19 +61,6 @@ export class NPMProxy extends JsPackageManager { return this.uninstallArgs; } - setRegistryURL(url: string) { - if (url) { - this.executeCommand('npm', ['config', 'set', 'registry', url]); - } else { - this.executeCommand('npm', ['config', 'delete', 'registry']); - } - } - - getRegistryURL() { - const url = this.executeCommand('npm', ['config', 'get', 'registry']).trim(); - return url === 'undefined' ? undefined : url; - } - protected getResolutions(packageJson: PackageJson, versions: Record) { return { overrides: { diff --git a/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts b/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts index bcb0c01ae213..789499084c85 100644 --- a/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts +++ b/code/lib/cli/src/js-package-manager/Yarn1Proxy.ts @@ -16,19 +16,6 @@ export class Yarn1Proxy extends JsPackageManager { return `yarn ${command}`; } - setRegistryURL(url: string) { - if (url) { - this.executeCommand('yarn', ['config', 'set', 'npmRegistryServer', url]); - } else { - this.executeCommand('yarn', ['config', 'delete', 'npmRegistryServer']); - } - } - - getRegistryURL() { - const url = this.executeCommand('yarn', ['config', 'get', 'npmRegistryServer']).trim(); - return url === 'undefined' ? undefined : url; - } - protected getResolutions(packageJson: PackageJson, versions: Record) { return { resolutions: { diff --git a/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts b/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts index 4ab59b903d4b..63736283424f 100644 --- a/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts +++ b/code/lib/cli/src/js-package-manager/Yarn2Proxy.ts @@ -16,19 +16,6 @@ export class Yarn2Proxy extends JsPackageManager { return `yarn ${command}`; } - setRegistryURL(url: string) { - if (url) { - this.executeCommand('yarn', ['config', 'set', 'npmRegistryServer', url]); - } else { - this.executeCommand('yarn', ['config', 'delete', 'npmRegistryServer']); - } - } - - getRegistryURL() { - const url = this.executeCommand('yarn', ['config', 'get', 'npmRegistryServer']).trim(); - return url === 'undefined' ? undefined : url; - } - protected getResolutions(packageJson: PackageJson, versions: Record) { return { resolutions: { From 3f21366145a06960a446359d0b63fef1de39a3e4 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 16:33:45 +0800 Subject: [PATCH 2/7] Build: Rename prepare to prep for npm8 and verdaccio --- code/addons/a11y/package.json | 2 +- code/addons/actions/package.json | 2 +- code/addons/backgrounds/package.json | 2 +- code/addons/controls/package.json | 2 +- code/addons/docs/package.json | 2 +- code/addons/essentials/package.json | 2 +- code/addons/highlight/package.json | 2 +- code/addons/interactions/package.json | 2 +- code/addons/jest/package.json | 2 +- code/addons/links/package.json | 2 +- code/addons/measure/package.json | 2 +- code/addons/outline/package.json | 2 +- code/addons/storyshots/storyshots-core/package.json | 2 +- .../storyshots/storyshots-puppeteer/package.json | 2 +- code/addons/storysource/package.json | 2 +- code/addons/toolbars/package.json | 2 +- code/addons/viewport/package.json | 2 +- code/frameworks/angular/package.json | 2 +- code/frameworks/ember/package.json | 2 +- code/frameworks/html-webpack5/package.json | 2 +- code/frameworks/preact-webpack5/package.json | 2 +- code/frameworks/react-webpack5/package.json | 2 +- code/frameworks/server-webpack5/package.json | 2 +- code/frameworks/svelte-webpack5/package.json | 2 +- code/frameworks/vue-webpack5/package.json | 2 +- code/frameworks/vue3-webpack5/package.json | 2 +- code/frameworks/web-components-webpack5/package.json | 2 +- code/lib/addons/package.json | 2 +- code/lib/api/package.json | 2 +- code/lib/blocks/package.json | 2 +- code/lib/builder-manager/package.json | 2 +- code/lib/builder-webpack5/package.json | 2 +- code/lib/channel-postmessage/package.json | 2 +- code/lib/channel-websocket/package.json | 2 +- code/lib/channels/package.json | 2 +- code/lib/cli-sb/package.json | 2 +- code/lib/cli-storybook/package.json | 2 +- code/lib/cli/package.json | 2 +- code/lib/client-api/package.json | 2 +- code/lib/client-logger/package.json | 2 +- code/lib/codemod/package.json | 2 +- code/lib/components/package.json | 2 +- code/lib/core-client/package.json | 2 +- code/lib/core-common/package.json | 2 +- code/lib/core-events/package.json | 2 +- code/lib/core-server/package.json | 2 +- code/lib/core-webpack/package.json | 2 +- code/lib/csf-tools/package.json | 2 +- code/lib/docs-tools/package.json | 2 +- code/lib/instrumenter/package.json | 2 +- code/lib/node-logger/package.json | 2 +- code/lib/postinstall/package.json | 2 +- code/lib/preview-web/package.json | 2 +- code/lib/router/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/lib/store/package.json | 2 +- code/lib/telemetry/package.json | 2 +- code/lib/theming/package.json | 2 +- code/lib/ui/package.json | 2 +- code/nx.json | 4 ++-- code/presets/html-webpack/package.json | 2 +- code/presets/preact-webpack/package.json | 2 +- code/presets/react-webpack/package.json | 2 +- code/presets/server-webpack/package.json | 2 +- code/presets/svelte-webpack/package.json | 2 +- code/presets/vue-webpack/package.json | 2 +- code/presets/vue3-webpack/package.json | 2 +- code/presets/web-components-webpack/package.json | 2 +- code/renderers/html/package.json | 2 +- code/renderers/preact/package.json | 2 +- code/renderers/react/package.json | 2 +- code/renderers/server/package.json | 2 +- code/renderers/svelte/package.json | 2 +- code/renderers/vue/package.json | 2 +- code/renderers/vue3/package.json | 2 +- code/renderers/web-components/package.json | 2 +- scripts/bootstrap.js | 10 +++++----- 77 files changed, 82 insertions(+), 82 deletions(-) diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index a2c3e076e0bc..d97bd81bbb88 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -59,7 +59,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addon-highlight": "7.0.0-alpha.23", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index 23d80a5f4b42..faa3b59edfc9 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -32,7 +32,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 40ea81c45637..97b407e22c34 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -59,7 +59,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 65207a7489c0..32d2119ceafd 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -54,7 +54,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 16800c0d752e..c30b22d53c3c 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -46,7 +46,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index 73167de5b5bf..846f8b2f4b65 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -30,7 +30,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addon-actions": "7.0.0-alpha.23", diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 0a9290701a2e..38849055a449 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -34,7 +34,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 785d41066ad8..46f070e6d98b 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -32,7 +32,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@devtools-ds/object-inspector": "^1.1.2", diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index df0006d8a35b..e65f7de67397 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -56,7 +56,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index 8ef24d9900ab..9c79eb620b37 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -60,7 +60,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index d282049ee859..3cac2cab0523 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -58,7 +58,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index 252956864af8..62ae398883b9 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -61,7 +61,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/storyshots/storyshots-core/package.json b/code/addons/storyshots/storyshots-core/package.json index af13f0ae8f01..f1f72a6eb038 100644 --- 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", - "prepare": "node ../../../../scripts/prepare.js", + "prep": "node ../../../../scripts/prepare.js", "storybook": "yarn sb dev -p 6006" }, "dependencies": { diff --git a/code/addons/storyshots/storyshots-puppeteer/package.json b/code/addons/storyshots/storyshots-puppeteer/package.json index 0d07b8325d56..41f26cf315ca 100644 --- a/code/addons/storyshots/storyshots-puppeteer/package.json +++ b/code/addons/storyshots/storyshots-puppeteer/package.json @@ -30,7 +30,7 @@ "*.d.ts" ], "scripts": { - "prepare": "node ../../../../scripts/prepare.js" + "prep": "node ../../../../scripts/prepare.js" }, "dependencies": { "@axe-core/puppeteer": "^4.2.0", diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index 3958eda9ff43..ef519a903cf4 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -32,7 +32,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index abd624753148..ffe656021a93 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -54,7 +54,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index 494790baf732..b238f4c2276c 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -33,7 +33,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 39bbe18c0394..a26cf4117b74 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index b0c91e79887f..e87a3f6803c4 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -27,7 +27,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index acd01d03e28e..1822d1741f5a 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 286048776544..1c239bdce89f 100644 --- a/code/frameworks/preact-webpack5/package.json +++ b/code/frameworks/preact-webpack5/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index d6e17ae59de3..6d712f530a88 100644 --- a/code/frameworks/react-webpack5/package.json +++ b/code/frameworks/react-webpack5/package.json @@ -48,7 +48,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index 9e20a2a97374..4fa0140de499 100644 --- a/code/frameworks/server-webpack5/package.json +++ b/code/frameworks/server-webpack5/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index 07f7f2559ed7..008933b4ae06 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -48,7 +48,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json index d6d925297e5c..68e58b8436bb 100644 --- a/code/frameworks/vue-webpack5/package.json +++ b/code/frameworks/vue-webpack5/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 6c79da4ae0b7..4c39ba8b92e6 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/builder-webpack5": "7.0.0-alpha.23", diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index 3c4cab8ccd91..c0c0e4319a16 100644 --- a/code/frameworks/web-components-webpack5/package.json +++ b/code/frameworks/web-components-webpack5/package.json @@ -49,7 +49,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/preset-env": "^7.12.11", diff --git a/code/lib/addons/package.json b/code/lib/addons/package.json index 187113cf715d..a1d76ac3806c 100644 --- a/code/lib/addons/package.json +++ b/code/lib/addons/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/api": "7.0.0-alpha.23", diff --git a/code/lib/api/package.json b/code/lib/api/package.json index 1c9b2febb979..1618eb1da563 100644 --- a/code/lib/api/package.json +++ b/code/lib/api/package.json @@ -29,7 +29,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/channels": "7.0.0-alpha.23", diff --git a/code/lib/blocks/package.json b/code/lib/blocks/package.json index 1f21556295cb..0db0297d51cd 100644 --- a/code/lib/blocks/package.json +++ b/code/lib/blocks/package.json @@ -38,7 +38,7 @@ "*.d.ts" ], "scripts": { - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/api": "7.0.0-alpha.23", diff --git a/code/lib/builder-manager/package.json b/code/lib/builder-manager/package.json index c8e6cb127058..24704eadf436 100644 --- a/code/lib/builder-manager/package.json +++ b/code/lib/builder-manager/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index d9830c9e0ad2..923676097261 100644 --- a/code/lib/builder-webpack5/package.json +++ b/code/lib/builder-webpack5/package.json @@ -30,7 +30,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/core": "^7.12.10", diff --git a/code/lib/channel-postmessage/package.json b/code/lib/channel-postmessage/package.json index e5bcb84738b2..6c0562994807 100644 --- a/code/lib/channel-postmessage/package.json +++ b/code/lib/channel-postmessage/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/channels": "7.0.0-alpha.23", diff --git a/code/lib/channel-websocket/package.json b/code/lib/channel-websocket/package.json index 5e30e9824d39..d2d0939d1cea 100644 --- a/code/lib/channel-websocket/package.json +++ b/code/lib/channel-websocket/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/channels": "7.0.0-alpha.23", diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json index 03ec73f71529..e62c92dea5ec 100644 --- a/code/lib/channels/package.json +++ b/code/lib/channels/package.json @@ -39,7 +39,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "core-js": "^3.8.2", diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index 080e6875a0c3..66825de3933d 100644 --- 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", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/cli": "7.0.0-alpha.23" diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 1886f6f489c5..315e919d36e0 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -25,7 +25,7 @@ }, "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/cli": "7.0.0-alpha.23" diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index aa0f7b2d3629..ce0e33dc7098 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -42,7 +42,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js", + "prep": "node ../../../scripts/prepare.js", "test": "jest test/**/*.test.js" }, "dependencies": { diff --git a/code/lib/client-api/package.json b/code/lib/client-api/package.json index ef06c7f2fb6c..2f6e81d285c6 100644 --- a/code/lib/client-api/package.json +++ b/code/lib/client-api/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json index 037bf42779ff..c43f9eccb998 100644 --- a/code/lib/client-logger/package.json +++ b/code/lib/client-logger/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "core-js": "^3.8.2", diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index adf008272108..b5b9f08bdbca 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -39,7 +39,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/types": "^7.12.11", diff --git a/code/lib/components/package.json b/code/lib/components/package.json index c9618e7376c7..a85970d5c47b 100644 --- a/code/lib/components/package.json +++ b/code/lib/components/package.json @@ -48,7 +48,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/client-logger": "7.0.0-alpha.23", diff --git a/code/lib/core-client/package.json b/code/lib/core-client/package.json index 08e1b9fa7f39..8aaed9af2aa8 100644 --- a/code/lib/core-client/package.json +++ b/code/lib/core-client/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index cee7e43afc6f..cd55e328ddbb 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -43,7 +43,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/core": "^7.12.10", diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json index 20c3cdc40962..c2c68017425b 100644 --- a/code/lib/core-events/package.json +++ b/code/lib/core-events/package.json @@ -39,7 +39,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "core-js": "^3.8.2" diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index c19aa724f6db..33d22c282a57 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -30,7 +30,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@aw-web-design/x-default-browser": "1.4.88", diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index 22dcc683ee62..b071050ac8b8 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/core-common": "7.0.0-alpha.23", diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index fb621f5b03db..30a20528ea6e 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/core": "^7.12.10", diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index 608443b30cf9..e9974a51e512 100644 --- a/code/lib/docs-tools/package.json +++ b/code/lib/docs-tools/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/core": "^7.12.10", diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index 207d4f6d1809..a58e3cae957a 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json index d348092f81fd..7fb2cfd000d8 100644 --- a/code/lib/node-logger/package.json +++ b/code/lib/node-logger/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@types/npmlog": "^4.1.2", diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json index 5060bc7a7671..fe6f1e4d67b7 100644 --- a/code/lib/postinstall/package.json +++ b/code/lib/postinstall/package.json @@ -32,7 +32,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "core-js": "^3.8.2" diff --git a/code/lib/preview-web/package.json b/code/lib/preview-web/package.json index 75cec5a954df..9295852a3f5c 100644 --- a/code/lib/preview-web/package.json +++ b/code/lib/preview-web/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/router/package.json b/code/lib/router/package.json index 66d1d77964fd..033b17399e15 100644 --- a/code/lib/router/package.json +++ b/code/lib/router/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "ts-node ../../../scripts/prebundle.ts" + "prep": "ts-node ../../../scripts/prebundle.ts" }, "dependencies": { "@storybook/client-logger": "7.0.0-alpha.23", diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index 8f90c2803ffd..a231d7551a57 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -32,7 +32,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/store/package.json b/code/lib/store/package.json index 485186f4624b..d0d9b718cab0 100644 --- a/code/lib/store/package.json +++ b/code/lib/store/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index 5a67a53c9bb0..2cf4b20c898a 100644 --- a/code/lib/telemetry/package.json +++ b/code/lib/telemetry/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "node ../../../scripts/prepare.js" + "prep": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/client-logger": "7.0.0-alpha.23", diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index 857fe573f008..e5b9163b78dd 100644 --- a/code/lib/theming/package.json +++ b/code/lib/theming/package.json @@ -44,7 +44,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/client-logger": "7.0.0-alpha.23", diff --git a/code/lib/ui/package.json b/code/lib/ui/package.json index f3f7ac9366eb..47f0b8ba91ef 100644 --- a/code/lib/ui/package.json +++ b/code/lib/ui/package.json @@ -49,7 +49,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "devDependencies": { "@babel/core": "^7.12.10", diff --git a/code/nx.json b/code/nx.json index 238750d72cae..249f9a30decc 100644 --- a/code/nx.json +++ b/code/nx.json @@ -10,8 +10,8 @@ "default": { "runner": "@nrwl/nx-cloud", "options": { - "cacheableOperations": ["build", "test", "lint", "package", "prepare"], - "strictlyOrderedTargets": ["build", "package", "prepare"], + "cacheableOperations": ["build", "test", "lint", "package", "prep"], + "strictlyOrderedTargets": ["build", "package", "prep"], "accessToken": "NGVmYTkxMmItYzY3OS00MjkxLTk1ZDktZDFmYTFmNmVlNGY4fHJlYWQ=", "canTrackAnalytics": false, "showUsageWarnings": true diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index 2e526c1189db..3915c80a8e3a 100644 --- a/code/presets/html-webpack/package.json +++ b/code/presets/html-webpack/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/core-webpack": "7.0.0-alpha.23", diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index 4d2c10c6dcb5..5370b851f84b 100644 --- a/code/presets/preact-webpack/package.json +++ b/code/presets/preact-webpack/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/plugin-transform-react-jsx": "^7.12.12", diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index c66cdc4a4d27..ccf5f3ac4831 100644 --- a/code/presets/react-webpack/package.json +++ b/code/presets/react-webpack/package.json @@ -68,7 +68,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/preset-flow": "^7.12.1", diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index 3ee7e60d78d7..eb39d659a386 100644 --- a/code/presets/server-webpack/package.json +++ b/code/presets/server-webpack/package.json @@ -52,7 +52,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/core-server": "7.0.0-alpha.23", diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index 0e35f3c10267..42951b02af8c 100644 --- a/code/presets/svelte-webpack/package.json +++ b/code/presets/svelte-webpack/package.json @@ -62,7 +62,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/core-webpack": "7.0.0-alpha.23", diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json index 8daa0e231231..7443bc21291b 100644 --- a/code/presets/vue-webpack/package.json +++ b/code/presets/vue-webpack/package.json @@ -57,7 +57,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/core-webpack": "7.0.0-alpha.23", diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index e7af72e400ed..b37b5a2720de 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -58,7 +58,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/core-webpack": "7.0.0-alpha.23", diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json index de13d64d7930..335e8b941b16 100644 --- a/code/presets/web-components-webpack/package.json +++ b/code/presets/web-components-webpack/package.json @@ -49,7 +49,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@babel/plugin-syntax-dynamic-import": "^7.8.3", diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index 4b80d58847c1..6a1482b02cdc 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index dd8deb91e123..163270d82fcf 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 0c32507e4e66..4ec41fabc55e 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -48,7 +48,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index d2d8e7202ada..829f4de94f2f 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 1a4f1faad951..965f142203dd 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -51,7 +51,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index 643e46a820a9..c18d6966dbe5 100644 --- a/code/renderers/vue/package.json +++ b/code/renderers/vue/package.json @@ -47,7 +47,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index ce52c5909256..f46c603c6567 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -48,7 +48,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index 80bf973d5d9d..278830d14195 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -49,7 +49,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prepare": "../../../scripts/prepare/bundle.ts" + "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 0ebde0341041..6423dc139641 100755 --- a/scripts/bootstrap.js +++ b/scripts/bootstrap.js @@ -74,9 +74,9 @@ function run() { defaultValue: true, option: '--prep', command: () => { - log.info(prefix, 'prepare'); + log.info(prefix, 'prep'); spawn( - `nx run-many --target="prepare" --all --parallel --exclude=@storybook/addon-storyshots,@storybook/addon-storyshots-puppeteer -- --reset` + `nx run-many --target="prep" --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, 'prepare'); + log.info(prefix, 'core'); spawn( - `nx run-many --target=prepare --all --parallel --only-failed ${ + `nx run-many --target="prep" --all --parallel --only-failed ${ process.env.CI ? `--max-parallel=${maxConcurrentTasks}` : '' }` ); @@ -131,7 +131,7 @@ function run() { command: () => { log.info(prefix, 'build'); spawn( - `nx run-many --target="prepare" --all --parallel=8 ${ + `nx run-many --target="prep" --all --parallel=8 ${ process.env.CI ? `--max-parallel=${maxConcurrentTasks}` : '' } -- --reset --optimized` ); From 8bccb081990400607fb0747a238732c07f760be9 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 16:36:22 +0800 Subject: [PATCH 3/7] Build: Remove unused bootstrap --cleanup --- code/package.json | 2 - code/yarn.lock | 124 ++----------------------------------------- scripts/bootstrap.js | 11 +--- 3 files changed, 5 insertions(+), 132 deletions(-) diff --git a/code/package.json b/code/package.json index 3a07e408d349..f16fe38ec2e5 100644 --- a/code/package.json +++ b/code/package.json @@ -59,7 +59,6 @@ "changelog": "pr-log --sloppy --cherry-pick", "changelog:next": "pr-log --sloppy --since-prerelease", "check": "NODE_ENV=production node ../scripts/check-package.js", - "clean:dist": "del **/dist", "coverage": "codecov", "create-built-sandboxes-index": "ts-node ../scripts/create-built-sandboxes-index", "danger": "danger", @@ -276,7 +275,6 @@ "core-js": "^3.21.1", "cross-env": "^7.0.3", "danger": "^10.6.2", - "del-cli": "^4.0.1", "detect-port": "^1.3.0", "dts-bundle-generator": "^6.2.0", "ejs-lint": "^1.2.2", diff --git a/code/yarn.lock b/code/yarn.lock index dbe50caa9955..76e37da4c9d9 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -9014,7 +9014,6 @@ __metadata: cross-env: ^7.0.3 cypress: 8.7.0 danger: ^10.6.2 - del-cli: ^4.0.1 detect-port: ^1.3.0 dts-bundle-generator: ^6.2.0 ejs-lint: ^1.2.2 @@ -15633,18 +15632,6 @@ __metadata: languageName: node linkType: hard -"camelcase-keys@npm:^7.0.0": - version: 7.0.2 - resolution: "camelcase-keys@npm:7.0.2" - dependencies: - camelcase: ^6.3.0 - map-obj: ^4.1.0 - quick-lru: ^5.1.1 - type-fest: ^1.2.1 - checksum: ae86a51168643e9e8a2f2c7bfa17850729979ec3dafc5253056a7d97931cbb0e3ef5b4185e59d54b7a56c54405dee2874b0c82033498d8626e512ff9034cb05c - languageName: node - linkType: hard - "camelcase@npm:^2.0.0": version: 2.1.1 resolution: "camelcase@npm:2.1.1" @@ -15666,7 +15653,7 @@ __metadata: languageName: node linkType: hard -"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0, camelcase@npm:^6.2.1, camelcase@npm:^6.3.0": +"camelcase@npm:^6.0.0, camelcase@npm:^6.2.0, camelcase@npm:^6.2.1": version: 6.3.0 resolution: "camelcase@npm:6.3.0" checksum: 0d701658219bd3116d12da3eab31acddb3f9440790c0792e0d398f0a520a6a4058018e546862b6fba89d7ae990efaeb97da71e1913e9ebf5a8b5621a3d55c710 @@ -18202,13 +18189,6 @@ __metadata: languageName: node linkType: hard -"decamelize@npm:^5.0.0": - version: 5.0.1 - resolution: "decamelize@npm:5.0.1" - checksum: 3da71022bc1e85487810fa0833138effb599fa331ca21e179650e93a765d0c4dabeb1ecdd6ad1474fa0bacd2457953c63ea335afb6e53b35f2b4bf779514e2a3 - languageName: node - linkType: hard - "decimal.js@npm:^10.2.1, decimal.js@npm:^10.3.1": version: 10.3.1 resolution: "decimal.js@npm:10.3.1" @@ -18482,19 +18462,6 @@ __metadata: languageName: node linkType: hard -"del-cli@npm:^4.0.1": - version: 4.0.1 - resolution: "del-cli@npm:4.0.1" - dependencies: - del: ^6.0.0 - meow: ^10.1.0 - bin: - del: cli.js - del-cli: cli.js - checksum: 01d314de214e7d96159f99d385186d90a71e0494a9262d98b8da15d144a22b894e0fae4d99d7c707cf3a50990f0513263c0e5b5b72ce5ad92f1ab1c7140e0f70 - languageName: node - linkType: hard - "del@npm:^2.2.0": version: 2.2.2 resolution: "del@npm:2.2.2" @@ -25373,13 +25340,6 @@ __metadata: languageName: node linkType: hard -"indent-string@npm:^5.0.0": - version: 5.0.0 - resolution: "indent-string@npm:5.0.0" - checksum: 8ee77b57d92e71745e133f6f444d6fa3ed503ad0e1bcd7e80c8da08b42375c07117128d670589725ed07b1978065803fa86318c309ba45415b7fe13e7f170220 - languageName: node - linkType: hard - "infer-owner@npm:^1.0.3, infer-owner@npm:^1.0.4": version: 1.0.4 resolution: "infer-owner@npm:1.0.4" @@ -30285,7 +30245,7 @@ __metadata: languageName: node linkType: hard -"map-obj@npm:^4.0.0, map-obj@npm:^4.1.0": +"map-obj@npm:^4.0.0": version: 4.3.0 resolution: "map-obj@npm:4.3.0" checksum: 1c19e1c88513c8abdab25c316367154c6a0a6a0f77e3e8c391bb7c0e093aefed293f539d026dc013d86219e5e4c25f23b0003ea588be2101ccd757bacc12d43b @@ -30841,26 +30801,6 @@ __metadata: languageName: node linkType: hard -"meow@npm:^10.1.0": - version: 10.1.3 - resolution: "meow@npm:10.1.3" - dependencies: - "@types/minimist": ^1.2.2 - camelcase-keys: ^7.0.0 - decamelize: ^5.0.0 - decamelize-keys: ^1.1.0 - hard-rejection: ^2.1.0 - minimist-options: 4.1.0 - normalize-package-data: ^3.0.2 - read-pkg-up: ^8.0.0 - redent: ^4.0.0 - trim-newlines: ^4.0.2 - type-fest: ^1.2.2 - yargs-parser: ^20.2.9 - checksum: 83370487875a4280268fcffc0d979ce4f90c1c020c6f5523890a5aae363712c00e1f692a81a625b289801a1555f8a2a7101521af498ef89de575aab53c54ef24 - languageName: node - linkType: hard - "meow@npm:^3.3.0": version: 3.7.0 resolution: "meow@npm:3.7.0" @@ -31520,7 +31460,7 @@ __metadata: languageName: node linkType: hard -"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1": +"min-indent@npm:^1.0.0": version: 1.0.1 resolution: "min-indent@npm:1.0.1" checksum: 7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c @@ -32702,7 +32642,7 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2": +"normalize-package-data@npm:^3.0.0": version: 3.0.3 resolution: "normalize-package-data@npm:3.0.3" dependencies: @@ -37374,17 +37314,6 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^8.0.0": - version: 8.0.0 - resolution: "read-pkg-up@npm:8.0.0" - dependencies: - find-up: ^5.0.0 - read-pkg: ^6.0.0 - type-fest: ^1.0.1 - checksum: cf3905ccbe5cd602f23192cc7ca65ed17561bab117eadb9aed817441d5bfc6b9a11215c2a3e9505f501d046818f3c4180dbea61fa83c42083e0b4e407d5cc745 - languageName: node - linkType: hard - "read-pkg@npm:^1.0.0": version: 1.1.0 resolution: "read-pkg@npm:1.1.0" @@ -37430,18 +37359,6 @@ __metadata: languageName: node linkType: hard -"read-pkg@npm:^6.0.0": - version: 6.0.0 - resolution: "read-pkg@npm:6.0.0" - dependencies: - "@types/normalize-package-data": ^2.4.0 - normalize-package-data: ^3.0.2 - parse-json: ^5.2.0 - type-fest: ^1.0.1 - checksum: b51ee5eed75324f4fac34c9a40b5e4b403de4c532242be01959c9bbdb1ff9db1c6c2aefaba569622fec49d1ead866e97ba856ab145f6e11039b11f7bec1318ba - languageName: node - linkType: hard - "read@npm:1, read@npm:~1.0.1": version: 1.0.7 resolution: "read@npm:1.0.7" @@ -37652,16 +37569,6 @@ __metadata: languageName: node linkType: hard -"redent@npm:^4.0.0": - version: 4.0.0 - resolution: "redent@npm:4.0.0" - dependencies: - indent-string: ^5.0.0 - strip-indent: ^4.0.0 - checksum: a9b640c8f4b2b5b26a1a908706475ff404dd50a97d6f094bc3c59717be922622927cc7d601d4ae2857d897ad243fd979bd76d751a0481cee8be7024e5fb4c662 - languageName: node - linkType: hard - "redeyed@npm:~1.0.0": version: 1.0.1 resolution: "redeyed@npm:1.0.1" @@ -41185,15 +41092,6 @@ __metadata: languageName: node linkType: hard -"strip-indent@npm:^4.0.0": - version: 4.0.0 - resolution: "strip-indent@npm:4.0.0" - dependencies: - min-indent: ^1.0.1 - checksum: 6b1fb4e22056867f5c9e7a6f3f45922d9a2436cac758607d58aeaac0d3b16ec40b1c43317de7900f1b8dd7a4107352fa47fb960f2c23566538c51e8585c8870e - languageName: node - linkType: hard - "strip-json-comments@npm:^2.0.0, strip-json-comments@npm:~2.0.1": version: 2.0.1 resolution: "strip-json-comments@npm:2.0.1" @@ -42674,13 +42572,6 @@ __metadata: languageName: node linkType: hard -"trim-newlines@npm:^4.0.2": - version: 4.0.2 - resolution: "trim-newlines@npm:4.0.2" - checksum: 48d022e9d14f27cf8b71983691af61cd8ce511d159ed0962452d2fa23f58298398d905e1ff982566f9034f93df3ef676868c1c14d13bcd849e7500dbfbd6101b - languageName: node - linkType: hard - "trim-repeated@npm:^1.0.0": version: 1.0.0 resolution: "trim-repeated@npm:1.0.0" @@ -43103,13 +42994,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^1.0.1, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2": - version: 1.4.0 - resolution: "type-fest@npm:1.4.0" - checksum: a3c0f4ee28ff6ddf800d769eafafcdeab32efa38763c1a1b8daeae681920f6e345d7920bf277245235561d8117dab765cb5f829c76b713b4c9de0998a5397141 - languageName: node - linkType: hard - "type-fest@npm:^2.17.0": version: 2.17.0 resolution: "type-fest@npm:2.17.0" diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 0ebde0341041..c20e1f2bd723 100755 --- a/scripts/bootstrap.js +++ b/scripts/bootstrap.js @@ -95,15 +95,6 @@ function run() { }, order: 1, }), - cleanup: createTask({ - name: `Remove compiled dist directories ${chalk.gray('(cleanup)')}`, - defaultValue: false, - option: '--cleanup', - command: () => { - spawn('npm run clean:dist'); - }, - order: 0, - }), reset: createTask({ name: `Clean repository ${chalk.red('(reset)')}`, defaultValue: false, @@ -161,7 +152,7 @@ function run() { const groups = { main: ['prep', 'core'], buildtasks: ['install', 'build'], - devtasks: ['dev', 'registry', 'cleanup', 'reset'], + devtasks: ['dev', 'registry', 'reset'], }; Object.keys(tasks) From d6c968c42cb13318480f479cd0c1653ff2eb316a Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 17:14:40 +0800 Subject: [PATCH 4/7] Fix unit tests --- code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts | 4 ++-- code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts b/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts index 90a7df8b9b8c..c9087095df63 100644 --- a/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts +++ b/code/lib/cli/src/js-package-manager/Yarn1Proxy.test.ts @@ -27,10 +27,10 @@ describe('Yarn 1 Proxy', () => { yarn1Proxy.setRegistryURL('https://foo.bar'); - expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [ + expect(executeCommandSpy).toHaveBeenCalledWith('npm', [ 'config', 'set', - 'npmRegistryServer', + 'registry', 'https://foo.bar', ]); }); diff --git a/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts b/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts index 93faad9aa82e..561c957257da 100644 --- a/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts +++ b/code/lib/cli/src/js-package-manager/Yarn2Proxy.test.ts @@ -37,10 +37,10 @@ describe('Yarn 2 Proxy', () => { yarn2Proxy.setRegistryURL('https://foo.bar'); - expect(executeCommandSpy).toHaveBeenCalledWith('yarn', [ + expect(executeCommandSpy).toHaveBeenCalledWith('npm', [ 'config', 'set', - 'npmRegistryServer', + 'registry', 'https://foo.bar', ]); }); From 58e361dcc7669865c4d27b75d742027cb2fb6cb2 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 17:40:30 +0800 Subject: [PATCH 5/7] Build: Run verdaccio on 6001 to enable web UI --- .circleci/config.yml | 20 +++++++++---------- code/lib/cli/src/repro-generators/scripts.ts | 2 +- code/package.json | 2 +- docs/contribute/code.md | 2 +- scripts/bootstrap.js | 2 +- .../next-repro-generators/generate-repros.ts | 2 +- scripts/run-e2e.ts | 2 +- scripts/run-registry.ts | 2 +- scripts/utils/serve-packages.ts | 2 +- scripts/utils/yarn.ts | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b384479d14ed..18ad245f250b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -195,13 +195,13 @@ jobs: name: running local registry command: | cd code - yarn local-registry --port 6000 --open + yarn local-registry --port 6001 --open background: true - run: name: Wait for registry command: | cd code - yarn wait-on http://localhost:6000 + yarn wait-on http://localhost:6001 - run: name: Run E2E (extended) tests command: | @@ -225,13 +225,13 @@ jobs: name: Running local registry command: | cd code - yarn local-registry --port 6000 --open + yarn local-registry --port 6001 --open background: true - run: name: Wait for registry command: | cd code - yarn wait-on http://localhost:6000 + yarn wait-on http://localhost:6001 - run: name: Run E2E (core) tests # Do not test CRA here because it's done in PnP part @@ -265,11 +265,11 @@ jobs: # at: . # - run: # name: Running local registry - # command: yarn local-registry --port 6000 --open + # command: yarn local-registry --port 6001 --open # background: true # - run: # name: Wait for registry - # command: yarn wait-on http://localhost:6000 + # command: yarn wait-on http://localhost:6001 # - run: # name: Run smoke tests # command: yarn test:e2e-framework angular_modern_inline_rendering --test-runner --docs-mode @@ -293,13 +293,13 @@ jobs: name: Running local registry command: | cd code - yarn local-registry --port 6000 --open + yarn local-registry --port 6001 --open background: true - run: name: Wait for registry command: | cd code - yarn wait-on http://localhost:6000 + yarn wait-on http://localhost:6001 - run: name: set up cra repro, skip tests command: | @@ -324,13 +324,13 @@ jobs: name: Running local registry command: | cd code - yarn local-registry --port 6000 --open + yarn local-registry --port 6001 --open background: true - run: name: Wait for registry command: | cd code - yarn wait-on http://localhost:6000 + yarn wait-on http://localhost:6001 - run: name: run e2e tests cra command: | diff --git a/code/lib/cli/src/repro-generators/scripts.ts b/code/lib/cli/src/repro-generators/scripts.ts index 1558be57817c..e08687688109 100644 --- a/code/lib/cli/src/repro-generators/scripts.ts +++ b/code/lib/cli/src/repro-generators/scripts.ts @@ -144,7 +144,7 @@ const installYarn2 = async ({ cwd, pnp, name }: Options) => { const configureYarn2ForE2E = async ({ cwd }: Options) => { const command = [ // ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml) - `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`, + `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6001/" } }'`, // Some required magic to be able to fetch deps from local registry `yarn config set unsafeHttpWhitelist --json '["localhost"]'`, // Disable fallback mode to make sure everything is required correctly diff --git a/code/package.json b/code/package.json index 3a07e408d349..fbf227ee1001 100644 --- a/code/package.json +++ b/code/package.json @@ -75,7 +75,7 @@ "lint:md": "remark -q .", "lint:other": "prettier --write '**/*.{css,html,json,md,yml}'", "lint:package": "sort-package-json", - "local-registry": "ts-node --project=../scripts/tsconfig.json ../scripts/run-registry.ts --port 6000", + "local-registry": "ts-node --project=../scripts/tsconfig.json ../scripts/run-registry.ts --port 6001", "publish-repros": "ts-node ../scripts/next-repro-generators/publish.ts", "publish:debug": "npm run publish:latest -- --npm-tag=debug --no-push", "publish:latest": "lerna publish --exact --concurrency 1 --force-publish", diff --git a/docs/contribute/code.md b/docs/contribute/code.md index 0aca843f604c..a6c596d709e0 100644 --- a/docs/contribute/code.md +++ b/docs/contribute/code.md @@ -101,7 +101,7 @@ Unit tests ensure that Storybook doesn't break accidentally. If your code can re Storybook's monorepo is set up to rely on end-to-end testing with [Cypress](https://www.cypress.io/) during CI. To help with testing, we encourage running this test suite before submitting your contribution. Detailed below are some steps you can take: 1. Ensure you have Storybook successfully built in your local branch (i.e., run `yarn bootstrap --core`) -2. Open a terminal and run `yarn local-registry --port 6000 --open --publish` to publish Storybook's packages into a local registry. +2. Open a terminal and run `yarn local-registry --port 6001 --open --publish` to publish Storybook's packages into a local registry. 3. In a second terminal, set up a reproduction using the local registry and run the Cypress tests with `yarn test:e2e-framework`. ## Submit a pull request diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 0ebde0341041..928a8bb803ca 100755 --- a/scripts/bootstrap.js +++ b/scripts/bootstrap.js @@ -143,7 +143,7 @@ function run() { defaultValue: false, option: '--reg', command: () => { - spawn('yarn local-registry --publish --open --port 6000'); + spawn('yarn local-registry --publish --open --port 6001'); }, order: 11, }), diff --git a/scripts/next-repro-generators/generate-repros.ts b/scripts/next-repro-generators/generate-repros.ts index d22b0728cc9d..89c3d66df9c5 100755 --- a/scripts/next-repro-generators/generate-repros.ts +++ b/scripts/next-repro-generators/generate-repros.ts @@ -29,7 +29,7 @@ const sbInit = async (cwd: string) => { await runCommand(`${sbCliBinaryPath} init --yes`, { cwd, env }); }; -const LOCAL_REGISTRY_URL = 'http://localhost:6000'; +const LOCAL_REGISTRY_URL = 'http://localhost:6001'; const withLocalRegistry = async (packageManager: JsPackageManager, action: () => Promise) => { const prevUrl = packageManager.getRegistryURL(); try { diff --git a/scripts/run-e2e.ts b/scripts/run-e2e.ts index 8e629914fbf4..e25504aeb0c1 100644 --- a/scripts/run-e2e.ts +++ b/scripts/run-e2e.ts @@ -163,7 +163,7 @@ const runTests = async ({ name, ...rest }: Parameters) => { targetFolder, `--renderer ${options.renderer}`, `--template ${options.name}`, - `--registry http://localhost:6000`, + `--registry http://localhost:6001`, '--e2e', ]; diff --git a/scripts/run-registry.ts b/scripts/run-registry.ts index 44cf43c8b86f..4837e5fa1112 100755 --- a/scripts/run-registry.ts +++ b/scripts/run-registry.ts @@ -43,7 +43,7 @@ const startVerdaccio = (port: number): Promise => { }); }; - startVerdaccioServer(config, 6000, cache, '1.0.0', 'verdaccio', onReady); + startVerdaccioServer(config, 6001, cache, '1.0.0', 'verdaccio', onReady); }), new Promise((_, rej) => { setTimeout(() => { diff --git a/scripts/utils/serve-packages.ts b/scripts/utils/serve-packages.ts index cba7ae8f98f5..58dd5adc9986 100644 --- a/scripts/utils/serve-packages.ts +++ b/scripts/utils/serve-packages.ts @@ -14,7 +14,7 @@ export async function servePackages({ dryRun, debug }: { dryRun?: boolean; debug // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); - await exec('yarn wait-on http://localhost:6000', { cwd: codeDir }, { dryRun, debug }); + await exec('yarn wait-on http://localhost:6001', { cwd: codeDir }, { dryRun, debug }); return controller; } diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts index fc8f95732bcf..948fd77acfb4 100644 --- a/scripts/utils/yarn.ts +++ b/scripts/utils/yarn.ts @@ -50,7 +50,7 @@ export const configureYarn2ForVerdaccio = async ({ cwd, dryRun, debug }: YarnOpt `yarn config set enableGlobalCache false`, `yarn config set enableMirror false`, // ⚠️ Need to set registry because Yarn 2 is not using the conf of Yarn 1 (URL is hardcoded in CircleCI config.yml) - `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6000/" } }'`, + `yarn config set npmScopes --json '{ "storybook": { "npmRegistryServer": "http://localhost:6001/" } }'`, // Some required magic to be able to fetch deps from local registry `yarn config set unsafeHttpWhitelist --json '["localhost"]'`, // Disable fallback mode to make sure everything is required correctly From 47fc954b5945f08a85b527bcb9cd4eb1c780719c Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 18:51:22 +0800 Subject: [PATCH 6/7] Build: Fix yarn build to use new prep script --- scripts/build-package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build-package.js b/scripts/build-package.js index f9df57b1f7c2..70468be2e0ea 100644 --- 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.prepare; + const commmand = (await readJSON(resolve(v.location, 'package.json'))).scripts.prep; const cwd = resolve(__dirname, '..', 'code', v.location); const sub = require('execa').command( `${commmand}${watchMode ? ' --watch' : ''}${prodMode ? ' --optimized' : ''}`, From 95679f0ab8058315bdf660a4fd11e9ca3dacc25e Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 22 Aug 2022 20:01:07 +0800 Subject: [PATCH 7/7] Revert "Build: Rename prepare to prep for npm8 and verdaccio" --- code/addons/a11y/package.json | 2 +- code/addons/actions/package.json | 2 +- code/addons/backgrounds/package.json | 2 +- code/addons/controls/package.json | 2 +- code/addons/docs/package.json | 2 +- code/addons/essentials/package.json | 2 +- code/addons/highlight/package.json | 2 +- code/addons/interactions/package.json | 2 +- code/addons/jest/package.json | 2 +- code/addons/links/package.json | 2 +- code/addons/measure/package.json | 2 +- code/addons/outline/package.json | 2 +- code/addons/storyshots/storyshots-core/package.json | 2 +- .../storyshots/storyshots-puppeteer/package.json | 2 +- code/addons/storysource/package.json | 2 +- code/addons/toolbars/package.json | 2 +- code/addons/viewport/package.json | 2 +- code/frameworks/angular/package.json | 2 +- code/frameworks/ember/package.json | 2 +- code/frameworks/html-webpack5/package.json | 2 +- code/frameworks/preact-webpack5/package.json | 2 +- code/frameworks/react-webpack5/package.json | 2 +- code/frameworks/server-webpack5/package.json | 2 +- code/frameworks/svelte-webpack5/package.json | 2 +- code/frameworks/vue-webpack5/package.json | 2 +- code/frameworks/vue3-webpack5/package.json | 2 +- code/frameworks/web-components-webpack5/package.json | 2 +- code/lib/addons/package.json | 2 +- code/lib/api/package.json | 2 +- code/lib/blocks/package.json | 2 +- code/lib/builder-manager/package.json | 2 +- code/lib/builder-webpack5/package.json | 2 +- code/lib/channel-postmessage/package.json | 2 +- code/lib/channel-websocket/package.json | 2 +- code/lib/channels/package.json | 2 +- code/lib/cli-sb/package.json | 2 +- code/lib/cli-storybook/package.json | 2 +- code/lib/cli/package.json | 2 +- code/lib/client-api/package.json | 2 +- code/lib/client-logger/package.json | 2 +- code/lib/codemod/package.json | 2 +- code/lib/components/package.json | 2 +- code/lib/core-client/package.json | 2 +- code/lib/core-common/package.json | 2 +- code/lib/core-events/package.json | 2 +- code/lib/core-server/package.json | 2 +- code/lib/core-webpack/package.json | 2 +- code/lib/csf-tools/package.json | 2 +- code/lib/docs-tools/package.json | 2 +- code/lib/instrumenter/package.json | 2 +- code/lib/node-logger/package.json | 2 +- code/lib/postinstall/package.json | 2 +- code/lib/preview-web/package.json | 2 +- code/lib/router/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/lib/store/package.json | 2 +- code/lib/telemetry/package.json | 2 +- code/lib/theming/package.json | 2 +- code/lib/ui/package.json | 2 +- code/nx.json | 4 ++-- code/presets/html-webpack/package.json | 2 +- code/presets/preact-webpack/package.json | 2 +- code/presets/react-webpack/package.json | 2 +- code/presets/server-webpack/package.json | 2 +- code/presets/svelte-webpack/package.json | 2 +- code/presets/vue-webpack/package.json | 2 +- code/presets/vue3-webpack/package.json | 2 +- code/presets/web-components-webpack/package.json | 2 +- code/renderers/html/package.json | 2 +- code/renderers/preact/package.json | 2 +- code/renderers/react/package.json | 2 +- code/renderers/server/package.json | 2 +- code/renderers/svelte/package.json | 2 +- code/renderers/vue/package.json | 2 +- code/renderers/vue3/package.json | 2 +- code/renderers/web-components/package.json | 2 +- scripts/bootstrap.js | 10 +++++----- 77 files changed, 82 insertions(+), 82 deletions(-) diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index d97bd81bbb88..a2c3e076e0bc 100644 --- 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.23", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index faa3b59edfc9..23d80a5f4b42 100644 --- 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.23", diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 97b407e22c34..40ea81c45637 100644 --- 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.23", diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 32d2119ceafd..65207a7489c0 100644 --- 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.23", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index c30b22d53c3c..16800c0d752e 100644 --- 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", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index 846f8b2f4b65..73167de5b5bf 100644 --- 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.23", diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 38849055a449..0a9290701a2e 100644 --- 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.23", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 46f070e6d98b..785d41066ad8 100644 --- 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", diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index e65f7de67397..df0006d8a35b 100644 --- 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.23", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index 9c79eb620b37..8ef24d9900ab 100644 --- 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.23", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index 3cac2cab0523..d282049ee859 100644 --- 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.23", diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index 62ae398883b9..252956864af8 100644 --- 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.23", diff --git a/code/addons/storyshots/storyshots-core/package.json b/code/addons/storyshots/storyshots-core/package.json index f1f72a6eb038..af13f0ae8f01 100644 --- 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": { diff --git a/code/addons/storyshots/storyshots-puppeteer/package.json b/code/addons/storyshots/storyshots-puppeteer/package.json index 41f26cf315ca..0d07b8325d56 100644 --- 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", diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index ef519a903cf4..3958eda9ff43 100644 --- 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.23", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index ffe656021a93..abd624753148 100644 --- 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.23", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index b238f4c2276c..494790baf732 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -33,7 +33,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index a26cf4117b74..39bbe18c0394 100644 --- 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.23", diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index e87a3f6803c4..b0c91e79887f 100644 --- 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.23", diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index 1822d1741f5a..acd01d03e28e 100644 --- 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.23", diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 1c239bdce89f..286048776544 100644 --- 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.23", diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index 6d712f530a88..d6e17ae59de3 100644 --- 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.23", diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index 4fa0140de499..9e20a2a97374 100644 --- 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.23", diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index 008933b4ae06..07f7f2559ed7 100644 --- 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.23", diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json index 68e58b8436bb..d6d925297e5c 100644 --- 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.23", diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 4c39ba8b92e6..6c79da4ae0b7 100644 --- 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.23", diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index c0c0e4319a16..3c4cab8ccd91 100644 --- 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", diff --git a/code/lib/addons/package.json b/code/lib/addons/package.json index a1d76ac3806c..187113cf715d 100644 --- 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.23", diff --git a/code/lib/api/package.json b/code/lib/api/package.json index 1618eb1da563..1c9b2febb979 100644 --- 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.23", diff --git a/code/lib/blocks/package.json b/code/lib/blocks/package.json index 0db0297d51cd..1f21556295cb 100644 --- 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.23", diff --git a/code/lib/builder-manager/package.json b/code/lib/builder-manager/package.json index 24704eadf436..c8e6cb127058 100644 --- 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", diff --git a/code/lib/builder-webpack5/package.json b/code/lib/builder-webpack5/package.json index 923676097261..d9830c9e0ad2 100644 --- 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", diff --git a/code/lib/channel-postmessage/package.json b/code/lib/channel-postmessage/package.json index 6c0562994807..e5bcb84738b2 100644 --- 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.23", diff --git a/code/lib/channel-websocket/package.json b/code/lib/channel-websocket/package.json index d2d0939d1cea..5e30e9824d39 100644 --- 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.23", diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json index e62c92dea5ec..03ec73f71529 100644 --- 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", diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index 66825de3933d..080e6875a0c3 100644 --- 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.23" diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 315e919d36e0..1886f6f489c5 100644 --- 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.23" diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index ce0e33dc7098..aa0f7b2d3629 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -42,7 +42,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js", + "prepare": "node ../../../scripts/prepare.js", "test": "jest test/**/*.test.js" }, "dependencies": { diff --git a/code/lib/client-api/package.json b/code/lib/client-api/package.json index 2f6e81d285c6..ef06c7f2fb6c 100644 --- 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.23", diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json index c43f9eccb998..037bf42779ff 100644 --- a/code/lib/client-logger/package.json +++ b/code/lib/client-logger/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "core-js": "^3.8.2", diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index b5b9f08bdbca..adf008272108 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -39,7 +39,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "@babel/types": "^7.12.11", diff --git a/code/lib/components/package.json b/code/lib/components/package.json index a85970d5c47b..c9618e7376c7 100644 --- 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.23", diff --git a/code/lib/core-client/package.json b/code/lib/core-client/package.json index 8aaed9af2aa8..08e1b9fa7f39 100644 --- 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.23", diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index cd55e328ddbb..cee7e43afc6f 100644 --- 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", diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json index c2c68017425b..20c3cdc40962 100644 --- 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" diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 33d22c282a57..c19aa724f6db 100644 --- 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", diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index b071050ac8b8..22dcc683ee62 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -31,7 +31,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/core-common": "7.0.0-alpha.23", diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index 30a20528ea6e..fb621f5b03db 100644 --- 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", diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index e9974a51e512..608443b30cf9 100644 --- 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", diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index a58e3cae957a..207d4f6d1809 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json index 7fb2cfd000d8..d348092f81fd 100644 --- 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", diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json index fe6f1e4d67b7..5060bc7a7671 100644 --- 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" diff --git a/code/lib/preview-web/package.json b/code/lib/preview-web/package.json index 9295852a3f5c..75cec5a954df 100644 --- a/code/lib/preview-web/package.json +++ b/code/lib/preview-web/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/router/package.json b/code/lib/router/package.json index 033b17399e15..66d1d77964fd 100644 --- 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.23", diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index a231d7551a57..8f90c2803ffd 100644 --- 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.23", diff --git a/code/lib/store/package.json b/code/lib/store/package.json index d0d9b718cab0..485186f4624b 100644 --- a/code/lib/store/package.json +++ b/code/lib/store/package.json @@ -38,7 +38,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "node ../../../scripts/prepare.js" + "prepare": "node ../../../scripts/prepare.js" }, "dependencies": { "@storybook/addons": "7.0.0-alpha.23", diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index 2cf4b20c898a..5a67a53c9bb0 100644 --- 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.23", diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index e5b9163b78dd..857fe573f008 100644 --- 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.23", diff --git a/code/lib/ui/package.json b/code/lib/ui/package.json index 47f0b8ba91ef..f3f7ac9366eb 100644 --- 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", diff --git a/code/nx.json b/code/nx.json index 249f9a30decc..238750d72cae 100644 --- 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 diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index 3915c80a8e3a..2e526c1189db 100644 --- 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.23", diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index 5370b851f84b..4d2c10c6dcb5 100644 --- 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", diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index ccf5f3ac4831..c66cdc4a4d27 100644 --- 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", diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index eb39d659a386..3ee7e60d78d7 100644 --- 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.23", diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index 42951b02af8c..0e35f3c10267 100644 --- 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.23", diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json index 7443bc21291b..8daa0e231231 100644 --- 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.23", diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index b37b5a2720de..e7af72e400ed 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -58,7 +58,7 @@ ], "scripts": { "check": "tsc --noEmit", - "prep": "../../../scripts/prepare/bundle.ts" + "prepare": "../../../scripts/prepare/bundle.ts" }, "dependencies": { "@storybook/core-webpack": "7.0.0-alpha.23", diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json index 335e8b941b16..de13d64d7930 100644 --- 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", diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index 6a1482b02cdc..4b80d58847c1 100644 --- 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.23", diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 163270d82fcf..dd8deb91e123 100644 --- 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.23", diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 4ec41fabc55e..0c32507e4e66 100644 --- 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.23", diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index 829f4de94f2f..d2d8e7202ada 100644 --- 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.23", diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 965f142203dd..1a4f1faad951 100644 --- 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.23", diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index c18d6966dbe5..643e46a820a9 100644 --- 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.23", diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index f46c603c6567..ce52c5909256 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/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.23", diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index 278830d14195..80bf973d5d9d 100644 --- 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.23", diff --git a/scripts/bootstrap.js b/scripts/bootstrap.js index 43473a086530..4fc16a11063d 100755 --- 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, 'core'); + 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` );