From 66e975da29c6ee0261a14cb20e4c88ecb97d43ff Mon Sep 17 00:00:00 2001 From: Matt Nigh Date: Fri, 24 May 2024 16:41:16 -0400 Subject: [PATCH 01/10] Upgrade tempy package --- code/lib/cli/package.json | 2 +- code/lib/core-common/package.json | 2 +- code/yarn.lock | 74 +++++++++++-------------------- scripts/package.json | 2 +- scripts/yarn.lock | 72 +++++++++++------------------- 5 files changed, 54 insertions(+), 98 deletions(-) diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index de2869dcce0f..3d6f30adb692 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -89,7 +89,7 @@ "read-pkg-up": "^7.0.1", "semver": "^7.3.7", "strip-json-comments": "^3.0.1", - "tempy": "^1.0.1", + "tempy": "^3.1.0", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0" }, diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index b4c2973ad245..17c65a457d7f 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -69,7 +69,7 @@ "pretty-hrtime": "^1.0.3", "resolve-from": "^5.0.0", "semver": "^7.3.7", - "tempy": "^1.0.1", + "tempy": "^3.1.0", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0", "util": "^0.12.4" diff --git a/code/yarn.lock b/code/yarn.lock index 90480fb20aa4..19c4b165484b 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5795,7 +5795,7 @@ __metadata: slash: "npm:^5.0.0" strip-ansi: "npm:^7.1.0" strip-json-comments: "npm:^3.1.1" - tempy: "npm:^1.0.1" + tempy: "npm:^3.1.0" tiny-invariant: "npm:^1.3.1" ts-dedent: "npm:^2.0.0" typescript: "npm:^5.3.2" @@ -5924,7 +5924,7 @@ __metadata: resolve-from: "npm:^5.0.0" semver: "npm:^7.3.7" slash: "npm:^5.0.0" - tempy: "npm:^1.0.1" + tempy: "npm:^3.1.0" tiny-invariant: "npm:^1.3.1" ts-dedent: "npm:^2.0.0" type-fest: "npm:~2.19" @@ -12645,10 +12645,12 @@ __metadata: languageName: node linkType: hard -"crypto-random-string@npm:^2.0.0": - version: 2.0.0 - resolution: "crypto-random-string@npm:2.0.0" - checksum: 10c0/288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37 +"crypto-random-string@npm:^4.0.0": + version: 4.0.0 + resolution: "crypto-random-string@npm:4.0.0" + dependencies: + type-fest: "npm:^1.0.1" + checksum: 10c0/16e11a3c8140398f5408b7fded35a961b9423c5dac39a60cbbd08bd3f0e07d7de130e87262adea7db03ec1a7a4b7551054e0db07ee5408b012bac5400cfc07a5 languageName: node linkType: hard @@ -13133,22 +13135,6 @@ __metadata: languageName: node linkType: hard -"del@npm:^6.0.0": - version: 6.1.1 - resolution: "del@npm:6.1.1" - dependencies: - globby: "npm:^11.0.1" - graceful-fs: "npm:^4.2.4" - is-glob: "npm:^4.0.1" - is-path-cwd: "npm:^2.2.0" - is-path-inside: "npm:^3.0.2" - p-map: "npm:^4.0.0" - rimraf: "npm:^3.0.2" - slash: "npm:^3.0.0" - checksum: 10c0/8a095c5ccade42c867a60252914ae485ec90da243d735d1f63ec1e64c1cfbc2b8810ad69a29ab6326d159d4fddaa2f5bad067808c42072351ec458efff86708f - languageName: node - linkType: hard - "delay@npm:^5.0.0": version: 5.0.0 resolution: "delay@npm:5.0.0" @@ -16378,7 +16364,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.1, globby@npm:^11.1.0": +"globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -17977,13 +17963,6 @@ __metadata: languageName: node linkType: hard -"is-path-cwd@npm:^2.2.0": - version: 2.2.0 - resolution: "is-path-cwd@npm:2.2.0" - checksum: 10c0/afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a - languageName: node - linkType: hard - "is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" @@ -27235,10 +27214,10 @@ __metadata: languageName: node linkType: hard -"temp-dir@npm:^2.0.0": - version: 2.0.0 - resolution: "temp-dir@npm:2.0.0" - checksum: 10c0/b1df969e3f3f7903f3426861887ed76ba3b495f63f6d0c8e1ce22588679d9384d336df6064210fda14e640ed422e2a17d5c40d901f60e161c99482d723f4d309 +"temp-dir@npm:^3.0.0": + version: 3.0.0 + resolution: "temp-dir@npm:3.0.0" + checksum: 10c0/a86978a400984cd5f315b77ebf3fe53bb58c61f192278cafcb1f3fb32d584a21dc8e08b93171d7874b7cc972234d3455c467306cc1bfc4524b622e5ad3bfd671 languageName: node linkType: hard @@ -27251,16 +27230,15 @@ __metadata: languageName: node linkType: hard -"tempy@npm:^1.0.1": - version: 1.0.1 - resolution: "tempy@npm:1.0.1" +"tempy@npm:^3.1.0": + version: 3.1.0 + resolution: "tempy@npm:3.1.0" dependencies: - del: "npm:^6.0.0" - is-stream: "npm:^2.0.0" - temp-dir: "npm:^2.0.0" - type-fest: "npm:^0.16.0" - unique-string: "npm:^2.0.0" - checksum: 10c0/864a1cf1b5536dc21e84ae45dbbc3ba4dd2c7ec1674d895f99c349cf209df959a53d797ca38d0b2cf69c7684d565fde5cfc67faaa63b7208ffb21d454b957472 + is-stream: "npm:^3.0.0" + temp-dir: "npm:^3.0.0" + type-fest: "npm:^2.12.2" + unique-string: "npm:^3.0.0" + checksum: 10c0/b88e70baa8d935ba8f0e0372b59ad1a961121f098da5fb4a6e05bec98ec32a49026b553532fb75c1c102ec782fd4c6a6bde0d46cbe87013fa324451ce476fb76 languageName: node linkType: hard @@ -28226,12 +28204,12 @@ __metadata: languageName: node linkType: hard -"unique-string@npm:^2.0.0": - version: 2.0.0 - resolution: "unique-string@npm:2.0.0" +"unique-string@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-string@npm:3.0.0" dependencies: - crypto-random-string: "npm:^2.0.0" - checksum: 10c0/11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b + crypto-random-string: "npm:^4.0.0" + checksum: 10c0/b35ea034b161b2a573666ec16c93076b4b6106b8b16c2415808d747ab3a0566b5db0c4be231d4b11cfbc16d7fd915c9d8a45884bff0e2db11b799775b2e1e017 languageName: node linkType: hard diff --git a/scripts/package.json b/scripts/package.json index 5c1d6ec3f774..1edef9f740a9 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -170,7 +170,7 @@ "simple-git": "^3.18.0", "slash": "^3.0.0", "sort-package-json": "^2.0.0", - "tempy": "^1.0.0", + "tempy": "^3.1.0", "tiny-invariant": "^1.3.1", "trash": "^7.0.0", "ts-dedent": "^2.0.0", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index 2c35285f4f8a..6d15fd0309cb 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -2820,7 +2820,7 @@ __metadata: simple-git: "npm:^3.18.0" slash: "npm:^3.0.0" sort-package-json: "npm:^2.0.0" - tempy: "npm:^1.0.0" + tempy: "npm:^3.1.0" tiny-invariant: "npm:^1.3.1" trash: "npm:^7.0.0" ts-dedent: "npm:^2.0.0" @@ -5662,10 +5662,12 @@ __metadata: languageName: node linkType: hard -"crypto-random-string@npm:^2.0.0": - version: 2.0.0 - resolution: "crypto-random-string@npm:2.0.0" - checksum: 10c0/288589b2484fe787f9e146f56c4be90b940018f17af1b152e4dde12309042ff5a2bf69e949aab8b8ac253948381529cc6f3e5a2427b73643a71ff177fa122b37 +"crypto-random-string@npm:^4.0.0": + version: 4.0.0 + resolution: "crypto-random-string@npm:4.0.0" + dependencies: + type-fest: "npm:^1.0.1" + checksum: 10c0/16e11a3c8140398f5408b7fded35a961b9423c5dac39a60cbbd08bd3f0e07d7de130e87262adea7db03ec1a7a4b7551054e0db07ee5408b012bac5400cfc07a5 languageName: node linkType: hard @@ -5990,22 +5992,6 @@ __metadata: languageName: node linkType: hard -"del@npm:^6.0.0": - version: 6.1.1 - resolution: "del@npm:6.1.1" - dependencies: - globby: "npm:^11.0.1" - graceful-fs: "npm:^4.2.4" - is-glob: "npm:^4.0.1" - is-path-cwd: "npm:^2.2.0" - is-path-inside: "npm:^3.0.2" - p-map: "npm:^4.0.0" - rimraf: "npm:^3.0.2" - slash: "npm:^3.0.0" - checksum: 10c0/8a095c5ccade42c867a60252914ae485ec90da243d735d1f63ec1e64c1cfbc2b8810ad69a29ab6326d159d4fddaa2f5bad067808c42072351ec458efff86708f - languageName: node - linkType: hard - "delay@npm:^5.0.0": version: 5.0.0 resolution: "delay@npm:5.0.0" @@ -8092,7 +8078,7 @@ __metadata: languageName: node linkType: hard -"globby@npm:^11.0.1, globby@npm:^11.0.3, globby@npm:^11.1.0": +"globby@npm:^11.0.3, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -9005,13 +8991,6 @@ __metadata: languageName: node linkType: hard -"is-path-cwd@npm:^2.2.0": - version: 2.2.0 - resolution: "is-path-cwd@npm:2.2.0" - checksum: 10c0/afce71533a427a759cd0329301c18950333d7589533c2c90205bd3fdcf7b91eb92d1940493190567a433134d2128ec9325de2fd281e05be1920fbee9edd22e0a - languageName: node - linkType: hard - "is-path-inside@npm:^3.0.2, is-path-inside@npm:^3.0.3": version: 3.0.3 resolution: "is-path-inside@npm:3.0.3" @@ -14516,23 +14495,22 @@ __metadata: languageName: node linkType: hard -"temp-dir@npm:^2.0.0": - version: 2.0.0 - resolution: "temp-dir@npm:2.0.0" - checksum: 10c0/b1df969e3f3f7903f3426861887ed76ba3b495f63f6d0c8e1ce22588679d9384d336df6064210fda14e640ed422e2a17d5c40d901f60e161c99482d723f4d309 +"temp-dir@npm:^3.0.0": + version: 3.0.0 + resolution: "temp-dir@npm:3.0.0" + checksum: 10c0/a86978a400984cd5f315b77ebf3fe53bb58c61f192278cafcb1f3fb32d584a21dc8e08b93171d7874b7cc972234d3455c467306cc1bfc4524b622e5ad3bfd671 languageName: node linkType: hard -"tempy@npm:^1.0.0": - version: 1.0.1 - resolution: "tempy@npm:1.0.1" +"tempy@npm:^3.1.0": + version: 3.1.0 + resolution: "tempy@npm:3.1.0" dependencies: - del: "npm:^6.0.0" - is-stream: "npm:^2.0.0" - temp-dir: "npm:^2.0.0" - type-fest: "npm:^0.16.0" - unique-string: "npm:^2.0.0" - checksum: 10c0/864a1cf1b5536dc21e84ae45dbbc3ba4dd2c7ec1674d895f99c349cf209df959a53d797ca38d0b2cf69c7684d565fde5cfc67faaa63b7208ffb21d454b957472 + is-stream: "npm:^3.0.0" + temp-dir: "npm:^3.0.0" + type-fest: "npm:^2.12.2" + unique-string: "npm:^3.0.0" + checksum: 10c0/b88e70baa8d935ba8f0e0372b59ad1a961121f098da5fb4a6e05bec98ec32a49026b553532fb75c1c102ec782fd4c6a6bde0d46cbe87013fa324451ce476fb76 languageName: node linkType: hard @@ -15226,12 +15204,12 @@ __metadata: languageName: node linkType: hard -"unique-string@npm:^2.0.0": - version: 2.0.0 - resolution: "unique-string@npm:2.0.0" +"unique-string@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-string@npm:3.0.0" dependencies: - crypto-random-string: "npm:^2.0.0" - checksum: 10c0/11820db0a4ba069d174bedfa96c588fc2c96b083066fafa186851e563951d0de78181ac79c744c1ed28b51f9d82ac5b8196ff3e4560d0178046ef455d8c2244b + crypto-random-string: "npm:^4.0.0" + checksum: 10c0/b35ea034b161b2a573666ec16c93076b4b6106b8b16c2415808d747ab3a0566b5db0c4be231d4b11cfbc16d7fd915c9d8a45884bff0e2db11b799775b2e1e017 languageName: node linkType: hard From 90062ea5f629932347b8e79c66418e1d3db93c85 Mon Sep 17 00:00:00 2001 From: Matt Nigh Date: Fri, 24 May 2024 16:41:52 -0400 Subject: [PATCH 02/10] Update tempy references --- code/lib/cli/src/automigrate/index.ts | 4 ++-- code/lib/cli/src/dirs.ts | 4 ++-- code/lib/cli/src/doctor/index.ts | 4 ++-- code/lib/core-common/src/utils/cli.ts | 4 ++-- scripts/combine-compodoc.ts | 4 ++-- scripts/sandbox/generate.ts | 4 ++-- scripts/sandbox/publish.ts | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/lib/cli/src/automigrate/index.ts b/code/lib/cli/src/automigrate/index.ts index 340a90f7ec38..fce12bbdaa16 100644 --- a/code/lib/cli/src/automigrate/index.ts +++ b/code/lib/cli/src/automigrate/index.ts @@ -2,7 +2,7 @@ import prompts from 'prompts'; import chalk from 'chalk'; import boxen from 'boxen'; import { createWriteStream, move, remove } from 'fs-extra'; -import tempy from 'tempy'; +import { temporaryFile } from 'tempy'; import { join } from 'path'; import invariant from 'tiny-invariant'; import semver from 'semver'; @@ -41,7 +41,7 @@ const originalStdOutWrite = process.stdout.write.bind(process.stdout); const originalStdErrWrite = process.stderr.write.bind(process.stdout); const augmentLogsToFile = () => { - TEMP_LOG_FILE_PATH = tempy.file({ name: LOG_FILE_NAME }); + TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); process.stdout.write = (d: string) => { diff --git a/code/lib/cli/src/dirs.ts b/code/lib/cli/src/dirs.ts index 1f41620b4ea6..bef3d80cc0f2 100644 --- a/code/lib/cli/src/dirs.ts +++ b/code/lib/cli/src/dirs.ts @@ -2,7 +2,7 @@ import { dirname, join } from 'path'; import downloadTarball from '@ndelangen/get-tarball'; import getNpmTarballUrl from 'get-npm-tarball-url'; -import * as tempy from 'tempy'; +import { temporaryDirectory } from 'tempy'; import invariant from 'tiny-invariant'; import { externalFrameworks } from './project_types'; @@ -16,7 +16,7 @@ export function getCliDir() { } const resolveUsingBranchInstall = async (packageManager: JsPackageManager, request: string) => { - const tempDirectory = tempy.directory(); + const tempDirectory = temporaryDirectory(); const name = request as keyof typeof versions; // FIXME: this might not be the right version for community packages diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/cli/src/doctor/index.ts index 2dfecaa96d17..5d44d3376c77 100644 --- a/code/lib/cli/src/doctor/index.ts +++ b/code/lib/cli/src/doctor/index.ts @@ -1,7 +1,7 @@ import chalk from 'chalk'; import boxen from 'boxen'; import { createWriteStream, move, remove } from 'fs-extra'; -import tempy from 'tempy'; +import { temporaryFile } from 'tempy'; import dedent from 'ts-dedent'; import { join } from 'path'; @@ -25,7 +25,7 @@ const originalStdOutWrite = process.stdout.write.bind(process.stdout); const originalStdErrWrite = process.stderr.write.bind(process.stdout); const augmentLogsToFile = () => { - TEMP_LOG_FILE_PATH = tempy.file({ name: LOG_FILE_NAME }); + TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); process.stdout.write = (d: string) => { diff --git a/code/lib/core-common/src/utils/cli.ts b/code/lib/core-common/src/utils/cli.ts index c4103bd59137..f23854e2c46f 100644 --- a/code/lib/core-common/src/utils/cli.ts +++ b/code/lib/core-common/src/utils/cli.ts @@ -1,7 +1,7 @@ import type { WriteStream } from 'fs-extra'; import { move, remove, writeFile, readFile, createWriteStream } from 'fs-extra'; import { join } from 'path'; -import tempy from 'tempy'; +import { temporaryFile } from 'tempy'; import { rendererPackages } from './get-storybook-info'; import type { JsPackageManager } from '../js-package-manager'; import versions from '../versions'; @@ -86,7 +86,7 @@ export const createLogStream = async ( logStream: WriteStream; }> => { const finalLogPath = join(process.cwd(), logFileName); - const temporaryLogPath = tempy.file({ name: logFileName }); + const temporaryLogPath = temporaryFile({ name: logFileName }); const logStream = createWriteStream(temporaryLogPath, { encoding: 'utf8' }); diff --git a/scripts/combine-compodoc.ts b/scripts/combine-compodoc.ts index c355cc242831..5c0ef5f41ed1 100755 --- a/scripts/combine-compodoc.ts +++ b/scripts/combine-compodoc.ts @@ -5,7 +5,7 @@ import { join, resolve } from 'path'; import { realpath, readFile, writeFile, lstat } from 'fs-extra'; import { globSync } from 'glob'; -import { directory } from 'tempy'; +import { temporaryDirectory } from 'tempy'; import { execaCommand } from 'execa'; import { esMain } from './utils/esmain'; @@ -36,7 +36,7 @@ async function run(cwd: string) { const docsArray: Record[] = await Promise.all( dirs.map(async (dir) => { - const outputDir = directory(); + const outputDir = temporaryDirectory(); const resolvedDir = await realpath(dir); await execaCommand( `yarn compodoc ${resolvedDir} -p ./tsconfig.json -e json -d ${outputDir}`, diff --git a/scripts/sandbox/generate.ts b/scripts/sandbox/generate.ts index 8f11b3a7a4db..7e2e623f952f 100755 --- a/scripts/sandbox/generate.ts +++ b/scripts/sandbox/generate.ts @@ -4,7 +4,7 @@ import pLimit from 'p-limit'; import prettyTime from 'pretty-hrtime'; import { copy, emptyDir, ensureDir, move, remove, rename, writeFile } from 'fs-extra'; import { program } from 'commander'; -import { directory } from 'tempy'; +import { temporaryDirectory } from 'tempy'; import { execaCommand } from 'execa'; import { esMain } from '../utils/esmain'; @@ -81,7 +81,7 @@ const addStorybook = async ({ const beforeDir = join(baseDir, BEFORE_DIR_NAME); const afterDir = join(baseDir, AFTER_DIR_NAME); - const tmpDir = directory(); + const tmpDir = temporaryDirectory(); try { await copy(beforeDir, tmpDir); diff --git a/scripts/sandbox/publish.ts b/scripts/sandbox/publish.ts index b973cfc10d86..49f6b606b064 100755 --- a/scripts/sandbox/publish.ts +++ b/scripts/sandbox/publish.ts @@ -1,7 +1,7 @@ import program from 'commander'; import { dirname, join, relative } from 'path'; import { existsSync } from 'fs'; -import * as tempy from 'tempy'; +import { temporaryDirectory } from 'tempy'; import { copy, emptyDir, remove, writeFile } from 'fs-extra'; import { execaCommand } from 'execa'; @@ -99,7 +99,7 @@ if (!existsSync(REPROS_DIRECTORY)) { throw Error("Couldn't find sandbox directory. Did you forget to run generate-sandboxes?"); } -const tmpFolder = tempy.directory(); +const tmpFolder = temporaryDirectory(); logger.log(`⏱ Created tmp folder: ${tmpFolder}`); const options = program.opts() as PublishOptions; From 915a13767fce1d56dcfd9c53881dbd980183d37e Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Sat, 25 May 2024 22:28:47 +0800 Subject: [PATCH 03/10] Switch to async imports for CJS/ESM compat --- code/lib/cli/src/automigrate/index.ts | 6 +++--- code/lib/cli/src/dirs.ts | 2 +- code/lib/cli/src/doctor/index.ts | 6 +++--- code/lib/core-common/src/utils/cli.ts | 2 +- scripts/combine-compodoc.ts | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/lib/cli/src/automigrate/index.ts b/code/lib/cli/src/automigrate/index.ts index fce12bbdaa16..c5353602dbaa 100644 --- a/code/lib/cli/src/automigrate/index.ts +++ b/code/lib/cli/src/automigrate/index.ts @@ -2,7 +2,6 @@ import prompts from 'prompts'; import chalk from 'chalk'; import boxen from 'boxen'; import { createWriteStream, move, remove } from 'fs-extra'; -import { temporaryFile } from 'tempy'; import { join } from 'path'; import invariant from 'tiny-invariant'; import semver from 'semver'; @@ -40,7 +39,8 @@ let TEMP_LOG_FILE_PATH = ''; const originalStdOutWrite = process.stdout.write.bind(process.stdout); const originalStdErrWrite = process.stderr.write.bind(process.stdout); -const augmentLogsToFile = () => { +const augmentLogsToFile = async () => { + const { temporaryFile } = await import('tempy'); TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); @@ -158,7 +158,7 @@ export const automigrate = async ({ return null; } - augmentLogsToFile(); + await augmentLogsToFile(); logger.info('πŸ”Ž checking possible migrations..'); diff --git a/code/lib/cli/src/dirs.ts b/code/lib/cli/src/dirs.ts index bef3d80cc0f2..7751e6c3a641 100644 --- a/code/lib/cli/src/dirs.ts +++ b/code/lib/cli/src/dirs.ts @@ -2,7 +2,6 @@ import { dirname, join } from 'path'; import downloadTarball from '@ndelangen/get-tarball'; import getNpmTarballUrl from 'get-npm-tarball-url'; -import { temporaryDirectory } from 'tempy'; import invariant from 'tiny-invariant'; import { externalFrameworks } from './project_types'; @@ -16,6 +15,7 @@ export function getCliDir() { } const resolveUsingBranchInstall = async (packageManager: JsPackageManager, request: string) => { + const { temporaryDirectory } = await import('tempy'); const tempDirectory = temporaryDirectory(); const name = request as keyof typeof versions; diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/cli/src/doctor/index.ts index 5d44d3376c77..22e47ce7d32c 100644 --- a/code/lib/cli/src/doctor/index.ts +++ b/code/lib/cli/src/doctor/index.ts @@ -1,7 +1,6 @@ import chalk from 'chalk'; import boxen from 'boxen'; import { createWriteStream, move, remove } from 'fs-extra'; -import { temporaryFile } from 'tempy'; import dedent from 'ts-dedent'; import { join } from 'path'; @@ -24,7 +23,8 @@ let TEMP_LOG_FILE_PATH = ''; const originalStdOutWrite = process.stdout.write.bind(process.stdout); const originalStdErrWrite = process.stderr.write.bind(process.stdout); -const augmentLogsToFile = () => { +const augmentLogsToFile = async () => { + const { temporaryFile } = await import('tempy'); TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); @@ -51,7 +51,7 @@ export const doctor = async ({ configDir: userSpecifiedConfigDir, packageManager: pkgMgr, }: DoctorOptions = {}) => { - augmentLogsToFile(); + await augmentLogsToFile(); let foundIssues = false; const logDiagnostic = (title: string, message: string) => { diff --git a/code/lib/core-common/src/utils/cli.ts b/code/lib/core-common/src/utils/cli.ts index f23854e2c46f..15b1c1ff0abc 100644 --- a/code/lib/core-common/src/utils/cli.ts +++ b/code/lib/core-common/src/utils/cli.ts @@ -1,7 +1,6 @@ import type { WriteStream } from 'fs-extra'; import { move, remove, writeFile, readFile, createWriteStream } from 'fs-extra'; import { join } from 'path'; -import { temporaryFile } from 'tempy'; import { rendererPackages } from './get-storybook-info'; import type { JsPackageManager } from '../js-package-manager'; import versions from '../versions'; @@ -86,6 +85,7 @@ export const createLogStream = async ( logStream: WriteStream; }> => { const finalLogPath = join(process.cwd(), logFileName); + const { temporaryFile } = await import('tempy'); const temporaryLogPath = temporaryFile({ name: logFileName }); const logStream = createWriteStream(temporaryLogPath, { encoding: 'utf8' }); diff --git a/scripts/combine-compodoc.ts b/scripts/combine-compodoc.ts index 5c0ef5f41ed1..718eb32f5361 100755 --- a/scripts/combine-compodoc.ts +++ b/scripts/combine-compodoc.ts @@ -5,7 +5,6 @@ import { join, resolve } from 'path'; import { realpath, readFile, writeFile, lstat } from 'fs-extra'; import { globSync } from 'glob'; -import { temporaryDirectory } from 'tempy'; import { execaCommand } from 'execa'; import { esMain } from './utils/esmain'; @@ -36,6 +35,7 @@ async function run(cwd: string) { const docsArray: Record[] = await Promise.all( dirs.map(async (dir) => { + const { temporaryDirectory } = await import('tempy'); const outputDir = temporaryDirectory(); const resolvedDir = await realpath(dir); await execaCommand( From 95edb31424e7dde7ecbba6162674cdce6213dd5c Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Tue, 28 May 2024 14:27:01 +0200 Subject: [PATCH 04/10] Build: Fix temporary @swc/core issue --- scripts/utils/yarn.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/utils/yarn.ts b/scripts/utils/yarn.ts index 90a6fb44b0df..fb7f8ecf5bc6 100644 --- a/scripts/utils/yarn.ts +++ b/scripts/utils/yarn.ts @@ -26,6 +26,7 @@ export const addPackageResolutions = async ({ cwd, dryRun }: YarnOptions) => { ...storybookVersions, 'enhanced-resolve': '~5.10.0', // TODO, remove this // this is for our CI test, ensure we use the same version as docker image, it should match version specified in `./code/package.json` and `.circleci/config.yml` + '@swc/core': '1.5.7', playwright: '1.36.0', 'playwright-core': '1.36.0', '@playwright/test': '1.36.0', From 1d304900ff38c3c4e023e182e5be032ffca49899 Mon Sep 17 00:00:00 2001 From: Michael Shilman Date: Wed, 29 May 2024 17:00:42 +0800 Subject: [PATCH 05/10] Fix generation script --- scripts/sandbox/generate.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sandbox/generate.ts b/scripts/sandbox/generate.ts index 7e2e623f952f..4d259b473e09 100755 --- a/scripts/sandbox/generate.ts +++ b/scripts/sandbox/generate.ts @@ -167,7 +167,7 @@ const runGenerators = async ( await emptyDir(baseDir); // We do the creation inside a temp dir to avoid yarn container problems - const createBaseDir = directory(); + const createBaseDir = temporaryDirectory(); if (!script.includes('pnp')) { await setupYarn({ cwd: createBaseDir }); } From dcf4a253eb8335eff13cbb05a16516517b83fd56 Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Wed, 29 May 2024 22:33:37 +0200 Subject: [PATCH 06/10] CSF-Tools: Fix export specifier bug --- code/lib/csf-tools/src/ConfigFile.test.ts | 13 ++++++++++++- code/lib/csf-tools/src/ConfigFile.ts | 9 +++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/lib/csf-tools/src/ConfigFile.test.ts b/code/lib/csf-tools/src/ConfigFile.test.ts index 4623b369b3cd..bc176b79825d 100644 --- a/code/lib/csf-tools/src/ConfigFile.test.ts +++ b/code/lib/csf-tools/src/ConfigFile.test.ts @@ -216,7 +216,7 @@ describe('ConfigFile', () => { ) ).toEqual([{ directory: '../src', titlePrefix: 'Demo' }]); }); - it('export specfier', () => { + it('export specifier', () => { expect( getField( ['foo'], @@ -227,6 +227,17 @@ describe('ConfigFile', () => { ) ).toEqual('bar'); }); + it('export aliased specifier', () => { + expect( + getField( + ['fooAlias'], + dedent` + const foo = 'bar'; + export { foo as fooAlias }; + ` + ) + ).toEqual('bar'); + }); }); }); diff --git a/code/lib/csf-tools/src/ConfigFile.ts b/code/lib/csf-tools/src/ConfigFile.ts index 9dfcacc889c5..9a7f68c08ef3 100644 --- a/code/lib/csf-tools/src/ConfigFile.ts +++ b/code/lib/csf-tools/src/ConfigFile.ts @@ -224,9 +224,14 @@ export class ConfigFile { } else if (node.specifiers) { // export { X }; node.specifiers.forEach((spec) => { - if (t.isExportSpecifier(spec) && t.isIdentifier(spec.exported)) { + if ( + t.isExportSpecifier(spec) && + t.isIdentifier(spec.local) && + t.isIdentifier(spec.exported) + ) { + const { name: localName } = spec.local; const { name: exportName } = spec.exported; - const decl = _findVarDeclarator(exportName, parent as t.Program) as any; + const decl = _findVarDeclarator(localName, parent as t.Program) as any; self._exports[exportName] = decl.init; self._exportDecls[exportName] = decl; } From ae1d4b203fcb680871e0442beb247577a866b2bf Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Wed, 29 May 2024 22:17:19 +0000 Subject: [PATCH 07/10] Write changelog for 8.2.0-alpha.4 [skip ci] --- CHANGELOG.prerelease.md | 8 ++++++++ code/package.json | 3 ++- docs/versions/next.json | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md index c989504cf696..8d60a9ad49f8 100644 --- a/CHANGELOG.prerelease.md +++ b/CHANGELOG.prerelease.md @@ -1,3 +1,11 @@ +## 8.2.0-alpha.4 + +- CSF-Tools: Fix export specifier bug - [#27418](https://github.com/storybookjs/storybook/pull/27418), thanks @valentinpalkovic! +- Dependency: Upgrade tempy - [#27366](https://github.com/storybookjs/storybook/pull/27366), thanks @mnigh! +- Tags: Refine composition behavior - [#27379](https://github.com/storybookjs/storybook/pull/27379), thanks @shilman! +- Theming: Fix self-referencing type - [#27155](https://github.com/storybookjs/storybook/pull/27155), thanks @SimenB! +- Vue3: Enable new hydration mismatch compile time flag - [#27192](https://github.com/storybookjs/storybook/pull/27192), thanks @Cherry! + ## 8.2.0-alpha.3 - Addon-A11y: Fix property default assignment - [#27224](https://github.com/storybookjs/storybook/pull/27224), thanks @valentinpalkovic! diff --git a/code/package.json b/code/package.json index cd913e8cd049..e525d887eaaf 100644 --- a/code/package.json +++ b/code/package.json @@ -298,5 +298,6 @@ "Dependency Upgrades" ] ] - } + }, + "deferredNextVersion": "8.2.0-alpha.4" } diff --git a/docs/versions/next.json b/docs/versions/next.json index 79e2866d8d0c..db3913715b30 100644 --- a/docs/versions/next.json +++ b/docs/versions/next.json @@ -1 +1 @@ -{"version":"8.2.0-alpha.3","info":{"plain":"- Addon-A11y: Fix property default assignment - [#27224](https://github.com/storybookjs/storybook/pull/27224), thanks @valentinpalkovic!\n- Angular: Revert style adjustments - [#27361](https://github.com/storybookjs/storybook/pull/27361), thanks @valentinpalkovic!\n- Angular: Support v18 - [#27237](https://github.com/storybookjs/storybook/pull/27237), thanks @valentinpalkovic!\n- Controls: Fix date picker control validation and assignment - [#26695](https://github.com/storybookjs/storybook/pull/26695), thanks @leeovictor!\n- Next.js: Avoid interfering with the svgr loader - [#27198](https://github.com/storybookjs/storybook/pull/27198), thanks @seanparmelee!\n- Svelte: Support latest prerelease - [#27378](https://github.com/storybookjs/storybook/pull/27378), thanks @valentinpalkovic!\n- Tags: Fix composition with older storybooks - [#27358](https://github.com/storybookjs/storybook/pull/27358), thanks @shilman!\n- Telemetry: Add test packages - [#27226](https://github.com/storybookjs/storybook/pull/27226), thanks @shilman!\n- Types: Fix type implementation for `CompatibleString` - [#27180](https://github.com/storybookjs/storybook/pull/27180), thanks @sni-J!\n- Vite: Fix HMR issue for Storybook preview files - [#27256](https://github.com/storybookjs/storybook/pull/27256), thanks @valentinpalkovic!\n- Vite: Fix asset warning by externalizing sb-common-assets font - [#27110](https://github.com/storybookjs/storybook/pull/27110), thanks @valentinpalkovic!\n- Webpack5/Vite: Fix sourcemaps - [#27171](https://github.com/storybookjs/storybook/pull/27171), thanks @valentinpalkovic!"}} +{"version":"8.2.0-alpha.4","info":{"plain":"- CSF-Tools: Fix export specifier bug - [#27418](https://github.com/storybookjs/storybook/pull/27418), thanks @valentinpalkovic!\n- Dependency: Upgrade tempy - [#27366](https://github.com/storybookjs/storybook/pull/27366), thanks @mnigh!\n- Tags: Refine composition behavior - [#27379](https://github.com/storybookjs/storybook/pull/27379), thanks @shilman!\n- Theming: Fix self-referencing type - [#27155](https://github.com/storybookjs/storybook/pull/27155), thanks @SimenB!\n- Vue3: Enable new hydration mismatch compile time flag - [#27192](https://github.com/storybookjs/storybook/pull/27192), thanks @Cherry!"}} From 80703e3118eb2862ddd7f6c0d27a4047722644b4 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Thu, 30 May 2024 02:57:50 +0000 Subject: [PATCH 08/10] Bump version from "8.2.0-alpha.3" to "8.2.0-alpha.4" [skip ci] --- code/addons/a11y/package.json | 2 +- code/addons/actions/package.json | 2 +- code/addons/backgrounds/package.json | 2 +- code/addons/controls/package.json | 2 +- code/addons/docs/package.json | 2 +- code/addons/essentials/package.json | 2 +- code/addons/gfm/package.json | 2 +- code/addons/highlight/package.json | 2 +- code/addons/interactions/package.json | 2 +- code/addons/jest/package.json | 2 +- code/addons/links/package.json | 2 +- code/addons/measure/package.json | 2 +- code/addons/onboarding/package.json | 2 +- code/addons/outline/package.json | 2 +- code/addons/storysource/package.json | 2 +- code/addons/themes/package.json | 2 +- code/addons/toolbars/package.json | 2 +- code/addons/viewport/package.json | 2 +- code/builders/builder-manager/package.json | 2 +- code/builders/builder-vite/package.json | 2 +- code/builders/builder-webpack5/package.json | 2 +- code/frameworks/angular/package.json | 2 +- code/frameworks/ember/package.json | 2 +- code/frameworks/html-vite/package.json | 2 +- code/frameworks/html-webpack5/package.json | 2 +- code/frameworks/nextjs/package.json | 2 +- code/frameworks/preact-vite/package.json | 2 +- code/frameworks/preact-webpack5/package.json | 2 +- code/frameworks/react-vite/package.json | 2 +- code/frameworks/react-webpack5/package.json | 2 +- code/frameworks/server-webpack5/package.json | 2 +- code/frameworks/svelte-vite/package.json | 2 +- code/frameworks/svelte-webpack5/package.json | 2 +- code/frameworks/sveltekit/package.json | 2 +- code/frameworks/vue3-vite/package.json | 2 +- code/frameworks/vue3-webpack5/package.json | 2 +- .../web-components-vite/package.json | 2 +- .../web-components-webpack5/package.json | 2 +- code/lib/channels/package.json | 2 +- code/lib/cli-sb/package.json | 2 +- code/lib/cli-storybook/package.json | 2 +- code/lib/cli/package.json | 2 +- code/lib/client-logger/package.json | 2 +- code/lib/codemod/package.json | 2 +- code/lib/core-common/package.json | 2 +- code/lib/core-common/src/versions.ts | 160 +++++++++--------- code/lib/core-events/package.json | 2 +- code/lib/core-server/package.json | 2 +- code/lib/core-webpack/package.json | 2 +- code/lib/csf-plugin/package.json | 2 +- code/lib/csf-tools/package.json | 2 +- code/lib/docs-tools/package.json | 2 +- code/lib/instrumenter/package.json | 2 +- code/lib/manager-api/package.json | 2 +- code/lib/manager-api/src/version.ts | 2 +- code/lib/node-logger/package.json | 2 +- code/lib/preview-api/package.json | 2 +- code/lib/preview/package.json | 2 +- code/lib/react-dom-shim/package.json | 2 +- code/lib/router/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/lib/telemetry/package.json | 2 +- code/lib/test/package.json | 2 +- code/lib/theming/package.json | 2 +- code/lib/types/package.json | 2 +- code/package.json | 5 +- code/presets/create-react-app/package.json | 2 +- code/presets/html-webpack/package.json | 2 +- code/presets/preact-webpack/package.json | 2 +- code/presets/react-webpack/package.json | 2 +- code/presets/server-webpack/package.json | 2 +- code/presets/svelte-webpack/package.json | 2 +- code/presets/vue3-webpack/package.json | 2 +- code/renderers/html/package.json | 2 +- code/renderers/preact/package.json | 2 +- code/renderers/react/package.json | 2 +- code/renderers/server/package.json | 2 +- code/renderers/svelte/package.json | 2 +- code/renderers/vue3/package.json | 2 +- code/renderers/web-components/package.json | 2 +- code/ui/blocks/package.json | 2 +- code/ui/components/package.json | 2 +- code/ui/manager/package.json | 2 +- 83 files changed, 163 insertions(+), 164 deletions(-) diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index 295a8e57d09b..b15dd2bf9e78 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Test component compliance with web accessibility standards", "keywords": [ "a11y", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index 8617b53011cd..7f9d45e0d416 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Get UI feedback when an action is performed on an interactive element", "keywords": [ "storybook", diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 2214b8a8af0a..4a1bace31b40 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Switch backgrounds to view components in different settings", "keywords": [ "addon", diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 8ce20219c4a6..b9faeb2622a1 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Interact with component inputs dynamically in the Storybook UI", "keywords": [ "addon", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index cb8e93daec39..54e2c405506a 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Document component usage and properties in Markdown", "keywords": [ "addon", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index 2dffa29177c3..fca4dbfa9143 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json index fff1a0a04a05..8f418d300b37 100644 --- a/code/addons/gfm/package.json +++ b/code/addons/gfm/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-mdx-gfm", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "GitHub Flavored Markdown in Storybook", "keywords": [ "addon", diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 29a5ec5b362c..7612605ee6c7 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-highlight", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Highlight DOM nodes within your stories", "keywords": [ "storybook-addons", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 2d86e4c5e6d8..8b14a180a2b5 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-interactions", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Automate, test and debug user interactions", "keywords": [ "storybook-addons", diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index b177e19a03b6..935b5299d9ac 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "React storybook addon that show component jest report", "keywords": [ "addon", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index 52657105ded6..3ddacf197051 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Link stories together to build demos and prototypes with your UI components", "keywords": [ "addon", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index 83e01dff62d0..776abed1e9d2 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-measure", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Inspect layouts by visualizing the box model", "keywords": [ "storybook-addons", diff --git a/code/addons/onboarding/package.json b/code/addons/onboarding/package.json index 151ca49948e5..5e9d174c92e6 100644 --- a/code/addons/onboarding/package.json +++ b/code/addons/onboarding/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-onboarding", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook Addon Onboarding - Introduces a new onboarding experience", "keywords": [ "storybook-addons", diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index cb03002f11ba..af57472763eb 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-outline", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Outline all elements with CSS to help with layout placement and alignment", "keywords": [ "storybook-addons", diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index 12e26dd63e0b..a468c5458d97 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "View a story’s source code to see how it works and paste into your app", "keywords": [ "addon", diff --git a/code/addons/themes/package.json b/code/addons/themes/package.json index f3537634cfd1..dd96d26744ad 100644 --- a/code/addons/themes/package.json +++ b/code/addons/themes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-themes", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Switch between multiple themes for you components in Storybook", "keywords": [ "css", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index 895eceffc682..b80a1770e47b 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Create your own toolbar items that control story rendering", "keywords": [ "addon", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index 1dc45c50eff6..ea8316a5f16a 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Build responsive components by adjusting Storybook’s viewport size and orientation", "keywords": [ "addon", diff --git a/code/builders/builder-manager/package.json b/code/builders/builder-manager/package.json index abf80252b643..23bcd42faea5 100644 --- a/code/builders/builder-manager/package.json +++ b/code/builders/builder-manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-manager", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook manager builder", "keywords": [ "storybook" diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json index c9f6af6fc645..bbbdb353d22d 100644 --- a/code/builders/builder-vite/package.json +++ b/code/builders/builder-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-vite", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "A plugin to run and build Storybooks with Vite", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme", "bugs": { diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json index ba0e7c7e5c55..3ce92d513ee5 100644 --- a/code/builders/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 47db1dce7522..58148a0a6408 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.", "keywords": [ "storybook", diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index 9e870ab848c2..bf4ae5082774 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember", "bugs": { diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index b38d408cbc3f..2d47c3d95c4c 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index 7be2feb391ca..4de3018a55d6 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index acceb89bce43..4afa718a92f3 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/nextjs", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Next.js", "keywords": [ "storybook", diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json index bfe6ee89e39b..d9cd3440e2bf 100644 --- a/code/frameworks/preact-vite/package.json +++ b/code/frameworks/preact-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-vite", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Preact and Vite: Develop Preact components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 116f02bf18f3..5c3fa9620283 100644 --- a/code/frameworks/preact-webpack5/package.json +++ b/code/frameworks/preact-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index c56da63d50b4..bba4df21f892 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-vite", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index dcefa457433c..1371a80f1ed2 100644 --- a/code/frameworks/react-webpack5/package.json +++ b/code/frameworks/react-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index b947a27e01da..5c0c7dcdbeb8 100644 --- a/code/frameworks/server-webpack5/package.json +++ b/code/frameworks/server-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 9a433e42bcef..c5b343d41f2e 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-vite", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index 4d4d75dff809..72182c02dad0 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index 8a1326d83bad..fe8dd54d0e99 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/sveltekit", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for SvelteKit", "keywords": [ "storybook", diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index 3d61778a7383..d2852b808c4c 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-vite", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index bdee747c7d08..c863ec5abc5a 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-webpack5", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json index c6b847b4738e..1b27ba53c18e 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index 4474de33ecea..ac72784f3d74 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit", diff --git a/code/lib/channels/package.json b/code/lib/channels/package.json index 9ae2a01e92d0..31121b09521b 100644 --- a/code/lib/channels/package.json +++ b/code/lib/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index 1ff30438cc75..ad14e36cb3fa 100644 --- a/code/lib/cli-sb/package.json +++ b/code/lib/cli-sb/package.json @@ -1,6 +1,6 @@ { "name": "sb", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook CLI", "keywords": [ "storybook" diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index bc7112cb9473..2c1ed222dded 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook CLI", "keywords": [ "storybook" diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 91d40ba7fb20..c25a7ca6a8dc 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook's CLI - install, dev, build, upgrade, and more", "keywords": [ "cli", diff --git a/code/lib/client-logger/package.json b/code/lib/client-logger/package.json index 415619210f77..d0b012a51fb7 100644 --- a/code/lib/client-logger/package.json +++ b/code/lib/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 402ce8dbabc0..bf3b1ef1a4ec 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" diff --git a/code/lib/core-common/package.json b/code/lib/core-common/package.json index a783e05165f1..26775ac49e2d 100644 --- a/code/lib/core-common/package.json +++ b/code/lib/core-common/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-common", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/lib/core-common/src/versions.ts b/code/lib/core-common/src/versions.ts index 884e70b9c0c2..5d2a3d9bba61 100644 --- a/code/lib/core-common/src/versions.ts +++ b/code/lib/core-common/src/versions.ts @@ -1,83 +1,83 @@ // auto generated file, do not edit export default { - '@storybook/addon-a11y': '8.2.0-alpha.3', - '@storybook/addon-actions': '8.2.0-alpha.3', - '@storybook/addon-backgrounds': '8.2.0-alpha.3', - '@storybook/addon-controls': '8.2.0-alpha.3', - '@storybook/addon-docs': '8.2.0-alpha.3', - '@storybook/addon-essentials': '8.2.0-alpha.3', - '@storybook/addon-highlight': '8.2.0-alpha.3', - '@storybook/addon-interactions': '8.2.0-alpha.3', - '@storybook/addon-jest': '8.2.0-alpha.3', - '@storybook/addon-links': '8.2.0-alpha.3', - '@storybook/addon-mdx-gfm': '8.2.0-alpha.3', - '@storybook/addon-measure': '8.2.0-alpha.3', - '@storybook/addon-onboarding': '8.2.0-alpha.3', - '@storybook/addon-outline': '8.2.0-alpha.3', - '@storybook/addon-storysource': '8.2.0-alpha.3', - '@storybook/addon-themes': '8.2.0-alpha.3', - '@storybook/addon-toolbars': '8.2.0-alpha.3', - '@storybook/addon-viewport': '8.2.0-alpha.3', - '@storybook/angular': '8.2.0-alpha.3', - '@storybook/blocks': '8.2.0-alpha.3', - '@storybook/builder-manager': '8.2.0-alpha.3', - '@storybook/builder-vite': '8.2.0-alpha.3', - '@storybook/builder-webpack5': '8.2.0-alpha.3', - '@storybook/channels': '8.2.0-alpha.3', - '@storybook/cli': '8.2.0-alpha.3', - '@storybook/client-logger': '8.2.0-alpha.3', - '@storybook/codemod': '8.2.0-alpha.3', - '@storybook/components': '8.2.0-alpha.3', - '@storybook/core-common': '8.2.0-alpha.3', - '@storybook/core-events': '8.2.0-alpha.3', - '@storybook/core-server': '8.2.0-alpha.3', - '@storybook/core-webpack': '8.2.0-alpha.3', - '@storybook/csf-plugin': '8.2.0-alpha.3', - '@storybook/csf-tools': '8.2.0-alpha.3', - '@storybook/docs-tools': '8.2.0-alpha.3', - '@storybook/ember': '8.2.0-alpha.3', - '@storybook/html': '8.2.0-alpha.3', - '@storybook/html-vite': '8.2.0-alpha.3', - '@storybook/html-webpack5': '8.2.0-alpha.3', - '@storybook/instrumenter': '8.2.0-alpha.3', - '@storybook/manager': '8.2.0-alpha.3', - '@storybook/manager-api': '8.2.0-alpha.3', - '@storybook/nextjs': '8.2.0-alpha.3', - '@storybook/node-logger': '8.2.0-alpha.3', - '@storybook/preact': '8.2.0-alpha.3', - '@storybook/preact-vite': '8.2.0-alpha.3', - '@storybook/preact-webpack5': '8.2.0-alpha.3', - '@storybook/preset-create-react-app': '8.2.0-alpha.3', - '@storybook/preset-html-webpack': '8.2.0-alpha.3', - '@storybook/preset-preact-webpack': '8.2.0-alpha.3', - '@storybook/preset-react-webpack': '8.2.0-alpha.3', - '@storybook/preset-server-webpack': '8.2.0-alpha.3', - '@storybook/preset-svelte-webpack': '8.2.0-alpha.3', - '@storybook/preset-vue3-webpack': '8.2.0-alpha.3', - '@storybook/preview': '8.2.0-alpha.3', - '@storybook/preview-api': '8.2.0-alpha.3', - '@storybook/react': '8.2.0-alpha.3', - '@storybook/react-dom-shim': '8.2.0-alpha.3', - '@storybook/react-vite': '8.2.0-alpha.3', - '@storybook/react-webpack5': '8.2.0-alpha.3', - '@storybook/router': '8.2.0-alpha.3', - '@storybook/server': '8.2.0-alpha.3', - '@storybook/server-webpack5': '8.2.0-alpha.3', - '@storybook/source-loader': '8.2.0-alpha.3', - '@storybook/svelte': '8.2.0-alpha.3', - '@storybook/svelte-vite': '8.2.0-alpha.3', - '@storybook/svelte-webpack5': '8.2.0-alpha.3', - '@storybook/sveltekit': '8.2.0-alpha.3', - '@storybook/telemetry': '8.2.0-alpha.3', - '@storybook/test': '8.2.0-alpha.3', - '@storybook/theming': '8.2.0-alpha.3', - '@storybook/types': '8.2.0-alpha.3', - '@storybook/vue3': '8.2.0-alpha.3', - '@storybook/vue3-vite': '8.2.0-alpha.3', - '@storybook/vue3-webpack5': '8.2.0-alpha.3', - '@storybook/web-components': '8.2.0-alpha.3', - '@storybook/web-components-vite': '8.2.0-alpha.3', - '@storybook/web-components-webpack5': '8.2.0-alpha.3', - sb: '8.2.0-alpha.3', - storybook: '8.2.0-alpha.3', + '@storybook/addon-a11y': '8.2.0-alpha.4', + '@storybook/addon-actions': '8.2.0-alpha.4', + '@storybook/addon-backgrounds': '8.2.0-alpha.4', + '@storybook/addon-controls': '8.2.0-alpha.4', + '@storybook/addon-docs': '8.2.0-alpha.4', + '@storybook/addon-essentials': '8.2.0-alpha.4', + '@storybook/addon-highlight': '8.2.0-alpha.4', + '@storybook/addon-interactions': '8.2.0-alpha.4', + '@storybook/addon-jest': '8.2.0-alpha.4', + '@storybook/addon-links': '8.2.0-alpha.4', + '@storybook/addon-mdx-gfm': '8.2.0-alpha.4', + '@storybook/addon-measure': '8.2.0-alpha.4', + '@storybook/addon-onboarding': '8.2.0-alpha.4', + '@storybook/addon-outline': '8.2.0-alpha.4', + '@storybook/addon-storysource': '8.2.0-alpha.4', + '@storybook/addon-themes': '8.2.0-alpha.4', + '@storybook/addon-toolbars': '8.2.0-alpha.4', + '@storybook/addon-viewport': '8.2.0-alpha.4', + '@storybook/angular': '8.2.0-alpha.4', + '@storybook/blocks': '8.2.0-alpha.4', + '@storybook/builder-manager': '8.2.0-alpha.4', + '@storybook/builder-vite': '8.2.0-alpha.4', + '@storybook/builder-webpack5': '8.2.0-alpha.4', + '@storybook/channels': '8.2.0-alpha.4', + '@storybook/cli': '8.2.0-alpha.4', + '@storybook/client-logger': '8.2.0-alpha.4', + '@storybook/codemod': '8.2.0-alpha.4', + '@storybook/components': '8.2.0-alpha.4', + '@storybook/core-common': '8.2.0-alpha.4', + '@storybook/core-events': '8.2.0-alpha.4', + '@storybook/core-server': '8.2.0-alpha.4', + '@storybook/core-webpack': '8.2.0-alpha.4', + '@storybook/csf-plugin': '8.2.0-alpha.4', + '@storybook/csf-tools': '8.2.0-alpha.4', + '@storybook/docs-tools': '8.2.0-alpha.4', + '@storybook/ember': '8.2.0-alpha.4', + '@storybook/html': '8.2.0-alpha.4', + '@storybook/html-vite': '8.2.0-alpha.4', + '@storybook/html-webpack5': '8.2.0-alpha.4', + '@storybook/instrumenter': '8.2.0-alpha.4', + '@storybook/manager': '8.2.0-alpha.4', + '@storybook/manager-api': '8.2.0-alpha.4', + '@storybook/nextjs': '8.2.0-alpha.4', + '@storybook/node-logger': '8.2.0-alpha.4', + '@storybook/preact': '8.2.0-alpha.4', + '@storybook/preact-vite': '8.2.0-alpha.4', + '@storybook/preact-webpack5': '8.2.0-alpha.4', + '@storybook/preset-create-react-app': '8.2.0-alpha.4', + '@storybook/preset-html-webpack': '8.2.0-alpha.4', + '@storybook/preset-preact-webpack': '8.2.0-alpha.4', + '@storybook/preset-react-webpack': '8.2.0-alpha.4', + '@storybook/preset-server-webpack': '8.2.0-alpha.4', + '@storybook/preset-svelte-webpack': '8.2.0-alpha.4', + '@storybook/preset-vue3-webpack': '8.2.0-alpha.4', + '@storybook/preview': '8.2.0-alpha.4', + '@storybook/preview-api': '8.2.0-alpha.4', + '@storybook/react': '8.2.0-alpha.4', + '@storybook/react-dom-shim': '8.2.0-alpha.4', + '@storybook/react-vite': '8.2.0-alpha.4', + '@storybook/react-webpack5': '8.2.0-alpha.4', + '@storybook/router': '8.2.0-alpha.4', + '@storybook/server': '8.2.0-alpha.4', + '@storybook/server-webpack5': '8.2.0-alpha.4', + '@storybook/source-loader': '8.2.0-alpha.4', + '@storybook/svelte': '8.2.0-alpha.4', + '@storybook/svelte-vite': '8.2.0-alpha.4', + '@storybook/svelte-webpack5': '8.2.0-alpha.4', + '@storybook/sveltekit': '8.2.0-alpha.4', + '@storybook/telemetry': '8.2.0-alpha.4', + '@storybook/test': '8.2.0-alpha.4', + '@storybook/theming': '8.2.0-alpha.4', + '@storybook/types': '8.2.0-alpha.4', + '@storybook/vue3': '8.2.0-alpha.4', + '@storybook/vue3-vite': '8.2.0-alpha.4', + '@storybook/vue3-webpack5': '8.2.0-alpha.4', + '@storybook/web-components': '8.2.0-alpha.4', + '@storybook/web-components-vite': '8.2.0-alpha.4', + '@storybook/web-components-webpack5': '8.2.0-alpha.4', + sb: '8.2.0-alpha.4', + storybook: '8.2.0-alpha.4', }; diff --git a/code/lib/core-events/package.json b/code/lib/core-events/package.json index de33cafa6f84..9e8d2f6d5b45 100644 --- a/code/lib/core-events/package.json +++ b/code/lib/core-events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-events", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "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 9013eef7a0a1..d506c19936e0 100644 --- a/code/lib/core-server/package.json +++ b/code/lib/core-server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-server", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index 31da30f3066d..c134bb905486 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-webpack", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json index 64e033abc90c..9368040f8d54 100644 --- a/code/lib/csf-plugin/package.json +++ b/code/lib/csf-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-plugin", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Enrich CSF files via static analysis", "keywords": [ "storybook" diff --git a/code/lib/csf-tools/package.json b/code/lib/csf-tools/package.json index f0619ec7ae75..2ccbde2880f3 100644 --- a/code/lib/csf-tools/package.json +++ b/code/lib/csf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-tools", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Parse and manipulate CSF and Storybook config files", "keywords": [ "storybook" diff --git a/code/lib/docs-tools/package.json b/code/lib/docs-tools/package.json index adfd368dddd7..37e30e6a74ad 100644 --- a/code/lib/docs-tools/package.json +++ b/code/lib/docs-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/docs-tools", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Shared utility functions for frameworks to implement docs", "keywords": [ "storybook" diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index 782b5d8c8688..62af672162b5 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/instrumenter", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/manager-api/package.json b/code/lib/manager-api/package.json index 7e395962306f..5619ef151d4a 100644 --- a/code/lib/manager-api/package.json +++ b/code/lib/manager-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager-api", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Core Storybook Manager API & Context", "keywords": [ "storybook" diff --git a/code/lib/manager-api/src/version.ts b/code/lib/manager-api/src/version.ts index dfc33c8e0970..8ab17d7c8375 100644 --- a/code/lib/manager-api/src/version.ts +++ b/code/lib/manager-api/src/version.ts @@ -1 +1 @@ -export const version = '8.2.0-alpha.3'; +export const version = '8.2.0-alpha.4'; diff --git a/code/lib/node-logger/package.json b/code/lib/node-logger/package.json index 96f4459e3336..b320046d41ee 100644 --- a/code/lib/node-logger/package.json +++ b/code/lib/node-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/node-logger", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/preview-api/package.json b/code/lib/preview-api/package.json index 3a4b26076261..ad261f18449f 100644 --- a/code/lib/preview-api/package.json +++ b/code/lib/preview-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-api", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/preview/package.json b/code/lib/preview/package.json index c8e85822e612..6cce88450189 100644 --- a/code/lib/preview/package.json +++ b/code/lib/preview/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json index 63008a9eb43c..0759033cebf1 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/router/package.json b/code/lib/router/package.json index 0db8c8433aed..d21f4907b1ef 100644 --- a/code/lib/router/package.json +++ b/code/lib/router/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/router", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Core Storybook Router", "keywords": [ "storybook" diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index c485feae491c..27d3b1cc4e86 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/source-loader", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Source loader", "keywords": [ "lib", diff --git a/code/lib/telemetry/package.json b/code/lib/telemetry/package.json index d4a1b7fff719..11726b4a6c79 100644 --- a/code/lib/telemetry/package.json +++ b/code/lib/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/telemetry", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Telemetry logging for crash reports and usage statistics", "keywords": [ "storybook" diff --git a/code/lib/test/package.json b/code/lib/test/package.json index 136b105f73c3..1c16576fc57c 100644 --- a/code/lib/test/package.json +++ b/code/lib/test/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/test", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "", "keywords": [ "storybook" diff --git a/code/lib/theming/package.json b/code/lib/theming/package.json index b106b7b7e664..ce159fe64c9e 100644 --- a/code/lib/theming/package.json +++ b/code/lib/theming/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/theming", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Core Storybook Components", "keywords": [ "storybook" diff --git a/code/lib/types/package.json b/code/lib/types/package.json index f5eefcd66dfa..9b0518edc421 100644 --- a/code/lib/types/package.json +++ b/code/lib/types/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/types", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Core Storybook TS Types", "keywords": [ "storybook" diff --git a/code/package.json b/code/package.json index e525d887eaaf..35a743ec402b 100644 --- a/code/package.json +++ b/code/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/root", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "private": true, "description": "Storybook root", "homepage": "https://storybook.js.org/", @@ -298,6 +298,5 @@ "Dependency Upgrades" ] ] - }, - "deferredNextVersion": "8.2.0-alpha.4" + } } diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json index fa2658b6429d..d372fbf0e821 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Create React App preset", "keywords": [ "storybook" diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index 75dda6f0e0a3..5ad049ad2fe3 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index 9e272dd34f5f..5f30ac8e5838 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index 23489578e407..ac7cc65ffc68 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading", "keywords": [ "storybook" diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index 42e5e79ce268..3fb7ab7672c8 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index 60d8a17f8bcc..c8ae45f2e118 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index 4eb82a644f27..e43a233bd7ba 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": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index ee0700bd80a0..2ee16b0747e2 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook HTML renderer", "keywords": [ "storybook" diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 557e8aab2d89..e1718653fd69 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook Preact renderer", "keywords": [ "storybook" diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 7830ae15676a..f2e39984bb0f 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook React renderer", "keywords": [ "storybook" diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index 58aa2a2a3f29..5aa4f9edb4ac 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook Server renderer", "keywords": [ "storybook" diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 97c969a83fe9..4386945454e0 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook Svelte renderer", "keywords": [ "storybook" diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index dc184db9007c..a555164328cf 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook Vue 3 renderer", "keywords": [ "storybook" diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index c341e51067e4..2568747436f3 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook web-components renderer", "keywords": [ "lit", diff --git a/code/ui/blocks/package.json b/code/ui/blocks/package.json index efc4c73e1118..c38b9fac880c 100644 --- a/code/ui/blocks/package.json +++ b/code/ui/blocks/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/blocks", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Storybook Doc Blocks", "keywords": [ "storybook" diff --git a/code/ui/components/package.json b/code/ui/components/package.json index 74b474bbed57..d258f13d7a2f 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Core Storybook Components", "keywords": [ "storybook" diff --git a/code/ui/manager/package.json b/code/ui/manager/package.json index f2e66961251b..55aacc654197 100644 --- a/code/ui/manager/package.json +++ b/code/ui/manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager", - "version": "8.2.0-alpha.3", + "version": "8.2.0-alpha.4", "description": "Core Storybook UI", "keywords": [ "storybook" From 331f4256c35e5afeb3a45bc5786addab71252822 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Thu, 30 May 2024 04:22:18 +0000 Subject: [PATCH 09/10] Update CHANGELOG.md for v8.1.5 [skip ci] --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f44e6e3dfdf0..3ad9cb833c1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 8.1.5 + +- CSF-Tools: Fix export specifier bug - [#27418](https://github.com/storybookjs/storybook/pull/27418), thanks @valentinpalkovic! +- Dependency: Upgrade tempy - [#27366](https://github.com/storybookjs/storybook/pull/27366), thanks @mnigh! +- Tags: Refine composition behavior - [#27379](https://github.com/storybookjs/storybook/pull/27379), thanks @shilman! +- Theming: Fix self-referencing type - [#27155](https://github.com/storybookjs/storybook/pull/27155), thanks @SimenB! + ## 8.1.4 - Angular: Revert style adjustments - [#27361](https://github.com/storybookjs/storybook/pull/27361), thanks @valentinpalkovic! From ea787d700a91c83c60c198220b4a8d1d0a81b754 Mon Sep 17 00:00:00 2001 From: Kyle Gach Date: Thu, 30 May 2024 13:04:30 -0600 Subject: [PATCH 10/10] Use absolute imports in module mocking snippets --- docs/snippets/angular/before-each-in-meta-mock-date.ts.mdx | 2 +- docs/snippets/angular/storybook-test-fn-mock-spy.ts.mdx | 4 ++-- docs/snippets/angular/storybook-test-mock-return-value.ts.mdx | 2 +- docs/snippets/common/before-each-in-meta-mock-date.js.mdx | 2 +- docs/snippets/common/before-each-in-meta-mock-date.ts-4-9.mdx | 2 +- docs/snippets/common/before-each-in-meta-mock-date.ts.mdx | 2 +- docs/snippets/common/storybook-test-fn-mock-spy.js.mdx | 4 ++-- docs/snippets/common/storybook-test-fn-mock-spy.ts-4-9.mdx | 4 ++-- docs/snippets/common/storybook-test-fn-mock-spy.ts.mdx | 4 ++-- docs/snippets/common/storybook-test-mock-return-value.js.mdx | 2 +- .../common/storybook-test-mock-return-value.ts-4-9.mdx | 2 +- docs/snippets/common/storybook-test-mock-return-value.ts.mdx | 2 +- .../web-components/before-each-in-meta-mock-date.ts.mdx | 2 +- .../snippets/web-components/storybook-test-fn-mock-spy.js.mdx | 4 ++-- .../snippets/web-components/storybook-test-fn-mock-spy.ts.mdx | 4 ++-- .../web-components/storybook-test-mock-return-value.js.mdx | 2 +- .../web-components/storybook-test-mock-return-value.ts.mdx | 2 +- 17 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/snippets/angular/before-each-in-meta-mock-date.ts.mdx b/docs/snippets/angular/before-each-in-meta-mock-date.ts.mdx index 8168708e3825..1d2cf99e0127 100644 --- a/docs/snippets/angular/before-each-in-meta-mock-date.ts.mdx +++ b/docs/snippets/angular/before-each-in-meta-mock-date.ts.mdx @@ -4,7 +4,7 @@ import type { Meta, StoryObj } from '@storybook/angular'; import MockDate from 'mockdate'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; const meta: Meta = { diff --git a/docs/snippets/angular/storybook-test-fn-mock-spy.ts.mdx b/docs/snippets/angular/storybook-test-fn-mock-spy.ts.mdx index 2108d5f64f1b..e23845a4be7a 100644 --- a/docs/snippets/angular/storybook-test-fn-mock-spy.ts.mdx +++ b/docs/snippets/angular/storybook-test-fn-mock-spy.ts.mdx @@ -4,8 +4,8 @@ import type { Meta, StoryObj } from '@storybook/angular'; import { expect, userEvent, within } from '@storybook/test'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { saveNote } from '../../app/actions.mock'; -import { createNotes } from '../../mocks/notes'; +import { saveNote } from '#app/actions.mock'; +import { createNotes } from '#mocks/notes'; import NoteUI from './note-ui'; const meta: Meta = { diff --git a/docs/snippets/angular/storybook-test-mock-return-value.ts.mdx b/docs/snippets/angular/storybook-test-mock-return-value.ts.mdx index f86630d0fe85..9c5c5982efe4 100644 --- a/docs/snippets/angular/storybook-test-mock-return-value.ts.mdx +++ b/docs/snippets/angular/storybook-test-mock-return-value.ts.mdx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/angular'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; const meta: Meta = { diff --git a/docs/snippets/common/before-each-in-meta-mock-date.js.mdx b/docs/snippets/common/before-each-in-meta-mock-date.js.mdx index 88358f60cbac..b39e8d8120b0 100644 --- a/docs/snippets/common/before-each-in-meta-mock-date.js.mdx +++ b/docs/snippets/common/before-each-in-meta-mock-date.js.mdx @@ -2,7 +2,7 @@ // Page.stories.js import MockDate from 'mockdate'; -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; export default { diff --git a/docs/snippets/common/before-each-in-meta-mock-date.ts-4-9.mdx b/docs/snippets/common/before-each-in-meta-mock-date.ts-4-9.mdx index 32aa8c4dfe70..4a26f603d1ed 100644 --- a/docs/snippets/common/before-each-in-meta-mock-date.ts-4-9.mdx +++ b/docs/snippets/common/before-each-in-meta-mock-date.ts-4-9.mdx @@ -5,7 +5,7 @@ import type { Meta, StoryObj } from '@storybook/your-renderer'; import MockDate from 'mockdate'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; const meta = { diff --git a/docs/snippets/common/before-each-in-meta-mock-date.ts.mdx b/docs/snippets/common/before-each-in-meta-mock-date.ts.mdx index cc15ba1b6251..89c3ca1717da 100644 --- a/docs/snippets/common/before-each-in-meta-mock-date.ts.mdx +++ b/docs/snippets/common/before-each-in-meta-mock-date.ts.mdx @@ -5,7 +5,7 @@ import type { Meta, StoryObj } from '@storybook/your-renderer'; import MockDate from 'mockdate'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; const meta: Meta = { diff --git a/docs/snippets/common/storybook-test-fn-mock-spy.js.mdx b/docs/snippets/common/storybook-test-fn-mock-spy.js.mdx index b647d7f747f2..e9d26c1b36c4 100644 --- a/docs/snippets/common/storybook-test-fn-mock-spy.js.mdx +++ b/docs/snippets/common/storybook-test-fn-mock-spy.js.mdx @@ -2,8 +2,8 @@ // NoteUI.stories.js import { expect, userEvent, within } from '@storybook/test'; -import { saveNote } from '../../app/actions.mock'; -import { createNotes } from '../../mocks/notes'; +import { saveNote } from '#app/actions.mock'; +import { createNotes } from '#mocks/notes'; import NoteUI from './note-ui'; export default { diff --git a/docs/snippets/common/storybook-test-fn-mock-spy.ts-4-9.mdx b/docs/snippets/common/storybook-test-fn-mock-spy.ts-4-9.mdx index ebfeb6f4e41b..a081b0f00883 100644 --- a/docs/snippets/common/storybook-test-fn-mock-spy.ts-4-9.mdx +++ b/docs/snippets/common/storybook-test-fn-mock-spy.ts-4-9.mdx @@ -5,8 +5,8 @@ import type { Meta, StoryObj } from '@storybook/your-renderer'; import { expect, userEvent, within } from '@storybook/test'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { saveNote } from '../../app/actions.mock'; -import { createNotes } from '../../mocks/notes'; +import { saveNote } from '#app/actions.mock'; +import { createNotes } from '#mocks/notes'; import NoteUI from './note-ui'; const meta = { diff --git a/docs/snippets/common/storybook-test-fn-mock-spy.ts.mdx b/docs/snippets/common/storybook-test-fn-mock-spy.ts.mdx index 0b350296f3e6..3e2418789d6c 100644 --- a/docs/snippets/common/storybook-test-fn-mock-spy.ts.mdx +++ b/docs/snippets/common/storybook-test-fn-mock-spy.ts.mdx @@ -5,8 +5,8 @@ import type { Meta, StoryObj } from '@storybook/your-renderer'; import { expect, userEvent, within } from '@storybook/test'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { saveNote } from '../../app/actions.mock'; -import { createNotes } from '../../mocks/notes'; +import { saveNote } from '#app/actions.mock'; +import { createNotes } from '#mocks/notes'; import NoteUI from './note-ui'; const meta: Meta = { diff --git a/docs/snippets/common/storybook-test-mock-return-value.js.mdx b/docs/snippets/common/storybook-test-mock-return-value.js.mdx index cad1a2854f2f..40359fae8522 100644 --- a/docs/snippets/common/storybook-test-mock-return-value.js.mdx +++ b/docs/snippets/common/storybook-test-mock-return-value.js.mdx @@ -1,6 +1,6 @@ ```js // Page.stories.js -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; export default { diff --git a/docs/snippets/common/storybook-test-mock-return-value.ts-4-9.mdx b/docs/snippets/common/storybook-test-mock-return-value.ts-4-9.mdx index 6044c33ddb99..8db3429a8bfa 100644 --- a/docs/snippets/common/storybook-test-mock-return-value.ts-4-9.mdx +++ b/docs/snippets/common/storybook-test-mock-return-value.ts-4-9.mdx @@ -4,7 +4,7 @@ import type { Meta, StoryObj } from '@storybook/your-renderer'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; const meta = { diff --git a/docs/snippets/common/storybook-test-mock-return-value.ts.mdx b/docs/snippets/common/storybook-test-mock-return-value.ts.mdx index 549751464b22..bf7c4164992b 100644 --- a/docs/snippets/common/storybook-test-mock-return-value.ts.mdx +++ b/docs/snippets/common/storybook-test-mock-return-value.ts.mdx @@ -4,7 +4,7 @@ import type { Meta, StoryObj } from '@storybook/your-renderer'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; import { Page } from './Page'; const meta: Meta = { diff --git a/docs/snippets/web-components/before-each-in-meta-mock-date.ts.mdx b/docs/snippets/web-components/before-each-in-meta-mock-date.ts.mdx index 3e1c4911e348..166b29c6028e 100644 --- a/docs/snippets/web-components/before-each-in-meta-mock-date.ts.mdx +++ b/docs/snippets/web-components/before-each-in-meta-mock-date.ts.mdx @@ -4,7 +4,7 @@ import type { Meta, StoryObj } from '@storybook/web-components'; import MockDate from 'mockdate'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; const meta: Meta = { component: 'my-page', diff --git a/docs/snippets/web-components/storybook-test-fn-mock-spy.js.mdx b/docs/snippets/web-components/storybook-test-fn-mock-spy.js.mdx index b89c145a5114..c93f3ba6b3ef 100644 --- a/docs/snippets/web-components/storybook-test-fn-mock-spy.js.mdx +++ b/docs/snippets/web-components/storybook-test-fn-mock-spy.js.mdx @@ -2,8 +2,8 @@ // NoteUI.stories.js import { expect, userEvent, within } from '@storybook/test'; -import { saveNote } from '../../app/actions.mock'; -import { createNotes } from '../../mocks/notes'; +import { saveNote } from '#app/actions.mock'; +import { createNotes } from '#mocks/notes'; export default { title: 'Mocked/NoteUI', diff --git a/docs/snippets/web-components/storybook-test-fn-mock-spy.ts.mdx b/docs/snippets/web-components/storybook-test-fn-mock-spy.ts.mdx index 9a94601ec81d..dfb83b7f8f07 100644 --- a/docs/snippets/web-components/storybook-test-fn-mock-spy.ts.mdx +++ b/docs/snippets/web-components/storybook-test-fn-mock-spy.ts.mdx @@ -4,8 +4,8 @@ import type { Meta, StoryObj } from '@storybook/react'; import { expect, userEvent, within } from '@storybook/test'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { saveNote } from '../../app/actions.mock'; -import { createNotes } from '../../mocks/notes'; +import { saveNote } from '#app/actions.mock'; +import { createNotes } from '#mocks/notes'; const meta: Meta = { title: 'Mocked/NoteUI', diff --git a/docs/snippets/web-components/storybook-test-mock-return-value.js.mdx b/docs/snippets/web-components/storybook-test-mock-return-value.js.mdx index 9f89343855b3..04c8c9858980 100644 --- a/docs/snippets/web-components/storybook-test-mock-return-value.js.mdx +++ b/docs/snippets/web-components/storybook-test-mock-return-value.js.mdx @@ -1,6 +1,6 @@ ```js // Page.stories.js -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; export default { component: 'my-page', diff --git a/docs/snippets/web-components/storybook-test-mock-return-value.ts.mdx b/docs/snippets/web-components/storybook-test-mock-return-value.ts.mdx index 54ffafc25108..053eb05ec8c6 100644 --- a/docs/snippets/web-components/storybook-test-mock-return-value.ts.mdx +++ b/docs/snippets/web-components/storybook-test-mock-return-value.ts.mdx @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/web-components'; // πŸ‘‡ Must include the `.mock` portion of filename to have mocks typed correctly -import { getUserFromSession } from '../../api/session.mock'; +import { getUserFromSession } from '#api/session.mock'; const meta: Meta = { component: 'my-page',