diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 64ef0a6ef55b..a975f383fb57 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/cli/src/automigrate/index.ts b/code/lib/cli/src/automigrate/index.ts index 340a90f7ec38..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 tempy from 'tempy'; import { join } from 'path'; import invariant from 'tiny-invariant'; import semver from 'semver'; @@ -40,8 +39,9 @@ let TEMP_LOG_FILE_PATH = ''; 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 }); +const augmentLogsToFile = async () => { + const { temporaryFile } = await import('tempy'); + TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); process.stdout.write = (d: string) => { @@ -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 1f41620b4ea6..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 * as tempy from 'tempy'; import invariant from 'tiny-invariant'; import { externalFrameworks } from './project_types'; @@ -16,7 +15,8 @@ export function getCliDir() { } const resolveUsingBranchInstall = async (packageManager: JsPackageManager, request: string) => { - const tempDirectory = tempy.directory(); + const { temporaryDirectory } = await import('tempy'); + 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..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 tempy from 'tempy'; import dedent from 'ts-dedent'; import { join } from 'path'; @@ -24,8 +23,9 @@ let TEMP_LOG_FILE_PATH = ''; 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 }); +const augmentLogsToFile = async () => { + const { temporaryFile } = await import('tempy'); + TEMP_LOG_FILE_PATH = temporaryFile({ name: LOG_FILE_NAME }); const logStream = createWriteStream(TEMP_LOG_FILE_PATH); process.stdout.write = (d: string) => { @@ -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/package.json b/code/lib/core-common/package.json index f2c187bd32b9..81dcd1769bac 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/lib/core-common/src/utils/cli.ts b/code/lib/core-common/src/utils/cli.ts index c4103bd59137..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 tempy from 'tempy'; import { rendererPackages } from './get-storybook-info'; import type { JsPackageManager } from '../js-package-manager'; import versions from '../versions'; @@ -86,7 +85,8 @@ export const createLogStream = async ( logStream: WriteStream; }> => { const finalLogPath = join(process.cwd(), logFileName); - const temporaryLogPath = tempy.file({ name: logFileName }); + const { temporaryFile } = await import('tempy'); + const temporaryLogPath = temporaryFile({ name: logFileName }); const logStream = createWriteStream(temporaryLogPath, { encoding: 'utf8' }); diff --git a/code/yarn.lock b/code/yarn.lock index 2a3ec738c4e6..a5a00f95b47f 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5796,7 +5796,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" @@ -5925,7 +5925,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" @@ -12655,10 +12655,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 @@ -13143,22 +13145,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" @@ -16388,7 +16374,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: @@ -17987,13 +17973,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" @@ -27245,10 +27224,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 @@ -27261,16 +27240,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 @@ -28236,12 +28214,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/combine-compodoc.ts b/scripts/combine-compodoc.ts index c355cc242831..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 { directory } from 'tempy'; import { execaCommand } from 'execa'; import { esMain } from './utils/esmain'; @@ -36,7 +35,8 @@ async function run(cwd: string) { const docsArray: Record[] = await Promise.all( dirs.map(async (dir) => { - const outputDir = directory(); + const { temporaryDirectory } = await import('tempy'); + const outputDir = temporaryDirectory(); const resolvedDir = await realpath(dir); await execaCommand( `yarn compodoc ${resolvedDir} -p ./tsconfig.json -e json -d ${outputDir}`, 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/sandbox/generate.ts b/scripts/sandbox/generate.ts index 8f11b3a7a4db..4d259b473e09 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); @@ -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 }); } 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; 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