From e83716a132157fbb427faee86b3b790f076e237a Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 19 Apr 2023 17:55:25 +0800 Subject: [PATCH 01/76] New benchmark task WIP --- scripts/bench/browse.ts | 54 ++++++++++++++++++++++++++++++++++++ scripts/bench/config.ts | 7 +++++ scripts/bench/index.ts | 3 ++ scripts/bench/types.ts | 40 ++++++++++++++++++++++++++ scripts/package.json | 1 + scripts/task.ts | 4 +++ scripts/tasks/bench-build.ts | 18 ++++++++++++ scripts/tasks/bench-dev.ts | 9 ++++++ scripts/tasks/build.ts | 16 +++++++++-- scripts/yarn.lock | 21 ++++++++++++++ 10 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 scripts/bench/browse.ts create mode 100644 scripts/bench/config.ts create mode 100644 scripts/bench/index.ts create mode 100644 scripts/bench/types.ts create mode 100644 scripts/tasks/bench-build.ts create mode 100644 scripts/tasks/bench-dev.ts diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts new file mode 100644 index 000000000000..6103cc47e70e --- /dev/null +++ b/scripts/bench/browse.ts @@ -0,0 +1,54 @@ +/* eslint-disable no-await-in-loop */ +import type { Page, FrameLocator } from 'playwright'; +import { chromium } from 'playwright'; + +import type { Config } from './config'; + +const now = () => new Date().getTime(); +const TIMEOUT = 20000; + +export const browse = async (url: string, config: Config) => { + if (!config.managerLoaded && !config.previewLoadedText) return undefined; + + const start = now(); + let managerLoaded; + let previewLoaded; + + const browser = await chromium.launch(/* { headless: false } */); + const page = await browser.newPage(); + page.on('console', (msg: any) => { + const type = msg.type(); + console.log(type, msg.text()); + }); + + await page.goto(url); + + if (config.managerLoaded) { + await page.waitForSelector(config.managerLoaded, { state: 'attached' }); + managerLoaded = now() - start; + console.log('manager', new Date(), config.managerLoaded, managerLoaded); + } + + if (config.previewLoadedText) { + let previewFrame: FrameLocator | Page; + previewFrame = page; + if (config.previewFrameLocator) { + previewFrame = await page.frameLocator(config.previewFrameLocator); + } + + let actualText; + while (now() - start < TIMEOUT && (!actualText || !actualText.length)) { + const preview = await previewFrame.getByText(config.previewLoadedText); + actualText = await preview.innerText(); + } + console.log({ actualText }); + if (!actualText?.includes(config.previewLoadedText)) { + throw new Error('previewLoadedText not found'); + } + previewLoaded = now() - start; + console.log('preview', new Date(), config.previewLoadedText, previewLoaded); + } + + await browser.close(); + return { managerLoaded, previewLoaded }; +}; diff --git a/scripts/bench/config.ts b/scripts/bench/config.ts new file mode 100644 index 000000000000..916313aaf142 --- /dev/null +++ b/scripts/bench/config.ts @@ -0,0 +1,7 @@ +import type { Config } from './types'; + +export const storybookConfig: Config = { + managerLoaded: '.sidebar-header', + previewFrameLocator: '#storybook-preview-iframe', + previewLoadedText: 'Button', +}; diff --git a/scripts/bench/index.ts b/scripts/bench/index.ts new file mode 100644 index 000000000000..ede4dc7deeee --- /dev/null +++ b/scripts/bench/index.ts @@ -0,0 +1,3 @@ +export * from './types'; +export * from './config'; +export { browse } from './browse'; diff --git a/scripts/bench/types.ts b/scripts/bench/types.ts new file mode 100644 index 000000000000..31c5875d170b --- /dev/null +++ b/scripts/bench/types.ts @@ -0,0 +1,40 @@ +export interface BenchResults { + branch: string; + commit: string; + timestamp: string; + label: string; + installTime: number; + installSize: number; + startManagerBuild: number; + startPreviewBuild: number; + startManagerRender: number; + startPreviewRender: number; + buildTime: number; + browseManagerRender: number; + browsePreviewRender: number; + browseSizeTotal: number; + browseSizeManagerTotal: number; + browseSizeManagerVendors: number; + browseSizeManagerUiDll: number; + browseSizePreviewTotal: number; + browseSizePreviewVendors: number; + browseSizePreviewDocsDll: number; +} + +export interface Config { + install?: string; + dev?: string; + devUrl?: string; + build?: string; + serve?: string; + serveUrl?: number; + managerLoaded?: string; + previewFrameLocator?: string; + previewLoadedText?: string; + /** + * If set, wait this amount of time (ms) after the dev server + * starts before starting the browser. Used for Histoire, which + * is incompatible with `wait-on` for some reason. + */ + waitOnTimeout?: number; +} diff --git a/scripts/package.json b/scripts/package.json index e2c3fb8b69b8..406c43194680 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -125,6 +125,7 @@ "npmlog": "^5.0.1", "nx": "^15.4.5", "p-limit": "^3.1.0", + "playwright": "1.32.3", "prettier": "^2.8.0", "pretty-hrtime": "^1.0.0", "process": "^0.11.10", diff --git a/scripts/task.ts b/scripts/task.ts index d945976759f4..7023849d35d8 100644 --- a/scripts/task.ts +++ b/scripts/task.ts @@ -25,6 +25,8 @@ import { testRunnerDev } from './tasks/test-runner-dev'; import { chromatic } from './tasks/chromatic'; import { e2eTestsBuild } from './tasks/e2e-tests-build'; import { e2eTestsDev } from './tasks/e2e-tests-dev'; +import { benchBuild } from './tasks/bench-build'; +import { benchDev } from './tasks/bench-dev'; import { allTemplates as TEMPLATES, @@ -105,6 +107,8 @@ export const tasks = { chromatic, 'e2e-tests': e2eTestsBuild, 'e2e-tests-dev': e2eTestsDev, + 'bench-build': benchBuild, + 'bench-dev': benchDev, }; type TaskKey = keyof typeof tasks; diff --git a/scripts/tasks/bench-build.ts b/scripts/tasks/bench-build.ts new file mode 100644 index 000000000000..0b4b39a2ad69 --- /dev/null +++ b/scripts/tasks/bench-build.ts @@ -0,0 +1,18 @@ +import { PORT } from './serve'; +import type { Task } from '../task'; +import { browse, storybookConfig } from '../bench'; + +export const benchBuild: Task & { port: number } = { + description: 'Run benchmarks against a sandbox in prod mode', + dependsOn: ['serve'], + port: PORT, + async ready() { + return false; + }, + async run() { + const url = `http://localhost:${this.port}?path=/story/example-button--primary`; + console.log({ url }); + const result = await browse(url, storybookConfig); + console.log({ result }); + }, +}; diff --git a/scripts/tasks/bench-dev.ts b/scripts/tasks/bench-dev.ts new file mode 100644 index 000000000000..9a07956f22e9 --- /dev/null +++ b/scripts/tasks/bench-dev.ts @@ -0,0 +1,9 @@ +import { PORT } from './dev'; +import { benchBuild } from './bench-build'; + +export const benchDev: typeof benchBuild = { + ...benchBuild, + description: 'Run e2e tests against a sandbox in dev mode', + dependsOn: ['dev'], + port: PORT, +}; diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index 8f6acedc2322..da902a5cfff3 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -1,7 +1,10 @@ -import { pathExists } from 'fs-extra'; +import { ensureDir, pathExists, writeJSON } from 'fs-extra'; +import { join } from 'path'; import type { Task } from '../task'; import { exec } from '../utils/exec'; +const now = () => new Date().getTime(); + export const build: Task = { description: 'Build the static version of the sandbox', dependsOn: ['sandbox'], @@ -9,6 +12,15 @@ export const build: Task = { return pathExists(builtSandboxDir); }, async run({ sandboxDir }, { dryRun, debug }) { - return exec(`yarn build-storybook --quiet`, { cwd: sandboxDir }, { dryRun, debug }); + const start = now(); + const result = await exec( + `yarn build-storybook --quiet`, + { cwd: sandboxDir }, + { dryRun, debug } + ); + const time = now() - start; + await ensureDir(join(sandboxDir, 'bench')); + await writeJSON(join(sandboxDir, 'bench', 'build.json'), { time }, { spaces: 2 }); + return result; }, }; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 5179a522ed76..8cc44218f8fb 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2898,6 +2898,7 @@ __metadata: npmlog: ^5.0.1 nx: ^15.4.5 p-limit: ^3.1.0 + playwright: 1.32.3 prettier: ^2.8.0 pretty-hrtime: ^1.0.0 process: ^0.11.10 @@ -12159,6 +12160,26 @@ __metadata: languageName: node linkType: hard +"playwright-core@npm:1.32.3": + version: 1.32.3 + resolution: "playwright-core@npm:1.32.3" + bin: + playwright: cli.js + checksum: 8b94feb15084813607abac69ef3d4f78b345bcc89e322706e62c203b79e74096caf499ce4cd4103b1bfc853f17a9ff0573f636dc0ee88f56a5cb6ed18ce55f06 + languageName: node + linkType: hard + +"playwright@npm:1.32.3": + version: 1.32.3 + resolution: "playwright@npm:1.32.3" + dependencies: + playwright-core: 1.32.3 + bin: + playwright: cli.js + checksum: 26a3a8897d1a41cd5d001859521ee44b3ac21618e638d3b2a58615672b2f325a6cdeb614dabc6b120999d8874f260c9786683644b13fe07476d4a3a47fcfff1f + languageName: node + linkType: hard + "please-upgrade-node@npm:^3.2.0": version: 3.2.0 resolution: "please-upgrade-node@npm:3.2.0" From 8c5f6048558afee01faafb25152bec783f6b096e Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 24 Apr 2023 23:42:19 +0800 Subject: [PATCH 02/76] Upgrade wait-on --- code/package.json | 2 +- code/yarn.lock | 38 ++++++++++++++++++++++++-------------- scripts/package.json | 2 +- scripts/yarn.lock | 40 +++++++++++++++++++++++++--------------- 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/code/package.json b/code/package.json index 65b7ed4d9eb4..082cea2e86d2 100644 --- a/code/package.json +++ b/code/package.json @@ -259,7 +259,7 @@ "util": "^0.12.4", "vite": "^4.0.0", "vite-plugin-turbosnap": "^1.0.1", - "wait-on": "^5.2.1", + "wait-on": "^7.0.1", "zx": "^7.0.3" }, "dependenciesMeta": { diff --git a/code/yarn.lock b/code/yarn.lock index a6b65b41483d..840545cf06ed 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7138,7 +7138,7 @@ __metadata: util: ^0.12.4 vite: ^4.0.0 vite-plugin-turbosnap: ^1.0.1 - wait-on: ^5.2.1 + wait-on: ^7.0.1 zx: ^7.0.3 dependenciesMeta: ejs: @@ -10501,7 +10501,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1, axios@npm:^0.21.2": +"axios@npm:^0.21.2": version: 0.21.4 resolution: "axios@npm:0.21.4" dependencies: @@ -10510,6 +10510,16 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.27.2": + version: 0.27.2 + resolution: "axios@npm:0.27.2" + dependencies: + follow-redirects: ^1.14.9 + form-data: ^4.0.0 + checksum: 76d673d2a90629944b44d6f345f01e58e9174690f635115d5ffd4aca495d99bcd8f95c590d5ccb473513f5ebc1d1a6e8934580d0c57cdd0498c3a101313ef771 + languageName: node + linkType: hard + "axios@npm:^1.0.0": version: 1.3.4 resolution: "axios@npm:1.3.4" @@ -15739,7 +15749,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -19338,7 +19348,7 @@ __metadata: languageName: node linkType: hard -"joi@npm:^17.3.0": +"joi@npm:^17.7.0": version: 17.9.1 resolution: "joi@npm:17.9.1" dependencies: @@ -21926,7 +21936,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 @@ -26567,7 +26577,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.1, rxjs@npm:^7.5.5": +"rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0": version: 7.8.0 resolution: "rxjs@npm:7.8.0" dependencies: @@ -30246,18 +30256,18 @@ __metadata: languageName: node linkType: hard -"wait-on@npm:^5.2.1": - version: 5.3.0 - resolution: "wait-on@npm:5.3.0" +"wait-on@npm:^7.0.1": + version: 7.0.1 + resolution: "wait-on@npm:7.0.1" dependencies: - axios: ^0.21.1 - joi: ^17.3.0 + axios: ^0.27.2 + joi: ^17.7.0 lodash: ^4.17.21 - minimist: ^1.2.5 - rxjs: ^6.6.3 + minimist: ^1.2.7 + rxjs: ^7.8.0 bin: wait-on: bin/wait-on - checksum: 5ca740e3f2cf4f73ebd2787ff15f7b8d0ee99f188dd37aae0a7d116ae9837f04b8752e4306218aee5165ca4e37cfd3c5b114627748e465e46f8cd51af0da1790 + checksum: 2a9c56d26dac573e6bfd36e85d99f072021c23dc2c0faab900a411460b58e16982b96b018d9168c366040f56196314fa46f3d79ef19e3dc38f55824d5035f2ec languageName: node linkType: hard diff --git a/scripts/package.json b/scripts/package.json index 406c43194680..dd4a78ee55a1 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -151,7 +151,7 @@ "type-fest": "^3.4.0", "typescript": "~4.9.3", "util": "^0.12.4", - "wait-on": "^5.2.1", + "wait-on": "^7.0.1", "window-size": "^1.1.1", "zx": "^7.0.3" }, diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 8cc44218f8fb..7f005efc307a 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2927,7 +2927,7 @@ __metadata: util: ^0.12.4 verdaccio: ^5.19.1 verdaccio-auth-memory: ^10.2.0 - wait-on: ^5.2.1 + wait-on: ^7.0.1 window-size: ^1.1.1 zx: ^7.0.3 dependenciesMeta: @@ -4625,7 +4625,7 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.21.1, axios@npm:^0.21.2": +"axios@npm:^0.21.2": version: 0.21.4 resolution: "axios@npm:0.21.4" dependencies: @@ -4634,6 +4634,16 @@ __metadata: languageName: node linkType: hard +"axios@npm:^0.27.2": + version: 0.27.2 + resolution: "axios@npm:0.27.2" + dependencies: + follow-redirects: ^1.14.9 + form-data: ^4.0.0 + checksum: 76d673d2a90629944b44d6f345f01e58e9174690f635115d5ffd4aca495d99bcd8f95c590d5ccb473513f5ebc1d1a6e8934580d0c57cdd0498c3a101313ef771 + languageName: node + linkType: hard + "axios@npm:^1.0.0": version: 1.3.4 resolution: "axios@npm:1.3.4" @@ -7636,7 +7646,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -9865,7 +9875,7 @@ __metadata: languageName: node linkType: hard -"joi@npm:^17.3.0": +"joi@npm:^17.7.0": version: 17.9.1 resolution: "joi@npm:17.9.1" dependencies: @@ -10974,7 +10984,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:^1.1.0, minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 @@ -13270,7 +13280,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^6.5.4, rxjs@npm:^6.6.3": +"rxjs@npm:^6.5.4": version: 6.6.7 resolution: "rxjs@npm:6.6.7" dependencies: @@ -13279,7 +13289,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.1": +"rxjs@npm:^7.5.1, rxjs@npm:^7.8.0": version: 7.8.0 resolution: "rxjs@npm:7.8.0" dependencies: @@ -15439,18 +15449,18 @@ __metadata: languageName: node linkType: hard -"wait-on@npm:^5.2.1": - version: 5.3.0 - resolution: "wait-on@npm:5.3.0" +"wait-on@npm:^7.0.1": + version: 7.0.1 + resolution: "wait-on@npm:7.0.1" dependencies: - axios: ^0.21.1 - joi: ^17.3.0 + axios: ^0.27.2 + joi: ^17.7.0 lodash: ^4.17.21 - minimist: ^1.2.5 - rxjs: ^6.6.3 + minimist: ^1.2.7 + rxjs: ^7.8.0 bin: wait-on: bin/wait-on - checksum: 5ca740e3f2cf4f73ebd2787ff15f7b8d0ee99f188dd37aae0a7d116ae9837f04b8752e4306218aee5165ca4e37cfd3c5b114627748e465e46f8cd51af0da1790 + checksum: 2a9c56d26dac573e6bfd36e85d99f072021c23dc2c0faab900a411460b58e16982b96b018d9168c366040f56196314fa46f3d79ef19e3dc38f55824d5035f2ec languageName: node linkType: hard From cbd3646cd8f34c505e527948306da95bb8df2e5c Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Mon, 24 Apr 2023 23:46:50 +0800 Subject: [PATCH 03/76] Save bench results to benchmark-results --- .gitignore | 1 + scripts/bench/index.ts | 1 + scripts/bench/utils.ts | 16 ++++++++++++++++ scripts/tasks/bench-build.ts | 12 ++++++++---- scripts/tasks/bench-dev.ts | 2 +- scripts/tasks/build.ts | 12 ++++++------ scripts/tasks/dev.ts | 13 ++++++++----- scripts/tasks/serve.ts | 3 ++- scripts/typings.d.ts | 1 + 9 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 scripts/bench/utils.ts diff --git a/.gitignore b/.gitignore index c72facf13ace..8630dc138669 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ code/test-results/ code/playwright-results/ code/playwright-report/ code/playwright/.cache/ +code/bench-results/ diff --git a/scripts/bench/index.ts b/scripts/bench/index.ts index ede4dc7deeee..59042055d8cf 100644 --- a/scripts/bench/index.ts +++ b/scripts/bench/index.ts @@ -1,3 +1,4 @@ export * from './types'; export * from './config'; +export * from './utils'; export { browse } from './browse'; diff --git a/scripts/bench/utils.ts b/scripts/bench/utils.ts new file mode 100644 index 000000000000..cc0f5df8c941 --- /dev/null +++ b/scripts/bench/utils.ts @@ -0,0 +1,16 @@ +import { join } from 'path'; +import { ensureDir, writeJSON } from 'fs-extra'; + +export const now = () => new Date().getTime(); + +interface SaveBenchOptions { + key: 'build' | 'dev' | 'bench-build' | 'bench-dev'; + rootDir?: string; +} + +export const saveBench = async (data: any, options: SaveBenchOptions) => { + console.log('save', options.key); + const dirname = join(options.rootDir || process.cwd(), 'bench-results'); + await ensureDir(dirname); + await writeJSON(join(dirname, `${options.key}.json`), data, { spaces: 2 }); +}; diff --git a/scripts/tasks/bench-build.ts b/scripts/tasks/bench-build.ts index 0b4b39a2ad69..1272b5eb33d4 100644 --- a/scripts/tasks/bench-build.ts +++ b/scripts/tasks/bench-build.ts @@ -1,6 +1,7 @@ +import { join } from 'path'; import { PORT } from './serve'; import type { Task } from '../task'; -import { browse, storybookConfig } from '../bench'; +import { browse, saveBench, storybookConfig } from '../bench'; export const benchBuild: Task & { port: number } = { description: 'Run benchmarks against a sandbox in prod mode', @@ -9,10 +10,13 @@ export const benchBuild: Task & { port: number } = { async ready() { return false; }, - async run() { + async run({ codeDir, selectedTask }) { const url = `http://localhost:${this.port}?path=/story/example-button--primary`; - console.log({ url }); const result = await browse(url, storybookConfig); - console.log({ result }); + + await saveBench(result, { + key: selectedTask as 'bench-build' | 'bench-dev', + rootDir: codeDir, + }); }, }; diff --git a/scripts/tasks/bench-dev.ts b/scripts/tasks/bench-dev.ts index 9a07956f22e9..24afbdaa80c2 100644 --- a/scripts/tasks/bench-dev.ts +++ b/scripts/tasks/bench-dev.ts @@ -3,7 +3,7 @@ import { benchBuild } from './bench-build'; export const benchDev: typeof benchBuild = { ...benchBuild, - description: 'Run e2e tests against a sandbox in dev mode', + description: 'Run benchmarks against a sandbox in dev mode', dependsOn: ['dev'], port: PORT, }; diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index da902a5cfff3..2a817fd14234 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -1,9 +1,8 @@ -import { ensureDir, pathExists, writeJSON } from 'fs-extra'; +import { pathExists } from 'fs-extra'; import { join } from 'path'; import type { Task } from '../task'; import { exec } from '../utils/exec'; - -const now = () => new Date().getTime(); +import { now, saveBench } from '../bench'; export const build: Task = { description: 'Build the static version of the sandbox', @@ -11,16 +10,17 @@ export const build: Task = { async ready({ builtSandboxDir }) { return pathExists(builtSandboxDir); }, - async run({ sandboxDir }, { dryRun, debug }) { + async run({ sandboxDir, codeDir }, { dryRun, debug }) { const start = now(); const result = await exec( `yarn build-storybook --quiet`, { cwd: sandboxDir }, { dryRun, debug } ); + const time = now() - start; - await ensureDir(join(sandboxDir, 'bench')); - await writeJSON(join(sandboxDir, 'bench', 'build.json'), { time }, { spaces: 2 }); + await saveBench({ time }, { key: 'build', rootDir: codeDir }); + return result; }, }; diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index a216cc53d923..06b8d5cfa47c 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -1,7 +1,10 @@ import detectFreePort from 'detect-port'; +import { join } from 'path'; +import waitOn from 'wait-on'; import type { Task } from '../task'; import { exec } from '../utils/exec'; +import { now, saveBench } from '../bench'; export const PORT = process.env.STORYBOOK_SERVE_PORT ? parseInt(process.env.STORYBOOK_SERVE_PORT, 10) @@ -17,6 +20,7 @@ export const dev: Task = { async run({ sandboxDir, codeDir, selectedTask }, { dryRun, debug }) { const controller = new AbortController(); const devCommand = `yarn storybook --port ${PORT}${selectedTask === 'dev' ? '' : ' --ci'}`; + const start = now(); exec( devCommand, @@ -26,11 +30,10 @@ export const dev: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); - await exec( - `yarn wait-on http://localhost:${PORT}/iframe.html`, - { cwd: codeDir }, - { dryRun, debug } - ); + await waitOn({ resources: [`http://localhost:${PORT}/iframe.html`], interval: 50 }); + + const time = now() - start; + await saveBench({ time }, { key: 'dev', rootDir: codeDir }); return controller; }, diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts index e191f8a39d7b..167a4c38a870 100644 --- a/scripts/tasks/serve.ts +++ b/scripts/tasks/serve.ts @@ -1,4 +1,5 @@ import detectFreePort from 'detect-port'; +import waitOn from 'wait-on'; import type { Task } from '../task'; import { exec } from '../utils/exec'; @@ -23,7 +24,7 @@ export const serve: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); - await exec(`yarn wait-on http://localhost:${PORT}`, { cwd: codeDir }, { dryRun, debug }); + await waitOn({ resources: [`http://localhost:${PORT}`], interval: 50 }); return controller; }, diff --git a/scripts/typings.d.ts b/scripts/typings.d.ts index 12d9b782fe64..c8256a0f4c1d 100644 --- a/scripts/typings.d.ts +++ b/scripts/typings.d.ts @@ -1 +1,2 @@ declare module 'pretty-hrtime'; +declare module 'wait-on'; \ No newline at end of file From 7d3ff463b9bdeaf380bdbac9321b1e65727eb8a0 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 00:17:36 +0800 Subject: [PATCH 04/76] Add bench tasks to CI --- .circleci/config.yml | 60 ++++++++++++--- code/lib/cli/src/sandbox-templates.ts | 101 +++++++++++++++++--------- package.json | 3 +- scripts/bench/utils.ts | 10 ++- scripts/package.json | 4 +- scripts/task.ts | 6 +- scripts/upload-bench.ts | 17 +++++ 7 files changed, 152 insertions(+), 49 deletions(-) create mode 100644 scripts/upload-bench.ts diff --git a/.circleci/config.yml b/.circleci/config.yml index 169309ba598f..227db6c8ec0b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -523,6 +523,38 @@ jobs: - store_artifacts: # this is where playwright puts more complex stuff path: code/playwright-results/ destination: playwright + bench: + parameters: + parallelism: + type: integer + default: 2 + executor: + class: medium + name: sb_playwright + parallelism: << parameters.parallelism >> + steps: + - git-shallow-clone/checkout_advanced: + clone_options: '--depth 1 --verbose' + - attach_workspace: + at: . + - run: + # NOTE: this assumes that the bench-dev key represents BOTH tasks since they are run at the same time. + # Update if we ever run these separately! + name: Running Dev Bench + command: yarn task --task bench-dev --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit + - run: + name: Running Prod Bench + command: yarn task --task bench-build --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit + - run: + name: Uploading results + command: yarn upload-bench + - report-workflow-on-failure: + template: $(yarn get-template << pipeline.parameters.workflow >> bench-dev) + - store_test_results: + path: test-results + - store_artifacts: # this is where playwright puts more complex stuff + path: code/bench-results/ + destination: bench-results workflows: ci: @@ -601,26 +633,30 @@ workflows: requires: - build - create-sandboxes: - parallelism: 9 + parallelism: 11 requires: - build - build-sandboxes: - parallelism: 9 + parallelism: 11 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 9 + parallelism: 11 requires: - build-sandboxes - e2e-production: - parallelism: 9 + parallelism: 11 requires: - build-sandboxes - e2e-dev: requires: - create-sandboxes - test-runner-production: - parallelism: 9 + parallelism: 11 + requires: + - build-sandboxes + - bench: + parallelism: 2 requires: - build-sandboxes # TODO: reenable once we find out the source of flakyness @@ -658,19 +694,19 @@ workflows: requires: - build - create-sandboxes: - parallelism: 18 + parallelism: 20 requires: - build - build-sandboxes: - parallelism: 18 + parallelism: 20 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 18 + parallelism: 20 requires: - build-sandboxes - e2e-production: - parallelism: 18 + parallelism: 20 requires: - build-sandboxes - e2e-dev: @@ -678,7 +714,11 @@ workflows: requires: - create-sandboxes - test-runner-production: - parallelism: 18 + parallelism: 20 + requires: + - build-sandboxes + - bench: + parallelism: 2 requires: - build-sandboxes # TODO: reenable once we find out the source of flakyness diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index dd92e55e39e1..4274cf2be16f 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -6,8 +6,14 @@ export type SkippableTask = | 'test-runner-dev' | 'chromatic' | 'e2e-tests' - | 'e2e-tests-dev'; -export type TemplateKey = keyof typeof baseTemplates | keyof typeof internalTemplates; + | 'e2e-tests-dev' + | 'bench-dev' + | 'bench-build'; + +export type TemplateKey = + | keyof typeof baseTemplates + | keyof typeof internalTemplates + | keyof typeof benchTemplates; export type Cadence = keyof typeof templatesByCadence; export type Template = { @@ -55,6 +61,7 @@ export type Template = { * such as extend main.js, for setting specific feature flags like storyStoreV7, etc. */ modifications?: { + skipTemplateStories?: boolean; mainConfig?: Partial; }; /** @@ -74,13 +81,13 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'cra/default-ts': { name: 'Create React App (Typescript)', script: 'npx create-react-app . --template typescript', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test'], + skipTasks: ['smoke-test', 'bench-dev', 'bench-build'], expected: { // TODO: change this to @storybook/cra once that package is created framework: '@storybook/react-webpack5', @@ -97,7 +104,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'nextjs/default-js': { name: 'Next.js (JavaScript)', @@ -107,7 +114,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'nextjs/default-ts': { name: 'Next.js (TypeScript)', @@ -117,7 +124,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'react-vite/default-js': { name: 'React Vite (JS)', @@ -127,7 +134,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'react-vite/default-ts': { name: 'React Vite (TS)', @@ -146,7 +153,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'react-webpack/17-ts': { name: 'React 17 Webpack5 (TS)', @@ -156,7 +163,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'solid-vite/default-js': { name: 'SolidJS Vite (JS)', @@ -168,7 +175,7 @@ const baseTemplates = { }, // TODO: remove this once solid-vite framework is released inDevelopment: true, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'solid-vite/default-ts': { name: 'SolidJS Vite (TS)', @@ -180,7 +187,7 @@ const baseTemplates = { }, // TODO: remove this once solid-vite framework is released inDevelopment: true, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'vue3-vite/default-js': { name: 'Vue3 Vite (JS)', @@ -190,7 +197,7 @@ const baseTemplates = { renderer: '@storybook/vue3', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'vue3-vite/default-ts': { name: 'Vue3 Vite (TS)', @@ -200,7 +207,7 @@ const baseTemplates = { renderer: '@storybook/vue3', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'vue2-vite/2.7-js': { name: 'Vue2 Vite (vue 2.7 JS)', @@ -211,7 +218,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'html-webpack/default': { name: 'HTML Webpack5', @@ -221,7 +228,7 @@ const baseTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'html-vite/default-js': { name: 'HTML Vite JS', @@ -232,7 +239,7 @@ const baseTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'html-vite/default-ts': { name: 'HTML Vite TS', @@ -243,7 +250,7 @@ const baseTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', @@ -253,7 +260,7 @@ const baseTemplates = { renderer: '@storybook/svelte', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'svelte-vite/default-ts': { name: 'Svelte Vite (TS)', @@ -264,7 +271,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'angular-cli/default-ts': { name: 'Angular CLI (latest)', @@ -275,7 +282,7 @@ const baseTemplates = { renderer: '@storybook/angular', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'angular-cli/14-ts': { name: 'Angular CLI (Version 14)', @@ -286,7 +293,7 @@ const baseTemplates = { renderer: '@storybook/angular', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'svelte-kit/skeleton-js': { name: 'Svelte Kit (JS)', @@ -297,7 +304,7 @@ const baseTemplates = { renderer: '@storybook/svelte', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'svelte-kit/skeleton-ts': { name: 'Svelte Kit (TS)', @@ -308,7 +315,7 @@ const baseTemplates = { renderer: '@storybook/svelte', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'lit-vite/default-js': { name: 'Lit Vite (JS)', @@ -319,7 +326,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'lit-vite/default-ts': { name: 'Lit Vite (TS)', @@ -330,7 +337,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'vue-cli/default-js': { name: 'Vue-CLI (Default JS)', @@ -341,7 +348,7 @@ const baseTemplates = { builder: '@storybook/builder-webpack5', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'vue-cli/vue2-default-js': { name: 'Vue-CLI (Vue2 JS)', @@ -353,7 +360,7 @@ const baseTemplates = { builder: '@storybook/builder-webpack5', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'preact-webpack5/default-js': { name: 'Preact CLI (Default JS)', @@ -363,7 +370,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'preact-webpack5/default-ts': { name: 'Preact CLI (Default TS)', @@ -373,7 +380,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'preact-vite/default-js': { name: 'Preact Vite (JS)', @@ -383,7 +390,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'preact-vite/default-ts': { name: 'Preact Vite (TS)', @@ -393,7 +400,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'qwik-vite/default-ts': { name: 'Qwik CLI (Default TS)', @@ -406,7 +413,7 @@ const baseTemplates = { builder: 'storybook-framework-qwik', }, // TODO: The community template does not provide standard stories, which is required for e2e tests. - skipTasks: ['e2e-tests', 'e2e-tests-dev'], + skipTasks: ['e2e-tests', 'e2e-tests-dev', 'bench-dev', 'bench-build'], }, } satisfies Record; @@ -451,9 +458,33 @@ const internalTemplates = { // }, } satisfies Record<`internal/${string}`, Template & { isInternal: true }>; +const benchTemplates = { + 'bench/react-vite-default-ts': { + ...baseTemplates['react-vite/default-ts'], + name: 'Bench (react-vite/default-ts)', + isInternal: true, + inDevelopment: true, + modifications: { + skipTemplateStories: true, + }, + skipTasks: ['e2e-tests-dev'], + }, + 'bench/react-webpack-18-ts': { + ...baseTemplates['react-webpack/18-ts'], + name: 'Bench (react-webpack/18-ts)', + isInternal: true, + inDevelopment: true, + modifications: { + skipTemplateStories: true, + }, + skipTasks: ['e2e-tests-dev'], + }, +} satisfies Record<`bench/${string}`, Template & { isInternal: true }>; + export const allTemplates: Record = { ...baseTemplates, ...internalTemplates, + ...benchTemplates, }; export const ci: TemplateKey[] = ['cra/default-ts', 'react-vite/default-ts']; @@ -466,6 +497,8 @@ export const pr: TemplateKey[] = [ 'svelte-vite/default-ts', 'svelte-kit/skeleton-ts', 'nextjs/default-ts', + 'bench/react-vite-default-ts', + 'bench/react-webpack-18-ts', ]; export const merged: TemplateKey[] = [ ...pr, @@ -478,6 +511,8 @@ export const merged: TemplateKey[] = [ 'html-vite/default-ts', 'internal/ssv6-vite', 'internal/ssv6-webpack', + 'bench/react-vite-default-ts', + 'bench/react-webpack-18-ts', ]; export const daily: TemplateKey[] = [ ...merged, diff --git a/package.json b/package.json index 5362f0c2e17d..e938a713fef8 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "start": "yarn task --task dev --template react-vite/default-ts --start-from=install", "task": "echo 'Installing Script Dependencies...'; cd scripts; yarn install >/dev/null; yarn task", "get-template": "cd scripts; yarn get-template", + "upload-bench": "cd scripts; yarn upload-bench", "get-report-message": "cd scripts; yarn get-report-message", "test": "cd code; yarn test", "lint": "cd code; yarn lint", @@ -11,4 +12,4 @@ "pretty-docs": "cd scripts; yarn install >/dev/null; yarn docs:prettier:write" }, "packageManager": "yarn@3.3.0" -} +} \ No newline at end of file diff --git a/scripts/bench/utils.ts b/scripts/bench/utils.ts index cc0f5df8c941..eaff2a27a94c 100644 --- a/scripts/bench/utils.ts +++ b/scripts/bench/utils.ts @@ -1,16 +1,20 @@ import { join } from 'path'; -import { ensureDir, writeJSON } from 'fs-extra'; +import { ensureDir, writeJSON, readJSON } from 'fs-extra'; export const now = () => new Date().getTime(); -interface SaveBenchOptions { +export interface SaveBenchOptions { key: 'build' | 'dev' | 'bench-build' | 'bench-dev'; rootDir?: string; } export const saveBench = async (data: any, options: SaveBenchOptions) => { - console.log('save', options.key); const dirname = join(options.rootDir || process.cwd(), 'bench-results'); await ensureDir(dirname); await writeJSON(join(dirname, `${options.key}.json`), data, { spaces: 2 }); }; + +export const loadBench = async (options: SaveBenchOptions) => { + const dirname = join(options.rootDir || process.cwd(), 'bench-results'); + return readJSON(join(dirname, `${options.key}.json`)); +}; diff --git a/scripts/package.json b/scripts/package.json index dd4a78ee55a1..d50cfebd7543 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -1,3 +1,4 @@ + { "name": "@storybook/scripts", "version": "7.0.0-alpha.16", @@ -14,7 +15,8 @@ "migrate-docs": "node --require esbuild-register ./ts-to-ts49.ts", "task": "ts-node --swc ./task.ts", "test": "jest --config ./jest.config.js", - "upgrade": "ts-node --swc ./task.ts" + "upgrade": "ts-node --swc ./task.ts", + "upload-bench": "ts-node ./upload-bench.ts" }, "husky": { "hooks": { diff --git a/scripts/task.ts b/scripts/task.ts index 7023849d35d8..2d81aaff3cdd 100644 --- a/scripts/task.ts +++ b/scripts/task.ts @@ -302,7 +302,11 @@ async function runTask(task: Task, details: TemplateDetails, optionValues: Passe const { junitFilename } = details; const startTime = new Date(); try { - const controller = await task.run(details, optionValues); + let updatedOptions = optionValues; + if (details.template?.modifications?.skipTemplateStories) { + updatedOptions = { ...optionValues, skipTemplateStories: true }; + } + const controller = await task.run(details, updatedOptions); if (junitFilename && !task.junit) await writeJunitXml(getTaskKey(task), details.key, startTime); diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts new file mode 100644 index 000000000000..6cd4d9c5472a --- /dev/null +++ b/scripts/upload-bench.ts @@ -0,0 +1,17 @@ +import { loadBench } from './bench'; +import type { SaveBenchOptions } from './bench'; + +const uploadBench = async () => { + const keys = ['build', 'dev', 'bench-build', 'bench-dev'] as SaveBenchOptions['key'][]; + // const data = {} as Record; + await Promise.all( + keys.map(async (key) => { + const val = await loadBench({ key, rootDir: '../code' }); + console.log({ key, val }); + }) + ); +}; + +uploadBench().then(() => { + console.log('done'); +}); From 7ad75d9640b67718cc6eb293a92fe1d63ffd13eb Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 00:29:25 +0800 Subject: [PATCH 05/76] Fix scripts package.json --- scripts/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/package.json b/scripts/package.json index d50cfebd7543..4a5850b99815 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -1,4 +1,3 @@ - { "name": "@storybook/scripts", "version": "7.0.0-alpha.16", From ea192ece85d9ddaa2566263c9b857528a3376068 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 00:39:45 +0800 Subject: [PATCH 06/76] update parallelism --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 227db6c8ec0b..746a60e4a358 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -633,26 +633,26 @@ workflows: requires: - build - create-sandboxes: - parallelism: 11 + parallelism: 9 requires: - build - build-sandboxes: - parallelism: 11 + parallelism: 9 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 11 + parallelism: 9 requires: - build-sandboxes - e2e-production: - parallelism: 11 + parallelism: 9 requires: - build-sandboxes - e2e-dev: requires: - create-sandboxes - test-runner-production: - parallelism: 11 + parallelism: 9 requires: - build-sandboxes - bench: @@ -694,19 +694,19 @@ workflows: requires: - build - create-sandboxes: - parallelism: 20 + parallelism: 18 requires: - build - build-sandboxes: - parallelism: 20 + parallelism: 18 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 20 + parallelism: 18 requires: - build-sandboxes - e2e-production: - parallelism: 20 + parallelism: 18 requires: - build-sandboxes - e2e-dev: @@ -714,7 +714,7 @@ workflows: requires: - create-sandboxes - test-runner-production: - parallelism: 20 + parallelism: 18 requires: - build-sandboxes - bench: From 765a5084cfb41fdeb1ae9513d3edb7e4089afc97 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 01:18:05 +0800 Subject: [PATCH 07/76] update bench CI --- .circleci/config.yml | 4 +--- code/lib/cli/src/sandbox-templates.ts | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 746a60e4a358..f73c08c84dba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -544,14 +544,12 @@ jobs: command: yarn task --task bench-dev --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit - run: name: Running Prod Bench - command: yarn task --task bench-build --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit + command: yarn task --task bench-build --template $(yarn get-template << pipeline.parameters.workflow >> bench-build) --no-link --start-from=never --junit - run: name: Uploading results command: yarn upload-bench - report-workflow-on-failure: template: $(yarn get-template << pipeline.parameters.workflow >> bench-dev) - - store_test_results: - path: test-results - store_artifacts: # this is where playwright puts more complex stuff path: code/bench-results/ destination: bench-results diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index 4274cf2be16f..af6aefb295b4 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -144,6 +144,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-vite', }, + skipTasks: ['bench-dev', 'bench-build'], }, 'react-webpack/18-ts': { name: 'React 18 Webpack5 (TS)', From c240afe56feb46913a12bea8f0e435f6b4dbfd67 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 01:58:08 +0800 Subject: [PATCH 08/76] Remove inDevelopment for bench tasks --- code/lib/cli/src/sandbox-templates.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index af6aefb295b4..535b648464a2 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -464,7 +464,6 @@ const benchTemplates = { ...baseTemplates['react-vite/default-ts'], name: 'Bench (react-vite/default-ts)', isInternal: true, - inDevelopment: true, modifications: { skipTemplateStories: true, }, @@ -474,7 +473,6 @@ const benchTemplates = { ...baseTemplates['react-webpack/18-ts'], name: 'Bench (react-webpack/18-ts)', isInternal: true, - inDevelopment: true, modifications: { skipTemplateStories: true, }, From 9a3fa7e4fcb3bfdaed4ee43c7b4a4228437b1821 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 02:03:45 +0800 Subject: [PATCH 09/76] Revert "update parallelism" This reverts commit ea192ece85d9ddaa2566263c9b857528a3376068. --- .circleci/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f73c08c84dba..9b1ca0e1d6ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -631,26 +631,26 @@ workflows: requires: - build - create-sandboxes: - parallelism: 9 + parallelism: 11 requires: - build - build-sandboxes: - parallelism: 9 + parallelism: 11 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 9 + parallelism: 11 requires: - build-sandboxes - e2e-production: - parallelism: 9 + parallelism: 11 requires: - build-sandboxes - e2e-dev: requires: - create-sandboxes - test-runner-production: - parallelism: 9 + parallelism: 11 requires: - build-sandboxes - bench: @@ -692,19 +692,19 @@ workflows: requires: - build - create-sandboxes: - parallelism: 18 + parallelism: 20 requires: - build - build-sandboxes: - parallelism: 18 + parallelism: 20 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 18 + parallelism: 20 requires: - build-sandboxes - e2e-production: - parallelism: 18 + parallelism: 20 requires: - build-sandboxes - e2e-dev: @@ -712,7 +712,7 @@ workflows: requires: - create-sandboxes - test-runner-production: - parallelism: 18 + parallelism: 20 requires: - build-sandboxes - bench: From bcefa032967e907ddbefdcc9350dca7e8296f31d Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 02:11:15 +0800 Subject: [PATCH 10/76] Fix duplicate keys --- code/lib/cli/src/sandbox-templates.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index 535b648464a2..ebb802195626 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -510,8 +510,6 @@ export const merged: TemplateKey[] = [ 'html-vite/default-ts', 'internal/ssv6-vite', 'internal/ssv6-webpack', - 'bench/react-vite-default-ts', - 'bench/react-webpack-18-ts', ]; export const daily: TemplateKey[] = [ ...merged, From abbb3d333c08ccce77fabec6f995b0213ac66659 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 24 Apr 2023 20:32:52 +0200 Subject: [PATCH 11/76] WIP temporarily change branch to next on repro command --- scripts/tasks/sandbox-parts.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index 6fc70ad26d99..23653f0bac00 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -58,7 +58,9 @@ export const create: Task['run'] = async ({ key, template, sandboxDir }, { dryRu } else { await executeCLIStep(steps.repro, { argument: key, - optionValues: { output: sandboxDir, branch: 'main', init: false, debug }, + // TODO: DO NOT MERGE WITH THIS CHANGE + // bring branch back to 'main' + optionValues: { output: sandboxDir, branch: 'next', init: false, debug }, cwd: parentDir, dryRun, debug, From 6865fc5eb1f819660ed41e686e53e744d78eade6 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 24 Apr 2023 21:01:04 +0200 Subject: [PATCH 12/76] fix path --- scripts/tasks/bench-build.ts | 1 - scripts/upload-bench.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/tasks/bench-build.ts b/scripts/tasks/bench-build.ts index 1272b5eb33d4..fc4249d195ea 100644 --- a/scripts/tasks/bench-build.ts +++ b/scripts/tasks/bench-build.ts @@ -1,4 +1,3 @@ -import { join } from 'path'; import { PORT } from './serve'; import type { Task } from '../task'; import { browse, saveBench, storybookConfig } from '../bench'; diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 6cd4d9c5472a..84545caa4757 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -6,7 +6,7 @@ const uploadBench = async () => { // const data = {} as Record; await Promise.all( keys.map(async (key) => { - const val = await loadBench({ key, rootDir: '../code' }); + const val = await loadBench({ key, rootDir: 'code' }); console.log({ key, val }); }) ); From ee01dad73a988e7ac29fbfe8970e15138ff1c061 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 24 Apr 2023 21:02:31 +0200 Subject: [PATCH 13/76] fix path using constant --- scripts/upload-bench.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 84545caa4757..51edfd55ad5f 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -1,3 +1,4 @@ +import { CODE_DIRECTORY } from './utils/constants'; import { loadBench } from './bench'; import type { SaveBenchOptions } from './bench'; @@ -6,7 +7,7 @@ const uploadBench = async () => { // const data = {} as Record; await Promise.all( keys.map(async (key) => { - const val = await loadBench({ key, rootDir: 'code' }); + const val = await loadBench({ key, rootDir: CODE_DIRECTORY }); console.log({ key, val }); }) ); From 205e5fa79de0c1a5387d91d166db96373fe5f5bc Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 24 Apr 2023 22:22:41 +0200 Subject: [PATCH 14/76] add error handling --- scripts/upload-bench.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 51edfd55ad5f..b5b8cc8805a0 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -7,8 +7,12 @@ const uploadBench = async () => { // const data = {} as Record; await Promise.all( keys.map(async (key) => { - const val = await loadBench({ key, rootDir: CODE_DIRECTORY }); - console.log({ key, val }); + try { + const val = await loadBench({ key, rootDir: CODE_DIRECTORY }); + console.log({ key, val }); + } catch (err) { + console.log(`Failed to load bench for the key ${key}:`, err); + } }) ); }; From 9d75abb5bf5945a280502bbe5f3654fc318ed5a7 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 09:41:29 +0800 Subject: [PATCH 15/76] Try writing to the sandbox dir instead of the code dir --- .circleci/config.yml | 4 ++-- scripts/tasks/bench-build.ts | 4 ++-- scripts/tasks/build.ts | 5 ++--- scripts/tasks/dev.ts | 5 ++--- scripts/upload-bench.ts | 12 +++++++++++- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b1ca0e1d6ed..8eb82bb8614b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -544,10 +544,10 @@ jobs: command: yarn task --task bench-dev --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit - run: name: Running Prod Bench - command: yarn task --task bench-build --template $(yarn get-template << pipeline.parameters.workflow >> bench-build) --no-link --start-from=never --junit + command: yarn task --task bench-build --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit - run: name: Uploading results - command: yarn upload-bench + command: yarn upload-bench $(yarn get-template << pipeline.parameters.workflow >> bench-dev) - report-workflow-on-failure: template: $(yarn get-template << pipeline.parameters.workflow >> bench-dev) - store_artifacts: # this is where playwright puts more complex stuff diff --git a/scripts/tasks/bench-build.ts b/scripts/tasks/bench-build.ts index 1272b5eb33d4..a5bb74804108 100644 --- a/scripts/tasks/bench-build.ts +++ b/scripts/tasks/bench-build.ts @@ -10,13 +10,13 @@ export const benchBuild: Task & { port: number } = { async ready() { return false; }, - async run({ codeDir, selectedTask }) { + async run({ sandboxDir, selectedTask }) { const url = `http://localhost:${this.port}?path=/story/example-button--primary`; const result = await browse(url, storybookConfig); await saveBench(result, { key: selectedTask as 'bench-build' | 'bench-dev', - rootDir: codeDir, + rootDir: sandboxDir, }); }, }; diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index 2a817fd14234..8139a197e867 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -1,5 +1,4 @@ import { pathExists } from 'fs-extra'; -import { join } from 'path'; import type { Task } from '../task'; import { exec } from '../utils/exec'; import { now, saveBench } from '../bench'; @@ -10,7 +9,7 @@ export const build: Task = { async ready({ builtSandboxDir }) { return pathExists(builtSandboxDir); }, - async run({ sandboxDir, codeDir }, { dryRun, debug }) { + async run({ sandboxDir }, { dryRun, debug }) { const start = now(); const result = await exec( `yarn build-storybook --quiet`, @@ -19,7 +18,7 @@ export const build: Task = { ); const time = now() - start; - await saveBench({ time }, { key: 'build', rootDir: codeDir }); + await saveBench({ time }, { key: 'build', rootDir: sandboxDir }); return result; }, diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index 06b8d5cfa47c..f630837c3104 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -1,5 +1,4 @@ import detectFreePort from 'detect-port'; -import { join } from 'path'; import waitOn from 'wait-on'; import type { Task } from '../task'; @@ -17,7 +16,7 @@ export const dev: Task = { async ready() { return (await detectFreePort(PORT)) !== PORT; }, - async run({ sandboxDir, codeDir, selectedTask }, { dryRun, debug }) { + async run({ sandboxDir, selectedTask }, { dryRun, debug }) { const controller = new AbortController(); const devCommand = `yarn storybook --port ${PORT}${selectedTask === 'dev' ? '' : ' --ci'}`; const start = now(); @@ -33,7 +32,7 @@ export const dev: Task = { await waitOn({ resources: [`http://localhost:${PORT}/iframe.html`], interval: 50 }); const time = now() - start; - await saveBench({ time }, { key: 'dev', rootDir: codeDir }); + await saveBench({ time }, { key: 'dev', rootDir: sandboxDir }); return controller; }, diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 6cd4d9c5472a..6e72eab41a12 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -1,15 +1,25 @@ +import { copy } from 'fs-extra'; +import { join } from 'path'; import { loadBench } from './bench'; import type { SaveBenchOptions } from './bench'; +import { SANDBOX_DIRECTORY, CODE_DIRECTORY } from './utils/constants'; + +const templateKey = process.argv[2]; + +const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY; +const templateSandboxDir = templateKey && join(sandboxDir, templateKey.replace('/', '-')); const uploadBench = async () => { const keys = ['build', 'dev', 'bench-build', 'bench-dev'] as SaveBenchOptions['key'][]; // const data = {} as Record; await Promise.all( keys.map(async (key) => { - const val = await loadBench({ key, rootDir: '../code' }); + const val = await loadBench({ key, rootDir: templateSandboxDir }); console.log({ key, val }); }) ); + + await copy(`${templateSandboxDir}/bench-results`, `${CODE_DIRECTORY}/bench-results`); }; uploadBench().then(() => { From 329ef4ecffbd2c95346ff97ac18c7bad62cd874e Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Tue, 25 Apr 2023 13:17:59 +0800 Subject: [PATCH 16/76] Upload to bigquery --- package.json | 2 +- scripts/package.json | 1 + scripts/upload-bench.ts | 65 +++++++++- scripts/yarn.lock | 268 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 330 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e938a713fef8..fbcb67fbf8cd 100644 --- a/package.json +++ b/package.json @@ -12,4 +12,4 @@ "pretty-docs": "cd scripts; yarn install >/dev/null; yarn docs:prettier:write" }, "packageManager": "yarn@3.3.0" -} \ No newline at end of file +} diff --git a/scripts/package.json b/scripts/package.json index 4a5850b99815..f4a8a85c6301 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -51,6 +51,7 @@ "@babel/preset-typescript": "^7.18.6", "@babel/types": "^7.20.7", "@emotion/jest": "^11.10.5", + "@google-cloud/bigquery": "^6.2.0", "@jest/globals": "^29.3.1", "@linear/sdk": "^1.22.0", "@nrwl/cli": "^15.4.5", diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 0883ba063033..e3de58cb6c37 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -1,27 +1,90 @@ import { copy } from 'fs-extra'; import { join } from 'path'; +import { BigQuery } from '@google-cloud/bigquery'; + import { loadBench } from './bench'; import type { SaveBenchOptions } from './bench'; import { SANDBOX_DIRECTORY, CODE_DIRECTORY } from './utils/constants'; +import { execaCommand } from './utils/exec'; const templateKey = process.argv[2]; +const GCP_CREDENTIALS = JSON.parse(process.env.GCP_CREDENTIALS || '{}'); const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY; const templateSandboxDir = templateKey && join(sandboxDir, templateKey.replace('/', '-')); +export interface BenchResults { + branch: string; + commit: string; + timestamp: string; + label: string; + installTime: number; + installSize: number; + startManagerBuild: number; + startPreviewBuild: number; + startManagerRender: number; + startPreviewRender: number; + buildTime: number; + browseManagerRender: number; + browsePreviewRender: number; + browseSizeTotal: number; + browseSizeManagerTotal: number; + browseSizeManagerVendors: number; + browseSizeManagerUiDll: number; + browseSizePreviewTotal: number; + browseSizePreviewVendors: number; + browseSizePreviewDocsDll: number; +} + const uploadBench = async () => { const keys = ['build', 'dev', 'bench-build', 'bench-dev'] as SaveBenchOptions['key'][]; - // const data = {} as Record; + const results = {} as Record; + await Promise.all( keys.map(async (key) => { try { const val = await loadBench({ key, rootDir: templateSandboxDir }); + results[key] = val; console.log({ key, val }); } catch (err) { console.log(`Failed to load bench for the key ${key}:`, err); } }) ); + const row = { + branch: + process.env.CIRCLE_BRANCH || (await execaCommand('git rev-parse --abbrev-ref HEAD')).stdout, + commit: process.env.CIRCLE_SHA1 || (await execaCommand('git rev-parse HEAD')).stdout, + timestamp: new Date().toISOString(), + label: templateKey, + installTime: 0, + installSize: 0, + startManagerBuild: 0, + startPreviewBuild: results.dev?.time || 0, + startManagerRender: results['bench-dev']?.managerLoaded || 0, + startPreviewRender: results['bench-dev']?.previewLoaded || 0, + buildTime: results.build?.time || 0, + browseManagerRender: results['bench-build']?.managerLoaded || 0, + browsePreviewRender: results['bench-build']?.previewLoaded || 0, + browseSizeTotal: 0, + browseSizeManagerTotal: 0, + browseSizeManagerVendors: 0, + browseSizeManagerUiDll: 0, + browseSizePreviewTotal: 0, + browseSizePreviewVendors: 0, + browseSizePreviewDocsDll: 0, + } as BenchResults; + + const bigquery = new BigQuery({ + projectId: GCP_CREDENTIALS.project_id, + credentials: GCP_CREDENTIALS, + }); + const dataset = bigquery.dataset('benchmark_results'); + const appTable = dataset.table('bench_new'); + + console.log('inserting', row); + await appTable.insert([row]); + console.log('inserted'); await copy(`${templateSandboxDir}/bench-results`, `${CODE_DIRECTORY}/bench-results`); }; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 7f005efc307a..6290813c0fb6 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -1711,6 +1711,75 @@ __metadata: languageName: node linkType: hard +"@google-cloud/bigquery@npm:^6.2.0": + version: 6.2.0 + resolution: "@google-cloud/bigquery@npm:6.2.0" + dependencies: + "@google-cloud/common": ^4.0.0 + "@google-cloud/paginator": ^4.0.0 + "@google-cloud/precise-date": ^3.0.1 + "@google-cloud/promisify": ^3.0.0 + arrify: ^2.0.1 + big.js: ^6.0.0 + duplexify: ^4.0.0 + extend: ^3.0.2 + is: ^3.3.0 + p-event: ^4.1.0 + readable-stream: ^4.0.0 + stream-events: ^1.0.5 + uuid: ^9.0.0 + checksum: 52989491997d5089ee8fec14ce1f07eb5445f69c2d8eccb766637e7f95e6b975c05e6d22efa4341728fcd48d10fe3430c8c70ba57eff7d770f9f3777db7b31fa + languageName: node + linkType: hard + +"@google-cloud/common@npm:^4.0.0": + version: 4.0.3 + resolution: "@google-cloud/common@npm:4.0.3" + dependencies: + "@google-cloud/projectify": ^3.0.0 + "@google-cloud/promisify": ^3.0.0 + arrify: ^2.0.1 + duplexify: ^4.1.1 + ent: ^2.2.0 + extend: ^3.0.2 + google-auth-library: ^8.0.2 + retry-request: ^5.0.0 + teeny-request: ^8.0.0 + checksum: cedd97e1260c06eb7e3cf1f62b99ff9cdd816f8f750166b29e84aef96380aea4180f2aaa6d2fc99e795f252333bea5ee57ab2e6d151c65cb010fb9fe757c7475 + languageName: node + linkType: hard + +"@google-cloud/paginator@npm:^4.0.0": + version: 4.0.1 + resolution: "@google-cloud/paginator@npm:4.0.1" + dependencies: + arrify: ^2.0.0 + extend: ^3.0.2 + checksum: 90998184454f3f008141c9663025ef51e32bdfa03bc001f93d323b4b520116f1073121bf3ebc637b21928553a3483f9d85b5aaded92b342c29bc872e62ac7c0e + languageName: node + linkType: hard + +"@google-cloud/precise-date@npm:^3.0.1": + version: 3.0.1 + resolution: "@google-cloud/precise-date@npm:3.0.1" + checksum: b3921e35767cb046f7d44d37922393978679559b9adc0c249ce71c14961472dc6d28a4be6a73840a3d4671964c636be09c6e9fa20a157914f3d29757be789ac4 + languageName: node + linkType: hard + +"@google-cloud/projectify@npm:^3.0.0": + version: 3.0.0 + resolution: "@google-cloud/projectify@npm:3.0.0" + checksum: b7309cb8c7565c0fe735f69520e9531f5212a5136fc26b00b9b34cbe9a7dfc4a7c7f9efff9e299dd7dced666865063acc47d22294da4ba79fcfd93429c239d8a + languageName: node + linkType: hard + +"@google-cloud/promisify@npm:^3.0.0": + version: 3.0.1 + resolution: "@google-cloud/promisify@npm:3.0.1" + checksum: b37a7e5797b0cd23d9cc0f171e6e97879d62be7359467a83155339b472eaaed8ffce657cc206a79ca1e6aad66b68718649e7915d9ea52fc61d8fc21589db27f3 + languageName: node + linkType: hard + "@graphql-typed-document-node/core@npm:^3.1.0": version: 3.2.0 resolution: "@graphql-typed-document-node/core@npm:3.2.0" @@ -2822,6 +2891,7 @@ __metadata: "@babel/preset-typescript": ^7.18.6 "@babel/types": ^7.20.7 "@emotion/jest": ^11.10.5 + "@google-cloud/bigquery": ^6.2.0 "@jest/globals": ^29.3.1 "@linear/sdk": ^1.22.0 "@nrwl/cli": ^15.4.5 @@ -4500,6 +4570,13 @@ __metadata: languageName: node linkType: hard +"arrify@npm:^2.0.0, arrify@npm:^2.0.1": + version: 2.0.1 + resolution: "arrify@npm:2.0.1" + checksum: 3fb30b5e7c37abea1907a60b28a554d2f0fc088757ca9bf5b684786e583fdf14360721eb12575c1ce6f995282eab936712d3c4389122682eafab0e0b57f78dbb + languageName: node + linkType: hard + "asn1@npm:~0.2.3": version: 0.2.6 resolution: "asn1@npm:0.2.6" @@ -4819,7 +4896,7 @@ __metadata: languageName: node linkType: hard -"base64-js@npm:^1.3.1": +"base64-js@npm:^1.3.0, base64-js@npm:^1.3.1": version: 1.5.1 resolution: "base64-js@npm:1.5.1" checksum: f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf @@ -4871,6 +4948,20 @@ __metadata: languageName: node linkType: hard +"big.js@npm:^6.0.0": + version: 6.2.1 + resolution: "big.js@npm:6.2.1" + checksum: 87734c70e6c668f3bc29d84e99b8a97392debbea258d260419c847039d63251fddb8675019c751ceb54ae6fa5f796c5221c4c08526b316149b14ad78dc0d7db1 + languageName: node + linkType: hard + +"bignumber.js@npm:^9.0.0": + version: 9.1.1 + resolution: "bignumber.js@npm:9.1.1" + checksum: 950312b15d038ae06028c8a6901fb4efd57fa889ada8c887cebd856e79f2fc9667641bebfb2e2ea4cc694e663fd55c1fe6e62a7e8fe40bbdebdf92269537b802 + languageName: node + linkType: hard + "binary-extensions@npm:^2.0.0": version: 2.2.0 resolution: "binary-extensions@npm:2.2.0" @@ -6258,7 +6349,7 @@ __metadata: languageName: node linkType: hard -"duplexify@npm:^4.1.2": +"duplexify@npm:^4.0.0, duplexify@npm:^4.1.1, duplexify@npm:^4.1.2": version: 4.1.2 resolution: "duplexify@npm:4.1.2" dependencies: @@ -6280,7 +6371,7 @@ __metadata: languageName: node linkType: hard -"ecdsa-sig-formatter@npm:1.0.11": +"ecdsa-sig-formatter@npm:1.0.11, ecdsa-sig-formatter@npm:^1.0.11": version: 1.0.11 resolution: "ecdsa-sig-formatter@npm:1.0.11" dependencies: @@ -6429,6 +6520,13 @@ __metadata: languageName: node linkType: hard +"ent@npm:^2.2.0": + version: 2.2.0 + resolution: "ent@npm:2.2.0" + checksum: d12c504d93afb8b22551323f78f60f0a2660289cf2de2210bdd2fdb07ac204956da23510a7711bf48079aa0aa726e21724224de6c6289120ddcf27652b30cb17 + languageName: node + linkType: hard + "entities@npm:^1.1.1": version: 1.1.2 resolution: "entities@npm:1.1.2" @@ -7363,7 +7461,7 @@ __metadata: languageName: node linkType: hard -"extend@npm:^3.0.0, extend@npm:~3.0.2": +"extend@npm:^3.0.0, extend@npm:^3.0.2, extend@npm:~3.0.2": version: 3.0.2 resolution: "extend@npm:3.0.2" checksum: 73bf6e27406e80aa3e85b0d1c4fd987261e628064e170ca781125c0b635a3dabad5e05adbf07595ea0cf1e6c5396cacb214af933da7cbaf24fe75ff14818e8f9 @@ -7459,6 +7557,13 @@ __metadata: languageName: node linkType: hard +"fast-text-encoding@npm:^1.0.0": + version: 1.0.6 + resolution: "fast-text-encoding@npm:1.0.6" + checksum: e1d0381bda229c92c7906f63308f3b9caca8c78b732768b1ee16f560089ed21bc159bbe1434138ccd3815931ec8d4785bdade1ad1c45accfdf27ac6606ac67d2 + languageName: node + linkType: hard + "fastq@npm:^1.6.0": version: 1.15.0 resolution: "fastq@npm:1.15.0" @@ -7883,6 +7988,28 @@ __metadata: languageName: node linkType: hard +"gaxios@npm:^5.0.0, gaxios@npm:^5.0.1": + version: 5.1.0 + resolution: "gaxios@npm:5.1.0" + dependencies: + extend: ^3.0.2 + https-proxy-agent: ^5.0.0 + is-stream: ^2.0.0 + node-fetch: ^2.6.7 + checksum: 6f70109d2f5bbb05c968cc2e799cf50739f7851b540b01fcf7471eabee4c630b2b93ba15a2cf81a3bc4f03b8eaa9faf1a49d2149ef74fc3880add7a409690871 + languageName: node + linkType: hard + +"gcp-metadata@npm:^5.0.0": + version: 5.2.0 + resolution: "gcp-metadata@npm:5.2.0" + dependencies: + gaxios: ^5.0.0 + json-bigint: ^1.0.0 + checksum: 67a17a1fe2d5823bec99937e60595f865d6ae26072f33f7d88f5137e76b1d9278bba3fe8bd46e04440d7a6a6d588654c5af521010118f49f35a59aa38e1c05b4 + languageName: node + linkType: hard + "gensync@npm:^1.0.0-beta.2": version: 1.0.0-beta.2 resolution: "gensync@npm:1.0.0-beta.2" @@ -8200,6 +8327,34 @@ __metadata: languageName: node linkType: hard +"google-auth-library@npm:^8.0.2": + version: 8.7.0 + resolution: "google-auth-library@npm:8.7.0" + dependencies: + arrify: ^2.0.0 + base64-js: ^1.3.0 + ecdsa-sig-formatter: ^1.0.11 + fast-text-encoding: ^1.0.0 + gaxios: ^5.0.0 + gcp-metadata: ^5.0.0 + gtoken: ^6.1.0 + jws: ^4.0.0 + lru-cache: ^6.0.0 + checksum: b588081779725db99caf29b12bd0ccf727df619499560e6f369986b91b34af227d536d9552f76f413829e29ef67cb721abe8a5c0f79143a7702b467a5ab02316 + languageName: node + linkType: hard + +"google-p12-pem@npm:^4.0.0": + version: 4.0.1 + resolution: "google-p12-pem@npm:4.0.1" + dependencies: + node-forge: ^1.3.1 + bin: + gp12-pem: build/src/bin/gp12-pem.js + checksum: 2cd15077cb2179306870223c65b49d38f0860bd8cc60da8072cc632c9aad8cb7e61e46e63d72e8ef3fca27ad9e6b8870db6cc809839f279382d9cc4d891a9a7b + languageName: node + linkType: hard + "gopd@npm:^1.0.1": version: 1.0.1 resolution: "gopd@npm:1.0.1" @@ -8246,6 +8401,17 @@ __metadata: languageName: node linkType: hard +"gtoken@npm:^6.1.0": + version: 6.1.2 + resolution: "gtoken@npm:6.1.2" + dependencies: + gaxios: ^5.0.1 + google-p12-pem: ^4.0.0 + jws: ^4.0.0 + checksum: d660fbb8ad00a9f5b6eb426090593cb2a07d63dc22a11b0cf155d43779b6078f804e3467e37deb9a1c078ae34e683070279dc5a1577c50e0e3166a6a6748d98e + languageName: node + linkType: hard + "handlebars@npm:4.7.7": version: 4.7.7 resolution: "handlebars@npm:4.7.7" @@ -9234,6 +9400,13 @@ __metadata: languageName: node linkType: hard +"is@npm:^3.3.0": + version: 3.3.0 + resolution: "is@npm:3.3.0" + checksum: d2474beed01c7abba47926d51989fbf6f1c154e01ab7f1052af7e2327d160fda12e52967c96440fdb962489bdd5ecce6a7102cbf98ea43c951b0faa3c21d104a + languageName: node + linkType: hard + "isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" @@ -9996,6 +10169,15 @@ __metadata: languageName: node linkType: hard +"json-bigint@npm:^1.0.0": + version: 1.0.0 + resolution: "json-bigint@npm:1.0.0" + dependencies: + bignumber.js: ^9.0.0 + checksum: e3f34e43be3284b573ea150a3890c92f06d54d8ded72894556357946aeed9877fd795f62f37fe16509af189fd314ab1104d0fd0f163746ad231b9f378f5b33f4 + languageName: node + linkType: hard + "json-parse-even-better-errors@npm:^2.3.0": version: 2.3.1 resolution: "json-parse-even-better-errors@npm:2.3.1" @@ -10164,6 +10346,17 @@ __metadata: languageName: node linkType: hard +"jwa@npm:^2.0.0": + version: 2.0.0 + resolution: "jwa@npm:2.0.0" + dependencies: + buffer-equal-constant-time: 1.0.1 + ecdsa-sig-formatter: 1.0.11 + safe-buffer: ^5.0.1 + checksum: 6baab823b93c038ba1d2a9e531984dcadbc04e9eb98d171f4901b7a40d2be15961a359335de1671d78cb6d987f07cbe5d350d8143255977a889160c4d90fcc3c + languageName: node + linkType: hard + "jws@npm:^3.2.2": version: 3.2.2 resolution: "jws@npm:3.2.2" @@ -10174,6 +10367,16 @@ __metadata: languageName: node linkType: hard +"jws@npm:^4.0.0": + version: 4.0.0 + resolution: "jws@npm:4.0.0" + dependencies: + jwa: ^2.0.0 + safe-buffer: ^5.0.1 + checksum: f1ca77ea5451e8dc5ee219cb7053b8a4f1254a79cb22417a2e1043c1eb8a569ae118c68f24d72a589e8a3dd1824697f47d6bd4fb4bebb93a3bdf53545e721661 + languageName: node + linkType: hard + "keygrip@npm:~1.1.0": version: 1.1.0 resolution: "keygrip@npm:1.1.0" @@ -11279,6 +11482,13 @@ __metadata: languageName: node linkType: hard +"node-forge@npm:^1.3.1": + version: 1.3.1 + resolution: "node-forge@npm:1.3.1" + checksum: e882819b251a4321f9fc1d67c85d1501d3004b4ee889af822fd07f64de3d1a8e272ff00b689570af0465d65d6bf5074df9c76e900e0aff23e60b847f2a46fbe8 + languageName: node + linkType: hard + "node-gyp-build@npm:^4.3.0": version: 4.6.0 resolution: "node-gyp-build@npm:4.6.0" @@ -11771,6 +11981,15 @@ __metadata: languageName: node linkType: hard +"p-event@npm:^4.1.0": + version: 4.2.0 + resolution: "p-event@npm:4.2.0" + dependencies: + p-timeout: ^3.1.0 + checksum: f1b6a2fb13d47f2a8afc00150da5ece0d28940ce3d8fa562873e091d3337d298e78fee9cb18b768598ff1d11df608b2ae23868309ff6405b864a2451ccd6d25a + languageName: node + linkType: hard + "p-finally@npm:^1.0.0": version: 1.0.0 resolution: "p-finally@npm:1.0.0" @@ -11839,6 +12058,15 @@ __metadata: languageName: node linkType: hard +"p-timeout@npm:^3.1.0": + version: 3.2.0 + resolution: "p-timeout@npm:3.2.0" + dependencies: + p-finally: ^1.0.0 + checksum: 524b393711a6ba8e1d48137c5924749f29c93d70b671e6db761afa784726572ca06149c715632da8f70c090073afb2af1c05730303f915604fd38ee207b70a61 + languageName: node + linkType: hard + "p-try@npm:^2.0.0": version: 2.2.0 resolution: "p-try@npm:2.2.0" @@ -13203,6 +13431,16 @@ __metadata: languageName: node linkType: hard +"retry-request@npm:^5.0.0": + version: 5.0.2 + resolution: "retry-request@npm:5.0.2" + dependencies: + debug: ^4.1.1 + extend: ^3.0.2 + checksum: 06de24fd2f08a3d7985ad12d5993a5772dd0a4e0a079577ad63c0ce9b4005fcf464c8b0b215b732bede995f326ac0408c0fa04658736c8ffae5adde5b0194ed9 + languageName: node + linkType: hard + "retry@npm:0.12.0, retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -14258,6 +14496,19 @@ __metadata: languageName: node linkType: hard +"teeny-request@npm:^8.0.0": + version: 8.0.3 + resolution: "teeny-request@npm:8.0.3" + dependencies: + http-proxy-agent: ^5.0.0 + https-proxy-agent: ^5.0.0 + node-fetch: ^2.6.1 + stream-events: ^1.0.5 + uuid: ^9.0.0 + checksum: d3f60db26aa314ed64776c89255abc2d2cfb264656921c952781b27c314e2d157134ad0c514ce170eb9c0c5443e7e2dbfe221310ade6c5b1badbc980184e6b57 + languageName: node + linkType: hard + "telejson@npm:^7.0.3": version: 7.1.0 resolution: "telejson@npm:7.1.0" @@ -15195,6 +15446,15 @@ __metadata: languageName: node linkType: hard +"uuid@npm:^9.0.0": + version: 9.0.0 + resolution: "uuid@npm:9.0.0" + bin: + uuid: dist/bin/uuid + checksum: 8867e438990d1d33ac61093e2e4e3477a2148b844e4fa9e3c2360fa4399292429c4b6ec64537eb1659c97b2d10db349c673ad58b50e2824a11e0d3630de3c056 + languageName: node + linkType: hard + "v8-compile-cache-lib@npm:^3.0.1": version: 3.0.1 resolution: "v8-compile-cache-lib@npm:3.0.1" From bdc92576ac34014cd317a4d7b6f7f9c61e0ac669 Mon Sep 17 00:00:00 2001 From: Pascal Date: Thu, 1 Jun 2023 15:39:04 +0200 Subject: [PATCH 17/76] added information that jest is not globally available this was very hard to find out so maybe someones would be happy to have that information here. --- docs/essentials/interactions.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/essentials/interactions.md b/docs/essentials/interactions.md index a8c212b15c12..245c02cb3384 100644 --- a/docs/essentials/interactions.md +++ b/docs/essentials/interactions.md @@ -82,3 +82,5 @@ The above example uses the `canvasElement` to scope your element queries to the While you can refer to the [Testing Library documentation](https://testing-library.com/docs/) for details on how to use it, there's an important detail that's different when using the Storybook wrapper: **method invocations must be `await`-ed**. It allows you to step back and forth through your interactions using the debugger. Any `args` that have been marked as an Action, either using the [argTypes annotation](./actions.md#action-argtype-annotation) or the [argTypesRegex](./actions.md#automatically-matching-args), will be automatically converted to a [Jest mock function](https://jestjs.io/docs/mock-function-api) (spy). This allows you to make assertions about calls to these functions. + +> Note: If you need to use jest native spys like `jest.fn()` the import of jest over `import {jest} from "@storybook/jest"` is needed, as jest is not available globally. From 3a9e78086bde4e6a3e656da2771bfdbe51e50fdf Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Sat, 3 Jun 2023 23:31:26 +0200 Subject: [PATCH 18/76] expand dep range to support svelte 4 --- code/frameworks/svelte-vite/package.json | 2 +- code/lib/cli/src/sandbox-templates.ts | 10 +-- code/renderers/svelte/package.json | 4 +- code/yarn.lock | 83 ++++++++++++++++++++++-- 4 files changed, 85 insertions(+), 14 deletions(-) diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 27fddbe4ed7a..9917e3b7e3b2 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -52,7 +52,7 @@ "@storybook/svelte": "7.1.0-alpha.26", "@sveltejs/vite-plugin-svelte": "^2.0.0", "magic-string": "^0.27.0", - "svelte": "^3.0.0", + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0", "sveltedoc-parser": "^4.2.1", "ts-dedent": "^2.2.0" }, diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index 20032b2db74b..1688c22c1251 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -248,7 +248,8 @@ const baseTemplates = { }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', - script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte', + script: + 'npm create vite@latest --yes {{beforeDir}} -- --template svelte && cd {{beforeDir}} && npm install --save-dev svelte@next', expected: { framework: '@storybook/svelte-vite', renderer: '@storybook/svelte', @@ -258,7 +259,8 @@ const baseTemplates = { }, 'svelte-vite/default-ts': { name: 'Svelte Vite (TS)', - script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts', + script: + 'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts && cd {{beforeDir}} && npm install --save-dev svelte@next', expected: { framework: '@storybook/svelte-vite', renderer: '@storybook/svelte', @@ -303,7 +305,7 @@ const baseTemplates = { 'svelte-kit/skeleton-js': { name: 'Svelte Kit (JS)', script: - 'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest', + 'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next', expected: { framework: '@storybook/sveltekit', renderer: '@storybook/svelte', @@ -314,7 +316,7 @@ const baseTemplates = { 'svelte-kit/skeleton-ts': { name: 'Svelte Kit (TS)', script: - 'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest', + 'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next', expected: { framework: '@storybook/sveltekit', renderer: '@storybook/svelte', diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index b361358ba475..efb76f2eadc4 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -64,12 +64,12 @@ }, "devDependencies": { "expect-type": "^0.14.2", - "svelte": "^3.59.1", + "svelte": "^4.0.0-next.0", "svelte-check": "^3.4.3", "typescript": "^5.0.4" }, "peerDependencies": { - "svelte": "^3.1.0" + "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.0" }, "engines": { "node": ">=16.0.0" diff --git a/code/yarn.lock b/code/yarn.lock index 267a38ca50bc..1e67cd1f350f 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -12,7 +12,7 @@ __metadata: languageName: node linkType: hard -"@ampproject/remapping@npm:2.2.1, @ampproject/remapping@npm:^2.2.0": +"@ampproject/remapping@npm:2.2.1, @ampproject/remapping@npm:^2.2.0, @ampproject/remapping@npm:^2.2.1": version: 2.2.1 resolution: "@ampproject/remapping@npm:2.2.1" dependencies: @@ -3814,7 +3814,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: 0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 @@ -7582,13 +7582,13 @@ __metadata: "@storybook/preview-api": 7.1.0-alpha.26 "@storybook/types": 7.1.0-alpha.26 expect-type: ^0.14.2 - svelte: ^3.59.1 + svelte: ^4.0.0-next.0 svelte-check: ^3.4.3 sveltedoc-parser: ^4.2.1 type-fest: 2.19.0 typescript: ^5.0.4 peerDependencies: - svelte: ^3.1.0 + svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.0 languageName: unknown linkType: soft @@ -10074,7 +10074,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.0.0, acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1": +"acorn@npm:^8.0.0, acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.6.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2": version: 8.8.2 resolution: "acorn@npm:8.8.2" bin: @@ -12636,6 +12636,19 @@ __metadata: languageName: node linkType: hard +"code-red@npm:^1.0.0": + version: 1.0.0 + resolution: "code-red@npm:1.0.0" + dependencies: + "@jridgewell/sourcemap-codec": ^1.4.14 + "@types/estree": ^1.0.0 + acorn: ^8.8.2 + estree-walker: ^3.0.3 + periscopic: ^3.1.0 + checksum: 584bad8f23b4aa13b9b7ce043fb92d3165aaa0a3bfd058b9cb9ec4cb7b2b3f1289abbc353cf62f353e05463c3f323560dfe1e4cb680d2900a7b85a549ab9206c + languageName: node + linkType: hard + "collapse-white-space@npm:^1.0.4": version: 1.0.6 resolution: "collapse-white-space@npm:1.0.6" @@ -13431,7 +13444,7 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^2.0.1": +"css-tree@npm:^2.0.1, css-tree@npm:^2.3.1": version: 2.3.1 resolution: "css-tree@npm:2.3.1" dependencies: @@ -15652,6 +15665,15 @@ __metadata: languageName: node linkType: hard +"estree-walker@npm:^3.0.0, estree-walker@npm:^3.0.3": + version: 3.0.3 + resolution: "estree-walker@npm:3.0.3" + dependencies: + "@types/estree": ^1.0.0 + checksum: c12e3c2b2642d2bcae7d5aa495c60fa2f299160946535763969a1c83fc74518ffa9c2cd3a8b69ac56aea547df6a8aac25f729a342992ef0bbac5f1c73e78995d + languageName: node + linkType: hard + "esutils@npm:^2.0.2": version: 2.0.3 resolution: "esutils@npm:2.0.3" @@ -19035,6 +19057,15 @@ __metadata: languageName: node linkType: hard +"is-reference@npm:^3.0.0, is-reference@npm:^3.0.1": + version: 3.0.1 + resolution: "is-reference@npm:3.0.1" + dependencies: + "@types/estree": "*" + checksum: 003af01fd96c4300111853d68b048e2f094e27ccd70eb66fdb7bb3cd7f7a9e6ad3f633387b2b453c85134fcc1ba0473dca55349a0162312d9fd127306d9f5a9b + languageName: node + linkType: hard + "is-regex@npm:^1.0.3, is-regex@npm:^1.0.5, is-regex@npm:^1.1.0, is-regex@npm:^1.1.4": version: 1.1.4 resolution: "is-regex@npm:1.1.4" @@ -21142,6 +21173,13 @@ __metadata: languageName: node linkType: hard +"locate-character@npm:^2.0.5": + version: 2.0.5 + resolution: "locate-character@npm:2.0.5" + checksum: 134d79b3494a4c56b91d2cee3cb333bcec1acdf145bf9a73e8bf03a917c0f1e0c6b2a4f7ce0fc550af494dec29835c0aa81f6d9836c30031b40faf2fe94aeaae + languageName: node + linkType: hard + "locate-path@npm:^2.0.0": version: 2.0.0 resolution: "locate-path@npm:2.0.0" @@ -24961,6 +24999,17 @@ __metadata: languageName: node linkType: hard +"periscopic@npm:^3.1.0": + version: 3.1.0 + resolution: "periscopic@npm:3.1.0" + dependencies: + "@types/estree": ^1.0.0 + estree-walker: ^3.0.0 + is-reference: ^3.0.0 + checksum: fb5ce7cd810c49254cdf1cd3892811e6dd1a1dfbdf5f10a0a33fb7141baac36443c4cad4f0e2b30abd4eac613f6ab845c2bc1b7ce66ae9694c7321e6ada5bd96 + languageName: node + linkType: hard + "picocolors@npm:^0.2.1": version: 0.2.1 resolution: "picocolors@npm:0.2.1" @@ -29281,13 +29330,33 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^3.0.0, svelte@npm:^3.31.2, svelte@npm:^3.48.0, svelte@npm:^3.59.1": +"svelte@npm:^3.0.0, svelte@npm:^3.31.2, svelte@npm:^3.48.0": version: 3.59.1 resolution: "svelte@npm:3.59.1" checksum: 12a250de5c359d3a184f15727d5e61e45103a795adb32e8c4100a40929d987832ab7edcbfe357d86863c0819ad4edbd69bfc83ac33bf9b5e47a233a621fbcc3e languageName: node linkType: hard +"svelte@npm:^4.0.0-next.0": + version: 4.0.0-next.0 + resolution: "svelte@npm:4.0.0-next.0" + dependencies: + "@ampproject/remapping": ^2.2.1 + "@jridgewell/sourcemap-codec": ^1.4.15 + acorn: ^8.8.2 + aria-query: ^5.1.3 + axobject-query: ^3.1.1 + code-red: ^1.0.0 + css-tree: ^2.3.1 + estree-walker: ^3.0.3 + is-reference: ^3.0.1 + locate-character: ^2.0.5 + magic-string: ^0.30.0 + periscopic: ^3.1.0 + checksum: 8dade0d28c01310a1f35fe8b08edbd17286110f11291c962f10b7566ec20752a9fe65ee4ca01b522741e3037f71c02eb78b67fed8b98ae5417af0d323c2d18b0 + languageName: node + linkType: hard + "sveltedoc-parser@npm:^4.2.1": version: 4.3.1 resolution: "sveltedoc-parser@npm:4.3.1" From 80e514313f6084376cabe277427f37c4edd15fc3 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Sat, 3 Jun 2023 23:42:10 +0200 Subject: [PATCH 19/76] update yarn.lock --- code/yarn.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index 1e67cd1f350f..9cabd0597fe0 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7538,7 +7538,7 @@ __metadata: "@sveltejs/vite-plugin-svelte": ^2.0.0 "@types/node": ^16.0.0 magic-string: ^0.27.0 - svelte: ^3.0.0 + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0 sveltedoc-parser: ^4.2.1 ts-dedent: ^2.2.0 typescript: ~4.9.3 @@ -29330,14 +29330,7 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^3.0.0, svelte@npm:^3.31.2, svelte@npm:^3.48.0": - version: 3.59.1 - resolution: "svelte@npm:3.59.1" - checksum: 12a250de5c359d3a184f15727d5e61e45103a795adb32e8c4100a40929d987832ab7edcbfe357d86863c0819ad4edbd69bfc83ac33bf9b5e47a233a621fbcc3e - languageName: node - linkType: hard - -"svelte@npm:^4.0.0-next.0": +"svelte@npm:^3.0.0 || ^4.0.0 || ^4.0.0-next.0, svelte@npm:^4.0.0-next.0": version: 4.0.0-next.0 resolution: "svelte@npm:4.0.0-next.0" dependencies: @@ -29357,6 +29350,13 @@ __metadata: languageName: node linkType: hard +"svelte@npm:^3.31.2, svelte@npm:^3.48.0": + version: 3.59.1 + resolution: "svelte@npm:3.59.1" + checksum: 12a250de5c359d3a184f15727d5e61e45103a795adb32e8c4100a40929d987832ab7edcbfe357d86863c0819ad4edbd69bfc83ac33bf9b5e47a233a621fbcc3e + languageName: node + linkType: hard + "sveltedoc-parser@npm:^4.2.1": version: 4.3.1 resolution: "sveltedoc-parser@npm:4.3.1" From f372e89eed949e795ca0eeb26b1ca6606a42a135 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Mon, 5 Jun 2023 07:51:44 +0200 Subject: [PATCH 20/76] use internal ComponentType --- code/renderers/svelte/src/public-types.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts index 4bd30feb1c38..03959818e781 100644 --- a/code/renderers/svelte/src/public-types.ts +++ b/code/renderers/svelte/src/public-types.ts @@ -12,7 +12,9 @@ import type { ProjectAnnotations, } from '@storybook/types'; -import type { ComponentProps, ComponentType, SvelteComponentTyped } from 'svelte'; +// TODO: don't use internal type when https://github.com/sveltejs/svelte/issues/8692 has been resolved +import type { ComponentType } from 'svelte/types/runtime/internal'; +import type { ComponentProps, SvelteComponentTyped } from 'svelte'; import type { SetOptional, Simplify } from 'type-fest'; import type { SvelteRenderer } from './types'; From 681ad608be8ac50cabc68077c0ce9cea0f9709f7 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Thu, 8 Jun 2023 00:11:40 +0200 Subject: [PATCH 21/76] fix svelte-vite dependencies on svelte --- code/frameworks/svelte-vite/package.json | 5 ++--- code/frameworks/sveltekit/package.json | 1 + code/yarn.lock | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index a9cabfcf688f..a65c21f9c766 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -52,18 +52,17 @@ "@storybook/svelte": "7.1.0-alpha.27", "@sveltejs/vite-plugin-svelte": "^2.0.0", "magic-string": "^0.27.0", - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0", "sveltedoc-parser": "^4.2.1", "ts-dedent": "^2.2.0" }, "devDependencies": { "@types/node": "^16.0.0", + "svelte": "^4.0.0-next.0", "typescript": "~4.9.3", "vite": "^4.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0", + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0", "vite": "^3.0.0 || ^4.0.0" }, "engines": { diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index f6b154bf24e1..443a1c89bffe 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -60,6 +60,7 @@ "vite": "^4.0.0" }, "peerDependencies": { + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0", "vite": "^4.0.0" }, "engines": { diff --git a/code/yarn.lock b/code/yarn.lock index 6013193776a0..c0ae5bd708ba 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7539,14 +7539,13 @@ __metadata: "@sveltejs/vite-plugin-svelte": ^2.0.0 "@types/node": ^16.0.0 magic-string: ^0.27.0 - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0 + svelte: ^4.0.0-next.0 sveltedoc-parser: ^4.2.1 ts-dedent: ^2.2.0 typescript: ~4.9.3 vite: ^4.0.0 peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0 vite: ^3.0.0 || ^4.0.0 languageName: unknown linkType: soft @@ -7604,6 +7603,7 @@ __metadata: typescript: ^4.9.3 vite: ^4.0.0 peerDependencies: + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0 vite: ^4.0.0 languageName: unknown linkType: soft @@ -29331,7 +29331,14 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^3.0.0 || ^4.0.0 || ^4.0.0-next.0, svelte@npm:^4.0.0-next.0": +"svelte@npm:^3.31.2, svelte@npm:^3.48.0": + version: 3.59.1 + resolution: "svelte@npm:3.59.1" + checksum: 12a250de5c359d3a184f15727d5e61e45103a795adb32e8c4100a40929d987832ab7edcbfe357d86863c0819ad4edbd69bfc83ac33bf9b5e47a233a621fbcc3e + languageName: node + linkType: hard + +"svelte@npm:^4.0.0-next.0": version: 4.0.0-next.0 resolution: "svelte@npm:4.0.0-next.0" dependencies: @@ -29351,13 +29358,6 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^3.31.2, svelte@npm:^3.48.0": - version: 3.59.1 - resolution: "svelte@npm:3.59.1" - checksum: 12a250de5c359d3a184f15727d5e61e45103a795adb32e8c4100a40929d987832ab7edcbfe357d86863c0819ad4edbd69bfc83ac33bf9b5e47a233a621fbcc3e - languageName: node - linkType: hard - "sveltedoc-parser@npm:^4.2.1": version: 4.3.1 resolution: "sveltedoc-parser@npm:4.3.1" From 5fb3c6dfb2bd6cf462a413ea6efc56e8f7cbce16 Mon Sep 17 00:00:00 2001 From: noviceGuru Date: Sun, 11 Jun 2023 09:19:03 +0200 Subject: [PATCH 22/76] config.resolve can be undefined by type adding the condition, type error prevented --- .../storybook-main-ts-module-resolution.ts.mdx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx b/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx index 8ec6bda19a50..6e05d0a6b319 100644 --- a/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx +++ b/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx @@ -10,12 +10,14 @@ const config: StorybookConfig = { framework: '@storybook/your-framework', stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], webpackFinal: async (config) => { - config.resolve.plugins = [ - ...(config.resolve.plugins || []), - new TsconfigPathsPlugin({ - extensions: config.resolve.extensions, - }), - ]; + if(config.resolve){ + config.resolve.plugins = [ + ...(config.resolve.plugins || []), + new TsconfigPathsPlugin({ + extensions: config.resolve.extensions, + }), + ]; + } return config; }, }; From 305b81c9b778281433285728d28db04441492db1 Mon Sep 17 00:00:00 2001 From: noviceGuru Date: Sun, 11 Jun 2023 09:38:49 +0200 Subject: [PATCH 23/76] An easy way to configure @ import was added, which does not require any package --- docs/builders/webpack.md | 13 +++++++++++ ...-ts-module-resolution-atsign-import.js.mdx | 20 +++++++++++++++++ ...-ts-module-resolution-atsign-import.ts.mdx | 22 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx create mode 100644 docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx diff --git a/docs/builders/webpack.md b/docs/builders/webpack.md index e0565bbd8a1f..71cf2b83d67b 100644 --- a/docs/builders/webpack.md +++ b/docs/builders/webpack.md @@ -128,6 +128,19 @@ Storybook's default Webpack configuration provides support for most project setu +While if you only want to add an import path, like `@` import which is used in `NextJS 13` default setup, you can use the following solution without adding a package: + + + + + + + ### Pre-bundled assets do not show in the Storybook UI As Storybook relies on [esbuild](https://esbuild.github.io/) to build its internal manager, support for bundling assets with the `managerWebpack` will no longer have an impact on the Storybook UI. We recommend removing existing `managerWebpack` configuration elements from your Storybook configuration file and bundling assets other than images or CSS into JavaScript beforehand. diff --git a/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx new file mode 100644 index 000000000000..7c54b152a917 --- /dev/null +++ b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx @@ -0,0 +1,20 @@ +```js +// .storybook/main.js + +import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin'; + +export default { + // Replace your-framework with the framework you are using (e.g., react-webpack5, vue3-vite) + framework: '@storybook/your-framework', + stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], + webpackFinal: async (config) => { + if(config.resolve){ + config.resolve.alias = { + ...config.resolve.alias, + '@' : path.resolve(__dirname, '../src') + } + } + return config; + }, +}; +``` diff --git a/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx new file mode 100644 index 000000000000..88318e7abc0f --- /dev/null +++ b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx @@ -0,0 +1,22 @@ +```ts +// .storybook/main.ts + +// Replace your-framework with the framework you are using (e.g., react-webpack5, vue3-vite) +import type { StorybookConfig } from '@storybook/your-framework'; + +const config: StorybookConfig = { + framework: '@storybook/your-framework', + stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], + webpackFinal: async (config) => { + if(config.resolve){ + config.resolve.alias = { + ...config.resolve.alias, + '@' : path.resolve(__dirname, '../src') + } + } + return config; + }, +}; + +export default config; +``` From 0be8314a25146a417849ce6c5b159d6e873a3826 Mon Sep 17 00:00:00 2001 From: noviceGuru Date: Tue, 13 Jun 2023 16:33:40 +0200 Subject: [PATCH 24/76] Description imporved, type correction applied to JS file Description for aliasing configuration imporved, and type correction that was added to TS example, was added to JS version for accuracy and consistency. --- docs/builders/webpack.md | 2 +- .../storybook-main-ts-module-resolution.js.mdx | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/builders/webpack.md b/docs/builders/webpack.md index 71cf2b83d67b..b5d3748b2a58 100644 --- a/docs/builders/webpack.md +++ b/docs/builders/webpack.md @@ -128,7 +128,7 @@ Storybook's default Webpack configuration provides support for most project setu -While if you only want to add an import path, like `@` import which is used in `NextJS 13` default setup, you can use the following solution without adding a package: +However, if you're working with a framework that provides a default aliasing configuration (e.g., Next.js, Nuxt) and you want to configure Storybook to use the same aliases, you may not need to install any additional packages. Instead, you can extend the default configuration of Storybook to use the same aliases provided by the framework. For example, to set up an alias for the `@` import path, you can add the following to your `.storybook/main.js|ts` file: diff --git a/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx b/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx index 9b02a41692a9..3be2fe956327 100644 --- a/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx +++ b/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx @@ -8,12 +8,14 @@ export default { framework: '@storybook/your-framework', stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], webpackFinal: async (config) => { - config.resolve.plugins = [ - ...(config.resolve.plugins || []), - new TsconfigPathsPlugin({ - extensions: config.resolve.extensions, - }), - ]; + if(config.resolve){ + config.resolve.plugins = [ + ...(config.resolve.plugins || []), + new TsconfigPathsPlugin({ + extensions: config.resolve.extensions, + }), + ]; + } return config; }, }; From 063c3efbfd41f6bef3daaafb9122f9090af4c571 Mon Sep 17 00:00:00 2001 From: noviceGuru Date: Wed, 14 Jun 2023 02:11:59 +0200 Subject: [PATCH 25/76] pretty-docs script was run --- ...storybook-main-ts-module-resolution-atsign-import.js.mdx | 6 +++--- ...storybook-main-ts-module-resolution-atsign-import.ts.mdx | 6 +++--- .../common/storybook-main-ts-module-resolution.js.mdx | 2 +- .../common/storybook-main-ts-module-resolution.ts.mdx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx index 7c54b152a917..46550ace3cfb 100644 --- a/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx +++ b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.js.mdx @@ -8,11 +8,11 @@ export default { framework: '@storybook/your-framework', stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], webpackFinal: async (config) => { - if(config.resolve){ + if (config.resolve) { config.resolve.alias = { ...config.resolve.alias, - '@' : path.resolve(__dirname, '../src') - } + '@': path.resolve(__dirname, '../src'), + }; } return config; }, diff --git a/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx index 88318e7abc0f..2d895baeac19 100644 --- a/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx +++ b/docs/snippets/common/storybook-main-ts-module-resolution-atsign-import.ts.mdx @@ -8,11 +8,11 @@ const config: StorybookConfig = { framework: '@storybook/your-framework', stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], webpackFinal: async (config) => { - if(config.resolve){ + if (config.resolve) { config.resolve.alias = { ...config.resolve.alias, - '@' : path.resolve(__dirname, '../src') - } + '@': path.resolve(__dirname, '../src'), + }; } return config; }, diff --git a/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx b/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx index 3be2fe956327..205d116bffba 100644 --- a/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx +++ b/docs/snippets/common/storybook-main-ts-module-resolution.js.mdx @@ -8,7 +8,7 @@ export default { framework: '@storybook/your-framework', stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], webpackFinal: async (config) => { - if(config.resolve){ + if (config.resolve) { config.resolve.plugins = [ ...(config.resolve.plugins || []), new TsconfigPathsPlugin({ diff --git a/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx b/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx index 6e05d0a6b319..9e52832566d0 100644 --- a/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx +++ b/docs/snippets/common/storybook-main-ts-module-resolution.ts.mdx @@ -10,7 +10,7 @@ const config: StorybookConfig = { framework: '@storybook/your-framework', stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'], webpackFinal: async (config) => { - if(config.resolve){ + if (config.resolve) { config.resolve.plugins = [ ...(config.resolve.plugins || []), new TsconfigPathsPlugin({ From 5183b34b80224e12dc18d1b73512b842f8c50fa3 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Thu, 15 Jun 2023 21:46:27 +0200 Subject: [PATCH 26/76] upgrade to svelte@4.0.0-next.1 --- code/frameworks/svelte-vite/package.json | 4 ++-- code/frameworks/sveltekit/package.json | 2 +- code/renderers/svelte/package.json | 4 ++-- code/renderers/svelte/src/public-types.ts | 4 +--- code/yarn.lock | 18 +++++++++--------- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index a65c21f9c766..dbe9a5633c57 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -57,12 +57,12 @@ }, "devDependencies": { "@types/node": "^16.0.0", - "svelte": "^4.0.0-next.0", + "svelte": "^4.0.0-next.1", "typescript": "~4.9.3", "vite": "^4.0.0" }, "peerDependencies": { - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0", + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1", "vite": "^3.0.0 || ^4.0.0" }, "engines": { diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index 443a1c89bffe..416ba7c6892b 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -60,7 +60,7 @@ "vite": "^4.0.0" }, "peerDependencies": { - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.0", + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1", "vite": "^4.0.0" }, "engines": { diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 6c2a6a38a54c..73d2ee2213ed 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -64,12 +64,12 @@ }, "devDependencies": { "expect-type": "^0.14.2", - "svelte": "^4.0.0-next.0", + "svelte": "^4.0.0-next.1", "svelte-check": "^3.4.3", "typescript": "^5.0.4" }, "peerDependencies": { - "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.0" + "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.1" }, "engines": { "node": ">=16.0.0" diff --git a/code/renderers/svelte/src/public-types.ts b/code/renderers/svelte/src/public-types.ts index 03959818e781..3e5abbb28678 100644 --- a/code/renderers/svelte/src/public-types.ts +++ b/code/renderers/svelte/src/public-types.ts @@ -12,9 +12,7 @@ import type { ProjectAnnotations, } from '@storybook/types'; -// TODO: don't use internal type when https://github.com/sveltejs/svelte/issues/8692 has been resolved -import type { ComponentType } from 'svelte/types/runtime/internal'; -import type { ComponentProps, SvelteComponentTyped } from 'svelte'; +import type { ComponentType, ComponentProps, SvelteComponentTyped } from 'svelte'; import type { SetOptional, Simplify } from 'type-fest'; import type { SvelteRenderer } from './types'; diff --git a/code/yarn.lock b/code/yarn.lock index c0ae5bd708ba..0e62a1855468 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7539,13 +7539,13 @@ __metadata: "@sveltejs/vite-plugin-svelte": ^2.0.0 "@types/node": ^16.0.0 magic-string: ^0.27.0 - svelte: ^4.0.0-next.0 + svelte: ^4.0.0-next.1 sveltedoc-parser: ^4.2.1 ts-dedent: ^2.2.0 typescript: ~4.9.3 vite: ^4.0.0 peerDependencies: - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0 + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1 vite: ^3.0.0 || ^4.0.0 languageName: unknown linkType: soft @@ -7582,13 +7582,13 @@ __metadata: "@storybook/preview-api": 7.1.0-alpha.27 "@storybook/types": 7.1.0-alpha.27 expect-type: ^0.14.2 - svelte: ^4.0.0-next.0 + svelte: ^4.0.0-next.1 svelte-check: ^3.4.3 sveltedoc-parser: ^4.2.1 type-fest: 2.19.0 typescript: ^5.0.4 peerDependencies: - svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.0 + svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.1 languageName: unknown linkType: soft @@ -7603,7 +7603,7 @@ __metadata: typescript: ^4.9.3 vite: ^4.0.0 peerDependencies: - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.0 + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1 vite: ^4.0.0 languageName: unknown linkType: soft @@ -29338,9 +29338,9 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^4.0.0-next.0": - version: 4.0.0-next.0 - resolution: "svelte@npm:4.0.0-next.0" +"svelte@npm:^4.0.0-next.1": + version: 4.0.0-next.1 + resolution: "svelte@npm:4.0.0-next.1" dependencies: "@ampproject/remapping": ^2.2.1 "@jridgewell/sourcemap-codec": ^1.4.15 @@ -29354,7 +29354,7 @@ __metadata: locate-character: ^2.0.5 magic-string: ^0.30.0 periscopic: ^3.1.0 - checksum: 8dade0d28c01310a1f35fe8b08edbd17286110f11291c962f10b7566ec20752a9fe65ee4ca01b522741e3037f71c02eb78b67fed8b98ae5417af0d323c2d18b0 + checksum: 4283979acb7be64e8dfdf29d2f843b4d6150d604fbfceb8702b7df3225deb325dc8984603127cba126a9151cfb40c62a1429abf55716065ea00696c3d73ccb7a languageName: node linkType: hard From d6271a783a5abd04849e66e14200da37583249d0 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sat, 17 Jun 2023 17:44:15 +0800 Subject: [PATCH 27/76] Build: Fix workflow link in release PR description --- scripts/release/generate-pr-description.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 55c1531aa04f..afe429e3c9c4 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -3,6 +3,7 @@ import chalk from 'chalk'; import program from 'commander'; import { z } from 'zod'; import dedent from 'ts-dedent'; +import semver from 'semver'; import { setOutput } from '@actions/core'; import type { Change } from './utils/get-changes'; import { getChanges, LABELS_BY_IMPORTANCE, RELEASED_LABELS } from './utils/get-changes'; @@ -140,6 +141,9 @@ export const generateReleaseDescription = ({ changelogText: string; manualCherryPicks?: string; }): string => { + const workflow = semver.prerelease(nextVersion) ? 'prepare-prerelease' : 'prepare-patch-release'; + const workflowUrl = `https://github.com/storybookjs/storybook/actions/workflows/${workflow}.yml`; + return ( dedent`This is an automated pull request that bumps the version from \`${currentVersion}\` to \`${nextVersion}\`. Once this pull request is merged, it will trigger a new release of version \`${nextVersion}\`. @@ -168,7 +172,7 @@ export const generateReleaseDescription = ({ ${manualCherryPicks || ''} - If you've made any changes doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. It will wipe your progress in this to do, which is expected. + If you've made any changes doing the above QA (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](${workflowUrl}) and wait for it to finish. It will wipe your progress in this to do, which is expected. When everything above is done: - Merge this PR From 1bcda19f4909c2ab106e1b870da7a509e370a584 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Mon, 19 Jun 2023 08:09:32 +0200 Subject: [PATCH 28/76] Upgrade to svelte@4.0.0-next.2 --- code/frameworks/svelte-vite/package.json | 4 +- code/frameworks/sveltekit/package.json | 2 +- code/renderers/svelte/package.json | 4 +- code/yarn.lock | 52 ++++++++++++++++-------- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index aee4c1576a3f..77a92fb18d73 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -57,12 +57,12 @@ }, "devDependencies": { "@types/node": "^16.0.0", - "svelte": "^4.0.0-next.1", + "svelte": "^4.0.0-next.2", "typescript": "~4.9.3", "vite": "^4.0.0" }, "peerDependencies": { - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1", + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2", "vite": "^3.0.0 || ^4.0.0" }, "engines": { diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index 6575eba338bf..60e0db7e388e 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -60,7 +60,7 @@ "vite": "^4.0.0" }, "peerDependencies": { - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.1", + "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2", "vite": "^4.0.0" }, "engines": { diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index faa62a447f86..3cd914cf45b5 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -64,12 +64,12 @@ }, "devDependencies": { "expect-type": "^0.15.0", - "svelte": "^4.0.0-next.1", + "svelte": "^4.0.0-next.2", "svelte-check": "^3.4.3", "typescript": "^5.0.4" }, "peerDependencies": { - "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.1" + "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.2" }, "engines": { "node": ">=16.0.0" diff --git a/code/yarn.lock b/code/yarn.lock index 1f35bdb8a981..a3fed0036e2f 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7399,13 +7399,13 @@ __metadata: "@sveltejs/vite-plugin-svelte": ^2.0.0 "@types/node": ^16.0.0 magic-string: ^0.30.0 - svelte: ^4.0.0-next.1 + svelte: ^4.0.0-next.2 sveltedoc-parser: ^4.2.1 ts-dedent: ^2.2.0 typescript: ~4.9.3 vite: ^4.0.0 peerDependencies: - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1 + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2 vite: ^3.0.0 || ^4.0.0 languageName: unknown linkType: soft @@ -7442,13 +7442,13 @@ __metadata: "@storybook/preview-api": 7.1.0-alpha.36 "@storybook/types": 7.1.0-alpha.36 expect-type: ^0.15.0 - svelte: ^4.0.0-next.1 + svelte: ^4.0.0-next.2 svelte-check: ^3.4.3 sveltedoc-parser: ^4.2.1 type-fest: ^3.11.0 typescript: ^5.0.4 peerDependencies: - svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.1 + svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.2 languageName: unknown linkType: soft @@ -7463,7 +7463,7 @@ __metadata: typescript: ^4.9.3 vite: ^4.0.0 peerDependencies: - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.1 + svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2 vite: ^4.0.0 languageName: unknown linkType: soft @@ -10312,6 +10312,15 @@ __metadata: languageName: node linkType: hard +"aria-query@npm:^5.2.1": + version: 5.2.1 + resolution: "aria-query@npm:5.2.1" + dependencies: + dequal: ^2.0.3 + checksum: 898031f69f8e9d63c914b73f45e50316fef157aae41af682fe64e8f10c9a9d623952929df01f6524b4ce37c3b21806b04e7617e38909720fbc0fad3f207d9e09 + languageName: node + linkType: hard + "arr-diff@npm:^4.0.0": version: 4.0.0 resolution: "arr-diff@npm:4.0.0" @@ -10743,6 +10752,15 @@ __metadata: languageName: node linkType: hard +"axobject-query@npm:^3.2.1": + version: 3.2.1 + resolution: "axobject-query@npm:3.2.1" + dependencies: + dequal: ^2.0.3 + checksum: f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7 + languageName: node + linkType: hard + "babel-core@npm:^7.0.0-bridge.0": version: 7.0.0-bridge.0 resolution: "babel-core@npm:7.0.0-bridge.0" @@ -13838,7 +13856,7 @@ __metadata: languageName: node linkType: hard -"dequal@npm:^2.0.0, dequal@npm:^2.0.2": +"dequal@npm:^2.0.0, dequal@npm:^2.0.2, dequal@npm:^2.0.3": version: 2.0.3 resolution: "dequal@npm:2.0.3" checksum: f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888 @@ -20731,10 +20749,10 @@ __metadata: languageName: node linkType: hard -"locate-character@npm:^2.0.5": - version: 2.0.5 - resolution: "locate-character@npm:2.0.5" - checksum: 134d79b3494a4c56b91d2cee3cb333bcec1acdf145bf9a73e8bf03a917c0f1e0c6b2a4f7ce0fc550af494dec29835c0aa81f6d9836c30031b40faf2fe94aeaae +"locate-character@npm:^3.0.0": + version: 3.0.0 + resolution: "locate-character@npm:3.0.0" + checksum: 9da917622395002eb1336fca8cbef1c19904e3dc0b3b8078abe8ff390106d947a86feccecd0346f0e0e19fa017623fb4ccb65263d72a76dfa36e20cc18766b6c languageName: node linkType: hard @@ -28806,23 +28824,23 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^4.0.0-next.1": - version: 4.0.0-next.1 - resolution: "svelte@npm:4.0.0-next.1" +"svelte@npm:^4.0.0-next.2": + version: 4.0.0-next.2 + resolution: "svelte@npm:4.0.0-next.2" dependencies: "@ampproject/remapping": ^2.2.1 "@jridgewell/sourcemap-codec": ^1.4.15 acorn: ^8.8.2 - aria-query: ^5.1.3 - axobject-query: ^3.1.1 + aria-query: ^5.2.1 + axobject-query: ^3.2.1 code-red: ^1.0.0 css-tree: ^2.3.1 estree-walker: ^3.0.3 is-reference: ^3.0.1 - locate-character: ^2.0.5 + locate-character: ^3.0.0 magic-string: ^0.30.0 periscopic: ^3.1.0 - checksum: 4283979acb7be64e8dfdf29d2f843b4d6150d604fbfceb8702b7df3225deb325dc8984603127cba126a9151cfb40c62a1429abf55716065ea00696c3d73ccb7a + checksum: ce14a2d3de37d80831b66a5eb2ab8129a8bd9578d4dafb70f66e47e6580f6ce7c1705094781b30b97572f2adef15d72938ca192aae00585feb945fa1ff41654c languageName: node linkType: hard From 73ca1eb121a1d2985f17f89d4c12c6cf65c8b62b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 13:12:29 +0200 Subject: [PATCH 29/76] fix lockfile --- code/yarn.lock | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index 2af12576113b..08ef490b7220 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -27127,7 +27127,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:7.8.1": +"rxjs@npm:7.8.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0": version: 7.8.1 resolution: "rxjs@npm:7.8.1" dependencies: @@ -27145,15 +27145,6 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.5, rxjs@npm:^7.8.0": - version: 7.8.0 - resolution: "rxjs@npm:7.8.0" - dependencies: - tslib: ^2.1.0 - checksum: c48833638ae5d339332f8b792e716c3c662950ba95ba04e9e97a8cfd4628d8f009129672793c6c067c872a4dab5757231d41d7256a2114a5fabbf30d8a5b9d67 - languageName: node - linkType: hard - "sade@npm:^1.7.3, sade@npm:^1.7.4": version: 1.8.1 resolution: "sade@npm:1.8.1" From dc220786a681938abdaa1ca5511731b96a678515 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 14:43:20 +0200 Subject: [PATCH 30/76] change config --- .circleci/config.yml | 8 ++++---- code/lib/cli/src/sandbox-templates.ts | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6d5185b226d..a51d52b6482b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -633,19 +633,19 @@ workflows: requires: - build - create-sandboxes: - parallelism: 11 + parallelism: 9 requires: - build - build-sandboxes: - parallelism: 11 + parallelism: 9 requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 11 + parallelism: 9 requires: - build-sandboxes - e2e-production: - parallelism: 11 + parallelism: 9 requires: - build-sandboxes - e2e-dev: diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index c37c836b9b0f..99aa780c05db 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -284,7 +284,7 @@ const baseTemplates = { renderer: '@storybook/angular', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], }, 'angular-cli/default-ts': { name: 'Angular CLI (latest)', @@ -453,6 +453,7 @@ const internalTemplates = { }, }, }, + skipTasks: ['bench-dev', 'bench-build'], }, 'internal/ssv6-webpack': { ...baseTemplates['cra/default-ts'], @@ -466,6 +467,7 @@ const internalTemplates = { }, }, }, + skipTasks: ['bench-dev', 'bench-build'], }, 'internal/swc-webpack': { ...baseTemplates['react-webpack/18-ts'], @@ -484,6 +486,7 @@ const internalTemplates = { }, }, }, + skipTasks: ['bench-dev', 'bench-build'], }, 'internal/server-webpack5': { name: 'Server Webpack5', @@ -494,6 +497,7 @@ const internalTemplates = { builder: '@storybook/builder-webpack5', }, isInternal: true, + skipTasks: ['bench-dev', 'bench-build'], }, // 'internal/pnp': { // ...baseTemplates['cra/default-ts'], @@ -512,7 +516,7 @@ const benchTemplates = { modifications: { skipTemplateStories: true, }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'test-runner', 'test-runner-dev', 'e2e-tests', 'chromatic'], }, 'bench/react-webpack-18-ts': { ...baseTemplates['react-webpack/18-ts'], @@ -521,7 +525,7 @@ const benchTemplates = { modifications: { skipTemplateStories: true, }, - skipTasks: ['e2e-tests-dev'], + skipTasks: ['e2e-tests-dev', 'test-runner', 'test-runner-dev', 'e2e-tests', 'chromatic'], }, } satisfies Record<`bench/${string}`, Template & { isInternal: true }>; From b6b0589af1ebd89711153bafd5a25e4d0b5f5a47 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 14:44:46 +0200 Subject: [PATCH 31/76] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a51d52b6482b..80ecc8597fb0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -652,7 +652,7 @@ workflows: requires: - create-sandboxes - test-runner-production: - parallelism: 11 + parallelism: 9 requires: - build-sandboxes - bench: From 94e19ac25bc5a722f27022b16e9368e665430932 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 14:52:18 +0200 Subject: [PATCH 32/76] set parallelism to 11 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80ecc8597fb0..ce04780bde5e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -633,11 +633,11 @@ workflows: requires: - build - create-sandboxes: - parallelism: 9 + parallelism: 11 requires: - build - build-sandboxes: - parallelism: 9 + parallelism: 11 requires: - create-sandboxes - chromatic-sandboxes: From baebb8a9354b58cf003a0962ad617d40998d06a2 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 15:40:57 +0200 Subject: [PATCH 33/76] remove the old bench CI config --- .circleci/config.yml | 94 -------------------------------------------- 1 file changed, 94 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce04780bde5e..dc03aadd5399 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -151,88 +151,6 @@ jobs: - code/renderers - code/presets - .verdaccio-cache - cra-bench: - executor: - class: large - name: sb_playwright - working_directory: /tmp/storybook - steps: - - git-shallow-clone/checkout_advanced: - clone_options: '--depth 1 --verbose' - - attach_workspace: - at: . - - run: - name: Running local registry - command: | - cd code - yarn local-registry --open - background: true - - run: - name: Wait for registry - command: | - cd code - yarn wait-on http://localhost:6001 - - run: - name: set up cra repro, skip tests - command: | - cd code - SANDBOX_ROOT=../bench yarn task --task sandbox --template cra/default-ts --skip-template-stories --start-from=never --no-link - - run: - name: Run @storybook/bench on repro - command: | - cd bench/cra-default-ts - rm -rf node_modules - mkdir node_modules - ../../code/node_modules/.bin/sb-bench 'yarn install' --label cra - - report-workflow-on-failure - - run: - name: prep artifacts - when: always - command: tar cvzf /tmp/cra-default-ts-bench.tar.gz bench/cra-default-ts - - store_artifacts: - path: /tmp/cra-default-ts-bench.tar.gz - destination: cra-default-ts-bench.tar.gz - react-vite-bench: - executor: - class: large - name: sb_playwright - working_directory: /tmp/storybook - steps: - - git-shallow-clone/checkout_advanced: - clone_options: '--depth 1 --verbose' - - attach_workspace: - at: . - - run: - name: Running local registry - command: | - cd code - yarn local-registry --open - background: true - - run: - name: Wait for registry - command: | - cd code - yarn wait-on http://localhost:6001 - - run: - name: set up react-vite repro, skip tests - command: | - cd code - SANDBOX_ROOT=../bench yarn task --task sandbox --template react-vite/default-ts --skip-template-stories --start-from=never --no-link - - run: - name: Run @storybook/bench on repro - command: | - cd bench/react-vite-default-ts - rm -rf node_modules - mkdir node_modules - ../../code/node_modules/.bin/sb-bench 'yarn install' --label react-vite - - report-workflow-on-failure - - run: - name: prep artifacts - when: always - command: tar cvzf /tmp/react-vite-default-ts-bench.tar.gz bench/react-vite-default-ts - - store_artifacts: - path: /tmp/react-vite-default-ts-bench.tar.gz - destination: react-vite-default-ts-bench.tar.gz lint: executor: class: large @@ -626,12 +544,6 @@ workflows: - coverage: requires: - unit-tests - - cra-bench: - requires: - - build - - react-vite-bench: - requires: - - build - create-sandboxes: parallelism: 11 requires: @@ -687,12 +599,6 @@ workflows: - coverage: requires: - unit-tests - - cra-bench: - requires: - - build - - react-vite-bench: - requires: - - build - create-sandboxes: parallelism: 20 requires: From 8e7baa2aa410d64962209d89cf6c8a30e4b3ee9f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 16:57:03 +0200 Subject: [PATCH 34/76] sync version of playwright --- scripts/package.json | 2 +- scripts/yarn.lock | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/scripts/package.json b/scripts/package.json index 756b3709b92d..cea4df7b6d65 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -149,7 +149,7 @@ "ora": "^5.4.1", "p-limit": "^3.1.0", "p-retry": "^5.1.2", - "playwright": "1.32.3", + "playwright": "^1.35.0", "prettier": "^2.8.0", "pretty-hrtime": "^1.0.0", "process": "^0.11.10", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 1be3294c01ba..ba740f386e0b 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -3106,7 +3106,7 @@ __metadata: ora: ^5.4.1 p-limit: ^3.1.0 p-retry: ^5.1.2 - playwright: 1.32.3 + playwright: ^1.35.0 prettier: ^2.8.0 pretty-hrtime: ^1.0.0 process: ^0.11.10 @@ -12948,23 +12948,14 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.32.3": - version: 1.32.3 - resolution: "playwright-core@npm:1.32.3" - bin: - playwright: cli.js - checksum: 8b94feb15084813607abac69ef3d4f78b345bcc89e322706e62c203b79e74096caf499ce4cd4103b1bfc853f17a9ff0573f636dc0ee88f56a5cb6ed18ce55f06 - languageName: node - linkType: hard - -"playwright@npm:1.32.3": - version: 1.32.3 - resolution: "playwright@npm:1.32.3" +"playwright-core@npm:1.35.1, playwright@npm:^1.35.0": + version: 1.35.1 + resolution: "playwright@npm:1.35.1" dependencies: - playwright-core: 1.32.3 + playwright-core: 1.35.1 bin: playwright: cli.js - checksum: 26a3a8897d1a41cd5d001859521ee44b3ac21618e638d3b2a58615672b2f325a6cdeb614dabc6b120999d8874f260c9786683644b13fe07476d4a3a47fcfff1f + checksum: db479aab7da6506ccab572d5cf3ffa7ba0ffcb874fc5eda27bc9231fef0db17cd150b412bb7f831004c3ff9e1a3743c83b02652964c84d809a5d22b9a40ba50a languageName: node linkType: hard From 7d872c6b310159ca1d2b5523a62fb962606aa560 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 17:34:12 +0200 Subject: [PATCH 35/76] add dep --- scripts/package.json | 1 + scripts/yarn.lock | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/scripts/package.json b/scripts/package.json index cea4df7b6d65..9fa5c9792ce4 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -150,6 +150,7 @@ "p-limit": "^3.1.0", "p-retry": "^5.1.2", "playwright": "^1.35.0", + "playwright-core": "^1.35.0", "prettier": "^2.8.0", "pretty-hrtime": "^1.0.0", "process": "^0.11.10", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index ba740f386e0b..a98446a00026 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -3107,6 +3107,7 @@ __metadata: p-limit: ^3.1.0 p-retry: ^5.1.2 playwright: ^1.35.0 + playwright-core: ^1.35.0 prettier: ^2.8.0 pretty-hrtime: ^1.0.0 process: ^0.11.10 @@ -12959,6 +12960,15 @@ __metadata: languageName: node linkType: hard +"playwright-core@npm:^1.35.0": + version: 1.35.1 + resolution: "playwright-core@npm:1.35.1" + bin: + playwright-core: cli.js + checksum: 378caaf452546554b01993006abf556fb2f35369355ff6cf462148ed154a177ff1cdcf7f90035c3e7cef3522435602fd4517f2f1a0a75eef92c4db4efdc24b02 + languageName: node + linkType: hard + "please-upgrade-node@npm:^3.2.0": version: 3.2.0 resolution: "please-upgrade-node@npm:3.2.0" From 7b42ad6f9d1ff1a65f993b34845046d9dbf2dec2 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 17:43:26 +0200 Subject: [PATCH 36/76] optimization --- scripts/tasks/bench-build.ts | 2 +- scripts/tasks/build.ts | 3 ++- scripts/tasks/dev.ts | 2 +- scripts/tasks/serve.ts | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/tasks/bench-build.ts b/scripts/tasks/bench-build.ts index c86fd1f815b5..70f56784cac6 100644 --- a/scripts/tasks/bench-build.ts +++ b/scripts/tasks/bench-build.ts @@ -1,6 +1,5 @@ import { PORT } from './serve'; import type { Task } from '../task'; -import { browse, saveBench, storybookConfig } from '../bench'; export const benchBuild: Task & { port: number } = { description: 'Run benchmarks against a sandbox in prod mode', @@ -10,6 +9,7 @@ export const benchBuild: Task & { port: number } = { return false; }, async run({ sandboxDir, selectedTask }) { + const { browse, saveBench, storybookConfig } = await import('../bench'); const url = `http://localhost:${this.port}?path=/story/example-button--primary`; const result = await browse(url, storybookConfig); diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index 8139a197e867..c324ea70db3f 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -1,7 +1,7 @@ import { pathExists } from 'fs-extra'; import type { Task } from '../task'; import { exec } from '../utils/exec'; -import { now, saveBench } from '../bench'; +import { now, saveBench } from '../bench/utils'; export const build: Task = { description: 'Build the static version of the sandbox', @@ -18,6 +18,7 @@ export const build: Task = { ); const time = now() - start; + await saveBench({ time }, { key: 'build', rootDir: sandboxDir }); return result; diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index f630837c3104..7da223e474c6 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -3,7 +3,7 @@ import waitOn from 'wait-on'; import type { Task } from '../task'; import { exec } from '../utils/exec'; -import { now, saveBench } from '../bench'; +import { now, saveBench } from '../bench/utils'; export const PORT = process.env.STORYBOOK_SERVE_PORT ? parseInt(process.env.STORYBOOK_SERVE_PORT, 10) diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts index 167a4c38a870..b06d3997b208 100644 --- a/scripts/tasks/serve.ts +++ b/scripts/tasks/serve.ts @@ -1,5 +1,4 @@ import detectFreePort from 'detect-port'; -import waitOn from 'wait-on'; import type { Task } from '../task'; import { exec } from '../utils/exec'; @@ -24,6 +23,7 @@ export const serve: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); + const waitOn = await import('wait-on'); await waitOn({ resources: [`http://localhost:${PORT}`], interval: 50 }); return controller; From 9619db23a708165addbb1b0e5a8dbe0c7ced1988 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 17:46:09 +0200 Subject: [PATCH 37/76] update lockfile --- scripts/yarn.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/yarn.lock b/scripts/yarn.lock index a98446a00026..0d54da353b39 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -12949,23 +12949,23 @@ __metadata: languageName: node linkType: hard -"playwright-core@npm:1.35.1, playwright@npm:^1.35.0": +"playwright-core@npm:1.35.1, playwright-core@npm:^1.35.0": version: 1.35.1 - resolution: "playwright@npm:1.35.1" - dependencies: - playwright-core: 1.35.1 + resolution: "playwright-core@npm:1.35.1" bin: - playwright: cli.js - checksum: db479aab7da6506ccab572d5cf3ffa7ba0ffcb874fc5eda27bc9231fef0db17cd150b412bb7f831004c3ff9e1a3743c83b02652964c84d809a5d22b9a40ba50a + playwright-core: cli.js + checksum: 378caaf452546554b01993006abf556fb2f35369355ff6cf462148ed154a177ff1cdcf7f90035c3e7cef3522435602fd4517f2f1a0a75eef92c4db4efdc24b02 languageName: node linkType: hard -"playwright-core@npm:^1.35.0": +"playwright@npm:^1.35.0": version: 1.35.1 - resolution: "playwright-core@npm:1.35.1" + resolution: "playwright@npm:1.35.1" + dependencies: + playwright-core: 1.35.1 bin: - playwright-core: cli.js - checksum: 378caaf452546554b01993006abf556fb2f35369355ff6cf462148ed154a177ff1cdcf7f90035c3e7cef3522435602fd4517f2f1a0a75eef92c4db4efdc24b02 + playwright: cli.js + checksum: db479aab7da6506ccab572d5cf3ffa7ba0ffcb874fc5eda27bc9231fef0db17cd150b412bb7f831004c3ff9e1a3743c83b02652964c84d809a5d22b9a40ba50a languageName: node linkType: hard From cc07e57e05f95853fcbfc763469a7fa40db224cb Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 19 Jun 2023 22:14:07 +0200 Subject: [PATCH 38/76] fix --- scripts/tasks/dev.ts | 2 +- scripts/tasks/serve.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index 7da223e474c6..95d8aacb4492 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -1,5 +1,4 @@ import detectFreePort from 'detect-port'; -import waitOn from 'wait-on'; import type { Task } from '../task'; import { exec } from '../utils/exec'; @@ -29,6 +28,7 @@ export const dev: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); + const { waitOn } = await import('wait-on'); await waitOn({ resources: [`http://localhost:${PORT}/iframe.html`], interval: 50 }); const time = now() - start; diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts index b06d3997b208..0cb96b38e3eb 100644 --- a/scripts/tasks/serve.ts +++ b/scripts/tasks/serve.ts @@ -23,7 +23,7 @@ export const serve: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); - const waitOn = await import('wait-on'); + const { waitOn } = await import('wait-on'); await waitOn({ resources: [`http://localhost:${PORT}`], interval: 50 }); return controller; From cc53ac6f060f91a991513c4715bb810a902a66ff Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Tue, 20 Jun 2023 09:55:27 +0200 Subject: [PATCH 39/76] switch to real types, fix import --- scripts/package.json | 1 + scripts/tasks/dev.ts | 2 +- scripts/tasks/serve.ts | 2 +- scripts/typings.d.ts | 1 - scripts/yarn.lock | 10 ++++++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/package.json b/scripts/package.json index 9fa5c9792ce4..c866c99ffcad 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -95,6 +95,7 @@ "@types/semver": "^7.3.4", "@types/serve-static": "^1.13.8", "@types/uuid": "^9.0.1", + "@types/wait-on": "^5.3.1", "@typescript-eslint/eslint-plugin": "^5.45.0", "@typescript-eslint/experimental-utils": "^5.45.0", "@typescript-eslint/parser": "^5.45.0", diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index 95d8aacb4492..850687dd583d 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -28,7 +28,7 @@ export const dev: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); - const { waitOn } = await import('wait-on'); + const { default: waitOn } = await import('wait-on'); await waitOn({ resources: [`http://localhost:${PORT}/iframe.html`], interval: 50 }); const time = now() - start; diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts index 0cb96b38e3eb..0fd840f07905 100644 --- a/scripts/tasks/serve.ts +++ b/scripts/tasks/serve.ts @@ -23,7 +23,7 @@ export const serve: Task = { // If aborted, we want to make sure the rejection is handled. if (!err.killed) throw err; }); - const { waitOn } = await import('wait-on'); + const { default: waitOn } = await import('wait-on'); await waitOn({ resources: [`http://localhost:${PORT}`], interval: 50 }); return controller; diff --git a/scripts/typings.d.ts b/scripts/typings.d.ts index c8256a0f4c1d..12d9b782fe64 100644 --- a/scripts/typings.d.ts +++ b/scripts/typings.d.ts @@ -1,2 +1 @@ declare module 'pretty-hrtime'; -declare module 'wait-on'; \ No newline at end of file diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 0d54da353b39..f83bafa61116 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -3051,6 +3051,7 @@ __metadata: "@types/semver": ^7.3.4 "@types/serve-static": ^1.13.8 "@types/uuid": ^9.0.1 + "@types/wait-on": ^5.3.1 "@typescript-eslint/eslint-plugin": ^5.45.0 "@typescript-eslint/experimental-utils": ^5.45.0 "@typescript-eslint/parser": ^5.45.0 @@ -3994,6 +3995,15 @@ __metadata: languageName: node linkType: hard +"@types/wait-on@npm:^5.3.1": + version: 5.3.1 + resolution: "@types/wait-on@npm:5.3.1" + dependencies: + "@types/node": "*" + checksum: fae18fa11910e0471582b762839d198852ed1b9fc75b2feae388f9f27502c16609514121fb2d9c9a63e2f973037b878b84635ac00cc8de345b5f286d26f03fc1 + languageName: node + linkType: hard + "@types/yargs-parser@npm:*": version: 21.0.0 resolution: "@types/yargs-parser@npm:21.0.0" From d74ef29284d074574b9d849c285103b0cc1ebd40 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Wed, 21 Jun 2023 10:43:40 +0200 Subject: [PATCH 40/76] silent internal type error --- .../addons/storyshots-core/src/frameworks/svelte/renderTree.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts b/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts index 78c19bd1ab66..d39cf95008e9 100644 --- a/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts +++ b/code/addons/storyshots-core/src/frameworks/svelte/renderTree.ts @@ -1,4 +1,7 @@ import { global } from '@storybook/global'; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore - types are removed in Svelte 4 but it still works. ts-ignore is safer than ts-expect-error because it's not an error in Svelte 3 +// eslint-disable-next-line import/no-unresolved import { set_current_component } from 'svelte/internal'; const { document } = global; From c3ae6375b8f6cdb73295fd60f1151386bfad3547 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 21 Jun 2023 17:14:01 +0200 Subject: [PATCH 41/76] wip --- .circleci/config.yml | 13 +- code/lib/cli/src/sandbox-templates.ts | 77 +++--- scripts/bench/browse.ts | 2 +- scripts/bench/utils.ts | 13 +- scripts/package.json | 1 + scripts/task.ts | 6 +- scripts/tasks/bench-build.ts | 21 -- scripts/tasks/bench-dev.ts | 9 - scripts/tasks/bench.ts | 45 ++++ scripts/tasks/build.ts | 32 ++- scripts/tasks/dev.ts | 18 +- scripts/tasks/sandbox-parts.ts | 19 +- scripts/tasks/sandbox.ts | 41 +++- scripts/tasks/serve.ts | 2 +- scripts/upload-bench.ts | 12 +- scripts/yarn.lock | 327 +++++++++++++++++++++++++- 16 files changed, 517 insertions(+), 121 deletions(-) delete mode 100644 scripts/tasks/bench-build.ts delete mode 100644 scripts/tasks/bench-dev.ts create mode 100644 scripts/tasks/bench.ts diff --git a/.circleci/config.yml b/.circleci/config.yml index dc03aadd5399..b25984a5e12e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -458,18 +458,13 @@ jobs: - attach_workspace: at: . - run: - # NOTE: this assumes that the bench-dev key represents BOTH tasks since they are run at the same time. - # Update if we ever run these separately! - name: Running Dev Bench - command: yarn task --task bench-dev --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit - - run: - name: Running Prod Bench - command: yarn task --task bench-build --template $(yarn get-template << pipeline.parameters.workflow >> bench-dev) --no-link --start-from=never --junit + name: Running Bench + command: yarn task --task bench --template $(yarn get-template << pipeline.parameters.workflow >> bench) --no-link --start-from=never --junit - run: name: Uploading results - command: yarn upload-bench $(yarn get-template << pipeline.parameters.workflow >> bench-dev) + command: yarn upload-bench $(yarn get-template << pipeline.parameters.workflow >> bench) - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> bench-dev) + template: $(yarn get-template << pipeline.parameters.workflow >> bench) - store_artifacts: # this is where playwright puts more complex stuff path: code/bench-results/ destination: bench-results diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index 99aa780c05db..2ca650b32eb4 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -7,8 +7,7 @@ export type SkippableTask = | 'chromatic' | 'e2e-tests' | 'e2e-tests-dev' - | 'bench-dev' - | 'bench-build'; + | 'bench'; export type TemplateKey = | keyof typeof baseTemplates @@ -81,13 +80,13 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'cra/default-ts': { name: 'Create React App (Typescript)', script: 'npx create-react-app {{beforeDir}} --template typescript', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'bench'], expected: { // TODO: change this to @storybook/cra once that package is created framework: '@storybook/react-webpack5', @@ -104,7 +103,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'nextjs/default-js': { name: 'Next.js (JavaScript)', @@ -114,7 +113,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'nextjs/default-ts': { name: 'Next.js (TypeScript)', @@ -124,7 +123,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'react-vite/default-js': { name: 'React Vite (JS)', @@ -134,7 +133,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'react-vite/default-ts': { name: 'React Vite (TS)', @@ -144,7 +143,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-vite', }, - skipTasks: ['bench-dev', 'bench-build'], + skipTasks: ['bench'], }, 'react-webpack/18-ts': { name: 'React 18 Webpack5 (TS)', @@ -154,7 +153,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'react-webpack/17-ts': { name: 'React 17 Webpack5 (TS)', @@ -165,7 +164,7 @@ const baseTemplates = { renderer: '@storybook/react', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'solid-vite/default-js': { name: 'SolidJS Vite (JS)', @@ -177,7 +176,7 @@ const baseTemplates = { }, // TODO: remove this once solid-vite framework is released inDevelopment: true, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'solid-vite/default-ts': { name: 'SolidJS Vite (TS)', @@ -189,7 +188,7 @@ const baseTemplates = { }, // TODO: remove this once solid-vite framework is released inDevelopment: true, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'vue3-vite/default-js': { name: 'Vue3 Vite (JS)', @@ -199,7 +198,7 @@ const baseTemplates = { renderer: '@storybook/vue3', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'vue3-vite/default-ts': { name: 'Vue3 Vite (TS)', @@ -209,7 +208,7 @@ const baseTemplates = { renderer: '@storybook/vue3', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'vue2-vite/2.7-js': { name: 'Vue2 Vite (vue 2.7 JS)', @@ -220,7 +219,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench'], }, 'html-webpack/default': { name: 'HTML Webpack5', @@ -230,7 +229,7 @@ const baseTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'html-vite/default-js': { name: 'HTML Vite JS', @@ -241,7 +240,7 @@ const baseTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'html-vite/default-ts': { name: 'HTML Vite TS', @@ -252,7 +251,7 @@ const baseTemplates = { renderer: '@storybook/html', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', @@ -262,7 +261,7 @@ const baseTemplates = { renderer: '@storybook/svelte', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'svelte-vite/default-ts': { name: 'Svelte Vite (TS)', @@ -273,7 +272,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench'], }, 'angular-cli/prerelease': { name: 'Angular CLI (Prerelease)', @@ -284,7 +283,7 @@ const baseTemplates = { renderer: '@storybook/angular', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'angular-cli/default-ts': { name: 'Angular CLI (latest)', @@ -295,7 +294,7 @@ const baseTemplates = { renderer: '@storybook/angular', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'angular-cli/14-ts': { name: 'Angular CLI (Version 14)', @@ -306,7 +305,7 @@ const baseTemplates = { renderer: '@storybook/angular', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'svelte-kit/skeleton-js': { name: 'Svelte Kit (JS)', @@ -317,7 +316,7 @@ const baseTemplates = { renderer: '@storybook/svelte', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'svelte-kit/skeleton-ts': { name: 'Svelte Kit (TS)', @@ -328,7 +327,7 @@ const baseTemplates = { renderer: '@storybook/svelte', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'lit-vite/default-js': { name: 'Lit Vite (JS)', @@ -340,7 +339,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench'], }, 'lit-vite/default-ts': { name: 'Lit Vite (TS)', @@ -352,7 +351,7 @@ const baseTemplates = { builder: '@storybook/builder-vite', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench'], }, 'vue-cli/default-js': { name: 'Vue-CLI (Default JS)', @@ -364,7 +363,7 @@ const baseTemplates = { builder: '@storybook/builder-webpack5', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench'], }, 'vue-cli/vue2-default-js': { name: 'Vue-CLI (Vue2 JS)', @@ -376,7 +375,7 @@ const baseTemplates = { builder: '@storybook/builder-webpack5', }, // Remove smoke-test from the list once https://github.com/storybookjs/storybook/issues/19351 is fixed. - skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['smoke-test', 'e2e-tests-dev', 'bench'], }, 'preact-webpack5/default-js': { name: 'Preact CLI (Default JS)', @@ -387,7 +386,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'preact-webpack5/default-ts': { name: 'Preact CLI (Default TS)', @@ -398,7 +397,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-webpack5', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'preact-vite/default-js': { name: 'Preact Vite (JS)', @@ -408,7 +407,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'preact-vite/default-ts': { name: 'Preact Vite (TS)', @@ -418,7 +417,7 @@ const baseTemplates = { renderer: '@storybook/preact', builder: '@storybook/builder-vite', }, - skipTasks: ['e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests-dev', 'bench'], }, 'qwik-vite/default-ts': { name: 'Qwik CLI (Default TS)', @@ -431,7 +430,7 @@ const baseTemplates = { builder: 'storybook-framework-qwik', }, // TODO: The community template does not provide standard stories, which is required for e2e tests. - skipTasks: ['e2e-tests', 'e2e-tests-dev', 'bench-dev', 'bench-build'], + skipTasks: ['e2e-tests', 'e2e-tests-dev', 'bench'], }, } satisfies Record; @@ -453,7 +452,7 @@ const internalTemplates = { }, }, }, - skipTasks: ['bench-dev', 'bench-build'], + skipTasks: ['bench'], }, 'internal/ssv6-webpack': { ...baseTemplates['cra/default-ts'], @@ -467,7 +466,7 @@ const internalTemplates = { }, }, }, - skipTasks: ['bench-dev', 'bench-build'], + skipTasks: ['bench'], }, 'internal/swc-webpack': { ...baseTemplates['react-webpack/18-ts'], @@ -486,7 +485,7 @@ const internalTemplates = { }, }, }, - skipTasks: ['bench-dev', 'bench-build'], + skipTasks: ['bench'], }, 'internal/server-webpack5': { name: 'Server Webpack5', @@ -497,7 +496,7 @@ const internalTemplates = { builder: '@storybook/builder-webpack5', }, isInternal: true, - skipTasks: ['bench-dev', 'bench-build'], + skipTasks: ['bench'], }, // 'internal/pnp': { // ...baseTemplates['cra/default-ts'], diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts index 6103cc47e70e..3c4153714788 100644 --- a/scripts/bench/browse.ts +++ b/scripts/bench/browse.ts @@ -2,7 +2,7 @@ import type { Page, FrameLocator } from 'playwright'; import { chromium } from 'playwright'; -import type { Config } from './config'; +import type { Config } from './types'; const now = () => new Date().getTime(); const TIMEOUT = 20000; diff --git a/scripts/bench/utils.ts b/scripts/bench/utils.ts index eaff2a27a94c..6de60d7cc86a 100644 --- a/scripts/bench/utils.ts +++ b/scripts/bench/utils.ts @@ -4,17 +4,18 @@ import { ensureDir, writeJSON, readJSON } from 'fs-extra'; export const now = () => new Date().getTime(); export interface SaveBenchOptions { - key: 'build' | 'dev' | 'bench-build' | 'bench-dev'; rootDir?: string; } export const saveBench = async (data: any, options: SaveBenchOptions) => { - const dirname = join(options.rootDir || process.cwd(), 'bench-results'); - await ensureDir(dirname); - await writeJSON(join(dirname, `${options.key}.json`), data, { spaces: 2 }); + const dirname = options.rootDir || process.cwd(); + const existing = await ensureDir(dirname).then(() => { + return loadBench(options).catch(() => ({})); + }); + await writeJSON(join(dirname, `bench.json`), { ...existing, ...data }, { spaces: 2 }); }; export const loadBench = async (options: SaveBenchOptions) => { - const dirname = join(options.rootDir || process.cwd(), 'bench-results'); - return readJSON(join(dirname, `${options.key}.json`)); + const dirname = options.rootDir || process.cwd(); + return readJSON(join(dirname, `bench.json`)); }; diff --git a/scripts/package.json b/scripts/package.json index 31c39e7e2dbd..328a130e6e83 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -122,6 +122,7 @@ "eslint-plugin-storybook": "^0.6.6", "execa": "^6.1.0", "express": "^4.17.3", + "fast-folder-size": "^2.1.0", "fast-glob": "^3.2.12", "find-up": "^5.0.0", "fs-extra": "^11.1.0", diff --git a/scripts/task.ts b/scripts/task.ts index 939b9f5890d9..007917577a77 100644 --- a/scripts/task.ts +++ b/scripts/task.ts @@ -26,8 +26,7 @@ import { testRunnerDev } from './tasks/test-runner-dev'; import { chromatic } from './tasks/chromatic'; import { e2eTestsBuild } from './tasks/e2e-tests-build'; import { e2eTestsDev } from './tasks/e2e-tests-dev'; -import { benchBuild } from './tasks/bench-build'; -import { benchDev } from './tasks/bench-dev'; +import { benchDev as bench } from './tasks/bench'; import { allTemplates as TEMPLATES, @@ -109,8 +108,7 @@ export const tasks = { chromatic, 'e2e-tests': e2eTestsBuild, 'e2e-tests-dev': e2eTestsDev, - 'bench-build': benchBuild, - 'bench-dev': benchDev, + bench, }; type TaskKey = keyof typeof tasks; diff --git a/scripts/tasks/bench-build.ts b/scripts/tasks/bench-build.ts deleted file mode 100644 index 70f56784cac6..000000000000 --- a/scripts/tasks/bench-build.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { PORT } from './serve'; -import type { Task } from '../task'; - -export const benchBuild: Task & { port: number } = { - description: 'Run benchmarks against a sandbox in prod mode', - dependsOn: ['serve'], - port: PORT, - async ready() { - return false; - }, - async run({ sandboxDir, selectedTask }) { - const { browse, saveBench, storybookConfig } = await import('../bench'); - const url = `http://localhost:${this.port}?path=/story/example-button--primary`; - const result = await browse(url, storybookConfig); - - await saveBench(result, { - key: selectedTask as 'bench-build' | 'bench-dev', - rootDir: sandboxDir, - }); - }, -}; diff --git a/scripts/tasks/bench-dev.ts b/scripts/tasks/bench-dev.ts deleted file mode 100644 index 24afbdaa80c2..000000000000 --- a/scripts/tasks/bench-dev.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { PORT } from './dev'; -import { benchBuild } from './bench-build'; - -export const benchDev: typeof benchBuild = { - ...benchBuild, - description: 'Run benchmarks against a sandbox in dev mode', - dependsOn: ['dev'], - port: PORT, -}; diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts new file mode 100644 index 000000000000..ac4578c5dcff --- /dev/null +++ b/scripts/tasks/bench.ts @@ -0,0 +1,45 @@ +import type { Task } from '../task'; + +import { PORT, dev } from './dev'; +import { serve } from './serve'; + +export const benchDev: Task & { port: number } = { + description: 'Run benchmarks against a sandbox in dev mode', + dependsOn: ['build'], + async ready() { + return false; + }, + + async run(details, options) { + const { browse, saveBench, storybookConfig } = await import('../bench'); + const url = `http://localhost:${PORT}?path=/story/example-button--primary`; + + const devController = await dev.run(details, options); + if (!devController) { + throw new Error('dev: controller is null'); + } + + const devBrowseResult = await browse(url, storybookConfig); + devController.abort(); + + const serveController = await serve.run(details, options); + if (!serveController) { + throw new Error('serve: controller is null'); + } + + const buildBrowseResult = await browse(url, storybookConfig); + serveController.abort(); + + await saveBench( + { + devManagerLoaded: devBrowseResult.managerLoaded, + devPreviewLoaded: devBrowseResult.previewLoaded, + buildManagerLoaded: buildBrowseResult.managerLoaded, + buildPreviewLoaded: buildBrowseResult.previewLoaded, + }, + { + rootDir: details.sandboxDir, + } + ); + }, +}; diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index c324ea70db3f..928ac31530bd 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -1,4 +1,7 @@ import { pathExists } from 'fs-extra'; +import dirSize from 'fast-folder-size'; +import { promisify } from 'util'; +import { join } from 'path'; import type { Task } from '../task'; import { exec } from '../utils/exec'; import { now, saveBench } from '../bench/utils'; @@ -17,9 +20,34 @@ export const build: Task = { { dryRun, debug } ); - const time = now() - start; + const buildTime = now() - start; + const dir = join(sandboxDir, 'storybook-static'); + const getSize = promisify(dirSize); + const buildSize = await getSize(dir); + const buildSbAddonsSize = await getSize(join(dir, 'sb-addons')); + const buildSbCommonSize = await getSize(join(dir, 'sb-common-assets')); + const buildSbManagerSize = await getSize(join(dir, 'sb-manager')); + const buildSbPreviewSize = await getSize(join(dir, 'sb-preview')); + const buildPrebuildSize = + buildSbAddonsSize + buildSbCommonSize + buildSbManagerSize + buildSbPreviewSize; - await saveBench({ time }, { key: 'build', rootDir: sandboxDir }); + const buildStaticSize = await getSize(join(dir, 'static')); + const buildPreviewSize = buildSize - buildPrebuildSize - buildStaticSize; + + await saveBench( + { + buildTime, + buildSize, + buildSbAddonsSize, + buildSbCommonSize, + buildSbManagerSize, + buildSbPreviewSize, + buildStaticSize, + buildPrebuildSize, + buildPreviewSize, + }, + { rootDir: sandboxDir } + ); return result; }, diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index 850687dd583d..50132d3a709a 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -18,6 +18,7 @@ export const dev: Task = { async run({ sandboxDir, selectedTask }, { dryRun, debug }) { const controller = new AbortController(); const devCommand = `yarn storybook --port ${PORT}${selectedTask === 'dev' ? '' : ' --ci'}`; + const { default: waitOn } = await import('wait-on'); const start = now(); exec( @@ -26,13 +27,20 @@ export const dev: Task = { { dryRun, debug, signal: controller.signal as AbortSignal } ).catch((err) => { // If aborted, we want to make sure the rejection is handled. - if (!err.killed) throw err; + if (!err.killed) { + throw err; + } }); - const { default: waitOn } = await import('wait-on'); - await waitOn({ resources: [`http://localhost:${PORT}/iframe.html`], interval: 50 }); + const [devPreviewResponsive, devManagerResponsive] = await Promise.all([ + waitOn({ resources: [`http://localhost:${PORT}/iframe.html`], interval: 16 }).then(() => { + return now() - start; + }), + waitOn({ resources: [`http://localhost:${PORT}/index.html`], interval: 16 }).then(() => { + return now() - start; + }), + ]); - const time = now() - start; - await saveBench({ time }, { key: 'dev', rootDir: sandboxDir }); + await saveBench({ devPreviewResponsive, devManagerResponsive }, { rootDir: sandboxDir }); return controller; }, diff --git a/scripts/tasks/sandbox-parts.ts b/scripts/tasks/sandbox-parts.ts index a09f9d71b882..d0e12af0cdc4 100644 --- a/scripts/tasks/sandbox-parts.ts +++ b/scripts/tasks/sandbox-parts.ts @@ -72,10 +72,7 @@ export const create: Task['run'] = async ({ key, template, sandboxDir }, { dryRu } }; -export const install: Task['run'] = async ( - { sandboxDir, template }, - { link, dryRun, debug, addon: addons, skipTemplateStories } -) => { +export const install: Task['run'] = async ({ sandboxDir }, { link, dryRun, debug }) => { const cwd = sandboxDir; await installYarn2({ cwd, dryRun, debug }); @@ -106,10 +103,20 @@ export const install: Task['run'] = async ( } ); } +}; + +export const init: Task['run'] = async ( + { sandboxDir, template }, + { dryRun, debug, addon: addons, skipTemplateStories } +) => { + const cwd = sandboxDir; let extra = {}; - if (template.expected.renderer === '@storybook/html') extra = { type: 'html' }; - else if (template.expected.renderer === '@storybook/server') extra = { type: 'server' }; + if (template.expected.renderer === '@storybook/html') { + extra = { type: 'html' }; + } else if (template.expected.renderer === '@storybook/server') { + extra = { type: 'server' }; + } await executeCLIStep(steps.init, { cwd, diff --git a/scripts/tasks/sandbox.ts b/scripts/tasks/sandbox.ts index 6607f13de396..087685ef8336 100644 --- a/scripts/tasks/sandbox.ts +++ b/scripts/tasks/sandbox.ts @@ -1,6 +1,10 @@ import { pathExists, remove } from 'fs-extra'; +import { join } from 'path'; +import { promisify } from 'util'; +import dirSize from 'fast-folder-size'; import type { Task } from '../task'; +import { now, saveBench } from '../bench/utils'; const logger = console; @@ -11,7 +15,10 @@ export const sandbox: Task = { return ['run-registry', 'generate']; } - if (link) return ['compile']; + if (link) { + return ['compile']; + } + return ['run-registry']; }, async ready({ sandboxDir }) { @@ -29,13 +36,43 @@ export const sandbox: Task = { logger.info('🗑 Removing old sandbox dir'); await remove(details.sandboxDir); } - const { create, install, addStories, extendMain } = await import('./sandbox-parts'); + + const { create, install, addStories, extendMain, init } = await import('./sandbox-parts'); + + let startTime = now(); await create(details, options); + const createTime = now() - startTime; + const createSize = 0; + + startTime = now(); await install(details, options); + const generateTime = now() - startTime; + const generateSize = await promisify(dirSize)(join(details.sandboxDir, 'node_modules')); + + startTime = now(); + await init(details, options); + const initTime = now() - startTime; + const initSize = await promisify(dirSize)(join(details.sandboxDir, 'node_modules')); + + await saveBench( + { + createTime, + generateTime, + initTime, + createSize, + generateSize, + initSize, + diffSize: initSize - generateSize, + }, + { rootDir: details.sandboxDir } + ); + if (!options.skipTemplateStories) { await addStories(details, options); } + await extendMain(details, options); + logger.info(`✅ Storybook sandbox created at ${details.sandboxDir}`); }, }; diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts index 0fd840f07905..05d183cc9606 100644 --- a/scripts/tasks/serve.ts +++ b/scripts/tasks/serve.ts @@ -24,7 +24,7 @@ export const serve: Task = { if (!err.killed) throw err; }); const { default: waitOn } = await import('wait-on'); - await waitOn({ resources: [`http://localhost:${PORT}`], interval: 50 }); + await waitOn({ resources: [`http://localhost:${PORT}`], interval: 16 }); return controller; }, diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index e3de58cb6c37..49c0c36bd7f2 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -37,13 +37,13 @@ export interface BenchResults { } const uploadBench = async () => { - const keys = ['build', 'dev', 'bench-build', 'bench-dev'] as SaveBenchOptions['key'][]; + const keys = ['build', 'dev', 'bench'] as SaveBenchOptions['key'][]; const results = {} as Record; await Promise.all( keys.map(async (key) => { try { - const val = await loadBench({ key, rootDir: templateSandboxDir }); + const val = await loadBench({ rootDir: templateSandboxDir }); results[key] = val; console.log({ key, val }); } catch (err) { @@ -61,11 +61,11 @@ const uploadBench = async () => { installSize: 0, startManagerBuild: 0, startPreviewBuild: results.dev?.time || 0, - startManagerRender: results['bench-dev']?.managerLoaded || 0, - startPreviewRender: results['bench-dev']?.previewLoaded || 0, + startManagerRender: results.bench?.managerLoaded || 0, + startPreviewRender: results.bench?.previewLoaded || 0, buildTime: results.build?.time || 0, - browseManagerRender: results['bench-build']?.managerLoaded || 0, - browsePreviewRender: results['bench-build']?.previewLoaded || 0, + browseManagerRender: results.bench?.managerLoaded || 0, + browsePreviewRender: results.bench?.previewLoaded || 0, browseSizeTotal: 0, browseSizeManagerTotal: 0, browseSizeManagerVendors: 0, diff --git a/scripts/yarn.lock b/scripts/yarn.lock index a70561bda7e4..a5dbf611c980 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2988,6 +2988,7 @@ __metadata: eslint-plugin-storybook: ^0.6.6 execa: ^6.1.0 express: ^4.17.3 + fast-folder-size: ^2.1.0 fast-glob: ^3.2.12 find-up: ^5.0.0 fs-extra: ^11.1.0 @@ -4407,6 +4408,15 @@ __metadata: languageName: node linkType: hard +"agent-base@npm:^7.0.2": + version: 7.1.0 + resolution: "agent-base@npm:7.1.0" + dependencies: + debug: ^4.3.4 + checksum: fc974ab57ffdd8421a2bc339644d312a9cca320c20c3393c9d8b1fd91731b9bbabdb985df5fc860f5b79d81c3e350daa3fcb31c5c07c0bb385aafc817df004ce + languageName: node + linkType: hard + "agentkeepalive@npm:^4.2.1": version: 4.3.0 resolution: "agentkeepalive@npm:4.3.0" @@ -5140,6 +5150,16 @@ __metadata: languageName: node linkType: hard +"bl@npm:^1.0.0": + version: 1.2.3 + resolution: "bl@npm:1.2.3" + dependencies: + readable-stream: ^2.3.5 + safe-buffer: ^5.1.1 + checksum: ee6478864d3b1295614f269f3fbabeb2362a2f2fc7f8dc2f6c1f944a278d84e0572ecefd6d0b0736d7418763f98dc3b2738253191ea9e98e4b08de211cfac0a6 + languageName: node + linkType: hard + "bl@npm:^4.0.3, bl@npm:^4.1.0": version: 4.1.0 resolution: "bl@npm:4.1.0" @@ -5258,6 +5278,30 @@ __metadata: languageName: node linkType: hard +"buffer-alloc-unsafe@npm:^1.1.0": + version: 1.1.0 + resolution: "buffer-alloc-unsafe@npm:1.1.0" + checksum: 06b9298c9369621a830227c3797ceb3ff5535e323946d7b39a7398fed8b3243798259b3c85e287608c5aad35ccc551cec1a0a5190cc8f39652e8eee25697fc9c + languageName: node + linkType: hard + +"buffer-alloc@npm:^1.2.0": + version: 1.2.0 + resolution: "buffer-alloc@npm:1.2.0" + dependencies: + buffer-alloc-unsafe: ^1.1.0 + buffer-fill: ^1.0.0 + checksum: 09d87dd53996342ccfbeb2871257d8cdb25ce9ee2259adc95c6490200cd6e528c5fbae8f30bcc323fe8d8efb0fe541e4ac3bbe9ee3f81c6b7c4b27434cc02ab4 + languageName: node + linkType: hard + +"buffer-crc32@npm:~0.2.3": + version: 0.2.13 + resolution: "buffer-crc32@npm:0.2.13" + checksum: cb0a8ddf5cf4f766466db63279e47761eb825693eeba6a5a95ee4ec8cb8f81ede70aa7f9d8aeec083e781d47154290eb5d4d26b3f7a465ec57fb9e7d59c47150 + languageName: node + linkType: hard + "buffer-equal-constant-time@npm:1.0.1": version: 1.0.1 resolution: "buffer-equal-constant-time@npm:1.0.1" @@ -5265,6 +5309,13 @@ __metadata: languageName: node linkType: hard +"buffer-fill@npm:^1.0.0": + version: 1.0.0 + resolution: "buffer-fill@npm:1.0.0" + checksum: 55b5654fbbf2d7ceb4991bb537f5e5b5b5b9debca583fee416a74fcec47c16d9e7a90c15acd27577da7bd750b7fa6396e77e7c221e7af138b6d26242381c6e4d + languageName: node + linkType: hard + "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -5272,7 +5323,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.5.0": +"buffer@npm:^5.2.1, buffer@npm:^5.5.0": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -5761,7 +5812,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.18.0": +"commander@npm:^2.18.0, commander@npm:^2.8.1": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: 74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288 @@ -5930,6 +5981,13 @@ __metadata: languageName: node linkType: hard +"core-util-is@npm:~1.0.0": + version: 1.0.3 + resolution: "core-util-is@npm:1.0.3" + checksum: 90a0e40abbddfd7618f8ccd63a74d88deea94e77d0e8dbbea059fa7ebebb8fbb4e2909667fe26f3a467073de1a542ebe6ae4c73a73745ac5833786759cd906c9 + languageName: node + linkType: hard + "cors@npm:2.8.5": version: 2.8.5 resolution: "cors@npm:2.8.5" @@ -6205,6 +6263,69 @@ __metadata: languageName: node linkType: hard +"decompress-tar@npm:^4.0.0, decompress-tar@npm:^4.1.0, decompress-tar@npm:^4.1.1": + version: 4.1.1 + resolution: "decompress-tar@npm:4.1.1" + dependencies: + file-type: ^5.2.0 + is-stream: ^1.1.0 + tar-stream: ^1.5.2 + checksum: 92d86c5dfe2a89f9b5db584668f8ed2a3107339083872c7f78b5f7d55222d954545e018c10346a50991542ad6d1406128bf1c97a24f023810993a1dcfb3c3f21 + languageName: node + linkType: hard + +"decompress-tarbz2@npm:^4.0.0": + version: 4.1.1 + resolution: "decompress-tarbz2@npm:4.1.1" + dependencies: + decompress-tar: ^4.1.0 + file-type: ^6.1.0 + is-stream: ^1.1.0 + seek-bzip: ^1.0.5 + unbzip2-stream: ^1.0.9 + checksum: d5ab2c2435a53f45da8348ffdb5ae0a3ff8fec55948b7890a1c55413de4d1e539a22978e7dcd8bd3561985878c9778253fe146cbdea429f04fa4529abb57c54e + languageName: node + linkType: hard + +"decompress-targz@npm:^4.0.0": + version: 4.1.1 + resolution: "decompress-targz@npm:4.1.1" + dependencies: + decompress-tar: ^4.1.1 + file-type: ^5.2.0 + is-stream: ^1.1.0 + checksum: 42514fb2df6248c56b2b115494b7d1d046bc582e960354ba4faad5792f261782a61d17d9ef53845abe78c0f0ecafc195cb0754c00227fa0bd0642a1bfd8eafad + languageName: node + linkType: hard + +"decompress-unzip@npm:^4.0.1": + version: 4.0.1 + resolution: "decompress-unzip@npm:4.0.1" + dependencies: + file-type: ^3.8.0 + get-stream: ^2.2.0 + pify: ^2.3.0 + yauzl: ^2.4.2 + checksum: 896f88e1c23b59cdce022227a8910c06158bd4b296c21d61af7167bd50d00e9e4355b605bdbfd7ba75d46ad277d4f881cdd037aec7165a40ccd0ee4ef59443a8 + languageName: node + linkType: hard + +"decompress@npm:^4.2.1": + version: 4.2.1 + resolution: "decompress@npm:4.2.1" + dependencies: + decompress-tar: ^4.0.0 + decompress-tarbz2: ^4.0.0 + decompress-targz: ^4.0.0 + decompress-unzip: ^4.0.1 + graceful-fs: ^4.1.10 + make-dir: ^1.0.0 + pify: ^2.3.0 + strip-dirs: ^2.0.0 + checksum: 6730279fa206aad04a8338a88ab49c596034c502b2d5f23a28d0a28290b82d9217f9e60c8b5739805474ca842fc856e08e2d64ed759f2118c2bcabe42fa9eece + languageName: node + linkType: hard + "dedent@npm:^0.7.0": version: 0.7.0 resolution: "dedent@npm:0.7.0" @@ -6699,7 +6820,7 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": +"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" dependencies: @@ -7671,6 +7792,18 @@ __metadata: languageName: node linkType: hard +"fast-folder-size@npm:^2.1.0": + version: 2.1.0 + resolution: "fast-folder-size@npm:2.1.0" + dependencies: + decompress: ^4.2.1 + https-proxy-agent: ^7.0.0 + bin: + fast-folder-size: cli.js + checksum: dd83eedd43d98c6b6f113b98b1ed3692d9ebe549626b0a892bc18fc80359a0aba773e7b66ac81e9d7530e765ac1bdacbab60105358e0e3d58e37c2b9e468079a + languageName: node + linkType: hard + "fast-glob@npm:3.2.7": version: 3.2.7 resolution: "fast-glob@npm:3.2.7" @@ -7775,6 +7908,15 @@ __metadata: languageName: node linkType: hard +"fd-slicer@npm:~1.1.0": + version: 1.1.0 + resolution: "fd-slicer@npm:1.1.0" + dependencies: + pend: ~1.2.0 + checksum: 304dd70270298e3ffe3bcc05e6f7ade2511acc278bc52d025f8918b48b6aa3b77f10361bddfadfe2a28163f7af7adbdce96f4d22c31b2f648ba2901f0c5fc20e + languageName: node + linkType: hard + "figgy-pudding@npm:^3.5.1": version: 3.5.2 resolution: "figgy-pudding@npm:3.5.2" @@ -7800,6 +7942,27 @@ __metadata: languageName: node linkType: hard +"file-type@npm:^3.8.0": + version: 3.9.0 + resolution: "file-type@npm:3.9.0" + checksum: 7ae074b350c2300807a99d428600a8ee6b2ace901400898706a20ddc2c43c9abb7e05177ff55ed67a2fd26dfa9b91857b21ec9c0ab3202b9cabebc7e65900240 + languageName: node + linkType: hard + +"file-type@npm:^5.2.0": + version: 5.2.0 + resolution: "file-type@npm:5.2.0" + checksum: c16c2f4e484a838c12b63e08637277905f08aebb1afbc291086029210aea17ded5ed701c9a4588313446ae0c1da71566b58df9a9c758a1ec300c4f80b9713cbf + languageName: node + linkType: hard + +"file-type@npm:^6.1.0": + version: 6.2.0 + resolution: "file-type@npm:6.2.0" + checksum: 3d7fe85a10bd97ca0c35fd9a20d21f5b20849bbb70985d37c34475051433f3c6109c76a3e5893bff6773037b769be9730a2db762789ecf25def9b62a4c2ee953 + languageName: node + linkType: hard + "filelist@npm:^1.0.4": version: 1.0.4 resolution: "filelist@npm:1.0.4" @@ -8200,6 +8363,16 @@ __metadata: languageName: node linkType: hard +"get-stream@npm:^2.2.0": + version: 2.3.1 + resolution: "get-stream@npm:2.3.1" + dependencies: + object-assign: ^4.0.1 + pinkie-promise: ^2.0.0 + checksum: 46c12f496e7edec688a1cc570fe7556ce91e91201fa7efb146853fb9f0a8f0b0bb9a02cf9d9e4e9d4e2097f98c83b09621d9034c25ca0cf80ae6f4dace9c3465 + languageName: node + linkType: hard + "get-stream@npm:^4.0.0": version: 4.1.0 resolution: "get-stream@npm:4.1.0" @@ -8527,7 +8700,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.1.10, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 386d011a553e02bc594ac2ca0bd6d9e4c22d7fa8cfbfc448a6d148c59ea881b092db9dbe3547ae4b88e55f1b01f7c4a2ecc53b310c042793e63aa44cf6c257f2 @@ -8867,6 +9040,16 @@ __metadata: languageName: node linkType: hard +"https-proxy-agent@npm:^7.0.0": + version: 7.0.0 + resolution: "https-proxy-agent@npm:7.0.0" + dependencies: + agent-base: ^7.0.2 + debug: 4 + checksum: 52ca5dab4c410c00673cd614013dde6ead0ad37d4fca0d2b7949914075d1e51ec398c99f05bdfc712f21a53ae80ec09bffae248c5ba01a107d9b55e6ded46de4 + languageName: node + linkType: hard + "human-signals@npm:^1.1.1": version: 1.1.1 resolution: "human-signals@npm:1.1.1" @@ -9033,7 +9216,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2 @@ -9327,6 +9510,13 @@ __metadata: languageName: node linkType: hard +"is-natural-number@npm:^4.0.1": + version: 4.0.1 + resolution: "is-natural-number@npm:4.0.1" + checksum: f05c544cb0ad39d4410e2ae2244282bf61918ebbb808b665436ffca4f6bbe908d3ae3a8d21fe143d302951f157d969986dd432098b63899561639fcd1ce1c280 + languageName: node + linkType: hard + "is-negative-zero@npm:^2.0.2": version: 2.0.2 resolution: "is-negative-zero@npm:2.0.2" @@ -9563,6 +9753,13 @@ __metadata: languageName: node linkType: hard +"isarray@npm:~1.0.0": + version: 1.0.0 + resolution: "isarray@npm:1.0.0" + checksum: 18b5be6669be53425f0b84098732670ed4e727e3af33bc7f948aac01782110eb9a18b3b329c5323bcdd3acdaae547ee077d3951317e7f133bff7105264b3003d + languageName: node + linkType: hard + "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -10962,6 +11159,15 @@ __metadata: languageName: node linkType: hard +"make-dir@npm:^1.0.0": + version: 1.3.0 + resolution: "make-dir@npm:1.3.0" + dependencies: + pify: ^3.0.0 + checksum: 5eb94f47d7ef41d89d1b8eef6539b8950d5bd99eeba093a942bfd327faa37d2d62227526b88b73633243a2ec7972d21eb0f4e5d62ae4e02a79e389f4a7bb3022 + languageName: node + linkType: hard + "make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" @@ -12686,6 +12892,13 @@ __metadata: languageName: node linkType: hard +"pend@npm:~1.2.0": + version: 1.2.0 + resolution: "pend@npm:1.2.0" + checksum: 8a87e63f7a4afcfb0f9f77b39bb92374afc723418b9cb716ee4257689224171002e07768eeade4ecd0e86f1fa3d8f022994219fb45634f2dbd78c6803e452458 + languageName: node + linkType: hard + "performance-now@npm:^2.1.0": version: 2.1.0 resolution: "performance-now@npm:2.1.0" @@ -12721,7 +12934,7 @@ __metadata: languageName: node linkType: hard -"pinkie-promise@npm:^2.0.1": +"pinkie-promise@npm:^2.0.0, pinkie-promise@npm:^2.0.1": version: 2.0.1 resolution: "pinkie-promise@npm:2.0.1" dependencies: @@ -12994,6 +13207,13 @@ __metadata: languageName: node linkType: hard +"process-nextick-args@npm:~2.0.0": + version: 2.0.1 + resolution: "process-nextick-args@npm:2.0.1" + checksum: bec089239487833d46b59d80327a1605e1c5287eaad770a291add7f45fda1bb5e28b38e0e061add0a1d0ee0984788ce74fa394d345eed1c420cacf392c554367 + languageName: node + linkType: hard + "process-warning@npm:1.0.0, process-warning@npm:^1.0.0": version: 1.0.0 resolution: "process-warning@npm:1.0.0" @@ -13283,6 +13503,21 @@ __metadata: languageName: node linkType: hard +"readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.5": + version: 2.3.8 + resolution: "readable-stream@npm:2.3.8" + dependencies: + core-util-is: ~1.0.0 + inherits: ~2.0.3 + isarray: ~1.0.0 + process-nextick-args: ~2.0.0 + safe-buffer: ~5.1.1 + string_decoder: ~1.1.1 + util-deprecate: ~1.0.1 + checksum: 7efdb01f3853bc35ac62ea25493567bf588773213f5f4a79f9c365e1ad13bab845ac0dae7bc946270dc40c3929483228415e92a3fc600cc7e4548992f41ee3fa + languageName: node + linkType: hard + "readable-stream@npm:^3.0.2, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" @@ -14273,14 +14508,14 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.1.2": +"safe-buffer@npm:5.1.2, safe-buffer@npm:~5.1.0, safe-buffer@npm:~5.1.1": version: 5.1.2 resolution: "safe-buffer@npm:5.1.2" checksum: 780ba6b5d99cc9a40f7b951d47152297d0e260f0df01472a1b99d4889679a4b94a13d644f7dbc4f022572f09ae9005fa2fbb93bbbd83643316f365a3e9a45b21 languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: 6501914237c0a86e9675d4e51d89ca3c21ffd6a31642efeba25ad65720bce6921c9e7e974e5be91a786b25aa058b5303285d3c15dbabf983a919f5f630d349f3 @@ -14350,6 +14585,18 @@ __metadata: languageName: node linkType: hard +"seek-bzip@npm:^1.0.5": + version: 1.0.6 + resolution: "seek-bzip@npm:1.0.6" + dependencies: + commander: ^2.8.1 + bin: + seek-bunzip: bin/seek-bunzip + seek-table: bin/seek-bzip-table + checksum: e4019e4498bb725ff855603595c4116ca003674b13d29cb9ed9891b2ceec884ccf7c1cb5dba0d6b50fe6ce760a011078f5744efb79823f4ddb9decb1571e9912 + languageName: node + linkType: hard + "semver-compare@npm:^1.0.0": version: 1.0.0 resolution: "semver-compare@npm:1.0.0" @@ -14970,6 +15217,15 @@ __metadata: languageName: node linkType: hard +"string_decoder@npm:~1.1.1": + version: 1.1.1 + resolution: "string_decoder@npm:1.1.1" + dependencies: + safe-buffer: ~5.1.0 + checksum: b4f89f3a92fd101b5653ca3c99550e07bdf9e13b35037e9e2a1c7b47cec4e55e06ff3fc468e314a0b5e80bfbaf65c1ca5a84978764884ae9413bec1fc6ca924e + languageName: node + linkType: hard + "stringify-object@npm:^3.3.0": version: 3.3.0 resolution: "stringify-object@npm:3.3.0" @@ -15013,6 +15269,15 @@ __metadata: languageName: node linkType: hard +"strip-dirs@npm:^2.0.0": + version: 2.1.0 + resolution: "strip-dirs@npm:2.1.0" + dependencies: + is-natural-number: ^4.0.1 + checksum: 073d6d08331ec2e87afc2c2535d7336fee1d63797384045e4ecb9908a5ac6615022ee000cc278d6bbc94147bed7350f7cf4657b6d18c377813f37e7ae329fb52 + languageName: node + linkType: hard + "strip-eof@npm:^1.0.0": version: 1.0.0 resolution: "strip-eof@npm:1.0.0" @@ -15178,6 +15443,21 @@ __metadata: languageName: node linkType: hard +"tar-stream@npm:^1.5.2": + version: 1.6.2 + resolution: "tar-stream@npm:1.6.2" + dependencies: + bl: ^1.0.0 + buffer-alloc: ^1.2.0 + end-of-stream: ^1.0.0 + fs-constants: ^1.0.0 + readable-stream: ^2.3.0 + to-buffer: ^1.1.1 + xtend: ^4.0.0 + checksum: ab8528d2cc9ccd0906d1ce6d8089030b2c92a578c57645ff4971452c8c5388b34c7152c04ed64b8510d22a66ffaf0fee58bada7d6ab41ad1e816e31993d59cf3 + languageName: node + linkType: hard + "tar-stream@npm:~2.2.0": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" @@ -15333,6 +15613,13 @@ __metadata: languageName: node linkType: hard +"to-buffer@npm:^1.1.1": + version: 1.1.1 + resolution: "to-buffer@npm:1.1.1" + checksum: fb9fc6a0103f2b06e2e01c3d291586d0148759d5584f35d0973376434d1b58bd6ee5df9273f0bb1190eb2a5747c894bf49fed571325a7ac10208a48f31736439 + languageName: node + linkType: hard + "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -15774,6 +16061,16 @@ __metadata: languageName: node linkType: hard +"unbzip2-stream@npm:^1.0.9": + version: 1.4.3 + resolution: "unbzip2-stream@npm:1.4.3" + dependencies: + buffer: ^5.2.1 + through: ^2.3.8 + checksum: 2ea2048f3c9db3499316ccc1d95ff757017ccb6f46c812d7c42466247e3b863fb178864267482f7f178254214247779daf68e85f50bd7736c3c97ba2d58b910a + languageName: node + linkType: hard + "unicode-canonical-property-names-ecmascript@npm:^2.0.0": version: 2.0.0 resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0" @@ -16248,7 +16545,7 @@ __metadata: languageName: node linkType: hard -"util-deprecate@npm:^1.0.1": +"util-deprecate@npm:^1.0.1, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" checksum: 41a5bdd214df2f6c3ecf8622745e4a366c4adced864bc3c833739791aeeeb1838119af7daed4ba36428114b5c67dcda034a79c882e97e43c03e66a4dd7389942 @@ -16992,7 +17289,7 @@ __metadata: languageName: node linkType: hard -"xtend@npm:^4.0.2, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:^4.0.2, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: 366ae4783eec6100f8a02dff02ac907bf29f9a00b82ac0264b4d8b832ead18306797e283cf19de776538babfdcb2101375ec5646b59f08c52128ac4ab812ed0e @@ -17056,6 +17353,16 @@ __metadata: languageName: node linkType: hard +"yauzl@npm:^2.4.2": + version: 2.10.0 + resolution: "yauzl@npm:2.10.0" + dependencies: + buffer-crc32: ~0.2.3 + fd-slicer: ~1.1.0 + checksum: f265002af7541b9ec3589a27f5fb8f11cf348b53cc15e2751272e3c062cd73f3e715bc72d43257de71bbaecae446c3f1b14af7559e8ab0261625375541816422 + languageName: node + linkType: hard + "yn@npm:3.1.1": version: 3.1.1 resolution: "yn@npm:3.1.1" From 16aa7229be13c69edcf08800aa0ff9470fa5005b Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 21 Jun 2023 17:14:51 +0200 Subject: [PATCH 42/76] wip --- scripts/task.ts | 2 +- scripts/tasks/bench.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/task.ts b/scripts/task.ts index 007917577a77..66314121768a 100644 --- a/scripts/task.ts +++ b/scripts/task.ts @@ -26,7 +26,7 @@ import { testRunnerDev } from './tasks/test-runner-dev'; import { chromatic } from './tasks/chromatic'; import { e2eTestsBuild } from './tasks/e2e-tests-build'; import { e2eTestsDev } from './tasks/e2e-tests-dev'; -import { benchDev as bench } from './tasks/bench'; +import { bench } from './tasks/bench'; import { allTemplates as TEMPLATES, diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index ac4578c5dcff..6211c32cd409 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -3,7 +3,7 @@ import type { Task } from '../task'; import { PORT, dev } from './dev'; import { serve } from './serve'; -export const benchDev: Task & { port: number } = { +export const bench: Task = { description: 'Run benchmarks against a sandbox in dev mode', dependsOn: ['build'], async ready() { From ee122a471ecae2a44d719ec7fbc13a5ccffa1dcc Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 21 Jun 2023 22:42:05 +0200 Subject: [PATCH 43/76] it works --- scripts/bench/browse.ts | 127 +++++++++++++++++++++++++++------------- scripts/bench/config.ts | 7 --- scripts/bench/index.ts | 1 - scripts/package.json | 4 ++ scripts/tasks/bench.ts | 78 ++++++++++++++++-------- scripts/tasks/serve.ts | 7 ++- scripts/typings.d.ts | 1 - scripts/yarn.lock | 43 ++++++++++++++ 8 files changed, 191 insertions(+), 77 deletions(-) delete mode 100644 scripts/bench/config.ts delete mode 100644 scripts/typings.d.ts diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts index 3c4153714788..db44d57107b9 100644 --- a/scripts/bench/browse.ts +++ b/scripts/bench/browse.ts @@ -1,54 +1,99 @@ /* eslint-disable no-await-in-loop */ -import type { Page, FrameLocator } from 'playwright'; +import type { Page, FrameLocator, Browser } from 'playwright'; import { chromium } from 'playwright'; -import type { Config } from './types'; +import { now } from './utils'; -const now = () => new Date().getTime(); const TIMEOUT = 20000; -export const browse = async (url: string, config: Config) => { - if (!config.managerLoaded && !config.previewLoadedText) return undefined; +interface Result { + managerHeaderVisible?: number; + managerIndexVisible?: number; + storyVisible?: number; + docsVisible?: number; +} +export const browse = async (url: string) => { const start = now(); - let managerLoaded; - let previewLoaded; + const result: Result = {}; const browser = await chromium.launch(/* { headless: false } */); - const page = await browser.newPage(); - page.on('console', (msg: any) => { - const type = msg.type(); - console.log(type, msg.text()); - }); - - await page.goto(url); - - if (config.managerLoaded) { - await page.waitForSelector(config.managerLoaded, { state: 'attached' }); - managerLoaded = now() - start; - console.log('manager', new Date(), config.managerLoaded, managerLoaded); - } - - if (config.previewLoadedText) { - let previewFrame: FrameLocator | Page; - previewFrame = page; - if (config.previewFrameLocator) { - previewFrame = await page.frameLocator(config.previewFrameLocator); - } - - let actualText; - while (now() - start < TIMEOUT && (!actualText || !actualText.length)) { - const preview = await previewFrame.getByText(config.previewLoadedText); - actualText = await preview.innerText(); - } - console.log({ actualText }); - if (!actualText?.includes(config.previewLoadedText)) { - throw new Error('previewLoadedText not found'); - } - previewLoaded = now() - start; - console.log('preview', new Date(), config.previewLoadedText, previewLoaded); - } + + Object.assign(result, await benchStory(browser, url, start)); + Object.assign(result, await benchDocs(browser, url, start)); await browser.close(); - return { managerLoaded, previewLoaded }; + + return result; }; + +async function benchDocs(browser: Browser, url: string, start: number) { + const page = await browser.newPage(); + const result: Result = {}; + await page.goto(`${url}?path=/docs/example-button--docs`); + + const tasks = [ + async () => { + let previewFrame: FrameLocator | Page = page; + previewFrame = await page.frameLocator('#storybook-preview-iframe'); + + let actualText; + while (now() - start < TIMEOUT && (!actualText || !actualText.length)) { + const preview = await previewFrame.getByText('Primary UI component for user interaction'); + actualText = await preview.innerText(); + } + + if (!actualText?.includes('Primary UI component for user interaction')) { + throw new Error('docs not visible in time'); + } + + result.docsVisible = now() - start; + }, + ]; + + await Promise.all(tasks.map((t) => t())); + + await page.close(); + + return result; +} + +async function benchStory(browser: Browser, url: string, start: number) { + const page = await browser.newPage(); + const result: Result = {}; + await page.goto(`${url}?path=/story/example-button--primary`); + + const tasks = [ + // + async () => { + await page.waitForSelector('.sidebar-header', { state: 'attached' }); + result.managerHeaderVisible = now() - start; + }, + async () => { + await page.waitForSelector('#example-button--primary', { state: 'attached' }); + result.managerIndexVisible = now() - start; + }, + async () => { + let previewFrame: FrameLocator | Page = page; + previewFrame = await page.frameLocator('#storybook-preview-iframe'); + + let actualText; + while (now() - start < TIMEOUT && (!actualText || !actualText.length)) { + const preview = await previewFrame.getByText('Button'); + actualText = await preview.innerText(); + } + + if (!actualText?.includes('Button')) { + throw new Error('preview not visible in time'); + } + + result.storyVisible = now() - start; + }, + ]; + + await Promise.all(tasks.map((t) => t())); + + await page.close(); + + return result; +} diff --git a/scripts/bench/config.ts b/scripts/bench/config.ts deleted file mode 100644 index 916313aaf142..000000000000 --- a/scripts/bench/config.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { Config } from './types'; - -export const storybookConfig: Config = { - managerLoaded: '.sidebar-header', - previewFrameLocator: '#storybook-preview-iframe', - previewLoadedText: 'Button', -}; diff --git a/scripts/bench/index.ts b/scripts/bench/index.ts index 59042055d8cf..95cd92527aae 100644 --- a/scripts/bench/index.ts +++ b/scripts/bench/index.ts @@ -1,4 +1,3 @@ export * from './types'; -export * from './config'; export * from './utils'; export { browse } from './browse'; diff --git a/scripts/package.json b/scripts/package.json index 328a130e6e83..3b9ea58ecc9e 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -86,9 +86,11 @@ "@types/escodegen": "^0.0.6", "@types/express": "^4.17.11", "@types/fs-extra": "^11.0.1", + "@types/http-server": "^0.12.1", "@types/lodash": "^4", "@types/node": "^16.0.0", "@types/node-fetch": "^2.5.7", + "@types/pretty-hrtime": "^1.0.0", "@types/prompts": "2.0.11", "@types/react": "^16.14.34", "@types/react-dom": "^16.9.17", @@ -154,7 +156,9 @@ "playwright": "^1.35.0", "playwright-core": "^1.35.0", "prettier": "^2.8.0", + "pretty-bytes": "^6.1.0", "pretty-hrtime": "^1.0.0", + "pretty-ms": "^8.0.0", "process": "^0.11.10", "prompts": "^2.4.0", "react": "16.14.0", diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 6211c32cd409..96051464228c 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -3,6 +3,9 @@ import type { Task } from '../task'; import { PORT, dev } from './dev'; import { serve } from './serve'; +// eslint-disable-next-line @typescript-eslint/no-implied-eval +const dynamicImport = new Function('specifier', 'return import(specifier)'); + export const bench: Task = { description: 'Run benchmarks against a sandbox in dev mode', dependsOn: ['build'], @@ -11,35 +14,60 @@ export const bench: Task = { }, async run(details, options) { - const { browse, saveBench, storybookConfig } = await import('../bench'); - const url = `http://localhost:${PORT}?path=/story/example-button--primary`; + const controllers: AbortController[] = []; + try { + const { browse, saveBench, loadBench } = await import('../bench'); + const { default: prettyBytes } = await dynamicImport('pretty-bytes'); + const { default: prettyTime } = await dynamicImport('pretty-ms'); - const devController = await dev.run(details, options); - if (!devController) { - throw new Error('dev: controller is null'); - } + const url = `http://localhost:${PORT}`; - const devBrowseResult = await browse(url, storybookConfig); - devController.abort(); + const devController = await dev.run(details, { ...options, debug: false }); + if (!devController) { + throw new Error('dev: controller is null'); + } + controllers.push(devController); - const serveController = await serve.run(details, options); - if (!serveController) { - throw new Error('serve: controller is null'); - } + const devBrowseResult = await browse(url); + devController.abort(); - const buildBrowseResult = await browse(url, storybookConfig); - serveController.abort(); - - await saveBench( - { - devManagerLoaded: devBrowseResult.managerLoaded, - devPreviewLoaded: devBrowseResult.previewLoaded, - buildManagerLoaded: buildBrowseResult.managerLoaded, - buildPreviewLoaded: buildBrowseResult.previewLoaded, - }, - { - rootDir: details.sandboxDir, + const serveController = await serve.run(details, { ...options, debug: false }); + if (!serveController) { + throw new Error('serve: controller is null'); } - ); + controllers.push(serveController); + + const buildBrowseResult = await browse(url); + serveController.abort(); + + await saveBench( + { + devManagerHeaderVisible: devBrowseResult.managerHeaderVisible, + devManagerIndexVisible: devBrowseResult.managerIndexVisible, + devStoryVisible: devBrowseResult.storyVisible, + devDocsVisible: devBrowseResult.docsVisible, + + buildManagerHeaderVisible: buildBrowseResult.managerHeaderVisible, + buildManagerIndexVisible: buildBrowseResult.managerIndexVisible, + buildPreviewVisible: buildBrowseResult.storyVisible, + buildDocsVisible: buildBrowseResult.docsVisible, + }, + { + rootDir: details.sandboxDir, + } + ); + + const data = await loadBench({ rootDir: details.sandboxDir }); + Object.entries(data).forEach(([key, value]) => { + if (key.includes('Size')) { + console.log(`${key}: ${prettyBytes(value)}`); + } else { + console.log(`${key}: ${prettyTime(value)}`); + } + }); + } catch (e) { + controllers.forEach((c) => c.abort()); + throw e; + } }, }; diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts index 05d183cc9606..f5e637f33bb9 100644 --- a/scripts/tasks/serve.ts +++ b/scripts/tasks/serve.ts @@ -6,6 +6,7 @@ import { exec } from '../utils/exec'; export const PORT = process.env.STORYBOOK_SERVE_PORT ? parseInt(process.env.STORYBOOK_SERVE_PORT, 10) : 8001; + export const serve: Task = { description: 'Serve the build storybook for a sandbox', service: true, @@ -16,12 +17,14 @@ export const serve: Task = { async run({ builtSandboxDir, codeDir }, { debug, dryRun }) { const controller = new AbortController(); exec( - `yarn http-server ${builtSandboxDir} --port ${PORT}`, + `yarn http-server ${builtSandboxDir} --port ${PORT} -s`, { cwd: codeDir }, { dryRun, debug, signal: controller.signal as AbortSignal } ).catch((err) => { // If aborted, we want to make sure the rejection is handled. - if (!err.killed) throw err; + if (!err.killed) { + throw err; + } }); const { default: waitOn } = await import('wait-on'); await waitOn({ resources: [`http://localhost:${PORT}`], interval: 16 }); diff --git a/scripts/typings.d.ts b/scripts/typings.d.ts deleted file mode 100644 index 12d9b782fe64..000000000000 --- a/scripts/typings.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module 'pretty-hrtime'; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index a5dbf611c980..00e809b69dbd 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2951,9 +2951,11 @@ __metadata: "@types/escodegen": ^0.0.6 "@types/express": ^4.17.11 "@types/fs-extra": ^11.0.1 + "@types/http-server": ^0.12.1 "@types/lodash": ^4 "@types/node": ^16.0.0 "@types/node-fetch": ^2.5.7 + "@types/pretty-hrtime": ^1.0.0 "@types/prompts": 2.0.11 "@types/react": ^16.14.34 "@types/react-dom": ^16.9.17 @@ -3020,7 +3022,9 @@ __metadata: playwright: ^1.35.0 playwright-core: ^1.35.0 prettier: ^2.8.0 + pretty-bytes: ^6.1.0 pretty-hrtime: ^1.0.0 + pretty-ms: ^8.0.0 process: ^0.11.10 prompts: ^2.4.0 react: 16.14.0 @@ -3530,6 +3534,15 @@ __metadata: languageName: node linkType: hard +"@types/http-server@npm:^0.12.1": + version: 0.12.1 + resolution: "@types/http-server@npm:0.12.1" + dependencies: + "@types/connect": "*" + checksum: 9b2397640b961589b23c98c5b1ed9f507fe07413f5723b3b4f447740d70ed702a356ec32dfa7e77fc477505f65758e423ee8745b879efb1fdddc23a840c29534 + languageName: node + linkType: hard + "@types/is-empty@npm:^1.0.0": version: 1.2.1 resolution: "@types/is-empty@npm:1.2.1" @@ -3711,6 +3724,13 @@ __metadata: languageName: node linkType: hard +"@types/pretty-hrtime@npm:^1.0.0": + version: 1.0.1 + resolution: "@types/pretty-hrtime@npm:1.0.1" + checksum: e990110a3626e987319092c5149d5ea244785b83fbbd8e62605714ec1fa4317a3524ae0b6381cdc2ca92619d9a451b3fe9ff4085c42826f5398e3380d3031bff + languageName: node + linkType: hard + "@types/prompts@npm:2.0.11": version: 2.0.11 resolution: "@types/prompts@npm:2.0.11" @@ -12787,6 +12807,13 @@ __metadata: languageName: node linkType: hard +"parse-ms@npm:^3.0.0": + version: 3.0.0 + resolution: "parse-ms@npm:3.0.0" + checksum: 056b4a32a9d3749f3f4cfffefb45c45540491deaa8e1d8ad43c2ddde7ba04edd076bd1b298f521238bb5fb084a9b2c4a2ebb78aefa651afbc4c2b0af4232fc54 + languageName: node + linkType: hard + "parse-passwd@npm:^1.0.0": version: 1.0.0 resolution: "parse-passwd@npm:1.0.0" @@ -13159,6 +13186,13 @@ __metadata: languageName: node linkType: hard +"pretty-bytes@npm:^6.1.0": + version: 6.1.0 + resolution: "pretty-bytes@npm:6.1.0" + checksum: 717ed82f8d4bbf038b623062d360bf71fe9107c3f2c43de7d0fd3e9610780306e38059d8d8356bc2c151d2929fada934c051f7d51be2587ebe8f426268b43112 + languageName: node + linkType: hard + "pretty-format@npm:^27.0.2": version: 27.5.1 resolution: "pretty-format@npm:27.5.1" @@ -13188,6 +13222,15 @@ __metadata: languageName: node linkType: hard +"pretty-ms@npm:^8.0.0": + version: 8.0.0 + resolution: "pretty-ms@npm:8.0.0" + dependencies: + parse-ms: ^3.0.0 + checksum: e960d633ecca45445cf5c6dffc0f5e4bef6744c92449ab0e8c6c704800675ab71e181c5e02ece5265e02137a33e313d3f3e355fbf8ea30b4b5b23de423329f8d + languageName: node + linkType: hard + "prettyjson@npm:^1.2.1": version: 1.2.5 resolution: "prettyjson@npm:1.2.5" From f83b18d35ca13e4d2c07cdbbd264b248213abb81 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Wed, 21 Jun 2023 22:57:37 +0200 Subject: [PATCH 44/76] update the upload script --- scripts/upload-bench.ts | 111 ++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 50 deletions(-) diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 49c0c36bd7f2..17fc0b3c5c76 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -3,7 +3,6 @@ import { join } from 'path'; import { BigQuery } from '@google-cloud/bigquery'; import { loadBench } from './bench'; -import type { SaveBenchOptions } from './bench'; import { SANDBOX_DIRECTORY, CODE_DIRECTORY } from './utils/constants'; import { execaCommand } from './utils/exec'; @@ -18,75 +17,87 @@ export interface BenchResults { commit: string; timestamp: string; label: string; - installTime: number; - installSize: number; - startManagerBuild: number; - startPreviewBuild: number; - startManagerRender: number; - startPreviewRender: number; + + createTime: number; + generateTime: number; + initTime: number; + createSize: number; + generateSize: number; + initSize: number; + diffSize: number; buildTime: number; - browseManagerRender: number; - browsePreviewRender: number; - browseSizeTotal: number; - browseSizeManagerTotal: number; - browseSizeManagerVendors: number; - browseSizeManagerUiDll: number; - browseSizePreviewTotal: number; - browseSizePreviewVendors: number; - browseSizePreviewDocsDll: number; + buildSize: number; + buildSbAddonsSize: number; + buildSbCommonSize: number; + buildSbManagerSize: number; + buildSbPreviewSize: number; + buildStaticSize: number; + buildPrebuildSize: number; + buildPreviewSize: number; + devPreviewResponsive: number; + devManagerResponsive: number; + devManagerLoaded: number; + devPreviewLoaded: number; + buildManagerLoaded: number; + buildPreviewLoaded: number; } +const defaults: Record = { + branch: null, + commit: null, + timestamp: null, + label: null, + + createTime: null, + generateTime: null, + initTime: null, + createSize: null, + generateSize: null, + initSize: null, + diffSize: null, + buildTime: null, + buildSize: null, + buildSbAddonsSize: null, + buildSbCommonSize: null, + buildSbManagerSize: null, + buildSbPreviewSize: null, + buildStaticSize: null, + buildPrebuildSize: null, + buildPreviewSize: null, + devPreviewResponsive: null, + devManagerResponsive: null, + devManagerLoaded: null, + devPreviewLoaded: null, + buildManagerLoaded: null, + buildPreviewLoaded: null, +}; const uploadBench = async () => { - const keys = ['build', 'dev', 'bench'] as SaveBenchOptions['key'][]; - const results = {} as Record; + const results = await loadBench({ rootDir: templateSandboxDir }); - await Promise.all( - keys.map(async (key) => { - try { - const val = await loadBench({ rootDir: templateSandboxDir }); - results[key] = val; - console.log({ key, val }); - } catch (err) { - console.log(`Failed to load bench for the key ${key}:`, err); - } - }) - ); const row = { + ...defaults, branch: process.env.CIRCLE_BRANCH || (await execaCommand('git rev-parse --abbrev-ref HEAD')).stdout, commit: process.env.CIRCLE_SHA1 || (await execaCommand('git rev-parse HEAD')).stdout, timestamp: new Date().toISOString(), label: templateKey, - installTime: 0, - installSize: 0, - startManagerBuild: 0, - startPreviewBuild: results.dev?.time || 0, - startManagerRender: results.bench?.managerLoaded || 0, - startPreviewRender: results.bench?.previewLoaded || 0, - buildTime: results.build?.time || 0, - browseManagerRender: results.bench?.managerLoaded || 0, - browsePreviewRender: results.bench?.previewLoaded || 0, - browseSizeTotal: 0, - browseSizeManagerTotal: 0, - browseSizeManagerVendors: 0, - browseSizeManagerUiDll: 0, - browseSizePreviewTotal: 0, - browseSizePreviewVendors: 0, - browseSizePreviewDocsDll: 0, + ...results, } as BenchResults; - const bigquery = new BigQuery({ + const store = new BigQuery({ projectId: GCP_CREDENTIALS.project_id, credentials: GCP_CREDENTIALS, }); - const dataset = bigquery.dataset('benchmark_results'); + const dataset = store.dataset('benchmark_results'); const appTable = dataset.table('bench_new'); - console.log('inserting', row); await appTable.insert([row]); - console.log('inserted'); - await copy(`${templateSandboxDir}/bench-results`, `${CODE_DIRECTORY}/bench-results`); + // for CI artifacts + await copy( + `${templateSandboxDir}/bench.json`, + `${CODE_DIRECTORY}/bench-results/${templateSandboxDir}.json` + ); }; uploadBench().then(() => { From 13f4caee14752f57f12fedcdf902da996d55d7b1 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 01:02:57 +0200 Subject: [PATCH 45/76] fix vite projects --- scripts/tasks/build.ts | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index 928ac31530bd..c9dbfc253e43 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -14,11 +14,8 @@ export const build: Task = { }, async run({ sandboxDir }, { dryRun, debug }) { const start = now(); - const result = await exec( - `yarn build-storybook --quiet`, - { cwd: sandboxDir }, - { dryRun, debug } - ); + + await exec(`yarn build-storybook --quiet`, { cwd: sandboxDir }, { dryRun, debug }); const buildTime = now() - start; const dir = join(sandboxDir, 'storybook-static'); @@ -31,7 +28,7 @@ export const build: Task = { const buildPrebuildSize = buildSbAddonsSize + buildSbCommonSize + buildSbManagerSize + buildSbPreviewSize; - const buildStaticSize = await getSize(join(dir, 'static')); + const buildStaticSize = await getSize(join(dir, 'static')).catch(() => 0); const buildPreviewSize = buildSize - buildPrebuildSize - buildStaticSize; await saveBench( @@ -48,7 +45,5 @@ export const build: Task = { }, { rootDir: sandboxDir } ); - - return result; }, }; From 70e26014d32188944d21a38227324f40a496c82d Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 22 Jun 2023 14:45:12 +0800 Subject: [PATCH 46/76] Upload to new bench2 table --- scripts/bench/bench.schema | 26 ++++++++++++++++++++++++++ scripts/bench/types.ts | 23 ----------------------- scripts/upload-bench.ts | 5 ++++- 3 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 scripts/bench/bench.schema diff --git a/scripts/bench/bench.schema b/scripts/bench/bench.schema new file mode 100644 index 000000000000..37069885dbb8 --- /dev/null +++ b/scripts/bench/bench.schema @@ -0,0 +1,26 @@ +branch: STRING, +commit: STRING, +timestamp: STRING, +label: STRING, +createTime: INTEGER, +generateTime: INTEGER, +initTime: INTEGER, +createSize: INTEGER, +generateSize: INTEGER, +initSize: INTEGER, +diffSize: INTEGER, +buildTime: INTEGER, +buildSize: INTEGER, +buildSbAddonsSize: INTEGER, +buildSbCommonSize: INTEGER, +buildSbManagerSize: INTEGER, +buildSbPreviewSize: INTEGER, +buildStaticSize: INTEGER, +buildPrebuildSize: INTEGER, +buildPreviewSize: INTEGER, +devPreviewResponsive: INTEGER, +devManagerResponsive: INTEGER, +devManagerLoaded: INTEGER, +devPreviewLoaded: INTEGER, +buildManagerLoaded: INTEGER, +buildPreviewLoaded: INTEGER \ No newline at end of file diff --git a/scripts/bench/types.ts b/scripts/bench/types.ts index 31c5875d170b..fc857f910490 100644 --- a/scripts/bench/types.ts +++ b/scripts/bench/types.ts @@ -1,26 +1,3 @@ -export interface BenchResults { - branch: string; - commit: string; - timestamp: string; - label: string; - installTime: number; - installSize: number; - startManagerBuild: number; - startPreviewBuild: number; - startManagerRender: number; - startPreviewRender: number; - buildTime: number; - browseManagerRender: number; - browsePreviewRender: number; - browseSizeTotal: number; - browseSizeManagerTotal: number; - browseSizeManagerVendors: number; - browseSizeManagerUiDll: number; - browseSizePreviewTotal: number; - browseSizePreviewVendors: number; - browseSizePreviewDocsDll: number; -} - export interface Config { install?: string; dev?: string; diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 17fc0b3c5c76..b7582de03507 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -12,6 +12,8 @@ const GCP_CREDENTIALS = JSON.parse(process.env.GCP_CREDENTIALS || '{}'); const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY; const templateSandboxDir = templateKey && join(sandboxDir, templateKey.replace('/', '-')); +// NOTE: this must be kept in sync with ./bench/bench.schema, which defines +// the table schema in BigQuery export interface BenchResults { branch: string; commit: string; @@ -41,6 +43,7 @@ export interface BenchResults { buildManagerLoaded: number; buildPreviewLoaded: number; } + const defaults: Record = { branch: null, commit: null, @@ -89,7 +92,7 @@ const uploadBench = async () => { credentials: GCP_CREDENTIALS, }); const dataset = store.dataset('benchmark_results'); - const appTable = dataset.table('bench_new'); + const appTable = dataset.table('bench2'); await appTable.insert([row]); From 2ec97e5aeaf5fd4f4ed0274203130ec76f130355 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Thu, 22 Jun 2023 15:24:29 +0800 Subject: [PATCH 47/76] Update upload types/schema & document --- scripts/bench/bench.schema | 12 ++++++++---- scripts/upload-bench.ts | 38 ++++++++++++++++++++++++++++++++++---- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/scripts/bench/bench.schema b/scripts/bench/bench.schema index 37069885dbb8..c440cf39bc00 100644 --- a/scripts/bench/bench.schema +++ b/scripts/bench/bench.schema @@ -20,7 +20,11 @@ buildPrebuildSize: INTEGER, buildPreviewSize: INTEGER, devPreviewResponsive: INTEGER, devManagerResponsive: INTEGER, -devManagerLoaded: INTEGER, -devPreviewLoaded: INTEGER, -buildManagerLoaded: INTEGER, -buildPreviewLoaded: INTEGER \ No newline at end of file +devManagerHeaderVisible: INTEGER, +devManagerIndexVisible: INTEGER, +devStoryVisible: INTEGER, +devDocsVisible: INTEGER, +buildManagerHeaderVisible: INTEGER, +buildManagerIndexVisible: INTEGER, +buildStoryVisible: INTEGER, +buildDocsVisible: INTEGER \ No newline at end of file diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index b7582de03507..d47c1ed5dd18 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -20,28 +20,58 @@ export interface BenchResults { timestamp: string; label: string; + /** The time it takes to create the base sandbox without storybook */ createTime: number; + /** The time it takes to install the base sandbox after it has been initialized */ generateTime: number; + /** The time it takes to run `sb init` on the base sandbox */ initTime: number; + /** Size of base sandbox node_modules without storybook pre-install */ createSize: number; + /** Size of base sandbox node_modules without storybook post-install */ generateSize: number; + /** Size of the sandbox node_modules post `sb init` */ initSize: number; + /** Difference bewtween `initSize` and `generateSize` */ diffSize: number; + /** Full `sb build` time */ buildTime: number; + /** Size of the storybook-static directory in total */ buildSize: number; + /** Size of the storybook-static/sb-addons in total */ buildSbAddonsSize: number; + /** Size of the storybook-static/sb-common-assets */ buildSbCommonSize: number; + /** Size of the storybook-static/sb-manager */ buildSbManagerSize: number; + /** Size of storybook-static/sb-preview */ buildSbPreviewSize: number; + /** Size of the `static` directory if it exists */ buildStaticSize: number; + /** Total size of `sb-x` above */ buildPrebuildSize: number; + /** Total size of everything else (user's stories & components & CSS & assets etc.) */ buildPreviewSize: number; + /** Time to wait-on iframe.html */ devPreviewResponsive: number; + /** Time to wait-on index.html */ devManagerResponsive: number; - devManagerLoaded: number; - devPreviewLoaded: number; - buildManagerLoaded: number; - buildPreviewLoaded: number; + /** Time to browse to index.html and view the SB logo */ + devManagerHeaderVisible: number; + /** Time to browse to index.html and load the story index */ + devManagerIndexVisible: number; + /** Time to browse to index.html and load iframe content and the story is rendered */ + devStoryVisible: number; + /** Time to browse to index.html and load iframe content and the docs page is rendered */ + devDocsVisible: number; + /** Time to browse to index.html and view the SB logo */ + buildManagerHeaderVisible: number; + /** Time to browse to index.html and load the story index */ + buildManagerIndexVisible: number; + /** Time to browse to index.html and load iframe content and the story is rendered */ + buildStoryVisible: number; + /** Time to browse to index.html and load iframe content and the docs page is rendered */ + buildDocsVisible: number; } const defaults: Record = { From ac6984f038b896c3acd5b253c5f82a6a7265a852 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 09:38:52 +0200 Subject: [PATCH 48/76] strict typing --- scripts/bench/index.ts | 3 -- scripts/bench/types.ts | 76 +++++++++++++++++++++++++++++++--------- scripts/bench/utils.ts | 5 +-- scripts/tasks/bench.ts | 9 +++-- scripts/upload-bench.ts | 77 ++++++----------------------------------- 5 files changed, 80 insertions(+), 90 deletions(-) delete mode 100644 scripts/bench/index.ts diff --git a/scripts/bench/index.ts b/scripts/bench/index.ts deleted file mode 100644 index 95cd92527aae..000000000000 --- a/scripts/bench/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './types'; -export * from './utils'; -export { browse } from './browse'; diff --git a/scripts/bench/types.ts b/scripts/bench/types.ts index fc857f910490..2f2e0277fe9b 100644 --- a/scripts/bench/types.ts +++ b/scripts/bench/types.ts @@ -1,17 +1,61 @@ -export interface Config { - install?: string; - dev?: string; - devUrl?: string; - build?: string; - serve?: string; - serveUrl?: number; - managerLoaded?: string; - previewFrameLocator?: string; - previewLoadedText?: string; - /** - * If set, wait this amount of time (ms) after the dev server - * starts before starting the browser. Used for Histoire, which - * is incompatible with `wait-on` for some reason. - */ - waitOnTimeout?: number; +// NOTE: this must be kept in sync with ./bench.schema, which defines +// the table schema in BigQuery +export interface BenchResults { + branch: string; + commit: string; + timestamp: string; + label: string; + + /** The time it takes to create the base sandbox without storybook */ + createTime: number; + /** The time it takes to install the base sandbox after it has been initialized */ + generateTime: number; + /** The time it takes to run `sb init` on the base sandbox */ + initTime: number; + /** Size of base sandbox node_modules without storybook pre-install */ + createSize: number; + /** Size of base sandbox node_modules without storybook post-install */ + generateSize: number; + /** Size of the sandbox node_modules post `sb init` */ + initSize: number; + /** Difference bewtween `initSize` and `generateSize` */ + diffSize: number; + /** Full `sb build` time */ + buildTime: number; + /** Size of the storybook-static directory in total */ + buildSize: number; + /** Size of the storybook-static/sb-addons in total */ + buildSbAddonsSize: number; + /** Size of the storybook-static/sb-common-assets */ + buildSbCommonSize: number; + /** Size of the storybook-static/sb-manager */ + buildSbManagerSize: number; + /** Size of storybook-static/sb-preview */ + buildSbPreviewSize: number; + /** Size of the `static` directory if it exists */ + buildStaticSize: number; + /** Total size of `sb-x` above */ + buildPrebuildSize: number; + /** Total size of everything else (user's stories & components & CSS & assets etc.) */ + buildPreviewSize: number; + /** Time to wait-on iframe.html */ + devPreviewResponsive: number; + /** Time to wait-on index.html */ + devManagerResponsive: number; + /** Time to browse to index.html and view the SB logo */ + devManagerHeaderVisible: number; + /** Time to browse to index.html and load the story index */ + devManagerIndexVisible: number; + /** Time to browse to index.html and load iframe content and the story is rendered */ + devStoryVisible: number; + /** Time to browse to index.html and load iframe content and the docs page is rendered */ + devDocsVisible: number; + /** Time to browse to index.html and view the SB logo */ + buildManagerHeaderVisible: number; + /** Time to browse to index.html and load the story index */ + buildManagerIndexVisible: number; + /** Time to browse to index.html and load iframe content and the story is rendered */ + buildStoryVisible: number; + /** Time to browse to index.html and load iframe content and the docs page is rendered */ + buildDocsVisible: number; } diff --git a/scripts/bench/utils.ts b/scripts/bench/utils.ts index 6de60d7cc86a..7467a8d6dc73 100644 --- a/scripts/bench/utils.ts +++ b/scripts/bench/utils.ts @@ -1,5 +1,6 @@ import { join } from 'path'; import { ensureDir, writeJSON, readJSON } from 'fs-extra'; +import type { BenchResults } from './types'; export const now = () => new Date().getTime(); @@ -7,7 +8,7 @@ export interface SaveBenchOptions { rootDir?: string; } -export const saveBench = async (data: any, options: SaveBenchOptions) => { +export const saveBench = async (data: Partial, options: SaveBenchOptions) => { const dirname = options.rootDir || process.cwd(); const existing = await ensureDir(dirname).then(() => { return loadBench(options).catch(() => ({})); @@ -15,7 +16,7 @@ export const saveBench = async (data: any, options: SaveBenchOptions) => { await writeJSON(join(dirname, `bench.json`), { ...existing, ...data }, { spaces: 2 }); }; -export const loadBench = async (options: SaveBenchOptions) => { +export const loadBench = async (options: SaveBenchOptions): Promise> => { const dirname = options.rootDir || process.cwd(); return readJSON(join(dirname, `bench.json`)); }; diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 96051464228c..1a0503427f9f 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -16,7 +16,8 @@ export const bench: Task = { async run(details, options) { const controllers: AbortController[] = []; try { - const { browse, saveBench, loadBench } = await import('../bench'); + const { browse } = await import('../bench/browse'); + const { saveBench, loadBench } = await import('../bench/utils'); const { default: prettyBytes } = await dynamicImport('pretty-bytes'); const { default: prettyTime } = await dynamicImport('pretty-ms'); @@ -49,7 +50,7 @@ export const bench: Task = { buildManagerHeaderVisible: buildBrowseResult.managerHeaderVisible, buildManagerIndexVisible: buildBrowseResult.managerIndexVisible, - buildPreviewVisible: buildBrowseResult.storyVisible, + buildStoryVisible: buildBrowseResult.storyVisible, buildDocsVisible: buildBrowseResult.docsVisible, }, { @@ -59,6 +60,10 @@ export const bench: Task = { const data = await loadBench({ rootDir: details.sandboxDir }); Object.entries(data).forEach(([key, value]) => { + if (typeof value !== 'number') { + return; + } + if (key.includes('Size')) { console.log(`${key}: ${prettyBytes(value)}`); } else { diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index d47c1ed5dd18..44bf2e2700f2 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -2,7 +2,8 @@ import { copy } from 'fs-extra'; import { join } from 'path'; import { BigQuery } from '@google-cloud/bigquery'; -import { loadBench } from './bench'; +import type { BenchResults } from './bench/types'; +import { loadBench } from './bench/utils'; import { SANDBOX_DIRECTORY, CODE_DIRECTORY } from './utils/constants'; import { execaCommand } from './utils/exec'; @@ -12,68 +13,6 @@ const GCP_CREDENTIALS = JSON.parse(process.env.GCP_CREDENTIALS || '{}'); const sandboxDir = process.env.SANDBOX_ROOT || SANDBOX_DIRECTORY; const templateSandboxDir = templateKey && join(sandboxDir, templateKey.replace('/', '-')); -// NOTE: this must be kept in sync with ./bench/bench.schema, which defines -// the table schema in BigQuery -export interface BenchResults { - branch: string; - commit: string; - timestamp: string; - label: string; - - /** The time it takes to create the base sandbox without storybook */ - createTime: number; - /** The time it takes to install the base sandbox after it has been initialized */ - generateTime: number; - /** The time it takes to run `sb init` on the base sandbox */ - initTime: number; - /** Size of base sandbox node_modules without storybook pre-install */ - createSize: number; - /** Size of base sandbox node_modules without storybook post-install */ - generateSize: number; - /** Size of the sandbox node_modules post `sb init` */ - initSize: number; - /** Difference bewtween `initSize` and `generateSize` */ - diffSize: number; - /** Full `sb build` time */ - buildTime: number; - /** Size of the storybook-static directory in total */ - buildSize: number; - /** Size of the storybook-static/sb-addons in total */ - buildSbAddonsSize: number; - /** Size of the storybook-static/sb-common-assets */ - buildSbCommonSize: number; - /** Size of the storybook-static/sb-manager */ - buildSbManagerSize: number; - /** Size of storybook-static/sb-preview */ - buildSbPreviewSize: number; - /** Size of the `static` directory if it exists */ - buildStaticSize: number; - /** Total size of `sb-x` above */ - buildPrebuildSize: number; - /** Total size of everything else (user's stories & components & CSS & assets etc.) */ - buildPreviewSize: number; - /** Time to wait-on iframe.html */ - devPreviewResponsive: number; - /** Time to wait-on index.html */ - devManagerResponsive: number; - /** Time to browse to index.html and view the SB logo */ - devManagerHeaderVisible: number; - /** Time to browse to index.html and load the story index */ - devManagerIndexVisible: number; - /** Time to browse to index.html and load iframe content and the story is rendered */ - devStoryVisible: number; - /** Time to browse to index.html and load iframe content and the docs page is rendered */ - devDocsVisible: number; - /** Time to browse to index.html and view the SB logo */ - buildManagerHeaderVisible: number; - /** Time to browse to index.html and load the story index */ - buildManagerIndexVisible: number; - /** Time to browse to index.html and load iframe content and the story is rendered */ - buildStoryVisible: number; - /** Time to browse to index.html and load iframe content and the docs page is rendered */ - buildDocsVisible: number; -} - const defaults: Record = { branch: null, commit: null, @@ -98,10 +37,14 @@ const defaults: Record = { buildPreviewSize: null, devPreviewResponsive: null, devManagerResponsive: null, - devManagerLoaded: null, - devPreviewLoaded: null, - buildManagerLoaded: null, - buildPreviewLoaded: null, + devManagerHeaderVisible: null, + devManagerIndexVisible: null, + devStoryVisible: null, + devDocsVisible: null, + buildManagerHeaderVisible: null, + buildManagerIndexVisible: null, + buildDocsVisible: null, + buildStoryVisible: null, }; const uploadBench = async () => { From d5bc851f2230bd2523310a54faadc302e9c7811f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 10:03:59 +0200 Subject: [PATCH 49/76] correct URLs per browse, kill port --- scripts/package.json | 2 ++ scripts/tasks/bench.ts | 17 ++++++++-------- scripts/yarn.lock | 45 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/scripts/package.json b/scripts/package.json index 3b9ea58ecc9e..9a14c7434826 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -87,6 +87,7 @@ "@types/express": "^4.17.11", "@types/fs-extra": "^11.0.1", "@types/http-server": "^0.12.1", + "@types/kill-port": "^2.0.0", "@types/lodash": "^4", "@types/node": "^16.0.0", "@types/node-fetch": "^2.5.7", @@ -142,6 +143,7 @@ "jest-watch-typeahead": "^2.2.1", "json5": "^2.2.3", "junit-xml": "^1.2.0", + "kill-port": "^2.0.1", "lint-staged": "^10.5.4", "lodash": "^4.17.21", "memoizerific": "^1.11.3", diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 1a0503427f9f..5eece1daf446 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -1,7 +1,8 @@ +import killPort from 'kill-port'; import type { Task } from '../task'; -import { PORT, dev } from './dev'; -import { serve } from './serve'; +import { PORT as devPort, dev } from './dev'; +import { PORT as servePort, serve } from './serve'; // eslint-disable-next-line @typescript-eslint/no-implied-eval const dynamicImport = new Function('specifier', 'return import(specifier)'); @@ -21,25 +22,25 @@ export const bench: Task = { const { default: prettyBytes } = await dynamicImport('pretty-bytes'); const { default: prettyTime } = await dynamicImport('pretty-ms'); - const url = `http://localhost:${PORT}`; - + await killPort(devPort).catch(() => {}); const devController = await dev.run(details, { ...options, debug: false }); if (!devController) { throw new Error('dev: controller is null'); } controllers.push(devController); - - const devBrowseResult = await browse(url); + const devBrowseResult = await browse(`http://localhost:${devPort}`); devController.abort(); + await killPort(devPort).catch(() => {}); + await killPort(servePort).catch(() => {}); const serveController = await serve.run(details, { ...options, debug: false }); if (!serveController) { throw new Error('serve: controller is null'); } controllers.push(serveController); - - const buildBrowseResult = await browse(url); + const buildBrowseResult = await browse(`http://localhost:${servePort}`); serveController.abort(); + await killPort(servePort).catch(() => {}); await saveBench( { diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 00e809b69dbd..d3638df701c3 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2952,6 +2952,7 @@ __metadata: "@types/express": ^4.17.11 "@types/fs-extra": ^11.0.1 "@types/http-server": ^0.12.1 + "@types/kill-port": ^2.0.0 "@types/lodash": ^4 "@types/node": ^16.0.0 "@types/node-fetch": ^2.5.7 @@ -3008,6 +3009,7 @@ __metadata: jest-watch-typeahead: ^2.2.1 json5: ^2.2.3 junit-xml: ^1.2.0 + kill-port: ^2.0.1 lint-staged: ^10.5.4 lodash: ^4.17.21 memoizerific: ^1.11.3 @@ -3628,6 +3630,16 @@ __metadata: languageName: node linkType: hard +"@types/kill-port@npm:^2.0.0": + version: 2.0.0 + resolution: "@types/kill-port@npm:2.0.0" + dependencies: + "@types/node": "*" + shell-exec: ^1 + checksum: 33fa3cee58477a5ee3ce086d5ddfc80dc32d26933c0d4f2e1a8a5aa9dac6bd641c800d1ea85ad7847972f7fc8d0b76e1b0eb61a8ce07c3e20291234ff8cf245b + languageName: node + linkType: hard + "@types/lodash@npm:^4, @types/lodash@npm:^4.14.175": version: 4.14.195 resolution: "@types/lodash@npm:4.14.195" @@ -8428,6 +8440,13 @@ __metadata: languageName: node linkType: hard +"get-them-args@npm:1.3.2": + version: 1.3.2 + resolution: "get-them-args@npm:1.3.2" + checksum: a75e26d7369a00f596dc9c3c7b4259a219d4486a0beef51d991867103cc8c07d22814a24210d9c9f56cefb35f9848e16fe120b57b3ec1ea333054e715059d586 + languageName: node + linkType: hard + "getpass@npm:^0.1.1": version: 0.1.7 resolution: "getpass@npm:0.1.7" @@ -10765,6 +10784,18 @@ __metadata: languageName: node linkType: hard +"kill-port@npm:^2.0.1": + version: 2.0.1 + resolution: "kill-port@npm:2.0.1" + dependencies: + get-them-args: 1.3.2 + shell-exec: 1.0.2 + bin: + kill-port: cli.js + checksum: fcbcea8e950f564e0a0b3a986390ecbd8ef1cac00f365cc2bf1f42dd972dc3a714fc2fbe362068deba2bec11cf10a7d3edb7aaf2d12e48390a2c26d73f85b4f7 + languageName: node + linkType: hard + "kind-of@npm:^3.0.2": version: 3.2.2 resolution: "kind-of@npm:3.2.2" @@ -14784,6 +14815,20 @@ __metadata: languageName: node linkType: hard +"shell-exec@npm:1.0.2": + version: 1.0.2 + resolution: "shell-exec@npm:1.0.2" + checksum: 3733ed251bc025340a373da151c44d36e69d37f570e94f5dd6a968427e8d9f751a58dd87c5a01bf0ad1289ad1de963a425aaf14ad3a06f8aee56f776462b63ca + languageName: node + linkType: hard + +"shell-exec@npm:^1": + version: 1.1.2 + resolution: "shell-exec@npm:1.1.2" + checksum: d03cdcaf1a7462397d70efde4f43df46a6776bff27d46c83a9f985898b738366236185e79958717356f19b54a1766597d86dfab4d1d8dbe18c07cd5586d2d27c + languageName: node + linkType: hard + "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" From ea013938697e2331138ded2bef4edb88753b6337 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 11:40:24 +0200 Subject: [PATCH 50/76] regen lockfile --- scripts/yarn.lock | 937 +++++++++++++++++++--------------------------- 1 file changed, 388 insertions(+), 549 deletions(-) diff --git a/scripts/yarn.lock b/scripts/yarn.lock index d3638df701c3..a1eb317d4f70 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -1572,156 +1572,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/android-arm64@npm:0.18.0" +"@esbuild/android-arm64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/android-arm64@npm:0.18.6" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/android-arm@npm:0.18.0" +"@esbuild/android-arm@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/android-arm@npm:0.18.6" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/android-x64@npm:0.18.0" +"@esbuild/android-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/android-x64@npm:0.18.6" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/darwin-arm64@npm:0.18.0" +"@esbuild/darwin-arm64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/darwin-arm64@npm:0.18.6" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/darwin-x64@npm:0.18.0" +"@esbuild/darwin-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/darwin-x64@npm:0.18.6" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/freebsd-arm64@npm:0.18.0" +"@esbuild/freebsd-arm64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/freebsd-arm64@npm:0.18.6" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/freebsd-x64@npm:0.18.0" +"@esbuild/freebsd-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/freebsd-x64@npm:0.18.6" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-arm64@npm:0.18.0" +"@esbuild/linux-arm64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-arm64@npm:0.18.6" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-arm@npm:0.18.0" +"@esbuild/linux-arm@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-arm@npm:0.18.6" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-ia32@npm:0.18.0" +"@esbuild/linux-ia32@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-ia32@npm:0.18.6" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-loong64@npm:0.18.0" +"@esbuild/linux-loong64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-loong64@npm:0.18.6" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-mips64el@npm:0.18.0" +"@esbuild/linux-mips64el@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-mips64el@npm:0.18.6" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-ppc64@npm:0.18.0" +"@esbuild/linux-ppc64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-ppc64@npm:0.18.6" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-riscv64@npm:0.18.0" +"@esbuild/linux-riscv64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-riscv64@npm:0.18.6" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-s390x@npm:0.18.0" +"@esbuild/linux-s390x@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-s390x@npm:0.18.6" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/linux-x64@npm:0.18.0" +"@esbuild/linux-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/linux-x64@npm:0.18.6" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/netbsd-x64@npm:0.18.0" +"@esbuild/netbsd-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/netbsd-x64@npm:0.18.6" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/openbsd-x64@npm:0.18.0" +"@esbuild/openbsd-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/openbsd-x64@npm:0.18.6" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/sunos-x64@npm:0.18.0" +"@esbuild/sunos-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/sunos-x64@npm:0.18.6" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/win32-arm64@npm:0.18.0" +"@esbuild/win32-arm64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/win32-arm64@npm:0.18.6" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/win32-ia32@npm:0.18.0" +"@esbuild/win32-ia32@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/win32-ia32@npm:0.18.6" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.18.0": - version: 0.18.0 - resolution: "@esbuild/win32-x64@npm:0.18.0" +"@esbuild/win32-x64@npm:0.18.6": + version: 0.18.6 + resolution: "@esbuild/win32-x64@npm:0.18.6" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -1761,17 +1761,10 @@ __metadata: languageName: node linkType: hard -"@eslint/js@npm:8.42.0": - version: 8.42.0 - resolution: "@eslint/js@npm:8.42.0" - checksum: 4ae46df1f32095cf9527d1f6a8a30512151f8eb66dd883a226face17c9e7cfdd2dcb3d4e3124fb67ac5801e0a776b1d7bba368276cfb1e1e4eefb047e38b41d6 - languageName: node - linkType: hard - -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 0b3c9958d3cd17f4add3574975e3115ae05dc7f1298a60810414b16f6f558c137b5fb3cd3905df380bacfd955ec13f67c1e6710cbb5c246a7e8d65a8289b2bff +"@eslint/js@npm:8.43.0": + version: 8.43.0 + resolution: "@eslint/js@npm:8.43.0" + checksum: ff1a1587e8f28c21dda36a331cf70ca16b76e5897cecf10f6b4c326abddf18db565ee5f71feb89cbb0d3d20ff321a2536357562c0233868eed70784640b73cf4 languageName: node linkType: hard @@ -2315,27 +2308,27 @@ __metadata: linkType: hard "@npmcli/config@npm:^6.0.0": - version: 6.2.0 - resolution: "@npmcli/config@npm:6.2.0" + version: 6.2.1 + resolution: "@npmcli/config@npm:6.2.1" dependencies: "@npmcli/map-workspaces": ^3.0.2 + ci-info: ^3.8.0 ini: ^4.1.0 nopt: ^7.0.0 proc-log: ^3.0.0 read-package-json-fast: ^3.0.2 semver: ^7.3.5 walk-up-path: ^3.0.1 - checksum: 6465b9e61e3599f53d31d6b782962b123bf4b2a650a9bb220bb24ec17fea069ad7a764b8c27c2aa62f54927131414ac02e83070dae18dac50d0f47e79aa5c5fe + checksum: ab64781e73af2adb037b58019a54b304ff25c6d08366f97569ddfda195f9045f68dbb91d68bcaf4c1d3c0bdc8877718620d77ca19d594592830277d38ce989d5 languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.2 - resolution: "@npmcli/fs@npm:2.1.2" +"@npmcli/fs@npm:^3.1.0": + version: 3.1.0 + resolution: "@npmcli/fs@npm:3.1.0" dependencies: - "@gar/promisify": ^1.1.3 semver: ^7.3.5 - checksum: c50d087733d0d8df23be24f700f104b19922a28677aa66fdbe06ff6af6431cc4a5bb1e27683cbc661a5dafa9bafdc603e6a0378121506dfcd394b2b6dd76a187 + checksum: 162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e languageName: node linkType: hard @@ -2351,16 +2344,6 @@ __metadata: languageName: node linkType: hard -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.1 - resolution: "@npmcli/move-file@npm:2.0.1" - dependencies: - mkdirp: ^1.0.4 - rimraf: ^3.0.2 - checksum: 11b2151e6d1de6f6eb23128de5aa8a429fd9097d839a5190cb77aa47a6b627022c42d50fa7c47a00f1c9f8f0c1560092b09b061855d293fa0741a2a94cfb174d - languageName: node - linkType: hard - "@npmcli/name-from-folder@npm:^2.0.0": version: 2.0.0 resolution: "@npmcli/name-from-folder@npm:2.0.0" @@ -2563,13 +2546,13 @@ __metadata: linkType: hard "@octokit/endpoint@npm:^7.0.0": - version: 7.0.5 - resolution: "@octokit/endpoint@npm:7.0.5" + version: 7.0.6 + resolution: "@octokit/endpoint@npm:7.0.6" dependencies: "@octokit/types": ^9.0.0 is-plain-object: ^5.0.0 universal-user-agent: ^6.0.0 - checksum: 68de3e40b4d2b4d3decfc3e23480d5a781275ebf86d084a38ba70c5d46a6cad051b63332da1768a64d58b0b810c5b57401a3892dff4dd0060d8b6b31d78fc2f5 + checksum: fd147a55010b54af7567bf90791359f7096a1c9916a2b7c72f8afd0c53141338b3d78da3a4ab3e3bdfeb26218a1b73735432d8987ccc04996b1019219299f115 languageName: node linkType: hard @@ -2602,10 +2585,10 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^17.2.0": - version: 17.2.0 - resolution: "@octokit/openapi-types@npm:17.2.0" - checksum: baec94b9c300171245d8b0592867ef96d3aa9cbb3261e961c5138e91894e165fffc421288d98f51031af12ab4149efb7ba597d79dee2e5b5a38962348528b1e5 +"@octokit/openapi-types@npm:^18.0.0": + version: 18.0.0 + resolution: "@octokit/openapi-types@npm:18.0.0" + checksum: d90fab10d962be71e72b85ffab2055cffd9c3196ff1edc3e4106deb78e99e8782965cf7aa6a4c1398f828e4d0c3e0f905915debfe34396d956dfce8e75b21664 languageName: node linkType: hard @@ -2688,8 +2671,8 @@ __metadata: linkType: hard "@octokit/request@npm:^6.0.0": - version: 6.2.5 - resolution: "@octokit/request@npm:6.2.5" + version: 6.2.8 + resolution: "@octokit/request@npm:6.2.8" dependencies: "@octokit/endpoint": ^7.0.0 "@octokit/request-error": ^3.0.0 @@ -2697,7 +2680,7 @@ __metadata: is-plain-object: ^5.0.0 node-fetch: ^2.6.7 universal-user-agent: ^6.0.0 - checksum: 1f9feaedd75156ffc5b05294974e18b1798a3350ed99acb6d7f9d7b76fc338a47cb9d88b927e7d506894edf49e3a1ef1e18d877403a0aa386d0037b734ab59e4 + checksum: 6b6079ed45bac44c4579b40990bfd1905b03d4bc4e5255f3d5a10cf5182171578ebe19abeab32ebb11a806f1131947f2a06b7a077bd7e77ade7b15fe2882174b languageName: node linkType: hard @@ -2753,11 +2736,11 @@ __metadata: linkType: hard "@octokit/types@npm:^9.0.0": - version: 9.2.3 - resolution: "@octokit/types@npm:9.2.3" + version: 9.3.2 + resolution: "@octokit/types@npm:9.3.2" dependencies: - "@octokit/openapi-types": ^17.2.0 - checksum: 9604939ed79be2298827e832177bb8e871d44170144a7504adb0c399966e45361fb909ccffacbd7151f08b94d2e739c6a2d1c0b9a2f9a4bde09c968d27060514 + "@octokit/openapi-types": ^18.0.0 + checksum: 2925479aa378a4491762b4fcf381bdc7daca39b4e0b2dd7062bce5d74a32ed7d79d20d3c65ceaca6d105cf4b1f7417fea634219bf90f79a57d03e2dac629ec45 languageName: node linkType: hard @@ -2842,11 +2825,11 @@ __metadata: linkType: hard "@sinonjs/fake-timers@npm:^10.0.2": - version: 10.2.0 - resolution: "@sinonjs/fake-timers@npm:10.2.0" + version: 10.3.0 + resolution: "@sinonjs/fake-timers@npm:10.3.0" dependencies: "@sinonjs/commons": ^3.0.0 - checksum: 9f4726e7799a409d51d6760af3b65dac061b4f5c0b69b3af4caf79ecc3012dacae1f40078d915f9cec1ecd81d84a41619a98d4878bb2ef9f3ed66c16c2f5f833 + checksum: 2e2fb6cc57f227912814085b7b01fede050cd4746ea8d49a1e44d5a0e56a804663b0340ae2f11af7559ea9bf4d087a11f2f646197a660ea3cb04e19efc04aa63 languageName: node linkType: hard @@ -3070,13 +3053,13 @@ __metadata: linkType: soft "@storybook/testing-library@npm:next": - version: 0.2.0-next.0 - resolution: "@storybook/testing-library@npm:0.2.0-next.0" + version: 0.2.0-next.1 + resolution: "@storybook/testing-library@npm:0.2.0-next.1" dependencies: - "@testing-library/dom": ^9.3.1 - "@testing-library/user-event": ^14.4.3 + "@testing-library/dom": ^9.0.0 + "@testing-library/user-event": ^14.0.0 ts-dedent: ^2.2.0 - checksum: 342ee91530b77db13c2691c36d7a00efead1af6453b58bbcca4d01afcdbe8e2b12dcaef734bea165838b6e6dd5af7d12032039c12e53955d7026190e56f6dc1b + checksum: 8e9a49cc854e46039a123d35a7c36a5f133f581998f10f4330af1be790fa57dc597caac377939562ba8bf48e551b7d9340e12a1425ca60e1690ff13dca3a89cd languageName: node linkType: hard @@ -3087,90 +3070,90 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-darwin-arm64@npm:1.3.62" +"@swc/core-darwin-arm64@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-darwin-arm64@npm:1.3.66" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-darwin-x64@npm:1.3.62" +"@swc/core-darwin-x64@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-darwin-x64@npm:1.3.66" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.62" +"@swc/core-linux-arm-gnueabihf@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.66" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-linux-arm64-gnu@npm:1.3.62" +"@swc/core-linux-arm64-gnu@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-linux-arm64-gnu@npm:1.3.66" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-linux-arm64-musl@npm:1.3.62" +"@swc/core-linux-arm64-musl@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-linux-arm64-musl@npm:1.3.66" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-linux-x64-gnu@npm:1.3.62" +"@swc/core-linux-x64-gnu@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-linux-x64-gnu@npm:1.3.66" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-linux-x64-musl@npm:1.3.62" +"@swc/core-linux-x64-musl@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-linux-x64-musl@npm:1.3.66" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-win32-arm64-msvc@npm:1.3.62" +"@swc/core-win32-arm64-msvc@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-win32-arm64-msvc@npm:1.3.66" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-win32-ia32-msvc@npm:1.3.62" +"@swc/core-win32-ia32-msvc@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-win32-ia32-msvc@npm:1.3.66" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.3.62": - version: 1.3.62 - resolution: "@swc/core-win32-x64-msvc@npm:1.3.62" +"@swc/core-win32-x64-msvc@npm:1.3.66": + version: 1.3.66 + resolution: "@swc/core-win32-x64-msvc@npm:1.3.66" conditions: os=win32 & cpu=x64 languageName: node linkType: hard "@swc/core@npm:^1.3.23": - version: 1.3.62 - resolution: "@swc/core@npm:1.3.62" - dependencies: - "@swc/core-darwin-arm64": 1.3.62 - "@swc/core-darwin-x64": 1.3.62 - "@swc/core-linux-arm-gnueabihf": 1.3.62 - "@swc/core-linux-arm64-gnu": 1.3.62 - "@swc/core-linux-arm64-musl": 1.3.62 - "@swc/core-linux-x64-gnu": 1.3.62 - "@swc/core-linux-x64-musl": 1.3.62 - "@swc/core-win32-arm64-msvc": 1.3.62 - "@swc/core-win32-ia32-msvc": 1.3.62 - "@swc/core-win32-x64-msvc": 1.3.62 + version: 1.3.66 + resolution: "@swc/core@npm:1.3.66" + dependencies: + "@swc/core-darwin-arm64": 1.3.66 + "@swc/core-darwin-x64": 1.3.66 + "@swc/core-linux-arm-gnueabihf": 1.3.66 + "@swc/core-linux-arm64-gnu": 1.3.66 + "@swc/core-linux-arm64-musl": 1.3.66 + "@swc/core-linux-x64-gnu": 1.3.66 + "@swc/core-linux-x64-musl": 1.3.66 + "@swc/core-win32-arm64-msvc": 1.3.66 + "@swc/core-win32-ia32-msvc": 1.3.66 + "@swc/core-win32-x64-msvc": 1.3.66 peerDependencies: "@swc/helpers": ^0.5.0 dependenciesMeta: @@ -3197,7 +3180,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: aaa0827960f656c762733836938d31b2d596495b8430eb6feb0d1f6b1416b3444e7b59c326ae37ee410d8d3d25fff20ac8ff0f66ebe8a87e7fae1ca651aff915 + checksum: bf1d9eb0c29d1cc100cb15272dfb55db8da02f9a90c4ae11af1803a189f686bdad9ce9b06af3b7ad004b6811efd9332cbab75be87a2c2aa7cf0a44999fab6d5d languageName: node linkType: hard @@ -3211,22 +3194,6 @@ __metadata: linkType: hard "@testing-library/dom@npm:^9.0.0, @testing-library/dom@npm:^9.3.0": - version: 9.3.0 - resolution: "@testing-library/dom@npm:9.3.0" - dependencies: - "@babel/code-frame": ^7.10.4 - "@babel/runtime": ^7.12.5 - "@types/aria-query": ^5.0.1 - aria-query: ^5.0.0 - chalk: ^4.1.0 - dom-accessibility-api: ^0.5.9 - lz-string: ^1.5.0 - pretty-format: ^27.0.2 - checksum: c5f9b6cf6ddf31e4556961d5ec8a6d700b953df3181860355e9506efe8825d40952286ab392b2f6aeb5cbaebf2f022562ef168c34f730f88d7c977e63ac41d82 - languageName: node - linkType: hard - -"@testing-library/dom@npm:^9.3.1": version: 9.3.1 resolution: "@testing-library/dom@npm:9.3.1" dependencies: @@ -3273,7 +3240,7 @@ __metadata: languageName: node linkType: hard -"@testing-library/user-event@npm:^14.4.3": +"@testing-library/user-event@npm:^14.0.0, @testing-library/user-event@npm:^14.4.3": version: 14.4.3 resolution: "@testing-library/user-event@npm:14.4.3" peerDependencies: @@ -3695,23 +3662,23 @@ __metadata: linkType: hard "@types/node@npm:*, @types/node@npm:>= 8": - version: 20.2.5 - resolution: "@types/node@npm:20.2.5" - checksum: 1c3db8a4ceb5e5d12e7cb140e37c14a16ce013084c6d65579b91cefbe0ecaca57d85093d968172b11c3d1d95bcbc5d972b08aa3dc3935206fb39bc6c10751102 + version: 20.3.1 + resolution: "@types/node@npm:20.3.1" + checksum: 7e8a6f5d6fc1ad3778f038f5f8df570741459984280fd2e9539af32620d93438c955fd1b90d00f9cc438cd132ec04d7669ada9e32502336e78713a3ad9b51d10 languageName: node linkType: hard "@types/node@npm:^16.0.0": - version: 16.18.34 - resolution: "@types/node@npm:16.18.34" - checksum: d6572e12b2200a813b2e0944add0abb8ac59d51a0cf28651dd1dde9de4d43e9d4c2c41fd7cf910d0c3bd8e13d10047f58211a53e76780279fc6d284137d3b001 + version: 16.18.36 + resolution: "@types/node@npm:16.18.36" + checksum: 7d7c30bcca0f61a0f051c2d5b03a625bca209c982bae35450828ee19e5f2c79df89c0f741f98e258203b82dc027f86b6c02860830b103a5b6ec3baf4d41fe0cf languageName: node linkType: hard "@types/node@npm:^18.0.0": - version: 18.16.16 - resolution: "@types/node@npm:18.16.16" - checksum: 880d80f98ea4ab443dbb7af06e778dd4058e7c005f76cd36329dfe76296852388571b7948996342e26b8636b851407aac7eb1543de965c182af4e43242edf769 + version: 18.16.18 + resolution: "@types/node@npm:18.16.18" + checksum: 1ad22342d1aaad446625e7eb2ca6137d0036fbc451fcb367c005ed4d6a102190bbba3d104652b2f9a73d0e520752b98fb89f22f5ef8fe09e8487bcb6fd75223f languageName: node linkType: hard @@ -3783,33 +3750,33 @@ __metadata: linkType: hard "@types/react-dom@npm:^18.0.0": - version: 18.2.4 - resolution: "@types/react-dom@npm:18.2.4" + version: 18.2.6 + resolution: "@types/react-dom@npm:18.2.6" dependencies: "@types/react": "*" - checksum: dfeaabb4268d39bdd5addc6c0b7099d5c57a364e70f1087b7c3ee189374312dc65201abfd3d87fee0de11d27c225678ce39c22d14b3035cde5792678704c27b5 + checksum: bd734ca04c52b3c96891a7f9c1139486807dac7a2449fb72e8f8e23018bc6eeeb87a490a105cb39d05ccb7ddf80ed7a441e5bd3e5866c6f6ae8870cd723599e8 languageName: node linkType: hard "@types/react@npm:*": - version: 18.2.9 - resolution: "@types/react@npm:18.2.9" + version: 18.2.13 + resolution: "@types/react@npm:18.2.13" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 5935a8cb8efc2804dbb0f85989970f654fb4117274b6d2836baa58d5e9dbfc09fd9d60e1f23a8d0fca70ad75e9f0e074790947899be40525cbe62f7ac58adcc6 + checksum: 59b434ab9f2cf4874c8715a3d848d7cfd257419af8c0e486e2af5b6760c99aab62a511cb3456a3044d8250c93539016ca84fbd23eaac988e74987e268df2eef2 languageName: node linkType: hard "@types/react@npm:^16, @types/react@npm:^16.14.34": - version: 16.14.42 - resolution: "@types/react@npm:16.14.42" + version: 16.14.43 + resolution: "@types/react@npm:16.14.43" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 44e6113f492ffffce4158b771bbb6f7ec2253961d53e873fcafd8b315b16c739dd4649932800c9414beed1fd3382aa90b6f3a41b74e4adc0b63f5c51e8ad1c09 + checksum: 1878039ed0d81bcfcdb7e389e221f7e3f0470e82007c60e58196b160c733ff194f6784e104e8071a96ec93d14998875c88c2dcf48aa49b73d16c5fc75d1bb602 languageName: node linkType: hard @@ -3949,13 +3916,13 @@ __metadata: linkType: hard "@typescript-eslint/eslint-plugin@npm:^5.45.0": - version: 5.59.9 - resolution: "@typescript-eslint/eslint-plugin@npm:5.59.9" + version: 5.60.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.60.0" dependencies: "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.59.9 - "@typescript-eslint/type-utils": 5.59.9 - "@typescript-eslint/utils": 5.59.9 + "@typescript-eslint/scope-manager": 5.60.0 + "@typescript-eslint/type-utils": 5.60.0 + "@typescript-eslint/utils": 5.60.0 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 @@ -3968,54 +3935,54 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 4bb9981bcc009c044ffd6b64288309480df2b6c9cdf6b345987e4b565d0973d1d98b7209f6b46b92880735d788f564e17553641087aa59f67990c84526622a27 + checksum: e41d1a45f330e766afb594429fad535f4db06efc458e74cc05109c4555550efdad57141aa088d5cb836aeb90b822e08e7690e5b650fd7b2419da1d64113d5360 languageName: node linkType: hard "@typescript-eslint/experimental-utils@npm:^5.45.0": - version: 5.59.9 - resolution: "@typescript-eslint/experimental-utils@npm:5.59.9" + version: 5.60.0 + resolution: "@typescript-eslint/experimental-utils@npm:5.60.0" dependencies: - "@typescript-eslint/utils": 5.59.9 + "@typescript-eslint/utils": 5.60.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 55b443a2b62f1736babb1f463175d9903267a423b4ba1f0e4f5092018805cf6f8ba0ffcbab4cf963f85fe219497870cdd41c4c7b222efafc1a52502e262da501 + checksum: 048dd2ed5f1aa974561bb97b8bf90fa93fdaf5a4d94fd06863282bb0251849f6623be9a7b9a9e5670eba0b93440d0fb9a3e5058c2c43d05b2a4c65f137d0c1d1 languageName: node linkType: hard "@typescript-eslint/parser@npm:^5.45.0": - version: 5.59.9 - resolution: "@typescript-eslint/parser@npm:5.59.9" + version: 5.60.0 + resolution: "@typescript-eslint/parser@npm:5.60.0" dependencies: - "@typescript-eslint/scope-manager": 5.59.9 - "@typescript-eslint/types": 5.59.9 - "@typescript-eslint/typescript-estree": 5.59.9 + "@typescript-eslint/scope-manager": 5.60.0 + "@typescript-eslint/types": 5.60.0 + "@typescript-eslint/typescript-estree": 5.60.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: af0e041e8a541734ff237ec0eac47e355c2f78dd2b0db4eb4ab0c10ba1b6d5d70f84ddc16f856bc72c4cacd53ef04b5f4948baffb5c8cb2d9a0ffd83a8fbc547 + checksum: a9b4875a3ed37cfe8205173caf85b21f8025cf21bc295036c6265010ff622054b137fa7f3251476104086804bf55b420431efa887935b67c506800e3adcc8910 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.59.9": - version: 5.59.9 - resolution: "@typescript-eslint/scope-manager@npm:5.59.9" +"@typescript-eslint/scope-manager@npm:5.60.0": + version: 5.60.0 + resolution: "@typescript-eslint/scope-manager@npm:5.60.0" dependencies: - "@typescript-eslint/types": 5.59.9 - "@typescript-eslint/visitor-keys": 5.59.9 - checksum: 41622fd270e5b8574347ed5dd020bbb9752d85e6f40df180e944c1110d9bd2227a949067feb23dd4117dd2be0623c05a47bc363abe605c96deb295753f6dd080 + "@typescript-eslint/types": 5.60.0 + "@typescript-eslint/visitor-keys": 5.60.0 + checksum: 87c742ea716359206244e1c7a8d2805b9e1caf04bce127f84b790046ae994849f25bf38af05de7a283eec58b34ecc701f441f23dfcccb59b9185260667bfe6e7 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.59.9": - version: 5.59.9 - resolution: "@typescript-eslint/type-utils@npm:5.59.9" +"@typescript-eslint/type-utils@npm:5.60.0": + version: 5.60.0 + resolution: "@typescript-eslint/type-utils@npm:5.60.0" dependencies: - "@typescript-eslint/typescript-estree": 5.59.9 - "@typescript-eslint/utils": 5.59.9 + "@typescript-eslint/typescript-estree": 5.60.0 + "@typescript-eslint/utils": 5.60.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -4023,23 +3990,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: c3a9773d2b81350923025933623e1572538f79bf119b40bed17389eda11632f6d364a49b385aa6d915d85f7c3d45376085cc55263d865dbc2b753598bba6473b + checksum: 0baa4baa9c059e3a0d4da19cb62b821ababce781208cf18965e54916ea718a993d969f8f42b4356409ac1ce74228532e9d1cd0f2e9d3e0815c405467775b4015 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.59.9": - version: 5.59.9 - resolution: "@typescript-eslint/types@npm:5.59.9" - checksum: 951046891bcc9fa27d72a5489b496291e44cedcff204d3ce6c10c8916fc5e255332738efd4d7555200a55b49ff4ba1204e186960d216d51fea89fe92a982180e +"@typescript-eslint/types@npm:5.60.0": + version: 5.60.0 + resolution: "@typescript-eslint/types@npm:5.60.0" + checksum: 008aedc2322120b9b760204ae26b5ecf5a1a61da84e77427048d076074cef703914a7a2db0286f891bbd045c1246238823671ec97192e03eabec35e9f75288e2 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.59.9": - version: 5.59.9 - resolution: "@typescript-eslint/typescript-estree@npm:5.59.9" +"@typescript-eslint/typescript-estree@npm:5.60.0": + version: 5.60.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.60.0" dependencies: - "@typescript-eslint/types": 5.59.9 - "@typescript-eslint/visitor-keys": 5.59.9 + "@typescript-eslint/types": 5.60.0 + "@typescript-eslint/visitor-keys": 5.60.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -4048,35 +4015,35 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 2f3d8df6d454fbc52d305abfe8447bff8e8d63294ce47e4679c920f647643f5d15a1f693caf74f4fabece12d5ba27ebdb156d507b16fbd2751fc01ba6c4df3c8 + checksum: 83352afbd5b32a2c0d939ba17dc3420c0e72b5d920146b96af863acda675d4f307bb5b8cff25637761dfcba0cbe71c624307f45e2b87810798967b5af0798d43 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.59.9, @typescript-eslint/utils@npm:^5.45.0": - version: 5.59.9 - resolution: "@typescript-eslint/utils@npm:5.59.9" +"@typescript-eslint/utils@npm:5.60.0, @typescript-eslint/utils@npm:^5.45.0": + version: 5.60.0 + resolution: "@typescript-eslint/utils@npm:5.60.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.59.9 - "@typescript-eslint/types": 5.59.9 - "@typescript-eslint/typescript-estree": 5.59.9 + "@typescript-eslint/scope-manager": 5.60.0 + "@typescript-eslint/types": 5.60.0 + "@typescript-eslint/typescript-estree": 5.60.0 eslint-scope: ^5.1.1 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: b8a04a83c121faa3e36abb2b6113f2e0ec5cf86884d0cb8619bfc50f7442341ee17e4495d69f8abeb6edad9e0347de8382ea1708a5fd6da1e4c80b7b8215c6ab + checksum: 00556a31fc288d2d59e85c139077c111ad2218ce817e24d02d9a50fb29c62293be7ab5200ae2a0cecce9c193a43519b690e9fd263bdc8bcef940eec005dc2bef languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.59.9": - version: 5.59.9 - resolution: "@typescript-eslint/visitor-keys@npm:5.59.9" +"@typescript-eslint/visitor-keys@npm:5.60.0": + version: 5.60.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.60.0" dependencies: - "@typescript-eslint/types": 5.59.9 + "@typescript-eslint/types": 5.60.0 eslint-visitor-keys: ^3.3.0 - checksum: 882fd03830cbe0eca8f9a547aecc6519ddbec10e55f5f3de66e605a3f3d42a6237abd3c09b34d9cc3343c8e11386e999876aec384efe523e1478cb22752d326d + checksum: 797888d1e9cfd42b92382443956f0a46d093c49bca2789699f638d79387f26c91c55b8545bfaba7b9b6d846efc6b1134df640c3975d51a8c3b57d8e6a837ab5b languageName: node linkType: hard @@ -4290,12 +4257,12 @@ __metadata: linkType: hard "@yarnpkg/parsers@npm:^3.0.0-rc.18": - version: 3.0.0-rc.45 - resolution: "@yarnpkg/parsers@npm:3.0.0-rc.45" + version: 3.0.0-rc.46 + resolution: "@yarnpkg/parsers@npm:3.0.0-rc.46" dependencies: js-yaml: ^3.10.0 tslib: ^2.4.0 - checksum: 64dfeae26c5782a722bcb3e936a43280ff46861f09042e32add6f1b7a1845ef3081ee515b60dd09ae9cd77cc28a85877bdcd9ba4b143bc1413edf71553698041 + checksum: c7f421c6885142f351459031c093fb2e79abcce6f4a89765a10e600bb7ab122949c54bcea2b23de9572a2b34ba29f822b17831c1c43ba50373ceb8cb5b336667 languageName: node linkType: hard @@ -4416,11 +4383,11 @@ __metadata: linkType: hard "acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.8.0, acorn@npm:^8.8.1": - version: 8.8.2 - resolution: "acorn@npm:8.8.2" + version: 8.9.0 + resolution: "acorn@npm:8.9.0" bin: acorn: bin/acorn - checksum: b5c54e736af5ed753911c6752fafd02d0a74cf4d55be606bd81fe71faba4f986dc090952329931ac2aba165803fd0005c59eeef08f9c6c689e8dc420031f3df0 + checksum: 5b51689d56f1ca5d6ea1fa58af478affd8d3396403637abcbc7caf28e1a47beb537cf1654f537b6cf4c73377f3e1aa99fd4a50674e64daefe08cb25c799ded28 languageName: node linkType: hard @@ -4681,11 +4648,11 @@ __metadata: linkType: hard "aria-query@npm:5.1.3, aria-query@npm:^5.0.0, aria-query@npm:^5.1.3": - version: 5.1.3 - resolution: "aria-query@npm:5.1.3" + version: 5.2.1 + resolution: "aria-query@npm:5.2.1" dependencies: - deep-equal: ^2.0.5 - checksum: edcbc8044c4663d6f88f785e983e6784f98cb62b4ba1e9dd8d61b725d0203e4cfca38d676aee984c31f354103461102a3d583aa4fbe4fd0a89b679744f4e5faf + dequal: ^2.0.3 + checksum: 898031f69f8e9d63c914b73f45e50316fef157aae41af682fe64e8f10c9a9d623952929df01f6524b4ce37c3b21806b04e7617e38909720fbc0fad3f207d9e09 languageName: node linkType: hard @@ -4937,11 +4904,11 @@ __metadata: linkType: hard "axobject-query@npm:^3.1.1": - version: 3.1.1 - resolution: "axobject-query@npm:3.1.1" + version: 3.2.1 + resolution: "axobject-query@npm:3.2.1" dependencies: - deep-equal: ^2.0.5 - checksum: fff3175a22fd1f41fceb7ae0cd25f6594a0d7fba28c2335dd904538b80eb4e1040432564a3c643025cd2bb748f68d35aaabffb780b794da97ecfc748810b25ad + dequal: ^2.0.3 + checksum: f7debc2012e456139b57d888c223f6d3cb4b61eb104164a85e3d346273dd6ef0bc9a04b6660ca9407704a14a8e05fa6b6eb9d55f44f348c7210de7ffb350c3a7 languageName: node linkType: hard @@ -5288,16 +5255,16 @@ __metadata: linkType: hard "browserslist@npm:^4.21.3, browserslist@npm:^4.21.5": - version: 4.21.7 - resolution: "browserslist@npm:4.21.7" + version: 4.21.9 + resolution: "browserslist@npm:4.21.9" dependencies: - caniuse-lite: ^1.0.30001489 - electron-to-chromium: ^1.4.411 + caniuse-lite: ^1.0.30001503 + electron-to-chromium: ^1.4.431 node-releases: ^2.0.12 update-browserslist-db: ^1.0.11 bin: browserslist: cli.js - checksum: c523a982ef5d4141907795bbb72d7e2c5df79b2c6e495ef8ff6405b6734a2f16529a7f54c86b113085cad8a3359ac2fc6a478e86ae715084ba7384b9344b2ef5 + checksum: 903189787141f645f47ec46ec482dc85985d1297948062690dc2ea8480eb98fd6213507234eb17177825acaae49c53888445910f1af984abce5373fb65c270b8 languageName: node linkType: hard @@ -5407,29 +5374,23 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.3 - resolution: "cacache@npm:16.1.3" +"cacache@npm:^17.0.0": + version: 17.1.3 + resolution: "cacache@npm:17.1.3" dependencies: - "@npmcli/fs": ^2.1.0 - "@npmcli/move-file": ^2.0.0 - chownr: ^2.0.0 - fs-minipass: ^2.1.0 - glob: ^8.0.1 - infer-owner: ^1.0.4 + "@npmcli/fs": ^3.1.0 + fs-minipass: ^3.0.0 + glob: ^10.2.2 lru-cache: ^7.7.1 - minipass: ^3.1.6 + minipass: ^5.0.0 minipass-collect: ^1.0.2 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 - mkdirp: ^1.0.4 p-map: ^4.0.0 - promise-inflight: ^1.0.1 - rimraf: ^3.0.2 - ssri: ^9.0.0 + ssri: ^10.0.0 tar: ^6.1.11 - unique-filename: ^2.0.0 - checksum: cdf6836e1c457d2a5616abcaf5d8240c0346b1f5bd6fdb8866b9d84b6dff0b54e973226dc11e0d099f35394213d24860d1989c8358d2a41b39eb912b3000e749 + unique-filename: ^3.0.0 + checksum: fcb0843c8e152b0e1440328508a2c0d6435c431198155e31daa591b348a1739b089ce2a72a4528690ed10a2bf086c180ee4980e2116457131b4c8a6e65e10976 languageName: node linkType: hard @@ -5493,10 +5454,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001489": - version: 1.0.30001497 - resolution: "caniuse-lite@npm:1.0.30001497" - checksum: 1581f6e6a3f4ea0be000d7d7bf3f2b92d0205d6637b6f12f7add3f9472b0c5e6c11f09175f6edd59496d702b251f999c4591933eb2267511a2eac52b759c2f58 +"caniuse-lite@npm:^1.0.30001503": + version: 1.0.30001506 + resolution: "caniuse-lite@npm:1.0.30001506" + checksum: 999f7e1c955a430bda94392f44fd56450f727a9f55908b1d63e6f1f1a2ac6646c6b41f79fbcf3cd800b24162e427ee56c446be9a99d62c191fa558cba91c53aa languageName: node linkType: hard @@ -5627,7 +5588,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.2.0": +"ci-info@npm:^3.2.0, ci-info@npm:^3.8.0": version: 3.8.0 resolution: "ci-info@npm:3.8.0" checksum: 0d3052193b58356372b34ab40d2668c3e62f1006d5ca33726d1d3c423853b19a85508eadde7f5908496fb41448f465263bf61c1ee58b7832cb6a924537e3863a @@ -5635,9 +5596,9 @@ __metadata: linkType: hard "cjs-module-lexer@npm:^1.0.0": - version: 1.2.2 - resolution: "cjs-module-lexer@npm:1.2.2" - checksum: 83330e1feda2e3699b8c305bfa8f841b41822049393f5eefeb574e60bde556e2a251ee9b7971cde0cb47ac4f7823bf4ab4a6005b8471f86ad9f5509eefb66cbd + version: 1.2.3 + resolution: "cjs-module-lexer@npm:1.2.3" + checksum: 0de9a9c3fad03a46804c0d38e7b712fb282584a9c7ef1ed44cae22fb71d9bb600309d66a9711ac36a596fd03422f5bb03e021e8f369c12a39fa1786ae531baab languageName: node linkType: hard @@ -5991,21 +5952,28 @@ __metadata: linkType: hard "core-js-compat@npm:^3.30.1, core-js-compat@npm:^3.30.2": - version: 3.30.2 - resolution: "core-js-compat@npm:3.30.2" + version: 3.31.0 + resolution: "core-js-compat@npm:3.31.0" dependencies: browserslist: ^4.21.5 - checksum: 7cb984fc6bcdd2f28c2f2f19fc8fc874a303adf7f835720b9937f0b1d40793819ed744dc14dff28ddb7735404b02a43f08493c3e2f227b27090cd6d64d28c5f9 + checksum: 09cca4c2565ddea1fb65324ef17c2dcc61e6c3ec089d8b343e6cbea2b42a9c3ae5e76a42c6faff3759a321c5e7165201db93b7b47912c4c2d1c3d6afad44f7fc languageName: node linkType: hard -"core-js@npm:3.30.2, core-js@npm:^3.8.2": +"core-js@npm:3.30.2": version: 3.30.2 resolution: "core-js@npm:3.30.2" checksum: 864d7dc908d4ece507d27e6c6d2830300dcb775d88cfefeec31e34ab95be5016bb23abb29c8b1c4a930bada01318af009276199d75dcab1a230c3cebdf8d3a70 languageName: node linkType: hard +"core-js@npm:^3.8.2": + version: 3.31.0 + resolution: "core-js@npm:3.31.0" + checksum: 6216c7ada80b2468b1297d844fa99a99da97d6156cb05270b3627d8c463fb8c17baeff74ef204ef1c905712930fe82740ba2a74e2f957e4909fd241416fe5735 + languageName: node + linkType: hard + "core-util-is@npm:1.0.2": version: 1.0.2 resolution: "core-util-is@npm:1.0.2" @@ -6365,32 +6333,6 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^2.0.5": - version: 2.2.1 - resolution: "deep-equal@npm:2.2.1" - dependencies: - array-buffer-byte-length: ^1.0.0 - call-bind: ^1.0.2 - es-get-iterator: ^1.1.3 - get-intrinsic: ^1.2.0 - is-arguments: ^1.1.1 - is-array-buffer: ^3.0.2 - is-date-object: ^1.0.5 - is-regex: ^1.1.4 - is-shared-array-buffer: ^1.0.2 - isarray: ^2.0.5 - object-is: ^1.1.5 - object-keys: ^1.1.1 - object.assign: ^4.1.4 - regexp.prototype.flags: ^1.5.0 - side-channel: ^1.0.4 - which-boxed-primitive: ^1.0.2 - which-collection: ^1.0.1 - which-typed-array: ^1.1.9 - checksum: 9e32606f0e24ef4d6b100c68cadae81495c3638944e933afc4b8389b042e95c5fe1381492cf7a6d385bcbae564c9cfb7086f37f277e37521a632b008a6b208dc - languageName: node - linkType: hard - "deep-is@npm:^0.1.3, deep-is@npm:~0.1.3": version: 0.1.4 resolution: "deep-is@npm:0.1.4" @@ -6491,7 +6433,7 @@ __metadata: languageName: node linkType: hard -"dequal@npm:^2.0.0": +"dequal@npm:^2.0.0, dequal@npm:^2.0.3": version: 2.0.3 resolution: "dequal@npm:2.0.3" checksum: f98860cdf58b64991ae10205137c0e97d384c3a4edc7f807603887b7c4b850af1224a33d88012009f150861cbee4fa2d322c4cc04b9313bee312e47f6ecaa888 @@ -6808,10 +6750,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.411": - version: 1.4.425 - resolution: "electron-to-chromium@npm:1.4.425" - checksum: eea2c9518db315f5ce70df76f78507def2749d794e4000787f2ffba566d77f9fc64bc9ce4aae9800ae1241557e4fe949cba0c9ccedbfb861463b7e5033ee5962 +"electron-to-chromium@npm:^1.4.431": + version: 1.4.437 + resolution: "electron-to-chromium@npm:1.4.437" + checksum: 58825f0e645985be1874d5f9c0395ed9c8620bea347ecfa523d18ddef8dd322862e039b7fbe18bbee1bf56c38333124d01125375a4ca3271abb3d33ff2aaeae4 languageName: node linkType: hard @@ -6862,12 +6804,12 @@ __metadata: linkType: hard "enhanced-resolve@npm:^5.0.0": - version: 5.14.1 - resolution: "enhanced-resolve@npm:5.14.1" + version: 5.15.0 + resolution: "enhanced-resolve@npm:5.15.0" dependencies: graceful-fs: ^4.2.4 tapable: ^2.2.0 - checksum: 65edb495492817fcdc2f8755f911835c4a5ea706377e9a57bbdacace14167c1413ad4d12630d23b850e80e2671b9a46603e562b9321546d1eca664ac24170906 + checksum: 69984a7990913948b4150855aed26a84afb4cb1c5a94fb8e3a65bd00729a73fc2eaff6871fb8e345377f294831afe349615c93560f2f54d61b43cdfdf668f19a languageName: node linkType: hard @@ -6989,23 +6931,6 @@ __metadata: languageName: node linkType: hard -"es-get-iterator@npm:^1.1.3": - version: 1.1.3 - resolution: "es-get-iterator@npm:1.1.3" - dependencies: - call-bind: ^1.0.2 - get-intrinsic: ^1.1.3 - has-symbols: ^1.0.3 - is-arguments: ^1.1.1 - is-map: ^2.0.2 - is-set: ^2.0.2 - is-string: ^1.0.7 - isarray: ^2.0.5 - stop-iteration-iterator: ^1.0.0 - checksum: ebd11effa79851ea75d7f079405f9d0dc185559fd65d986c6afea59a0ff2d46c2ed8675f19f03dce7429d7f6c14ff9aede8d121fbab78d75cfda6a263030bac0 - languageName: node - linkType: hard - "es-set-tostringtag@npm:^2.0.1": version: 2.0.1 resolution: "es-set-tostringtag@npm:2.0.1" @@ -7063,31 +6988,31 @@ __metadata: linkType: hard "esbuild@npm:^0.18.0": - version: 0.18.0 - resolution: "esbuild@npm:0.18.0" - dependencies: - "@esbuild/android-arm": 0.18.0 - "@esbuild/android-arm64": 0.18.0 - "@esbuild/android-x64": 0.18.0 - "@esbuild/darwin-arm64": 0.18.0 - "@esbuild/darwin-x64": 0.18.0 - "@esbuild/freebsd-arm64": 0.18.0 - "@esbuild/freebsd-x64": 0.18.0 - "@esbuild/linux-arm": 0.18.0 - "@esbuild/linux-arm64": 0.18.0 - "@esbuild/linux-ia32": 0.18.0 - "@esbuild/linux-loong64": 0.18.0 - "@esbuild/linux-mips64el": 0.18.0 - "@esbuild/linux-ppc64": 0.18.0 - "@esbuild/linux-riscv64": 0.18.0 - "@esbuild/linux-s390x": 0.18.0 - "@esbuild/linux-x64": 0.18.0 - "@esbuild/netbsd-x64": 0.18.0 - "@esbuild/openbsd-x64": 0.18.0 - "@esbuild/sunos-x64": 0.18.0 - "@esbuild/win32-arm64": 0.18.0 - "@esbuild/win32-ia32": 0.18.0 - "@esbuild/win32-x64": 0.18.0 + version: 0.18.6 + resolution: "esbuild@npm:0.18.6" + dependencies: + "@esbuild/android-arm": 0.18.6 + "@esbuild/android-arm64": 0.18.6 + "@esbuild/android-x64": 0.18.6 + "@esbuild/darwin-arm64": 0.18.6 + "@esbuild/darwin-x64": 0.18.6 + "@esbuild/freebsd-arm64": 0.18.6 + "@esbuild/freebsd-x64": 0.18.6 + "@esbuild/linux-arm": 0.18.6 + "@esbuild/linux-arm64": 0.18.6 + "@esbuild/linux-ia32": 0.18.6 + "@esbuild/linux-loong64": 0.18.6 + "@esbuild/linux-mips64el": 0.18.6 + "@esbuild/linux-ppc64": 0.18.6 + "@esbuild/linux-riscv64": 0.18.6 + "@esbuild/linux-s390x": 0.18.6 + "@esbuild/linux-x64": 0.18.6 + "@esbuild/netbsd-x64": 0.18.6 + "@esbuild/openbsd-x64": 0.18.6 + "@esbuild/sunos-x64": 0.18.6 + "@esbuild/win32-arm64": 0.18.6 + "@esbuild/win32-ia32": 0.18.6 + "@esbuild/win32-x64": 0.18.6 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -7135,7 +7060,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: f40bd01dd3125d0a4831aeddf16b65f4f7ee402e52f61f85c0672a580c4c7623da30e339e3ab997fac95978c4d41baaaf4704a85b4bf76e01038e825942a0c97 + checksum: a5ed533def194066b82e87f2f8faab4f4d1e15136b33a67159328516687e085b5edbb9f79709bb95012198c957ae115b19a15b07c1d994ed79fc7d2bca568d69 languageName: node linkType: hard @@ -7486,13 +7411,13 @@ __metadata: linkType: hard "eslint@npm:^8.28.0": - version: 8.42.0 - resolution: "eslint@npm:8.42.0" + version: 8.43.0 + resolution: "eslint@npm:8.43.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.4.0 "@eslint/eslintrc": ^2.0.3 - "@eslint/js": 8.42.0 + "@eslint/js": 8.43.0 "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 @@ -7530,7 +7455,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 8ab5a3c1619008c946497a16b88a811b1f6c49a750a9bd0f81085dff4166418b9da4e46108b09d920877ab2f5981e3613332653b7f5e3917d8088bc4b8d40b5a + checksum: 1f9ff2c774e852c179ba569a3b672cbc4cf91aa59843ee32f7da363c10b5aad842672005ac04c760f6077b3471da428562274e0fcb0a78c2056866b3d36be948 languageName: node linkType: hard @@ -7734,6 +7659,13 @@ __metadata: languageName: node linkType: hard +"exponential-backoff@npm:^3.1.1": + version: 3.1.1 + resolution: "exponential-backoff@npm:3.1.1" + checksum: 160456d2d647e6019640bd07111634d8c353038d9fa40176afb7cd49b0548bdae83b56d05e907c2cce2300b81cae35d800ef92fefb9d0208e190fa3b7d6bb579 + languageName: node + linkType: hard + "express-rate-limit@npm:5.5.1": version: 5.5.1 resolution: "express-rate-limit@npm:5.5.1" @@ -8225,7 +8157,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": +"fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -8234,6 +8166,15 @@ __metadata: languageName: node linkType: hard +"fs-minipass@npm:^3.0.0": + version: 3.0.2 + resolution: "fs-minipass@npm:3.0.2" + dependencies: + minipass: ^5.0.0 + checksum: 34726f25b968ac05f6122ea7e9457fe108c7ae3b82beff0256953b0e405def61af2850570e32be2eb05c1e7660b663f24e14b6ab882d1d8a858314faacc4c972 + languageName: node + linkType: hard + "fs.realpath@npm:^1.0.0": version: 1.0.0 resolution: "fs.realpath@npm:1.0.0" @@ -8331,7 +8272,7 @@ __metadata: languageName: node linkType: hard -"gcp-metadata@npm:^5.0.0": +"gcp-metadata@npm:^5.2.0": version: 5.2.0 resolution: "gcp-metadata@npm:5.2.0" dependencies: @@ -8540,8 +8481,8 @@ __metadata: linkType: hard "glob@npm:^10.0.0, glob@npm:^10.2.2": - version: 10.2.7 - resolution: "glob@npm:10.2.7" + version: 10.3.0 + resolution: "glob@npm:10.3.0" dependencies: foreground-child: ^3.1.0 jackspeak: ^2.0.3 @@ -8550,7 +8491,7 @@ __metadata: path-scurry: ^1.7.0 bin: glob: dist/cjs/src/bin.js - checksum: 15b742f933c4302cca278527a720c1300ba67b92975005e54e0fb85fee85aff1c45e71fbac386a2e190e64b7b17897b5ae1bc6cbd2cdd96a62c0dc55c8fb076f + checksum: 0ed8f32c3ff68710b9c09d6988901bca7b20f4786e7617d2ccdc6673efaf391b562e483871747d625415c394f61abda22a6adfdce554019ad09b7515292041f9 languageName: node linkType: hard @@ -8581,7 +8522,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.0, glob@npm:^8.0.1": +"glob@npm:^8.0.0": version: 8.1.0 resolution: "glob@npm:8.1.0" dependencies: @@ -8650,15 +8591,15 @@ __metadata: linkType: hard "globby@npm:^13.0.0, globby@npm:^13.1.2": - version: 13.1.4 - resolution: "globby@npm:13.1.4" + version: 13.2.0 + resolution: "globby@npm:13.2.0" dependencies: dir-glob: ^3.0.1 fast-glob: ^3.2.11 ignore: ^5.2.0 merge2: ^1.4.1 slash: ^4.0.0 - checksum: cbf4ce32ea7fba37be8c4749a2f69c2803b70a57e40a968b57343cc74daced8c87a7cdea038f69eda95fe17df8ebf75346d18e188c2bc4948f081bbbc655c323 + checksum: d1ea2b09dbb24961d16413cdb45764cb63280a2a7066739df5e5b33292ce4980d9da1d168a6a135c332ea1856f921e28d8ffcc2c6c24b82d4f4208477bfe62b4 languageName: node linkType: hard @@ -8684,19 +8625,19 @@ __metadata: linkType: hard "google-auth-library@npm:^8.0.2": - version: 8.7.0 - resolution: "google-auth-library@npm:8.7.0" + version: 8.8.0 + resolution: "google-auth-library@npm:8.8.0" dependencies: arrify: ^2.0.0 base64-js: ^1.3.0 ecdsa-sig-formatter: ^1.0.11 fast-text-encoding: ^1.0.0 gaxios: ^5.0.0 - gcp-metadata: ^5.0.0 + gcp-metadata: ^5.2.0 gtoken: ^6.1.0 jws: ^4.0.0 lru-cache: ^6.0.0 - checksum: b588081779725db99caf29b12bd0ccf727df619499560e6f369986b91b34af227d536d9552f76f413829e29ef67cb721abe8a5c0f79143a7702b467a5ab02316 + checksum: f41a1d37763c593b39533bb86d5d35960c04a05f89abbed74e1270c94a2034c0029e659b02efe406794eb83a92c64f2fe1c064c9abc6afcafdd48894323a7e77 languageName: node linkType: hard @@ -8965,7 +8906,7 @@ __metadata: languageName: node linkType: hard -"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0": +"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.1": version: 4.1.1 resolution: "http-cache-semantics@npm:4.1.1" checksum: ce1319b8a382eb3cbb4a37c19f6bfe14e5bb5be3d09079e885e8c513ab2d3cd9214902f8a31c9dc4e37022633ceabfc2d697405deeaf1b8f3552bb4ed996fdfc @@ -9238,13 +9179,6 @@ __metadata: languageName: node linkType: hard -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: a7b241e3149c26e37474e3435779487f42f36883711f198c45794703c7556bc38af224088bd4d1a221a45b8208ae2c2bcf86200383621434d0c099304481c5b9 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -9276,7 +9210,7 @@ __metadata: languageName: node linkType: hard -"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5": +"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.5": version: 1.0.5 resolution: "internal-slot@npm:1.0.5" dependencies: @@ -9327,7 +9261,7 @@ __metadata: languageName: node linkType: hard -"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1": +"is-arguments@npm:^1.0.4": version: 1.1.1 resolution: "is-arguments@npm:1.1.1" dependencies: @@ -9422,7 +9356,7 @@ __metadata: languageName: node linkType: hard -"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5": +"is-date-object@npm:^1.0.1": version: 1.0.5 resolution: "is-date-object@npm:1.0.5" dependencies: @@ -9532,13 +9466,6 @@ __metadata: languageName: node linkType: hard -"is-map@npm:^2.0.1, is-map@npm:^2.0.2": - version: 2.0.2 - resolution: "is-map@npm:2.0.2" - checksum: 119ff9137a37fd131a72fab3f4ab8c9d6a24b0a1ee26b4eff14dc625900d8675a97785eea5f4174265e2006ed076cc24e89f6e57ebd080a48338d914ec9168a5 - languageName: node - linkType: hard - "is-nan@npm:^1.2.1": version: 1.3.2 resolution: "is-nan@npm:1.3.2" @@ -9661,13 +9588,6 @@ __metadata: languageName: node linkType: hard -"is-set@npm:^2.0.1, is-set@npm:^2.0.2": - version: 2.0.2 - resolution: "is-set@npm:2.0.2" - checksum: 5f8bd1880df8c0004ce694e315e6e1e47a3452014be792880bb274a3b2cdb952fdb60789636ca6e084c7947ca8b7ae03ccaf54c93a7fcfed228af810559e5432 - languageName: node - linkType: hard - "is-shared-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "is-shared-array-buffer@npm:1.0.2" @@ -9743,13 +9663,6 @@ __metadata: languageName: node linkType: hard -"is-weakmap@npm:^2.0.1": - version: 2.0.1 - resolution: "is-weakmap@npm:2.0.1" - checksum: 9c9fec9efa7bf5030a4a927f33fff2a6976b93646259f92b517d3646c073cc5b98283a162ce75c412b060a46de07032444b530f0a4c9b6e012ef8f1741c3a987 - languageName: node - linkType: hard - "is-weakref@npm:^1.0.2": version: 1.0.2 resolution: "is-weakref@npm:1.0.2" @@ -9759,16 +9672,6 @@ __metadata: languageName: node linkType: hard -"is-weakset@npm:^2.0.1": - version: 2.0.2 - resolution: "is-weakset@npm:2.0.2" - dependencies: - call-bind: ^1.0.2 - get-intrinsic: ^1.1.1 - checksum: ef5136bd446ae4603229b897f73efd0720c6ab3ec6cc05c8d5c4b51aa9f95164713c4cad0a22ff1fedf04865ff86cae4648bc1d5eead4b6388e1150525af1cc1 - languageName: node - linkType: hard - "is-wsl@npm:^2.2.0": version: 2.2.0 resolution: "is-wsl@npm:2.2.0" @@ -9785,13 +9688,6 @@ __metadata: languageName: node linkType: hard -"isarray@npm:^2.0.5": - version: 2.0.5 - resolution: "isarray@npm:2.0.5" - checksum: 4199f14a7a13da2177c66c31080008b7124331956f47bca57dd0b6ea9f11687aa25e565a2c7a2b519bc86988d10398e3049a1f5df13c9f6b7664154690ae79fd - languageName: node - linkType: hard - "isarray@npm:~1.0.0": version: 1.0.0 resolution: "isarray@npm:1.0.0" @@ -11235,27 +11131,26 @@ __metadata: languageName: node linkType: hard -"make-fetch-happen@npm:^10.0.3": - version: 10.2.1 - resolution: "make-fetch-happen@npm:10.2.1" +"make-fetch-happen@npm:^11.0.3": + version: 11.1.1 + resolution: "make-fetch-happen@npm:11.1.1" dependencies: agentkeepalive: ^4.2.1 - cacache: ^16.1.0 - http-cache-semantics: ^4.1.0 + cacache: ^17.0.0 + http-cache-semantics: ^4.1.1 http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 is-lambda: ^1.0.1 lru-cache: ^7.7.1 - minipass: ^3.1.6 - minipass-collect: ^1.0.2 - minipass-fetch: ^2.0.3 + minipass: ^5.0.0 + minipass-fetch: ^3.0.0 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 negotiator: ^0.6.3 promise-retry: ^2.0.1 socks-proxy-agent: ^7.0.0 - ssri: ^9.0.0 - checksum: 28ec392f63ab93511f400839dcee83107eeecfaad737d1e8487ea08b4332cd89a8f3319584222edd9f6f1d0833cf516691469496d46491863f9e88c658013949 + ssri: ^10.0.0 + checksum: c161bde51dbc03382f9fac091734526a64dd6878205db6c338f70d2133df797b5b5166bff3091cf7d4785869d4b21e99a58139c1790c2fb1b5eec00f528f5f0b languageName: node linkType: hard @@ -11863,18 +11758,18 @@ __metadata: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.2 - resolution: "minipass-fetch@npm:2.1.2" +"minipass-fetch@npm:^3.0.0": + version: 3.0.3 + resolution: "minipass-fetch@npm:3.0.3" dependencies: encoding: ^0.1.13 - minipass: ^3.1.6 + minipass: ^5.0.0 minipass-sized: ^1.0.3 minizlib: ^2.1.2 dependenciesMeta: encoding: optional: true - checksum: 33ab2c5bdb3d91b9cb8bc6ae42d7418f4f00f7f7beae14b3bb21ea18f9224e792f560a6e17b6f1be12bbeb70dbe99a269f4204c60e5d99130a0777b153505c43 + checksum: 12e0fde7e8fdb1bd923b9243b4788e7d3df305c6ddb3b79ab2da4587fa608c126157c7f6dd43746e8063ee99ec5abbb898d0426c812e9c9b68260c4fea9b279a languageName: node linkType: hard @@ -11905,7 +11800,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": +"minipass@npm:^3.0.0": version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -12142,13 +12037,14 @@ __metadata: linkType: hard "node-gyp@npm:^9.3.1, node-gyp@npm:latest": - version: 9.3.1 - resolution: "node-gyp@npm:9.3.1" + version: 9.4.0 + resolution: "node-gyp@npm:9.4.0" dependencies: env-paths: ^2.2.0 + exponential-backoff: ^3.1.1 glob: ^7.1.4 graceful-fs: ^4.2.6 - make-fetch-happen: ^10.0.3 + make-fetch-happen: ^11.0.3 nopt: ^6.0.0 npmlog: ^6.0.0 rimraf: ^3.0.2 @@ -12157,7 +12053,7 @@ __metadata: which: ^2.0.2 bin: node-gyp: bin/node-gyp.js - checksum: 3285c110768eb65aadd9aa1d056f917e594ea22611d21fd535ab3677ea433d0a281e7f09bc73d53e64b02214f4379dbca476dc33faffe455b0ac1d5ba92802f4 + checksum: e8dfbe2b02f23d056f69e01c409381963e92c71cafba6c9cfbf63b038f65ca19ab8183bb6891d080e59c4eb2cc425fc736f42e90afc0f0030ecd97bfc64fb7ad languageName: node linkType: hard @@ -12194,13 +12090,13 @@ __metadata: linkType: hard "nopt@npm:^7.0.0": - version: 7.1.0 - resolution: "nopt@npm:7.1.0" + version: 7.2.0 + resolution: "nopt@npm:7.2.0" dependencies: abbrev: ^2.0.0 bin: nopt: bin/nopt.js - checksum: f6dc14b7ae956d561798ed98e40ab5354ace6b6b23a74c7fd5f60036b5d734a6a99e4873c7a76dccda1b0326f0e3cdd432536fe8d1eab4d96fe525b53830f674 + checksum: 9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff languageName: node linkType: hard @@ -12425,7 +12321,7 @@ __metadata: languageName: node linkType: hard -"object-is@npm:^1.0.1, object-is@npm:^1.1.5": +"object-is@npm:^1.0.1": version: 1.1.5 resolution: "object-is@npm:1.1.5" dependencies: @@ -13064,9 +12960,9 @@ __metadata: linkType: hard "pirates@npm:^4.0.1, pirates@npm:^4.0.4": - version: 4.0.5 - resolution: "pirates@npm:4.0.5" - checksum: 58b6ff0f137a3d70ff34ac4802fd19819cdc19b53e9c95adecae6c7cfc77719a11f561ad85d46e79e520ef57c31145a564c8bc3bee8cfee75d441fab2928a51d + version: 4.0.6 + resolution: "pirates@npm:4.0.6" + checksum: 00d5fa51f8dded94d7429700fb91a0c1ead00ae2c7fd27089f0c5b63e6eca36197fe46384631872690a66f390c5e27198e99006ab77ae472692ab9c2ca903f36 languageName: node linkType: hard @@ -13302,13 +13198,6 @@ __metadata: languageName: node linkType: hard -"promise-inflight@npm:^1.0.1": - version: 1.0.1 - resolution: "promise-inflight@npm:1.0.1" - checksum: d179d148d98fbff3d815752fa9a08a87d3190551d1420f17c4467f628214db12235ae068d98cd001f024453676d8985af8f28f002345646c4ece4600a79620bc - languageName: node - linkType: hard - "promise-retry@npm:^2.0.1": version: 2.0.1 resolution: "promise-retry@npm:2.0.1" @@ -13703,7 +13592,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.0": +"regexp.prototype.flags@npm:^1.4.3": version: 1.5.0 resolution: "regexp.prototype.flags@npm:1.5.0" dependencies: @@ -14542,8 +14431,8 @@ __metadata: linkType: hard "rollup@npm:^3.2.5": - version: 3.24.0 - resolution: "rollup@npm:3.24.0" + version: 3.25.1 + resolution: "rollup@npm:3.25.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -14551,7 +14440,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: b9c2d72937af906ddffcc4a9e66936912a391c7b20cd89ed5afd50dfb0350f8efac4f58f9087cf09a982183b7adf2b6a2bd461080f775891a1d145e77672f5d6 + checksum: 52ac7b8ae9dc2d47a08c7bba99b2f79a66906a8db3fce5eccc96c91315f2fb8fc2555ef212299854b463d04c0afd8cb84481e847e19d01f198c69be0261e4cbd languageName: node linkType: hard @@ -14641,14 +14530,14 @@ __metadata: linkType: hard "schema-utils@npm:^4.0.0": - version: 4.1.0 - resolution: "schema-utils@npm:4.1.0" + version: 4.2.0 + resolution: "schema-utils@npm:4.2.0" dependencies: "@types/json-schema": ^7.0.9 ajv: ^8.9.0 ajv-formats: ^2.1.1 ajv-keywords: ^5.1.0 - checksum: bb1b387936c5d98f8a7fbd21a158259af9c981fb07460b39052f8bddd068297ec06c41629177a3be54eac017ce077c9d71b01773502b99caad6be167c2a9b82c + checksum: 8dab7e7800316387fd8569870b4b668cfcecf95ac551e369ea799bbcbfb63fb0365366d4b59f64822c9f7904d8c5afcfaf5a6124a4b08783e558cd25f299a6b4 languageName: node linkType: hard @@ -14694,36 +14583,14 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.3.4": - version: 7.3.4 - resolution: "semver@npm:7.3.4" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: 16b77752071597135b934bb33258badbac6c1cebbabe507ce31f68db3229acae7afa9602265c375c34df092339caa738b105e0c62240536ea1efd4767c36e674 - languageName: node - linkType: hard - -"semver@npm:7.5.0": - version: 7.5.0 - resolution: "semver@npm:7.5.0" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: 203a556d7189c277b9774a325fd2695187b2822069094e0dbfcc56dfd10a1fd646a94e73812f249802a661f6437b2370ccb8ee330e7b9888b38e53c5a8216222 - languageName: node - linkType: hard - -"semver@npm:7.5.1, semver@npm:^7.0.0, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": - version: 7.5.1 - resolution: "semver@npm:7.5.1" +"semver@npm:7.3.4, semver@npm:7.5.0, semver@npm:7.5.1, semver@npm:^7.0.0, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8": + version: 7.5.2 + resolution: "semver@npm:7.5.2" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: ae6aca3cfba9b4d0e0a8fa789c7fa4a8412e39f24ecc19500db291a0a31bb43c151021e4fdbb68a85dcd06c1297f6daeeb09647cea4253eba0ccc0106eb7cd67 + checksum: d151207ab762a8067f6302076edc04e5b8da2362eb9e3f21c2567ceadfd415064936d215b4aae7791da118c230649d29089be979ffa49c5b56a6bcf82147efdd languageName: node linkType: hard @@ -14815,14 +14682,7 @@ __metadata: languageName: node linkType: hard -"shell-exec@npm:1.0.2": - version: 1.0.2 - resolution: "shell-exec@npm:1.0.2" - checksum: 3733ed251bc025340a373da151c44d36e69d37f570e94f5dd6a968427e8d9f751a58dd87c5a01bf0ad1289ad1de963a425aaf14ad3a06f8aee56f776462b63ca - languageName: node - linkType: hard - -"shell-exec@npm:^1": +"shell-exec@npm:1.0.2, shell-exec@npm:^1": version: 1.1.2 resolution: "shell-exec@npm:1.1.2" checksum: d03cdcaf1a7462397d70efde4f43df46a6776bff27d46c83a9f985898b738366236185e79958717356f19b54a1766597d86dfab4d1d8dbe18c07cd5586d2d27c @@ -15132,12 +14992,12 @@ __metadata: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" +"ssri@npm:^10.0.0": + version: 10.0.4 + resolution: "ssri@npm:10.0.4" dependencies: - minipass: ^3.1.1 - checksum: c5d153ce03b5980d683ecaa4d805f6a03d8dc545736213803e168a1907650c46c08a4e5ce6d670a0205482b35c35713d9d286d9133bdd79853a406e22ad81f04 + minipass: ^5.0.0 + checksum: d085474ea6b439623a9a6a2c67570cb9e68e1bb6060e46e4d387f113304d75a51946d57c524be3a90ebfa3c73026edf76eb1a2d79a7f6cff0b04f21d99f127ab languageName: node linkType: hard @@ -15166,15 +15026,6 @@ __metadata: languageName: node linkType: hard -"stop-iteration-iterator@npm:^1.0.0": - version: 1.0.0 - resolution: "stop-iteration-iterator@npm:1.0.0" - dependencies: - internal-slot: ^1.0.4 - checksum: c4158d6188aac510d9e92925b58709207bd94699e9c31186a040c80932a687f84a51356b5895e6dc72710aad83addb9411c22171832c9ae0e6e11b7d61b0dfb9 - languageName: node - linkType: hard - "stream-events@npm:^1.0.5": version: 1.0.5 resolution: "stream-events@npm:1.0.5" @@ -16074,9 +15925,9 @@ __metadata: linkType: hard "type-fest@npm:^3.11.0": - version: 3.11.1 - resolution: "type-fest@npm:3.11.1" - checksum: 55c0ba11e8b494684bf63f76e762ac44a95a9243a873cfc03c97f909477938d4a80f0c6265bfae92074072305447428748726385bbf2be4484b8451d73c84881 + version: 3.12.0 + resolution: "type-fest@npm:3.12.0" + checksum: c51abb6bcb7f92601a9b143d0fa44cacc1d1c19041300168303476c36f05e561610b8c2457e321a107c715160a33f63f507552034d2fd49a7bc1dbb4c1de565f languageName: node linkType: hard @@ -16361,21 +16212,21 @@ __metadata: languageName: node linkType: hard -"unique-filename@npm:^2.0.0": - version: 2.0.1 - resolution: "unique-filename@npm:2.0.1" +"unique-filename@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-filename@npm:3.0.0" dependencies: - unique-slug: ^3.0.0 - checksum: 55d95cd670c4a86117ebc34d394936d712d43b56db6bc511f9ca00f666373818bf9f075fb0ab76bcbfaf134592ef26bb75aad20786c1ff1ceba4457eaba90fb8 + unique-slug: ^4.0.0 + checksum: 6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f languageName: node linkType: hard -"unique-slug@npm:^3.0.0": - version: 3.0.0 - resolution: "unique-slug@npm:3.0.0" +"unique-slug@npm:^4.0.0": + version: 4.0.0 + resolution: "unique-slug@npm:4.0.0" dependencies: imurmurhash: ^0.1.4 - checksum: 617240eb921af803b47d322d75a71a363dacf2e56c29ae5d1404fad85f64f4ec81ef10ee4fd79215d0202cbe1e5a653edb0558d59c9c81d3bd538c2d58e4c026 + checksum: cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635 languageName: node linkType: hard @@ -17147,18 +16998,6 @@ __metadata: languageName: node linkType: hard -"which-collection@npm:^1.0.1": - version: 1.0.1 - resolution: "which-collection@npm:1.0.1" - dependencies: - is-map: ^2.0.1 - is-set: ^2.0.1 - is-weakmap: ^2.0.1 - is-weakset: ^2.0.1 - checksum: 249f913e1758ed2f06f00706007d87dc22090a80591a56917376e70ecf8fc9ab6c41d98e1c87208bb9648676f65d4b09c0e4d23c56c7afb0f0a73a27d701df5d - languageName: node - linkType: hard - "which-pm-runs@npm:^1.0.0": version: 1.1.0 resolution: "which-pm-runs@npm:1.1.0" From df1090bd9c23ba3e6da2e211c9027a590a7776fe Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 11:59:04 +0200 Subject: [PATCH 51/76] fix index.html not being a route during dev --- code/builders/builder-manager/src/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/builders/builder-manager/src/index.ts b/code/builders/builder-manager/src/index.ts index 6b5f04e66d6f..3597a206ec46 100644 --- a/code/builders/builder-manager/src/index.ts +++ b/code/builders/builder-manager/src/index.ts @@ -189,6 +189,10 @@ const starter: StarterFunction = async function* starterGeneratorFn({ next(); } }); + router.use(`/index.html`, ({ path }, res) => { + console.log({ path }); + res.status(200).send(html); + }); return { bail, From e6205754242b22793e774e02aefe117b6640b011 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 16:09:21 +0200 Subject: [PATCH 52/76] Make browser data consistent --- scripts/bench/browse.ts | 51 ++++++++++++++++++++++------------------- scripts/package.json | 3 +-- scripts/tasks/bench.ts | 2 +- scripts/yarn.lock | 48 ++++++++------------------------------ 4 files changed, 39 insertions(+), 65 deletions(-) diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts index db44d57107b9..3069e2f89b0f 100644 --- a/scripts/bench/browse.ts +++ b/scripts/bench/browse.ts @@ -1,11 +1,8 @@ -/* eslint-disable no-await-in-loop */ -import type { Page, FrameLocator, Browser } from 'playwright'; +import type { Page, FrameLocator } from 'playwright'; import { chromium } from 'playwright'; import { now } from './utils'; -const TIMEOUT = 20000; - interface Result { managerHeaderVisible?: number; managerIndexVisible?: number; @@ -14,21 +11,29 @@ interface Result { } export const browse = async (url: string) => { - const start = now(); const result: Result = {}; - const browser = await chromium.launch(/* { headless: false } */); - - Object.assign(result, await benchStory(browser, url, start)); - Object.assign(result, await benchDocs(browser, url, start)); + /* Heat up time for playwright and the builder + * This is to avoid the first run being slower than the rest + * which can happen due to vite or webpack lazy compilation + * We visit the story and the docs page, so those should be fully cached + * + * We instantiate a new browser for each run to avoid any caching happening in the browser itself + */ + await benchStory(url); + await benchDocs(url); - await browser.close(); + Object.assign(result, await benchStory(url)); + Object.assign(result, await benchDocs(url)); return result; }; -async function benchDocs(browser: Browser, url: string, start: number) { +async function benchDocs(url: string) { + const browser = await chromium.launch(/* { headless: false } */); + await browser.newContext(); const page = await browser.newPage(); + const start = now(); const result: Result = {}; await page.goto(`${url}?path=/docs/example-button--docs`); @@ -37,11 +42,8 @@ async function benchDocs(browser: Browser, url: string, start: number) { let previewFrame: FrameLocator | Page = page; previewFrame = await page.frameLocator('#storybook-preview-iframe'); - let actualText; - while (now() - start < TIMEOUT && (!actualText || !actualText.length)) { - const preview = await previewFrame.getByText('Primary UI component for user interaction'); - actualText = await preview.innerText(); - } + const preview = await previewFrame.getByText('Primary UI component for user interaction'); + const actualText = await preview.innerText(); if (!actualText?.includes('Primary UI component for user interaction')) { throw new Error('docs not visible in time'); @@ -58,7 +60,10 @@ async function benchDocs(browser: Browser, url: string, start: number) { return result; } -async function benchStory(browser: Browser, url: string, start: number) { +async function benchStory(url: string) { + const browser = await chromium.launch(/* { headless: false } */); + const start = now(); + await browser.newContext(); const page = await browser.newPage(); const result: Result = {}; await page.goto(`${url}?path=/story/example-button--primary`); @@ -74,14 +79,12 @@ async function benchStory(browser: Browser, url: string, start: number) { result.managerIndexVisible = now() - start; }, async () => { - let previewFrame: FrameLocator | Page = page; - previewFrame = await page.frameLocator('#storybook-preview-iframe'); + const previewFrame: FrameLocator | Page = await page.frameLocator( + '#storybook-preview-iframe' + ); - let actualText; - while (now() - start < TIMEOUT && (!actualText || !actualText.length)) { - const preview = await previewFrame.getByText('Button'); - actualText = await preview.innerText(); - } + const preview = await previewFrame.getByText('Button'); + const actualText = await preview.innerText(); if (!actualText?.includes('Button')) { throw new Error('preview not visible in time'); diff --git a/scripts/package.json b/scripts/package.json index 9a14c7434826..743f4b50a531 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -87,7 +87,6 @@ "@types/express": "^4.17.11", "@types/fs-extra": "^11.0.1", "@types/http-server": "^0.12.1", - "@types/kill-port": "^2.0.0", "@types/lodash": "^4", "@types/node": "^16.0.0", "@types/node-fetch": "^2.5.7", @@ -110,6 +109,7 @@ "codecov": "^3.8.1", "commander": "^6.2.1", "cross-env": "^7.0.3", + "cross-port-killer": "^1.4.0", "cross-spawn": "^7.0.3", "danger": "^11.2.6", "dataloader": "^2.2.2", @@ -143,7 +143,6 @@ "jest-watch-typeahead": "^2.2.1", "json5": "^2.2.3", "junit-xml": "^1.2.0", - "kill-port": "^2.0.1", "lint-staged": "^10.5.4", "lodash": "^4.17.21", "memoizerific": "^1.11.3", diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 5eece1daf446..6ebf176630ea 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -1,4 +1,4 @@ -import killPort from 'kill-port'; +import { kill as killPort } from 'cross-port-killer'; import type { Task } from '../task'; import { PORT as devPort, dev } from './dev'; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index a1eb317d4f70..c2bddacfaecf 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2935,7 +2935,6 @@ __metadata: "@types/express": ^4.17.11 "@types/fs-extra": ^11.0.1 "@types/http-server": ^0.12.1 - "@types/kill-port": ^2.0.0 "@types/lodash": ^4 "@types/node": ^16.0.0 "@types/node-fetch": ^2.5.7 @@ -2959,6 +2958,7 @@ __metadata: codecov: ^3.8.1 commander: ^6.2.1 cross-env: ^7.0.3 + cross-port-killer: ^1.4.0 cross-spawn: ^7.0.3 danger: ^11.2.6 dataloader: ^2.2.2 @@ -2992,7 +2992,6 @@ __metadata: jest-watch-typeahead: ^2.2.1 json5: ^2.2.3 junit-xml: ^1.2.0 - kill-port: ^2.0.1 lint-staged: ^10.5.4 lodash: ^4.17.21 memoizerific: ^1.11.3 @@ -3597,16 +3596,6 @@ __metadata: languageName: node linkType: hard -"@types/kill-port@npm:^2.0.0": - version: 2.0.0 - resolution: "@types/kill-port@npm:2.0.0" - dependencies: - "@types/node": "*" - shell-exec: ^1 - checksum: 33fa3cee58477a5ee3ce086d5ddfc80dc32d26933c0d4f2e1a8a5aa9dac6bd641c800d1ea85ad7847972f7fc8d0b76e1b0eb61a8ce07c3e20291234ff8cf245b - languageName: node - linkType: hard - "@types/lodash@npm:^4, @types/lodash@npm:^4.14.175": version: 4.14.195 resolution: "@types/lodash@npm:4.14.195" @@ -6037,6 +6026,15 @@ __metadata: languageName: node linkType: hard +"cross-port-killer@npm:^1.4.0": + version: 1.4.0 + resolution: "cross-port-killer@npm:1.4.0" + bin: + kill-port: source/cli.js + checksum: 6057d2f2f8b30d1abab70118f55dd0b49e95da9cc8c9ded849f20220bbdf3e56c1f9b362112f89bc948f22521fb4b8b2ff8522d1f607f88c276c6ba44dfa9310 + languageName: node + linkType: hard + "cross-spawn@npm:^6.0.0": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" @@ -8381,13 +8379,6 @@ __metadata: languageName: node linkType: hard -"get-them-args@npm:1.3.2": - version: 1.3.2 - resolution: "get-them-args@npm:1.3.2" - checksum: a75e26d7369a00f596dc9c3c7b4259a219d4486a0beef51d991867103cc8c07d22814a24210d9c9f56cefb35f9848e16fe120b57b3ec1ea333054e715059d586 - languageName: node - linkType: hard - "getpass@npm:^0.1.1": version: 0.1.7 resolution: "getpass@npm:0.1.7" @@ -10680,18 +10671,6 @@ __metadata: languageName: node linkType: hard -"kill-port@npm:^2.0.1": - version: 2.0.1 - resolution: "kill-port@npm:2.0.1" - dependencies: - get-them-args: 1.3.2 - shell-exec: 1.0.2 - bin: - kill-port: cli.js - checksum: fcbcea8e950f564e0a0b3a986390ecbd8ef1cac00f365cc2bf1f42dd972dc3a714fc2fbe362068deba2bec11cf10a7d3edb7aaf2d12e48390a2c26d73f85b4f7 - languageName: node - linkType: hard - "kind-of@npm:^3.0.2": version: 3.2.2 resolution: "kind-of@npm:3.2.2" @@ -14682,13 +14661,6 @@ __metadata: languageName: node linkType: hard -"shell-exec@npm:1.0.2, shell-exec@npm:^1": - version: 1.1.2 - resolution: "shell-exec@npm:1.1.2" - checksum: d03cdcaf1a7462397d70efde4f43df46a6776bff27d46c83a9f985898b738366236185e79958717356f19b54a1766597d86dfab4d1d8dbe18c07cd5586d2d27c - languageName: node - linkType: hard - "side-channel@npm:^1.0.4": version: 1.0.4 resolution: "side-channel@npm:1.0.4" From 5a910d2950fceaefd2f5d6d51d5343c988bed1aa Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 16:51:31 +0200 Subject: [PATCH 53/76] fix port-killer in CI --- scripts/tasks/bench.ts | 2 +- scripts/utils/serve.ts | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 6ebf176630ea..16e1f8aaa1cb 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -1,4 +1,4 @@ -import { kill as killPort } from 'cross-port-killer'; +import { killPort } from '../utils/serve'; import type { Task } from '../task'; import { PORT as devPort, dev } from './dev'; diff --git a/scripts/utils/serve.ts b/scripts/utils/serve.ts index 8f023b3174ba..50e80e59dda4 100644 --- a/scripts/utils/serve.ts +++ b/scripts/utils/serve.ts @@ -1,3 +1,4 @@ +import { kill as portKiller } from 'cross-port-killer'; import express from 'express'; import serveStatic from 'serve-static'; import type { Server } from 'http'; @@ -12,3 +13,12 @@ export const serve = async (location: string, port: string): Promise => }); }); }; + +// portKiller is not actually async.. it does return a promise, but executes synchronously +export const killPort = async (port: number) => { + try { + await portKiller(port); + } catch (e) { + // ignore + } +}; From ef9fa44c4ff3dd97cb600d4791c0439b0a3d0a52 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Thu, 22 Jun 2023 17:51:02 +0200 Subject: [PATCH 54/76] remove prerelease versions of svelte 4 --- code/frameworks/svelte-vite/package.json | 6 ++-- code/frameworks/sveltekit/package.json | 2 +- code/renderers/svelte/package.json | 4 +-- code/yarn.lock | 35 ++++++++++++------------ 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 79bb6612d3a7..7e6fc28664d8 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -50,19 +50,19 @@ "@storybook/builder-vite": "7.1.0-alpha.38", "@storybook/node-logger": "7.1.0-alpha.38", "@storybook/svelte": "7.1.0-alpha.38", - "@sveltejs/vite-plugin-svelte": "^2.0.0", + "@sveltejs/vite-plugin-svelte": "^2.4.1", "magic-string": "^0.30.0", "sveltedoc-parser": "^4.2.1", "ts-dedent": "^2.2.0" }, "devDependencies": { "@types/node": "^16.0.0", - "svelte": "^4.0.0-next.2", + "svelte": "^4.0.0", "typescript": "~4.9.3", "vite": "^4.0.0" }, "peerDependencies": { - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2", + "svelte": "^3.0.0 || ^4.0.0", "vite": "^3.0.0 || ^4.0.0" }, "engines": { diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index e9cf3f3dccb0..29f1f9b9209d 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -60,7 +60,7 @@ "vite": "^4.0.0" }, "peerDependencies": { - "svelte": "^3.0.0 || ^4.0.0 || ^4.0.0-next.2", + "svelte": "^3.0.0 || ^4.0.0", "vite": "^4.0.0" }, "engines": { diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 188ed931a2f0..b75695e1464e 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -64,12 +64,12 @@ }, "devDependencies": { "expect-type": "^0.15.0", - "svelte": "^4.0.0-next.2", + "svelte": "^4.0.0", "svelte-check": "^3.4.3", "typescript": "^5.0.4" }, "peerDependencies": { - "svelte": "^3.59.1 || ^4.0.0 || ^4.0.0-next.2" + "svelte": "^3.59.1 || ^4.0.0" }, "engines": { "node": ">=16.0.0" diff --git a/code/yarn.lock b/code/yarn.lock index 06876a1fa5ae..5b216fbff059 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -3786,7 +3786,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": +"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9": version: 0.3.18 resolution: "@jridgewell/trace-mapping@npm:0.3.18" dependencies: @@ -7321,16 +7321,16 @@ __metadata: "@storybook/builder-vite": 7.1.0-alpha.38 "@storybook/node-logger": 7.1.0-alpha.38 "@storybook/svelte": 7.1.0-alpha.38 - "@sveltejs/vite-plugin-svelte": ^2.0.0 + "@sveltejs/vite-plugin-svelte": ^2.4.1 "@types/node": ^16.0.0 magic-string: ^0.30.0 - svelte: ^4.0.0-next.2 + svelte: ^4.0.0 sveltedoc-parser: ^4.2.1 ts-dedent: ^2.2.0 typescript: ~4.9.3 vite: ^4.0.0 peerDependencies: - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2 + svelte: ^3.0.0 || ^4.0.0 vite: ^3.0.0 || ^4.0.0 languageName: unknown linkType: soft @@ -7367,13 +7367,13 @@ __metadata: "@storybook/preview-api": 7.1.0-alpha.38 "@storybook/types": 7.1.0-alpha.38 expect-type: ^0.15.0 - svelte: ^4.0.0-next.2 + svelte: ^4.0.0 svelte-check: ^3.4.3 sveltedoc-parser: ^4.2.1 type-fest: ^3.11.0 typescript: ^5.0.4 peerDependencies: - svelte: ^3.59.1 || ^4.0.0 || ^4.0.0-next.2 + svelte: ^3.59.1 || ^4.0.0 languageName: unknown linkType: soft @@ -7388,7 +7388,7 @@ __metadata: typescript: ^4.9.3 vite: ^4.0.0 peerDependencies: - svelte: ^3.0.0 || ^4.0.0 || ^4.0.0-next.2 + svelte: ^3.0.0 || ^4.0.0 vite: ^4.0.0 languageName: unknown linkType: soft @@ -7680,7 +7680,7 @@ __metadata: languageName: node linkType: hard -"@sveltejs/vite-plugin-svelte@npm:^2.0.0": +"@sveltejs/vite-plugin-svelte@npm:^2.4.1": version: 2.4.1 resolution: "@sveltejs/vite-plugin-svelte@npm:2.4.1" dependencies: @@ -12456,16 +12456,16 @@ __metadata: languageName: node linkType: hard -"code-red@npm:^1.0.0": - version: 1.0.0 - resolution: "code-red@npm:1.0.0" +"code-red@npm:^1.0.3": + version: 1.0.3 + resolution: "code-red@npm:1.0.3" dependencies: "@jridgewell/sourcemap-codec": ^1.4.14 "@types/estree": ^1.0.0 acorn: ^8.8.2 estree-walker: ^3.0.3 periscopic: ^3.1.0 - checksum: 584bad8f23b4aa13b9b7ce043fb92d3165aaa0a3bfd058b9cb9ec4cb7b2b3f1289abbc353cf62f353e05463c3f323560dfe1e4cb680d2900a7b85a549ab9206c + checksum: d8722c5bb5898fe0723211d07067179cd0befe70b4b4115752d207b4703816bf146298fa0bfe6b1aaa94e16387bd80945bba2b7271d0ebd3b2e9d10e0b9f1e2a languageName: node linkType: hard @@ -28746,23 +28746,24 @@ __metadata: languageName: node linkType: hard -"svelte@npm:^4.0.0-next.2": - version: 4.0.0-next.2 - resolution: "svelte@npm:4.0.0-next.2" +"svelte@npm:^4.0.0": + version: 4.0.0 + resolution: "svelte@npm:4.0.0" dependencies: "@ampproject/remapping": ^2.2.1 "@jridgewell/sourcemap-codec": ^1.4.15 + "@jridgewell/trace-mapping": ^0.3.18 acorn: ^8.8.2 aria-query: ^5.2.1 axobject-query: ^3.2.1 - code-red: ^1.0.0 + code-red: ^1.0.3 css-tree: ^2.3.1 estree-walker: ^3.0.3 is-reference: ^3.0.1 locate-character: ^3.0.0 magic-string: ^0.30.0 periscopic: ^3.1.0 - checksum: ce14a2d3de37d80831b66a5eb2ab8129a8bd9578d4dafb70f66e47e6580f6ce7c1705094781b30b97572f2adef15d72938ca192aae00585feb945fa1ff41654c + checksum: fb0bf76904d3f5c4a72a91d6db7fbbabf1bfbeaeb99e4cd29a90bfc5d9cb784f994fc4249c7635f27cb1890e7313de533e0d7931ff409297cdd2a2374d0f9d53 languageName: node linkType: hard From 2f4481a690e1ed04bdcf354f449faf4258545dd0 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Thu, 22 Jun 2023 17:54:40 +0200 Subject: [PATCH 55/76] don't install svelte@next in templates --- code/lib/cli/src/sandbox-templates.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/lib/cli/src/sandbox-templates.ts b/code/lib/cli/src/sandbox-templates.ts index b1408f0037d5..832c80e96523 100644 --- a/code/lib/cli/src/sandbox-templates.ts +++ b/code/lib/cli/src/sandbox-templates.ts @@ -248,8 +248,7 @@ const baseTemplates = { }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', - script: - 'npm create vite@latest --yes {{beforeDir}} -- --template svelte && cd {{beforeDir}} && npm install --save-dev svelte@next', + script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte', expected: { framework: '@storybook/svelte-vite', renderer: '@storybook/svelte', @@ -259,8 +258,7 @@ const baseTemplates = { }, 'svelte-vite/default-ts': { name: 'Svelte Vite (TS)', - script: - 'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts && cd {{beforeDir}} && npm install --save-dev svelte@next', + script: 'npm create vite@latest --yes {{beforeDir}} -- --template svelte-ts', expected: { framework: '@storybook/svelte-vite', renderer: '@storybook/svelte', @@ -305,7 +303,7 @@ const baseTemplates = { 'svelte-kit/skeleton-js': { name: 'Svelte Kit (JS)', script: - 'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next', + 'yarn create svelte-with-args --name=svelte-kit/skeleton-js --directory={{beforeDir}} --template=skeleton --types=null --no-prettier --no-eslint --no-playwright --no-vitest', expected: { framework: '@storybook/sveltekit', renderer: '@storybook/svelte', @@ -316,7 +314,7 @@ const baseTemplates = { 'svelte-kit/skeleton-ts': { name: 'Svelte Kit (TS)', script: - 'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest && cd {{beforeDir}} && npm install --save-dev svelte@next', + 'yarn create svelte-with-args --name=svelte-kit/skeleton-ts --directory={{beforeDir}} --template=skeleton --types=typescript --no-prettier --no-eslint --no-playwright --no-vitest', expected: { framework: '@storybook/sveltekit', renderer: '@storybook/svelte', From bb473527f86f0dfa0b35e9c5dcc6ddf6523b800f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Thu, 22 Jun 2023 18:22:55 +0200 Subject: [PATCH 56/76] remove port-killer add MDX tracking --- scripts/bench/bench.schema | 7 ++++-- scripts/bench/browse.ts | 48 +++++++++++++++++++++++++++++++++----- scripts/bench/types.ts | 10 ++++++-- scripts/package.json | 1 - scripts/tasks/bench.ts | 12 ++++------ scripts/utils/serve.ts | 10 -------- scripts/yarn.lock | 10 -------- 7 files changed, 60 insertions(+), 38 deletions(-) diff --git a/scripts/bench/bench.schema b/scripts/bench/bench.schema index c440cf39bc00..59903c0a6441 100644 --- a/scripts/bench/bench.schema +++ b/scripts/bench/bench.schema @@ -23,8 +23,11 @@ devManagerResponsive: INTEGER, devManagerHeaderVisible: INTEGER, devManagerIndexVisible: INTEGER, devStoryVisible: INTEGER, -devDocsVisible: INTEGER, +devStoryVisibleUncached: INTEGER, +devAutodocsVisible: INTEGER, +devMDXVisible: INTEGER, buildManagerHeaderVisible: INTEGER, buildManagerIndexVisible: INTEGER, buildStoryVisible: INTEGER, -buildDocsVisible: INTEGER \ No newline at end of file +buildAutodocsVisible: INTEGER +buildMDXVisible: INTEGER, \ No newline at end of file diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts index 3069e2f89b0f..d26d5e784e6a 100644 --- a/scripts/bench/browse.ts +++ b/scripts/bench/browse.ts @@ -7,7 +7,9 @@ interface Result { managerHeaderVisible?: number; managerIndexVisible?: number; storyVisible?: number; - docsVisible?: number; + storyVisibleUncached?: number; + autodocsVisible?: number; + mdxVisible?: number; } export const browse = async (url: string) => { @@ -20,16 +22,19 @@ export const browse = async (url: string) => { * * We instantiate a new browser for each run to avoid any caching happening in the browser itself */ - await benchStory(url); - await benchDocs(url); + const x = await benchStory(url); + await benchAutodocs(url); + result.storyVisibleUncached = x.storyVisible; + + Object.assign(result, await benchMDX(url)); Object.assign(result, await benchStory(url)); - Object.assign(result, await benchDocs(url)); + Object.assign(result, await benchAutodocs(url)); return result; }; -async function benchDocs(url: string) { +async function benchAutodocs(url: string) { const browser = await chromium.launch(/* { headless: false } */); await browser.newContext(); const page = await browser.newPage(); @@ -49,7 +54,38 @@ async function benchDocs(url: string) { throw new Error('docs not visible in time'); } - result.docsVisible = now() - start; + result.autodocsVisible = now() - start; + }, + ]; + + await Promise.all(tasks.map((t) => t())); + + await page.close(); + + return result; +} + +async function benchMDX(url: string) { + const browser = await chromium.launch(/* { headless: false } */); + await browser.newContext(); + const page = await browser.newPage(); + const start = now(); + const result: Result = {}; + await page.goto(`${url}?path=/docs/configure-your-project--docs`); + + const tasks = [ + async () => { + let previewFrame: FrameLocator | Page = page; + previewFrame = await page.frameLocator('#storybook-preview-iframe'); + + const preview = await previewFrame.getByText('Configure your project'); + const actualText = await preview.innerText(); + + if (!actualText?.includes('Configure your project')) { + throw new Error('docs not visible in time'); + } + + result.mdxVisible = now() - start; }, ]; diff --git a/scripts/bench/types.ts b/scripts/bench/types.ts index 2f2e0277fe9b..da00af720ad2 100644 --- a/scripts/bench/types.ts +++ b/scripts/bench/types.ts @@ -46,10 +46,14 @@ export interface BenchResults { devManagerHeaderVisible: number; /** Time to browse to index.html and load the story index */ devManagerIndexVisible: number; + /** Time to browse to index.html and load iframe content and the story is rendered, for the very first run */ + devStoryVisibleUncached: number; /** Time to browse to index.html and load iframe content and the story is rendered */ devStoryVisible: number; /** Time to browse to index.html and load iframe content and the docs page is rendered */ - devDocsVisible: number; + devAutodocsVisible: number; + /** Time to browse to index.html and load iframe content and the MDX page is rendered */ + devMDXVisible: number; /** Time to browse to index.html and view the SB logo */ buildManagerHeaderVisible: number; /** Time to browse to index.html and load the story index */ @@ -57,5 +61,7 @@ export interface BenchResults { /** Time to browse to index.html and load iframe content and the story is rendered */ buildStoryVisible: number; /** Time to browse to index.html and load iframe content and the docs page is rendered */ - buildDocsVisible: number; + buildAutodocsVisible: number; + /** Time to browse to index.html and load iframe content and the MDX page is rendered */ + buildMDXVisible: number; } diff --git a/scripts/package.json b/scripts/package.json index 743f4b50a531..3b9ea58ecc9e 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -109,7 +109,6 @@ "codecov": "^3.8.1", "commander": "^6.2.1", "cross-env": "^7.0.3", - "cross-port-killer": "^1.4.0", "cross-spawn": "^7.0.3", "danger": "^11.2.6", "dataloader": "^2.2.2", diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 16e1f8aaa1cb..62d7d1d062b2 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -1,4 +1,3 @@ -import { killPort } from '../utils/serve'; import type { Task } from '../task'; import { PORT as devPort, dev } from './dev'; @@ -22,7 +21,6 @@ export const bench: Task = { const { default: prettyBytes } = await dynamicImport('pretty-bytes'); const { default: prettyTime } = await dynamicImport('pretty-ms'); - await killPort(devPort).catch(() => {}); const devController = await dev.run(details, { ...options, debug: false }); if (!devController) { throw new Error('dev: controller is null'); @@ -30,9 +28,7 @@ export const bench: Task = { controllers.push(devController); const devBrowseResult = await browse(`http://localhost:${devPort}`); devController.abort(); - await killPort(devPort).catch(() => {}); - await killPort(servePort).catch(() => {}); const serveController = await serve.run(details, { ...options, debug: false }); if (!serveController) { throw new Error('serve: controller is null'); @@ -40,19 +36,21 @@ export const bench: Task = { controllers.push(serveController); const buildBrowseResult = await browse(`http://localhost:${servePort}`); serveController.abort(); - await killPort(servePort).catch(() => {}); await saveBench( { devManagerHeaderVisible: devBrowseResult.managerHeaderVisible, devManagerIndexVisible: devBrowseResult.managerIndexVisible, devStoryVisible: devBrowseResult.storyVisible, - devDocsVisible: devBrowseResult.docsVisible, + devStoryVisibleUncached: devBrowseResult.storyVisibleUncached, + devAutodocsVisible: devBrowseResult.autodocsVisible, + devMDXVisible: devBrowseResult.mdxVisible, buildManagerHeaderVisible: buildBrowseResult.managerHeaderVisible, buildManagerIndexVisible: buildBrowseResult.managerIndexVisible, buildStoryVisible: buildBrowseResult.storyVisible, - buildDocsVisible: buildBrowseResult.docsVisible, + buildAutodocsVisible: buildBrowseResult.autodocsVisible, + buildMDXVisible: buildBrowseResult.mdxVisible, }, { rootDir: details.sandboxDir, diff --git a/scripts/utils/serve.ts b/scripts/utils/serve.ts index 50e80e59dda4..8f023b3174ba 100644 --- a/scripts/utils/serve.ts +++ b/scripts/utils/serve.ts @@ -1,4 +1,3 @@ -import { kill as portKiller } from 'cross-port-killer'; import express from 'express'; import serveStatic from 'serve-static'; import type { Server } from 'http'; @@ -13,12 +12,3 @@ export const serve = async (location: string, port: string): Promise => }); }); }; - -// portKiller is not actually async.. it does return a promise, but executes synchronously -export const killPort = async (port: number) => { - try { - await portKiller(port); - } catch (e) { - // ignore - } -}; diff --git a/scripts/yarn.lock b/scripts/yarn.lock index c2bddacfaecf..603b3509edbc 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2958,7 +2958,6 @@ __metadata: codecov: ^3.8.1 commander: ^6.2.1 cross-env: ^7.0.3 - cross-port-killer: ^1.4.0 cross-spawn: ^7.0.3 danger: ^11.2.6 dataloader: ^2.2.2 @@ -6026,15 +6025,6 @@ __metadata: languageName: node linkType: hard -"cross-port-killer@npm:^1.4.0": - version: 1.4.0 - resolution: "cross-port-killer@npm:1.4.0" - bin: - kill-port: source/cli.js - checksum: 6057d2f2f8b30d1abab70118f55dd0b49e95da9cc8c9ded849f20220bbdf3e56c1f9b362112f89bc948f22521fb4b8b2ff8522d1f607f88c276c6ba44dfa9310 - languageName: node - linkType: hard - "cross-spawn@npm:^6.0.0": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" From 0289bb3027df6e1266bfb28be7893dd0f36e284c Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2023 09:43:10 +0800 Subject: [PATCH 57/76] Skip docs benchmarks for now --- scripts/bench/browse.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts index d26d5e784e6a..c01eff4fda35 100644 --- a/scripts/bench/browse.ts +++ b/scripts/bench/browse.ts @@ -23,13 +23,13 @@ export const browse = async (url: string) => { * We instantiate a new browser for each run to avoid any caching happening in the browser itself */ const x = await benchStory(url); - await benchAutodocs(url); + // FIXME await benchAutodocs(url); result.storyVisibleUncached = x.storyVisible; - Object.assign(result, await benchMDX(url)); + // FIXME Object.assign(result, await benchMDX(url)); Object.assign(result, await benchStory(url)); - Object.assign(result, await benchAutodocs(url)); + // FIXME Object.assign(result, await benchAutodocs(url)); return result; }; From 10166210c2e89da1ca5f2a79ced5a891f6112dbd Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2023 10:22:14 +0800 Subject: [PATCH 58/76] Fix defaults, error logging --- scripts/upload-bench.ts | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 44bf2e2700f2..668ab8a9e41a 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -40,11 +40,14 @@ const defaults: Record = { devManagerHeaderVisible: null, devManagerIndexVisible: null, devStoryVisible: null, - devDocsVisible: null, + devStoryVisibleUncached: null, + devAutodocsVisible: null, + devMDXVisible: null, buildManagerHeaderVisible: null, buildManagerIndexVisible: null, - buildDocsVisible: null, + buildAutodocsVisible: null, buildStoryVisible: null, + buildMDXVisible: null, }; const uploadBench = async () => { @@ -76,6 +79,16 @@ const uploadBench = async () => { ); }; -uploadBench().then(() => { - console.log('done'); -}); +uploadBench() + .catch((err) => { + console.error(err); + if (err.errors) { + err.errors.forEach((elt: any) => { + console.log(elt); + }); + } + process.exit(1); + }) + .then(() => { + console.log('done'); + }); From 2d8a6914f25753152a3aa70883f7eda92f7c18fa Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Fri, 23 Jun 2023 12:03:38 +0800 Subject: [PATCH 59/76] Fix typo --- scripts/bench/bench.schema | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/bench/bench.schema b/scripts/bench/bench.schema index 59903c0a6441..d459223136a0 100644 --- a/scripts/bench/bench.schema +++ b/scripts/bench/bench.schema @@ -29,5 +29,5 @@ devMDXVisible: INTEGER, buildManagerHeaderVisible: INTEGER, buildManagerIndexVisible: INTEGER, buildStoryVisible: INTEGER, -buildAutodocsVisible: INTEGER -buildMDXVisible: INTEGER, \ No newline at end of file +buildAutodocsVisible: INTEGER, +buildMDXVisible: INTEGER \ No newline at end of file From 2df984ea1a6e50e3f3fe8c5224217a665714f724 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 23 Jun 2023 10:53:55 +0200 Subject: [PATCH 60/76] add bench.json to workspace to be persisted in CI --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b25984a5e12e..27ec6db3d15a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -332,6 +332,7 @@ jobs: - persist_to_workspace: root: . paths: + - sandbox/*/bench.json - sandbox/*/storybook-static test-runner-production: parameters: From 9542f7c5294498fde2d762bbc6a12555c46badaf Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Fri, 23 Jun 2023 11:35:37 +0200 Subject: [PATCH 61/76] Hide ModuleNotFound error in pnpm pnp mode --- code/lib/cli/src/js-package-manager/PNPMProxy.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/lib/cli/src/js-package-manager/PNPMProxy.ts b/code/lib/cli/src/js-package-manager/PNPMProxy.ts index 4ddaeb6fcda3..d435ec397a05 100644 --- a/code/lib/cli/src/js-package-manager/PNPMProxy.ts +++ b/code/lib/cli/src/js-package-manager/PNPMProxy.ts @@ -135,7 +135,9 @@ export class PNPMProxy extends JsPackageManager { return packageJSON; } catch (error) { - console.error('Error while fetching package version in PNPM PnP mode:', error); + if (error.code !== 'MODULE_NOT_FOUND') { + console.error('Error while fetching package version in PNPM PnP mode:', error); + } return null; } } From 6b252298a9039a7f8a89ae734c01a569a2a31198 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 12:23:26 +0200 Subject: [PATCH 62/76] still support svelte 3.1.0 --- code/renderers/svelte/package.json | 2 +- code/yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index b78970060d87..b15cc60e9743 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -69,7 +69,7 @@ "typescript": "^5.0.4" }, "peerDependencies": { - "svelte": "^3.59.1 || ^4.0.0" + "svelte": "^3.1.0 || ^4.0.0" }, "engines": { "node": ">=16.0.0" diff --git a/code/yarn.lock b/code/yarn.lock index 050b5974bede..db2f297265d8 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7373,7 +7373,7 @@ __metadata: type-fest: ^3.11.0 typescript: ^5.0.4 peerDependencies: - svelte: ^3.59.1 || ^4.0.0 + svelte: ^3.1.0 || ^4.0.0 languageName: unknown linkType: soft From 06ce21d8703e566adb8db5333efc08b26030dced Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 12:56:35 +0200 Subject: [PATCH 63/76] don't trigger CI on release PRs per default --- .github/workflows/trigger-circle-ci-workflow.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/trigger-circle-ci-workflow.yml b/.github/workflows/trigger-circle-ci-workflow.yml index 78de059ad4e3..7b1f853bde1e 100644 --- a/.github/workflows/trigger-circle-ci-workflow.yml +++ b/.github/workflows/trigger-circle-ci-workflow.yml @@ -9,8 +9,6 @@ on: branches: - next - main - - version-prerelease-from-** - - version-patch-from-** jobs: get-branch: @@ -56,7 +54,7 @@ jobs: trigger-pr-tests: runs-on: ubuntu-latest needs: get-branch - if: github.event_name == 'pull_request_target' && ((github.event.pull_request.draft == false || contains(github.event.pull_request.labels.*.name, 'ci:pr')) && !contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily')) + if: github.event_name == 'pull_request_target' && (((github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'release')) || contains(github.event.pull_request.labels.*.name, 'ci:pr')) && !contains(github.event.pull_request.labels.*.name, 'ci:merged') && !contains(github.event.pull_request.labels.*.name, 'ci:daily')) steps: - name: Trigger PR tests run: > @@ -109,4 +107,4 @@ jobs: }' env: CIRCLE_CI_TOKEN: ${{ secrets.CIRCLE_CI_TOKEN }} - BRANCH: ${{ needs.get-branch.outputs.branch }} \ No newline at end of file + BRANCH: ${{ needs.get-branch.outputs.branch }} From 9f6b3bbd319bbb7afd9a089a6adead5c50a82ab1 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 13:02:25 +0200 Subject: [PATCH 64/76] add line about CI in release PR description --- scripts/release/generate-pr-description.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 55c1531aa04f..3c4e207349b2 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -150,6 +150,7 @@ export const generateReleaseDescription = ({ Before merging the PR, there are a few QA steps to go through: - [ ] Add the "freeze" label to this PR, to ensure it doesn't get automatically forced pushed by new changes. + - [ ] Add the "ci:daily" label to this PR, to trigger the full test suite to run on this PR. And for each change below: @@ -201,7 +202,7 @@ export const generateNonReleaseDescription = ( ${manualCherryPicks || ''} - If you've made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. + If you've made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-patch-release.yml) and wait for it to finish. When everything above is done: - Merge this PR From 12a61bc9cbdb9f18b4429923eee8286abb4c7677 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 13:04:12 +0200 Subject: [PATCH 65/76] add todo to non-release pr descriptions --- scripts/release/generate-pr-description.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/release/generate-pr-description.ts b/scripts/release/generate-pr-description.ts index 9af509800a33..363520474e88 100644 --- a/scripts/release/generate-pr-description.ts +++ b/scripts/release/generate-pr-description.ts @@ -200,6 +200,13 @@ export const generateNonReleaseDescription = ( dedent`This is an automated pull request. None of the changes requires a version bump, they are only internal or documentation related. Merging this PR will not trigger a new release, but documentation will be updated. If you're not a core maintainer with permissions to release you can ignore this pull request. + ## To do + + Before merging the PR: + + - [ ] Add the "freeze" label to this PR, to ensure it doesn't get automatically forced pushed by new changes. + - [ ] Add the "ci:daily" label to this PR, to trigger the full test suite to run on this PR. + This is a list of all the PRs merged and commits pushed directly to \`next\` since the last release: ${changeList} From ce80cf08830dc37a5b32e8262442992f89a679b5 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 23 Jun 2023 13:05:23 +0200 Subject: [PATCH 66/76] update snapshots --- .../__tests__/generate-pr-description.test.ts | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/scripts/release/__tests__/generate-pr-description.test.ts b/scripts/release/__tests__/generate-pr-description.test.ts index 5323f6bc2a87..b96d466514ed 100644 --- a/scripts/release/__tests__/generate-pr-description.test.ts +++ b/scripts/release/__tests__/generate-pr-description.test.ts @@ -174,6 +174,7 @@ For each pull request below, you need to either manually cherry pick it, or disc Before merging the PR, there are a few QA steps to go through: - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. And for each change below: @@ -235,6 +236,13 @@ For each pull request below, you need to either manually cherry pick it, or disc "This is an automated pull request. None of the changes requires a version bump, they are only internal or documentation related. Merging this PR will not trigger a new release, but documentation will be updated. If you\\'re not a core maintainer with permissions to release you can ignore this pull request. + ## To do + + Before merging the PR: + + - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. + This is a list of all the PRs merged and commits pushed directly to \\\`next\\\` since the last release: - **🐛 Bug**: Some PR title for a bug [#42](https://github.com/storybookjs/storybook/pull/42) @@ -263,7 +271,7 @@ For each pull request below, you need to either manually cherry pick it, or disc - [ ] [#42](https://github.com/storybookjs/storybook/pull/42): \\\`git cherry-pick -m1 -x abc123\\\` - If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. + If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-patch-release.yml) and wait for it to finish. When everything above is done: - Merge this PR @@ -294,6 +302,7 @@ For each pull request below, you need to either manually cherry pick it, or disc Before merging the PR, there are a few QA steps to go through: - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. And for each change below: @@ -350,6 +359,13 @@ For each pull request below, you need to either manually cherry pick it, or disc "This is an automated pull request. None of the changes requires a version bump, they are only internal or documentation related. Merging this PR will not trigger a new release, but documentation will be updated. If you\\'re not a core maintainer with permissions to release you can ignore this pull request. + ## To do + + Before merging the PR: + + - [ ] Add the \\"freeze\\" label to this PR, to ensure it doesn\\'t get automatically forced pushed by new changes. + - [ ] Add the \\"ci:daily\\" label to this PR, to trigger the full test suite to run on this PR. + This is a list of all the PRs merged and commits pushed directly to \\\`next\\\` since the last release: - **🐛 Bug**: Some PR title for a bug [#42](https://github.com/storybookjs/storybook/pull/42) @@ -373,7 +389,7 @@ For each pull request below, you need to either manually cherry pick it, or disc - If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-prerelease.yml) and wait for it to finish. + If you\\'ve made any changes (change PR titles, revert PRs), manually trigger a re-generation of this PR with [this workflow](https://github.com/storybookjs/storybook/actions/workflows/prepare-patch-release.yml) and wait for it to finish. When everything above is done: - Merge this PR From e310832e4f416d112dd873a49a44f056c9a81f4a Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 23 Jun 2023 13:05:42 +0200 Subject: [PATCH 67/76] use the frame api instead, await for the load event, increase timeout, split the bench files apart for CI --- .circleci/config.yml | 2 +- scripts/bench/browse.ts | 60 +++++++++++++++------------------------- scripts/bench/utils.ts | 17 +++++++++--- scripts/tasks/bench.ts | 1 + scripts/tasks/build.ts | 1 + scripts/tasks/dev.ts | 9 +++++- scripts/tasks/sandbox.ts | 1 + 7 files changed, 48 insertions(+), 43 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 27ec6db3d15a..759b3b25d9eb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -332,7 +332,7 @@ jobs: - persist_to_workspace: root: . paths: - - sandbox/*/bench.json + - sandbox/*/bench/*.json - sandbox/*/storybook-static test-runner-production: parameters: diff --git a/scripts/bench/browse.ts b/scripts/bench/browse.ts index c01eff4fda35..d101f27e8c47 100644 --- a/scripts/bench/browse.ts +++ b/scripts/bench/browse.ts @@ -1,6 +1,4 @@ -import type { Page, FrameLocator } from 'playwright'; import { chromium } from 'playwright'; - import { now } from './utils'; interface Result { @@ -23,85 +21,79 @@ export const browse = async (url: string) => { * We instantiate a new browser for each run to avoid any caching happening in the browser itself */ const x = await benchStory(url); - // FIXME await benchAutodocs(url); + await benchAutodocs(url); result.storyVisibleUncached = x.storyVisible; - // FIXME Object.assign(result, await benchMDX(url)); + Object.assign(result, await benchMDX(url)); Object.assign(result, await benchStory(url)); - // FIXME Object.assign(result, await benchAutodocs(url)); + Object.assign(result, await benchAutodocs(url)); return result; }; async function benchAutodocs(url: string) { + const result: Result = {}; const browser = await chromium.launch(/* { headless: false } */); await browser.newContext(); const page = await browser.newPage(); + await page.setDefaultTimeout(40000); + const start = now(); - const result: Result = {}; await page.goto(`${url}?path=/docs/example-button--docs`); const tasks = [ async () => { - let previewFrame: FrameLocator | Page = page; - previewFrame = await page.frameLocator('#storybook-preview-iframe'); - - const preview = await previewFrame.getByText('Primary UI component for user interaction'); - const actualText = await preview.innerText(); + const previewPage = await page.frame({ url: /iframe.html/ }).page(); + await previewPage.setDefaultTimeout(40000); - if (!actualText?.includes('Primary UI component for user interaction')) { - throw new Error('docs not visible in time'); - } + await previewPage.waitForLoadState('load'); + await previewPage.getByText('Primary UI component for user interaction'); result.autodocsVisible = now() - start; }, ]; await Promise.all(tasks.map((t) => t())); - await page.close(); return result; } async function benchMDX(url: string) { + const result: Result = {}; const browser = await chromium.launch(/* { headless: false } */); await browser.newContext(); const page = await browser.newPage(); + const start = now(); - const result: Result = {}; await page.goto(`${url}?path=/docs/configure-your-project--docs`); const tasks = [ async () => { - let previewFrame: FrameLocator | Page = page; - previewFrame = await page.frameLocator('#storybook-preview-iframe'); + const previewPage = await page.frame({ url: /iframe.html/ }).page(); + await previewPage.setDefaultTimeout(40000); - const preview = await previewFrame.getByText('Configure your project'); - const actualText = await preview.innerText(); - - if (!actualText?.includes('Configure your project')) { - throw new Error('docs not visible in time'); - } + await previewPage.waitForLoadState('load'); + await previewPage.getByText('Configure your project'); result.mdxVisible = now() - start; }, ]; await Promise.all(tasks.map((t) => t())); - await page.close(); return result; } async function benchStory(url: string) { + const result: Result = {}; const browser = await chromium.launch(/* { headless: false } */); - const start = now(); await browser.newContext(); const page = await browser.newPage(); - const result: Result = {}; + + const start = now(); await page.goto(`${url}?path=/story/example-button--primary`); const tasks = [ @@ -115,23 +107,17 @@ async function benchStory(url: string) { result.managerIndexVisible = now() - start; }, async () => { - const previewFrame: FrameLocator | Page = await page.frameLocator( - '#storybook-preview-iframe' - ); + const previewPage = await page.frame({ url: /iframe.html/ }).page(); + await previewPage.setDefaultTimeout(40000); - const preview = await previewFrame.getByText('Button'); - const actualText = await preview.innerText(); - - if (!actualText?.includes('Button')) { - throw new Error('preview not visible in time'); - } + await previewPage.waitForLoadState('load'); + await previewPage.getByText('Button'); result.storyVisible = now() - start; }, ]; await Promise.all(tasks.map((t) => t())); - await page.close(); return result; diff --git a/scripts/bench/utils.ts b/scripts/bench/utils.ts index 7467a8d6dc73..93b9cf5dbae5 100644 --- a/scripts/bench/utils.ts +++ b/scripts/bench/utils.ts @@ -1,5 +1,5 @@ import { join } from 'path'; -import { ensureDir, writeJSON, readJSON } from 'fs-extra'; +import { ensureDir, writeJSON, readJSON, readdir } from 'fs-extra'; import type { BenchResults } from './types'; export const now = () => new Date().getTime(); @@ -8,15 +8,24 @@ export interface SaveBenchOptions { rootDir?: string; } -export const saveBench = async (data: Partial, options: SaveBenchOptions) => { +export const saveBench = async ( + key: string, + data: Partial, + options: SaveBenchOptions +) => { const dirname = options.rootDir || process.cwd(); const existing = await ensureDir(dirname).then(() => { return loadBench(options).catch(() => ({})); }); - await writeJSON(join(dirname, `bench.json`), { ...existing, ...data }, { spaces: 2 }); + await writeJSON(join(dirname, `bench/${key}.json`), { ...existing, ...data }, { spaces: 2 }); }; export const loadBench = async (options: SaveBenchOptions): Promise> => { const dirname = options.rootDir || process.cwd(); - return readJSON(join(dirname, `bench.json`)); + const files = await readdir(join(dirname, `bench`)); + return files.reduce(async (acc, file) => { + const data = await readJSON(join(dirname, `bench/${file}`)); + return { ...(await acc), ...data }; + }, Promise.resolve({})); + // return readJSON(join(dirname, `bench.json`)); }; diff --git a/scripts/tasks/bench.ts b/scripts/tasks/bench.ts index 62d7d1d062b2..e1b1fec753ea 100644 --- a/scripts/tasks/bench.ts +++ b/scripts/tasks/bench.ts @@ -38,6 +38,7 @@ export const bench: Task = { serveController.abort(); await saveBench( + 'browse', { devManagerHeaderVisible: devBrowseResult.managerHeaderVisible, devManagerIndexVisible: devBrowseResult.managerIndexVisible, diff --git a/scripts/tasks/build.ts b/scripts/tasks/build.ts index c9dbfc253e43..38aadb15fda6 100644 --- a/scripts/tasks/build.ts +++ b/scripts/tasks/build.ts @@ -32,6 +32,7 @@ export const build: Task = { const buildPreviewSize = buildSize - buildPrebuildSize - buildStaticSize; await saveBench( + 'build', { buildTime, buildSize, diff --git a/scripts/tasks/dev.ts b/scripts/tasks/dev.ts index 50132d3a709a..92e885f52078 100644 --- a/scripts/tasks/dev.ts +++ b/scripts/tasks/dev.ts @@ -40,7 +40,14 @@ export const dev: Task = { }), ]); - await saveBench({ devPreviewResponsive, devManagerResponsive }, { rootDir: sandboxDir }); + await saveBench( + 'dev', + { + devPreviewResponsive, + devManagerResponsive, + }, + { rootDir: sandboxDir } + ); return controller; }, diff --git a/scripts/tasks/sandbox.ts b/scripts/tasks/sandbox.ts index 087685ef8336..24b946049631 100644 --- a/scripts/tasks/sandbox.ts +++ b/scripts/tasks/sandbox.ts @@ -55,6 +55,7 @@ export const sandbox: Task = { const initSize = await promisify(dirSize)(join(details.sandboxDir, 'node_modules')); await saveBench( + 'sandbox', { createTime, generateTime, From ca5dca955cea67b811c1d6ff4ba468d859867952 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 23 Jun 2023 13:48:34 +0200 Subject: [PATCH 68/76] fix --- scripts/bench/utils.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/bench/utils.ts b/scripts/bench/utils.ts index 93b9cf5dbae5..c2dd21aeb18b 100644 --- a/scripts/bench/utils.ts +++ b/scripts/bench/utils.ts @@ -13,18 +13,19 @@ export const saveBench = async ( data: Partial, options: SaveBenchOptions ) => { - const dirname = options.rootDir || process.cwd(); - const existing = await ensureDir(dirname).then(() => { - return loadBench(options).catch(() => ({})); + const dirName = join(options.rootDir || process.cwd(), 'bench'); + const fileName = `${key}.json`; + const existing = await ensureDir(dirName).then(() => { + return readJSON(join(dirName, fileName)).catch(() => ({})); }); - await writeJSON(join(dirname, `bench/${key}.json`), { ...existing, ...data }, { spaces: 2 }); + await writeJSON(join(dirName, fileName), { ...existing, ...data }, { spaces: 2 }); }; export const loadBench = async (options: SaveBenchOptions): Promise> => { - const dirname = options.rootDir || process.cwd(); - const files = await readdir(join(dirname, `bench`)); - return files.reduce(async (acc, file) => { - const data = await readJSON(join(dirname, `bench/${file}`)); + const dirName = join(options.rootDir || process.cwd(), 'bench'); + const files = await readdir(dirName); + return files.reduce(async (acc, fileName) => { + const data = await readJSON(join(dirName, fileName)); return { ...(await acc), ...data }; }, Promise.resolve({})); // return readJSON(join(dirname, `bench.json`)); From 1107520c5b516f2f78824f7af43604ae9a94c083 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 23 Jun 2023 14:31:58 +0200 Subject: [PATCH 69/76] cleanup --- .circleci/config.yml | 3 --- scripts/upload-bench.ts | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 759b3b25d9eb..c0e0943b630a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -466,9 +466,6 @@ jobs: command: yarn upload-bench $(yarn get-template << pipeline.parameters.workflow >> bench) - report-workflow-on-failure: template: $(yarn get-template << pipeline.parameters.workflow >> bench) - - store_artifacts: # this is where playwright puts more complex stuff - path: code/bench-results/ - destination: bench-results workflows: ci: diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index 668ab8a9e41a..1b0d570ee821 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -1,10 +1,9 @@ -import { copy } from 'fs-extra'; import { join } from 'path'; import { BigQuery } from '@google-cloud/bigquery'; import type { BenchResults } from './bench/types'; import { loadBench } from './bench/utils'; -import { SANDBOX_DIRECTORY, CODE_DIRECTORY } from './utils/constants'; +import { SANDBOX_DIRECTORY } from './utils/constants'; import { execaCommand } from './utils/exec'; const templateKey = process.argv[2]; @@ -71,12 +70,6 @@ const uploadBench = async () => { const appTable = dataset.table('bench2'); await appTable.insert([row]); - - // for CI artifacts - await copy( - `${templateSandboxDir}/bench.json`, - `${CODE_DIRECTORY}/bench-results/${templateSandboxDir}.json` - ); }; uploadBench() From 536ca99a848276c67e0b2b1fb5bbd894da8e7141 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 23 Jun 2023 16:58:26 +0200 Subject: [PATCH 70/76] parse pnp paths in storybook metadata --- code/lib/telemetry/src/get-framework-info.ts | 34 +- code/lib/telemetry/src/sanitize.test.ts | 8 +- .../telemetry/src/storybook-metadata.test.ts | 447 +++++++++++------- 3 files changed, 314 insertions(+), 175 deletions(-) diff --git a/code/lib/telemetry/src/get-framework-info.ts b/code/lib/telemetry/src/get-framework-info.ts index 4f465c7f0b2f..c5e706166471 100644 --- a/code/lib/telemetry/src/get-framework-info.ts +++ b/code/lib/telemetry/src/get-framework-info.ts @@ -1,4 +1,7 @@ import type { PackageJson, StorybookConfig } from '@storybook/types'; +import path from 'path'; +import { frameworkPackages } from '@storybook/core-common'; +import { cleanPaths } from './sanitize'; import { getActualPackageJson } from './package-json'; const knownRenderers = [ @@ -30,20 +33,39 @@ function findMatchingPackage(packageJson: PackageJson, suffixes: string[]) { return suffixes.map((suffix) => `@storybook/${suffix}`).find((pkg) => allDependencies[pkg]); } -export async function getFrameworkInfo(mainConfig: StorybookConfig) { - const { framework: frameworkInput } = mainConfig; +export const getFrameworkPackageName = (mainConfig?: StorybookConfig) => { + const packageNameOrPath = + typeof mainConfig?.framework === 'string' ? mainConfig.framework : mainConfig?.framework?.name; + + if (!packageNameOrPath) { + return null; + } + + const normalizedPath = path.normalize(packageNameOrPath).replace(new RegExp(/\\/, 'g'), '/'); - if (!frameworkInput) return {}; + const knownFramework = Object.keys(frameworkPackages).find((pkg) => normalizedPath.endsWith(pkg)); + + return knownFramework || cleanPaths(packageNameOrPath).replace(/.*node_modules[\\/]/, ''); +}; + +export async function getFrameworkInfo(mainConfig: StorybookConfig) { + if (!mainConfig.framework) return {}; - const framework = typeof frameworkInput === 'string' ? { name: frameworkInput } : frameworkInput; + const frameworkName = getFrameworkPackageName(mainConfig); + if (!frameworkName) return {}; + const frameworkOptions = + typeof mainConfig.framework === 'object' ? mainConfig.framework.options : {}; - const frameworkPackageJson = await getActualPackageJson(framework.name); + const frameworkPackageJson = await getActualPackageJson(frameworkName); const builder = findMatchingPackage(frameworkPackageJson, knownBuilders); const renderer = findMatchingPackage(frameworkPackageJson, knownRenderers); return { - framework, + framework: { + name: frameworkName, + options: frameworkOptions, + }, builder, renderer, }; diff --git a/code/lib/telemetry/src/sanitize.test.ts b/code/lib/telemetry/src/sanitize.test.ts index 2f8f5b2267f7..f5b3a742d3e6 100644 --- a/code/lib/telemetry/src/sanitize.test.ts +++ b/code/lib/telemetry/src/sanitize.test.ts @@ -73,10 +73,10 @@ describe(`Errors Helpers`, () => { const mockCwd = jest.spyOn(process, `cwd`).mockImplementation(() => cwdMockPath); - const errorMessage = `This path ${fullPath} is a test ${fullPath}`; + const errorMessage = `This path should be sanitized ${fullPath}`; expect(cleanPaths(errorMessage, `/`)).toBe( - `This path $SNIP/${filePath} is a test $SNIP/${filePath}` + `This path should be sanitized $SNIP/${filePath}` ); mockCwd.mockRestore(); } @@ -90,10 +90,10 @@ describe(`Errors Helpers`, () => { const mockCwd = jest.spyOn(process, `cwd`).mockImplementation(() => cwdMockPath); - const errorMessage = `This path ${fullPath} is a test ${fullPath}`; + const errorMessage = `This path should be sanitized ${fullPath}`; expect(cleanPaths(errorMessage, `\\`)).toBe( - `This path $SNIP\\${filePath} is a test $SNIP\\${filePath}` + `This path should be sanitized $SNIP\\${filePath}` ); mockCwd.mockRestore(); } diff --git a/code/lib/telemetry/src/storybook-metadata.test.ts b/code/lib/telemetry/src/storybook-metadata.test.ts index 1df998adbb5e..ab64dc26e9a1 100644 --- a/code/lib/telemetry/src/storybook-metadata.test.ts +++ b/code/lib/telemetry/src/storybook-metadata.test.ts @@ -47,209 +47,326 @@ jest.mock('detect-package-manager', () => ({ getNpmVersion: () => '3.1.1', })); -describe('sanitizeAddonName', () => { - const originalSep = path.sep; +const originalSep = path.sep; + +describe('storybook-metadata', () => { + let cwdSpy: jest.SpyInstance; beforeEach(() => { // @ts-expect-error the property is read only but we can change it for testing purposes path.sep = originalSep; }); - test('special addon names', () => { - const addonNames = [ - '@storybook/preset-create-react-app', - 'storybook-addon-deprecated/register', - 'storybook-addon-ends-with-js/register.js', - '@storybook/addon-knobs/preset', - '@storybook/addon-ends-with-js/preset.js', - '@storybook/addon-postcss/dist/index.js', - '../local-addon/register.js', - '../../', - ].map(sanitizeAddonName); - - expect(addonNames).toEqual([ - '@storybook/preset-create-react-app', - 'storybook-addon-deprecated', - 'storybook-addon-ends-with-js', - '@storybook/addon-knobs', - '@storybook/addon-ends-with-js', - '@storybook/addon-postcss', - '../local-addon', - '../../', - ]); + afterEach(() => { + cwdSpy?.mockRestore(); + // @ts-expect-error the property is read only but we can change it for testing purposes + path.sep = originalSep; }); - test('Windows paths', () => { - // @ts-expect-error the property is read only but we can change it for testing purposes - path.sep = '\\'; - const cwdMockPath = `C:\\Users\\username\\storybook-app`; - jest.spyOn(process, `cwd`).mockImplementationOnce(() => cwdMockPath); + describe('sanitizeAddonName', () => { + test('special addon names', () => { + const addonNames = [ + '@storybook/preset-create-react-app', + 'storybook-addon-deprecated/register', + 'storybook-addon-ends-with-js/register.js', + '@storybook/addon-knobs/preset', + '@storybook/addon-ends-with-js/preset.js', + '@storybook/addon-postcss/dist/index.js', + '../local-addon/register.js', + '../../', + ].map(sanitizeAddonName); - expect(sanitizeAddonName(`${cwdMockPath}\\local-addon\\themes.js`)).toEqual( - '$SNIP\\local-addon\\themes' - ); - }); + expect(addonNames).toEqual([ + '@storybook/preset-create-react-app', + 'storybook-addon-deprecated', + 'storybook-addon-ends-with-js', + '@storybook/addon-knobs', + '@storybook/addon-ends-with-js', + '@storybook/addon-postcss', + '../local-addon', + '../../', + ]); + }); - test('Linux paths', () => { - // @ts-expect-error the property is read only but we can change it for testing purposes - path.sep = '/'; - const cwdMockPath = `/Users/username/storybook-app`; - jest.spyOn(process, `cwd`).mockImplementationOnce(() => cwdMockPath); + test('Windows paths', () => { + // @ts-expect-error the property is read only but we can change it for testing purposes + path.sep = '\\'; + const cwdMockPath = `C:\\Users\\username\\storybook-app`; + cwdSpy = jest.spyOn(process, `cwd`).mockReturnValueOnce(cwdMockPath); - expect(sanitizeAddonName(`${cwdMockPath}/local-addon/themes.js`)).toEqual( - '$SNIP/local-addon/themes' - ); + expect(sanitizeAddonName(`${cwdMockPath}\\local-addon\\themes.js`)).toEqual( + '$SNIP\\local-addon\\themes' + ); + }); + + test('Linux paths', () => { + // @ts-expect-error the property is read only but we can change it for testing purposes + path.sep = '/'; + const cwdMockPath = `/Users/username/storybook-app`; + cwdSpy = jest.spyOn(process, `cwd`).mockReturnValue(cwdMockPath); + + expect(sanitizeAddonName(`${cwdMockPath}/local-addon/themes.js`)).toEqual( + '$SNIP/local-addon/themes' + ); + }); }); -}); -describe('await computeStorybookMetadata', () => { - test('should return frameworkOptions from mainjs', async () => { - const reactResult = await computeStorybookMetadata({ - packageJson: packageJsonMock, - mainConfig: { - ...mainJsMock, - framework: { + describe('computeStorybookMetadata', () => { + describe('pnp paths', () => { + test('should parse pnp paths for known frameworks', async () => { + const unixResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: '/Users/foo/storybook/.yarn/__virtual__/@storybook-react-vite-virtual-769c990b9/0/cache/@storybook-react-vite-npm-7.1.0-alpha.38-512b-a23.zip/node_modules/@storybook/react-vite', + options: { + fastRefresh: false, + }, + }, + }, + }); + + expect(unixResult.framework).toEqual({ name: '@storybook/react-vite', - options: { - fastRefresh: false, + options: { fastRefresh: false }, + }); + + const windowsResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: 'C:\\Users\\foo\\storybook\\.yarn\\__virtual__\\@storybook-react-vite-virtual-769c990b9\\0\\cache\\@storybook-react-vite-npm-7.1.0-alpha.38-512b-a23.zip\\node_modules\\@storybook\\react-vite', + options: { + fastRefresh: false, + }, + }, }, - }, - }, - }); + }); - expect(reactResult.framework).toEqual({ - name: '@storybook/react-vite', - options: { fastRefresh: false }, + expect(windowsResult.framework).toEqual({ + name: '@storybook/react-vite', + options: { fastRefresh: false }, + }); + }); + + test('should parse pnp paths for unknown frameworks', async () => { + const unixResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: '/Users/foo/my-project/.yarn/__virtual__/@storybook-react-vite-virtual-769c990b9/0/cache/@storybook-react-rust-npm-7.1.0-alpha.38-512b-a23.zip/node_modules/storybook-react-rust', + }, + }, + }); + + expect(unixResult.framework).toEqual({ + name: 'storybook-react-rust', + }); + + const windowsResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: 'C:\\Users\\foo\\my-project\\.yarn\\__virtual__\\@storybook-react-vite-virtual-769c990b9\\0\\cache\\@storybook-react-rust-npm-7.1.0-alpha.38-512b-a23.zip\\node_modules\\storybook-react-rust', + }, + }, + }); + + expect(windowsResult.framework).toEqual({ + name: 'storybook-react-rust', + }); + }); + + test('should sanitize pnp paths for local frameworks', async () => { + // @ts-expect-error the property is read only but we can change it for testing purposes + path.sep = '/'; + cwdSpy = jest.spyOn(process, 'cwd').mockReturnValue('/Users/foo/my-projects'); + + const unixResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: '/Users/foo/my-projects/.storybook/some-local-framework', + }, + }, + }); + + expect(unixResult.framework).toEqual({ + name: '$SNIP/.storybook/some-local-framework', + }); + + // @ts-expect-error the property is read only but we can change it for testing purposes + path.sep = '\\'; + cwdSpy = jest.spyOn(process, 'cwd').mockReturnValue('C:\\Users\\foo\\my-project'); + const windowsResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: 'C:\\Users\\foo\\my-project\\.storybook\\some-local-framework', + }, + }, + }); + + expect(windowsResult.framework).toEqual({ + name: '$SNIP\\.storybook\\some-local-framework', + }); + }); }); - const angularResult = await computeStorybookMetadata({ - packageJson: packageJsonMock, - mainConfig: { - ...mainJsMock, - framework: { - name: '@storybook/angular', - options: { - enableIvy: true, - enableNgcc: true, + test('should return frameworkOptions from mainjs', async () => { + const reactResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: '@storybook/react-vite', + options: { + fastRefresh: false, + }, }, }, - }, - }); + }); - expect(angularResult.framework).toEqual({ - name: '@storybook/angular', - options: { enableIvy: true, enableNgcc: true }, - }); - }); + expect(reactResult.framework).toEqual({ + name: '@storybook/react-vite', + options: { fastRefresh: false }, + }); - test('should separate storybook packages and addons', async () => { - const result = await computeStorybookMetadata({ - packageJson: { - ...packageJsonMock, - devDependencies: { - '@storybook/react': 'x.y.z', - '@storybook/addon-essentials': 'x.x.x', - '@storybook/addon-knobs': 'x.x.y', - 'storybook-addon-deprecated': 'x.x.z', + const angularResult = await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: { + name: '@storybook/angular', + options: { + enableIvy: true, + enableNgcc: true, + }, + }, }, - } as PackageJson, - mainConfig: { - ...mainJsMock, - addons: [ - '@storybook/addon-essentials', - 'storybook-addon-deprecated/register', - '@storybook/addon-knobs/preset', - ], - }, + }); + + expect(angularResult.framework).toEqual({ + name: '@storybook/angular', + options: { enableIvy: true, enableNgcc: true }, + }); }); - expect(result.addons).toMatchInlineSnapshot(` - Object { - "@storybook/addon-essentials": Object { - "options": undefined, - "version": "x.x.x", - }, - "@storybook/addon-knobs": Object { - "options": undefined, - "version": "x.x.x", - }, - "storybook-addon-deprecated": Object { - "options": undefined, - "version": "x.x.x", - }, - } - `); - expect(result.storybookPackages).toMatchInlineSnapshot(` - Object { - "@storybook/react": Object { - "version": "x.x.x", + test('should separate storybook packages and addons', async () => { + const result = await computeStorybookMetadata({ + packageJson: { + ...packageJsonMock, + devDependencies: { + '@storybook/react': 'x.y.z', + '@storybook/addon-essentials': 'x.x.x', + '@storybook/addon-knobs': 'x.x.y', + 'storybook-addon-deprecated': 'x.x.z', + }, + } as PackageJson, + mainConfig: { + ...mainJsMock, + addons: [ + '@storybook/addon-essentials', + 'storybook-addon-deprecated/register', + '@storybook/addon-knobs/preset', + ], }, - } - `); - }); + }); - test('should return user specified features', async () => { - const features = { - storyStoreV7: true, - }; - - const result = await computeStorybookMetadata({ - packageJson: packageJsonMock, - mainConfig: { - ...mainJsMock, - features, - }, + expect(result.addons).toMatchInlineSnapshot(` + Object { + "@storybook/addon-essentials": Object { + "options": undefined, + "version": "x.x.x", + }, + "@storybook/addon-knobs": Object { + "options": undefined, + "version": "x.x.x", + }, + "storybook-addon-deprecated": Object { + "options": undefined, + "version": "x.x.x", + }, + } + `); + expect(result.storybookPackages).toMatchInlineSnapshot(` + Object { + "@storybook/react": Object { + "version": "x.x.x", + }, + } + `); }); - expect(result.features).toEqual(features); - }); + test('should return user specified features', async () => { + const features = { + storyStoreV7: true, + }; - test('should infer builder and renderer from framework package.json', async () => { - expect( - await computeStorybookMetadata({ + const result = await computeStorybookMetadata({ packageJson: packageJsonMock, mainConfig: { ...mainJsMock, - framework: '@storybook/react-vite', + features, }, - }) - ).toMatchObject({ - framework: { name: '@storybook/react-vite' }, - renderer: '@storybook/react', - builder: '@storybook/builder-vite', + }); + + expect(result.features).toEqual(features); }); - }); - test('should return the number of refs', async () => { - const res = await computeStorybookMetadata({ - packageJson: packageJsonMock, - mainConfig: { - ...mainJsMock, - refs: { - a: { title: '', url: '' }, - b: { title: '', url: '' }, - }, - }, + test('should infer builder and renderer from framework package.json', async () => { + expect( + await computeStorybookMetadata({ + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + framework: '@storybook/react-vite', + }, + }) + ).toMatchObject({ + framework: { name: '@storybook/react-vite' }, + renderer: '@storybook/react', + builder: '@storybook/builder-vite', + }); }); - expect(res.refCount).toEqual(2); - }); - test.each(Object.entries(metaFrameworks))( - 'should detect the supported metaframework: %s', - async (metaFramework, name) => { + test('should return the number of refs', async () => { const res = await computeStorybookMetadata({ - packageJson: { - ...packageJsonMock, - dependencies: { - [metaFramework]: 'x.x.x', + packageJson: packageJsonMock, + mainConfig: { + ...mainJsMock, + refs: { + a: { title: '', url: '' }, + b: { title: '', url: '' }, }, - } as PackageJson, - mainConfig: mainJsMock, - }); - expect(res.metaFramework).toEqual({ - name, - packageName: metaFramework, - version: 'x.x.x', + }, }); - } - ); + expect(res.refCount).toEqual(2); + }); + + test.each(Object.entries(metaFrameworks))( + 'should detect the supported metaframework: %s', + async (metaFramework, name) => { + const res = await computeStorybookMetadata({ + packageJson: { + ...packageJsonMock, + dependencies: { + [metaFramework]: 'x.x.x', + }, + } as PackageJson, + mainConfig: mainJsMock, + }); + expect(res.metaFramework).toEqual({ + name, + packageName: metaFramework, + version: 'x.x.x', + }); + } + ); + }); }); From 915c9b12461b817cd6b05246de50066951dfe867 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Sat, 24 Jun 2023 01:03:41 +0200 Subject: [PATCH 71/76] fix parallelism count --- .circleci/config.yml | 50 ++++++++++++------------- scripts/get-template.ts | 83 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 102 insertions(+), 31 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0e0943b630a..596da221fa85 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -269,9 +269,9 @@ jobs: at: . - run: name: Creating Sandboxes - command: yarn task --task sandbox --template $(yarn get-template << pipeline.parameters.workflow >> sandbox) --no-link --start-from=never --junit + command: yarn task --task sandbox --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task sandbox) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> sandbox) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task sandbox) - persist_to_workspace: root: . paths: @@ -294,9 +294,9 @@ jobs: at: . - run: name: Smoke Testing Sandboxes - command: yarn task --task smoke-test --template $(yarn get-template << pipeline.parameters.workflow >> smoke-test) --no-link --start-from=never --junit + command: yarn task --task smoke-test --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task smoke-test) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> smoke-test) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task smoke-test) - store_test_results: path: test-results build-sandboxes: @@ -320,13 +320,13 @@ jobs: background: true - run: name: Building Sandboxes - command: yarn task --task build --template $(yarn get-template << pipeline.parameters.workflow >> build) --no-link --start-from=never --junit + command: yarn task --task build --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build) --no-link --start-from=never --junit - run: name: Verifying Telemetry - command: yarn ts-node ./event-log-checker build $(yarn get-template << pipeline.parameters.workflow >> build) + command: yarn ts-node ./event-log-checker build $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build) working_directory: scripts - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> build) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task build) - store_test_results: path: test-results - persist_to_workspace: @@ -350,9 +350,9 @@ jobs: at: . - run: name: Running Test Runner - command: yarn task --task test-runner --template $(yarn get-template << pipeline.parameters.workflow >> test-runner) --no-link --start-from=never --junit + command: yarn task --task test-runner --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> test-runner) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner) - store_test_results: path: test-results test-runner-dev: @@ -371,9 +371,9 @@ jobs: at: . - run: name: Running Test Runner in Dev mode - command: yarn task --task test-runner-dev --template $(yarn get-template << pipeline.parameters.workflow >> test-runner-dev) --no-link --start-from=never --junit + command: yarn task --task test-runner-dev --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner-dev) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> test-runner-dev) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task test-runner-dev) - store_test_results: path: test-results chromatic-sandboxes: @@ -391,9 +391,9 @@ jobs: at: . - run: name: Running Chromatic - command: yarn task --task chromatic --template $(yarn get-template << pipeline.parameters.workflow >> chromatic) --no-link --start-from=never --junit + command: yarn task --task chromatic --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task chromatic) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> chromatic) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task chromatic) - store_test_results: path: test-results e2e-production: @@ -412,9 +412,9 @@ jobs: at: . - run: name: Running E2E Tests - command: yarn task --task e2e-tests --template $(yarn get-template << pipeline.parameters.workflow >> e2e-tests) --no-link --start-from=never --junit + command: yarn task --task e2e-tests --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task e2e-tests) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> e2e-tests) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task e2e-tests) - store_test_results: path: test-results - store_artifacts: # this is where playwright puts more complex stuff @@ -436,9 +436,9 @@ jobs: at: . - run: name: Running E2E Tests - command: yarn task --task e2e-tests-dev --template $(yarn get-template << pipeline.parameters.workflow >> e2e-tests-dev) --no-link --start-from=never --junit + command: yarn task --task e2e-tests-dev --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task e2e-tests-dev) --no-link --start-from=never --junit - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> e2e-tests-dev) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task e2e-tests-dev) - store_test_results: path: test-results - store_artifacts: # this is where playwright puts more complex stuff @@ -460,12 +460,12 @@ jobs: at: . - run: name: Running Bench - command: yarn task --task bench --template $(yarn get-template << pipeline.parameters.workflow >> bench) --no-link --start-from=never --junit + command: yarn task --task bench --template $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench) --no-link --start-from=never --junit - run: name: Uploading results - command: yarn upload-bench $(yarn get-template << pipeline.parameters.workflow >> bench) + command: yarn upload-bench $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench) - report-workflow-on-failure: - template: $(yarn get-template << pipeline.parameters.workflow >> bench) + template: $(yarn get-template --cadence << pipeline.parameters.workflow >> --task bench) workflows: ci: @@ -601,11 +601,11 @@ workflows: requires: - create-sandboxes - chromatic-sandboxes: - parallelism: 20 + parallelism: 18 requires: - build-sandboxes - e2e-production: - parallelism: 20 + parallelism: 18 requires: - build-sandboxes - e2e-dev: @@ -613,7 +613,7 @@ workflows: requires: - create-sandboxes - test-runner-production: - parallelism: 20 + parallelism: 18 requires: - build-sandboxes - bench: @@ -647,14 +647,14 @@ workflows: requires: - build - create-sandboxes: - parallelism: 32 + parallelism: 34 requires: - build # - smoke-test-sandboxes: # disabled for now # requires: # - create-sandboxes - build-sandboxes: - parallelism: 32 + parallelism: 34 requires: - create-sandboxes - chromatic-sandboxes: diff --git a/scripts/get-template.ts b/scripts/get-template.ts index 57f832fe6eca..53719378f9b1 100644 --- a/scripts/get-template.ts +++ b/scripts/get-template.ts @@ -1,5 +1,7 @@ import { readdir } from 'fs/promises'; import { pathExists } from 'fs-extra'; +import { program } from 'commander'; +import dedent from 'ts-dedent'; import { allTemplates, templatesByCadence, @@ -54,27 +56,86 @@ export async function getTemplate( }); if (potentialTemplateKeys.length !== total) { - throw new Error(`Circle parallelism set incorrectly. + throw new Error(dedent`Circle parallelism set incorrectly. Parallelism is set to ${total}, but there are ${ potentialTemplateKeys.length } templates to run: - ${potentialTemplateKeys.join(', ')} + ${potentialTemplateKeys.map((v) => `- ${v}`).join('\n')} + + ${await getParallelismSummary(cadence)} `); } return potentialTemplateKeys[index]; } -async function run() { - const [, , cadence, scriptName] = process.argv; +const tasks = [ + 'sandbox', + 'build', + 'chromatic', + 'e2e-tests', + 'e2e-tests-dev', + 'test-runner', + // 'test-runner-dev', TODO: bring this back when the task is enabled again + 'bench', +]; + +async function getParallelismSummary(cadence?: Cadence, scriptName?: string) { + let potentialTemplateKeys: TemplateKey[] = []; + const cadences = cadence ? [cadence] : (Object.keys(templatesByCadence) as Cadence[]); + const scripts = scriptName ? [scriptName] : tasks; + const summary = []; + summary.push('These are the values you should have in .circleci/config.yml:'); + cadences.forEach((cad) => { + summary.push(`\n${cad}`); + const cadenceTemplates = Object.entries(allTemplates).filter(([key]) => + templatesByCadence[cad].includes(key as TemplateKey) + ); + potentialTemplateKeys = cadenceTemplates.map(([k]) => k) as TemplateKey[]; + + scripts.forEach((script) => { + const templateKeysPerScript = potentialTemplateKeys.filter((t) => { + const currentTemplate = allTemplates[t] as Template; + return ( + currentTemplate.inDevelopment !== true && + !currentTemplate.skipTasks?.includes(script as SkippableTask) + ); + }); + if (templateKeysPerScript.length > 0) { + summary.push( + `-- ${script} - parallelism: ${templateKeysPerScript.length}${ + templateKeysPerScript.length === 2 ? ' (default)' : '' + }` + ); + } else { + summary.push(`-- ${script} - this script is fully skipped for this cadence.`); + } + }); + }); + + return summary.concat('\n').join('\n'); +} + +type RunOptions = { cadence?: Cadence; task?: string; debug: boolean }; +async function run({ cadence, task, debug }: RunOptions) { + if (debug) { + if (task && !(task in tasks)) { + throw new Error( + dedent`The "${task}" task you provided is not valid. Valid tasks (found in .circleci/config.yml) are: + ${tasks.map((v) => `- ${v}`).join('\n')}` + ); + } + console.log(await getParallelismSummary(cadence as Cadence, task)); + return; + } if (!cadence) throw new Error('Need to supply cadence to get template script'); const { CIRCLE_NODE_INDEX = 0, CIRCLE_NODE_TOTAL = 1 } = process.env; console.log( - await getTemplate(cadence as Cadence, scriptName, { + await getTemplate(cadence as Cadence, task, { index: +CIRCLE_NODE_INDEX, total: +CIRCLE_NODE_TOTAL, }) @@ -82,7 +143,17 @@ async function run() { } if (require.main === module) { - run().catch((err) => { + program + .description('Retrieve the template to run for a given cadence and task') + .option('--cadence ', 'Which cadence you want to run the script for') + .option('--task ', 'Which task you want to run the script for') + .option('--debug', 'Whether to list the parallelism counts for tasks by cadence', false); + + program.parse(process.argv); + + const options = program.opts() as RunOptions; + + run(options).catch((err) => { console.error(err); process.exit(1); }); From 7befc4c61e3808ab397bb2b8de5a10408f1634e4 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Sat, 24 Jun 2023 12:13:46 +0200 Subject: [PATCH 72/76] temporarily skip a test on windows --- .../builder-vite/src/utils/process-preview-annotation.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/builders/builder-vite/src/utils/process-preview-annotation.test.ts b/code/builders/builder-vite/src/utils/process-preview-annotation.test.ts index 586a9ecad34b..085c8547d0a9 100644 --- a/code/builders/builder-vite/src/utils/process-preview-annotation.test.ts +++ b/code/builders/builder-vite/src/utils/process-preview-annotation.test.ts @@ -35,7 +35,8 @@ describe('processPreviewAnnotation()', () => { expect(url).toBe('/src/stories/components'); }); - it('should convert node_modules into bare paths', () => { + // TODO: figure out why this fails on windows. Could be related to storybook-metadata.test file altering path.sep + it.skipWindows('should convert node_modules into bare paths', () => { const annotation = '/Users/foo/storybook/node_modules/storybook-addon/preview'; const url = processPreviewAnnotation(annotation, '/Users/foo/storybook/'); expect(url).toBe('storybook-addon/preview'); From 09db7fe9704943f8510a702e810b7cbcecd18e63 Mon Sep 17 00:00:00 2001 From: noviceGuru Date: Sat, 24 Jun 2023 19:24:06 +0200 Subject: [PATCH 73/76] typo corrected: extra stars in webpack.md deleted --- docs/builders/webpack.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/builders/webpack.md b/docs/builders/webpack.md index b5d3748b2a58..130ac9bd56e1 100644 --- a/docs/builders/webpack.md +++ b/docs/builders/webpack.md @@ -136,7 +136,7 @@ However, if you're working with a framework that provides a default aliasing con paths={[ 'common/storybook-main-ts-module-resolution-atsign-import.js.mdx', 'common/storybook-main-ts-module-resolution-atsign-import.ts.mdx', - ]}**** + ]} /> From d0293bb1588731ff89eece902ba8be73be611214 Mon Sep 17 00:00:00 2001 From: Pascal Date: Mon, 26 Jun 2023 09:19:26 +0200 Subject: [PATCH 74/76] applied suggested changes --- docs/essentials/interactions.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/essentials/interactions.md b/docs/essentials/interactions.md index 245c02cb3384..6baff2197774 100644 --- a/docs/essentials/interactions.md +++ b/docs/essentials/interactions.md @@ -83,4 +83,8 @@ While you can refer to the [Testing Library documentation](https://testing-libra Any `args` that have been marked as an Action, either using the [argTypes annotation](./actions.md#action-argtype-annotation) or the [argTypesRegex](./actions.md#automatically-matching-args), will be automatically converted to a [Jest mock function](https://jestjs.io/docs/mock-function-api) (spy). This allows you to make assertions about calls to these functions. -> Note: If you need to use jest native spys like `jest.fn()` the import of jest over `import {jest} from "@storybook/jest"` is needed, as jest is not available globally. +
+ +ℹ️ To mock functions in your Storybook stories for reliable and isolated component testing, use the `jest` import from `@storybook/jest`. This allows you to avoid configuring Jest globally in your project. + +
From 0f27f9bc550a4318a84e725ec9fcd46cfc74e3fa Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Tue, 27 Jun 2023 02:13:41 +0200 Subject: [PATCH 75/76] pin file-system-cache to 2.3.0 --- code/lib/core-common/package.json | 2 +- code/lib/types/package.json | 2 +- code/yarn.lock | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index ae8b8a42335d..3d0621616f7a 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -52,7 +52,7 @@ "chalk": "^4.1.0", "esbuild": "^0.18.0", "esbuild-register": "^3.4.0", - "file-system-cache": "^2.0.0", + "file-system-cache": "2.3.0", "find-cache-dir": "^3.0.0", "find-up": "^5.0.0", "fs-extra": "^11.1.0", diff --git a/code/lib/types/package.json b/code/lib/types/package.json index 6682c4031e51..10f4a15dcd17 100644 --- a/code/lib/types/package.json +++ b/code/lib/types/package.json @@ -46,7 +46,7 @@ "@storybook/channels": "7.1.0-alpha.39", "@types/babel__core": "^7.0.0", "@types/express": "^4.7.0", - "file-system-cache": "^2.0.0" + "file-system-cache": "2.3.0" }, "devDependencies": { "@storybook/csf": "^0.1.0", diff --git a/code/yarn.lock b/code/yarn.lock index db2f297265d8..25b652901059 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6146,7 +6146,7 @@ __metadata: chalk: ^4.1.0 esbuild: ^0.18.0 esbuild-register: ^3.4.0 - file-system-cache: ^2.0.0 + file-system-cache: 2.3.0 find-cache-dir: ^3.0.0 find-up: ^5.0.0 fs-extra: ^11.1.0 @@ -7455,7 +7455,7 @@ __metadata: "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 "@types/node": ^16.0.0 - file-system-cache: ^2.0.0 + file-system-cache: 2.3.0 typescript: ~4.9.3 languageName: unknown linkType: soft @@ -16002,7 +16002,7 @@ __metadata: languageName: node linkType: hard -"file-system-cache@npm:^2.0.0": +"file-system-cache@npm:2.3.0": version: 2.3.0 resolution: "file-system-cache@npm:2.3.0" dependencies: From 7907a8c02b0b2aacb51ebf1b47f299daf6bbcb31 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 27 Jun 2023 02:49:34 +0000 Subject: [PATCH 76/76] Bump version from 7.1.0-alpha.39 to 7.1.0-alpha.40 --- CHANGELOG.prerelease.md | 7 + code/addons/a11y/package.json | 20 +- code/addons/actions/package.json | 16 +- code/addons/backgrounds/package.json | 16 +- code/addons/controls/package.json | 20 +- code/addons/docs/package.json | 24 +- code/addons/essentials/package.json | 30 +- code/addons/gfm/package.json | 4 +- code/addons/highlight/package.json | 6 +- code/addons/interactions/package.json | 20 +- code/addons/jest/package.json | 14 +- code/addons/links/package.json | 14 +- code/addons/measure/package.json | 14 +- code/addons/outline/package.json | 14 +- code/addons/storyshots-core/package.json | 22 +- code/addons/storyshots-puppeteer/package.json | 8 +- code/addons/storysource/package.json | 16 +- code/addons/toolbars/package.json | 12 +- code/addons/viewport/package.json | 14 +- code/builders/builder-manager/package.json | 8 +- code/builders/builder-vite/package.json | 18 +- code/builders/builder-webpack5/package.json | 36 +- code/deprecated/addons/package.json | 8 +- .../channel-postmessage/package.json | 6 +- .../deprecated/channel-websocket/package.json | 6 +- code/deprecated/client-api/package.json | 6 +- code/deprecated/core-client/package.json | 6 +- code/deprecated/manager-api-shim/package.json | 6 +- code/deprecated/preview-web/package.json | 6 +- code/deprecated/store/package.json | 6 +- code/frameworks/angular/package.json | 28 +- code/frameworks/ember/package.json | 12 +- code/frameworks/html-vite/package.json | 18 +- code/frameworks/html-webpack5/package.json | 10 +- code/frameworks/nextjs/package.json | 16 +- code/frameworks/preact-vite/package.json | 6 +- code/frameworks/preact-webpack5/package.json | 10 +- code/frameworks/react-vite/package.json | 6 +- code/frameworks/react-webpack5/package.json | 8 +- code/frameworks/server-webpack5/package.json | 10 +- code/frameworks/svelte-vite/package.json | 8 +- code/frameworks/svelte-webpack5/package.json | 10 +- code/frameworks/sveltekit/package.json | 8 +- code/frameworks/vue-vite/package.json | 10 +- code/frameworks/vue-webpack5/package.json | 10 +- code/frameworks/vue3-vite/package.json | 8 +- code/frameworks/vue3-webpack5/package.json | 10 +- .../web-components-vite/package.json | 10 +- .../web-components-webpack5/package.json | 10 +- code/lib/channels/package.json | 8 +- code/lib/cli-sb/package.json | 4 +- code/lib/cli-storybook/package.json | 4 +- code/lib/cli/package.json | 18 +- code/lib/cli/src/versions.ts | 186 ++-- code/lib/client-logger/package.json | 2 +- code/lib/codemod/package.json | 8 +- code/lib/core-common/package.json | 6 +- code/lib/core-events/package.json | 2 +- code/lib/core-server/package.json | 22 +- code/lib/core-webpack/package.json | 8 +- code/lib/csf-plugin/package.json | 4 +- code/lib/csf-tools/package.json | 4 +- code/lib/docs-tools/package.json | 8 +- code/lib/instrumenter/package.json | 10 +- code/lib/manager-api/package.json | 14 +- code/lib/manager-api/src/version.ts | 2 +- code/lib/node-logger/package.json | 2 +- code/lib/postinstall/package.json | 2 +- code/lib/preview-api/package.json | 14 +- code/lib/preview/package.json | 10 +- code/lib/react-dom-shim/package.json | 4 +- code/lib/router/package.json | 4 +- code/lib/source-loader/package.json | 4 +- code/lib/telemetry/package.json | 6 +- code/lib/theming/package.json | 4 +- code/lib/types/package.json | 4 +- code/package.json | 2 +- code/presets/create-react-app/package.json | 6 +- code/presets/html-webpack/package.json | 4 +- code/presets/preact-webpack/package.json | 4 +- code/presets/react-webpack/package.json | 10 +- code/presets/server-webpack/package.json | 8 +- code/presets/svelte-webpack/package.json | 6 +- code/presets/vue-webpack/package.json | 6 +- code/presets/vue3-webpack/package.json | 6 +- .../web-components-webpack/package.json | 4 +- code/renderers/html/package.json | 10 +- code/renderers/preact/package.json | 8 +- code/renderers/react/package.json | 14 +- code/renderers/server/package.json | 10 +- code/renderers/svelte/package.json | 14 +- code/renderers/vue/package.json | 12 +- code/renderers/vue3/package.json | 10 +- code/renderers/web-components/package.json | 14 +- code/ui/blocks/package.json | 22 +- code/ui/components/package.json | 8 +- code/ui/manager/package.json | 24 +- code/yarn.lock | 920 +++++++++--------- 98 files changed, 1052 insertions(+), 1045 deletions(-) diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md index 2680bc695ac6..aa2d13566418 100644 --- a/CHANGELOG.prerelease.md +++ b/CHANGELOG.prerelease.md @@ -1,3 +1,10 @@ +## 7.1.0-alpha.40 + +- CLI: Parse pnp paths in storybook metadata - [#23199](https://github.com/storybookjs/storybook/pull/23199), thanks [@yannbf](https://github.com/yannbf)! +- Dependencies: Pin `file-system-cache` to 2.3.0 - [#23221](https://github.com/storybookjs/storybook/pull/23221), thanks [@JReinhold](https://github.com/JReinhold)! +- PNPM: Hide ModuleNotFound error in pnpm pnp mode - [#23195](https://github.com/storybookjs/storybook/pull/23195), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)! +- Svelte: Support v4 - [#22905](https://github.com/storybookjs/storybook/pull/22905), thanks [@JReinhold](https://github.com/JReinhold)! + ## 7.1.0-alpha.39 - CLI: Add new Configure page to templates - [#23171](https://github.com/storybookjs/storybook/pull/23171), thanks [@yannbf](https://github.com/yannbf)! diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index 85197593fd28..5abcd1117084 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Test component compliance with web accessibility standards", "keywords": [ "a11y", @@ -63,16 +63,16 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-highlight": "7.1.0-alpha.39", - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/addon-highlight": "7.1.0-alpha.40", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "axe-core": "^4.2.0", "lodash": "^4.17.21", "react-resize-detector": "^7.1.2" diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index a7d64bdcafea..8443a101f70e 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Get UI feedback when an action is performed on an interactive element", "keywords": [ "storybook", @@ -80,14 +80,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "dequal": "^2.0.2", "lodash": "^4.17.21", "polished": "^4.2.2", diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 2617f57e49f4..6574671bddf0 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Switch backgrounds to view components in different settings", "keywords": [ "addon", @@ -76,14 +76,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "memoizerific": "^1.11.3", "ts-dedent": "^2.0.0" }, diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 08ff666eac8f..16b2dcc77987 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Interact with component inputs dynamically in the Storybook UI", "keywords": [ "addon", @@ -68,15 +68,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/blocks": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/blocks": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "lodash": "^4.17.21", "ts-dedent": "^2.0.0" }, diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 814861869651..7da6fee06ceb 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Document component usage and properties in Markdown", "keywords": [ "addon", @@ -99,19 +99,19 @@ "dependencies": { "@jest/transform": "^29.3.1", "@mdx-js/react": "^2.1.5", - "@storybook/blocks": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/csf-plugin": "7.1.0-alpha.39", - "@storybook/csf-tools": "7.1.0-alpha.39", + "@storybook/blocks": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/csf-plugin": "7.1.0-alpha.40", + "@storybook/csf-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", "@storybook/mdx2-csf": "^1.0.0", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/postinstall": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/react-dom-shim": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/postinstall": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/react-dom-shim": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "fs-extra": "^11.1.0", "remark-external-links": "^8.0.0", "remark-slug": "^6.0.0", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index 07d9b60cc040..1a1353f6266e 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", @@ -119,23 +119,23 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addon-actions": "7.1.0-alpha.39", - "@storybook/addon-backgrounds": "7.1.0-alpha.39", - "@storybook/addon-controls": "7.1.0-alpha.39", - "@storybook/addon-docs": "7.1.0-alpha.39", - "@storybook/addon-highlight": "7.1.0-alpha.39", - "@storybook/addon-measure": "7.1.0-alpha.39", - "@storybook/addon-outline": "7.1.0-alpha.39", - "@storybook/addon-toolbars": "7.1.0-alpha.39", - "@storybook/addon-viewport": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", + "@storybook/addon-actions": "7.1.0-alpha.40", + "@storybook/addon-backgrounds": "7.1.0-alpha.40", + "@storybook/addon-controls": "7.1.0-alpha.40", + "@storybook/addon-docs": "7.1.0-alpha.40", + "@storybook/addon-highlight": "7.1.0-alpha.40", + "@storybook/addon-measure": "7.1.0-alpha.40", + "@storybook/addon-outline": "7.1.0-alpha.40", + "@storybook/addon-toolbars": "7.1.0-alpha.40", + "@storybook/addon-viewport": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", "ts-dedent": "^2.0.0" }, "devDependencies": { - "@storybook/vue": "7.1.0-alpha.39", + "@storybook/vue": "7.1.0-alpha.40", "typescript": "^4.9.3" }, "peerDependencies": { diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json index 30bea5ec4e1f..ebecdb276e98 100644 --- a/code/addons/gfm/package.json +++ b/code/addons/gfm/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-mdx-gfm", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "GitHub Flavored Markdown in Storybook", "keywords": [ "addon", @@ -51,7 +51,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/node-logger": "7.1.0-alpha.39", + "@storybook/node-logger": "7.1.0-alpha.40", "remark-gfm": "^3.0.1", "ts-dedent": "^2.0.0" }, diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 7c489552b4ec..c7a0521d02e2 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-highlight", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Highlight DOM nodes within your stories", "keywords": [ "storybook-addons", @@ -61,9 +61,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39" + "@storybook/preview-api": "7.1.0-alpha.40" }, "devDependencies": { "@types/webpack-env": "^1.16.0", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 8f6fc232abbd..f637e3f0b0ff 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-interactions", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Automate, test and debug user interactions", "keywords": [ "storybook-addons", @@ -72,16 +72,16 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/instrumenter": "7.1.0-alpha.39", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/instrumenter": "7.1.0-alpha.40", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "jest-mock": "^29.5.0", "polished": "^4.2.2", "ts-dedent": "^2.2.0" diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index 709fa9ec4561..fb699c1c4cac 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "React storybook addon that show component jest report", "keywords": [ "addon", @@ -70,13 +70,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", "react-resize-detector": "^7.1.2", "tiny-invariant": "^1.3.1", "upath": "^2.0.1" diff --git a/code/addons/links/package.json b/code/addons/links/package.json index a564f8c8711a..36cc5de26a64 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Link stories together to build demos and prototypes with your UI components", "keywords": [ "addon", @@ -80,14 +80,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/router": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/router": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "prop-types": "^15.7.2", "ts-dedent": "^2.0.0" }, diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index c6a2350666aa..5349ce455e54 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-measure", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Inspect layouts by visualizing the box model", "keywords": [ "storybook-addons", @@ -75,13 +75,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "tiny-invariant": "^1.3.1" }, "devDependencies": { diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index 71d34c49db00..bf29b19a3271 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-outline", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Outline all elements with CSS to help with layout placement and alignment", "keywords": [ "storybook-addons", @@ -78,13 +78,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/addons/storyshots-core/package.json b/code/addons/storyshots-core/package.json index 8b6fdf1e59b9..6a26c8a76ef9 100644 --- a/code/addons/storyshots-core/package.json +++ b/code/addons/storyshots-core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Take a code snapshot of every story automatically with Jest", "keywords": [ "addon", @@ -38,12 +38,12 @@ "dependencies": { "@jest/transform": "^29.3.1", "@storybook/babel-plugin-require-context-hook": "1.0.1", - "@storybook/client-api": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-webpack": "7.1.0-alpha.39", + "@storybook/client-api": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-webpack": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/jest-specific-snapshot": "^0.5.6", "glob": "^10.0.0", "jest-specific-snapshot": "^8.0.0", @@ -57,11 +57,11 @@ "@angular/core": "^16.0.0-rc.4", "@angular/platform-browser-dynamic": "^16.0.0-rc.4", "@emotion/jest": "^11.8.0", - "@storybook/addon-docs": "7.1.0-alpha.39", - "@storybook/angular": "7.1.0-alpha.39", - "@storybook/react": "7.1.0-alpha.39", - "@storybook/vue": "7.1.0-alpha.39", - "@storybook/vue3": "7.1.0-alpha.39", + "@storybook/addon-docs": "7.1.0-alpha.40", + "@storybook/angular": "7.1.0-alpha.40", + "@storybook/react": "7.1.0-alpha.40", + "@storybook/vue": "7.1.0-alpha.40", + "@storybook/vue3": "7.1.0-alpha.40", "babel-loader": "^9.1.2", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", diff --git a/code/addons/storyshots-puppeteer/package.json b/code/addons/storyshots-puppeteer/package.json index 5cc4651f2c81..919e8ccc9640 100644 --- a/code/addons/storyshots-puppeteer/package.json +++ b/code/addons/storyshots-puppeteer/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storyshots-puppeteer", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Image snapshots addition to StoryShots based on puppeteer", "keywords": [ "addon", @@ -37,8 +37,8 @@ "dependencies": { "@axe-core/puppeteer": "^4.2.0", "@storybook/csf": "^0.1.0", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/jest-image-snapshot": "^6.0.0", "jest-image-snapshot": "^6.0.0" }, @@ -49,7 +49,7 @@ "puppeteer": "^2.0.0 || ^3.0.0" }, "peerDependencies": { - "@storybook/addon-storyshots": "7.1.0-alpha.39", + "@storybook/addon-storyshots": "7.1.0-alpha.40", "puppeteer": ">=2.0.0" }, "peerDependenciesMeta": { diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index 0c3e2935bf3b..9829b260044f 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "View a story’s source code to see how it works and paste into your app", "keywords": [ "addon", @@ -53,13 +53,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/router": "7.1.0-alpha.39", - "@storybook/source-loader": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/router": "7.1.0-alpha.40", + "@storybook/source-loader": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", "estraverse": "^5.2.0", "prop-types": "^15.7.2", "react-syntax-highlighter": "^15.5.0", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index 1695def31fde..e3d9d2698820 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Create your own toolbar items that control story rendering", "keywords": [ "addon", @@ -68,11 +68,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39" + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40" }, "devDependencies": { "typescript": "~4.9.3" diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index 9c743770c8e2..155f3d58a612 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Build responsive components by adjusting Storybook’s viewport size and orientation", "keywords": [ "addon", @@ -73,13 +73,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", "memoizerific": "^1.11.3", "prop-types": "^15.7.2" }, diff --git a/code/builders/builder-manager/package.json b/code/builders/builder-manager/package.json index 3e3e41ebcc3a..495439518ed2 100644 --- a/code/builders/builder-manager/package.json +++ b/code/builders/builder-manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-manager", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook manager builder", "keywords": [ "storybook" @@ -44,9 +44,9 @@ }, "dependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/manager": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/manager": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", "@types/ejs": "^3.1.1", "@types/find-cache-dir": "^3.2.1", "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10", diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json index 22268f478890..013eadef162d 100644 --- a/code/builders/builder-vite/package.json +++ b/code/builders/builder-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "A plugin to run and build Storybooks with Vite", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme", "bugs": { @@ -42,15 +42,15 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/csf-plugin": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/csf-plugin": "7.1.0-alpha.40", "@storybook/mdx2-csf": "^1.0.0", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/find-cache-dir": "^3.2.1", "browser-assert": "^1.2.1", "es-module-lexer": "^0.9.3", diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json index b3a6e1a3337c..797ff5151cf1 100644 --- a/code/builders/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -56,24 +56,24 @@ }, "dependencies": { "@babel/core": "^7.22.0", - "@storybook/addons": "7.1.0-alpha.39", - "@storybook/api": "7.1.0-alpha.39", - "@storybook/channel-postmessage": "7.1.0-alpha.39", - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-api": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", - "@storybook/core-webpack": "7.1.0-alpha.39", + "@storybook/addons": "7.1.0-alpha.40", + "@storybook/api": "7.1.0-alpha.40", + "@storybook/channel-postmessage": "7.1.0-alpha.40", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-api": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", + "@storybook/core-webpack": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/router": "7.1.0-alpha.39", - "@storybook/store": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/router": "7.1.0-alpha.40", + "@storybook/store": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", "@swc/core": "^1.3.49", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", diff --git a/code/deprecated/addons/package.json b/code/deprecated/addons/package.json index 1362bcbd4968..00c4ae9eb6d2 100644 --- a/code/deprecated/addons/package.json +++ b/code/deprecated/addons/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addons", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook addons store", "keywords": [ "storybook" @@ -44,9 +44,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39" + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/code/deprecated/channel-postmessage/package.json b/code/deprecated/channel-postmessage/package.json index aff68209bfe7..727be6a7bc9f 100644 --- a/code/deprecated/channel-postmessage/package.json +++ b/code/deprecated/channel-postmessage/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-postmessage", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39" + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40" }, "devDependencies": { "typescript": "~4.9.3" diff --git a/code/deprecated/channel-websocket/package.json b/code/deprecated/channel-websocket/package.json index 8e15fc8c616e..975a6e7bed18 100644 --- a/code/deprecated/channel-websocket/package.json +++ b/code/deprecated/channel-websocket/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channel-websocket", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39" + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40" }, "devDependencies": { "typescript": "~4.9.3" diff --git a/code/deprecated/client-api/package.json b/code/deprecated/client-api/package.json index 82ee658611f7..15bac57f0988 100644 --- a/code/deprecated/client-api/package.json +++ b/code/deprecated/client-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-api", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Client API", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39" + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40" }, "publishConfig": { "access": "public" diff --git a/code/deprecated/core-client/package.json b/code/deprecated/core-client/package.json index f79e56602f56..4c94448b6af1 100644 --- a/code/deprecated/core-client/package.json +++ b/code/deprecated/core-client/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-client", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -35,8 +35,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39" + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40" }, "publishConfig": { "access": "public" diff --git a/code/deprecated/manager-api-shim/package.json b/code/deprecated/manager-api-shim/package.json index 05a83a6e899a..8a421a561727 100644 --- a/code/deprecated/manager-api-shim/package.json +++ b/code/deprecated/manager-api-shim/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/api", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Manager API (facade)", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/manager-api": "7.1.0-alpha.39" + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/manager-api": "7.1.0-alpha.40" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/code/deprecated/preview-web/package.json b/code/deprecated/preview-web/package.json index 1fc0e392fd1c..569abcb3e9a6 100644 --- a/code/deprecated/preview-web/package.json +++ b/code/deprecated/preview-web/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-web", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39" + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40" }, "publishConfig": { "access": "public" diff --git a/code/deprecated/store/package.json b/code/deprecated/store/package.json index 32dc47778d9f..f2ea6daaf58b 100644 --- a/code/deprecated/store/package.json +++ b/code/deprecated/store/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/store", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -42,8 +42,8 @@ "prep": "../../../scripts/prepare/facade.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39" + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40" }, "publishConfig": { "access": "public" diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index da795f758fa1..5fd3e2395b59 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.", "keywords": [ "storybook", @@ -36,20 +36,20 @@ "prep": "../../../scripts/prepare/tsc.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/cli": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/core-webpack": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/cli": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/core-webpack": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/telemetry": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/telemetry": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/node": "^16.0.0", "@types/react": "^16.14.34", "@types/react-dom": "^16.9.14", diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index e38f02c95d09..e5b8642bc612 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember", "bugs": { @@ -31,12 +31,12 @@ "prep": "../../../scripts/prepare/tsc.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index a9b0b069d6c4..1471bde85a34 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,14 +47,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/addons": "7.1.0-alpha.39", - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/channel-postmessage": "7.1.0-alpha.39", - "@storybook/client-api": "7.1.0-alpha.39", - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/html": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview-web": "7.1.0-alpha.39", + "@storybook/addons": "7.1.0-alpha.40", + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/channel-postmessage": "7.1.0-alpha.40", + "@storybook/client-api": "7.1.0-alpha.40", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/html": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview-web": "7.1.0-alpha.40", "magic-string": "^0.30.0" }, "devDependencies": { diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index fa90bdf1d4d1..46d59af8b884 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,11 +47,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/html": "7.1.0-alpha.39", - "@storybook/preset-html-webpack": "7.1.0-alpha.39", + "@storybook/html": "7.1.0-alpha.40", + "@storybook/preset-html-webpack": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index 622e7215be51..b542eadccf05 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/nextjs", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Next.js", "keywords": [ "storybook", @@ -70,13 +70,13 @@ "@babel/preset-react": "^7.22.0", "@babel/preset-typescript": "^7.21.0", "@babel/runtime": "^7.22.0", - "@storybook/addon-actions": "7.1.0-alpha.39", - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preset-react-webpack": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/react": "7.1.0-alpha.39", + "@storybook/addon-actions": "7.1.0-alpha.40", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preset-react-webpack": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/react": "7.1.0-alpha.40", "@types/node": "^16.0.0", "css-loader": "^6.7.3", "find-up": "^5.0.0", diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json index 7af61293d34c..a5b50addc41a 100644 --- a/code/frameworks/preact-vite/package.json +++ b/code/frameworks/preact-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Preact and Vite: Develop Preact components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,8 +47,8 @@ }, "dependencies": { "@preact/preset-vite": "^2.0.0", - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/preact": "7.1.0-alpha.39" + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/preact": "7.1.0-alpha.40" }, "devDependencies": { "@types/node": "^16.0.0", diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 467e85f91ea9..021a35c3d1f1 100644 --- a/code/frameworks/preact-webpack5/package.json +++ b/code/frameworks/preact-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preact": "7.1.0-alpha.39", - "@storybook/preset-preact-webpack": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preact": "7.1.0-alpha.40", + "@storybook/preset-preact-webpack": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index 413e22de311d..550135d8c1e8 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -49,8 +49,8 @@ "dependencies": { "@joshwooding/vite-plugin-react-docgen-typescript": "0.2.1", "@rollup/pluginutils": "^5.0.2", - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/react": "7.1.0-alpha.39", + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/react": "7.1.0-alpha.40", "@vitejs/plugin-react": "^3.0.1", "ast-types": "^0.14.2", "magic-string": "^0.30.0", diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index b0ac50091fe5..08bff6ba0919 100644 --- a/code/frameworks/react-webpack5/package.json +++ b/code/frameworks/react-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,9 +47,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/preset-react-webpack": "7.1.0-alpha.39", - "@storybook/react": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/preset-react-webpack": "7.1.0-alpha.40", + "@storybook/react": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index 69747ebcffd6..5473585c9340 100644 --- a/code/frameworks/server-webpack5/package.json +++ b/code/frameworks/server-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preset-server-webpack": "7.1.0-alpha.39", - "@storybook/server": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preset-server-webpack": "7.1.0-alpha.40", + "@storybook/server": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 0464d95e7da7..ba48aa2d4a29 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,9 +47,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/svelte": "7.1.0-alpha.39", + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/svelte": "7.1.0-alpha.40", "@sveltejs/vite-plugin-svelte": "^2.4.1", "magic-string": "^0.30.0", "sveltedoc-parser": "^4.2.1", diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index 3cdbd7ea04bc..73b05acdb028 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preset-svelte-webpack": "7.1.0-alpha.39", - "@storybook/svelte": "7.1.0-alpha.39" + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preset-svelte-webpack": "7.1.0-alpha.40", + "@storybook/svelte": "7.1.0-alpha.40" }, "devDependencies": { "svelte": "^3.48.0", diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index 2a6cf86394ee..ed20b5c4aba3 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/sveltekit", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for SvelteKit", "keywords": [ "storybook", @@ -50,9 +50,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/svelte": "7.1.0-alpha.39", - "@storybook/svelte-vite": "7.1.0-alpha.39" + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/svelte": "7.1.0-alpha.40", + "@storybook/svelte-vite": "7.1.0-alpha.40" }, "devDependencies": { "@types/node": "^16.0.0", diff --git a/code/frameworks/vue-vite/package.json b/code/frameworks/vue-vite/package.json index 191b595c9a3e..ada3cc98cc96 100644 --- a/code/frameworks/vue-vite/package.json +++ b/code/frameworks/vue-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Vue2 and Vite: Develop Vue2 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/vue": "7.1.0-alpha.39", + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/vue": "7.1.0-alpha.40", "magic-string": "^0.30.0", "vue-docgen-api": "^4.40.0" }, diff --git a/code/frameworks/vue-webpack5/package.json b/code/frameworks/vue-webpack5/package.json index 9db4a3f7e148..889435f3e45c 100644 --- a/code/frameworks/vue-webpack5/package.json +++ b/code/frameworks/vue-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preset-vue-webpack": "7.1.0-alpha.39", - "@storybook/vue": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preset-vue-webpack": "7.1.0-alpha.40", + "@storybook/vue": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index 4044db1719f6..3ee9c993ae20 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,9 +47,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/vue3": "7.1.0-alpha.39", + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/vue3": "7.1.0-alpha.40", "@vitejs/plugin-vue": "^4.0.0", "magic-string": "^0.30.0", "vue-docgen-api": "^4.40.0" diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 45b774460346..04708f038da5 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preset-vue3-webpack": "7.1.0-alpha.39", - "@storybook/vue3": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preset-vue3-webpack": "7.1.0-alpha.40", + "@storybook/vue3": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json index a127278d227d..141dec7d7608 100644 --- a/code/frameworks/web-components-vite/package.json +++ b/code/frameworks/web-components-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-vite", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -47,10 +47,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/builder-vite": "7.1.0-alpha.39", - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/web-components": "7.1.0-alpha.39", + "@storybook/builder-vite": "7.1.0-alpha.40", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/web-components": "7.1.0-alpha.40", "magic-string": "^0.30.0" }, "devDependencies": { diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index ff092ff7f212..2605410427f2 100644 --- a/code/frameworks/web-components-webpack5/package.json +++ b/code/frameworks/web-components-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-webpack5", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit", @@ -51,10 +51,10 @@ }, "dependencies": { "@babel/preset-env": "^7.22.0", - "@storybook/builder-webpack5": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preset-web-components-webpack": "7.1.0-alpha.39", - "@storybook/web-components": "7.1.0-alpha.39", + "@storybook/builder-webpack5": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preset-web-components-webpack": "7.1.0-alpha.40", + "@storybook/web-components": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json index 06aa7b19aae4..60119ddbc8eb 100644 --- a/code/lib/channels/package.json +++ b/code/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -68,9 +68,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", "qs": "^6.10.0", "telejson": "^7.0.3", diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index ec9a563fe371..08f6ea2216fc 100644 --- a/code/lib/cli-sb/package.json +++ b/code/lib/cli-sb/package.json @@ -1,6 +1,6 @@ { "name": "sb", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook CLI", "keywords": [ "storybook" @@ -21,7 +21,7 @@ "license": "MIT", "bin": "./index.js", "dependencies": { - "@storybook/cli": "7.1.0-alpha.39" + "@storybook/cli": "7.1.0-alpha.40" }, "publishConfig": { "access": "public" diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 4f4542d30074..17d2d510420c 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook CLI", "keywords": [ "storybook" @@ -24,7 +24,7 @@ "storybook": "./index.js" }, "dependencies": { - "@storybook/cli": "7.1.0-alpha.39" + "@storybook/cli": "7.1.0-alpha.40" }, "publishConfig": { "access": "public" diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 24b5a36d26d2..42b32d63b277 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook's CLI - easiest method of adding storybook to your projects", "keywords": [ "cli", @@ -57,13 +57,13 @@ "@babel/core": "^7.22.0", "@babel/preset-env": "^7.22.0", "@ndelangen/get-tarball": "^3.0.7", - "@storybook/codemod": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/csf-tools": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/telemetry": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/codemod": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/csf-tools": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/telemetry": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/semver": "^7.3.4", "@yarnpkg/fslib": "^2.10.3", "@yarnpkg/libzip": "^2.3.0", @@ -95,7 +95,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/client-api": "7.1.0-alpha.39", + "@storybook/client-api": "7.1.0-alpha.40", "@types/cross-spawn": "^6.0.2", "@types/prompts": "^2.0.9", "@types/puppeteer-core": "^2.1.0", diff --git a/code/lib/cli/src/versions.ts b/code/lib/cli/src/versions.ts index f6f98a8a335f..c28ce322d516 100644 --- a/code/lib/cli/src/versions.ts +++ b/code/lib/cli/src/versions.ts @@ -1,96 +1,96 @@ // auto generated file, do not edit export default { - '@storybook/addon-a11y': '7.1.0-alpha.39', - '@storybook/addon-actions': '7.1.0-alpha.39', - '@storybook/addon-backgrounds': '7.1.0-alpha.39', - '@storybook/addon-controls': '7.1.0-alpha.39', - '@storybook/addon-docs': '7.1.0-alpha.39', - '@storybook/addon-essentials': '7.1.0-alpha.39', - '@storybook/addon-highlight': '7.1.0-alpha.39', - '@storybook/addon-interactions': '7.1.0-alpha.39', - '@storybook/addon-jest': '7.1.0-alpha.39', - '@storybook/addon-links': '7.1.0-alpha.39', - '@storybook/addon-mdx-gfm': '7.1.0-alpha.39', - '@storybook/addon-measure': '7.1.0-alpha.39', - '@storybook/addon-outline': '7.1.0-alpha.39', - '@storybook/addon-storyshots': '7.1.0-alpha.39', - '@storybook/addon-storyshots-puppeteer': '7.1.0-alpha.39', - '@storybook/addon-storysource': '7.1.0-alpha.39', - '@storybook/addon-toolbars': '7.1.0-alpha.39', - '@storybook/addon-viewport': '7.1.0-alpha.39', - '@storybook/addons': '7.1.0-alpha.39', - '@storybook/angular': '7.1.0-alpha.39', - '@storybook/api': '7.1.0-alpha.39', - '@storybook/blocks': '7.1.0-alpha.39', - '@storybook/builder-manager': '7.1.0-alpha.39', - '@storybook/builder-vite': '7.1.0-alpha.39', - '@storybook/builder-webpack5': '7.1.0-alpha.39', - '@storybook/channel-postmessage': '7.1.0-alpha.39', - '@storybook/channel-websocket': '7.1.0-alpha.39', - '@storybook/channels': '7.1.0-alpha.39', - '@storybook/cli': '7.1.0-alpha.39', - '@storybook/client-api': '7.1.0-alpha.39', - '@storybook/client-logger': '7.1.0-alpha.39', - '@storybook/codemod': '7.1.0-alpha.39', - '@storybook/components': '7.1.0-alpha.39', - '@storybook/core-client': '7.1.0-alpha.39', - '@storybook/core-common': '7.1.0-alpha.39', - '@storybook/core-events': '7.1.0-alpha.39', - '@storybook/core-server': '7.1.0-alpha.39', - '@storybook/core-webpack': '7.1.0-alpha.39', - '@storybook/csf-plugin': '7.1.0-alpha.39', - '@storybook/csf-tools': '7.1.0-alpha.39', - '@storybook/docs-tools': '7.1.0-alpha.39', - '@storybook/ember': '7.1.0-alpha.39', - '@storybook/html': '7.1.0-alpha.39', - '@storybook/html-vite': '7.1.0-alpha.39', - '@storybook/html-webpack5': '7.1.0-alpha.39', - '@storybook/instrumenter': '7.1.0-alpha.39', - '@storybook/manager': '7.1.0-alpha.39', - '@storybook/manager-api': '7.1.0-alpha.39', - '@storybook/nextjs': '7.1.0-alpha.39', - '@storybook/node-logger': '7.1.0-alpha.39', - '@storybook/postinstall': '7.1.0-alpha.39', - '@storybook/preact': '7.1.0-alpha.39', - '@storybook/preact-vite': '7.1.0-alpha.39', - '@storybook/preact-webpack5': '7.1.0-alpha.39', - '@storybook/preset-create-react-app': '7.1.0-alpha.39', - '@storybook/preset-html-webpack': '7.1.0-alpha.39', - '@storybook/preset-preact-webpack': '7.1.0-alpha.39', - '@storybook/preset-react-webpack': '7.1.0-alpha.39', - '@storybook/preset-server-webpack': '7.1.0-alpha.39', - '@storybook/preset-svelte-webpack': '7.1.0-alpha.39', - '@storybook/preset-vue-webpack': '7.1.0-alpha.39', - '@storybook/preset-vue3-webpack': '7.1.0-alpha.39', - '@storybook/preset-web-components-webpack': '7.1.0-alpha.39', - '@storybook/preview': '7.1.0-alpha.39', - '@storybook/preview-api': '7.1.0-alpha.39', - '@storybook/preview-web': '7.1.0-alpha.39', - '@storybook/react': '7.1.0-alpha.39', - '@storybook/react-dom-shim': '7.1.0-alpha.39', - '@storybook/react-vite': '7.1.0-alpha.39', - '@storybook/react-webpack5': '7.1.0-alpha.39', - '@storybook/router': '7.1.0-alpha.39', - '@storybook/server': '7.1.0-alpha.39', - '@storybook/server-webpack5': '7.1.0-alpha.39', - '@storybook/source-loader': '7.1.0-alpha.39', - '@storybook/store': '7.1.0-alpha.39', - '@storybook/svelte': '7.1.0-alpha.39', - '@storybook/svelte-vite': '7.1.0-alpha.39', - '@storybook/svelte-webpack5': '7.1.0-alpha.39', - '@storybook/sveltekit': '7.1.0-alpha.39', - '@storybook/telemetry': '7.1.0-alpha.39', - '@storybook/theming': '7.1.0-alpha.39', - '@storybook/types': '7.1.0-alpha.39', - '@storybook/vue': '7.1.0-alpha.39', - '@storybook/vue-vite': '7.1.0-alpha.39', - '@storybook/vue-webpack5': '7.1.0-alpha.39', - '@storybook/vue3': '7.1.0-alpha.39', - '@storybook/vue3-vite': '7.1.0-alpha.39', - '@storybook/vue3-webpack5': '7.1.0-alpha.39', - '@storybook/web-components': '7.1.0-alpha.39', - '@storybook/web-components-vite': '7.1.0-alpha.39', - '@storybook/web-components-webpack5': '7.1.0-alpha.39', - sb: '7.1.0-alpha.39', - storybook: '7.1.0-alpha.39', + '@storybook/addon-a11y': '7.1.0-alpha.40', + '@storybook/addon-actions': '7.1.0-alpha.40', + '@storybook/addon-backgrounds': '7.1.0-alpha.40', + '@storybook/addon-controls': '7.1.0-alpha.40', + '@storybook/addon-docs': '7.1.0-alpha.40', + '@storybook/addon-essentials': '7.1.0-alpha.40', + '@storybook/addon-highlight': '7.1.0-alpha.40', + '@storybook/addon-interactions': '7.1.0-alpha.40', + '@storybook/addon-jest': '7.1.0-alpha.40', + '@storybook/addon-links': '7.1.0-alpha.40', + '@storybook/addon-mdx-gfm': '7.1.0-alpha.40', + '@storybook/addon-measure': '7.1.0-alpha.40', + '@storybook/addon-outline': '7.1.0-alpha.40', + '@storybook/addon-storyshots': '7.1.0-alpha.40', + '@storybook/addon-storyshots-puppeteer': '7.1.0-alpha.40', + '@storybook/addon-storysource': '7.1.0-alpha.40', + '@storybook/addon-toolbars': '7.1.0-alpha.40', + '@storybook/addon-viewport': '7.1.0-alpha.40', + '@storybook/addons': '7.1.0-alpha.40', + '@storybook/angular': '7.1.0-alpha.40', + '@storybook/api': '7.1.0-alpha.40', + '@storybook/blocks': '7.1.0-alpha.40', + '@storybook/builder-manager': '7.1.0-alpha.40', + '@storybook/builder-vite': '7.1.0-alpha.40', + '@storybook/builder-webpack5': '7.1.0-alpha.40', + '@storybook/channel-postmessage': '7.1.0-alpha.40', + '@storybook/channel-websocket': '7.1.0-alpha.40', + '@storybook/channels': '7.1.0-alpha.40', + '@storybook/cli': '7.1.0-alpha.40', + '@storybook/client-api': '7.1.0-alpha.40', + '@storybook/client-logger': '7.1.0-alpha.40', + '@storybook/codemod': '7.1.0-alpha.40', + '@storybook/components': '7.1.0-alpha.40', + '@storybook/core-client': '7.1.0-alpha.40', + '@storybook/core-common': '7.1.0-alpha.40', + '@storybook/core-events': '7.1.0-alpha.40', + '@storybook/core-server': '7.1.0-alpha.40', + '@storybook/core-webpack': '7.1.0-alpha.40', + '@storybook/csf-plugin': '7.1.0-alpha.40', + '@storybook/csf-tools': '7.1.0-alpha.40', + '@storybook/docs-tools': '7.1.0-alpha.40', + '@storybook/ember': '7.1.0-alpha.40', + '@storybook/html': '7.1.0-alpha.40', + '@storybook/html-vite': '7.1.0-alpha.40', + '@storybook/html-webpack5': '7.1.0-alpha.40', + '@storybook/instrumenter': '7.1.0-alpha.40', + '@storybook/manager': '7.1.0-alpha.40', + '@storybook/manager-api': '7.1.0-alpha.40', + '@storybook/nextjs': '7.1.0-alpha.40', + '@storybook/node-logger': '7.1.0-alpha.40', + '@storybook/postinstall': '7.1.0-alpha.40', + '@storybook/preact': '7.1.0-alpha.40', + '@storybook/preact-vite': '7.1.0-alpha.40', + '@storybook/preact-webpack5': '7.1.0-alpha.40', + '@storybook/preset-create-react-app': '7.1.0-alpha.40', + '@storybook/preset-html-webpack': '7.1.0-alpha.40', + '@storybook/preset-preact-webpack': '7.1.0-alpha.40', + '@storybook/preset-react-webpack': '7.1.0-alpha.40', + '@storybook/preset-server-webpack': '7.1.0-alpha.40', + '@storybook/preset-svelte-webpack': '7.1.0-alpha.40', + '@storybook/preset-vue-webpack': '7.1.0-alpha.40', + '@storybook/preset-vue3-webpack': '7.1.0-alpha.40', + '@storybook/preset-web-components-webpack': '7.1.0-alpha.40', + '@storybook/preview': '7.1.0-alpha.40', + '@storybook/preview-api': '7.1.0-alpha.40', + '@storybook/preview-web': '7.1.0-alpha.40', + '@storybook/react': '7.1.0-alpha.40', + '@storybook/react-dom-shim': '7.1.0-alpha.40', + '@storybook/react-vite': '7.1.0-alpha.40', + '@storybook/react-webpack5': '7.1.0-alpha.40', + '@storybook/router': '7.1.0-alpha.40', + '@storybook/server': '7.1.0-alpha.40', + '@storybook/server-webpack5': '7.1.0-alpha.40', + '@storybook/source-loader': '7.1.0-alpha.40', + '@storybook/store': '7.1.0-alpha.40', + '@storybook/svelte': '7.1.0-alpha.40', + '@storybook/svelte-vite': '7.1.0-alpha.40', + '@storybook/svelte-webpack5': '7.1.0-alpha.40', + '@storybook/sveltekit': '7.1.0-alpha.40', + '@storybook/telemetry': '7.1.0-alpha.40', + '@storybook/theming': '7.1.0-alpha.40', + '@storybook/types': '7.1.0-alpha.40', + '@storybook/vue': '7.1.0-alpha.40', + '@storybook/vue-vite': '7.1.0-alpha.40', + '@storybook/vue-webpack5': '7.1.0-alpha.40', + '@storybook/vue3': '7.1.0-alpha.40', + '@storybook/vue3-vite': '7.1.0-alpha.40', + '@storybook/vue3-webpack5': '7.1.0-alpha.40', + '@storybook/web-components': '7.1.0-alpha.40', + '@storybook/web-components-vite': '7.1.0-alpha.40', + '@storybook/web-components-webpack5': '7.1.0-alpha.40', + sb: '7.1.0-alpha.40', + storybook: '7.1.0-alpha.40', }; diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json index 6f50c252cba5..d9fdc3b3b399 100644 --- a/code/lib/client-logger/package.json +++ b/code/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 19e9f45026e9..29f8a56facfc 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" @@ -49,9 +49,9 @@ "@babel/preset-env": "^7.22.0", "@babel/types": "^7.22.0", "@storybook/csf": "^0.1.0", - "@storybook/csf-tools": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/csf-tools": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/cross-spawn": "^6.0.2", "cross-spawn": "^7.0.3", "globby": "^11.0.2", diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index 3d0621616f7a..a6899d072e05 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-common", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/find-cache-dir": "^3.2.1", "@types/node": "^16.0.0", "@types/node-fetch": "^2.6.4", diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json index 4f8bdb58733e..11017bd1fe4e 100644 --- a/code/lib/core-events/package.json +++ b/code/lib/core-events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-events", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Event names used in storybook core", "keywords": [ "storybook" diff --git a/code/lib/core-server/package.json b/code/lib/core-server/package.json index 792ec77ccc0f..aca6e1ed459e 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-server", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -56,19 +56,19 @@ "dependencies": { "@aw-web-design/x-default-browser": "1.4.126", "@discoveryjs/json-ext": "^0.5.3", - "@storybook/builder-manager": "7.1.0-alpha.39", - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/builder-manager": "7.1.0-alpha.40", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", - "@storybook/csf-tools": "7.1.0-alpha.39", + "@storybook/csf-tools": "7.1.0-alpha.40", "@storybook/docs-mdx": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/manager": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/telemetry": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/telemetry": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/detect-port": "^1.3.0", "@types/node": "^16.0.0", "@types/pretty-hrtime": "^1.0.0", diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index 94717b1b47a0..4873c27e98a3 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" @@ -43,9 +43,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/node": "^16.0.0", "ts-dedent": "^2.0.0" }, diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json index ae5d0ed8baa0..75830c695d09 100644 --- a/code/lib/csf-plugin/package.json +++ b/code/lib/csf-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-plugin", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Enrich CSF files via static analysis", "keywords": [ "storybook" @@ -43,7 +43,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/csf-tools": "7.1.0-alpha.39", + "@storybook/csf-tools": "7.1.0-alpha.40", "unplugin": "^1.3.1" }, "devDependencies": { diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index 40ef7fca5b8d..12cc8568e4ca 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-tools", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Parse and manipulate CSF and Storybook config files", "keywords": [ "storybook" @@ -46,7 +46,7 @@ "@babel/traverse": "^7.22.0", "@babel/types": "^7.22.0", "@storybook/csf": "^0.1.0", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/types": "7.1.0-alpha.40", "fs-extra": "^11.1.0", "recast": "^0.23.1", "ts-dedent": "^2.0.0" diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index 26f101a3dc6f..2582e989830d 100644 --- a/code/lib/docs-tools/package.json +++ b/code/lib/docs-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/docs-tools", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Shared utility functions for frameworks to implement docs", "keywords": [ "storybook" @@ -43,9 +43,9 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-common": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/core-common": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/doctrine": "^0.0.3", "doctrine": "^3.0.0", "lodash": "^4.17.21" diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index 71fc16fd7dd8..b5297120d3d2 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/instrumenter", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -43,11 +43,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39" + "@storybook/preview-api": "7.1.0-alpha.40" }, "devDependencies": { "typescript": "~4.9.3" diff --git a/code/lib/manager-api/package.json b/code/lib/manager-api/package.json index ed53fae845b5..ffd47bb888f7 100644 --- a/code/lib/manager-api/package.json +++ b/code/lib/manager-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager-api", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Core Storybook Manager API & Context", "keywords": [ "storybook" @@ -42,14 +42,14 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/router": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/router": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "dequal": "^2.0.2", "lodash": "^4.17.21", "memoizerific": "^1.11.3", diff --git a/code/lib/manager-api/src/version.ts b/code/lib/manager-api/src/version.ts index 98a36cb5ab9d..1568eaffb0ca 100644 --- a/code/lib/manager-api/src/version.ts +++ b/code/lib/manager-api/src/version.ts @@ -1 +1 @@ -export const version = '7.1.0-alpha.39'; +export const version = '7.1.0-alpha.40'; diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json index 19e4177e821d..a9ff121bf37d 100644 --- a/code/lib/node-logger/package.json +++ b/code/lib/node-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/node-logger", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" diff --git a/code/lib/postinstall/package.json b/code/lib/postinstall/package.json index 8f18600c7643..2a7919b104fb 100644 --- a/code/lib/postinstall/package.json +++ b/code/lib/postinstall/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/postinstall", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook addons postinstall utilities", "keywords": [ "api", diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json index 788402dcc438..5e0c969c5252 100644 --- a/code/lib/preview-api/package.json +++ b/code/lib/preview-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-api", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -67,13 +67,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channel-postmessage": "7.1.0-alpha.39", - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/channel-postmessage": "7.1.0-alpha.40", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/types": "7.1.0-alpha.40", "@types/qs": "^6.9.5", "dequal": "^2.0.2", "lodash": "^4.17.21", @@ -85,7 +85,7 @@ }, "devDependencies": { "@jest/globals": "^29.5.0", - "@storybook/core-common": "7.1.0-alpha.39", + "@storybook/core-common": "7.1.0-alpha.40", "ansi-to-html": "^0.6.11", "react": "^16.14.0", "slash": "^5.0.0" diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json index c4ba9bf235f4..d02f3585176d 100644 --- a/code/lib/preview/package.json +++ b/code/lib/preview/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -55,10 +55,10 @@ "prep": "../../../scripts/prepare/esm-bundle.ts" }, "devDependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", "typescript": "~4.9.3" }, "publishConfig": { diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json index 04b710889428..8de77f055c98 100644 --- a/code/lib/react-dom-shim/package.json +++ b/code/lib/react-dom-shim/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-dom-shim", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "", "keywords": [ "storybook" @@ -53,7 +53,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "devDependencies": { - "@storybook/types": "7.1.0-alpha.39", + "@storybook/types": "7.1.0-alpha.40", "typescript": "~4.9.3" }, "peerDependencies": { diff --git a/code/lib/router/package.json b/code/lib/router/package.json index 124d173de6d0..a4f4b84b4ef5 100644 --- a/code/lib/router/package.json +++ b/code/lib/router/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/router", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Core Storybook Router", "keywords": [ "storybook" @@ -48,7 +48,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", "memoizerific": "^1.11.3", "qs": "^6.10.0" }, diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index acd9fa971f04..86b127624496 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/source-loader", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Source loader", "keywords": [ "lib", @@ -45,7 +45,7 @@ }, "dependencies": { "@storybook/csf": "^0.1.0", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/types": "7.1.0-alpha.40", "estraverse": "^5.2.0", "lodash": "^4.17.21", "prettier": "^2.8.0" diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index 2fab4eed930d..5d001ec7033f 100644 --- a/code/lib/telemetry/package.json +++ b/code/lib/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/telemetry", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Telemetry logging for crash reports and usage statistics", "keywords": [ "storybook" @@ -43,8 +43,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-common": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-common": "7.1.0-alpha.40", "chalk": "^4.1.0", "detect-package-manager": "^2.0.1", "fetch-retry": "^5.0.2", diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index ffecd18c83a9..e223150df439 100644 --- a/code/lib/theming/package.json +++ b/code/lib/theming/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/theming", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -49,7 +49,7 @@ }, "dependencies": { "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", - "@storybook/client-logger": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", "memoizerific": "^1.11.3" }, diff --git a/code/lib/types/package.json b/code/lib/types/package.json index 10f4a15dcd17..9a2a019c50fc 100644 --- a/code/lib/types/package.json +++ b/code/lib/types/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/types", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Core Storybook TS Types", "keywords": [ "storybook" @@ -43,7 +43,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", "@types/babel__core": "^7.0.0", "@types/express": "^4.7.0", "file-system-cache": "2.3.0" diff --git a/code/package.json b/code/package.json index 7dc9576a1d4b..6206ad43b4ae 100644 --- a/code/package.json +++ b/code/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/root", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "private": true, "description": "Storybook root", "homepage": "https://storybook.js.org/", diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json index 4029183cca56..466ef3b228e4 100644 --- a/code/presets/create-react-app/package.json +++ b/code/presets/create-react-app/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-create-react-app", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Create React App preset", "keywords": [ "storybook" @@ -50,14 +50,14 @@ "dependencies": { "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/types": "7.1.0-alpha.40", "@types/babel__core": "^7.1.7", "babel-plugin-react-docgen": "^4.1.0", "pnp-webpack-plugin": "^1.7.0", "semver": "^7.3.5" }, "devDependencies": { - "@storybook/node-logger": "7.1.0-alpha.39", + "@storybook/node-logger": "7.1.0-alpha.40", "@types/node": "^16.0.0", "typescript": "~4.9.3" }, diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index be90bd143004..cb1d303a43c0 100644 --- a/code/presets/html-webpack/package.json +++ b/code/presets/html-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-html-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -48,7 +48,7 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", "@types/node": "^16.0.0", "html-loader": "^3.1.0", "webpack": "5" diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index 265bd1591ccc..5c9eab665f17 100644 --- a/code/presets/preact-webpack/package.json +++ b/code/presets/preact-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-preact-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" @@ -50,7 +50,7 @@ "dependencies": { "@babel/plugin-transform-react-jsx": "^7.21.0", "@babel/preset-typescript": "^7.21.0", - "@storybook/core-webpack": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", "@types/node": "^16.0.0" }, "devDependencies": { diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index 0637341945ea..f58c11701ece 100644 --- a/code/presets/react-webpack/package.json +++ b/code/presets/react-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-react-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading", "keywords": [ "storybook" @@ -66,10 +66,10 @@ "@babel/preset-flow": "^7.21.0", "@babel/preset-react": "^7.22.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.5", - "@storybook/core-webpack": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", - "@storybook/react": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", + "@storybook/react": "7.1.0-alpha.40", "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0", "@types/node": "^16.0.0", "@types/semver": "^7.3.4", diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index c3376f6663ef..da4e38ec780a 100644 --- a/code/presets/server-webpack/package.json +++ b/code/presets/server-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-server-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -53,10 +53,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-server": "7.1.0-alpha.39", - "@storybook/core-webpack": "7.1.0-alpha.39", + "@storybook/core-server": "7.1.0-alpha.40", + "@storybook/core-webpack": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/server": "7.1.0-alpha.39", + "@storybook/server": "7.1.0-alpha.40", "@types/node": "^16.0.0", "safe-identifier": "^0.4.1", "ts-dedent": "^2.0.0", diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index bbf6834fd2df..06cb6c02ba3a 100644 --- a/code/presets/svelte-webpack/package.json +++ b/code/presets/svelte-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-svelte-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -63,8 +63,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.1.0-alpha.39", - "@storybook/node-logger": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", + "@storybook/node-logger": "7.1.0-alpha.40", "sveltedoc-parser": "^4.2.1", "ts-dedent": "^2.0.0" }, diff --git a/code/presets/vue-webpack/package.json b/code/presets/vue-webpack/package.json index fbef57a371fc..234fde798e14 100644 --- a/code/presets/vue-webpack/package.json +++ b/code/presets/vue-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Vue: Develop Vue Component in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -58,8 +58,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@types/node": "^16.0.0", "ts-loader": "^9.2.8", "vue-docgen-api": "^4.44.23", diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index ae9865a7ebd8..a5b0c5e83d1b 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue3-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" @@ -58,8 +58,8 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-webpack": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@types/node": "^16.0.0", "ts-loader": "^9.2.8", "vue-docgen-api": "^4.46.0", diff --git a/code/presets/web-components-webpack/package.json b/code/presets/web-components-webpack/package.json index 57595b46f838..ea372d02ed2c 100644 --- a/code/presets/web-components-webpack/package.json +++ b/code/presets/web-components-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-web-components-webpack", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit", @@ -54,7 +54,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/preset-env": "^7.22.0", - "@storybook/core-webpack": "7.1.0-alpha.39", + "@storybook/core-webpack": "7.1.0-alpha.40", "@types/node": "^16.0.0", "babel-loader": "^7.0.0 || ^8.0.0 || ^9.0.0", "babel-plugin-bundled-import-meta": "^0.3.1" diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index b8283570e816..1bc4ba27232f 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook HTML renderer", "keywords": [ "storybook" @@ -48,11 +48,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/core-client": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 2fbd85ba4756..d142a9b84ae9 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Preact renderer", "keywords": [ "storybook" @@ -48,10 +48,10 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.1.0-alpha.39", + "@storybook/core-client": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index a634704c1c5d..5255f30020c0 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook React renderer", "keywords": [ "storybook" @@ -52,13 +52,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-client": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-client": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/react-dom-shim": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/react-dom-shim": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/escodegen": "^0.0.6", "@types/estree": "^0.0.51", "@types/node": "^16.0.0", diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index b188c1903599..b7202f641ba6 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Server renderer", "keywords": [ "storybook" @@ -53,12 +53,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.1.0-alpha.39", + "@storybook/core-client": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", - "@storybook/csf-tools": "7.1.0-alpha.39", + "@storybook/csf-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/fs-extra": "^11.0.1", "fs-extra": "^11.1.0", "ts-dedent": "^2.0.0", diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index b15cc60e9743..7ab8c4da4e00 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Svelte renderer", "keywords": [ "storybook" @@ -52,13 +52,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-client": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-client": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "sveltedoc-parser": "^4.2.1", "type-fest": "^3.11.0" }, diff --git a/code/renderers/vue/package.json b/code/renderers/vue/package.json index 78a95855ede0..14962aac7f05 100644 --- a/code/renderers/vue/package.json +++ b/code/renderers/vue/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Vue renderer", "keywords": [ "storybook" @@ -48,12 +48,12 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-client": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-client": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "ts-dedent": "^2.0.0", "type-fest": "^3.11.0" }, diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index 6e220bb48d01..5f3f29fe0b98 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Vue 3 renderer", "keywords": [ "storybook" @@ -48,11 +48,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/core-client": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/core-client": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "lodash": "^4.17.21", "ts-dedent": "^2.0.0", "type-fest": "^3.11.0", diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index d3102cd1b00a..8d4a50c8c507 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook web-components renderer", "keywords": [ "lit", @@ -51,13 +51,13 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/core-client": "7.1.0-alpha.39", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/core-client": "7.1.0-alpha.40", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0" }, diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index 6258387e91f6..12e3a19dea19 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/blocks", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Storybook Doc Blocks", "keywords": [ "storybook" @@ -43,17 +43,17 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", - "@storybook/docs-tools": "7.1.0-alpha.39", + "@storybook/docs-tools": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/preview-api": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/preview-api": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@types/lodash": "^4.14.167", "color-convert": "^2.0.1", "dequal": "^2.0.2", @@ -67,7 +67,7 @@ "util-deprecate": "^1.0.2" }, "devDependencies": { - "@storybook/addon-actions": "7.1.0-alpha.39", + "@storybook/addon-actions": "7.1.0-alpha.40", "@types/color-convert": "^2.0.0" }, "peerDependencies": { diff --git a/code/ui/components/package.json b/code/ui/components/package.json index 1ff56f36291e..4032aca62c02 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Core Storybook Components", "keywords": [ "storybook" @@ -48,11 +48,11 @@ "prep": "../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@storybook/client-logger": "7.1.0-alpha.39", + "@storybook/client-logger": "7.1.0-alpha.40", "@storybook/csf": "^0.1.0", "@storybook/global": "^5.0.0", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "memoizerific": "^1.11.3", "use-resize-observer": "^9.1.0", "util-deprecate": "^1.0.2" diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index 569e2b6b9c25..4a069dc3a3ac 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager", - "version": "7.1.0-alpha.39", + "version": "7.1.0-alpha.40", "description": "Core Storybook UI", "keywords": [ "storybook" @@ -51,18 +51,18 @@ }, "devDependencies": { "@fal-works/esbuild-plugin-global-externals": "^2.1.2", - "@storybook/addons": "7.1.0-alpha.39", - "@storybook/api": "7.1.0-alpha.39", - "@storybook/channel-postmessage": "7.1.0-alpha.39", - "@storybook/channels": "7.1.0-alpha.39", - "@storybook/client-logger": "7.1.0-alpha.39", - "@storybook/components": "7.1.0-alpha.39", - "@storybook/core-events": "7.1.0-alpha.39", + "@storybook/addons": "7.1.0-alpha.40", + "@storybook/api": "7.1.0-alpha.40", + "@storybook/channel-postmessage": "7.1.0-alpha.40", + "@storybook/channels": "7.1.0-alpha.40", + "@storybook/client-logger": "7.1.0-alpha.40", + "@storybook/components": "7.1.0-alpha.40", + "@storybook/core-events": "7.1.0-alpha.40", "@storybook/global": "^5.0.0", - "@storybook/manager-api": "7.1.0-alpha.39", - "@storybook/router": "7.1.0-alpha.39", - "@storybook/theming": "7.1.0-alpha.39", - "@storybook/types": "7.1.0-alpha.39", + "@storybook/manager-api": "7.1.0-alpha.40", + "@storybook/router": "7.1.0-alpha.40", + "@storybook/theming": "7.1.0-alpha.40", + "@storybook/types": "7.1.0-alpha.40", "@testing-library/react": "^11.2.2", "@types/semver": "^7.3.4", "copy-to-clipboard": "^3.3.1", diff --git a/code/yarn.lock b/code/yarn.lock index 25b652901059..01eb0a5af5fa 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5124,16 +5124,16 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-a11y@workspace:addons/a11y" dependencies: - "@storybook/addon-highlight": 7.1.0-alpha.39 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/addon-highlight": 7.1.0-alpha.40 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@testing-library/react": ^11.2.2 axe-core: ^4.2.0 lodash: ^4.17.21 @@ -5151,18 +5151,18 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-actions@7.1.0-alpha.39, @storybook/addon-actions@workspace:*, @storybook/addon-actions@workspace:addons/actions": +"@storybook/addon-actions@7.1.0-alpha.40, @storybook/addon-actions@workspace:*, @storybook/addon-actions@workspace:addons/actions": version: 0.0.0-use.local resolution: "@storybook/addon-actions@workspace:addons/actions" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/lodash": ^4.14.167 "@types/uuid": ^9.0.1 dequal: ^2.0.2 @@ -5185,18 +5185,18 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-backgrounds@7.1.0-alpha.39, @storybook/addon-backgrounds@workspace:*, @storybook/addon-backgrounds@workspace:addons/backgrounds": +"@storybook/addon-backgrounds@7.1.0-alpha.40, @storybook/addon-backgrounds@workspace:*, @storybook/addon-backgrounds@workspace:addons/backgrounds": version: 0.0.0-use.local resolution: "@storybook/addon-backgrounds@workspace:addons/backgrounds" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 memoizerific: ^1.11.3 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -5211,19 +5211,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-controls@7.1.0-alpha.39, @storybook/addon-controls@workspace:*, @storybook/addon-controls@workspace:addons/controls": +"@storybook/addon-controls@7.1.0-alpha.40, @storybook/addon-controls@workspace:*, @storybook/addon-controls@workspace:addons/controls": version: 0.0.0-use.local resolution: "@storybook/addon-controls@workspace:addons/controls" dependencies: - "@storybook/blocks": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/blocks": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 lodash: ^4.17.21 ts-dedent: ^2.0.0 peerDependencies: @@ -5237,25 +5237,25 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-docs@7.1.0-alpha.39, @storybook/addon-docs@workspace:*, @storybook/addon-docs@workspace:addons/docs": +"@storybook/addon-docs@7.1.0-alpha.40, @storybook/addon-docs@workspace:*, @storybook/addon-docs@workspace:addons/docs": version: 0.0.0-use.local resolution: "@storybook/addon-docs@workspace:addons/docs" dependencies: "@jest/transform": ^29.3.1 "@mdx-js/react": ^2.1.5 - "@storybook/blocks": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/csf-plugin": 7.1.0-alpha.39 - "@storybook/csf-tools": 7.1.0-alpha.39 + "@storybook/blocks": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/csf-plugin": 7.1.0-alpha.40 + "@storybook/csf-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 "@storybook/mdx2-csf": ^1.0.0 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/postinstall": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/react-dom-shim": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/postinstall": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/react-dom-shim": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 fs-extra: ^11.1.0 react: ^16.14.0 react-dom: ^16.8.0 @@ -5273,20 +5273,20 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-essentials@workspace:addons/essentials" dependencies: - "@storybook/addon-actions": 7.1.0-alpha.39 - "@storybook/addon-backgrounds": 7.1.0-alpha.39 - "@storybook/addon-controls": 7.1.0-alpha.39 - "@storybook/addon-docs": 7.1.0-alpha.39 - "@storybook/addon-highlight": 7.1.0-alpha.39 - "@storybook/addon-measure": 7.1.0-alpha.39 - "@storybook/addon-outline": 7.1.0-alpha.39 - "@storybook/addon-toolbars": 7.1.0-alpha.39 - "@storybook/addon-viewport": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/vue": 7.1.0-alpha.39 + "@storybook/addon-actions": 7.1.0-alpha.40 + "@storybook/addon-backgrounds": 7.1.0-alpha.40 + "@storybook/addon-controls": 7.1.0-alpha.40 + "@storybook/addon-docs": 7.1.0-alpha.40 + "@storybook/addon-highlight": 7.1.0-alpha.40 + "@storybook/addon-measure": 7.1.0-alpha.40 + "@storybook/addon-outline": 7.1.0-alpha.40 + "@storybook/addon-toolbars": 7.1.0-alpha.40 + "@storybook/addon-viewport": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/vue": 7.1.0-alpha.40 ts-dedent: ^2.0.0 typescript: ^4.9.3 peerDependencies: @@ -5295,13 +5295,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-highlight@7.1.0-alpha.39, @storybook/addon-highlight@workspace:*, @storybook/addon-highlight@workspace:addons/highlight": +"@storybook/addon-highlight@7.1.0-alpha.40, @storybook/addon-highlight@workspace:*, @storybook/addon-highlight@workspace:addons/highlight": version: 0.0.0-use.local resolution: "@storybook/addon-highlight@workspace:addons/highlight" dependencies: - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 "@types/webpack-env": ^1.16.0 typescript: ~4.9.3 languageName: unknown @@ -5312,18 +5312,18 @@ __metadata: resolution: "@storybook/addon-interactions@workspace:addons/interactions" dependencies: "@devtools-ds/object-inspector": ^1.1.2 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/instrumenter": 7.1.0-alpha.39 + "@storybook/instrumenter": 7.1.0-alpha.40 "@storybook/jest": next - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 "@storybook/testing-library": next - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/node": ^16.0.0 formik: ^2.2.9 jest-mock: ^29.5.0 @@ -5345,13 +5345,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-jest@workspace:addons/jest" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 react-resize-detector: ^7.1.2 tiny-invariant: ^1.3.1 typescript: ~4.9.3 @@ -5371,14 +5371,14 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-links@workspace:addons/links" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/router": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/router": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 fs-extra: ^11.1.0 prop-types: ^15.7.2 ts-dedent: ^2.0.0 @@ -5398,24 +5398,24 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-mdx-gfm@workspace:addons/gfm" dependencies: - "@storybook/node-logger": 7.1.0-alpha.39 + "@storybook/node-logger": 7.1.0-alpha.40 remark-gfm: ^3.0.1 ts-dedent: ^2.0.0 typescript: ~4.9.3 languageName: unknown linkType: soft -"@storybook/addon-measure@7.1.0-alpha.39, @storybook/addon-measure@workspace:*, @storybook/addon-measure@workspace:addons/measure": +"@storybook/addon-measure@7.1.0-alpha.40, @storybook/addon-measure@workspace:*, @storybook/addon-measure@workspace:addons/measure": version: 0.0.0-use.local resolution: "@storybook/addon-measure@workspace:addons/measure" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 tiny-invariant: ^1.3.1 typescript: ~4.9.3 peerDependencies: @@ -5429,17 +5429,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-outline@7.1.0-alpha.39, @storybook/addon-outline@workspace:*, @storybook/addon-outline@workspace:addons/outline": +"@storybook/addon-outline@7.1.0-alpha.40, @storybook/addon-outline@workspace:*, @storybook/addon-outline@workspace:addons/outline": version: 0.0.0-use.local resolution: "@storybook/addon-outline@workspace:addons/outline" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 ts-dedent: ^2.0.0 typescript: ~4.9.3 peerDependencies: @@ -5459,8 +5459,8 @@ __metadata: dependencies: "@axe-core/puppeteer": ^4.2.0 "@storybook/csf": ^0.1.0 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/jest-image-snapshot": ^6.0.0 "@types/puppeteer": ^5.4.0 enzyme: ^3.11.0 @@ -5468,7 +5468,7 @@ __metadata: jest-image-snapshot: ^6.0.0 puppeteer: ^2.0.0 || ^3.0.0 peerDependencies: - "@storybook/addon-storyshots": 7.1.0-alpha.39 + "@storybook/addon-storyshots": 7.1.0-alpha.40 puppeteer: ">=2.0.0" peerDependenciesMeta: puppeteer: @@ -5484,18 +5484,18 @@ __metadata: "@angular/platform-browser-dynamic": ^16.0.0-rc.4 "@emotion/jest": ^11.8.0 "@jest/transform": ^29.3.1 - "@storybook/addon-docs": 7.1.0-alpha.39 - "@storybook/angular": 7.1.0-alpha.39 + "@storybook/addon-docs": 7.1.0-alpha.40 + "@storybook/angular": 7.1.0-alpha.40 "@storybook/babel-plugin-require-context-hook": 1.0.1 - "@storybook/client-api": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-webpack": 7.1.0-alpha.39 + "@storybook/client-api": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-webpack": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/react": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 - "@storybook/vue": 7.1.0-alpha.39 - "@storybook/vue3": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/react": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 + "@storybook/vue": 7.1.0-alpha.40 + "@storybook/vue3": 7.1.0-alpha.40 "@types/jest-specific-snapshot": ^0.5.6 babel-loader: ^9.1.2 enzyme: ^3.11.0 @@ -5567,13 +5567,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/addon-storysource@workspace:addons/storysource" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/router": 7.1.0-alpha.39 - "@storybook/source-loader": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/router": 7.1.0-alpha.40 + "@storybook/source-loader": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 "@types/react": ^16.14.34 "@types/react-syntax-highlighter": 11.0.5 estraverse: ^5.2.0 @@ -5592,15 +5592,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-toolbars@7.1.0-alpha.39, @storybook/addon-toolbars@workspace:*, @storybook/addon-toolbars@workspace:addons/toolbars": +"@storybook/addon-toolbars@7.1.0-alpha.40, @storybook/addon-toolbars@workspace:*, @storybook/addon-toolbars@workspace:addons/toolbars": version: 0.0.0-use.local resolution: "@storybook/addon-toolbars@workspace:addons/toolbars" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 typescript: ~4.9.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -5613,17 +5613,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addon-viewport@7.1.0-alpha.39, @storybook/addon-viewport@workspace:*, @storybook/addon-viewport@workspace:addons/viewport": +"@storybook/addon-viewport@7.1.0-alpha.40, @storybook/addon-viewport@workspace:*, @storybook/addon-viewport@workspace:addons/viewport": version: 0.0.0-use.local resolution: "@storybook/addon-viewport@workspace:addons/viewport" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 memoizerific: ^1.11.3 prop-types: ^15.7.2 typescript: ~4.9.3 @@ -5638,20 +5638,20 @@ __metadata: languageName: unknown linkType: soft -"@storybook/addons@7.1.0-alpha.39, @storybook/addons@workspace:*, @storybook/addons@workspace:deprecated/addons": +"@storybook/addons@7.1.0-alpha.40, @storybook/addons@workspace:*, @storybook/addons@workspace:deprecated/addons": version: 0.0.0-use.local resolution: "@storybook/addons@workspace:deprecated/addons" dependencies: - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 languageName: unknown linkType: soft -"@storybook/angular@7.1.0-alpha.39, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": +"@storybook/angular@7.1.0-alpha.40, @storybook/angular@workspace:*, @storybook/angular@workspace:frameworks/angular": version: 0.0.0-use.local resolution: "@storybook/angular@workspace:frameworks/angular" dependencies: @@ -5667,20 +5667,20 @@ __metadata: "@angular/forms": ^16.0.0-rc.4 "@angular/platform-browser": ^16.0.0-rc.4 "@angular/platform-browser-dynamic": ^16.0.0-rc.4 - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/cli": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/core-webpack": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/cli": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/core-webpack": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/telemetry": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/telemetry": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/cross-spawn": ^6.0.2 "@types/node": ^16.0.0 "@types/react": ^16.14.34 @@ -5727,12 +5727,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/api@7.1.0-alpha.39, @storybook/api@workspace:*, @storybook/api@workspace:deprecated/manager-api-shim": +"@storybook/api@7.1.0-alpha.40, @storybook/api@workspace:*, @storybook/api@workspace:deprecated/manager-api-shim": version: 0.0.0-use.local resolution: "@storybook/api@workspace:deprecated/manager-api-shim" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/manager-api": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/manager-api": 7.1.0-alpha.40 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -5776,22 +5776,22 @@ __metadata: languageName: node linkType: hard -"@storybook/blocks@7.1.0-alpha.39, @storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks": +"@storybook/blocks@7.1.0-alpha.40, @storybook/blocks@workspace:*, @storybook/blocks@workspace:ui/blocks": version: 0.0.0-use.local resolution: "@storybook/blocks@workspace:ui/blocks" dependencies: - "@storybook/addon-actions": 7.1.0-alpha.39 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/addon-actions": 7.1.0-alpha.40 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/color-convert": ^2.0.0 "@types/lodash": ^4.14.167 color-convert: ^2.0.1 @@ -5810,14 +5810,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-manager@7.1.0-alpha.39, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:builders/builder-manager": +"@storybook/builder-manager@7.1.0-alpha.40, @storybook/builder-manager@workspace:*, @storybook/builder-manager@workspace:builders/builder-manager": version: 0.0.0-use.local resolution: "@storybook/builder-manager@workspace:builders/builder-manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/manager": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/manager": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 "@types/ejs": ^3.1.1 "@types/find-cache-dir": ^3.2.1 "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10 @@ -5835,19 +5835,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-vite@7.1.0-alpha.39, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:builders/builder-vite": +"@storybook/builder-vite@7.1.0-alpha.40, @storybook/builder-vite@workspace:*, @storybook/builder-vite@workspace:builders/builder-vite": version: 0.0.0-use.local resolution: "@storybook/builder-vite@workspace:builders/builder-vite" dependencies: - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/csf-plugin": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/csf-plugin": 7.1.0-alpha.40 "@storybook/mdx2-csf": ^1.0.0 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/express": ^4.17.13 "@types/find-cache-dir": ^3.2.1 "@types/node": ^16.0.0 @@ -5879,29 +5879,29 @@ __metadata: languageName: unknown linkType: soft -"@storybook/builder-webpack5@7.1.0-alpha.39, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:builders/builder-webpack5": +"@storybook/builder-webpack5@7.1.0-alpha.40, @storybook/builder-webpack5@workspace:*, @storybook/builder-webpack5@workspace:builders/builder-webpack5": version: 0.0.0-use.local resolution: "@storybook/builder-webpack5@workspace:builders/builder-webpack5" dependencies: "@babel/core": ^7.22.0 - "@storybook/addons": 7.1.0-alpha.39 - "@storybook/api": 7.1.0-alpha.39 - "@storybook/channel-postmessage": 7.1.0-alpha.39 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-api": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 - "@storybook/core-webpack": 7.1.0-alpha.39 + "@storybook/addons": 7.1.0-alpha.40 + "@storybook/api": 7.1.0-alpha.40 + "@storybook/channel-postmessage": 7.1.0-alpha.40 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-api": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 + "@storybook/core-webpack": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/router": 7.1.0-alpha.39 - "@storybook/store": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/router": 7.1.0-alpha.40 + "@storybook/store": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 "@swc/core": ^1.3.49 "@types/node": ^16.0.0 "@types/pretty-hrtime": ^1.0.0 @@ -5945,12 +5945,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/channel-postmessage@7.1.0-alpha.39, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:deprecated/channel-postmessage": +"@storybook/channel-postmessage@7.1.0-alpha.40, @storybook/channel-postmessage@workspace:*, @storybook/channel-postmessage@workspace:deprecated/channel-postmessage": version: 0.0.0-use.local resolution: "@storybook/channel-postmessage@workspace:deprecated/channel-postmessage" dependencies: - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 typescript: ~4.9.3 languageName: unknown linkType: soft @@ -5959,19 +5959,19 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/channel-websocket@workspace:deprecated/channel-websocket" dependencies: - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 typescript: ~4.9.3 languageName: unknown linkType: soft -"@storybook/channels@7.1.0-alpha.39, @storybook/channels@workspace:*, @storybook/channels@workspace:lib/channels": +"@storybook/channels@7.1.0-alpha.40, @storybook/channels@workspace:*, @storybook/channels@workspace:lib/channels": version: 0.0.0-use.local resolution: "@storybook/channels@workspace:lib/channels" dependencies: - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 qs: ^6.10.0 telejson: ^7.0.3 @@ -5980,21 +5980,21 @@ __metadata: languageName: unknown linkType: soft -"@storybook/cli@7.1.0-alpha.39, @storybook/cli@workspace:*, @storybook/cli@workspace:lib/cli": +"@storybook/cli@7.1.0-alpha.40, @storybook/cli@workspace:*, @storybook/cli@workspace:lib/cli": version: 0.0.0-use.local resolution: "@storybook/cli@workspace:lib/cli" dependencies: "@babel/core": ^7.22.0 "@babel/preset-env": ^7.22.0 "@ndelangen/get-tarball": ^3.0.7 - "@storybook/client-api": 7.1.0-alpha.39 - "@storybook/codemod": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/csf-tools": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/telemetry": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/client-api": 7.1.0-alpha.40 + "@storybook/codemod": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/csf-tools": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/telemetry": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/cross-spawn": ^6.0.2 "@types/prompts": ^2.0.9 "@types/puppeteer-core": ^2.1.0 @@ -6037,16 +6037,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/client-api@7.1.0-alpha.39, @storybook/client-api@workspace:*, @storybook/client-api@workspace:deprecated/client-api": +"@storybook/client-api@7.1.0-alpha.40, @storybook/client-api@workspace:*, @storybook/client-api@workspace:deprecated/client-api": version: 0.0.0-use.local resolution: "@storybook/client-api@workspace:deprecated/client-api" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 languageName: unknown linkType: soft -"@storybook/client-logger@7.1.0-alpha.39, @storybook/client-logger@workspace:*, @storybook/client-logger@workspace:lib/client-logger": +"@storybook/client-logger@7.1.0-alpha.40, @storybook/client-logger@workspace:*, @storybook/client-logger@workspace:lib/client-logger": version: 0.0.0-use.local resolution: "@storybook/client-logger@workspace:lib/client-logger" dependencies: @@ -6055,7 +6055,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/codemod@7.1.0-alpha.39, @storybook/codemod@workspace:*, @storybook/codemod@workspace:lib/codemod": +"@storybook/codemod@7.1.0-alpha.40, @storybook/codemod@workspace:*, @storybook/codemod@workspace:lib/codemod": version: 0.0.0-use.local resolution: "@storybook/codemod@workspace:lib/codemod" dependencies: @@ -6063,9 +6063,9 @@ __metadata: "@babel/preset-env": ^7.22.0 "@babel/types": ^7.22.0 "@storybook/csf": ^0.1.0 - "@storybook/csf-tools": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/csf-tools": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/cross-spawn": ^6.0.2 "@types/jscodeshift": ^0.11.6 ansi-regex: ^5.0.1 @@ -6091,16 +6091,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/components@7.1.0-alpha.39, @storybook/components@workspace:*, @storybook/components@workspace:ui/components": +"@storybook/components@7.1.0-alpha.40, @storybook/components@workspace:*, @storybook/components@workspace:ui/components": version: 0.0.0-use.local resolution: "@storybook/components@workspace:ui/components" dependencies: "@popperjs/core": ^2.6.0 - "@storybook/client-logger": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/react-syntax-highlighter": 11.0.5 "@types/util-deprecate": ^1.0.0 css: ^3.0.0 @@ -6122,21 +6122,21 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-client@7.1.0-alpha.39, @storybook/core-client@workspace:*, @storybook/core-client@workspace:deprecated/core-client": +"@storybook/core-client@7.1.0-alpha.40, @storybook/core-client@workspace:*, @storybook/core-client@workspace:deprecated/core-client": version: 0.0.0-use.local resolution: "@storybook/core-client@workspace:deprecated/core-client" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 languageName: unknown linkType: soft -"@storybook/core-common@7.1.0-alpha.39, @storybook/core-common@workspace:*, @storybook/core-common@workspace:lib/core-common": +"@storybook/core-common@7.1.0-alpha.40, @storybook/core-common@workspace:*, @storybook/core-common@workspace:lib/core-common": version: 0.0.0-use.local resolution: "@storybook/core-common@workspace:lib/core-common" dependencies: - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/find-cache-dir": ^3.2.1 "@types/mock-fs": ^4.13.1 "@types/node": ^16.0.0 @@ -6166,7 +6166,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-events@7.1.0-alpha.39, @storybook/core-events@workspace:*, @storybook/core-events@workspace:lib/core-events": +"@storybook/core-events@7.1.0-alpha.40, @storybook/core-events@workspace:*, @storybook/core-events@workspace:lib/core-events": version: 0.0.0-use.local resolution: "@storybook/core-events@workspace:lib/core-events" dependencies: @@ -6174,25 +6174,25 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-server@7.1.0-alpha.39, @storybook/core-server@workspace:*, @storybook/core-server@workspace:lib/core-server": +"@storybook/core-server@7.1.0-alpha.40, @storybook/core-server@workspace:*, @storybook/core-server@workspace:lib/core-server": version: 0.0.0-use.local resolution: "@storybook/core-server@workspace:lib/core-server" dependencies: "@aw-web-design/x-default-browser": 1.4.126 "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-manager": 7.1.0-alpha.39 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/builder-manager": 7.1.0-alpha.40 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 - "@storybook/csf-tools": 7.1.0-alpha.39 + "@storybook/csf-tools": 7.1.0-alpha.40 "@storybook/docs-mdx": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/manager": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/telemetry": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/telemetry": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/compression": ^1.7.0 "@types/detect-port": ^1.3.0 "@types/ip": ^1.1.0 @@ -6234,13 +6234,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/core-webpack@7.1.0-alpha.39, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": +"@storybook/core-webpack@7.1.0-alpha.40, @storybook/core-webpack@workspace:*, @storybook/core-webpack@workspace:lib/core-webpack": version: 0.0.0-use.local resolution: "@storybook/core-webpack@workspace:lib/core-webpack" dependencies: - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/node": ^16.0.0 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -6248,17 +6248,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/csf-plugin@7.1.0-alpha.39, @storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": +"@storybook/csf-plugin@7.1.0-alpha.40, @storybook/csf-plugin@workspace:*, @storybook/csf-plugin@workspace:lib/csf-plugin": version: 0.0.0-use.local resolution: "@storybook/csf-plugin@workspace:lib/csf-plugin" dependencies: - "@storybook/csf-tools": 7.1.0-alpha.39 + "@storybook/csf-tools": 7.1.0-alpha.40 typescript: ~4.9.3 unplugin: ^1.3.1 languageName: unknown linkType: soft -"@storybook/csf-tools@7.1.0-alpha.39, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": +"@storybook/csf-tools@7.1.0-alpha.40, @storybook/csf-tools@workspace:*, @storybook/csf-tools@workspace:lib/csf-tools": version: 0.0.0-use.local resolution: "@storybook/csf-tools@workspace:lib/csf-tools" dependencies: @@ -6267,7 +6267,7 @@ __metadata: "@babel/traverse": ^7.22.0 "@babel/types": ^7.22.0 "@storybook/csf": ^0.1.0 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/types": 7.1.0-alpha.40 "@types/fs-extra": ^11.0.1 "@types/js-yaml": ^4.0.5 fs-extra: ^11.1.0 @@ -6303,14 +6303,14 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-tools@7.1.0-alpha.39, @storybook/docs-tools@workspace:*, @storybook/docs-tools@workspace:lib/docs-tools": +"@storybook/docs-tools@7.1.0-alpha.40, @storybook/docs-tools@workspace:*, @storybook/docs-tools@workspace:lib/docs-tools": version: 0.0.0-use.local resolution: "@storybook/docs-tools@workspace:lib/docs-tools" dependencies: "@babel/core": ^7.22.0 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/doctrine": ^0.0.3 doctrine: ^3.0.0 jest-specific-snapshot: ^8.0.0 @@ -6324,12 +6324,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/ember@workspace:frameworks/ember" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 ember-source: ~3.28.1 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -6373,14 +6373,14 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-vite@workspace:frameworks/html-vite" dependencies: - "@storybook/addons": 7.1.0-alpha.39 - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/channel-postmessage": 7.1.0-alpha.39 - "@storybook/client-api": 7.1.0-alpha.39 - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/html": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preview-web": 7.1.0-alpha.39 + "@storybook/addons": 7.1.0-alpha.40 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/channel-postmessage": 7.1.0-alpha.40 + "@storybook/client-api": 7.1.0-alpha.40 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/html": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preview-web": 7.1.0-alpha.40 "@types/node": ^16.0.0 magic-string: ^0.30.0 typescript: ~4.9.3 @@ -6391,11 +6391,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html-webpack5@workspace:frameworks/html-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/html": 7.1.0-alpha.39 - "@storybook/preset-html-webpack": 7.1.0-alpha.39 + "@storybook/html": 7.1.0-alpha.40 + "@storybook/preset-html-webpack": 7.1.0-alpha.40 "@types/node": ^16.0.0 typescript: ~4.9.3 peerDependencies: @@ -6405,15 +6405,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/html@7.1.0-alpha.39, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": +"@storybook/html@7.1.0-alpha.40, @storybook/html@workspace:*, @storybook/html@workspace:renderers/html": version: 0.0.0-use.local resolution: "@storybook/html@workspace:renderers/html" dependencies: - "@storybook/core-client": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/core-client": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 ts-dedent: ^2.0.0 typescript: ~4.9.3 peerDependencies: @@ -6421,15 +6421,15 @@ __metadata: languageName: unknown linkType: soft -"@storybook/instrumenter@7.1.0-alpha.39, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": +"@storybook/instrumenter@7.1.0-alpha.40, @storybook/instrumenter@workspace:*, @storybook/instrumenter@workspace:lib/instrumenter": version: 0.0.0-use.local resolution: "@storybook/instrumenter@workspace:lib/instrumenter" dependencies: - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 typescript: ~4.9.3 languageName: unknown linkType: soft @@ -6472,19 +6472,19 @@ __metadata: languageName: node linkType: hard -"@storybook/manager-api@7.1.0-alpha.39, @storybook/manager-api@workspace:*, @storybook/manager-api@workspace:lib/manager-api": +"@storybook/manager-api@7.1.0-alpha.40, @storybook/manager-api@workspace:*, @storybook/manager-api@workspace:lib/manager-api": version: 0.0.0-use.local resolution: "@storybook/manager-api@workspace:lib/manager-api" dependencies: "@jest/globals": ^29.3.1 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/router": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/router": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/lodash": ^4.14.167 "@types/qs": ^6 dequal: ^2.0.2 @@ -6503,23 +6503,23 @@ __metadata: languageName: unknown linkType: soft -"@storybook/manager@7.1.0-alpha.39, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager": +"@storybook/manager@7.1.0-alpha.40, @storybook/manager@workspace:*, @storybook/manager@workspace:ui/manager": version: 0.0.0-use.local resolution: "@storybook/manager@workspace:ui/manager" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/addons": 7.1.0-alpha.39 - "@storybook/api": 7.1.0-alpha.39 - "@storybook/channel-postmessage": 7.1.0-alpha.39 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/components": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/addons": 7.1.0-alpha.40 + "@storybook/api": 7.1.0-alpha.40 + "@storybook/channel-postmessage": 7.1.0-alpha.40 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/components": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/router": 7.1.0-alpha.39 - "@storybook/theming": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/router": 7.1.0-alpha.40 + "@storybook/theming": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@testing-library/react": ^11.2.2 "@types/semver": ^7.3.4 copy-to-clipboard: ^3.3.1 @@ -6569,13 +6569,13 @@ __metadata: "@babel/preset-typescript": ^7.21.0 "@babel/runtime": ^7.22.0 "@babel/types": ^7.22.0 - "@storybook/addon-actions": 7.1.0-alpha.39 - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/preset-react-webpack": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/react": 7.1.0-alpha.39 + "@storybook/addon-actions": 7.1.0-alpha.40 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/preset-react-webpack": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/react": 7.1.0-alpha.40 "@types/babel__core": ^7 "@types/babel__plugin-transform-runtime": ^7 "@types/babel__preset-env": ^7 @@ -6621,7 +6621,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/node-logger@7.1.0-alpha.39, @storybook/node-logger@workspace:*, @storybook/node-logger@workspace:lib/node-logger": +"@storybook/node-logger@7.1.0-alpha.40, @storybook/node-logger@workspace:*, @storybook/node-logger@workspace:lib/node-logger": version: 0.0.0-use.local resolution: "@storybook/node-logger@workspace:lib/node-logger" dependencies: @@ -6634,7 +6634,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/postinstall@7.1.0-alpha.39, @storybook/postinstall@workspace:*, @storybook/postinstall@workspace:lib/postinstall": +"@storybook/postinstall@7.1.0-alpha.40, @storybook/postinstall@workspace:*, @storybook/postinstall@workspace:lib/postinstall": version: 0.0.0-use.local resolution: "@storybook/postinstall@workspace:lib/postinstall" dependencies: @@ -6650,8 +6650,8 @@ __metadata: resolution: "@storybook/preact-vite@workspace:frameworks/preact-vite" dependencies: "@preact/preset-vite": ^2.0.0 - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/preact": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/preact": 7.1.0-alpha.40 "@types/node": ^16.0.0 typescript: ~4.9.3 vite: ^4.0.0 @@ -6665,10 +6665,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preact-webpack5@workspace:frameworks/preact-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preact": 7.1.0-alpha.39 - "@storybook/preset-preact-webpack": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preact": 7.1.0-alpha.40 + "@storybook/preset-preact-webpack": 7.1.0-alpha.40 "@types/node": ^16.0.0 preact: ^10.5.13 typescript: ~4.9.3 @@ -6680,14 +6680,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preact@7.1.0-alpha.39, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": +"@storybook/preact@7.1.0-alpha.40, @storybook/preact@workspace:*, @storybook/preact@workspace:renderers/preact": version: 0.0.0-use.local resolution: "@storybook/preact@workspace:renderers/preact" dependencies: - "@storybook/core-client": 7.1.0-alpha.39 + "@storybook/core-client": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 preact: ^10.5.13 ts-dedent: ^2.0.0 typescript: ~4.9.3 @@ -6701,9 +6701,9 @@ __metadata: resolution: "@storybook/preset-create-react-app@workspace:presets/create-react-app" dependencies: "@pmmmwh/react-refresh-webpack-plugin": ^0.5.1 - "@storybook/node-logger": 7.1.0-alpha.39 + "@storybook/node-logger": 7.1.0-alpha.40 "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/types": 7.1.0-alpha.40 "@types/babel__core": ^7.1.7 "@types/node": ^16.0.0 babel-plugin-react-docgen: ^4.1.0 @@ -6716,11 +6716,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-html-webpack@7.1.0-alpha.39, @storybook/preset-html-webpack@workspace:*, @storybook/preset-html-webpack@workspace:presets/html-webpack": +"@storybook/preset-html-webpack@7.1.0-alpha.40, @storybook/preset-html-webpack@workspace:*, @storybook/preset-html-webpack@workspace:presets/html-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-html-webpack@workspace:presets/html-webpack" dependencies: - "@storybook/core-webpack": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 "@types/node": ^16.0.0 html-loader: ^3.1.0 typescript: ~4.9.3 @@ -6730,13 +6730,13 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-preact-webpack@7.1.0-alpha.39, @storybook/preset-preact-webpack@workspace:*, @storybook/preset-preact-webpack@workspace:presets/preact-webpack": +"@storybook/preset-preact-webpack@7.1.0-alpha.40, @storybook/preset-preact-webpack@workspace:*, @storybook/preset-preact-webpack@workspace:presets/preact-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-preact-webpack@workspace:presets/preact-webpack" dependencies: "@babel/plugin-transform-react-jsx": ^7.21.0 "@babel/preset-typescript": ^7.21.0 - "@storybook/core-webpack": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 "@types/node": ^16.0.0 preact: ^10.5.13 typescript: ~4.9.3 @@ -6746,17 +6746,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-react-webpack@7.1.0-alpha.39, @storybook/preset-react-webpack@workspace:*, @storybook/preset-react-webpack@workspace:presets/react-webpack": +"@storybook/preset-react-webpack@7.1.0-alpha.40, @storybook/preset-react-webpack@workspace:*, @storybook/preset-react-webpack@workspace:presets/react-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-react-webpack@workspace:presets/react-webpack" dependencies: "@babel/preset-flow": ^7.21.0 "@babel/preset-react": ^7.22.0 "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5 - "@storybook/core-webpack": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/react": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/react": 7.1.0-alpha.40 "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0 "@types/node": ^16.0.0 "@types/semver": ^7.3.4 @@ -6779,14 +6779,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-server-webpack@7.1.0-alpha.39, @storybook/preset-server-webpack@workspace:*, @storybook/preset-server-webpack@workspace:presets/server-webpack": +"@storybook/preset-server-webpack@7.1.0-alpha.40, @storybook/preset-server-webpack@workspace:*, @storybook/preset-server-webpack@workspace:presets/server-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-server-webpack@workspace:presets/server-webpack" dependencies: - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/core-webpack": 7.1.0-alpha.39 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/core-webpack": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/server": 7.1.0-alpha.39 + "@storybook/server": 7.1.0-alpha.40 "@types/node": ^16.0.0 fs-extra: ^11.1.0 jest-specific-snapshot: ^8.0.0 @@ -6798,12 +6798,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-svelte-webpack@7.1.0-alpha.39, @storybook/preset-svelte-webpack@workspace:*, @storybook/preset-svelte-webpack@workspace:presets/svelte-webpack": +"@storybook/preset-svelte-webpack@7.1.0-alpha.40, @storybook/preset-svelte-webpack@workspace:*, @storybook/preset-svelte-webpack@workspace:presets/svelte-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-svelte-webpack@workspace:presets/svelte-webpack" dependencies: - "@storybook/core-webpack": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 svelte: ^3.31.2 svelte-loader: ^3.1.2 sveltedoc-parser: ^4.2.1 @@ -6816,12 +6816,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-vue-webpack@7.1.0-alpha.39, @storybook/preset-vue-webpack@workspace:*, @storybook/preset-vue-webpack@workspace:presets/vue-webpack": +"@storybook/preset-vue-webpack@7.1.0-alpha.40, @storybook/preset-vue-webpack@workspace:*, @storybook/preset-vue-webpack@workspace:presets/vue-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-vue-webpack@workspace:presets/vue-webpack" dependencies: - "@storybook/core-webpack": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@types/node": ^16.0.0 ts-loader: ^9.2.8 typescript: ~4.9.3 @@ -6841,12 +6841,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-vue3-webpack@7.1.0-alpha.39, @storybook/preset-vue3-webpack@workspace:*, @storybook/preset-vue3-webpack@workspace:presets/vue3-webpack": +"@storybook/preset-vue3-webpack@7.1.0-alpha.40, @storybook/preset-vue3-webpack@workspace:*, @storybook/preset-vue3-webpack@workspace:presets/vue3-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-vue3-webpack@workspace:presets/vue3-webpack" dependencies: - "@storybook/core-webpack": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@types/node": ^16.0.0 "@vue/compiler-sfc": ^3.2.33 ts-loader: ^9.2.8 @@ -6864,14 +6864,14 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preset-web-components-webpack@7.1.0-alpha.39, @storybook/preset-web-components-webpack@workspace:*, @storybook/preset-web-components-webpack@workspace:presets/web-components-webpack": +"@storybook/preset-web-components-webpack@7.1.0-alpha.40, @storybook/preset-web-components-webpack@workspace:*, @storybook/preset-web-components-webpack@workspace:presets/web-components-webpack": version: 0.0.0-use.local resolution: "@storybook/preset-web-components-webpack@workspace:presets/web-components-webpack" dependencies: "@babel/plugin-syntax-dynamic-import": ^7.8.3 "@babel/plugin-syntax-import-meta": ^7.10.4 "@babel/preset-env": ^7.22.0 - "@storybook/core-webpack": 7.1.0-alpha.39 + "@storybook/core-webpack": 7.1.0-alpha.40 "@types/node": ^16.0.0 babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0 babel-plugin-bundled-import-meta: ^0.3.1 @@ -6882,19 +6882,19 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-api@7.1.0-alpha.39, @storybook/preview-api@workspace:*, @storybook/preview-api@workspace:lib/preview-api": +"@storybook/preview-api@7.1.0-alpha.40, @storybook/preview-api@workspace:*, @storybook/preview-api@workspace:lib/preview-api": version: 0.0.0-use.local resolution: "@storybook/preview-api@workspace:lib/preview-api" dependencies: "@jest/globals": ^29.5.0 - "@storybook/channel-postmessage": 7.1.0-alpha.39 - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 + "@storybook/channel-postmessage": 7.1.0-alpha.40 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/types": 7.1.0-alpha.40 "@types/qs": ^6.9.5 ansi-to-html: ^0.6.11 dequal: ^2.0.2 @@ -6909,23 +6909,23 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-web@7.1.0-alpha.39, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:deprecated/preview-web": +"@storybook/preview-web@7.1.0-alpha.40, @storybook/preview-web@workspace:*, @storybook/preview-web@workspace:deprecated/preview-web": version: 0.0.0-use.local resolution: "@storybook/preview-web@workspace:deprecated/preview-web" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 languageName: unknown linkType: soft -"@storybook/preview@7.1.0-alpha.39, @storybook/preview@workspace:*, @storybook/preview@workspace:lib/preview": +"@storybook/preview@7.1.0-alpha.40, @storybook/preview@workspace:*, @storybook/preview@workspace:lib/preview": version: 0.0.0-use.local resolution: "@storybook/preview@workspace:lib/preview" dependencies: - "@storybook/channels": 7.1.0-alpha.39 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 typescript: ~4.9.3 languageName: unknown linkType: soft @@ -6948,11 +6948,11 @@ __metadata: languageName: node linkType: hard -"@storybook/react-dom-shim@7.1.0-alpha.39, @storybook/react-dom-shim@workspace:lib/react-dom-shim": +"@storybook/react-dom-shim@7.1.0-alpha.40, @storybook/react-dom-shim@workspace:lib/react-dom-shim": version: 0.0.0-use.local resolution: "@storybook/react-dom-shim@workspace:lib/react-dom-shim" dependencies: - "@storybook/types": 7.1.0-alpha.39 + "@storybook/types": 7.1.0-alpha.40 typescript: ~4.9.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -6966,8 +6966,8 @@ __metadata: dependencies: "@joshwooding/vite-plugin-react-docgen-typescript": 0.2.1 "@rollup/pluginutils": ^5.0.2 - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/react": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/react": 7.1.0-alpha.40 "@types/node": ^16.0.0 "@vitejs/plugin-react": ^3.0.1 ast-types: ^0.14.2 @@ -6986,9 +6986,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/react-webpack5@workspace:frameworks/react-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/preset-react-webpack": 7.1.0-alpha.39 - "@storybook/react": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/preset-react-webpack": 7.1.0-alpha.40 + "@storybook/react": 7.1.0-alpha.40 "@types/node": ^16.0.0 jest-specific-snapshot: ^8.0.0 typescript: ~4.9.3 @@ -7004,18 +7004,18 @@ __metadata: languageName: unknown linkType: soft -"@storybook/react@7.1.0-alpha.39, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": +"@storybook/react@7.1.0-alpha.40, @storybook/react@workspace:*, @storybook/react@workspace:renderers/react": version: 0.0.0-use.local resolution: "@storybook/react@workspace:renderers/react" dependencies: "@babel/core": ^7.22.0 - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-client": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-client": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/react-dom-shim": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/react-dom-shim": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/escodegen": ^0.0.6 "@types/estree": ^0.0.51 "@types/node": ^16.0.0 @@ -7235,11 +7235,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/router@7.1.0-alpha.39, @storybook/router@workspace:*, @storybook/router@workspace:lib/router": +"@storybook/router@7.1.0-alpha.40, @storybook/router@workspace:*, @storybook/router@workspace:lib/router": version: 0.0.0-use.local resolution: "@storybook/router@workspace:lib/router" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 dequal: ^2.0.2 lodash: ^4.17.21 @@ -7258,10 +7258,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/server-webpack5@workspace:frameworks/server-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preset-server-webpack": 7.1.0-alpha.39 - "@storybook/server": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preset-server-webpack": 7.1.0-alpha.40 + "@storybook/server": 7.1.0-alpha.40 "@types/node": ^16.0.0 typescript: ~4.9.3 peerDependencies: @@ -7270,16 +7270,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/server@7.1.0-alpha.39, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": +"@storybook/server@7.1.0-alpha.40, @storybook/server@workspace:*, @storybook/server@workspace:renderers/server": version: 0.0.0-use.local resolution: "@storybook/server@workspace:renderers/server" dependencies: - "@storybook/core-client": 7.1.0-alpha.39 + "@storybook/core-client": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 - "@storybook/csf-tools": 7.1.0-alpha.39 + "@storybook/csf-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/fs-extra": ^11.0.1 fs-extra: ^11.1.0 ts-dedent: ^2.0.0 @@ -7288,12 +7288,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/source-loader@7.1.0-alpha.39, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": +"@storybook/source-loader@7.1.0-alpha.40, @storybook/source-loader@workspace:*, @storybook/source-loader@workspace:lib/source-loader": version: 0.0.0-use.local resolution: "@storybook/source-loader@workspace:lib/source-loader" dependencies: "@storybook/csf": ^0.1.0 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/types": 7.1.0-alpha.40 estraverse: ^5.2.0 jest-specific-snapshot: ^8.0.0 lodash: ^4.17.21 @@ -7305,22 +7305,22 @@ __metadata: languageName: unknown linkType: soft -"@storybook/store@7.1.0-alpha.39, @storybook/store@workspace:*, @storybook/store@workspace:deprecated/store": +"@storybook/store@7.1.0-alpha.40, @storybook/store@workspace:*, @storybook/store@workspace:deprecated/store": version: 0.0.0-use.local resolution: "@storybook/store@workspace:deprecated/store" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 languageName: unknown linkType: soft -"@storybook/svelte-vite@7.1.0-alpha.39, @storybook/svelte-vite@workspace:frameworks/svelte-vite": +"@storybook/svelte-vite@7.1.0-alpha.40, @storybook/svelte-vite@workspace:frameworks/svelte-vite": version: 0.0.0-use.local resolution: "@storybook/svelte-vite@workspace:frameworks/svelte-vite" dependencies: - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/svelte": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/svelte": 7.1.0-alpha.40 "@sveltejs/vite-plugin-svelte": ^2.4.1 "@types/node": ^16.0.0 magic-string: ^0.30.0 @@ -7339,10 +7339,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/svelte-webpack5@workspace:frameworks/svelte-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preset-svelte-webpack": 7.1.0-alpha.39 - "@storybook/svelte": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preset-svelte-webpack": 7.1.0-alpha.40 + "@storybook/svelte": 7.1.0-alpha.40 svelte: ^3.48.0 svelte-loader: ^3.1.2 typescript: ~4.9.3 @@ -7355,17 +7355,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/svelte@7.1.0-alpha.39, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": +"@storybook/svelte@7.1.0-alpha.40, @storybook/svelte@workspace:*, @storybook/svelte@workspace:renderers/svelte": version: 0.0.0-use.local resolution: "@storybook/svelte@workspace:renderers/svelte" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-client": 7.1.0-alpha.39 - "@storybook/core-events": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-client": 7.1.0-alpha.40 + "@storybook/core-events": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 expect-type: ^0.15.0 svelte: ^4.0.0 svelte-check: ^3.4.3 @@ -7381,9 +7381,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/sveltekit@workspace:frameworks/sveltekit" dependencies: - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/svelte": 7.1.0-alpha.39 - "@storybook/svelte-vite": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/svelte": 7.1.0-alpha.40 + "@storybook/svelte-vite": 7.1.0-alpha.40 "@types/node": ^16.0.0 typescript: ^4.9.3 vite: ^4.0.0 @@ -7393,12 +7393,12 @@ __metadata: languageName: unknown linkType: soft -"@storybook/telemetry@7.1.0-alpha.39, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": +"@storybook/telemetry@7.1.0-alpha.40, @storybook/telemetry@workspace:*, @storybook/telemetry@workspace:lib/telemetry": version: 0.0.0-use.local resolution: "@storybook/telemetry@workspace:lib/telemetry" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 chalk: ^4.1.0 detect-package-manager: ^2.0.1 fetch-retry: ^5.0.2 @@ -7421,7 +7421,7 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@7.1.0-alpha.39, @storybook/theming@workspace:*, @storybook/theming@workspace:lib/theming": +"@storybook/theming@7.1.0-alpha.40, @storybook/theming@workspace:*, @storybook/theming@workspace:lib/theming": version: 0.0.0-use.local resolution: "@storybook/theming@workspace:lib/theming" dependencies: @@ -7430,7 +7430,7 @@ __metadata: "@emotion/react": ^11.10.4 "@emotion/styled": ^11.10.4 "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 - "@storybook/client-logger": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 "@types/fs-extra": ^11.0.1 "@types/node": ^16.0.0 @@ -7446,11 +7446,11 @@ __metadata: languageName: unknown linkType: soft -"@storybook/types@7.1.0-alpha.39, @storybook/types@workspace:*, @storybook/types@workspace:lib/types": +"@storybook/types@7.1.0-alpha.40, @storybook/types@workspace:*, @storybook/types@workspace:lib/types": version: 0.0.0-use.local resolution: "@storybook/types@workspace:lib/types" dependencies: - "@storybook/channels": 7.1.0-alpha.39 + "@storybook/channels": 7.1.0-alpha.40 "@storybook/csf": ^0.1.0 "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 @@ -7464,10 +7464,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue-vite@workspace:frameworks/vue-vite" dependencies: - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/vue": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/vue": 7.1.0-alpha.40 magic-string: ^0.30.0 typescript: ~4.9.3 vite: ^4.0.0 @@ -7485,10 +7485,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue-webpack5@workspace:frameworks/vue-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preset-vue-webpack": 7.1.0-alpha.39 - "@storybook/vue": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preset-vue-webpack": 7.1.0-alpha.40 + "@storybook/vue": 7.1.0-alpha.40 "@types/node": ^16.0.0 typescript: ~4.9.3 vue: ^2.6.12 @@ -7510,9 +7510,9 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue3-vite@workspace:frameworks/vue3-vite" dependencies: - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/vue3": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/vue3": 7.1.0-alpha.40 "@types/node": ^16.0.0 "@vitejs/plugin-vue": ^4.0.0 magic-string: ^0.30.0 @@ -7530,10 +7530,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/vue3-webpack5@workspace:frameworks/vue3-webpack5" dependencies: - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preset-vue3-webpack": 7.1.0-alpha.39 - "@storybook/vue3": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preset-vue3-webpack": 7.1.0-alpha.40 + "@storybook/vue3": 7.1.0-alpha.40 "@types/node": ^16.0.0 "@vue/compiler-sfc": 3.0.0 typescript: ~4.9.3 @@ -7548,16 +7548,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue3@7.1.0-alpha.39, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": +"@storybook/vue3@7.1.0-alpha.40, @storybook/vue3@workspace:*, @storybook/vue3@workspace:renderers/vue3": version: 0.0.0-use.local resolution: "@storybook/vue3@workspace:renderers/vue3" dependencies: "@digitak/esrun": ^3.2.2 - "@storybook/core-client": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/core-client": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/prettier": 2.7.2 "@vue/compiler-core": ^3.3.4 "@vue/vue3-jest": 29 @@ -7574,16 +7574,16 @@ __metadata: languageName: unknown linkType: soft -"@storybook/vue@7.1.0-alpha.39, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": +"@storybook/vue@7.1.0-alpha.40, @storybook/vue@workspace:*, @storybook/vue@workspace:renderers/vue": version: 0.0.0-use.local resolution: "@storybook/vue@workspace:renderers/vue" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-client": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-client": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 ts-dedent: ^2.0.0 type-fest: ^3.11.0 typescript: ~4.9.3 @@ -7604,10 +7604,10 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/web-components-vite@workspace:frameworks/web-components-vite" dependencies: - "@storybook/builder-vite": 7.1.0-alpha.39 - "@storybook/core-server": 7.1.0-alpha.39 - "@storybook/node-logger": 7.1.0-alpha.39 - "@storybook/web-components": 7.1.0-alpha.39 + "@storybook/builder-vite": 7.1.0-alpha.40 + "@storybook/core-server": 7.1.0-alpha.40 + "@storybook/node-logger": 7.1.0-alpha.40 + "@storybook/web-components": 7.1.0-alpha.40 "@types/node": ^16.0.0 magic-string: ^0.30.0 typescript: ~4.9.3 @@ -7622,10 +7622,10 @@ __metadata: resolution: "@storybook/web-components-webpack5@workspace:frameworks/web-components-webpack5" dependencies: "@babel/preset-env": ^7.22.0 - "@storybook/builder-webpack5": 7.1.0-alpha.39 - "@storybook/core-common": 7.1.0-alpha.39 - "@storybook/preset-web-components-webpack": 7.1.0-alpha.39 - "@storybook/web-components": 7.1.0-alpha.39 + "@storybook/builder-webpack5": 7.1.0-alpha.40 + "@storybook/core-common": 7.1.0-alpha.40 + "@storybook/preset-web-components-webpack": 7.1.0-alpha.40 + "@storybook/web-components": 7.1.0-alpha.40 "@types/node": ^16.0.0 lit: 2.3.1 typescript: ~4.9.3 @@ -7636,17 +7636,17 @@ __metadata: languageName: unknown linkType: soft -"@storybook/web-components@7.1.0-alpha.39, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": +"@storybook/web-components@7.1.0-alpha.40, @storybook/web-components@workspace:*, @storybook/web-components@workspace:renderers/web-components": version: 0.0.0-use.local resolution: "@storybook/web-components@workspace:renderers/web-components" dependencies: - "@storybook/client-logger": 7.1.0-alpha.39 - "@storybook/core-client": 7.1.0-alpha.39 - "@storybook/docs-tools": 7.1.0-alpha.39 + "@storybook/client-logger": 7.1.0-alpha.40 + "@storybook/core-client": 7.1.0-alpha.40 + "@storybook/docs-tools": 7.1.0-alpha.40 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.1.0-alpha.39 - "@storybook/preview-api": 7.1.0-alpha.39 - "@storybook/types": 7.1.0-alpha.39 + "@storybook/manager-api": 7.1.0-alpha.40 + "@storybook/preview-api": 7.1.0-alpha.40 + "@storybook/types": 7.1.0-alpha.40 "@types/cross-spawn": ^6.0.2 "@types/node": ^16.0.0 cross-spawn: ^7.0.3 @@ -27293,7 +27293,7 @@ __metadata: version: 0.0.0-use.local resolution: "sb@workspace:lib/cli-sb" dependencies: - "@storybook/cli": 7.1.0-alpha.39 + "@storybook/cli": 7.1.0-alpha.40 bin: sb: ./index.js languageName: unknown @@ -28235,7 +28235,7 @@ __metadata: version: 0.0.0-use.local resolution: "storybook@workspace:lib/cli-storybook" dependencies: - "@storybook/cli": 7.1.0-alpha.39 + "@storybook/cli": 7.1.0-alpha.40 bin: sb: ./index.js storybook: ./index.js