From dcbccd25ae5bcf2e3477a58d55df6dcbcab5b1cc Mon Sep 17 00:00:00 2001 From: Michael Essiet Date: Sun, 27 Aug 2023 13:26:49 +0100 Subject: [PATCH 001/290] Update core package README.md The readme didn't have enough information on what the package is and how to initially use it. I added a bit more information to make the NPM readme page a bit more informative and less like an abandoned project. --- packages/core/README.md | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/packages/core/README.md b/packages/core/README.md index 51fc211..9e8d8ac 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -1,3 +1,50 @@ # @solid-cli/core The main entry point package for the CLI. To install, just run `npm i -g @solid-cli/core`, and invoke with the `solid` command + +The main package for the SolidJS CLI tool. + +## Installation + +Run the following command to install the CLI tool globally: + +```bash +npm i -g @solid-cli/core +``` + +## Usage + +For a full list of commands and how to use them, you can invoke the help command like so: + +```bash +solid --help +``` + +Which should print this: + +```bash +solid + +where can be one of: + +- add - Can add and install integrations: `solid add unocss`. +- docs +- new - Creates a new solid project +- set +- start - Commands specific to solid start +- playground + +For more help, try running `solid --help` +``` + +## Documentation + +Visit our [official documentation](https://solid-cli.netlify.app/) + +## Support + +Reach out to us on the official [SolidJS discord](https://discord.gg/solidjs) + +## Contributing + +If you would like to contribute or keep up to date with the package, come join the effort over on [our GitHub](https://github.com/solidjs-community/solid-cli) From f7830753c30330f81d58947d3942019a6de1951c Mon Sep 17 00:00:00 2001 From: Michael Essiet Date: Sun, 27 Aug 2023 13:27:45 +0100 Subject: [PATCH 002/290] Update README.md --- packages/core/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/core/README.md b/packages/core/README.md index 9e8d8ac..c922b0e 100644 --- a/packages/core/README.md +++ b/packages/core/README.md @@ -1,7 +1,5 @@ # @solid-cli/core -The main entry point package for the CLI. To install, just run `npm i -g @solid-cli/core`, and invoke with the `solid` command - The main package for the SolidJS CLI tool. ## Installation From 7a2bb167351ad9968bcd691d23094fec3ad32ac3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 28 Aug 2023 20:14:49 +0100 Subject: [PATCH 003/290] Reduced bundle size of `create-solid` --- package.json | 2 +- packages/commands/package.json | 9 +- packages/commands/src/handlers/new.ts | 8 +- packages/commands/tsup.config.ts | 2 +- packages/core/package.json | 3 +- packages/create-solid/package.json | 6 +- packages/create-solid/src/index.ts | 11 +- packages/create-solid/tsup.config.ts | 8 + packages/utils/package.json | 2 +- pnpm-lock.yaml | 309 +++++++++++++++++--------- 10 files changed, 236 insertions(+), 124 deletions(-) diff --git a/package.json b/package.json index 6e1b3a5..ba31f4b 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@changesets/cli": "2.26.2", "nodemon": "^3.0.1", "prettier": "^3.0.2", - "turbo": "^1.10.12", + "turbo": "^1.10.13", "vitest": "^0.33.0" }, "pnpm": { diff --git a/packages/commands/package.json b/packages/commands/package.json index 98d6d45..c439dc7 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -16,6 +16,11 @@ "import": "./dist/index.mjs", "require": "./dist/index.mjs", "types": "./types/index.d.ts" + }, + "./new": { + "import": "./dist/handlers/new.mjs", + "require": "./dist/handlers/new.mjs", + "types": "./types/handlers/new.d.ts" } }, "scripts": { @@ -33,14 +38,12 @@ "access": "public" }, "dependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.17.7", "@clack/prompts": "0.6.3", "@solid-cli/reactivity": "workspace:*", - "@solid-cli/transpiler": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "detect-package-manager": "^2.0.1", - "execa": "^7.2.0", + "execa": "^8.0.1", "picocolors": "^1.0.0", "sucrase": "^3.34.0" } diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index c45dae6..c0da9ee 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -10,7 +10,7 @@ import { getRunner } from "@solid-cli/utils/paths"; import { rm } from "fs/promises"; import { basename, join, resolve } from "path"; import { Dirent, copyFileSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; -import prettier from "prettier"; +// import prettier from "prettier"; import { transform } from "sucrase"; const gitIgnore = ` dist @@ -91,9 +91,9 @@ const convertToJS = async (file: Dirent, startPath: string) => { transforms: ["typescript", "jsx"], jsxRuntime: "preserve", }); - code = await prettier.format(code, { - parser: "babel", - }); + // code = await prettier.format(code, { + // parser: "babel", + // }); writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); } else { diff --git a/packages/commands/tsup.config.ts b/packages/commands/tsup.config.ts index 0399ef0..f51cbec 100644 --- a/packages/commands/tsup.config.ts +++ b/packages/commands/tsup.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from "tsup"; import metaUrlPlugin from "@chialab/esbuild-plugin-meta-url"; export default defineConfig({ - entry: ["src/index.ts"], + entry: ["src/index.ts", "src/handlers/new.ts"], target: "esnext", format: "esm", splitting: false, diff --git a/packages/core/package.json b/packages/core/package.json index 7079f2c..fbdbc78 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,11 +29,10 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@solid-cli/transpiler": "workspace:*", "@swc/core": "^1.3.75", "cmd-ts": "^0.12.1", "detect-package-manager": "^2.0.1", - "execa": "^7.2.0", + "execa": "^8.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.1", "tiny-updater": "^3.5.1" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index c9936c8..10defc8 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -21,13 +21,13 @@ "files": [ "dist" ], - "dependencies": { - "@solid-cli/commands": "workspace:*" - }, "scripts": { "start": "jiti ./src/index.ts", "build": "tsc && tsup" }, + "dependencies": { + "@solid-cli/commands": "workspace:*" + }, "devDependencies": { "jiti": "^1.19.1", "tsup": "^7.2.0", diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 43b55c4..f879dac 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -1,6 +1,7 @@ #! /usr/bin/env node -import { handleNew } from "@solid-cli/commands"; -const main = async () => { - await handleNew(); -}; -main(); +import { handleNew } from "@solid-cli/commands/new"; +// const main = async () => { +// await handleNew(); +// }; +// main(); +handleNew(); diff --git a/packages/create-solid/tsup.config.ts b/packages/create-solid/tsup.config.ts index d80d441..2ef6887 100644 --- a/packages/create-solid/tsup.config.ts +++ b/packages/create-solid/tsup.config.ts @@ -5,6 +5,14 @@ export default defineConfig({ target: "esnext", format: "esm", splitting: false, + bundle: true, sourcemap: true, clean: true, + noExternal: ["@solid-cli/commands"], + treeshake: true, + minify: true, + banner: { + js: `import { createRequire } from "module"; + const require = createRequire(import.meta.url);`, + }, }); diff --git a/packages/utils/package.json b/packages/utils/package.json index 8af9dc5..fe5af1e 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -70,7 +70,7 @@ "@swc/core": "^1.3.76", "cmd-ts": "^0.12.1", "detect-package-manager": "^2.0.1", - "execa": "^7.2.0", + "execa": "^8.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d433d9b..7addb79 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,26 +23,20 @@ importers: specifier: ^3.0.2 version: 3.0.2 turbo: - specifier: ^1.10.12 - version: 1.10.12 + specifier: ^1.10.13 + version: 1.10.13 vitest: specifier: ^0.33.0 version: 0.33.0 packages/commands: dependencies: - '@chialab/esbuild-plugin-meta-url': - specifier: ^0.17.7 - version: 0.17.7 '@clack/prompts': specifier: 0.6.3 version: 0.6.3 '@solid-cli/reactivity': specifier: workspace:* version: link:../reactivity - '@solid-cli/transpiler': - specifier: workspace:* - version: link:../transpiler '@solid-cli/ui': specifier: workspace:* version: link:../ui @@ -53,8 +47,8 @@ importers: specifier: ^2.0.1 version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) execa: - specifier: ^7.2.0 - version: 7.2.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.0 version: 1.0.0 @@ -62,6 +56,9 @@ importers: specifier: ^3.34.0 version: 3.34.0 devDependencies: + '@chialab/esbuild-plugin-meta-url': + specifier: ^0.17.7 + version: 0.17.7 '@types/node': specifier: ^20.5.0 version: 20.5.0 @@ -92,9 +89,6 @@ importers: '@solid-cli/swc-plugin-solid-cli': specifier: workspace:* version: link:../swc-plugin-solid-cli - '@solid-cli/transpiler': - specifier: workspace:* - version: link:../transpiler '@solid-cli/ui': specifier: workspace:* version: link:../ui @@ -111,8 +105,8 @@ importers: specifier: ^2.0.1 version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) execa: - specifier: ^7.2.0 - version: 7.2.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.0 version: 1.0.0 @@ -166,16 +160,6 @@ importers: packages/swc-plugin-solid-cli: {} - packages/transpiler: - dependencies: - vitest: - specifier: ^0.33.0 - version: 0.33.0 - devDependencies: - '@napi-rs/cli': - specifier: ^2.16.3 - version: 2.16.3 - packages/ui: dependencies: '@clack/core': @@ -225,8 +209,8 @@ importers: specifier: ^2.0.1 version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) execa: - specifier: ^7.2.0 - version: 7.2.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.0 version: 1.0.0 @@ -255,11 +239,11 @@ importers: packages: - /@babel/code-frame@7.22.10: - resolution: {integrity: sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==} + /@babel/code-frame@7.22.13: + resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.22.10 + '@babel/highlight': 7.22.13 chalk: 2.4.2 dev: true @@ -268,8 +252,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/highlight@7.22.10: - resolution: {integrity: sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==} + /@babel/highlight@7.22.13: + resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-validator-identifier': 7.22.5 @@ -277,8 +261,8 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/runtime@7.22.10: - resolution: {integrity: sha512-21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ==} + /@babel/runtime@7.22.11: + resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.0 @@ -287,7 +271,7 @@ packages: /@changesets/apply-release-plan@6.1.4: resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/config': 2.3.1 '@changesets/get-version-range-type': 0.3.2 '@changesets/git': 2.0.0 @@ -305,7 +289,7 @@ packages: /@changesets/assemble-release-plan@5.2.4: resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.6 '@changesets/types': 5.2.1 @@ -323,7 +307,7 @@ packages: resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==} hasBin: true dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/apply-release-plan': 6.1.4 '@changesets/assemble-release-plan': 5.2.4 '@changesets/changelog-git': 0.1.14 @@ -339,7 +323,7 @@ packages: '@changesets/write': 0.2.3 '@manypkg/get-packages': 1.1.3 '@types/is-ci': 3.0.0 - '@types/semver': 7.5.0 + '@types/semver': 7.5.1 ansi-colors: 4.1.3 chalk: 2.4.2 enquirer: 2.4.1 @@ -389,7 +373,7 @@ packages: /@changesets/get-release-plan@3.0.17: resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/assemble-release-plan': 5.2.4 '@changesets/config': 2.3.1 '@changesets/pre': 1.0.14 @@ -405,7 +389,7 @@ packages: /@changesets/git@2.0.0: resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -430,7 +414,7 @@ packages: /@changesets/pre@1.0.14: resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -440,7 +424,7 @@ packages: /@changesets/read@0.5.9: resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/git': 2.0.0 '@changesets/logger': 0.0.5 '@changesets/parse': 0.3.16 @@ -461,7 +445,7 @@ packages: /@changesets/write@0.2.3: resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 @@ -476,6 +460,7 @@ packages: '@chialab/estransform': 0.17.4 '@chialab/node-resolve': 0.17.1 mime-types: 2.1.35 + dev: true /@chialab/esbuild-rna@0.17.8: resolution: {integrity: sha512-hovU4W5zlyMnbJjexdczpQ9mcUfFsJuv9FWUhzpXiQwPprlp5lul+frTed9s8AyVDTDq2yq3Gx2Ac411QsXYGA==} @@ -483,16 +468,19 @@ packages: dependencies: '@chialab/estransform': 0.17.4 '@chialab/node-resolve': 0.17.1 + dev: true /@chialab/estransform@0.17.4: resolution: {integrity: sha512-p4nf8ECdmanwbRK6A/X/VYtJfkBk5vgChPh0GiCyZAPt6/mKPbe0v3y9WjLHfFdkv1bzjJzP3pjTJ1SZ1E1U8Q==} engines: {node: '>=13'} dependencies: '@parcel/source-map': 2.1.1 + dev: true /@chialab/node-resolve@0.17.1: resolution: {integrity: sha512-YWaK0MKKeB0FILI6j7qiAlGoSC9MqJZDFXzlAgfOaMCbn8Feqh6njxv7mI3oVkdi7QwV6zPRaTN6hKig/NriMA==} engines: {node: '>=13'} + dev: true /@clack/core@0.3.2: resolution: {integrity: sha512-FZnsNynwGDIDktx6PEZK1EuCkFpY4ldEX6VYvfl0dqeoLPb9Jpw1xoUXaVcGR8ExmYNm1w2vdGdJkEUYD/2pqg==} @@ -517,6 +505,7 @@ packages: cpu: [arm64] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/android-arm@0.18.20: @@ -525,6 +514,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/android-x64@0.18.20: @@ -533,6 +523,7 @@ packages: cpu: [x64] os: [android] requiresBuild: true + dev: true optional: true /@esbuild/darwin-arm64@0.18.20: @@ -541,6 +532,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: true optional: true /@esbuild/darwin-x64@0.18.20: @@ -549,6 +541,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: true optional: true /@esbuild/freebsd-arm64@0.18.20: @@ -557,6 +550,7 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true + dev: true optional: true /@esbuild/freebsd-x64@0.18.20: @@ -565,6 +559,7 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true + dev: true optional: true /@esbuild/linux-arm64@0.18.20: @@ -573,6 +568,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-arm@0.18.20: @@ -581,6 +577,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-ia32@0.18.20: @@ -589,6 +586,7 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-loong64@0.18.20: @@ -597,6 +595,7 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-mips64el@0.18.20: @@ -605,6 +604,7 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-ppc64@0.18.20: @@ -613,6 +613,7 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-riscv64@0.18.20: @@ -621,6 +622,7 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-s390x@0.18.20: @@ -629,6 +631,7 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/linux-x64@0.18.20: @@ -637,6 +640,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true /@esbuild/netbsd-x64@0.18.20: @@ -645,6 +649,7 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true + dev: true optional: true /@esbuild/openbsd-x64@0.18.20: @@ -653,6 +658,7 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true + dev: true optional: true /@esbuild/sunos-x64@0.18.20: @@ -661,6 +667,7 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true + dev: true optional: true /@esbuild/win32-arm64@0.18.20: @@ -669,6 +676,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + dev: true optional: true /@esbuild/win32-ia32@0.18.20: @@ -677,6 +685,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + dev: true optional: true /@esbuild/win32-x64@0.18.20: @@ -685,6 +694,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + dev: true optional: true /@jest/schemas@29.6.0: @@ -692,6 +702,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@sinclair/typebox': 0.27.8 + dev: true /@jridgewell/gen-mapping@0.3.3: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} @@ -721,7 +732,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -730,7 +741,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.22.10 + '@babel/runtime': 7.22.11 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -738,12 +749,6 @@ packages: read-yaml-file: 1.1.0 dev: true - /@napi-rs/cli@2.16.3: - resolution: {integrity: sha512-3mLNPlbbOhpbIUKicLrJtIearlHXUuXL3UeueYyRRplpVMNkdn8xCyzY6PcYZi3JXR8bmCOiWgkVmLnrSL7DKw==} - engines: {node: '>= 10'} - hasBin: true - dev: true - /@nodelib/fs.scandir@2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -770,9 +775,11 @@ packages: engines: {node: ^12.18.3 || >=14} dependencies: detect-libc: 1.0.3 + dev: true /@sinclair/typebox@0.27.8: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + dev: true /@swc/core-darwin-arm64@1.3.75: resolution: {integrity: sha512-anDnx9L465lGbjB2mvcV54NGHW6illr0IDvVV7JmkabYUVneaRdQvTr0tbHv3xjHnjrK1wuwVOHKV0LcQF2tnQ==} @@ -980,9 +987,11 @@ packages: resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==} dependencies: '@types/chai': 4.3.5 + dev: true /@types/chai@4.3.5: resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==} + dev: true /@types/is-ci@3.0.0: resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} @@ -1008,13 +1017,18 @@ packages: /@types/node@20.5.0: resolution: {integrity: sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==} + dev: true + + /@types/node@20.5.7: + resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==} + dev: true /@types/normalize-package-data@2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} dev: true - /@types/semver@7.5.0: - resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==} + /@types/semver@7.5.1: + resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} dev: true /@vitest/expect@0.33.0: @@ -1023,6 +1037,7 @@ packages: '@vitest/spy': 0.33.0 '@vitest/utils': 0.33.0 chai: 4.3.7 + dev: true /@vitest/runner@0.33.0: resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==} @@ -1030,6 +1045,7 @@ packages: '@vitest/utils': 0.33.0 p-limit: 4.0.0 pathe: 1.1.1 + dev: true /@vitest/snapshot@0.33.0: resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==} @@ -1037,11 +1053,13 @@ packages: magic-string: 0.30.2 pathe: 1.1.1 pretty-format: 29.6.2 + dev: true /@vitest/spy@0.33.0: resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==} dependencies: tinyspy: 2.1.1 + dev: true /@vitest/utils@0.33.0: resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==} @@ -1049,6 +1067,7 @@ packages: diff-sequences: 29.4.3 loupe: 2.3.6 pretty-format: 29.6.2 + dev: true /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -1057,11 +1076,13 @@ packages: /acorn-walk@8.2.0: resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} engines: {node: '>=0.4.0'} + dev: true /acorn@8.10.0: resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} hasBin: true + dev: true /ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -1088,6 +1109,7 @@ packages: /ansi-styles@5.2.0: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} + dev: true /any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -1147,6 +1169,7 @@ packages: /assertion-error@1.1.0: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} + dev: true /available-typed-arrays@1.0.5: resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} @@ -1200,6 +1223,7 @@ packages: /cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} + dev: true /call-bind@1.0.2: resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} @@ -1233,6 +1257,20 @@ packages: loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 + dev: true + + /chai@4.3.8: + resolution: {integrity: sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==} + engines: {node: '>=4'} + dependencies: + assertion-error: 1.1.0 + check-error: 1.0.2 + deep-eql: 4.1.3 + get-func-name: 2.0.0 + loupe: 2.3.6 + pathval: 1.1.1 + type-detect: 4.0.8 + dev: true /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -1256,6 +1294,7 @@ packages: /check-error@1.0.2: resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==} + dev: true /chokidar@3.5.3: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} @@ -1269,7 +1308,7 @@ packages: normalize-path: 3.0.0 readdirp: 3.6.0 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true /ci-info@3.8.0: @@ -1415,6 +1454,7 @@ packages: engines: {node: '>=6'} dependencies: type-detect: 4.0.8 + dev: true /defaults@1.0.4: resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} @@ -1439,6 +1479,7 @@ packages: resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} engines: {node: '>=0.10'} hasBin: true + dev: true /detect-package-manager@2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi): resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==} @@ -1455,6 +1496,7 @@ packages: /diff-sequences@29.4.3: resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dev: true /dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} @@ -1491,7 +1533,7 @@ packages: call-bind: 1.0.2 es-set-tostringtag: 2.0.1 es-to-primitive: 1.2.1 - function.prototype.name: 1.1.5 + function.prototype.name: 1.1.6 get-intrinsic: 1.2.1 get-symbol-description: 1.0.0 globalthis: 1.0.3 @@ -1578,6 +1620,7 @@ packages: '@esbuild/win32-arm64': 0.18.20 '@esbuild/win32-ia32': 0.18.20 '@esbuild/win32-x64': 0.18.20 + dev: true /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -1609,18 +1652,18 @@ packages: signal-exit: 3.0.7 strip-final-newline: 2.0.0 - /execa@7.2.0: - resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} - engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} + /execa@8.0.1: + resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} + engines: {node: '>=16.17'} dependencies: cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 4.3.1 + get-stream: 8.0.1 + human-signals: 5.0.0 is-stream: 3.0.0 merge-stream: 2.0.0 npm-run-path: 5.1.0 onetime: 6.0.0 - signal-exit: 3.0.7 + signal-exit: 4.1.0 strip-final-newline: 3.0.0 dev: false @@ -1711,19 +1754,20 @@ packages: /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true + dev: true optional: true /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} dev: true - /function.prototype.name@1.1.5: - resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==} + /function.prototype.name@1.1.6: + resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -1743,6 +1787,7 @@ packages: /get-func-name@2.0.0: resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==} + dev: true /get-intrinsic@1.2.1: resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} @@ -1757,6 +1802,11 @@ packages: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} + /get-stream@8.0.1: + resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} + engines: {node: '>=16'} + dev: false + /get-symbol-description@1.0.0: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} engines: {node: '>= 0.4'} @@ -1875,9 +1925,9 @@ packages: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} - /human-signals@4.3.1: - resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} - engines: {node: '>=14.18.0'} + /human-signals@5.0.0: + resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} + engines: {node: '>=16.17.0'} dev: false /iconv-lite@0.4.24: @@ -2117,6 +2167,7 @@ packages: /jsonc-parser@3.2.0: resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} + dev: true /jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} @@ -2160,6 +2211,7 @@ packages: /local-pkg@0.4.3: resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} engines: {node: '>=14'} + dev: true /locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} @@ -2187,6 +2239,7 @@ packages: resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} dependencies: get-func-name: 2.0.0 + dev: true /lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} @@ -2207,6 +2260,14 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + + /magic-string@0.30.3: + resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true /map-obj@1.0.1: resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==} @@ -2254,12 +2315,14 @@ packages: /mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} + dev: true /mime-types@2.1.35: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} dependencies: mime-db: 1.52.0 + dev: true /mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} @@ -2301,6 +2364,7 @@ packages: pathe: 1.1.1 pkg-types: 1.0.3 ufo: 1.2.0 + dev: true /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} @@ -2320,6 +2384,7 @@ packages: resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + dev: true /nodemon@3.0.1: resolution: {integrity: sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==} @@ -2448,6 +2513,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: yocto-queue: 1.0.0 + dev: true /p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} @@ -2477,7 +2543,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.22.10 + '@babel/code-frame': 7.22.13 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -2512,9 +2578,11 @@ packages: /pathe@1.1.1: resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==} + dev: true /pathval@1.1.1: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} + dev: true /picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} @@ -2546,6 +2614,7 @@ packages: jsonc-parser: 3.2.0 mlly: 1.4.0 pathe: 1.1.1 + dev: true /postcss-load-config@4.0.1: resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} @@ -2570,6 +2639,7 @@ packages: nanoid: 3.3.6 picocolors: 1.0.0 source-map-js: 1.0.2 + dev: true /preferred-pm@3.0.3: resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==} @@ -2600,6 +2670,7 @@ packages: '@jest/schemas': 29.6.0 ansi-styles: 5.2.0 react-is: 18.2.0 + dev: true /pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -2625,6 +2696,7 @@ packages: /react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} + dev: true /read-pkg-up@7.0.1: resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} @@ -2716,7 +2788,16 @@ packages: engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 + dev: true + + /rollup@3.28.1: + resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + hasBin: true + optionalDependencies: + fsevents: 2.3.3 + dev: true /run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -2795,10 +2876,16 @@ packages: /siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} + dev: true /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + /signal-exit@4.1.0: + resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} + engines: {node: '>=14'} + dev: false + /simple-update-notifier@2.0.0: resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} engines: {node: '>=10'} @@ -2836,6 +2923,7 @@ packages: /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} + dev: true /source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} @@ -2879,9 +2967,11 @@ packages: /stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} + dev: true - /std-env@3.3.3: - resolution: {integrity: sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==} + /std-env@3.4.3: + resolution: {integrity: sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==} + dev: true /stream-transform@2.1.3: resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} @@ -2954,6 +3044,7 @@ packages: resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==} dependencies: acorn: 8.10.0 + dev: true /sucrase@3.34.0: resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==} @@ -3016,14 +3107,17 @@ packages: /tinybench@2.5.0: resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==} + dev: true /tinypool@0.6.0: resolution: {integrity: sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==} engines: {node: '>=14.0.0'} + dev: true /tinyspy@2.1.1: resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==} engines: {node: '>=14.0.0'} + dev: true /tmp@0.0.33: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} @@ -3153,70 +3247,71 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.10.12: - resolution: {integrity: sha512-vmDfGVPl5/aFenAbOj3eOx3ePNcWVUyZwYr7taRl0ZBbmv2TzjRiFotO4vrKCiTVnbqjQqAFQWY2ugbqCI1kOQ==} + /turbo-darwin-64@1.10.13: + resolution: {integrity: sha512-vmngGfa2dlYvX7UFVncsNDMuT4X2KPyPJ2Jj+xvf5nvQnZR/3IeDEGleGVuMi/hRzdinoxwXqgk9flEmAYp0Xw==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.10.12: - resolution: {integrity: sha512-3JliEESLNX2s7g54SOBqqkqJ7UhcOGkS0ywMr5SNuvF6kWVTbuUq7uBU/sVbGq8RwvK1ONlhPvJne5MUqBCTCQ==} + /turbo-darwin-arm64@1.10.13: + resolution: {integrity: sha512-eMoJC+k7gIS4i2qL6rKmrIQGP6Wr9nN4odzzgHFngLTMimok2cGLK3qbJs5O5F/XAtEeRAmuxeRnzQwTl/iuAw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.10.12: - resolution: {integrity: sha512-siYhgeX0DidIfHSgCR95b8xPee9enKSOjCzx7EjTLmPqPaCiVebRYvbOIYdQWRqiaKh9yfhUtFmtMOMScUf1gg==} + /turbo-linux-64@1.10.13: + resolution: {integrity: sha512-0CyYmnKTs6kcx7+JRH3nPEqCnzWduM0hj8GP/aodhaIkLNSAGAa+RiYZz6C7IXN+xUVh5rrWTnU2f1SkIy7Gdg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.10.12: - resolution: {integrity: sha512-K/ZhvD9l4SslclaMkTiIrnfcACgos79YcAo4kwc8bnMQaKuUeRpM15sxLpZp3xDjDg8EY93vsKyjaOhdFG2UbA==} + /turbo-linux-arm64@1.10.13: + resolution: {integrity: sha512-0iBKviSGQQlh2OjZgBsGjkPXoxvRIxrrLLbLObwJo3sOjIH0loGmVIimGS5E323soMfi/o+sidjk2wU1kFfD7Q==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.10.12: - resolution: {integrity: sha512-7FSgSwvktWDNOqV65l9AbZwcoueAILeE4L7JvjauNASAjjbuzXGCEq5uN8AQU3U5BOFj4TdXrVmO2dX+lLu8Zg==} + /turbo-windows-64@1.10.13: + resolution: {integrity: sha512-S5XySRfW2AmnTeY1IT+Jdr6Goq7mxWganVFfrmqU+qqq3Om/nr0GkcUX+KTIo9mPrN0D3p5QViBRzulwB5iuUQ==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.10.12: - resolution: {integrity: sha512-gCNXF52dwom1HLY9ry/cneBPOKTBHhzpqhMylcyvJP0vp9zeMQQkt6yjYv+6QdnmELC92CtKNp2FsNZo+z0pyw==} + /turbo-windows-arm64@1.10.13: + resolution: {integrity: sha512-nKol6+CyiExJIuoIc3exUQPIBjP9nIq5SkMJgJuxsot2hkgGrafAg/izVDRDrRduQcXj2s8LdtxJHvvnbI8hEQ==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.10.12: - resolution: {integrity: sha512-WM3+jTfQWnB9W208pmP4oeehZcC6JQNlydb/ZHMRrhmQa+htGhWLCzd6Q9rLe0MwZLPpSPFV2/bN5egCLyoKjQ==} + /turbo@1.10.13: + resolution: {integrity: sha512-vOF5IPytgQPIsgGtT0n2uGZizR2N3kKuPIn4b5p5DdeLoI0BV7uNiydT7eSzdkPRpdXNnO8UwS658VaI4+YSzQ==} hasBin: true requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.10.12 - turbo-darwin-arm64: 1.10.12 - turbo-linux-64: 1.10.12 - turbo-linux-arm64: 1.10.12 - turbo-windows-64: 1.10.12 - turbo-windows-arm64: 1.10.12 + turbo-darwin-64: 1.10.13 + turbo-darwin-arm64: 1.10.13 + turbo-linux-64: 1.10.13 + turbo-linux-arm64: 1.10.13 + turbo-windows-64: 1.10.13 + turbo-windows-arm64: 1.10.13 dev: true /type-detect@4.0.8: resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} + dev: true /type-fest@0.13.1: resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==} @@ -3279,6 +3374,7 @@ packages: /ufo@1.2.0: resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==} + dev: true /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} @@ -3305,7 +3401,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@0.33.0(@types/node@20.5.0): + /vite-node@0.33.0(@types/node@20.5.7): resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==} engines: {node: '>=v14.18.0'} hasBin: true @@ -3315,7 +3411,7 @@ packages: mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.5.0) + vite: 4.4.9(@types/node@20.5.7) transitivePeerDependencies: - '@types/node' - less @@ -3325,8 +3421,9 @@ packages: - sugarss - supports-color - terser + dev: true - /vite@4.4.9(@types/node@20.5.0): + /vite@4.4.9(@types/node@20.5.7): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -3354,12 +3451,13 @@ packages: terser: optional: true dependencies: - '@types/node': 20.5.0 + '@types/node': 20.5.7 esbuild: 0.18.20 postcss: 8.4.28 - rollup: 3.28.0 + rollup: 3.28.1 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 + dev: true /vitest@0.33.0: resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==} @@ -3394,7 +3492,7 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 20.5.0 + '@types/node': 20.5.7 '@vitest/expect': 0.33.0 '@vitest/runner': 0.33.0 '@vitest/snapshot': 0.33.0 @@ -3403,18 +3501,18 @@ packages: acorn: 8.10.0 acorn-walk: 8.2.0 cac: 6.7.14 - chai: 4.3.7 + chai: 4.3.8 debug: 4.3.4 local-pkg: 0.4.3 - magic-string: 0.30.2 + magic-string: 0.30.3 pathe: 1.1.1 picocolors: 1.0.0 - std-env: 3.3.3 + std-env: 3.4.3 strip-literal: 1.3.0 tinybench: 2.5.0 tinypool: 0.6.0 - vite: 4.4.9(@types/node@20.5.0) - vite-node: 0.33.0(@types/node@20.5.0) + vite: 4.4.9(@types/node@20.5.7) + vite-node: 0.33.0(@types/node@20.5.7) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -3424,6 +3522,7 @@ packages: - sugarss - supports-color - terser + dev: true /wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} @@ -3501,6 +3600,7 @@ packages: dependencies: siginfo: 2.0.0 stackback: 0.0.2 + dev: true /wrap-ansi@6.2.0: resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} @@ -3596,3 +3696,4 @@ packages: /yocto-queue@1.0.0: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} + dev: true From c39629021a18f61232a57f095b2c9d7143a21130 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 28 Aug 2023 20:15:48 +0100 Subject: [PATCH 004/290] Made `@solid-cli/commands` dev dependency --- packages/create-solid/package.json | 6 ++---- pnpm-lock.yaml | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 10defc8..c6b68a3 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.5", + "version": "0.0.6", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", @@ -25,10 +25,8 @@ "start": "jiti ./src/index.ts", "build": "tsc && tsup" }, - "dependencies": { - "@solid-cli/commands": "workspace:*" - }, "devDependencies": { + "@solid-cli/commands": "workspace:*", "jiti": "^1.19.1", "tsup": "^7.2.0", "typescript": "^5.1.6" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7addb79..437dd87 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -134,11 +134,10 @@ importers: version: 5.1.6 packages/create-solid: - dependencies: + devDependencies: '@solid-cli/commands': specifier: workspace:* version: link:../commands - devDependencies: jiti: specifier: ^1.19.1 version: 1.19.1 From 50aad6617ba24947d97aea7fca1baf6580015cda Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 28 Aug 2023 20:22:17 +0100 Subject: [PATCH 005/290] Sourcemaps are no longer included in `create-solid` output bundle --- packages/create-solid/package.json | 2 +- packages/create-solid/tsup.config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index c6b68a3..159c688 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.6", + "version": "0.0.7", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/tsup.config.ts b/packages/create-solid/tsup.config.ts index 2ef6887..e0ff30c 100644 --- a/packages/create-solid/tsup.config.ts +++ b/packages/create-solid/tsup.config.ts @@ -6,7 +6,7 @@ export default defineConfig({ format: "esm", splitting: false, bundle: true, - sourcemap: true, + sourcemap: false, clean: true, noExternal: ["@solid-cli/commands"], treeshake: true, From 1934caeda206bc9929b1783d9d2b22b316057750 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 28 Aug 2023 23:28:12 +0100 Subject: [PATCH 006/290] Minify all packages --- packages/commands/package.json | 2 +- packages/commands/tsup.config.ts | 1 + packages/core/package.json | 2 +- packages/core/tsup.config.ts | 1 + packages/reactivity/package.json | 2 +- packages/reactivity/tsup.config.ts | 1 + packages/ui/package.json | 2 +- packages/ui/tsup.config.ts | 1 + packages/utils/package.json | 2 +- packages/utils/tsup.config.ts | 1 + 10 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index c439dc7..1311fdf 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.2", + "version": "0.0.3", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/commands/tsup.config.ts b/packages/commands/tsup.config.ts index f51cbec..0e6978c 100644 --- a/packages/commands/tsup.config.ts +++ b/packages/commands/tsup.config.ts @@ -8,5 +8,6 @@ export default defineConfig({ splitting: false, sourcemap: true, clean: true, + minify: true, esbuildPlugins: [metaUrlPlugin()], }); diff --git a/packages/core/package.json b/packages/core/package.json index fbdbc78..a8e9f21 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.15", + "version": "0.0.16", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/core/tsup.config.ts b/packages/core/tsup.config.ts index 0399ef0..75f3240 100644 --- a/packages/core/tsup.config.ts +++ b/packages/core/tsup.config.ts @@ -8,5 +8,6 @@ export default defineConfig({ splitting: false, sourcemap: true, clean: true, + minify: true, esbuildPlugins: [metaUrlPlugin()], }); diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index f4a8c97..e8cfed5 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/reactivity", - "version": "0.0.9", + "version": "0.0.10", "description": "The minimal, eager reactive system that powers the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/reactivity/tsup.config.ts b/packages/reactivity/tsup.config.ts index 0289b01..aaf7a65 100644 --- a/packages/reactivity/tsup.config.ts +++ b/packages/reactivity/tsup.config.ts @@ -6,5 +6,6 @@ export default defineConfig({ format: ["esm", "cjs"], splitting: false, sourcemap: true, + minify: true, clean: true, }); diff --git a/packages/ui/package.json b/packages/ui/package.json index 9a3194a..853f6d2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.5", + "version": "0.0.6", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { diff --git a/packages/ui/tsup.config.ts b/packages/ui/tsup.config.ts index 0289b01..aaf7a65 100644 --- a/packages/ui/tsup.config.ts +++ b/packages/ui/tsup.config.ts @@ -6,5 +6,6 @@ export default defineConfig({ format: ["esm", "cjs"], splitting: false, sourcemap: true, + minify: true, clean: true, }); diff --git a/packages/utils/package.json b/packages/utils/package.json index fe5af1e..91bd8e5 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.5", + "version": "0.0.6", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/utils/tsup.config.ts b/packages/utils/tsup.config.ts index 861ed77..6902122 100644 --- a/packages/utils/tsup.config.ts +++ b/packages/utils/tsup.config.ts @@ -8,5 +8,6 @@ export default defineConfig({ splitting: false, sourcemap: true, clean: true, + minify: true, esbuildPlugins: [metaUrlPlugin()], }); From 5ea2ce7ba044e271caea8c143d19f5619643a2db Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 28 Aug 2023 23:33:40 +0100 Subject: [PATCH 007/290] Update `AWS` case --- docs/vitepress_docs/supported-integrations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/vitepress_docs/supported-integrations.md b/docs/vitepress_docs/supported-integrations.md index 96c32ec..0dfca99 100644 --- a/docs/vitepress_docs/supported-integrations.md +++ b/docs/vitepress_docs/supported-integrations.md @@ -2,7 +2,7 @@ ## Adapters -- [Aws](https://github.com/solidjs/solid-start/tree/main/packages/start-aws) +- [AWS](https://github.com/solidjs/solid-start/tree/main/packages/start-aws) - [Cloudflare-pages](https://github.com/solidjs/solid-start/tree/main/packages/start-cloudflare-pages) - [Cloudflare-workers](https://github.com/solidjs/solid-start/tree/main/packages/start-cloudflare-workers) - [Deno](https://github.com/solidjs/solid-start/tree/main/packages/start-deno) From dd5991544210e29496d59b5c6a7b41b917c5942b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 28 Aug 2023 23:35:07 +0100 Subject: [PATCH 008/290] `UnoCSS` case --- docs/vitepress_docs/supported-integrations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/vitepress_docs/supported-integrations.md b/docs/vitepress_docs/supported-integrations.md index 0dfca99..934ee99 100644 --- a/docs/vitepress_docs/supported-integrations.md +++ b/docs/vitepress_docs/supported-integrations.md @@ -15,7 +15,7 @@ These packages will be automatically installed and configured with sensible defaults: -- [UnoCss](https://unocss.dev/) +- [UnoCSS](https://unocss.dev/) - [Tailwind CSS](https://tailwindcss.com/) - [Solid Devtools](https://github.com/thetarnav/solid-devtools) - [VitePWA](https://vite-pwa-org.netlify.app) From 7c0476261d1aaedb02411823aaebf09e57351448 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 1 Sep 2023 12:31:08 +0100 Subject: [PATCH 009/290] Add `files` property --- packages/reactivity/package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index e8cfed5..689410d 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/reactivity", - "version": "0.0.10", + "version": "0.0.11", "description": "The minimal, eager reactive system that powers the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -8,6 +8,10 @@ "type": "git", "url": "https://github.com/solidjs-community/solid-cli" }, + "files": [ + "dist", + "types" + ], "main": "./dist/index.mjs", "module": "./dist/index.mjs", "types": "./types/index.d.ts", From a729ac6ee80869106f7d33a326f79e2d58f7d86a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 1 Sep 2023 17:17:12 +0100 Subject: [PATCH 010/290] Include types with npm package --- packages/commands/package.json | 6 +++++- packages/ui/package.json | 6 +++++- packages/utils/package.json | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 1311fdf..c2b0741 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.3", + "version": "0.0.4", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -8,6 +8,10 @@ "type": "git", "url": "https://github.com/solidjs-community/solid-cli" }, + "files": [ + "dist", + "types" + ], "main": "./dist/index.mjs", "module": "./dist/index.mjs", "types": "./types/index.d.ts", diff --git a/packages/ui/package.json b/packages/ui/package.json index 853f6d2..d82ae25 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,12 +1,16 @@ { "name": "@solid-cli/ui", - "version": "0.0.6", + "version": "0.0.7", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { "type": "git", "url": "https://github.com/solidjs-community/solid-cli" }, + "files": [ + "dist", + "types" + ], "description": "A collection of UI utilities for the Solid CLI", "main": "./dist/index.mjs", "module": "./dist/index.mjs", diff --git a/packages/utils/package.json b/packages/utils/package.json index 91bd8e5..261784d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.6", + "version": "0.0.7", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -8,6 +8,10 @@ "type": "git", "url": "https://github.com/solidjs-community/solid-cli" }, + "files": [ + "dist", + "types" + ], "main": "./dist/index.mjs", "module": "./dist/index.mjs", "types": "./types/index.d.ts", From 7c1378118fe3c2ab88a4c4597b14c27dc78770e0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 15:36:22 +0100 Subject: [PATCH 011/290] Use degit directly --- packages/commands/package.json | 4 +++- packages/commands/src/handlers/new.ts | 13 ++++++------- packages/create-solid/package.json | 2 +- pnpm-lock.yaml | 16 ++++++++++++++++ 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index c2b0741..7647958 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.4", + "version": "0.0.5", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -33,6 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", + "@types/degit": "^2.8.3", "@types/node": "^20.5.0", "prettier": "^3.0.2", "tsup": "^7.2.0", @@ -46,6 +47,7 @@ "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", + "degit": "^2.8.4", "detect-package-manager": "^2.0.1", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index c0da9ee..20ae110 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -10,7 +10,7 @@ import { getRunner } from "@solid-cli/utils/paths"; import { rm } from "fs/promises"; import { basename, join, resolve } from "path"; import { Dirent, copyFileSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; -// import prettier from "prettier"; +import degit from "degit"; import { transform } from "sucrase"; const gitIgnore = ` dist @@ -164,15 +164,14 @@ const handleNewStartProject = async (projectName: string) => { // If the user does not want ts, we create the project in a temp directory inside the project directory const tempDir = withTs ? projectName : join(projectName, ".solid-start"); - const pM = await detect(); await spinnerify({ startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, - fn: () => - execa( - getRunner(pM), - ["degit", `solidjs/solid-start/examples/${template}#main`, tempDir].filter((e) => e !== null) as string[], - ), + fn: async () => { + const emitter = degit(`solidjs/solid-start/examples/${template}#main`); + emitter.on("info", ({ message }) => p.log.info(message)); + await emitter.clone(tempDir); + }, }); if (!withTs) await handleTSConversion(tempDir, projectName); diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 159c688..7ceab14 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.7", + "version": "0.0.8", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 437dd87..55e4bc3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,6 +43,9 @@ importers: '@solid-cli/utils': specifier: workspace:* version: link:../utils + degit: + specifier: ^2.8.4 + version: 2.8.4 detect-package-manager: specifier: ^2.0.1 version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) @@ -59,6 +62,9 @@ importers: '@chialab/esbuild-plugin-meta-url': specifier: ^0.17.7 version: 0.17.7 + '@types/degit': + specifier: ^2.8.3 + version: 2.8.3 '@types/node': specifier: ^20.5.0 version: 20.5.0 @@ -992,6 +998,10 @@ packages: resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==} dev: true + /@types/degit@2.8.3: + resolution: {integrity: sha512-CL7y71j2zaDmtPLD5Xq5S1Gv2dFoHl0/GBZm6s39Mj/ls28L3NzAOqf7H4H0/2TNVMgMjMVf9CAFYSjmXhi3bw==} + dev: true + /@types/is-ci@3.0.0: resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} dependencies: @@ -1469,6 +1479,12 @@ packages: object-keys: 1.1.1 dev: true + /degit@2.8.4: + resolution: {integrity: sha512-vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng==} + engines: {node: '>=8.0.0'} + hasBin: true + dev: false + /detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} From eecf1b82c312ffb6d863226d770c87b48c25ed0c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 15:45:26 +0100 Subject: [PATCH 012/290] Added intro with version to `create-solid` --- packages/core/src/index.ts | 2 +- packages/create-solid/package.json | 6 +++++- packages/create-solid/src/index.ts | 8 ++++---- pnpm-lock.yaml | 7 +++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index b51ce88..69d759f 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -91,7 +91,7 @@ const main = async () => { const cli = subcommands({ name: "solid", cmds: await loadCommands(), - version: version, + version, }); const args = process.argv.slice(2); diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 7ceab14..6092cab 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.8", + "version": "0.0.9", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", @@ -33,5 +33,9 @@ }, "publishConfig": { "access": "public" + }, + "dependencies": { + "@clack/prompts": "0.6.3", + "picocolors": "^1.0.0" } } diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index f879dac..3c3c92f 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -1,7 +1,7 @@ #! /usr/bin/env node import { handleNew } from "@solid-cli/commands/new"; -// const main = async () => { -// await handleNew(); -// }; -// main(); +import { bgCyan, black } from "picocolors"; +import { intro } from "@clack/prompts"; +import { version } from "../package.json"; +intro(`\n${bgCyan(black(` Create-Solid v${version}`))}`); handleNew(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 55e4bc3..dee699b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,6 +140,13 @@ importers: version: 5.1.6 packages/create-solid: + dependencies: + '@clack/prompts': + specifier: 0.6.3 + version: 0.6.3 + picocolors: + specifier: ^1.0.0 + version: 1.0.0 devDependencies: '@solid-cli/commands': specifier: workspace:* From 743ac483df696e501bacabd2f448d2746baf27b0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:55:38 +0100 Subject: [PATCH 013/290] Fix bug with `picocolors` not supporting es imports --- packages/create-solid/package.json | 2 +- packages/create-solid/src/index.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 6092cab..8f00dc7 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.9", + "version": "0.0.10", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 3c3c92f..d34feeb 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -1,7 +1,7 @@ #! /usr/bin/env node import { handleNew } from "@solid-cli/commands/new"; -import { bgCyan, black } from "picocolors"; +import color from "picocolors"; import { intro } from "@clack/prompts"; import { version } from "../package.json"; -intro(`\n${bgCyan(black(` Create-Solid v${version}`))}`); +intro(`\n${color.bgCyan(color.black(` Create-Solid v${version}`))}`); handleNew(); From b52ef5f2be7bfa84683fa08a177854d56a738594 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:57:47 +0100 Subject: [PATCH 014/290] Removed runtime dependencies --- packages/create-solid/package.json | 11 +++++------ pnpm-lock.yaml | 12 ++++-------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 8f00dc7..ef4d4b1 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.10", + "version": "0.0.11", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", @@ -29,13 +29,12 @@ "@solid-cli/commands": "workspace:*", "jiti": "^1.19.1", "tsup": "^7.2.0", - "typescript": "^5.1.6" + "typescript": "^5.1.6", + "@clack/prompts": "0.6.3", + "picocolors": "^1.0.0" }, "publishConfig": { "access": "public" }, - "dependencies": { - "@clack/prompts": "0.6.3", - "picocolors": "^1.0.0" - } + "dependencies": {} } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dee699b..0d3694a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,20 +140,19 @@ importers: version: 5.1.6 packages/create-solid: - dependencies: + devDependencies: '@clack/prompts': specifier: 0.6.3 version: 0.6.3 - picocolors: - specifier: ^1.0.0 - version: 1.0.0 - devDependencies: '@solid-cli/commands': specifier: workspace:* version: link:../commands jiti: specifier: ^1.19.1 version: 1.19.1 + picocolors: + specifier: ^1.0.0 + version: 1.0.0 tsup: specifier: ^7.2.0 version: 7.2.0(@swc/core@1.3.76)(typescript@5.1.6) @@ -499,7 +498,6 @@ packages: dependencies: picocolors: 1.0.0 sisteransi: 1.0.5 - dev: false /@clack/prompts@0.6.3: resolution: {integrity: sha512-AM+kFmAHawpUQv2q9+mcB6jLKxXGjgu/r2EQjEwujgpCdzrST6BJqYw00GRn56/L/Izw5U7ImoLmy00X/r80Pw==} @@ -507,7 +505,6 @@ packages: '@clack/core': 0.3.2 picocolors: 1.0.0 sisteransi: 1.0.5 - dev: false bundledDependencies: - is-unicode-supported @@ -2917,7 +2914,6 @@ packages: /sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - dev: false /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} From c7577eca364da9b6f25d07aee98c3b8ae75571fc Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:15:39 +0100 Subject: [PATCH 015/290] Use degit package for new solidjs projects --- packages/commands/src/handlers/new.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 20ae110..3e5162a 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -214,6 +214,7 @@ export const handleNew = async ( name: string = "solid-project", stackblitz: boolean = false, ) => { + console.log(variation, name, stackblitz); if (!variation) { await handleAutocompleteNew(); return; @@ -233,16 +234,14 @@ export const handleNew = async ( // If the user does not want ts, we create the project in a temp directory inside the project directory const tempDir = withTs ? name : join(name, ".solid-start"); - const pM = await detect(); - await spinnerify({ startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, - fn: () => - execa( - getRunner(pM), - ["degit", `solidjs/templates/${variation}`, name ?? null].filter((e) => e !== null) as string[], - ), + fn: async () => { + const emitter = degit(`solidjs/templates/${variation}`); + emitter.on("info", ({ message }) => p.log.info(message)); + await emitter.clone(tempDir); + }, }); if (!withTs) await handleTSConversion(tempDir, name); From f1cd9eef7d6096cca6ee166698f747d9114d4645 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:42:01 +0100 Subject: [PATCH 016/290] Update dependencies Use the same algorithm for detecting the package manager as `create-solid` Bump packages --- package.json | 9 +- packages/commands/package.json | 7 +- packages/commands/src/handlers/add.ts | 2 +- packages/commands/src/handlers/new.ts | 3 - packages/commands/src/lib/integrations.ts | 4 +- packages/core/package.json | 11 +- packages/core/pnpm-lock.yaml | 1164 ----------------- packages/create-solid/package.json | 8 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 8 +- packages/utils/package.json | 16 +- .../utils/src/detect-package-manager/index.ts | 22 + packages/utils/src/paths/index.ts | 4 +- packages/utils/src/updates/index.ts | 8 +- pnpm-lock.yaml | 311 +++-- 15 files changed, 279 insertions(+), 1300 deletions(-) delete mode 100644 packages/core/pnpm-lock.yaml create mode 100644 packages/utils/src/detect-package-manager/index.ts diff --git a/package.json b/package.json index ba31f4b..ba7b4c2 100644 --- a/package.json +++ b/package.json @@ -30,13 +30,8 @@ "devDependencies": { "@changesets/cli": "2.26.2", "nodemon": "^3.0.1", - "prettier": "^3.0.2", + "prettier": "^3.0.3", "turbo": "^1.10.13", - "vitest": "^0.33.0" - }, - "pnpm": { - "patchedDependencies": { - "detect-package-manager@2.0.1": "patches/detect-package-manager@2.0.1.patch" - } + "vitest": "^0.34.3" } } diff --git a/packages/commands/package.json b/packages/commands/package.json index 7647958..6ec5eab 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.5", + "version": "0.0.6", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -37,18 +37,17 @@ "@types/node": "^20.5.0", "prettier": "^3.0.2", "tsup": "^7.2.0", - "typescript": "^5.1.6" + "typescript": "^5.2.2" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/prompts": "0.6.3", + "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "degit": "^2.8.4", - "detect-package-manager": "^2.0.1", "execa": "^8.0.1", "picocolors": "^1.0.0", "sucrase": "^3.34.0" diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index 45572b7..0cb746e 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -3,7 +3,7 @@ import { S_BAR, cancelable, spinnerify } from "@solid-cli/ui"; import { Integrations, Supported, integrations, setRootFile } from "../lib/integrations"; import * as p from "@clack/prompts"; import color from "picocolors"; -import { PM } from "detect-package-manager"; +import { PM } from "@solid-cli/utils/detect-package-manager"; import { primitives, loadPrimitives } from "@solid-cli/utils/primitives"; import { t } from "@solid-cli/utils"; import { fileExists, getRootFile, getViteConfig, validateFilePath } from "../lib/utils/helpers"; diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 3e5162a..dab3696 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -1,12 +1,9 @@ import * as p from "@clack/prompts"; import { openInBrowser } from "@solid-cli/utils"; -import { detect } from "detect-package-manager"; -import { execa } from "execa"; import { cancelable, spinnerify } from "@solid-cli/ui"; import { t } from "@solid-cli/utils"; import { insertAtEnd, readFileToString } from "@solid-cli/utils/fs"; import { flushQueue } from "@solid-cli/utils/updates"; -import { getRunner } from "@solid-cli/utils/paths"; import { rm } from "fs/promises"; import { basename, join, resolve } from "path"; import { Dirent, copyFileSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index 7abe789..d7d9219 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -1,7 +1,7 @@ import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs"; import { fileExists, validateFilePath } from "./utils/helpers"; import { $ } from "execa"; -import { detect } from "detect-package-manager"; +import { getUserPkgManager } from "@solid-cli/utils/detect-package-manager"; import { getRunner } from "@solid-cli/utils/paths"; import { createSignal } from "@solid-cli/reactivity"; import * as p from "@clack/prompts"; @@ -28,7 +28,7 @@ export const integrations = { "tailwind": { installs: ["tailwindcss", "postcss", "autoprefixer"], postInstall: async () => { - const pM = await detect(); + const pM = getUserPkgManager(); await $`${getRunner(pM)} tailwindcss init -p`; let tailwindConfig = "tailwind.config.js"; if (!fileExists(tailwindConfig)) { diff --git a/packages/core/package.json b/packages/core/package.json index a8e9f21..b35528e 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.16", + "version": "0.0.17", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", @@ -22,8 +22,8 @@ "dist" ], "dependencies": { - "@clack/core": "0.3.2", - "@clack/prompts": "0.6.3", + "@clack/core": "0.3.3", + "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", "@solid-cli/reactivity": "workspace:*", "@solid-cli/swc-plugin-solid-cli": "workspace:*", @@ -31,7 +31,6 @@ "@solid-cli/utils": "workspace:*", "@swc/core": "^1.3.75", "cmd-ts": "^0.12.1", - "detect-package-manager": "^2.0.1", "execa": "^8.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.1", @@ -44,9 +43,9 @@ "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", "@types/node": "^20.4.9", - "jiti": "^1.19.1", + "jiti": "^1.19.3", "tsup": "^7.2.0", - "typescript": "^5.1.6" + "typescript": "^5.2.2" }, "publishConfig": { "access": "public" diff --git a/packages/core/pnpm-lock.yaml b/packages/core/pnpm-lock.yaml deleted file mode 100644 index 95ddd57..0000000 --- a/packages/core/pnpm-lock.yaml +++ /dev/null @@ -1,1164 +0,0 @@ -lockfileVersion: '6.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -dependencies: - '@clack/core': - specifier: 0.3.2 - version: 0.3.2 - '@clack/prompts': - specifier: 0.6.3 - version: 0.6.3 - '@swc/core': - specifier: ^1.3.68 - version: 1.3.68 - cmd-ts: - specifier: ^0.12.1 - version: 0.12.1 - detect-package-manager: - specifier: ^2.0.1 - version: 2.0.1 - execa: - specifier: ^7.1.1 - version: 7.1.1 - picocolors: - specifier: ^1.0.0 - version: 1.0.0 - tsup: - specifier: ^7.1.0 - version: 7.1.0(@swc/core@1.3.68) - -devDependencies: - '@types/node': - specifier: ^20.4.1 - version: 20.4.1 - jiti: - specifier: ^1.17.0 - version: 1.17.0 - -packages: - - /@clack/core@0.3.2: - resolution: {integrity: sha512-FZnsNynwGDIDktx6PEZK1EuCkFpY4ldEX6VYvfl0dqeoLPb9Jpw1xoUXaVcGR8ExmYNm1w2vdGdJkEUYD/2pqg==} - dependencies: - picocolors: 1.0.0 - sisteransi: 1.0.5 - dev: false - - /@clack/prompts@0.6.3: - resolution: {integrity: sha512-AM+kFmAHawpUQv2q9+mcB6jLKxXGjgu/r2EQjEwujgpCdzrST6BJqYw00GRn56/L/Izw5U7ImoLmy00X/r80Pw==} - dependencies: - '@clack/core': 0.3.2 - picocolors: 1.0.0 - sisteransi: 1.0.5 - dev: false - bundledDependencies: - - is-unicode-supported - - /@esbuild/android-arm64@0.18.12: - resolution: {integrity: sha512-BMAlczRqC/LUt2P97E4apTBbkvS9JTJnp2DKFbCwpZ8vBvXVbNdqmvzW/OsdtI/+mGr+apkkpqGM8WecLkPgrA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@esbuild/android-arm@0.18.12: - resolution: {integrity: sha512-LIxaNIQfkFZbTLb4+cX7dozHlAbAshhFE5PKdro0l+FnCpx1GDJaQ2WMcqm+ToXKMt8p8Uojk/MFRuGyz3V5Sw==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@esbuild/android-x64@0.18.12: - resolution: {integrity: sha512-zU5MyluNsykf5cOJ0LZZZjgAHbhPJ1cWfdH1ZXVMXxVMhEV0VZiZXQdwBBVvmvbF28EizeK7obG9fs+fpmS0eQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: false - optional: true - - /@esbuild/darwin-arm64@0.18.12: - resolution: {integrity: sha512-zUZMep7YONnp6954QOOwEBwFX9svlKd3ov6PkxKd53LGTHsp/gy7vHaPGhhjBmEpqXEXShi6dddjIkmd+NgMsA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@esbuild/darwin-x64@0.18.12: - resolution: {integrity: sha512-ohqLPc7i67yunArPj1+/FeeJ7AgwAjHqKZ512ADk3WsE3FHU9l+m5aa7NdxXr0HmN1bjDlUslBjWNbFlD9y12Q==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@esbuild/freebsd-arm64@0.18.12: - resolution: {integrity: sha512-GIIHtQXqgeOOqdG16a/A9N28GpkvjJnjYMhOnXVbn3EDJcoItdR58v/pGN31CHjyXDc8uCcRnFWmqaJt24AYJg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: false - optional: true - - /@esbuild/freebsd-x64@0.18.12: - resolution: {integrity: sha512-zK0b9a1/0wZY+6FdOS3BpZcPc1kcx2G5yxxfEJtEUzVxI6n/FrC2Phsxj/YblPuBchhBZ/1wwn7AyEBUyNSa6g==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-arm64@0.18.12: - resolution: {integrity: sha512-JKgG8Q/LL/9sw/iHHxQyVMoQYu3rU3+a5Z87DxC+wAu3engz+EmctIrV+FGOgI6gWG1z1+5nDDbXiRMGQZXqiw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-arm@0.18.12: - resolution: {integrity: sha512-y75OijvrBE/1XRrXq1jtrJfG26eHeMoqLJ2dwQNwviwTuTtHGCojsDO6BJNF8gU+3jTn1KzJEMETytwsFSvc+Q==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-ia32@0.18.12: - resolution: {integrity: sha512-yoRIAqc0B4lDIAAEFEIu9ttTRFV84iuAl0KNCN6MhKLxNPfzwCBvEMgwco2f71GxmpBcTtn7KdErueZaM2rEvw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-loong64@0.18.12: - resolution: {integrity: sha512-qYgt3dHPVvf/MgbIBpJ4Sup/yb9DAopZ3a2JgMpNKIHUpOdnJ2eHBo/aQdnd8dJ21X/+sS58wxHtA9lEazYtXQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-mips64el@0.18.12: - resolution: {integrity: sha512-wHphlMLK4ufNOONqukELfVIbnGQJrHJ/mxZMMrP2jYrPgCRZhOtf0kC4yAXBwnfmULimV1qt5UJJOw4Kh13Yfg==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-ppc64@0.18.12: - resolution: {integrity: sha512-TeN//1Ft20ZZW41+zDSdOI/Os1bEq5dbvBvYkberB7PHABbRcsteeoNVZFlI0YLpGdlBqohEpjrn06kv8heCJg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-riscv64@0.18.12: - resolution: {integrity: sha512-AgUebVS4DoAblBgiB2ACQ/8l4eGE5aWBb8ZXtkXHiET9mbj7GuWt3OnsIW/zX+XHJt2RYJZctbQ2S/mDjbp0UA==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-s390x@0.18.12: - resolution: {integrity: sha512-dJ3Rb3Ei2u/ysSXd6pzleGtfDdc2MuzKt8qc6ls8vreP1G3B7HInX3i7gXS4BGeVd24pp0yqyS7bJ5NHaI9ing==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-x64@0.18.12: - resolution: {integrity: sha512-OrNJMGQbPaVyHHcDF8ybNSwu7TDOfX8NGpXCbetwOSP6txOJiWlgQnRymfC9ocR1S0Y5PW0Wb1mV6pUddqmvmQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@esbuild/netbsd-x64@0.18.12: - resolution: {integrity: sha512-55FzVCAiwE9FK8wWeCRuvjazNRJ1QqLCYGZVB6E8RuQuTeStSwotpSW4xoRGwp3a1wUsaVCdYcj5LGCASVJmMg==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: false - optional: true - - /@esbuild/openbsd-x64@0.18.12: - resolution: {integrity: sha512-qnluf8rfb6Y5Lw2tirfK2quZOBbVqmwxut7GPCIJsM8lc4AEUj9L8y0YPdLaPK0TECt4IdyBdBD/KRFKorlK3g==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: false - optional: true - - /@esbuild/sunos-x64@0.18.12: - resolution: {integrity: sha512-+RkKpVQR7bICjTOPUpkTBTaJ4TFqQBX5Ywyd/HSdDkQGn65VPkTsR/pL4AMvuMWy+wnXgIl4EY6q4mVpJal8Kg==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: false - optional: true - - /@esbuild/win32-arm64@0.18.12: - resolution: {integrity: sha512-GNHuciv0mFM7ouzsU0+AwY+7eV4Mgo5WnbhfDCQGtpvOtD1vbOiRjPYG6dhmMoFyBjj+pNqQu2X+7DKn0KQ/Gw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@esbuild/win32-ia32@0.18.12: - resolution: {integrity: sha512-kR8cezhYipbbypGkaqCTWIeu4zID17gamC8YTPXYtcN3E5BhhtTnwKBn9I0PJur/T6UVwIEGYzkffNL0lFvxEw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@esbuild/win32-x64@0.18.12: - resolution: {integrity: sha512-O0UYQVkvfM/jO8a4OwoV0mAKSJw+mjWTAd1MJd/1FCX6uiMdLmMRPK/w6e9OQ0ob2WGxzIm9va/KG0Ja4zIOgg==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@jridgewell/gen-mapping@0.3.3: - resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} - engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.18 - dev: false - - /@jridgewell/resolve-uri@3.1.0: - resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} - engines: {node: '>=6.0.0'} - dev: false - - /@jridgewell/set-array@1.1.2: - resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} - engines: {node: '>=6.0.0'} - dev: false - - /@jridgewell/sourcemap-codec@1.4.14: - resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} - dev: false - - /@jridgewell/sourcemap-codec@1.4.15: - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - dev: false - - /@jridgewell/trace-mapping@0.3.18: - resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==} - dependencies: - '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.14 - dev: false - - /@nodelib/fs.scandir@2.1.5: - resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} - engines: {node: '>= 8'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - run-parallel: 1.2.0 - dev: false - - /@nodelib/fs.stat@2.0.5: - resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} - engines: {node: '>= 8'} - dev: false - - /@nodelib/fs.walk@1.2.8: - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} - dependencies: - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 - dev: false - - /@swc/core-darwin-arm64@1.3.68: - resolution: {integrity: sha512-Z5pNxeuP2NxpOHTzDQkJs0wAPLnTlglZnR3WjObijwvdwT/kw1Y5EPDKM/BVSIeG40SPMkDLBbI0aj0qyXzrBA==} - engines: {node: '>=10'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@swc/core-darwin-x64@1.3.68: - resolution: {integrity: sha512-ZHl42g6yXhfX4PzAQ0BNvBXpt/OcbAHfubWRN6eXELK3fiNnxL7QBW1if7iizlq6iA+Mj1pwHyyUit1pz0+fgA==} - engines: {node: '>=10'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /@swc/core-linux-arm-gnueabihf@1.3.68: - resolution: {integrity: sha512-Mk8f6KCOQ2CNAR4PtWajIjS6XKSSR7ZYDOCf1GXRxhS3qEyQH7V8elWvqWYqHcT4foO60NUmxA/NOM/dQrdO1A==} - engines: {node: '>=10'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@swc/core-linux-arm64-gnu@1.3.68: - resolution: {integrity: sha512-RhBllggh9t9sIxaRgRcGrVaS7fDk6KsIqR6b9+dwU5OyDr4ZyHWw1ZaH/1/HAebuXYhNBjoNUiRtca6lKRIPgQ==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@swc/core-linux-arm64-musl@1.3.68: - resolution: {integrity: sha512-8K3zjU+tFgn6yGDEeD343gkKaHU9dhz77NiVkI1VzwRaT/Ag5pwl5eMQ1yStm8koNFzn3zq6rGjHfI5g2yI5Wg==} - engines: {node: '>=10'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@swc/core-linux-x64-gnu@1.3.68: - resolution: {integrity: sha512-4xAnvsBOyeTL0AB8GWlRKDM/hsysJ5jr5qvdKKI3rZfJgnnxl/xSX6TJKPsJ8gygfUJ3BmfCbmUmEyeDZ3YPvA==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@swc/core-linux-x64-musl@1.3.68: - resolution: {integrity: sha512-RCpaBo1fcpy1EFdjF+I7N4lfzOaHXVV0iMw/ABM+0PD6tp3V/9pxsguaZyeAHyEiUlDA6PZ4TfXv5zfnXEgW4Q==} - engines: {node: '>=10'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: false - optional: true - - /@swc/core-win32-arm64-msvc@1.3.68: - resolution: {integrity: sha512-v2WZvXrSslYEpY1nqpItyamL4DyaJinmOkXvM8Bc1LLKU5rGuvmBdjUYg/5Y+o0AUynuiWubpgHNOkBWiCvfqw==} - engines: {node: '>=10'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@swc/core-win32-ia32-msvc@1.3.68: - resolution: {integrity: sha512-HH5NJrIdzkJs+1xxprie0qSCMBeL9yeEhcC1yZTzYv8bwmabOUSdtKIqS55iYP/2hLWn9CTbvKPmLOIhCopW3Q==} - engines: {node: '>=10'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@swc/core-win32-x64-msvc@1.3.68: - resolution: {integrity: sha512-9HZVtLQUgK8r/yXQdwe0VBexbIcrY6+fBROhs7AAPWdewpaUeLkwQEJk6TbYr9CQuHw26FFGg6SjwAiqXF+kgQ==} - engines: {node: '>=10'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: false - optional: true - - /@swc/core@1.3.68: - resolution: {integrity: sha512-njGQuJO+Wy06dEayt70cf0c/KI3HGjm4iW9LLViVLBuYNzJ4SSdNfzejludzufu6im+dsDJ0i3QjgWhAIcVHMQ==} - engines: {node: '>=10'} - requiresBuild: true - peerDependencies: - '@swc/helpers': ^0.5.0 - peerDependenciesMeta: - '@swc/helpers': - optional: true - optionalDependencies: - '@swc/core-darwin-arm64': 1.3.68 - '@swc/core-darwin-x64': 1.3.68 - '@swc/core-linux-arm-gnueabihf': 1.3.68 - '@swc/core-linux-arm64-gnu': 1.3.68 - '@swc/core-linux-arm64-musl': 1.3.68 - '@swc/core-linux-x64-gnu': 1.3.68 - '@swc/core-linux-x64-musl': 1.3.68 - '@swc/core-win32-arm64-msvc': 1.3.68 - '@swc/core-win32-ia32-msvc': 1.3.68 - '@swc/core-win32-x64-msvc': 1.3.68 - dev: false - - /@types/node@20.4.1: - resolution: {integrity: sha512-JIzsAvJeA/5iY6Y/OxZbv1lUcc8dNSE77lb2gnBH+/PJ3lFR1Ccvgwl5JWnHAkNHcRsT0TbpVOsiMKZ1F/yyJg==} - dev: true - - /ansi-regex@5.0.1: - resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} - engines: {node: '>=8'} - dev: false - - /ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} - dependencies: - color-convert: 2.0.1 - dev: false - - /any-promise@1.3.0: - resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - dev: false - - /anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - dev: false - - /array-union@2.1.0: - resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} - engines: {node: '>=8'} - dev: false - - /balanced-match@1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: false - - /binary-extensions@2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - dev: false - - /brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - dev: false - - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} - engines: {node: '>=8'} - dependencies: - fill-range: 7.0.1 - dev: false - - /bundle-require@4.0.1(esbuild@0.18.12): - resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - peerDependencies: - esbuild: '>=0.17' - dependencies: - esbuild: 0.18.12 - load-tsconfig: 0.2.5 - dev: false - - /cac@6.7.14: - resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} - engines: {node: '>=8'} - dev: false - - /chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - dev: false - - /chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.2 - dev: false - - /cmd-ts@0.12.1: - resolution: {integrity: sha512-k93f6LgFEzx7/vBy5qV+tu1VI8YuH0DZmwNXPvRaDR4Qp7Fl9+pUSylX/CKHrWoKqHMJjNOLb1NeYTvHOjQ2Kw==} - dependencies: - chalk: 4.1.2 - debug: 4.3.4 - didyoumean: 1.2.2 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - dev: false - - /color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} - dependencies: - color-name: 1.1.4 - dev: false - - /color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - dev: false - - /commander@4.1.1: - resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} - engines: {node: '>= 6'} - dev: false - - /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - dev: false - - /cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} - engines: {node: '>= 8'} - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - dev: false - - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - dev: false - - /detect-package-manager@2.0.1: - resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==} - engines: {node: '>=12'} - dependencies: - execa: 5.1.1 - dev: false - - /didyoumean@1.2.2: - resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - dev: false - - /dir-glob@3.0.1: - resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} - engines: {node: '>=8'} - dependencies: - path-type: 4.0.0 - dev: false - - /esbuild@0.18.12: - resolution: {integrity: sha512-XuOVLDdtsDslXStStduT41op21Ytmf4/BDS46aa3xPJ7X5h2eMWBF1oAe3QjUH3bDksocNXgzGUZ7XHIBya6Tg==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.18.12 - '@esbuild/android-arm64': 0.18.12 - '@esbuild/android-x64': 0.18.12 - '@esbuild/darwin-arm64': 0.18.12 - '@esbuild/darwin-x64': 0.18.12 - '@esbuild/freebsd-arm64': 0.18.12 - '@esbuild/freebsd-x64': 0.18.12 - '@esbuild/linux-arm': 0.18.12 - '@esbuild/linux-arm64': 0.18.12 - '@esbuild/linux-ia32': 0.18.12 - '@esbuild/linux-loong64': 0.18.12 - '@esbuild/linux-mips64el': 0.18.12 - '@esbuild/linux-ppc64': 0.18.12 - '@esbuild/linux-riscv64': 0.18.12 - '@esbuild/linux-s390x': 0.18.12 - '@esbuild/linux-x64': 0.18.12 - '@esbuild/netbsd-x64': 0.18.12 - '@esbuild/openbsd-x64': 0.18.12 - '@esbuild/sunos-x64': 0.18.12 - '@esbuild/win32-arm64': 0.18.12 - '@esbuild/win32-ia32': 0.18.12 - '@esbuild/win32-x64': 0.18.12 - dev: false - - /execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - dev: false - - /execa@7.1.1: - resolution: {integrity: sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==} - engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 4.3.1 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.1.0 - onetime: 6.0.0 - signal-exit: 3.0.7 - strip-final-newline: 3.0.0 - dev: false - - /fast-glob@3.3.0: - resolution: {integrity: sha512-ChDuvbOypPuNjO8yIDf36x7BlZX1smcUMTTcyoIjycexOxd6DFsKsg21qVBzEmr3G7fUKIRy2/psii+CIUt7FA==} - engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - dev: false - - /fastq@1.15.0: - resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} - dependencies: - reusify: 1.0.4 - dev: false - - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} - dependencies: - to-regex-range: 5.0.1 - dev: false - - /fs.realpath@1.0.0: - resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - dev: false - - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - requiresBuild: true - dev: false - optional: true - - /get-stream@6.0.1: - resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} - engines: {node: '>=10'} - dev: false - - /glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - dependencies: - is-glob: 4.0.3 - dev: false - - /glob@7.1.6: - resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: false - - /globby@11.1.0: - resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} - engines: {node: '>=10'} - dependencies: - array-union: 2.1.0 - dir-glob: 3.0.1 - fast-glob: 3.3.0 - ignore: 5.2.4 - merge2: 1.4.1 - slash: 3.0.0 - dev: false - - /has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - dev: false - - /human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - dev: false - - /human-signals@4.3.1: - resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} - engines: {node: '>=14.18.0'} - dev: false - - /ignore@5.2.4: - resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} - engines: {node: '>= 4'} - dev: false - - /inflight@1.0.6: - resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - dev: false - - /inherits@2.0.4: - resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - dev: false - - /is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - dependencies: - binary-extensions: 2.2.0 - dev: false - - /is-extglob@2.1.1: - resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} - engines: {node: '>=0.10.0'} - dev: false - - /is-glob@4.0.3: - resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} - engines: {node: '>=0.10.0'} - dependencies: - is-extglob: 2.1.1 - dev: false - - /is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - dev: false - - /is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - dev: false - - /is-stream@3.0.0: - resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: false - - /isexe@2.0.0: - resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - dev: false - - /jiti@1.17.0: - resolution: {integrity: sha512-CByzPgFqYoB9odEeef7GNmQ3S5THIBOtzRYoSCya2Sv27AuQxy2jgoFjQ6VTF53xsq1MXRm+YWNvOoDHUAteOw==} - hasBin: true - dev: true - - /joycon@3.1.1: - resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} - engines: {node: '>=10'} - dev: false - - /lilconfig@2.1.0: - resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} - engines: {node: '>=10'} - dev: false - - /lines-and-columns@1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - dev: false - - /load-tsconfig@0.2.5: - resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: false - - /lodash.sortby@4.7.0: - resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} - dev: false - - /merge-stream@2.0.0: - resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - dev: false - - /merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - dev: false - - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} - engines: {node: '>=8.6'} - dependencies: - braces: 3.0.2 - picomatch: 2.3.1 - dev: false - - /mimic-fn@2.1.0: - resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} - engines: {node: '>=6'} - dev: false - - /mimic-fn@4.0.0: - resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} - engines: {node: '>=12'} - dev: false - - /minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - dependencies: - brace-expansion: 1.1.11 - dev: false - - /ms@2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - dev: false - - /mz@2.7.0: - resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - dependencies: - any-promise: 1.3.0 - object-assign: 4.1.1 - thenify-all: 1.6.0 - dev: false - - /normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - dev: false - - /npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - dependencies: - path-key: 3.1.1 - dev: false - - /npm-run-path@5.1.0: - resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - path-key: 4.0.0 - dev: false - - /object-assign@4.1.1: - resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} - engines: {node: '>=0.10.0'} - dev: false - - /once@1.4.0: - resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - dependencies: - wrappy: 1.0.2 - dev: false - - /onetime@5.1.2: - resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} - engines: {node: '>=6'} - dependencies: - mimic-fn: 2.1.0 - dev: false - - /onetime@6.0.0: - resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} - engines: {node: '>=12'} - dependencies: - mimic-fn: 4.0.0 - dev: false - - /path-is-absolute@1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - dev: false - - /path-key@3.1.1: - resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} - engines: {node: '>=8'} - dev: false - - /path-key@4.0.0: - resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} - engines: {node: '>=12'} - dev: false - - /path-type@4.0.0: - resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} - engines: {node: '>=8'} - dev: false - - /picocolors@1.0.0: - resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - dev: false - - /picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} - engines: {node: '>=8.6'} - dev: false - - /pirates@4.0.6: - resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} - engines: {node: '>= 6'} - dev: false - - /postcss-load-config@4.0.1: - resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} - engines: {node: '>= 14'} - peerDependencies: - postcss: '>=8.0.9' - ts-node: '>=9.0.0' - peerDependenciesMeta: - postcss: - optional: true - ts-node: - optional: true - dependencies: - lilconfig: 2.1.0 - yaml: 2.3.1 - dev: false - - /punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} - engines: {node: '>=6'} - dev: false - - /queue-microtask@1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - dev: false - - /readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.1 - dev: false - - /resolve-from@5.0.0: - resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} - engines: {node: '>=8'} - dev: false - - /reusify@1.0.4: - resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} - engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - dev: false - - /rollup@3.26.2: - resolution: {integrity: sha512-6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: false - - /run-parallel@1.2.0: - resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - dependencies: - queue-microtask: 1.2.3 - dev: false - - /shebang-command@2.0.0: - resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} - engines: {node: '>=8'} - dependencies: - shebang-regex: 3.0.0 - dev: false - - /shebang-regex@3.0.0: - resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} - engines: {node: '>=8'} - dev: false - - /signal-exit@3.0.7: - resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - dev: false - - /sisteransi@1.0.5: - resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - dev: false - - /slash@3.0.0: - resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} - engines: {node: '>=8'} - dev: false - - /source-map@0.8.0-beta.0: - resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} - engines: {node: '>= 8'} - dependencies: - whatwg-url: 7.1.0 - dev: false - - /strip-ansi@6.0.1: - resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} - engines: {node: '>=8'} - dependencies: - ansi-regex: 5.0.1 - dev: false - - /strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - dev: false - - /strip-final-newline@3.0.0: - resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} - engines: {node: '>=12'} - dev: false - - /sucrase@3.32.0: - resolution: {integrity: sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==} - engines: {node: '>=8'} - hasBin: true - dependencies: - '@jridgewell/gen-mapping': 0.3.3 - commander: 4.1.1 - glob: 7.1.6 - lines-and-columns: 1.2.4 - mz: 2.7.0 - pirates: 4.0.6 - ts-interface-checker: 0.1.13 - dev: false - - /supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - dependencies: - has-flag: 4.0.0 - dev: false - - /thenify-all@1.6.0: - resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} - engines: {node: '>=0.8'} - dependencies: - thenify: 3.3.1 - dev: false - - /thenify@3.3.1: - resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - dependencies: - any-promise: 1.3.0 - dev: false - - /to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - dependencies: - is-number: 7.0.0 - dev: false - - /tr46@1.0.1: - resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} - dependencies: - punycode: 2.3.0 - dev: false - - /tree-kill@1.2.2: - resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} - hasBin: true - dev: false - - /ts-interface-checker@0.1.13: - resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - dev: false - - /tsup@7.1.0(@swc/core@1.3.68): - resolution: {integrity: sha512-mazl/GRAk70j8S43/AbSYXGgvRP54oQeX8Un4iZxzATHt0roW0t6HYDVZIXMw0ZQIpvr1nFMniIVnN5186lW7w==} - engines: {node: '>=16.14'} - hasBin: true - peerDependencies: - '@swc/core': ^1 - postcss: ^8.4.12 - typescript: '>=4.1.0' - peerDependenciesMeta: - '@swc/core': - optional: true - postcss: - optional: true - typescript: - optional: true - dependencies: - '@swc/core': 1.3.68 - bundle-require: 4.0.1(esbuild@0.18.12) - cac: 6.7.14 - chokidar: 3.5.3 - debug: 4.3.4 - esbuild: 0.18.12 - execa: 5.1.1 - globby: 11.1.0 - joycon: 3.1.1 - postcss-load-config: 4.0.1 - resolve-from: 5.0.0 - rollup: 3.26.2 - source-map: 0.8.0-beta.0 - sucrase: 3.32.0 - tree-kill: 1.2.2 - transitivePeerDependencies: - - supports-color - - ts-node - dev: false - - /webidl-conversions@4.0.2: - resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} - dev: false - - /whatwg-url@7.1.0: - resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} - dependencies: - lodash.sortby: 4.7.0 - tr46: 1.0.1 - webidl-conversions: 4.0.2 - dev: false - - /which@2.0.2: - resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} - engines: {node: '>= 8'} - hasBin: true - dependencies: - isexe: 2.0.0 - dev: false - - /wrappy@1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - dev: false - - /yaml@2.3.1: - resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} - engines: {node: '>= 14'} - dev: false diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ef4d4b1..07d7979 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.11", + "version": "0.0.12", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", @@ -27,10 +27,10 @@ }, "devDependencies": { "@solid-cli/commands": "workspace:*", - "jiti": "^1.19.1", + "jiti": "^1.19.3", "tsup": "^7.2.0", - "typescript": "^5.1.6", - "@clack/prompts": "0.6.3", + "typescript": "^5.2.2", + "@clack/prompts": "0.7.0", "picocolors": "^1.0.0" }, "publishConfig": { diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 689410d..0fbc666 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -29,7 +29,7 @@ "author": "Thomas Beer", "devDependencies": { "tsup": "^7.2.0", - "typescript": "^5.1.6" + "typescript": "^5.2.2" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index d82ae25..4ec7a32 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.7", + "version": "0.0.8", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { @@ -28,15 +28,15 @@ }, "devDependencies": { "tsup": "^7.2.0", - "typescript": "^5.1.6", + "typescript": "^5.2.2", "@types/node": "20.4.8" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.3.2", - "@clack/prompts": "0.6.3", + "@clack/core": "0.3.3", + "@clack/prompts": "0.7.0", "picocolors": "^1.0.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/utils": "workspace:*" diff --git a/packages/utils/package.json b/packages/utils/package.json index 261784d..66ce65d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.7", + "version": "0.0.8", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -50,6 +50,11 @@ "import": "./dist/primitives/index.mjs", "require": "./dist/primitives/index.mjs", "types": "./types/primitives/index.d.ts" + }, + "./detect-package-manager": { + "import": "./dist/detect-package-manager/index.mjs", + "require": "./dist/detect-package-manager/index.mjs", + "types": "./types/detect-package-manager/index.d.ts" } }, "scripts": { @@ -59,21 +64,20 @@ "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", "@types/node": "20.4.8", - "jiti": "^1.19.1", + "jiti": "^1.19.3", "tsup": "^7.2.0", - "typescript": "^5.1.6", + "typescript": "^5.2.2", "vitest": "^0.33.0" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.3.2", - "@clack/prompts": "0.6.3", + "@clack/core": "0.3.3", + "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@swc/core": "^1.3.76", "cmd-ts": "^0.12.1", - "detect-package-manager": "^2.0.1", "execa": "^8.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.1" diff --git a/packages/utils/src/detect-package-manager/index.ts b/packages/utils/src/detect-package-manager/index.ts new file mode 100644 index 0000000..b8b38ed --- /dev/null +++ b/packages/utils/src/detect-package-manager/index.ts @@ -0,0 +1,22 @@ +// Taken almost verbatim from https://github.com/solidjs/solid-start/blob/f351f42ba8566cbfa72b483dd63d4debcb386230/packages/create-solid/cli/index.js#L62C1-L80C2 +export const getUserPkgManager = (): PM => { + // This environment variable is set by npm and yarn but pnpm seems less consistent + const userAgent = process.env.npm_config_user_agent; + + if (userAgent) { + if (userAgent.startsWith("yarn")) { + return "yarn"; + } else if (userAgent.startsWith("pnpm")) { + return "pnpm"; + } else if (userAgent.startsWith("bun")) { + return "bun"; + } else { + return "npm"; + } + } else { + // If no user agent is set, assume npm + return "npm"; + } +}; + +export type PM = "npm" | "yarn" | "pnpm" | "bun"; diff --git a/packages/utils/src/paths/index.ts b/packages/utils/src/paths/index.ts index 0f82d83..0111491 100644 --- a/packages/utils/src/paths/index.ts +++ b/packages/utils/src/paths/index.ts @@ -1,4 +1,4 @@ -import { PM } from "detect-package-manager"; +import { PM } from "../detect-package-manager"; import { homedir as oshomedir, tmpdir as ostmpdir } from "os"; export const homedir = () => { @@ -16,5 +16,7 @@ export const getRunner = (pM: PM) => { return "npx"; case "pnpm": return "pnpx"; + case "bun": + return "bunx"; } }; diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index 4bf3b78..84e8f86 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -1,6 +1,6 @@ import { open, writeFile } from "fs/promises"; import { $ } from "execa"; -import { detect, type PM } from "detect-package-manager"; +import { getUserPkgManager, type PM } from "../detect-package-manager"; // Batch all updates here, so we can confirm with the user then flush // @ts-ignore export const UPDATESQUEUE: Update[] = globalThis.UPDATESQUEUE ?? []; @@ -25,6 +25,8 @@ const installCommand = (pM: PM): string => { return "add"; case "pnpm": return "add"; + case "bun": + return "install"; } }; export const clearQueue = () => { @@ -54,7 +56,7 @@ export const readQueuedFile = (name: string) => { }; export const flushFileUpdates = async () => { const fileUpdates = UPDATESQUEUE.filter((u) => u.type === "file") as FileUpdate[]; - + for (const update of fileUpdates) { if (!update.checked) { await writeFile(update.name, update.contents); @@ -70,7 +72,7 @@ export const flushFileUpdates = async () => { }; export const flushPackageUpdates = async () => { const packageUpdates = UPDATESQUEUE.filter((u) => u.type === "package") as PackageUpdate[]; - const pM = await detect(); + const pM = getUserPkgManager(); const instlCmd = installCommand(pM); for (const update of packageUpdates) { await $`${pM} ${instlCmd} ${update.name}`; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d3694a..b2c171c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,11 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -patchedDependencies: - detect-package-manager@2.0.1: - hash: z3ggdkumlo4f7lrrhi5q7ehiyi - path: patches/detect-package-manager@2.0.1.patch - importers: .: @@ -20,20 +15,20 @@ importers: specifier: ^3.0.1 version: 3.0.1 prettier: - specifier: ^3.0.2 - version: 3.0.2 + specifier: ^3.0.3 + version: 3.0.3 turbo: specifier: ^1.10.13 version: 1.10.13 vitest: - specifier: ^0.33.0 - version: 0.33.0 + specifier: ^0.34.3 + version: 0.34.3 packages/commands: dependencies: '@clack/prompts': - specifier: 0.6.3 - version: 0.6.3 + specifier: 0.7.0 + version: 0.7.0 '@solid-cli/reactivity': specifier: workspace:* version: link:../reactivity @@ -46,9 +41,6 @@ importers: degit: specifier: ^2.8.4 version: 2.8.4 - detect-package-manager: - specifier: ^2.0.1 - version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) execa: specifier: ^8.0.1 version: 8.0.1 @@ -73,19 +65,19 @@ importers: version: 3.0.2 tsup: specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.1.6) + version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 packages/core: dependencies: '@clack/core': - specifier: 0.3.2 - version: 0.3.2 + specifier: 0.3.3 + version: 0.3.3 '@clack/prompts': - specifier: 0.6.3 - version: 0.6.3 + specifier: 0.7.0 + version: 0.7.0 '@solid-cli/commands': specifier: workspace:* version: link:../commands @@ -107,9 +99,6 @@ importers: cmd-ts: specifier: ^0.12.1 version: 0.12.1 - detect-package-manager: - specifier: ^2.0.1 - version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) execa: specifier: ^8.0.1 version: 8.0.1 @@ -130,55 +119,55 @@ importers: specifier: ^20.4.9 version: 20.4.9 jiti: - specifier: ^1.19.1 - version: 1.19.1 + specifier: ^1.19.3 + version: 1.19.3 tsup: specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.75)(typescript@5.1.6) + version: 7.2.0(@swc/core@1.3.75)(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 packages/create-solid: devDependencies: '@clack/prompts': - specifier: 0.6.3 - version: 0.6.3 + specifier: 0.7.0 + version: 0.7.0 '@solid-cli/commands': specifier: workspace:* version: link:../commands jiti: - specifier: ^1.19.1 - version: 1.19.1 + specifier: ^1.19.3 + version: 1.19.3 picocolors: specifier: ^1.0.0 version: 1.0.0 tsup: specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.1.6) + version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 packages/reactivity: devDependencies: tsup: specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.1.6) + version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 packages/swc-plugin-solid-cli: {} packages/ui: dependencies: '@clack/core': - specifier: 0.3.2 - version: 0.3.2 + specifier: 0.3.3 + version: 0.3.3 '@clack/prompts': - specifier: 0.6.3 - version: 0.6.3 + specifier: 0.7.0 + version: 0.7.0 '@solid-cli/reactivity': specifier: workspace:* version: link:../reactivity @@ -194,19 +183,19 @@ importers: version: 20.4.8 tsup: specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.1.6) + version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 packages/utils: dependencies: '@clack/core': - specifier: 0.3.2 - version: 0.3.2 + specifier: 0.3.3 + version: 0.3.3 '@clack/prompts': - specifier: 0.6.3 - version: 0.6.3 + specifier: 0.7.0 + version: 0.7.0 '@solid-cli/reactivity': specifier: workspace:* version: link:../reactivity @@ -216,9 +205,6 @@ importers: cmd-ts: specifier: ^0.12.1 version: 0.12.1 - detect-package-manager: - specifier: ^2.0.1 - version: 2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi) execa: specifier: ^8.0.1 version: 8.0.1 @@ -236,14 +222,14 @@ importers: specifier: 20.4.8 version: 20.4.8 jiti: - specifier: ^1.19.1 - version: 1.19.1 + specifier: ^1.19.3 + version: 1.19.3 tsup: specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.1.6) + version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) typescript: - specifier: ^5.1.6 - version: 5.1.6 + specifier: ^5.2.2 + version: 5.2.2 vitest: specifier: ^0.33.0 version: 0.33.0 @@ -345,7 +331,7 @@ packages: meow: 6.1.1 outdent: 0.5.0 p-limit: 2.3.0 - preferred-pm: 3.0.3 + preferred-pm: 3.1.1 resolve-from: 5.0.0 semver: 7.5.4 spawndamnit: 2.0.0 @@ -493,16 +479,16 @@ packages: engines: {node: '>=13'} dev: true - /@clack/core@0.3.2: - resolution: {integrity: sha512-FZnsNynwGDIDktx6PEZK1EuCkFpY4ldEX6VYvfl0dqeoLPb9Jpw1xoUXaVcGR8ExmYNm1w2vdGdJkEUYD/2pqg==} + /@clack/core@0.3.3: + resolution: {integrity: sha512-5ZGyb75BUBjlll6eOa1m/IZBxwk91dooBWhPSL67sWcLS0zt9SnswRL0l26TVdBhb0wnWORRxUn//uH6n4z7+A==} dependencies: picocolors: 1.0.0 sisteransi: 1.0.5 - /@clack/prompts@0.6.3: - resolution: {integrity: sha512-AM+kFmAHawpUQv2q9+mcB6jLKxXGjgu/r2EQjEwujgpCdzrST6BJqYw00GRn56/L/Izw5U7ImoLmy00X/r80Pw==} + /@clack/prompts@0.7.0: + resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==} dependencies: - '@clack/core': 0.3.2 + '@clack/core': 0.3.3 picocolors: 1.0.0 sisteransi: 1.0.5 bundledDependencies: @@ -1032,8 +1018,8 @@ packages: resolution: {integrity: sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==} dev: true - /@types/node@20.5.7: - resolution: {integrity: sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==} + /@types/node@20.5.8: + resolution: {integrity: sha512-eajsR9aeljqNhK028VG0Wuw+OaY5LLxYmxeoXynIoE6jannr9/Ucd1LL0hSSoafk5LTYG+FfqsyGt81Q6Zkybw==} dev: true /@types/normalize-package-data@2.4.1: @@ -1052,6 +1038,14 @@ packages: chai: 4.3.7 dev: true + /@vitest/expect@0.34.3: + resolution: {integrity: sha512-F8MTXZUYRBVsYL1uoIft1HHWhwDbSzwAU9Zgh8S6WFC3YgVb4AnFV2GXO3P5Em8FjEYaZtTnQYoNwwBrlOMXgg==} + dependencies: + '@vitest/spy': 0.34.3 + '@vitest/utils': 0.34.3 + chai: 4.3.8 + dev: true + /@vitest/runner@0.33.0: resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==} dependencies: @@ -1060,6 +1054,14 @@ packages: pathe: 1.1.1 dev: true + /@vitest/runner@0.34.3: + resolution: {integrity: sha512-lYNq7N3vR57VMKMPLVvmJoiN4bqwzZ1euTW+XXYH5kzr3W/+xQG3b41xJn9ChJ3AhYOSoweu974S1V3qDcFESA==} + dependencies: + '@vitest/utils': 0.34.3 + p-limit: 4.0.0 + pathe: 1.1.1 + dev: true + /@vitest/snapshot@0.33.0: resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==} dependencies: @@ -1068,12 +1070,26 @@ packages: pretty-format: 29.6.2 dev: true + /@vitest/snapshot@0.34.3: + resolution: {integrity: sha512-QyPaE15DQwbnIBp/yNJ8lbvXTZxS00kRly0kfFgAD5EYmCbYcA+1EEyRalc93M0gosL/xHeg3lKAClIXYpmUiQ==} + dependencies: + magic-string: 0.30.3 + pathe: 1.1.1 + pretty-format: 29.6.2 + dev: true + /@vitest/spy@0.33.0: resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==} dependencies: tinyspy: 2.1.1 dev: true + /@vitest/spy@0.34.3: + resolution: {integrity: sha512-N1V0RFQ6AI7CPgzBq9kzjRdPIgThC340DGjdKdPSE8r86aUSmeliTUgkTqLSgtEwWWsGfBQ+UetZWhK0BgJmkQ==} + dependencies: + tinyspy: 2.1.1 + dev: true + /@vitest/utils@0.33.0: resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==} dependencies: @@ -1082,6 +1098,14 @@ packages: pretty-format: 29.6.2 dev: true + /@vitest/utils@0.34.3: + resolution: {integrity: sha512-kiSnzLG6m/tiT0XEl4U2H8JDBjFtwVlaE8I3QfGiMFR0QvnRDfYfdP3YvTBWM/6iJDAyaPY6yVQiCTUc7ZzTHA==} + dependencies: + diff-sequences: 29.4.3 + loupe: 2.3.6 + pretty-format: 29.6.2 + dev: true + /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: true @@ -1500,14 +1524,6 @@ packages: hasBin: true dev: true - /detect-package-manager@2.0.1(patch_hash=z3ggdkumlo4f7lrrhi5q7ehiyi): - resolution: {integrity: sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==} - engines: {node: '>=12'} - dependencies: - execa: 5.1.1 - dev: false - patched: true - /didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} dev: false @@ -1670,6 +1686,7 @@ packages: onetime: 5.1.2 signal-exit: 3.0.7 strip-final-newline: 2.0.0 + dev: true /execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} @@ -1820,6 +1837,7 @@ packages: /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} + dev: true /get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} @@ -1943,6 +1961,7 @@ packages: /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} + dev: true /human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} @@ -2106,6 +2125,7 @@ packages: /is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} + dev: true /is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} @@ -2158,8 +2178,8 @@ packages: /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - /jiti@1.19.1: - resolution: {integrity: sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==} + /jiti@1.19.3: + resolution: {integrity: sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==} hasBin: true dev: true @@ -2346,6 +2366,7 @@ packages: /mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} + dev: true /mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} @@ -2448,6 +2469,7 @@ packages: engines: {node: '>=8'} dependencies: path-key: 3.1.1 + dev: true /npm-run-path@5.1.0: resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} @@ -2489,6 +2511,7 @@ packages: engines: {node: '>=6'} dependencies: mimic-fn: 2.1.0 + dev: true /onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} @@ -2651,8 +2674,8 @@ packages: yaml: 2.3.1 dev: true - /postcss@8.4.28: - resolution: {integrity: sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==} + /postcss@8.4.29: + resolution: {integrity: sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.6 @@ -2660,8 +2683,8 @@ packages: source-map-js: 1.0.2 dev: true - /preferred-pm@3.0.3: - resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==} + /preferred-pm@3.1.1: + resolution: {integrity: sha512-CsZgOVLKHifdoRu2y66P1s6oLb2WfT5Njkcgi80I/52FWTTVkWG6z0Z13vPkXC4hsT0nMrYXqX30buH8+D2eRQ==} engines: {node: '>=10'} dependencies: find-up: 5.0.0 @@ -2682,6 +2705,12 @@ packages: hasBin: true dev: true + /prettier@3.0.3: + resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + engines: {node: '>=14'} + hasBin: true + dev: true + /pretty-format@29.6.2: resolution: {integrity: sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -2899,6 +2928,7 @@ packages: /signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} + dev: true /signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} @@ -3045,6 +3075,7 @@ packages: /strip-final-newline@2.0.0: resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} engines: {node: '>=6'} + dev: true /strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} @@ -3132,6 +3163,11 @@ packages: engines: {node: '>=14.0.0'} dev: true + /tinypool@0.7.0: + resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==} + engines: {node: '>=14.0.0'} + dev: true + /tinyspy@2.1.1: resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==} engines: {node: '>=14.0.0'} @@ -3177,7 +3213,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@7.2.0(@swc/core@1.3.75)(typescript@5.1.6): + /tsup@7.2.0(@swc/core@1.3.75)(typescript@5.2.2): resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} engines: {node: '>=16.14'} hasBin: true @@ -3208,13 +3244,13 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 - typescript: 5.1.6 + typescript: 5.2.2 transitivePeerDependencies: - supports-color - ts-node dev: true - /tsup@7.2.0(@swc/core@1.3.76)(typescript@5.1.6): + /tsup@7.2.0(@swc/core@1.3.76)(typescript@5.2.2): resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} engines: {node: '>=16.14'} hasBin: true @@ -3245,7 +3281,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 - typescript: 5.1.6 + typescript: 5.2.2 transitivePeerDependencies: - supports-color - ts-node @@ -3384,8 +3420,8 @@ packages: is-typed-array: 1.1.12 dev: true - /typescript@5.1.6: - resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + /typescript@5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -3419,7 +3455,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@0.33.0(@types/node@20.5.7): + /vite-node@0.33.0(@types/node@20.5.8): resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==} engines: {node: '>=v14.18.0'} hasBin: true @@ -3429,7 +3465,29 @@ packages: mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.5.7) + vite: 4.4.9(@types/node@20.5.8) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vite-node@0.34.3(@types/node@20.5.8): + resolution: {integrity: sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==} + engines: {node: '>=v14.18.0'} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4 + mlly: 1.4.0 + pathe: 1.1.1 + picocolors: 1.0.0 + vite: 4.4.9(@types/node@20.5.8) transitivePeerDependencies: - '@types/node' - less @@ -3441,7 +3499,7 @@ packages: - terser dev: true - /vite@4.4.9(@types/node@20.5.7): + /vite@4.4.9(@types/node@20.5.8): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -3469,9 +3527,9 @@ packages: terser: optional: true dependencies: - '@types/node': 20.5.7 + '@types/node': 20.5.8 esbuild: 0.18.20 - postcss: 8.4.28 + postcss: 8.4.29 rollup: 3.28.1 optionalDependencies: fsevents: 2.3.3 @@ -3510,7 +3568,7 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 20.5.7 + '@types/node': 20.5.8 '@vitest/expect': 0.33.0 '@vitest/runner': 0.33.0 '@vitest/snapshot': 0.33.0 @@ -3529,8 +3587,73 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.0 tinypool: 0.6.0 - vite: 4.4.9(@types/node@20.5.7) - vite-node: 0.33.0(@types/node@20.5.7) + vite: 4.4.9(@types/node@20.5.8) + vite-node: 0.33.0(@types/node@20.5.8) + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vitest@0.34.3: + resolution: {integrity: sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==} + engines: {node: '>=v14.18.0'} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@vitest/browser': '*' + '@vitest/ui': '*' + happy-dom: '*' + jsdom: '*' + playwright: '*' + safaridriver: '*' + webdriverio: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + playwright: + optional: true + safaridriver: + optional: true + webdriverio: + optional: true + dependencies: + '@types/chai': 4.3.5 + '@types/chai-subset': 1.3.3 + '@types/node': 20.5.8 + '@vitest/expect': 0.34.3 + '@vitest/runner': 0.34.3 + '@vitest/snapshot': 0.34.3 + '@vitest/spy': 0.34.3 + '@vitest/utils': 0.34.3 + acorn: 8.10.0 + acorn-walk: 8.2.0 + cac: 6.7.14 + chai: 4.3.8 + debug: 4.3.4 + local-pkg: 0.4.3 + magic-string: 0.30.3 + pathe: 1.1.1 + picocolors: 1.0.0 + std-env: 3.4.3 + strip-literal: 1.3.0 + tinybench: 2.5.0 + tinypool: 0.7.0 + vite: 4.4.9(@types/node@20.5.8) + vite-node: 0.34.3(@types/node@20.5.8) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 109c58fcb29edebc0036cbbcf53097f49d145c81 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:51:25 +0100 Subject: [PATCH 017/290] Remove ts ignores Fix typo --- packages/utils/src/updates/index.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index 84e8f86..690ff84 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -1,15 +1,16 @@ import { open, writeFile } from "fs/promises"; import { $ } from "execa"; import { getUserPkgManager, type PM } from "../detect-package-manager"; +declare global { + var UPDATESQUEUE: Update[] | undefined; +} // Batch all updates here, so we can confirm with the user then flush -// @ts-ignore export const UPDATESQUEUE: Update[] = globalThis.UPDATESQUEUE ?? []; -// @ts-ignore globalThis.UPDATESQUEUE = UPDATESQUEUE; type PackageUpdate = { type: "package"; name: string }; type CommandUpdate = { type: "command"; name: string }; type FileUpdate = { type: "file"; name: string; contents: string; checked: boolean }; -// Don't bother explicitely handling plugin updates, since they're just a file update +// Don't bother explicitly handling plugin updates, since they're just a file update export type Update = PackageUpdate | CommandUpdate | FileUpdate; type UpdateSummary = { packageUpdates: string[]; From 8bc0da1d937b4714d9b9d87067490d54935e131c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 17:54:08 +0100 Subject: [PATCH 018/290] Bump core, so that it no longer depends on `detect-package-manager` on npm --- packages/core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/package.json b/packages/core/package.json index b35528e..ae8f1aa 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.17", + "version": "0.0.18", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", From 533aad412ee535f61534de295ea6fc69cff99fb7 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:08:03 +0100 Subject: [PATCH 019/290] Bump utils --- packages/utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/package.json b/packages/utils/package.json index 66ce65d..04d0d59 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.8", + "version": "0.0.9", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 2f6e6ff53695da289e7c26015e7a530c5043b569 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:09:47 +0100 Subject: [PATCH 020/290] Bump commands --- packages/commands/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 6ec5eab..dd2b088 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.6", + "version": "0.0.7", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From ec5c375a378face30b7c6dfa0f5d7b6a2f142a6b Mon Sep 17 00:00:00 2001 From: Michael Essiet Date: Sun, 3 Sep 2023 14:01:04 +0100 Subject: [PATCH 021/290] Update installation.md --- docs/vitepress_docs/installation.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/vitepress_docs/installation.md b/docs/vitepress_docs/installation.md index 405da30..58474ed 100644 --- a/docs/vitepress_docs/installation.md +++ b/docs/vitepress_docs/installation.md @@ -7,6 +7,15 @@ npm install @solid-cli/core ``` Or installed globally: +### UNIX/MacOS/Linux + +In order to install global packages on Unix based systems you will need to grant npm special system permissions using the `sudo` command, suffixed by the command you would like to run. + +```sh +sudo npm install -g @solid-cli/core +``` + +### Windows ```sh npm install -g @solid-cli/core From 11c311c8a0f6444e7778d6102068da0b51666435 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 4 Sep 2023 16:30:45 +0100 Subject: [PATCH 022/290] Add nested effects test --- packages/reactivity/test/effects.test.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/reactivity/test/effects.test.ts b/packages/reactivity/test/effects.test.ts index 6156aaf..735f405 100644 --- a/packages/reactivity/test/effects.test.ts +++ b/packages/reactivity/test/effects.test.ts @@ -32,4 +32,23 @@ describe("createEffect", () => { set(2); expect(updates).toBe(3); }); + test("Nested effects", () => { + const [A, setA] = createSignal(0); + let updates = 0; + createEffect(() => { + A(); + updates++; + let nestedUpdates = 0; + const [get, set] = createSignal(0); + createEffect(() => { + get(); + nestedUpdates++; + }); + expect(nestedUpdates).toBe(1); + set(1); + expect(nestedUpdates).toBe(2); + }); + setA(1); + expect(updates).toBe(2); + }); }); From 96752e7f4c6ef8f6b9f4bcca4271508edfb4380d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Sep 2023 15:05:14 +0100 Subject: [PATCH 023/290] Remove unnecessary patch --- patches/detect-package-manager@2.0.1.patch | 105 --------------------- 1 file changed, 105 deletions(-) delete mode 100644 patches/detect-package-manager@2.0.1.patch diff --git a/patches/detect-package-manager@2.0.1.patch b/patches/detect-package-manager@2.0.1.patch deleted file mode 100644 index c052925..0000000 --- a/patches/detect-package-manager@2.0.1.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --git a/package.json b/package.json -index 7e338208773e2385934056669fcd5f9db1d20408..1d16444bd700ed288585bf881a827ecb0bb7f98d 100644 ---- a/package.json -+++ b/package.json -@@ -1,50 +1,52 @@ - { -- "name": "detect-package-manager", -- "version": "2.0.1", -- "description": "Detect which package manager you're using (yarn or npm)", -- "repository": { -- "url": "egoist/detect-package-manager", -- "type": "git" -- }, -- "main": "dist/index.js", -- "module": "dist/index.mjs", -- "exports": { -- ".": { -- "require": "./dist/index.js", -- "default": "./dist/index.mjs" -- } -- }, -- "types": "./dist/index.d.ts", -- "files": [ -- "dist" -- ], -- "keywords": [ -- "npm", -- "yarn", -- "package-manager", -- "detect", -- "check", -- "pnpm" -- ], -- "scripts": { -- "build": "tsup src/index.ts --format esm,cjs --dts", -- "test": "node -r sucrase/register test.ts", -- "prepublishOnly": "npm run build" -- }, -- "author": "egoist <0x142857@gmail.com>", -- "license": "MIT", -- "dependencies": { -- "execa": "^5.1.1" -- }, -- "devDependencies": { -- "@types/node": "^16.11.4", -- "ava": "^3.15.0", -- "sucrase": "^3.20.3", -- "tsup": "^5.4.4", -- "typescript": "^4.4.4", -- "uvu": "^0.5.2" -- }, -- "engines": { -- "node": ">=12" -- } -+ "name": "detect-package-manager", -+ "version": "2.0.1", -+ "description": "Detect which package manager you're using (yarn or npm)", -+ "repository": { -+ "url": "egoist/detect-package-manager", -+ "type": "git" -+ }, -+ "main": "dist/index.js", -+ "module": "dist/index.mjs", -+ "exports": { -+ ".": { -+ "require": "./dist/index.js", -+ "default": "./dist/index.mjs", -+ "import": "./dist/index.mjs", -+ "types": "./dist/index.d.ts" -+ } -+ }, -+ "types": "./dist/index.d.ts", -+ "files": [ -+ "dist" -+ ], -+ "keywords": [ -+ "npm", -+ "yarn", -+ "package-manager", -+ "detect", -+ "check", -+ "pnpm" -+ ], -+ "scripts": { -+ "build": "tsup src/index.ts --format esm,cjs --dts", -+ "test": "node -r sucrase/register test.ts", -+ "prepublishOnly": "npm run build" -+ }, -+ "author": "egoist <0x142857@gmail.com>", -+ "license": "MIT", -+ "dependencies": { -+ "execa": "^5.1.1" -+ }, -+ "devDependencies": { -+ "@types/node": "^16.11.4", -+ "ava": "^3.15.0", -+ "sucrase": "^3.20.3", -+ "tsup": "^5.4.4", -+ "typescript": "^4.4.4", -+ "uvu": "^0.5.2" -+ }, -+ "engines": { -+ "node": ">=12" -+ } - } \ No newline at end of file From d0b2a4cd1ae81f3c7fc2b8ecb5327fb328d836a8 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 10 Sep 2023 13:29:14 +0100 Subject: [PATCH 024/290] Remove unnecessary logs --- packages/commands/src/handlers/new.ts | 1 - packages/reactivity/test/memos.test.ts | 2 -- packages/ui/src/components/form/index.ts | 1 - 3 files changed, 4 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index dab3696..8e9bad7 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -211,7 +211,6 @@ export const handleNew = async ( name: string = "solid-project", stackblitz: boolean = false, ) => { - console.log(variation, name, stackblitz); if (!variation) { await handleAutocompleteNew(); return; diff --git a/packages/reactivity/test/memos.test.ts b/packages/reactivity/test/memos.test.ts index 88e28ef..e18c764 100644 --- a/packages/reactivity/test/memos.test.ts +++ b/packages/reactivity/test/memos.test.ts @@ -37,11 +37,9 @@ describe("createMemo", () => { test("Memos don't overexecute in a diamond (The diamond problem)", () => { const [A, setA] = createSignal(0); const B = createMemo(() => { - console.log("B updating"); return A() * 2; }); const C = createMemo(() => { - console.log("C updating"); return A() + 2; }); let updates = 0; diff --git a/packages/ui/src/components/form/index.ts b/packages/ui/src/components/form/index.ts index 99dff16..bfbd08f 100644 --- a/packages/ui/src/components/form/index.ts +++ b/packages/ui/src/components/form/index.ts @@ -22,7 +22,6 @@ export const form = async (fields: Field[]) => { returns.push({ name: field.name, value: r }); } - // console.log(JSON.stringify(returns)); return returns; }; From 892c3ee2b93bfeaa3239119fdb254ce7f345a0c0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 10 Sep 2023 17:43:13 +0100 Subject: [PATCH 025/290] Remove degit Remove unnecessary content from readme --- .gitignore | 3 + README.md | 21 -- package.json | 2 +- packages/commands/package.json | 9 +- packages/commands/src/handlers/new.ts | 19 +- packages/create-solid/package.json | 2 +- packages/create-solid/tsconfig.json | 3 +- pnpm-lock.yaml | 353 +++++++++++++++++--------- 8 files changed, 249 insertions(+), 163 deletions(-) diff --git a/.gitignore b/.gitignore index 5bf8787..084f96e 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,6 @@ dist .yarn/build-state.yml .yarn/install-state.gz .pnp.* + +# Testing directory +testing \ No newline at end of file diff --git a/README.md b/README.md index 867dcb0..dece5aa 100644 --- a/README.md +++ b/README.md @@ -58,27 +58,6 @@ The CLI will use `solid` as the initialiation keyword. The CLI commands will the - `add`: Starts the process of submitting your current project to our ecosystem listing (Solidex) ie. `solid ecosystem publish` - `search`: Initializes an ecosystem search result `solid ecosystem search auth` -# Development Path - -We will need to decide what framework and language we will use to develop this utility. - -## JS - -- [`Solid Ink`](https://github.com/devinxi/solid-ink) - Needs to be maintained but expands our ecosystem -- [`Ink`](https://github.com/vadimdemedes/ink) - React-based and popular -- [`Clack`](https://github.com/natemoo-re/clack) - Used by Astro -- [`Tiny Bin`](https://github.com/fabiospampinato/tiny-bin) - By Fabio! -- [`Prompts`](https://github.com/terkelg/prompts) - Popular and well maintained - -## Rust - -- [`TUI-RS`](https://github.com/fdehau/tui-rs) - Great for using SWC - -## Go - -- [`BubbleTea`](https://github.com/charmbracelet/bubbletea) - Beautiful CLI builder lots of tools -- [`Cobra`](https://github.com/spf13/cobra) - Used by K8 - # Contributions Please feel free to contribute to this repo by expanding on this design document. Once we lock a general design a choice of technology will be decided. diff --git a/package.json b/package.json index ba7b4c2..836f992 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,6 @@ "nodemon": "^3.0.1", "prettier": "^3.0.3", "turbo": "^1.10.13", - "vitest": "^0.34.3" + "vitest": "^0.34.4" } } diff --git a/packages/commands/package.json b/packages/commands/package.json index dd2b088..9e32e39 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.7", + "version": "0.0.8", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", @@ -33,9 +33,8 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/degit": "^2.8.3", - "@types/node": "^20.5.0", - "prettier": "^3.0.2", + "@types/node": "^20.6.0", + "prettier": "^3.0.3", "tsup": "^7.2.0", "typescript": "^5.2.2" }, @@ -43,11 +42,11 @@ "access": "public" }, "dependencies": { + "@begit/core": "^0.0.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "degit": "^2.8.4", "execa": "^8.0.1", "picocolors": "^1.0.0", "sucrase": "^3.34.0" diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 8e9bad7..1406389 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -7,7 +7,7 @@ import { flushQueue } from "@solid-cli/utils/updates"; import { rm } from "fs/promises"; import { basename, join, resolve } from "path"; import { Dirent, copyFileSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; -import degit from "degit"; +import { downloadAndExtract } from "@begit/core"; import { transform } from "sucrase"; const gitIgnore = ` dist @@ -165,9 +165,13 @@ const handleNewStartProject = async (projectName: string) => { startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, fn: async () => { - const emitter = degit(`solidjs/solid-start/examples/${template}#main`); - emitter.on("info", ({ message }) => p.log.info(message)); - await emitter.clone(tempDir); + // const emitter = degit(`solidjs/solid-start/examples/${template}#main`); + // emitter.on("info", ({ message }) => p.log.info(message)); + // await emitter.clone(tempDir); + await downloadAndExtract({ + repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, + dest: tempDir, + }); }, }); @@ -234,9 +238,10 @@ export const handleNew = async ( startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, fn: async () => { - const emitter = degit(`solidjs/templates/${variation}`); - emitter.on("info", ({ message }) => p.log.info(message)); - await emitter.clone(tempDir); + // const emitter = degit(`solidjs/templates/${variation}`); + // emitter.on("info", ({ message }) => p.log.info(message)); + // await emitter.clone(tempDir); + await downloadAndExtract({ repo: { owner: "solidjs", name: "templates", subdir: variation }, dest: tempDir }); }, }); diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 07d7979..b518266 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.12", + "version": "0.0.13", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/tsconfig.json b/packages/create-solid/tsconfig.json index b6d4e3a..55a0135 100644 --- a/packages/create-solid/tsconfig.json +++ b/packages/create-solid/tsconfig.json @@ -10,5 +10,6 @@ "forceConsistentCasingInFileNames": true, "skipLibCheck": true, "resolveJsonModule": true - } + }, + "include": ["src/*"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b2c171c..ef1a12f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,11 +21,14 @@ importers: specifier: ^1.10.13 version: 1.10.13 vitest: - specifier: ^0.34.3 - version: 0.34.3 + specifier: ^0.34.4 + version: 0.34.4 packages/commands: dependencies: + '@begit/core': + specifier: ^0.0.4 + version: 0.0.4 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -38,9 +41,6 @@ importers: '@solid-cli/utils': specifier: workspace:* version: link:../utils - degit: - specifier: ^2.8.4 - version: 2.8.4 execa: specifier: ^8.0.1 version: 8.0.1 @@ -54,15 +54,12 @@ importers: '@chialab/esbuild-plugin-meta-url': specifier: ^0.17.7 version: 0.17.7 - '@types/degit': - specifier: ^2.8.3 - version: 2.8.3 '@types/node': - specifier: ^20.5.0 - version: 20.5.0 + specifier: ^20.6.0 + version: 20.6.0 prettier: - specifier: ^3.0.2 - version: 3.0.2 + specifier: ^3.0.3 + version: 3.0.3 tsup: specifier: ^7.2.0 version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) @@ -244,8 +241,8 @@ packages: chalk: 2.4.2 dev: true - /@babel/helper-validator-identifier@7.22.5: - resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} + /@babel/helper-validator-identifier@7.22.15: + resolution: {integrity: sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==} engines: {node: '>=6.9.0'} dev: true @@ -253,22 +250,28 @@ packages: resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.22.5 + '@babel/helper-validator-identifier': 7.22.15 chalk: 2.4.2 js-tokens: 4.0.0 dev: true - /@babel/runtime@7.22.11: - resolution: {integrity: sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==} + /@babel/runtime@7.22.15: + resolution: {integrity: sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.0 dev: true + /@begit/core@0.0.4: + resolution: {integrity: sha512-DSm+0r43hMwaKx++9bB3ii5Z+8XTs4G4tzTPiChKD+uBYSjIBUONALj0+8oFMVqfM8xLcayLj6TI1ug1gmxxgg==} + dependencies: + tar: 6.2.0 + dev: false + /@changesets/apply-release-plan@6.1.4: resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/config': 2.3.1 '@changesets/get-version-range-type': 0.3.2 '@changesets/git': 2.0.0 @@ -286,7 +289,7 @@ packages: /@changesets/assemble-release-plan@5.2.4: resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/errors': 0.1.4 '@changesets/get-dependents-graph': 1.3.6 '@changesets/types': 5.2.1 @@ -304,7 +307,7 @@ packages: resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==} hasBin: true dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/apply-release-plan': 6.1.4 '@changesets/assemble-release-plan': 5.2.4 '@changesets/changelog-git': 0.1.14 @@ -331,7 +334,7 @@ packages: meow: 6.1.1 outdent: 0.5.0 p-limit: 2.3.0 - preferred-pm: 3.1.1 + preferred-pm: 3.1.2 resolve-from: 5.0.0 semver: 7.5.4 spawndamnit: 2.0.0 @@ -370,7 +373,7 @@ packages: /@changesets/get-release-plan@3.0.17: resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/assemble-release-plan': 5.2.4 '@changesets/config': 2.3.1 '@changesets/pre': 1.0.14 @@ -386,7 +389,7 @@ packages: /@changesets/git@2.0.0: resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -411,7 +414,7 @@ packages: /@changesets/pre@1.0.14: resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/errors': 0.1.4 '@changesets/types': 5.2.1 '@manypkg/get-packages': 1.1.3 @@ -421,7 +424,7 @@ packages: /@changesets/read@0.5.9: resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/git': 2.0.0 '@changesets/logger': 0.0.5 '@changesets/parse': 0.3.16 @@ -442,7 +445,7 @@ packages: /@changesets/write@0.2.3: resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/types': 5.2.1 fs-extra: 7.0.1 human-id: 1.0.2 @@ -454,7 +457,7 @@ packages: engines: {node: '>=13'} dependencies: '@chialab/esbuild-rna': 0.17.8 - '@chialab/estransform': 0.17.4 + '@chialab/estransform': 0.17.5 '@chialab/node-resolve': 0.17.1 mime-types: 2.1.35 dev: true @@ -463,12 +466,12 @@ packages: resolution: {integrity: sha512-hovU4W5zlyMnbJjexdczpQ9mcUfFsJuv9FWUhzpXiQwPprlp5lul+frTed9s8AyVDTDq2yq3Gx2Ac411QsXYGA==} engines: {node: '>=13'} dependencies: - '@chialab/estransform': 0.17.4 + '@chialab/estransform': 0.17.5 '@chialab/node-resolve': 0.17.1 dev: true - /@chialab/estransform@0.17.4: - resolution: {integrity: sha512-p4nf8ECdmanwbRK6A/X/VYtJfkBk5vgChPh0GiCyZAPt6/mKPbe0v3y9WjLHfFdkv1bzjJzP3pjTJ1SZ1E1U8Q==} + /@chialab/estransform@0.17.5: + resolution: {integrity: sha512-maJUFkwk0ie0L4VvDO74NDYyRvaTQAI0qmSmrms8bZxUkZ+zQZd1ByWKDCYTRwtR6AOzTvgEOl2ZvEG+OUKv/A==} engines: {node: '>=13'} dependencies: '@parcel/source-map': 2.1.1 @@ -699,6 +702,13 @@ packages: '@sinclair/typebox': 0.27.8 dev: true + /@jest/schemas@29.6.3: + resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@sinclair/typebox': 0.27.8 + dev: true + /@jridgewell/gen-mapping@0.3.3: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} @@ -727,7 +737,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -736,7 +746,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.22.11 + '@babel/runtime': 7.22.15 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -988,8 +998,8 @@ packages: resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==} dev: true - /@types/degit@2.8.3: - resolution: {integrity: sha512-CL7y71j2zaDmtPLD5Xq5S1Gv2dFoHl0/GBZm6s39Mj/ls28L3NzAOqf7H4H0/2TNVMgMjMVf9CAFYSjmXhi3bw==} + /@types/chai@4.3.6: + resolution: {integrity: sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==} dev: true /@types/is-ci@3.0.0: @@ -1014,12 +1024,8 @@ packages: resolution: {integrity: sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==} dev: true - /@types/node@20.5.0: - resolution: {integrity: sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==} - dev: true - - /@types/node@20.5.8: - resolution: {integrity: sha512-eajsR9aeljqNhK028VG0Wuw+OaY5LLxYmxeoXynIoE6jannr9/Ucd1LL0hSSoafk5LTYG+FfqsyGt81Q6Zkybw==} + /@types/node@20.6.0: + resolution: {integrity: sha512-najjVq5KN2vsH2U/xyh2opaSEz6cZMR2SetLIlxlj08nOcmPOemJmUK2o4kUzfLqfrWE0PIrNeE16XhYDd3nqg==} dev: true /@types/normalize-package-data@2.4.1: @@ -1038,11 +1044,11 @@ packages: chai: 4.3.7 dev: true - /@vitest/expect@0.34.3: - resolution: {integrity: sha512-F8MTXZUYRBVsYL1uoIft1HHWhwDbSzwAU9Zgh8S6WFC3YgVb4AnFV2GXO3P5Em8FjEYaZtTnQYoNwwBrlOMXgg==} + /@vitest/expect@0.34.4: + resolution: {integrity: sha512-XlMKX8HyYUqB8dsY8Xxrc64J2Qs9pKMt2Z8vFTL4mBWXJsg4yoALHzJfDWi8h5nkO4Zua4zjqtapQ/IluVkSnA==} dependencies: - '@vitest/spy': 0.34.3 - '@vitest/utils': 0.34.3 + '@vitest/spy': 0.34.4 + '@vitest/utils': 0.34.4 chai: 4.3.8 dev: true @@ -1054,10 +1060,10 @@ packages: pathe: 1.1.1 dev: true - /@vitest/runner@0.34.3: - resolution: {integrity: sha512-lYNq7N3vR57VMKMPLVvmJoiN4bqwzZ1euTW+XXYH5kzr3W/+xQG3b41xJn9ChJ3AhYOSoweu974S1V3qDcFESA==} + /@vitest/runner@0.34.4: + resolution: {integrity: sha512-hwwdB1StERqUls8oV8YcpmTIpVeJMe4WgYuDongVzixl5hlYLT2G8afhcdADeDeqCaAmZcSgLTLtqkjPQF7x+w==} dependencies: - '@vitest/utils': 0.34.3 + '@vitest/utils': 0.34.4 p-limit: 4.0.0 pathe: 1.1.1 dev: true @@ -1070,12 +1076,12 @@ packages: pretty-format: 29.6.2 dev: true - /@vitest/snapshot@0.34.3: - resolution: {integrity: sha512-QyPaE15DQwbnIBp/yNJ8lbvXTZxS00kRly0kfFgAD5EYmCbYcA+1EEyRalc93M0gosL/xHeg3lKAClIXYpmUiQ==} + /@vitest/snapshot@0.34.4: + resolution: {integrity: sha512-GCsh4coc3YUSL/o+BPUo7lHQbzpdttTxL6f4q0jRx2qVGoYz/cyTRDJHbnwks6TILi6560bVWoBpYC10PuTLHw==} dependencies: magic-string: 0.30.3 pathe: 1.1.1 - pretty-format: 29.6.2 + pretty-format: 29.6.3 dev: true /@vitest/spy@0.33.0: @@ -1084,8 +1090,8 @@ packages: tinyspy: 2.1.1 dev: true - /@vitest/spy@0.34.3: - resolution: {integrity: sha512-N1V0RFQ6AI7CPgzBq9kzjRdPIgThC340DGjdKdPSE8r86aUSmeliTUgkTqLSgtEwWWsGfBQ+UetZWhK0BgJmkQ==} + /@vitest/spy@0.34.4: + resolution: {integrity: sha512-PNU+fd7DUPgA3Ya924b1qKuQkonAW6hL7YUjkON3wmBwSTIlhOSpy04SJ0NrRsEbrXgMMj6Morh04BMf8k+w0g==} dependencies: tinyspy: 2.1.1 dev: true @@ -1098,12 +1104,12 @@ packages: pretty-format: 29.6.2 dev: true - /@vitest/utils@0.34.3: - resolution: {integrity: sha512-kiSnzLG6m/tiT0XEl4U2H8JDBjFtwVlaE8I3QfGiMFR0QvnRDfYfdP3YvTBWM/6iJDAyaPY6yVQiCTUc7ZzTHA==} + /@vitest/utils@0.34.4: + resolution: {integrity: sha512-yR2+5CHhp/K4ySY0Qtd+CAL9f5Yh1aXrKfAT42bq6CtlGPh92jIDDDSg7ydlRow1CP+dys4TrOrbELOyNInHSg==} dependencies: - diff-sequences: 29.4.3 + diff-sequences: 29.6.3 loupe: 2.3.6 - pretty-format: 29.6.2 + pretty-format: 29.6.3 dev: true /abbrev@1.1.1: @@ -1177,8 +1183,8 @@ packages: engines: {node: '>=8'} dev: true - /array.prototype.flat@1.3.1: - resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==} + /array.prototype.flat@1.3.2: + resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -1187,13 +1193,14 @@ packages: es-shim-unscopables: 1.0.0 dev: true - /arraybuffer.prototype.slice@1.0.1: - resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==} + /arraybuffer.prototype.slice@1.0.2: + resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==} engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.0 call-bind: 1.0.2 define-properties: 1.2.0 + es-abstract: 1.22.1 get-intrinsic: 1.2.1 is-array-buffer: 3.0.2 is-shared-array-buffer: 1.0.2 @@ -1348,6 +1355,11 @@ packages: fsevents: 2.3.3 dev: true + /chownr@2.0.0: + resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} + engines: {node: '>=10'} + dev: false + /ci-info@3.8.0: resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} engines: {node: '>=8'} @@ -1507,12 +1519,6 @@ packages: object-keys: 1.1.1 dev: true - /degit@2.8.4: - resolution: {integrity: sha512-vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng==} - engines: {node: '>=8.0.0'} - hasBin: true - dev: false - /detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} @@ -1533,6 +1539,11 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dev: true + /diff-sequences@29.6.3: + resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dev: true + /dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} @@ -1563,7 +1574,7 @@ packages: engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.0 - arraybuffer.prototype.slice: 1.0.1 + arraybuffer.prototype.slice: 1.0.2 available-typed-arrays: 1.0.5 call-bind: 1.0.2 es-set-tostringtag: 2.0.1 @@ -1590,11 +1601,11 @@ packages: object-keys: 1.1.1 object.assign: 4.1.4 regexp.prototype.flags: 1.5.0 - safe-array-concat: 1.0.0 + safe-array-concat: 1.0.1 safe-regex-test: 1.0.0 - string.prototype.trim: 1.2.7 - string.prototype.trimend: 1.0.6 - string.prototype.trimstart: 1.0.6 + string.prototype.trim: 1.2.8 + string.prototype.trimend: 1.0.7 + string.prototype.trimstart: 1.0.7 typed-array-buffer: 1.0.0 typed-array-byte-length: 1.0.0 typed-array-byte-offset: 1.0.0 @@ -1787,6 +1798,13 @@ packages: universalify: 0.1.2 dev: true + /fs-minipass@2.1.0: + resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.3.6 + dev: false + /fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -2392,11 +2410,37 @@ packages: kind-of: 6.0.3 dev: true + /minipass@3.3.6: + resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} + engines: {node: '>=8'} + dependencies: + yallist: 4.0.0 + dev: false + + /minipass@5.0.0: + resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} + engines: {node: '>=8'} + dev: false + + /minizlib@2.1.2: + resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} + engines: {node: '>= 8'} + dependencies: + minipass: 3.3.6 + yallist: 4.0.0 + dev: false + /mixme@0.5.9: resolution: {integrity: sha512-VC5fg6ySUscaWUpI4gxCBTQMH2RdUpNrk+MsbpCYtIvf9SBJdiUey4qE7BXviJsJR4nDQxCZ+3yaYNW3guz/Pw==} engines: {node: '>= 8.0.0'} dev: true + /mkdirp@1.0.4: + resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} + engines: {node: '>=10'} + hasBin: true + dev: false + /mlly@1.4.0: resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} dependencies: @@ -2406,6 +2450,15 @@ packages: ufo: 1.2.0 dev: true + /mlly@1.4.2: + resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} + dependencies: + acorn: 8.10.0 + pathe: 1.1.1 + pkg-types: 1.0.3 + ufo: 1.3.0 + dev: true + /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} @@ -2671,7 +2724,7 @@ packages: optional: true dependencies: lilconfig: 2.1.0 - yaml: 2.3.1 + yaml: 2.3.2 dev: true /postcss@8.4.29: @@ -2683,8 +2736,8 @@ packages: source-map-js: 1.0.2 dev: true - /preferred-pm@3.1.1: - resolution: {integrity: sha512-CsZgOVLKHifdoRu2y66P1s6oLb2WfT5Njkcgi80I/52FWTTVkWG6z0Z13vPkXC4hsT0nMrYXqX30buH8+D2eRQ==} + /preferred-pm@3.1.2: + resolution: {integrity: sha512-nk7dKrcW8hfCZ4H6klWcdRknBOXWzNQByJ0oJyX97BOupsYD+FzLS4hflgEu/uPUEHZCuRfMxzCBsuWd7OzT8Q==} engines: {node: '>=10'} dependencies: find-up: 5.0.0 @@ -2699,12 +2752,6 @@ packages: hasBin: true dev: true - /prettier@3.0.2: - resolution: {integrity: sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==} - engines: {node: '>=14'} - hasBin: true - dev: true - /prettier@3.0.3: resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} engines: {node: '>=14'} @@ -2720,6 +2767,15 @@ packages: react-is: 18.2.0 dev: true + /pretty-format@29.6.3: + resolution: {integrity: sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + dependencies: + '@jest/schemas': 29.6.3 + ansi-styles: 5.2.0 + react-is: 18.2.0 + dev: true + /pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} dev: true @@ -2831,16 +2887,8 @@ packages: engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: true - /rollup@3.28.0: - resolution: {integrity: sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /rollup@3.28.1: - resolution: {integrity: sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==} + /rollup@3.29.1: + resolution: {integrity: sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: @@ -2853,8 +2901,8 @@ packages: queue-microtask: 1.2.3 dev: true - /safe-array-concat@1.0.0: - resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==} + /safe-array-concat@1.0.1: + resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==} engines: {node: '>=0.4'} dependencies: call-bind: 1.0.2 @@ -2955,7 +3003,7 @@ packages: engines: {node: '>=6'} hasBin: true dependencies: - array.prototype.flat: 1.3.1 + array.prototype.flat: 1.3.2 breakword: 1.0.6 grapheme-splitter: 1.0.4 strip-ansi: 6.0.1 @@ -3036,8 +3084,8 @@ packages: strip-ansi: 6.0.1 dev: true - /string.prototype.trim@1.2.7: - resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==} + /string.prototype.trim@1.2.8: + resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.2 @@ -3045,16 +3093,16 @@ packages: es-abstract: 1.22.1 dev: true - /string.prototype.trimend@1.0.6: - resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==} + /string.prototype.trimend@1.0.7: + resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==} dependencies: call-bind: 1.0.2 define-properties: 1.2.0 es-abstract: 1.22.1 dev: true - /string.prototype.trimstart@1.0.6: - resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==} + /string.prototype.trimstart@1.0.7: + resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} dependencies: call-bind: 1.0.2 define-properties: 1.2.0 @@ -3126,6 +3174,18 @@ packages: engines: {node: '>= 0.4'} dev: true + /tar@6.2.0: + resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} + engines: {node: '>=10'} + dependencies: + chownr: 2.0.0 + fs-minipass: 2.1.0 + minipass: 5.0.0 + minizlib: 2.1.2 + mkdirp: 1.0.4 + yallist: 4.0.0 + dev: false + /term-size@2.2.1: resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} engines: {node: '>=8'} @@ -3240,7 +3300,7 @@ packages: joycon: 3.1.1 postcss-load-config: 4.0.1 resolve-from: 5.0.0 - rollup: 3.28.0 + rollup: 3.29.1 source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 @@ -3277,7 +3337,7 @@ packages: joycon: 3.1.1 postcss-load-config: 4.0.1 resolve-from: 5.0.0 - rollup: 3.28.0 + rollup: 3.29.1 source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 @@ -3430,6 +3490,10 @@ packages: resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==} dev: true + /ufo@1.3.0: + resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==} + dev: true + /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: @@ -3455,7 +3519,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@0.33.0(@types/node@20.5.8): + /vite-node@0.33.0(@types/node@20.4.8): resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==} engines: {node: '>=v14.18.0'} hasBin: true @@ -3465,7 +3529,7 @@ packages: mlly: 1.4.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.5.8) + vite: 4.4.9(@types/node@20.4.8) transitivePeerDependencies: - '@types/node' - less @@ -3477,17 +3541,17 @@ packages: - terser dev: true - /vite-node@0.34.3(@types/node@20.5.8): - resolution: {integrity: sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==} + /vite-node@0.34.4(@types/node@20.6.0): + resolution: {integrity: sha512-ho8HtiLc+nsmbwZMw8SlghESEE3KxJNp04F/jPUCLVvaURwt0d+r9LxEqCX5hvrrOQ0GSyxbYr5ZfRYhQ0yVKQ==} engines: {node: '>=v14.18.0'} hasBin: true dependencies: cac: 6.7.14 debug: 4.3.4 - mlly: 1.4.0 + mlly: 1.4.2 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.5.8) + vite: 4.4.9(@types/node@20.6.0) transitivePeerDependencies: - '@types/node' - less @@ -3499,7 +3563,43 @@ packages: - terser dev: true - /vite@4.4.9(@types/node@20.5.8): + /vite@4.4.9(@types/node@20.4.8): + resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 20.4.8 + esbuild: 0.18.20 + postcss: 8.4.29 + rollup: 3.29.1 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /vite@4.4.9(@types/node@20.6.0): resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -3527,10 +3627,10 @@ packages: terser: optional: true dependencies: - '@types/node': 20.5.8 + '@types/node': 20.6.0 esbuild: 0.18.20 postcss: 8.4.29 - rollup: 3.28.1 + rollup: 3.29.1 optionalDependencies: fsevents: 2.3.3 dev: true @@ -3568,7 +3668,7 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 20.5.8 + '@types/node': 20.4.8 '@vitest/expect': 0.33.0 '@vitest/runner': 0.33.0 '@vitest/snapshot': 0.33.0 @@ -3587,8 +3687,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.0 tinypool: 0.6.0 - vite: 4.4.9(@types/node@20.5.8) - vite-node: 0.33.0(@types/node@20.5.8) + vite: 4.4.9(@types/node@20.4.8) + vite-node: 0.33.0(@types/node@20.4.8) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -3600,8 +3700,8 @@ packages: - terser dev: true - /vitest@0.34.3: - resolution: {integrity: sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==} + /vitest@0.34.4: + resolution: {integrity: sha512-SE/laOsB6995QlbSE6BtkpXDeVNLJc1u2LHRG/OpnN4RsRzM3GQm4nm3PQCK5OBtrsUqnhzLdnT7se3aeNGdlw==} engines: {node: '>=v14.18.0'} hasBin: true peerDependencies: @@ -3631,14 +3731,14 @@ packages: webdriverio: optional: true dependencies: - '@types/chai': 4.3.5 + '@types/chai': 4.3.6 '@types/chai-subset': 1.3.3 - '@types/node': 20.5.8 - '@vitest/expect': 0.34.3 - '@vitest/runner': 0.34.3 - '@vitest/snapshot': 0.34.3 - '@vitest/spy': 0.34.3 - '@vitest/utils': 0.34.3 + '@types/node': 20.6.0 + '@vitest/expect': 0.34.4 + '@vitest/runner': 0.34.4 + '@vitest/snapshot': 0.34.4 + '@vitest/spy': 0.34.4 + '@vitest/utils': 0.34.4 acorn: 8.10.0 acorn-walk: 8.2.0 cac: 6.7.14 @@ -3652,8 +3752,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.0 tinypool: 0.7.0 - vite: 4.4.9(@types/node@20.5.8) - vite-node: 0.34.3(@types/node@20.5.8) + vite: 4.4.9(@types/node@20.6.0) + vite-node: 0.34.4(@types/node@20.6.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -3779,10 +3879,9 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true - /yaml@2.3.1: - resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} + /yaml@2.3.2: + resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} engines: {node: '>= 14'} dev: true From 292556ebe575fa93870d7b03118679c9ba7207ed Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 10 Sep 2023 17:56:00 +0100 Subject: [PATCH 026/290] Update begit to fix race condition --- packages/commands/package.json | 2 +- pnpm-lock.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 9e32e39..f0b5cd8 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -42,7 +42,7 @@ "access": "public" }, "dependencies": { - "@begit/core": "^0.0.4", + "@begit/core": "^0.0.7", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ef1a12f..089cad5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -27,8 +27,8 @@ importers: packages/commands: dependencies: '@begit/core': - specifier: ^0.0.4 - version: 0.0.4 + specifier: ^0.0.7 + version: 0.0.7 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -262,8 +262,8 @@ packages: regenerator-runtime: 0.14.0 dev: true - /@begit/core@0.0.4: - resolution: {integrity: sha512-DSm+0r43hMwaKx++9bB3ii5Z+8XTs4G4tzTPiChKD+uBYSjIBUONALj0+8oFMVqfM8xLcayLj6TI1ug1gmxxgg==} + /@begit/core@0.0.7: + resolution: {integrity: sha512-nuS1W1HwS8Ir7K+H+MCixuFwBfP+1ZDu94GOtCheZNUr2h96S5rg2K4N3V9bd7N7iD5EvltscyXCHXt8H6rqxw==} dependencies: tar: 6.2.0 dev: false From 7c44e1505cb2d04490727b65d638cfe16cc80fd0 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 11 Sep 2023 19:00:22 -0400 Subject: [PATCH 027/290] docs: update headings, beta warning --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dece5aa..f444042 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,17 @@ Solid CLI

-# Solid CLI (This is currently very much still in beta) +> [!WARNING] +> 🚧 This project is under heavy development and still in beta. More features coming soon! + +# Solid CLI [![Build and Test](https://github.com/solidjs-community/solid-cli/actions/workflows/tests.yml/badge.svg)](https://github.com/solidjs-community/solid-cli/actions/workflows/tests.yml) [![Netlify Status](https://api.netlify.com/api/v1/badges/5233ac74-3f53-4c90-b95d-25b528b931a1/deploy-status)](https://app.netlify.com/sites/solid-cli/deploys) -A custom CLI built for the purpose of installing and managing SolidJS apps and projects. The goal of the CLI is to provide a useful and powerful utility to installing any dependencies, searching the Solid ecosystem etc. +A custom-built CLI for creating and managing SolidJS apps and projects. -# Roadmap/Features +## Roadmap/Features - [x] Templates - [x] From Degit @@ -40,7 +43,7 @@ A custom CLI built for the purpose of installing and managing SolidJS apps and p - [x] Enable Adapters - [x] Enable SSR/CSR/SSG mode -# CLI Design +## Structure The CLI will use `solid` as the initialiation keyword. The CLI commands will then cascade based on groupings determined baed on what the action does defined by higher level actions. The actions will be: @@ -58,6 +61,6 @@ The CLI will use `solid` as the initialiation keyword. The CLI commands will the - `add`: Starts the process of submitting your current project to our ecosystem listing (Solidex) ie. `solid ecosystem publish` - `search`: Initializes an ecosystem search result `solid ecosystem search auth` -# Contributions +## Contributing Please feel free to contribute to this repo by expanding on this design document. Once we lock a general design a choice of technology will be decided. From d0cf24ff81917b6f12208d7c49b782628fe69d34 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 11 Sep 2023 19:11:08 -0400 Subject: [PATCH 028/290] docs: reword development warning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f444042..314eb8c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

> [!WARNING] -> 🚧 This project is under heavy development and still in beta. More features coming soon! +> 🚧 This project is under heavy development and is not yet complete. More features coming soon! # Solid CLI From 706bfa285b70ecfafc7f463c70fc51a164e9dc81 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Wed, 13 Sep 2023 00:08:07 -0400 Subject: [PATCH 029/290] chore: update package.json --- package.json | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 836f992..0188833 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "solid-cli", "private": true, "version": "0.0.1", - "description": "A CLI for making the solidjs development experience easier, faster, and less error prone.", + "description": "A CLI for making the SolidJS development experience easier, faster, and less error prone.", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { @@ -20,10 +20,16 @@ "watch:ui": "nodemon --watch packages/ui/src -e ts --exec 'turbo run build --scope=ui'", "watch:utils": "nodemon --watch packages/utils/src -e ts --exec 'turbo run build --scope=utils'", "start": "cd packages/core && pnpm start", - "format": "prettier . --write" + "format": "prettier --write ." }, - "keywords": [], - "author": "Thomas Beer & Rahul Batra", + "contributors": [ + { + "name": "Thomas Beer" + }, + { + "name": "Rahul Batra" + } + ], "workspaces": [ "./packages/*" ], @@ -33,5 +39,6 @@ "prettier": "^3.0.3", "turbo": "^1.10.13", "vitest": "^0.34.4" - } + }, + "packageManager": "pnpm@8.7.5" } From 59bd278b817290292cbd92a0ff0873a7c749810d Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Wed, 13 Sep 2023 15:25:20 -0400 Subject: [PATCH 030/290] docs: remove emoji from warning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 314eb8c..b6a5c01 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

> [!WARNING] -> 🚧 This project is under heavy development and is not yet complete. More features coming soon! +> This project is under heavy development and is not yet complete. More features coming soon! # Solid CLI From caddd2390a78cb79ab4374c8467c7a478734329c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 19 Sep 2023 21:56:29 +0100 Subject: [PATCH 031/290] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6a5c01..ac1727f 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ A custom-built CLI for creating and managing SolidJS apps and projects. ## Structure -The CLI will use `solid` as the initialiation keyword. The CLI commands will then cascade based on groupings determined baed on what the action does defined by higher level actions. The actions will be: +The CLI is invoked with `solid`. The commands then cascade, where actions are grouped with other similar actions. The actions will be: - `version`: Displays a changelog of recent Solid versions - `start`: Specific command for Start versions @@ -63,4 +63,4 @@ The CLI will use `solid` as the initialiation keyword. The CLI commands will the ## Contributing -Please feel free to contribute to this repo by expanding on this design document. Once we lock a general design a choice of technology will be decided. +Please feel free to contribute to this repo by creating an issue or a PR. From 11afadb7561edbc1fcd7d56277080b28f4d0b4e0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 17 Dec 2023 16:43:28 +0000 Subject: [PATCH 032/290] Update dependencies --- package.json | 10 +- packages/commands/package.json | 10 +- packages/core/package.json | 14 +- packages/create-solid/package.json | 6 +- packages/reactivity/package.json | 4 +- packages/ui/package.json | 6 +- packages/utils/package.json | 16 +- pnpm-lock.yaml | 1287 +++++++++++----------------- 8 files changed, 530 insertions(+), 823 deletions(-) diff --git a/package.json b/package.json index 0188833..97d2dda 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.26.2", - "nodemon": "^3.0.1", - "prettier": "^3.0.3", - "turbo": "^1.10.13", - "vitest": "^0.34.4" + "@changesets/cli": "2.27.1", + "nodemon": "^3.0.2", + "prettier": "^3.1.1", + "turbo": "^1.11.2", + "vitest": "^1.0.4" }, "packageManager": "pnpm@8.7.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index f0b5cd8..325807f 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,16 +33,16 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.6.0", - "prettier": "^3.0.3", - "tsup": "^7.2.0", - "typescript": "^5.2.2" + "@types/node": "^20.10.4", + "prettier": "^3.1.1", + "tsup": "^8.0.1", + "typescript": "^5.3.3" }, "publishConfig": { "access": "public" }, "dependencies": { - "@begit/core": "^0.0.7", + "@begit/core": "^0.0.11", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index ae8f1aa..4a7c7c6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,11 +29,11 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.3.75", - "cmd-ts": "^0.12.1", + "@swc/core": "^1.3.100", + "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", - "smol-toml": "^1.1.1", + "smol-toml": "^1.1.3", "tiny-updater": "^3.5.1" }, "scripts": { @@ -42,10 +42,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.4.9", - "jiti": "^1.19.3", - "tsup": "^7.2.0", - "typescript": "^5.2.2" + "@types/node": "^20.10.4", + "jiti": "^1.21.0", + "tsup": "^8.0.1", + "typescript": "^5.3.3" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index b518266..d89b32b 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -27,9 +27,9 @@ }, "devDependencies": { "@solid-cli/commands": "workspace:*", - "jiti": "^1.19.3", - "tsup": "^7.2.0", - "typescript": "^5.2.2", + "jiti": "^1.21.0", + "tsup": "^8.0.1", + "typescript": "^5.3.3", "@clack/prompts": "0.7.0", "picocolors": "^1.0.0" }, diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 0fbc666..03ac65e 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,8 +28,8 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^7.2.0", - "typescript": "^5.2.2" + "tsup": "^8.0.1", + "typescript": "^5.3.3" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 4ec7a32..4aa155b 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^7.2.0", - "typescript": "^5.2.2", - "@types/node": "20.4.8" + "tsup": "^8.0.1", + "typescript": "^5.3.3", + "@types/node": "20.10.4" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 04d0d59..4f0a88b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "20.4.8", - "jiti": "^1.19.3", - "tsup": "^7.2.0", - "typescript": "^5.2.2", - "vitest": "^0.33.0" + "@types/node": "20.10.4", + "jiti": "^1.21.0", + "tsup": "^8.0.1", + "typescript": "^5.3.3", + "vitest": "^1.0.4" }, "publishConfig": { "access": "public" @@ -76,10 +76,10 @@ "@clack/core": "0.3.3", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.3.76", - "cmd-ts": "^0.12.1", + "@swc/core": "^1.3.100", + "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", - "smol-toml": "^1.1.1" + "smol-toml": "^1.1.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 089cad5..2c4fe3e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,26 +9,26 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.26.2 - version: 2.26.2 + specifier: 2.27.1 + version: 2.27.1 nodemon: - specifier: ^3.0.1 - version: 3.0.1 + specifier: ^3.0.2 + version: 3.0.2 prettier: - specifier: ^3.0.3 - version: 3.0.3 + specifier: ^3.1.1 + version: 3.1.1 turbo: - specifier: ^1.10.13 - version: 1.10.13 + specifier: ^1.11.2 + version: 1.11.2 vitest: - specifier: ^0.34.4 - version: 0.34.4 + specifier: ^1.0.4 + version: 1.0.4(@types/node@20.10.4) packages/commands: dependencies: '@begit/core': - specifier: ^0.0.7 - version: 0.0.7 + specifier: ^0.0.11 + version: 0.0.11 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: ^20.6.0 - version: 20.6.0 + specifier: ^20.10.4 + version: 20.10.4 prettier: - specifier: ^3.0.3 - version: 3.0.3 + specifier: ^3.1.1 + version: 3.1.1 tsup: - specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) + specifier: ^8.0.1 + version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 packages/core: dependencies: @@ -91,11 +91,11 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.3.75 - version: 1.3.75 + specifier: ^1.3.100 + version: 1.3.100 cmd-ts: - specifier: ^0.12.1 - version: 0.12.1 + specifier: ^0.13.0 + version: 0.13.0 execa: specifier: ^8.0.1 version: 8.0.1 @@ -103,8 +103,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 smol-toml: - specifier: ^1.1.1 - version: 1.1.1 + specifier: ^1.1.3 + version: 1.1.3 tiny-updater: specifier: ^3.5.1 version: 3.5.1 @@ -113,17 +113,17 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: ^20.4.9 - version: 20.4.9 + specifier: ^20.10.4 + version: 20.10.4 jiti: - specifier: ^1.19.3 - version: 1.19.3 + specifier: ^1.21.0 + version: 1.21.0 tsup: - specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.75)(typescript@5.2.2) + specifier: ^8.0.1 + version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 packages/create-solid: devDependencies: @@ -134,26 +134,26 @@ importers: specifier: workspace:* version: link:../commands jiti: - specifier: ^1.19.3 - version: 1.19.3 + specifier: ^1.21.0 + version: 1.21.0 picocolors: specifier: ^1.0.0 version: 1.0.0 tsup: - specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) + specifier: ^8.0.1 + version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 packages/reactivity: devDependencies: tsup: - specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) + specifier: ^8.0.1 + version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 packages/swc-plugin-solid-cli: {} @@ -176,14 +176,14 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.4.8 - version: 20.4.8 + specifier: 20.10.4 + version: 20.10.4 tsup: - specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) + specifier: ^8.0.1 + version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 packages/utils: dependencies: @@ -197,11 +197,11 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.3.76 - version: 1.3.76 + specifier: ^1.3.100 + version: 1.3.100 cmd-ts: - specifier: ^0.12.1 - version: 0.12.1 + specifier: ^0.13.0 + version: 0.13.0 execa: specifier: ^8.0.1 version: 8.0.1 @@ -209,27 +209,27 @@ importers: specifier: ^1.0.0 version: 1.0.0 smol-toml: - specifier: ^1.1.1 - version: 1.1.1 + specifier: ^1.1.3 + version: 1.1.3 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: 20.4.8 - version: 20.4.8 + specifier: 20.10.4 + version: 20.10.4 jiti: - specifier: ^1.19.3 - version: 1.19.3 + specifier: ^1.21.0 + version: 1.21.0 tsup: - specifier: ^7.2.0 - version: 7.2.0(@swc/core@1.3.76)(typescript@5.2.2) + specifier: ^8.0.1 + version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) typescript: - specifier: ^5.2.2 - version: 5.2.2 + specifier: ^5.3.3 + version: 5.3.3 vitest: - specifier: ^0.33.0 - version: 0.33.0 + specifier: ^1.0.4 + version: 1.0.4(@types/node@20.10.4) packages: @@ -262,20 +262,20 @@ packages: regenerator-runtime: 0.14.0 dev: true - /@begit/core@0.0.7: - resolution: {integrity: sha512-nuS1W1HwS8Ir7K+H+MCixuFwBfP+1ZDu94GOtCheZNUr2h96S5rg2K4N3V9bd7N7iD5EvltscyXCHXt8H6rqxw==} + /@begit/core@0.0.11: + resolution: {integrity: sha512-JwS7kubIw1FeLmrXR46z1QSBkXNMOZWYeziaMa9kqh/RBTi3Cb5ry1jO1oTBCYQfzldt/qDwQbGkwMPUR1qo3g==} dependencies: tar: 6.2.0 dev: false - /@changesets/apply-release-plan@6.1.4: - resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==} + /@changesets/apply-release-plan@7.0.0: + resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/config': 2.3.1 - '@changesets/get-version-range-type': 0.3.2 - '@changesets/git': 2.0.0 - '@changesets/types': 5.2.1 + '@changesets/config': 3.0.0 + '@changesets/get-version-range-type': 0.4.0 + '@changesets/git': 3.0.0 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 detect-indent: 6.1.0 fs-extra: 7.0.1 @@ -286,51 +286,50 @@ packages: semver: 7.5.4 dev: true - /@changesets/assemble-release-plan@5.2.4: - resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==} + /@changesets/assemble-release-plan@6.0.0: + resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.6 - '@changesets/types': 5.2.1 + '@changesets/errors': 0.2.0 + '@changesets/get-dependents-graph': 2.0.0 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 semver: 7.5.4 dev: true - /@changesets/changelog-git@0.1.14: - resolution: {integrity: sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==} + /@changesets/changelog-git@0.2.0: + resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} dependencies: - '@changesets/types': 5.2.1 + '@changesets/types': 6.0.0 dev: true - /@changesets/cli@2.26.2: - resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==} + /@changesets/cli@2.27.1: + resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true dependencies: '@babel/runtime': 7.22.15 - '@changesets/apply-release-plan': 6.1.4 - '@changesets/assemble-release-plan': 5.2.4 - '@changesets/changelog-git': 0.1.14 - '@changesets/config': 2.3.1 - '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.6 - '@changesets/get-release-plan': 3.0.17 - '@changesets/git': 2.0.0 - '@changesets/logger': 0.0.5 - '@changesets/pre': 1.0.14 - '@changesets/read': 0.5.9 - '@changesets/types': 5.2.1 - '@changesets/write': 0.2.3 + '@changesets/apply-release-plan': 7.0.0 + '@changesets/assemble-release-plan': 6.0.0 + '@changesets/changelog-git': 0.2.0 + '@changesets/config': 3.0.0 + '@changesets/errors': 0.2.0 + '@changesets/get-dependents-graph': 2.0.0 + '@changesets/get-release-plan': 4.0.0 + '@changesets/git': 3.0.0 + '@changesets/logger': 0.1.0 + '@changesets/pre': 2.0.0 + '@changesets/read': 0.6.0 + '@changesets/types': 6.0.0 + '@changesets/write': 0.3.0 '@manypkg/get-packages': 1.1.3 - '@types/is-ci': 3.0.0 '@types/semver': 7.5.1 ansi-colors: 4.1.3 chalk: 2.4.2 + ci-info: 3.8.0 enquirer: 2.4.1 external-editor: 3.1.0 fs-extra: 7.0.1 human-id: 1.0.2 - is-ci: 3.0.1 meow: 6.1.1 outdent: 0.5.0 p-limit: 2.3.0 @@ -342,93 +341,93 @@ packages: tty-table: 4.2.1 dev: true - /@changesets/config@2.3.1: - resolution: {integrity: sha512-PQXaJl82CfIXddUOppj4zWu+987GCw2M+eQcOepxN5s+kvnsZOwjEJO3DH9eVy+OP6Pg/KFEWdsECFEYTtbg6w==} + /@changesets/config@3.0.0: + resolution: {integrity: sha512-o/rwLNnAo/+j9Yvw9mkBQOZySDYyOr/q+wptRLcAVGlU6djOeP9v1nlalbL9MFsobuBVQbZCTp+dIzdq+CLQUA==} dependencies: - '@changesets/errors': 0.1.4 - '@changesets/get-dependents-graph': 1.3.6 - '@changesets/logger': 0.0.5 - '@changesets/types': 5.2.1 + '@changesets/errors': 0.2.0 + '@changesets/get-dependents-graph': 2.0.0 + '@changesets/logger': 0.1.0 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 micromatch: 4.0.5 dev: true - /@changesets/errors@0.1.4: - resolution: {integrity: sha512-HAcqPF7snsUJ/QzkWoKfRfXushHTu+K5KZLJWPb34s4eCZShIf8BFO3fwq6KU8+G7L5KdtN2BzQAXOSXEyiY9Q==} + /@changesets/errors@0.2.0: + resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} dependencies: extendable-error: 0.1.7 dev: true - /@changesets/get-dependents-graph@1.3.6: - resolution: {integrity: sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q==} + /@changesets/get-dependents-graph@2.0.0: + resolution: {integrity: sha512-cafUXponivK4vBgZ3yLu944mTvam06XEn2IZGjjKc0antpenkYANXiiE6GExV/yKdsCnE8dXVZ25yGqLYZmScA==} dependencies: - '@changesets/types': 5.2.1 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 chalk: 2.4.2 fs-extra: 7.0.1 semver: 7.5.4 dev: true - /@changesets/get-release-plan@3.0.17: - resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==} + /@changesets/get-release-plan@4.0.0: + resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/assemble-release-plan': 5.2.4 - '@changesets/config': 2.3.1 - '@changesets/pre': 1.0.14 - '@changesets/read': 0.5.9 - '@changesets/types': 5.2.1 + '@changesets/assemble-release-plan': 6.0.0 + '@changesets/config': 3.0.0 + '@changesets/pre': 2.0.0 + '@changesets/read': 0.6.0 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 dev: true - /@changesets/get-version-range-type@0.3.2: - resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==} + /@changesets/get-version-range-type@0.4.0: + resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} dev: true - /@changesets/git@2.0.0: - resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==} + /@changesets/git@3.0.0: + resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/errors': 0.1.4 - '@changesets/types': 5.2.1 + '@changesets/errors': 0.2.0 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 is-subdir: 1.2.0 micromatch: 4.0.5 spawndamnit: 2.0.0 dev: true - /@changesets/logger@0.0.5: - resolution: {integrity: sha512-gJyZHomu8nASHpaANzc6bkQMO9gU/ib20lqew1rVx753FOxffnCrJlGIeQVxNWCqM+o6OOleCo/ivL8UAO5iFw==} + /@changesets/logger@0.1.0: + resolution: {integrity: sha512-pBrJm4CQm9VqFVwWnSqKEfsS2ESnwqwH+xR7jETxIErZcfd1u2zBSqrHbRHR7xjhSgep9x2PSKFKY//FAshA3g==} dependencies: chalk: 2.4.2 dev: true - /@changesets/parse@0.3.16: - resolution: {integrity: sha512-127JKNd167ayAuBjUggZBkmDS5fIKsthnr9jr6bdnuUljroiERW7FBTDNnNVyJ4l69PzR57pk6mXQdtJyBCJKg==} + /@changesets/parse@0.4.0: + resolution: {integrity: sha512-TS/9KG2CdGXS27S+QxbZXgr8uPsP4yNJYb4BC2/NeFUj80Rni3TeD2qwWmabymxmrLo7JEsytXH1FbpKTbvivw==} dependencies: - '@changesets/types': 5.2.1 + '@changesets/types': 6.0.0 js-yaml: 3.14.1 dev: true - /@changesets/pre@1.0.14: - resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==} + /@changesets/pre@2.0.0: + resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/errors': 0.1.4 - '@changesets/types': 5.2.1 + '@changesets/errors': 0.2.0 + '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 dev: true - /@changesets/read@0.5.9: - resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==} + /@changesets/read@0.6.0: + resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/git': 2.0.0 - '@changesets/logger': 0.0.5 - '@changesets/parse': 0.3.16 - '@changesets/types': 5.2.1 + '@changesets/git': 3.0.0 + '@changesets/logger': 0.1.0 + '@changesets/parse': 0.4.0 + '@changesets/types': 6.0.0 chalk: 2.4.2 fs-extra: 7.0.1 p-filter: 2.1.0 @@ -438,15 +437,15 @@ packages: resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} dev: true - /@changesets/types@5.2.1: - resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==} + /@changesets/types@6.0.0: + resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} dev: true - /@changesets/write@0.2.3: - resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==} + /@changesets/write@0.3.0: + resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} dependencies: '@babel/runtime': 7.22.15 - '@changesets/types': 5.2.1 + '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 prettier: 2.8.8 @@ -497,8 +496,8 @@ packages: bundledDependencies: - is-unicode-supported - /@esbuild/android-arm64@0.18.20: - resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} + /@esbuild/android-arm64@0.19.9: + resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -506,8 +505,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.18.20: - resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} + /@esbuild/android-arm@0.19.9: + resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -515,8 +514,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.18.20: - resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} + /@esbuild/android-x64@0.19.9: + resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -524,8 +523,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.18.20: - resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} + /@esbuild/darwin-arm64@0.19.9: + resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -533,8 +532,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.18.20: - resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} + /@esbuild/darwin-x64@0.19.9: + resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -542,8 +541,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.18.20: - resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} + /@esbuild/freebsd-arm64@0.19.9: + resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -551,8 +550,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.18.20: - resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} + /@esbuild/freebsd-x64@0.19.9: + resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -560,8 +559,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.18.20: - resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} + /@esbuild/linux-arm64@0.19.9: + resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -569,8 +568,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.18.20: - resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} + /@esbuild/linux-arm@0.19.9: + resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -578,8 +577,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.18.20: - resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} + /@esbuild/linux-ia32@0.19.9: + resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -587,8 +586,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.18.20: - resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} + /@esbuild/linux-loong64@0.19.9: + resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -596,8 +595,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.18.20: - resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} + /@esbuild/linux-mips64el@0.19.9: + resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -605,8 +604,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.18.20: - resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} + /@esbuild/linux-ppc64@0.19.9: + resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -614,8 +613,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.18.20: - resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} + /@esbuild/linux-riscv64@0.19.9: + resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -623,8 +622,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.18.20: - resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} + /@esbuild/linux-s390x@0.19.9: + resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -632,8 +631,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.18.20: - resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} + /@esbuild/linux-x64@0.19.9: + resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -641,8 +640,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.18.20: - resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} + /@esbuild/netbsd-x64@0.19.9: + resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -650,8 +649,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.18.20: - resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} + /@esbuild/openbsd-x64@0.19.9: + resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -659,8 +658,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.18.20: - resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} + /@esbuild/sunos-x64@0.19.9: + resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -668,8 +667,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.18.20: - resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} + /@esbuild/win32-arm64@0.19.9: + resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -677,8 +676,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.18.20: - resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} + /@esbuild/win32-ia32@0.19.9: + resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -686,8 +685,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.18.20: - resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} + /@esbuild/win32-x64@0.19.9: + resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -695,13 +694,6 @@ packages: dev: true optional: true - /@jest/schemas@29.6.0: - resolution: {integrity: sha512-rxLjXyJBTL4LQeJW3aKo0M/+GkCOXsO+8i9Iu7eDb6KwtP65ayoDsitrdPBtujxQ88k4wI2FNYfa6TOGwSn6cQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@sinclair/typebox': 0.27.8 - dev: true - /@jest/schemas@29.6.3: resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -782,193 +774,188 @@ packages: detect-libc: 1.0.3 dev: true - /@sinclair/typebox@0.27.8: - resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + /@rollup/rollup-android-arm-eabi@4.9.1: + resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} + cpu: [arm] + os: [android] + requiresBuild: true dev: true + optional: true - /@swc/core-darwin-arm64@1.3.75: - resolution: {integrity: sha512-anDnx9L465lGbjB2mvcV54NGHW6illr0IDvVV7JmkabYUVneaRdQvTr0tbHv3xjHnjrK1wuwVOHKV0LcQF2tnQ==} - engines: {node: '>=10'} + /@rollup/rollup-android-arm64@4.9.1: + resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} cpu: [arm64] - os: [darwin] + os: [android] requiresBuild: true + dev: true optional: true - /@swc/core-darwin-arm64@1.3.76: - resolution: {integrity: sha512-ovviEhZ/1E81Z9OGrO0ivLWk4VCa3I3ZzM+cd3gugglRRwVwtlIaoIYqY5S3KiCAupDd1+UCl5X7Vbio7a/V8g==} - engines: {node: '>=10'} + /@rollup/rollup-darwin-arm64@4.9.1: + resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} cpu: [arm64] os: [darwin] requiresBuild: true + dev: true optional: true - /@swc/core-darwin-x64@1.3.75: - resolution: {integrity: sha512-dIHDfrLmeZfr2xwi1whO7AmzdI3HdamgvxthaL+S8L1x8TeczAZEvsmZTjy3s8p3Va4rbGXcb3+uBhmfkqCbfw==} - engines: {node: '>=10'} + /@rollup/rollup-darwin-x64@4.9.1: + resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} cpu: [x64] os: [darwin] requiresBuild: true + dev: true optional: true - /@swc/core-darwin-x64@1.3.76: - resolution: {integrity: sha512-tcySTDqs0SHCebtW35sCdcLWsmTEo7bEwx0gNL/spetqVT9fpFi6qU8qcnt7i2KaZHbeNl9g1aadu+Yrni+GzA==} - engines: {node: '>=10'} - cpu: [x64] - os: [darwin] + /@rollup/rollup-linux-arm-gnueabihf@4.9.1: + resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} + cpu: [arm] + os: [linux] requiresBuild: true + dev: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.75: - resolution: {integrity: sha512-qeJmvMGrjC6xt+G0R4kVqqxvlhxJx7tTzhcEoWgLJnfvGZiF6SJdsef4OSM7HuReXrlBoEtJbfGPrLJtbV+C0w==} - engines: {node: '>=10'} - cpu: [arm] + /@rollup/rollup-linux-arm64-gnu@4.9.1: + resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} + cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.76: - resolution: {integrity: sha512-apgzpGWy1AwoMF4urAAASsAjE7rEzZFIF+p6utuxhS7cNHzE0AyEVDYJbo+pzBdlZ8orBdzzsHtFwoEgKOjebA==} - engines: {node: '>=10'} - cpu: [arm] + /@rollup/rollup-linux-arm64-musl@4.9.1: + resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} + cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true - /@swc/core-linux-arm64-gnu@1.3.75: - resolution: {integrity: sha512-sqA9JqHEJBF4AdNuwo5zRqq0HC3l31SPsG9zpRa4nRzG5daBBJ80H7fi6PZQud1rfNNq+Q08gjYrdrxwHstvjw==} - engines: {node: '>=10'} - cpu: [arm64] + /@rollup/rollup-linux-riscv64-gnu@4.9.1: + resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} + cpu: [riscv64] os: [linux] requiresBuild: true + dev: true optional: true - /@swc/core-linux-arm64-gnu@1.3.76: - resolution: {integrity: sha512-c3c0zz6S0eludqidDpuqbadE0WT3OZczyQxe9Vw8lFFXES85mvNGtwYzyGK2o7TICpsuHrndwDIoYpmpWk879g==} - engines: {node: '>=10'} - cpu: [arm64] + /@rollup/rollup-linux-x64-gnu@4.9.1: + resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} + cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true - /@swc/core-linux-arm64-musl@1.3.75: - resolution: {integrity: sha512-95rQT5xTAL3eKhMJbJbLsZHHP9EUlh1rcrFoLf0gUApoVF8g94QjZ9hYZiI72mMP5WPjgTEXQVnVB9O2GxeaLw==} - engines: {node: '>=10'} - cpu: [arm64] + /@rollup/rollup-linux-x64-musl@4.9.1: + resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} + cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true - /@swc/core-linux-arm64-musl@1.3.76: - resolution: {integrity: sha512-Is3bpq7F2qtlnkzEeOD6HIZJPpOmu3q6c82lKww90Q0NnrlSluVMozTHJgwVoFZyizH7uLnk0LuNcEAWLnmJIw==} - engines: {node: '>=10'} + /@rollup/rollup-win32-arm64-msvc@4.9.1: + resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} cpu: [arm64] - os: [linux] + os: [win32] requiresBuild: true + dev: true optional: true - /@swc/core-linux-x64-gnu@1.3.75: - resolution: {integrity: sha512-If7UpAhnPduMmtC+TSgPpZ1UXZfp2hIpjUFxpeCmHHYLS6Fn/2GZC5hpEiu+wvFJF0hzPh93eNAHa9gUxGUG+w==} - engines: {node: '>=10'} + /@rollup/rollup-win32-ia32-msvc@4.9.1: + resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.9.1: + resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} cpu: [x64] - os: [linux] + os: [win32] requiresBuild: true + dev: true optional: true - /@swc/core-linux-x64-gnu@1.3.76: - resolution: {integrity: sha512-iwCeRzd9oSvUzqt7nU6p/ztceAWfnO9XVxBn502R5gs6QCBbE1HCKrWHDO77aKPK7ss+0NcIGHvXTd9L8/wRzw==} + /@sinclair/typebox@0.27.8: + resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + dev: true + + /@swc/core-darwin-arm64@1.3.100: + resolution: {integrity: sha512-XVWFsKe6ei+SsDbwmsuRkYck1SXRpO60Hioa4hoLwR8fxbA9eVp6enZtMxzVVMBi8ej5seZ4HZQeAWepbukiBw==} engines: {node: '>=10'} - cpu: [x64] - os: [linux] + cpu: [arm64] + os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.75: - resolution: {integrity: sha512-HOhxX0YNHTElCZqIviquka3CGYTN8rSQ6BdFfSk/K0O+ZEHx3qGte0qr+gGLPF/237GxreUkp3OMaWKuURtuCg==} + /@swc/core-darwin-x64@1.3.100: + resolution: {integrity: sha512-KF/MXrnH1nakm1wbt4XV8FS7kvqD9TGmVxeJ0U4bbvxXMvzeYUurzg3AJUTXYmXDhH/VXOYJE5N5RkwZZPs5iA==} engines: {node: '>=10'} cpu: [x64] - os: [linux] + os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.76: - resolution: {integrity: sha512-a671g4tW8kyFeuICsgq4uB9ukQfiIyXJT4V6YSnmqhCTz5mazWuDxZ5wKnx/1g5nXTl+U5cWH2TZaCJatp4GKA==} + /@swc/core-linux-arm64-gnu@1.3.100: + resolution: {integrity: sha512-p8hikNnAEJrw5vHCtKiFT4hdlQxk1V7vqPmvUDgL/qe2menQDK/i12tbz7/3BEQ4UqUPnvwpmVn2d19RdEMNxw==} engines: {node: '>=10'} - cpu: [x64] + cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.75: - resolution: {integrity: sha512-7QPI+mvBXAerVfWahrgBNe+g7fK8PuetxFnZSEmXUcDXvWcdJXAndD7GjAJzbDyjQpLKHbsDKMiHYvfNxZoN/A==} + /@swc/core-linux-arm64-musl@1.3.100: + resolution: {integrity: sha512-BWx/0EeY89WC4q3AaIaBSGfQxkYxIlS3mX19dwy2FWJs/O+fMvF9oLk/CyJPOZzbp+1DjGeeoGFuDYpiNO91JA==} engines: {node: '>=10'} cpu: [arm64] - os: [win32] + os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.76: - resolution: {integrity: sha512-+swEFtjdMezS0vKUhJC3psdSDtOJGY5pEOt4e8XOPvn7aQpKQ9LfF49XVtIwDSk5SGuWtVoLFzkSY3reWUJCyg==} + /@swc/core-linux-x64-gnu@1.3.100: + resolution: {integrity: sha512-XUdGu3dxAkjsahLYnm8WijPfKebo+jHgHphDxaW0ovI6sTdmEGFDew7QzKZRlbYL2jRkUuuKuDGvD6lO5frmhA==} engines: {node: '>=10'} - cpu: [arm64] - os: [win32] + cpu: [x64] + os: [linux] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.75: - resolution: {integrity: sha512-EfABCy4Wlq7O5ShWsm32FgDkSjyeyj/SQ4wnUIvWpkXhgfT1iNXky7KRU1HtX+SmnVk/k/NnabVZpIklYbjtZA==} + /@swc/core-linux-x64-musl@1.3.100: + resolution: {integrity: sha512-PhoXKf+f0OaNW/GCuXjJ0/KfK9EJX7z2gko+7nVnEA0p3aaPtbP6cq1Ubbl6CMoPL+Ci3gZ7nYumDqXNc3CtLQ==} engines: {node: '>=10'} - cpu: [ia32] - os: [win32] + cpu: [x64] + os: [linux] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.76: - resolution: {integrity: sha512-5CqwAykpGBJ3PqGLOlWGLGIPpBAG1IwWVDUfro3hhjQ7XJxV5Z1aQf5V5OJ90HJVtrEAVx2xx59UV/Dh081LOg==} + /@swc/core-win32-arm64-msvc@1.3.100: + resolution: {integrity: sha512-PwLADZN6F9cXn4Jw52FeP/MCLVHm8vwouZZSOoOScDtihjY495SSjdPnlosMaRSR4wJQssGwiD/4MbpgQPqbAw==} engines: {node: '>=10'} - cpu: [ia32] + cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.75: - resolution: {integrity: sha512-cTvP0pOD9C3pSp1cwtt85ZsrUkQz8RZfSPhM+jCGxKxmoowDCnInoOQ4Ica/ehyuUnQ4/IstSdYtYpO5yzPDJg==} + /@swc/core-win32-ia32-msvc@1.3.100: + resolution: {integrity: sha512-0f6nicKSLlDKlyPRl2JEmkpBV4aeDfRQg6n8mPqgL7bliZIcDahG0ej+HxgNjZfS3e0yjDxsNRa6sAqWU2Z60A==} engines: {node: '>=10'} - cpu: [x64] + cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.76: - resolution: {integrity: sha512-CiMpWLLlR3Cew9067E7XxaLBwYYJ90r9EhGSO6V1pvYSWj7ET/Ppmtj1ZhzPJMqRXAP6xflfl5R5o4ee1m4WLA==} + /@swc/core-win32-x64-msvc@1.3.100: + resolution: {integrity: sha512-b7J0rPoMkRTa3XyUGt8PwCaIBuYWsL2DqbirrQKRESzgCvif5iNpqaM6kjIjI/5y5q1Ycv564CB51YDpiS8EtQ==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.3.75: - resolution: {integrity: sha512-YLqd5oZVnaOq/OzkjRSsJUQqAfKYiD0fzUyVUPVlNNCoQEfVfSMcXH80hLmYe9aDH0T/a7qEMjWyIr/0kWqy1A==} - engines: {node: '>=10'} - requiresBuild: true - peerDependencies: - '@swc/helpers': ^0.5.0 - peerDependenciesMeta: - '@swc/helpers': - optional: true - optionalDependencies: - '@swc/core-darwin-arm64': 1.3.75 - '@swc/core-darwin-x64': 1.3.75 - '@swc/core-linux-arm-gnueabihf': 1.3.75 - '@swc/core-linux-arm64-gnu': 1.3.75 - '@swc/core-linux-arm64-musl': 1.3.75 - '@swc/core-linux-x64-gnu': 1.3.75 - '@swc/core-linux-x64-musl': 1.3.75 - '@swc/core-win32-arm64-msvc': 1.3.75 - '@swc/core-win32-ia32-msvc': 1.3.75 - '@swc/core-win32-x64-msvc': 1.3.75 - - /@swc/core@1.3.76: - resolution: {integrity: sha512-aYYTA2aVYkwJAZepQXtPnkUthhOfn8qd6rsh+lrJxonFrjmpI7RHt2tMDVTXP6XDX7fvnvrVtT1bwZfmBFPh0Q==} + /@swc/core@1.3.100: + resolution: {integrity: sha512-7dKgTyxJjlrMwFZYb1auj3Xq0D8ZBe+5oeIgfMlRU05doXZypYJe0LAk0yjj3WdbwYzpF+T1PLxwTWizI0pckw==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -976,37 +963,25 @@ packages: peerDependenciesMeta: '@swc/helpers': optional: true - optionalDependencies: - '@swc/core-darwin-arm64': 1.3.76 - '@swc/core-darwin-x64': 1.3.76 - '@swc/core-linux-arm-gnueabihf': 1.3.76 - '@swc/core-linux-arm64-gnu': 1.3.76 - '@swc/core-linux-arm64-musl': 1.3.76 - '@swc/core-linux-x64-gnu': 1.3.76 - '@swc/core-linux-x64-musl': 1.3.76 - '@swc/core-win32-arm64-msvc': 1.3.76 - '@swc/core-win32-ia32-msvc': 1.3.76 - '@swc/core-win32-x64-msvc': 1.3.76 - - /@types/chai-subset@1.3.3: - resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==} - dependencies: - '@types/chai': 4.3.5 - dev: true - - /@types/chai@4.3.5: - resolution: {integrity: sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==} - dev: true - - /@types/chai@4.3.6: - resolution: {integrity: sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==} - dev: true - - /@types/is-ci@3.0.0: - resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==} dependencies: - ci-info: 3.8.0 - dev: true + '@swc/counter': 0.1.2 + '@swc/types': 0.1.5 + optionalDependencies: + '@swc/core-darwin-arm64': 1.3.100 + '@swc/core-darwin-x64': 1.3.100 + '@swc/core-linux-arm64-gnu': 1.3.100 + '@swc/core-linux-arm64-musl': 1.3.100 + '@swc/core-linux-x64-gnu': 1.3.100 + '@swc/core-linux-x64-musl': 1.3.100 + '@swc/core-win32-arm64-msvc': 1.3.100 + '@swc/core-win32-ia32-msvc': 1.3.100 + '@swc/core-win32-x64-msvc': 1.3.100 + + /@swc/counter@0.1.2: + resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} + + /@swc/types@0.1.5: + resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==} /@types/minimist@1.2.2: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} @@ -1016,16 +991,10 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.4.8: - resolution: {integrity: sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==} - dev: true - - /@types/node@20.4.9: - resolution: {integrity: sha512-8e2HYcg7ohnTUbHk8focoklEQYvemQmu9M/f43DZVx43kHn0tE3BY/6gSDxS7k0SprtS0NHvj+L80cGLnoOUcQ==} - dev: true - - /@types/node@20.6.0: - resolution: {integrity: sha512-najjVq5KN2vsH2U/xyh2opaSEz6cZMR2SetLIlxlj08nOcmPOemJmUK2o4kUzfLqfrWE0PIrNeE16XhYDd3nqg==} + /@types/node@20.10.4: + resolution: {integrity: sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==} + dependencies: + undici-types: 5.26.5 dev: true /@types/normalize-package-data@2.4.1: @@ -1036,88 +1005,50 @@ packages: resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} dev: true - /@vitest/expect@0.33.0: - resolution: {integrity: sha512-sVNf+Gla3mhTCxNJx+wJLDPp/WcstOe0Ksqz4Vec51MmgMth/ia0MGFEkIZmVGeTL5HtjYR4Wl/ZxBxBXZJTzQ==} - dependencies: - '@vitest/spy': 0.33.0 - '@vitest/utils': 0.33.0 - chai: 4.3.7 - dev: true - - /@vitest/expect@0.34.4: - resolution: {integrity: sha512-XlMKX8HyYUqB8dsY8Xxrc64J2Qs9pKMt2Z8vFTL4mBWXJsg4yoALHzJfDWi8h5nkO4Zua4zjqtapQ/IluVkSnA==} - dependencies: - '@vitest/spy': 0.34.4 - '@vitest/utils': 0.34.4 - chai: 4.3.8 - dev: true - - /@vitest/runner@0.33.0: - resolution: {integrity: sha512-UPfACnmCB6HKRHTlcgCoBh6ppl6fDn+J/xR8dTufWiKt/74Y9bHci5CKB8tESSV82zKYtkBJo9whU3mNvfaisg==} - dependencies: - '@vitest/utils': 0.33.0 - p-limit: 4.0.0 - pathe: 1.1.1 - dev: true - - /@vitest/runner@0.34.4: - resolution: {integrity: sha512-hwwdB1StERqUls8oV8YcpmTIpVeJMe4WgYuDongVzixl5hlYLT2G8afhcdADeDeqCaAmZcSgLTLtqkjPQF7x+w==} + /@vitest/expect@1.0.4: + resolution: {integrity: sha512-/NRN9N88qjg3dkhmFcCBwhn/Ie4h064pY3iv7WLRsDJW7dXnEgeoa8W9zy7gIPluhz6CkgqiB3HmpIXgmEY5dQ==} dependencies: - '@vitest/utils': 0.34.4 - p-limit: 4.0.0 - pathe: 1.1.1 + '@vitest/spy': 1.0.4 + '@vitest/utils': 1.0.4 + chai: 4.3.10 dev: true - /@vitest/snapshot@0.33.0: - resolution: {integrity: sha512-tJjrl//qAHbyHajpFvr8Wsk8DIOODEebTu7pgBrP07iOepR5jYkLFiqLq2Ltxv+r0uptUb4izv1J8XBOwKkVYA==} + /@vitest/runner@1.0.4: + resolution: {integrity: sha512-rhOQ9FZTEkV41JWXozFM8YgOqaG9zA7QXbhg5gy6mFOVqh4PcupirIJ+wN7QjeJt8S8nJRYuZH1OjJjsbxAXTQ==} dependencies: - magic-string: 0.30.2 + '@vitest/utils': 1.0.4 + p-limit: 5.0.0 pathe: 1.1.1 - pretty-format: 29.6.2 dev: true - /@vitest/snapshot@0.34.4: - resolution: {integrity: sha512-GCsh4coc3YUSL/o+BPUo7lHQbzpdttTxL6f4q0jRx2qVGoYz/cyTRDJHbnwks6TILi6560bVWoBpYC10PuTLHw==} + /@vitest/snapshot@1.0.4: + resolution: {integrity: sha512-vkfXUrNyNRA/Gzsp2lpyJxh94vU2OHT1amoD6WuvUAA12n32xeVZQ0KjjQIf8F6u7bcq2A2k969fMVxEsxeKYA==} dependencies: - magic-string: 0.30.3 + magic-string: 0.30.5 pathe: 1.1.1 - pretty-format: 29.6.3 - dev: true - - /@vitest/spy@0.33.0: - resolution: {integrity: sha512-Kv+yZ4hnH1WdiAkPUQTpRxW8kGtH8VRTnus7ZTGovFYM1ZezJpvGtb9nPIjPnptHbsyIAxYZsEpVPYgtpjGnrg==} - dependencies: - tinyspy: 2.1.1 + pretty-format: 29.7.0 dev: true - /@vitest/spy@0.34.4: - resolution: {integrity: sha512-PNU+fd7DUPgA3Ya924b1qKuQkonAW6hL7YUjkON3wmBwSTIlhOSpy04SJ0NrRsEbrXgMMj6Morh04BMf8k+w0g==} + /@vitest/spy@1.0.4: + resolution: {integrity: sha512-9ojTFRL1AJVh0hvfzAQpm0QS6xIS+1HFIw94kl/1ucTfGCaj1LV/iuJU4Y6cdR03EzPDygxTHwE1JOm+5RCcvA==} dependencies: - tinyspy: 2.1.1 + tinyspy: 2.2.0 dev: true - /@vitest/utils@0.33.0: - resolution: {integrity: sha512-pF1w22ic965sv+EN6uoePkAOTkAPWM03Ri/jXNyMIKBb/XHLDPfhLvf/Fa9g0YECevAIz56oVYXhodLvLQ/awA==} - dependencies: - diff-sequences: 29.4.3 - loupe: 2.3.6 - pretty-format: 29.6.2 - dev: true - - /@vitest/utils@0.34.4: - resolution: {integrity: sha512-yR2+5CHhp/K4ySY0Qtd+CAL9f5Yh1aXrKfAT42bq6CtlGPh92jIDDDSg7ydlRow1CP+dys4TrOrbELOyNInHSg==} + /@vitest/utils@1.0.4: + resolution: {integrity: sha512-gsswWDXxtt0QvtK/y/LWukN7sGMYmnCcv1qv05CsY6cU/Y1zpGX1QuvLs+GO1inczpE6Owixeel3ShkjhYtGfA==} dependencies: diff-sequences: 29.6.3 - loupe: 2.3.6 - pretty-format: 29.6.3 + loupe: 2.3.7 + pretty-format: 29.7.0 dev: true /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: true - /acorn-walk@8.2.0: - resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} + /acorn-walk@8.3.1: + resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==} engines: {node: '>=0.4.0'} dev: true @@ -1254,13 +1185,13 @@ packages: wcwidth: 1.0.1 dev: true - /bundle-require@4.0.1(esbuild@0.18.20): + /bundle-require@4.0.1(esbuild@0.19.9): resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} peerDependencies: esbuild: '>=0.17' dependencies: - esbuild: 0.18.20 + esbuild: 0.19.9 load-tsconfig: 0.2.5 dev: true @@ -1290,27 +1221,14 @@ packages: engines: {node: '>=6'} dev: true - /chai@4.3.7: - resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==} - engines: {node: '>=4'} - dependencies: - assertion-error: 1.1.0 - check-error: 1.0.2 - deep-eql: 4.1.3 - get-func-name: 2.0.0 - loupe: 2.3.6 - pathval: 1.1.1 - type-detect: 4.0.8 - dev: true - - /chai@4.3.8: - resolution: {integrity: sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==} + /chai@4.3.10: + resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==} engines: {node: '>=4'} dependencies: assertion-error: 1.1.0 - check-error: 1.0.2 + check-error: 1.0.3 deep-eql: 4.1.3 - get-func-name: 2.0.0 + get-func-name: 2.0.2 loupe: 2.3.6 pathval: 1.1.1 type-detect: 4.0.8 @@ -1336,8 +1254,10 @@ packages: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} dev: true - /check-error@1.0.2: - resolution: {integrity: sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==} + /check-error@1.0.3: + resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} + dependencies: + get-func-name: 2.0.2 dev: true /chokidar@3.5.3: @@ -1387,11 +1307,11 @@ packages: engines: {node: '>=0.8'} dev: true - /cmd-ts@0.12.1: - resolution: {integrity: sha512-k93f6LgFEzx7/vBy5qV+tu1VI8YuH0DZmwNXPvRaDR4Qp7Fl9+pUSylX/CKHrWoKqHMJjNOLb1NeYTvHOjQ2Kw==} + /cmd-ts@0.13.0: + resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} dependencies: chalk: 4.1.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@5.5.0) didyoumean: 1.2.2 strip-ansi: 6.0.1 transitivePeerDependencies: @@ -1462,19 +1382,7 @@ packages: stream-transform: 2.1.3 dev: true - /debug@3.2.7(supports-color@5.5.0): - resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.3 - supports-color: 5.5.0 - dev: true - - /debug@4.3.4: + /debug@4.3.4(supports-color@5.5.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} peerDependencies: @@ -1484,6 +1392,7 @@ packages: optional: true dependencies: ms: 2.1.2 + supports-color: 5.5.0 /decamelize-keys@1.1.1: resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} @@ -1534,11 +1443,6 @@ packages: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} dev: false - /diff-sequences@29.4.3: - resolution: {integrity: sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dev: true - /diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -1638,34 +1542,34 @@ packages: is-symbol: 1.0.4 dev: true - /esbuild@0.18.20: - resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} + /esbuild@0.19.9: + resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.18.20 - '@esbuild/android-arm64': 0.18.20 - '@esbuild/android-x64': 0.18.20 - '@esbuild/darwin-arm64': 0.18.20 - '@esbuild/darwin-x64': 0.18.20 - '@esbuild/freebsd-arm64': 0.18.20 - '@esbuild/freebsd-x64': 0.18.20 - '@esbuild/linux-arm': 0.18.20 - '@esbuild/linux-arm64': 0.18.20 - '@esbuild/linux-ia32': 0.18.20 - '@esbuild/linux-loong64': 0.18.20 - '@esbuild/linux-mips64el': 0.18.20 - '@esbuild/linux-ppc64': 0.18.20 - '@esbuild/linux-riscv64': 0.18.20 - '@esbuild/linux-s390x': 0.18.20 - '@esbuild/linux-x64': 0.18.20 - '@esbuild/netbsd-x64': 0.18.20 - '@esbuild/openbsd-x64': 0.18.20 - '@esbuild/sunos-x64': 0.18.20 - '@esbuild/win32-arm64': 0.18.20 - '@esbuild/win32-ia32': 0.18.20 - '@esbuild/win32-x64': 0.18.20 + '@esbuild/android-arm': 0.19.9 + '@esbuild/android-arm64': 0.19.9 + '@esbuild/android-x64': 0.19.9 + '@esbuild/darwin-arm64': 0.19.9 + '@esbuild/darwin-x64': 0.19.9 + '@esbuild/freebsd-arm64': 0.19.9 + '@esbuild/freebsd-x64': 0.19.9 + '@esbuild/linux-arm': 0.19.9 + '@esbuild/linux-arm64': 0.19.9 + '@esbuild/linux-ia32': 0.19.9 + '@esbuild/linux-loong64': 0.19.9 + '@esbuild/linux-mips64el': 0.19.9 + '@esbuild/linux-ppc64': 0.19.9 + '@esbuild/linux-riscv64': 0.19.9 + '@esbuild/linux-s390x': 0.19.9 + '@esbuild/linux-x64': 0.19.9 + '@esbuild/netbsd-x64': 0.19.9 + '@esbuild/openbsd-x64': 0.19.9 + '@esbuild/sunos-x64': 0.19.9 + '@esbuild/win32-arm64': 0.19.9 + '@esbuild/win32-ia32': 0.19.9 + '@esbuild/win32-x64': 0.19.9 dev: true /escalade@3.1.1: @@ -1712,7 +1616,6 @@ packages: onetime: 6.0.0 signal-exit: 4.1.0 strip-final-newline: 3.0.0 - dev: false /extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} @@ -1839,8 +1742,8 @@ packages: engines: {node: 6.* || 8.* || >= 10.*} dev: true - /get-func-name@2.0.0: - resolution: {integrity: sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==} + /get-func-name@2.0.2: + resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} dev: true /get-intrinsic@1.2.1: @@ -1860,7 +1763,6 @@ packages: /get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - dev: false /get-symbol-description@1.0.0: resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} @@ -1932,7 +1834,6 @@ packages: /has-flag@3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} - dev: true /has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} @@ -1984,7 +1885,6 @@ packages: /human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - dev: false /iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} @@ -2067,13 +1967,6 @@ packages: engines: {node: '>= 0.4'} dev: true - /is-ci@3.0.1: - resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==} - hasBin: true - dependencies: - ci-info: 3.8.0 - dev: true - /is-core-module@2.13.0: resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} dependencies: @@ -2148,7 +2041,6 @@ packages: /is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: false /is-string@1.0.7: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} @@ -2196,8 +2088,8 @@ packages: /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - /jiti@1.19.3: - resolution: {integrity: sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==} + /jiti@1.21.0: + resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true dev: true @@ -2265,9 +2157,12 @@ packages: strip-bom: 3.0.0 dev: true - /local-pkg@0.4.3: - resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==} + /local-pkg@0.5.0: + resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} engines: {node: '>=14'} + dependencies: + mlly: 1.4.2 + pkg-types: 1.0.3 dev: true /locate-path@5.0.0: @@ -2294,8 +2189,15 @@ packages: /loupe@2.3.6: resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} + deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5 dependencies: - get-func-name: 2.0.0 + get-func-name: 2.0.2 + dev: true + + /loupe@2.3.7: + resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} + dependencies: + get-func-name: 2.0.2 dev: true /lru-cache@4.1.5: @@ -2312,15 +2214,8 @@ packages: yallist: 4.0.0 dev: true - /magic-string@0.30.2: - resolution: {integrity: sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - - /magic-string@0.30.3: - resolution: {integrity: sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==} + /magic-string@0.30.5: + resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -2389,7 +2284,6 @@ packages: /mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} - dev: false /min-indent@1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} @@ -2441,15 +2335,6 @@ packages: hasBin: true dev: false - /mlly@1.4.0: - resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} - dependencies: - acorn: 8.10.0 - pathe: 1.1.1 - pkg-types: 1.0.3 - ufo: 1.2.0 - dev: true - /mlly@1.4.2: resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} dependencies: @@ -2462,10 +2347,6 @@ packages: /ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - /ms@2.1.3: - resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - dev: true - /mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} dependencies: @@ -2473,19 +2354,19 @@ packages: object-assign: 4.1.1 thenify-all: 1.6.0 - /nanoid@3.3.6: - resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} + /nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true dev: true - /nodemon@3.0.1: - resolution: {integrity: sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==} + /nodemon@3.0.2: + resolution: {integrity: sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA==} engines: {node: '>=10'} hasBin: true dependencies: chokidar: 3.5.3 - debug: 3.2.7(supports-color@5.5.0) + debug: 4.3.4(supports-color@5.5.0) ignore-by-default: 1.0.1 minimatch: 3.1.2 pstree.remy: 1.1.8 @@ -2529,7 +2410,6 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: path-key: 4.0.0 - dev: false /object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} @@ -2571,7 +2451,6 @@ packages: engines: {node: '>=12'} dependencies: mimic-fn: 4.0.0 - dev: false /os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} @@ -2603,9 +2482,9 @@ packages: yocto-queue: 0.1.0 dev: true - /p-limit@4.0.0: - resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + /p-limit@5.0.0: + resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} + engines: {node: '>=18'} dependencies: yocto-queue: 1.0.0 dev: true @@ -2660,7 +2539,6 @@ packages: /path-key@4.0.0: resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} engines: {node: '>=12'} - dev: false /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} @@ -2707,7 +2585,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.4.0 + mlly: 1.4.2 pathe: 1.1.1 dev: true @@ -2727,11 +2605,11 @@ packages: yaml: 2.3.2 dev: true - /postcss@8.4.29: - resolution: {integrity: sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==} + /postcss@8.4.32: + resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.6 + nanoid: 3.3.7 picocolors: 1.0.0 source-map-js: 1.0.2 dev: true @@ -2752,23 +2630,14 @@ packages: hasBin: true dev: true - /prettier@3.0.3: - resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + /prettier@3.1.1: + resolution: {integrity: sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==} engines: {node: '>=14'} hasBin: true dev: true - /pretty-format@29.6.2: - resolution: {integrity: sha512-1q0oC8eRveTg5nnBEWMXAU2qpv65Gnuf2eCQzSjxpWFkPaPARwqZZDGuNE0zPAZfTCHzIk3A8dIjwlQKKLphyg==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/schemas': 29.6.0 - ansi-styles: 5.2.0 - react-is: 18.2.0 - dev: true - - /pretty-format@29.6.3: - resolution: {integrity: sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==} + /pretty-format@29.7.0: + resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/schemas': 29.6.3 @@ -2887,11 +2756,24 @@ packages: engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: true - /rollup@3.29.1: - resolution: {integrity: sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} + /rollup@4.9.1: + resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.9.1 + '@rollup/rollup-android-arm64': 4.9.1 + '@rollup/rollup-darwin-arm64': 4.9.1 + '@rollup/rollup-darwin-x64': 4.9.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.9.1 + '@rollup/rollup-linux-arm64-gnu': 4.9.1 + '@rollup/rollup-linux-arm64-musl': 4.9.1 + '@rollup/rollup-linux-riscv64-gnu': 4.9.1 + '@rollup/rollup-linux-x64-gnu': 4.9.1 + '@rollup/rollup-linux-x64-musl': 4.9.1 + '@rollup/rollup-win32-arm64-msvc': 4.9.1 + '@rollup/rollup-win32-ia32-msvc': 4.9.1 + '@rollup/rollup-win32-x64-msvc': 4.9.1 fsevents: 2.3.3 dev: true @@ -2981,7 +2863,6 @@ packages: /signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - dev: false /simple-update-notifier@2.0.0: resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} @@ -3011,8 +2892,8 @@ packages: yargs: 15.4.1 dev: true - /smol-toml@1.1.1: - resolution: {integrity: sha512-qyYMygHyDKiy82iiKTH/zXr0DZmEpsou0AMZnkXdYhA/0LhPLoZ/xHaOBrbecLbAJ/Gd5KhMWWH8TXtgv1g+DQ==} + /smol-toml@1.1.3: + resolution: {integrity: sha512-qTyy6Owjho1ISBmxj4HdrFWB2kMQ5RczU6J04OqslSfdSH656OIHuomHS4ZDvhwm37nig/uXyiTMJxlC9zIVfw==} engines: {node: '>= 18', pnpm: '>= 8'} dev: false @@ -3065,8 +2946,8 @@ packages: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} dev: true - /std-env@3.4.3: - resolution: {integrity: sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==} + /std-env@3.6.0: + resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==} dev: true /stream-transform@2.1.3: @@ -3128,7 +3009,6 @@ packages: /strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} - dev: false /strip-indent@3.0.0: resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} @@ -3161,7 +3041,6 @@ packages: engines: {node: '>=4'} dependencies: has-flag: 3.0.0 - dev: true /supports-color@7.2.0: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} @@ -3214,22 +3093,17 @@ packages: when-exit: 2.1.1 dev: false - /tinybench@2.5.0: - resolution: {integrity: sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==} + /tinybench@2.5.1: + resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==} dev: true - /tinypool@0.6.0: - resolution: {integrity: sha512-FdswUUo5SxRizcBc6b1GSuLpLjisa8N8qMyYoP3rl+bym+QauhtJP5bvZY1ytt8krKGmMLYIRl36HBZfeAoqhQ==} + /tinypool@0.8.1: + resolution: {integrity: sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==} engines: {node: '>=14.0.0'} dev: true - /tinypool@0.7.0: - resolution: {integrity: sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==} - engines: {node: '>=14.0.0'} - dev: true - - /tinyspy@2.1.1: - resolution: {integrity: sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==} + /tinyspy@2.2.0: + resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==} engines: {node: '>=14.0.0'} dev: true @@ -3273,52 +3147,18 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@7.2.0(@swc/core@1.3.75)(typescript@5.2.2): - resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} - engines: {node: '>=16.14'} + /tsup@8.0.1(@swc/core@1.3.100)(typescript@5.3.3): + resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} + engines: {node: '>=18'} hasBin: true peerDependencies: + '@microsoft/api-extractor': ^7.36.0 '@swc/core': ^1 postcss: ^8.4.12 - typescript: '>=4.1.0' + typescript: '>=4.5.0' peerDependenciesMeta: - '@swc/core': + '@microsoft/api-extractor': optional: true - postcss: - optional: true - typescript: - optional: true - dependencies: - '@swc/core': 1.3.75 - bundle-require: 4.0.1(esbuild@0.18.20) - cac: 6.7.14 - chokidar: 3.5.3 - debug: 4.3.4 - esbuild: 0.18.20 - execa: 5.1.1 - globby: 11.1.0 - joycon: 3.1.1 - postcss-load-config: 4.0.1 - resolve-from: 5.0.0 - rollup: 3.29.1 - source-map: 0.8.0-beta.0 - sucrase: 3.34.0 - tree-kill: 1.2.2 - typescript: 5.2.2 - transitivePeerDependencies: - - supports-color - - ts-node - dev: true - - /tsup@7.2.0(@swc/core@1.3.76)(typescript@5.2.2): - resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} - engines: {node: '>=16.14'} - hasBin: true - peerDependencies: - '@swc/core': ^1 - postcss: ^8.4.12 - typescript: '>=4.1.0' - peerDependenciesMeta: '@swc/core': optional: true postcss: @@ -3326,22 +3166,22 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.3.76 - bundle-require: 4.0.1(esbuild@0.18.20) + '@swc/core': 1.3.100 + bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 - debug: 4.3.4 - esbuild: 0.18.20 + debug: 4.3.4(supports-color@5.5.0) + esbuild: 0.19.9 execa: 5.1.1 globby: 11.1.0 joycon: 3.1.1 postcss-load-config: 4.0.1 resolve-from: 5.0.0 - rollup: 3.29.1 + rollup: 4.9.1 source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 - typescript: 5.2.2 + typescript: 5.3.3 transitivePeerDependencies: - supports-color - ts-node @@ -3361,65 +3201,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.10.13: - resolution: {integrity: sha512-vmngGfa2dlYvX7UFVncsNDMuT4X2KPyPJ2Jj+xvf5nvQnZR/3IeDEGleGVuMi/hRzdinoxwXqgk9flEmAYp0Xw==} + /turbo-darwin-64@1.11.2: + resolution: {integrity: sha512-toFmRG/adriZY3hOps7nYCfqHAS+Ci6xqgX3fbo82kkLpC6OBzcXnleSwuPqjHVAaRNhVoB83L5njcE9Qwi2og==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.10.13: - resolution: {integrity: sha512-eMoJC+k7gIS4i2qL6rKmrIQGP6Wr9nN4odzzgHFngLTMimok2cGLK3qbJs5O5F/XAtEeRAmuxeRnzQwTl/iuAw==} + /turbo-darwin-arm64@1.11.2: + resolution: {integrity: sha512-FCsEDZ8BUSFYEOSC3rrARQrj7x2VOrmVcfrMUIhexTxproRh4QyMxLfr6LALk4ymx6jbDCxWa6Szal8ckldFbA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.10.13: - resolution: {integrity: sha512-0CyYmnKTs6kcx7+JRH3nPEqCnzWduM0hj8GP/aodhaIkLNSAGAa+RiYZz6C7IXN+xUVh5rrWTnU2f1SkIy7Gdg==} + /turbo-linux-64@1.11.2: + resolution: {integrity: sha512-Vzda/o/QyEske5CxLf0wcu7UUS+7zB90GgHZV4tyN+WZtoouTvbwuvZ3V6b5Wgd3OJ/JwWR0CXDK7Sf4VEMr7A==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.10.13: - resolution: {integrity: sha512-0iBKviSGQQlh2OjZgBsGjkPXoxvRIxrrLLbLObwJo3sOjIH0loGmVIimGS5E323soMfi/o+sidjk2wU1kFfD7Q==} + /turbo-linux-arm64@1.11.2: + resolution: {integrity: sha512-bRLwovQRz0yxDZrM4tQEAYV0fBHEaTzUF0JZ8RG1UmZt/CqtpnUrJpYb1VK8hj1z46z9YehARpYCwQ2K0qU4yw==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.10.13: - resolution: {integrity: sha512-S5XySRfW2AmnTeY1IT+Jdr6Goq7mxWganVFfrmqU+qqq3Om/nr0GkcUX+KTIo9mPrN0D3p5QViBRzulwB5iuUQ==} + /turbo-windows-64@1.11.2: + resolution: {integrity: sha512-LgTWqkHAKgyVuLYcEPxZVGPInTjjeCnN5KQMdJ4uQZ+xMDROvMFS2rM93iQl4ieDJgidwHCxxCxaU9u8c3d/Kg==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.10.13: - resolution: {integrity: sha512-nKol6+CyiExJIuoIc3exUQPIBjP9nIq5SkMJgJuxsot2hkgGrafAg/izVDRDrRduQcXj2s8LdtxJHvvnbI8hEQ==} + /turbo-windows-arm64@1.11.2: + resolution: {integrity: sha512-829aVBU7IX0c/B4G7g1VI8KniAGutHhIupkYMgF6xPkYVev2G3MYe6DMS/vsLt9GGM9ulDtdWxWrH5P2ngK8IQ==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.10.13: - resolution: {integrity: sha512-vOF5IPytgQPIsgGtT0n2uGZizR2N3kKuPIn4b5p5DdeLoI0BV7uNiydT7eSzdkPRpdXNnO8UwS658VaI4+YSzQ==} + /turbo@1.11.2: + resolution: {integrity: sha512-jPC7LVQJzebs5gWf8FmEvsvXGNyKbN+O9qpvv98xpNaM59aS0/Irhd0H0KbcqnXfsz7ETlzOC3R+xFWthC4Z8A==} hasBin: true - requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.10.13 - turbo-darwin-arm64: 1.10.13 - turbo-linux-64: 1.10.13 - turbo-linux-arm64: 1.10.13 - turbo-windows-64: 1.10.13 - turbo-windows-arm64: 1.10.13 + turbo-darwin-64: 1.11.2 + turbo-darwin-arm64: 1.11.2 + turbo-linux-64: 1.11.2 + turbo-linux-arm64: 1.11.2 + turbo-windows-64: 1.11.2 + turbo-windows-arm64: 1.11.2 dev: true /type-detect@4.0.8: @@ -3480,16 +3319,12 @@ packages: is-typed-array: 1.1.12 dev: true - /typescript@5.2.2: - resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} engines: {node: '>=14.17'} hasBin: true dev: true - /ufo@1.2.0: - resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==} - dev: true - /ufo@1.3.0: resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==} dev: true @@ -3507,6 +3342,10 @@ packages: resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} dev: true + /undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + dev: true + /universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -3519,17 +3358,16 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@0.33.0(@types/node@20.4.8): - resolution: {integrity: sha512-19FpHYbwWWxDr73ruNahC+vtEdza52kA90Qb3La98yZ0xULqV8A5JLNPUff0f5zID4984tW7l3DH2przTJUZSw==} - engines: {node: '>=v14.18.0'} + /vite-node@1.0.4(@types/node@20.10.4): + resolution: {integrity: sha512-9xQQtHdsz5Qn8hqbV7UKqkm8YkJhzT/zr41Dmt5N7AlD8hJXw/Z7y0QiD5I8lnTthV9Rvcvi0QW7PI0Fq83ZPg==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4 - mlly: 1.4.0 + debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.4.8) + vite: 5.0.10(@types/node@20.10.4) transitivePeerDependencies: - '@types/node' - less @@ -3541,70 +3379,12 @@ packages: - terser dev: true - /vite-node@0.34.4(@types/node@20.6.0): - resolution: {integrity: sha512-ho8HtiLc+nsmbwZMw8SlghESEE3KxJNp04F/jPUCLVvaURwt0d+r9LxEqCX5hvrrOQ0GSyxbYr5ZfRYhQ0yVKQ==} - engines: {node: '>=v14.18.0'} - hasBin: true - dependencies: - cac: 6.7.14 - debug: 4.3.4 - mlly: 1.4.2 - pathe: 1.1.1 - picocolors: 1.0.0 - vite: 4.4.9(@types/node@20.6.0) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vite@4.4.9(@types/node@20.4.8): - resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.4.8 - esbuild: 0.18.20 - postcss: 8.4.29 - rollup: 3.29.1 - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /vite@4.4.9(@types/node@20.6.0): - resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==} - engines: {node: ^14.18.0 || >=16.0.0} + /vite@5.0.10(@types/node@20.10.4): + resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: - '@types/node': '>= 14' + '@types/node': ^18.0.0 || >=20.0.0 less: '*' lightningcss: ^1.21.0 sass: '*' @@ -3627,94 +3407,29 @@ packages: terser: optional: true dependencies: - '@types/node': 20.6.0 - esbuild: 0.18.20 - postcss: 8.4.29 - rollup: 3.29.1 + '@types/node': 20.10.4 + esbuild: 0.19.9 + postcss: 8.4.32 + rollup: 4.9.1 optionalDependencies: fsevents: 2.3.3 dev: true - /vitest@0.33.0: - resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==} - engines: {node: '>=v14.18.0'} + /vitest@1.0.4(@types/node@20.10.4): + resolution: {integrity: sha512-s1GQHp/UOeWEo4+aXDOeFBJwFzL6mjycbQwwKWX2QcYfh/7tIerS59hWQ20mxzupTJluA2SdwiBuWwQHH67ckg==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' - '@vitest/browser': '*' - '@vitest/ui': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': ^1.0.0 + '@vitest/ui': ^1.0.0 happy-dom: '*' jsdom: '*' - playwright: '*' - safaridriver: '*' - webdriverio: '*' peerDependenciesMeta: '@edge-runtime/vm': optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true - dependencies: - '@types/chai': 4.3.5 - '@types/chai-subset': 1.3.3 - '@types/node': 20.4.8 - '@vitest/expect': 0.33.0 - '@vitest/runner': 0.33.0 - '@vitest/snapshot': 0.33.0 - '@vitest/spy': 0.33.0 - '@vitest/utils': 0.33.0 - acorn: 8.10.0 - acorn-walk: 8.2.0 - cac: 6.7.14 - chai: 4.3.8 - debug: 4.3.4 - local-pkg: 0.4.3 - magic-string: 0.30.3 - pathe: 1.1.1 - picocolors: 1.0.0 - std-env: 3.4.3 - strip-literal: 1.3.0 - tinybench: 2.5.0 - tinypool: 0.6.0 - vite: 4.4.9(@types/node@20.4.8) - vite-node: 0.33.0(@types/node@20.4.8) - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vitest@0.34.4: - resolution: {integrity: sha512-SE/laOsB6995QlbSE6BtkpXDeVNLJc1u2LHRG/OpnN4RsRzM3GQm4nm3PQCK5OBtrsUqnhzLdnT7se3aeNGdlw==} - engines: {node: '>=v14.18.0'} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@vitest/browser': '*' - '@vitest/ui': '*' - happy-dom: '*' - jsdom: '*' - playwright: '*' - safaridriver: '*' - webdriverio: '*' - peerDependenciesMeta: - '@edge-runtime/vm': + '@types/node': optional: true '@vitest/browser': optional: true @@ -3724,36 +3439,28 @@ packages: optional: true jsdom: optional: true - playwright: - optional: true - safaridriver: - optional: true - webdriverio: - optional: true dependencies: - '@types/chai': 4.3.6 - '@types/chai-subset': 1.3.3 - '@types/node': 20.6.0 - '@vitest/expect': 0.34.4 - '@vitest/runner': 0.34.4 - '@vitest/snapshot': 0.34.4 - '@vitest/spy': 0.34.4 - '@vitest/utils': 0.34.4 - acorn: 8.10.0 - acorn-walk: 8.2.0 + '@types/node': 20.10.4 + '@vitest/expect': 1.0.4 + '@vitest/runner': 1.0.4 + '@vitest/snapshot': 1.0.4 + '@vitest/spy': 1.0.4 + '@vitest/utils': 1.0.4 + acorn-walk: 8.3.1 cac: 6.7.14 - chai: 4.3.8 - debug: 4.3.4 - local-pkg: 0.4.3 - magic-string: 0.30.3 + chai: 4.3.10 + debug: 4.3.4(supports-color@5.5.0) + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.5 pathe: 1.1.1 picocolors: 1.0.0 - std-env: 3.4.3 + std-env: 3.6.0 strip-literal: 1.3.0 - tinybench: 2.5.0 - tinypool: 0.7.0 - vite: 4.4.9(@types/node@20.6.0) - vite-node: 0.34.4(@types/node@20.6.0) + tinybench: 2.5.1 + tinypool: 0.8.1 + vite: 5.0.10(@types/node@20.10.4) + vite-node: 1.0.4(@types/node@20.10.4) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 7d6b2e9d0fa9b1c2243354dbcc8670dd1169f53c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 17 Dec 2023 21:12:15 +0000 Subject: [PATCH 033/290] Bump packages --- .gitignore | 3 +++ packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 084f96e..b1d8509 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,9 @@ dist # SWC Plugin Cache .swc +# Turbopack files +.turbo + # Gatsby files .cache/ # Comment in the public line in if your project uses Gatsby and not Next.js diff --git a/packages/commands/package.json b/packages/commands/package.json index 325807f..e2d7105 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.8", + "version": "0.0.9", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index 4a7c7c6..4398c62 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.18", + "version": "0.0.19", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index d89b32b..eb6a3ba 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.13", + "version": "0.0.14", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/ui/package.json b/packages/ui/package.json index 4aa155b..88bd288 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.8", + "version": "0.0.9", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 4f0a88b..08ce97b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.9", + "version": "0.0.10", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 5e42a647b5b171f065b5ba4ce17ee3671e55be76 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:04:36 +0000 Subject: [PATCH 034/290] Update supported --- packages/commands/src/handlers/new.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 1406389..c2a5d9c 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -41,16 +41,16 @@ Thumbs.db const startSupported = [ "bare", + "basic", "hackernews", "todomvc", "with-auth", - "with-authjs", "with-mdx", "with-prisma", "with-solid-styled", "with-tailwindcss", "with-trpc", - "with-vitest", + // "with-vitest", "with-websocket", ] as const; const localSupported = ["ts", "js"] as const; From a2d4bb409f9b132d5bfbf53e3a762051ccd7b382 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:06:45 +0000 Subject: [PATCH 035/290] Bump packages --- packages/commands/package.json | 2 +- packages/create-solid/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index e2d7105..10c2334 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.9", + "version": "0.0.10", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index eb6a3ba..5ebb063 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.14", + "version": "0.0.15", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", From a023c99ca539a13cdf70564aee4a24805234e68d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:21:29 +0000 Subject: [PATCH 036/290] Update supported (again) --- packages/commands/src/handlers/new.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index c2a5d9c..10c844a 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -42,6 +42,7 @@ Thumbs.db const startSupported = [ "bare", "basic", + "experiments", "hackernews", "todomvc", "with-auth", @@ -50,8 +51,6 @@ const startSupported = [ "with-solid-styled", "with-tailwindcss", "with-trpc", - // "with-vitest", - "with-websocket", ] as const; const localSupported = ["ts", "js"] as const; const stackblitzSupported = ["bare"] as const; From a4945f36f198b3f5bf4aa400a70ffeb38669542f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:21:58 +0000 Subject: [PATCH 037/290] Bump versions --- packages/commands/package.json | 2 +- packages/create-solid/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 10c2334..91b4789 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.10", + "version": "0.0.11", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 5ebb063..3751aaf 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.15", + "version": "0.0.16", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", From d518a690a6d2f0fabfe28935bf0321e26ba96615 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:29:29 +0000 Subject: [PATCH 038/290] Update vitest --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97d2dda..a32ed58 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "nodemon": "^3.0.2", "prettier": "^3.1.1", "turbo": "^1.11.2", - "vitest": "^1.0.4" + "vitest": "^1.1.0" }, "packageManager": "pnpm@8.7.5" } From ecfe7ddb1a52afb23c3f597dec037c8e9e377a1a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 26 Dec 2023 19:43:42 +0000 Subject: [PATCH 039/290] Fix lockfile --- pnpm-lock.yaml | 128 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 118 insertions(+), 10 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c4fe3e..d00f9ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.11.2 version: 1.11.2 vitest: - specifier: ^1.0.4 - version: 1.0.4(@types/node@20.10.4) + specifier: ^1.1.0 + version: 1.1.0 packages/commands: dependencies: @@ -1013,6 +1013,14 @@ packages: chai: 4.3.10 dev: true + /@vitest/expect@1.1.0: + resolution: {integrity: sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==} + dependencies: + '@vitest/spy': 1.1.0 + '@vitest/utils': 1.1.0 + chai: 4.3.10 + dev: true + /@vitest/runner@1.0.4: resolution: {integrity: sha512-rhOQ9FZTEkV41JWXozFM8YgOqaG9zA7QXbhg5gy6mFOVqh4PcupirIJ+wN7QjeJt8S8nJRYuZH1OjJjsbxAXTQ==} dependencies: @@ -1021,6 +1029,14 @@ packages: pathe: 1.1.1 dev: true + /@vitest/runner@1.1.0: + resolution: {integrity: sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==} + dependencies: + '@vitest/utils': 1.1.0 + p-limit: 5.0.0 + pathe: 1.1.1 + dev: true + /@vitest/snapshot@1.0.4: resolution: {integrity: sha512-vkfXUrNyNRA/Gzsp2lpyJxh94vU2OHT1amoD6WuvUAA12n32xeVZQ0KjjQIf8F6u7bcq2A2k969fMVxEsxeKYA==} dependencies: @@ -1029,12 +1045,26 @@ packages: pretty-format: 29.7.0 dev: true + /@vitest/snapshot@1.1.0: + resolution: {integrity: sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==} + dependencies: + magic-string: 0.30.5 + pathe: 1.1.1 + pretty-format: 29.7.0 + dev: true + /@vitest/spy@1.0.4: resolution: {integrity: sha512-9ojTFRL1AJVh0hvfzAQpm0QS6xIS+1HFIw94kl/1ucTfGCaj1LV/iuJU4Y6cdR03EzPDygxTHwE1JOm+5RCcvA==} dependencies: tinyspy: 2.2.0 dev: true + /@vitest/spy@1.1.0: + resolution: {integrity: sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==} + dependencies: + tinyspy: 2.2.0 + dev: true + /@vitest/utils@1.0.4: resolution: {integrity: sha512-gsswWDXxtt0QvtK/y/LWukN7sGMYmnCcv1qv05CsY6cU/Y1zpGX1QuvLs+GO1inczpE6Owixeel3ShkjhYtGfA==} dependencies: @@ -1043,6 +1073,14 @@ packages: pretty-format: 29.7.0 dev: true + /@vitest/utils@1.1.0: + resolution: {integrity: sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==} + dependencies: + diff-sequences: 29.6.3 + loupe: 2.3.7 + pretty-format: 29.7.0 + dev: true + /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: true @@ -1229,7 +1267,7 @@ packages: check-error: 1.0.3 deep-eql: 4.1.3 get-func-name: 2.0.2 - loupe: 2.3.6 + loupe: 2.3.7 pathval: 1.1.1 type-detect: 4.0.8 dev: true @@ -2187,13 +2225,6 @@ packages: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} dev: true - /loupe@2.3.6: - resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==} - deprecated: Please upgrade to 2.3.7 which fixes GHSA-4q6p-r6v2-jvc5 - dependencies: - get-func-name: 2.0.2 - dev: true - /loupe@2.3.7: resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} dependencies: @@ -3379,6 +3410,27 @@ packages: - terser dev: true + /vite-node@1.1.0: + resolution: {integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4(supports-color@5.5.0) + pathe: 1.1.1 + picocolors: 1.0.0 + vite: 5.0.10(@types/node@20.10.4) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vite@5.0.10(@types/node@20.10.4): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} @@ -3472,6 +3524,62 @@ packages: - terser dev: true + /vitest@1.1.0: + resolution: {integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': ^1.0.0 + '@vitest/ui': ^1.0.0 + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@types/node': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + dependencies: + '@vitest/expect': 1.1.0 + '@vitest/runner': 1.1.0 + '@vitest/snapshot': 1.1.0 + '@vitest/spy': 1.1.0 + '@vitest/utils': 1.1.0 + acorn-walk: 8.3.1 + cac: 6.7.14 + chai: 4.3.10 + debug: 4.3.4(supports-color@5.5.0) + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.5 + pathe: 1.1.1 + picocolors: 1.0.0 + std-env: 3.6.0 + strip-literal: 1.3.0 + tinybench: 2.5.1 + tinypool: 0.8.1 + vite: 5.0.10(@types/node@20.10.4) + vite-node: 1.1.0 + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /wcwidth@1.0.1: resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} dependencies: From a13d87a2024c5d18c2ce9a299476eae7d11e0bad Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 28 Dec 2023 15:11:11 +0000 Subject: [PATCH 040/290] Updated link to astro CLI --- packages/utils/src/open/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/src/open/index.ts b/packages/utils/src/open/index.ts index 52b7814..68ce0da 100644 --- a/packages/utils/src/open/index.ts +++ b/packages/utils/src/open/index.ts @@ -1,4 +1,4 @@ -// Taken verbatim from https://github.com/withastro/astro/blob/main/packages/astro/src/cli/open.ts#L29 +// Taken verbatim from https://github.com/withastro/astro/blob/main/packages/astro/src/cli/docs/open.ts import type { ExecaChildProcess } from "execa"; import { execa } from "execa"; From 8238a59c63df24d2f31528d327333759b2e80067 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:15:48 -0500 Subject: [PATCH 041/290] refactor: consolidate package manager related functions and update imports --- packages/commands/src/handlers/add.ts | 12 ----- packages/commands/src/lib/integrations.ts | 7 ++- packages/utils/package.json | 8 ++-- .../utils/src/detect-package-manager/index.ts | 22 ---------- packages/utils/src/package-manager/index.ts | 44 +++++++++++++++++++ packages/utils/src/paths/index.ts | 13 ------ packages/utils/src/updates/index.ts | 18 ++------ 7 files changed, 54 insertions(+), 70 deletions(-) delete mode 100644 packages/utils/src/detect-package-manager/index.ts create mode 100644 packages/utils/src/package-manager/index.ts diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index 0cb746e..eafa288 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -3,7 +3,6 @@ import { S_BAR, cancelable, spinnerify } from "@solid-cli/ui"; import { Integrations, Supported, integrations, setRootFile } from "../lib/integrations"; import * as p from "@clack/prompts"; import color from "picocolors"; -import { PM } from "@solid-cli/utils/detect-package-manager"; import { primitives, loadPrimitives } from "@solid-cli/utils/primitives"; import { t } from "@solid-cli/utils"; import { fileExists, getRootFile, getViteConfig, validateFilePath } from "../lib/utils/helpers"; @@ -75,17 +74,6 @@ const transformPrimitives = async (ps: string[]) => { const mappedInput = ps.map((p) => p.replace("@solid-primitives/", "")); return primitives().filter((p) => mappedInput.includes(p.value.replace("@solid-primitives/", ""))); }; -// @ts-ignore -const installCommand = async (pM: PM): Promise => { - switch (pM) { - case "npm": - return "install"; - case "yarn": - return "add"; - case "pnpm": - return "add"; - } -}; type Configs = Integrations[keyof Integrations][]; export const handleAdd = async (packages?: string[], forceTransform: boolean = false) => { if (!packages?.length) { diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index d7d9219..ddf3b47 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -1,8 +1,7 @@ import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs"; import { fileExists, validateFilePath } from "./utils/helpers"; import { $ } from "execa"; -import { getUserPkgManager } from "@solid-cli/utils/detect-package-manager"; -import { getRunner } from "@solid-cli/utils/paths"; +import { getRunnerCommand, detectPackageManager } from "@solid-cli/utils/package-manager"; import { createSignal } from "@solid-cli/reactivity"; import * as p from "@clack/prompts"; import color from "picocolors"; @@ -28,8 +27,8 @@ export const integrations = { "tailwind": { installs: ["tailwindcss", "postcss", "autoprefixer"], postInstall: async () => { - const pM = getUserPkgManager(); - await $`${getRunner(pM)} tailwindcss init -p`; + const pM = detectPackageManager(); + await $`${getRunnerCommand(pM)} tailwindcss init -p`; let tailwindConfig = "tailwind.config.js"; if (!fileExists(tailwindConfig)) { p.log.error(color.red(`Can't find tailwind config file`)); diff --git a/packages/utils/package.json b/packages/utils/package.json index 08ce97b..dedfb54 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -51,10 +51,10 @@ "require": "./dist/primitives/index.mjs", "types": "./types/primitives/index.d.ts" }, - "./detect-package-manager": { - "import": "./dist/detect-package-manager/index.mjs", - "require": "./dist/detect-package-manager/index.mjs", - "types": "./types/detect-package-manager/index.d.ts" + "./package-manager": { + "import": "./dist/package-manager/index.mjs", + "require": "./dist/package-manager/index.mjs", + "types": "./types/package-manager/index.d.ts" } }, "scripts": { diff --git a/packages/utils/src/detect-package-manager/index.ts b/packages/utils/src/detect-package-manager/index.ts deleted file mode 100644 index b8b38ed..0000000 --- a/packages/utils/src/detect-package-manager/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -// Taken almost verbatim from https://github.com/solidjs/solid-start/blob/f351f42ba8566cbfa72b483dd63d4debcb386230/packages/create-solid/cli/index.js#L62C1-L80C2 -export const getUserPkgManager = (): PM => { - // This environment variable is set by npm and yarn but pnpm seems less consistent - const userAgent = process.env.npm_config_user_agent; - - if (userAgent) { - if (userAgent.startsWith("yarn")) { - return "yarn"; - } else if (userAgent.startsWith("pnpm")) { - return "pnpm"; - } else if (userAgent.startsWith("bun")) { - return "bun"; - } else { - return "npm"; - } - } else { - // If no user agent is set, assume npm - return "npm"; - } -}; - -export type PM = "npm" | "yarn" | "pnpm" | "bun"; diff --git a/packages/utils/src/package-manager/index.ts b/packages/utils/src/package-manager/index.ts new file mode 100644 index 0000000..88ff4c5 --- /dev/null +++ b/packages/utils/src/package-manager/index.ts @@ -0,0 +1,44 @@ +// Taken almost verbatim from https://github.com/solidjs/solid-start/blob/f351f42ba8566cbfa72b483dd63d4debcb386230/packages/create-solid/cli/index.js#L62C1-L80C2 +export const detectPackageManager = () => { + // This environment variable is set by npm and yarn but pnpm seems less consistent + const userAgent = process.env.npm_config_user_agent || ""; + + switch (true) { + case userAgent.startsWith("yarn"): + return "yarn"; + case userAgent.startsWith("pnpm"): + return "pnpm"; + case userAgent.startsWith("bun"): + return "bun"; + default: + return "npm"; + } +}; + +export const getInstallCommand = (packageManager: PackageManager): string => { + switch (packageManager) { + case "npm": + return "install"; + case "yarn": + return "add"; + case "pnpm": + return "add"; + case "bun": + return "add"; + } +}; + +export const getRunnerCommand = (packageManager: PackageManager) => { + switch (packageManager) { + case "npm": + return "npx"; + case "yarn": + return "npx"; + case "pnpm": + return "pnpx"; + case "bun": + return "bunx"; + } +}; + +export type PackageManager = ReturnType; diff --git a/packages/utils/src/paths/index.ts b/packages/utils/src/paths/index.ts index 0111491..5a71876 100644 --- a/packages/utils/src/paths/index.ts +++ b/packages/utils/src/paths/index.ts @@ -1,4 +1,3 @@ -import { PM } from "../detect-package-manager"; import { homedir as oshomedir, tmpdir as ostmpdir } from "os"; export const homedir = () => { @@ -8,15 +7,3 @@ export const homedir = () => { export const tmpdir = () => { return process.env.XDG_CACHE_HOME ?? ostmpdir(); }; -export const getRunner = (pM: PM) => { - switch (pM) { - case "npm": - return "npx"; - case "yarn": - return "npx"; - case "pnpm": - return "pnpx"; - case "bun": - return "bunx"; - } -}; diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index 690ff84..c6ac36b 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -1,6 +1,6 @@ import { open, writeFile } from "fs/promises"; import { $ } from "execa"; -import { getUserPkgManager, type PM } from "../detect-package-manager"; +import { detectPackageManager, getInstallCommand } from "../package-manager"; declare global { var UPDATESQUEUE: Update[] | undefined; } @@ -18,18 +18,6 @@ type UpdateSummary = { fileUpdates: string[]; }; -const installCommand = (pM: PM): string => { - switch (pM) { - case "npm": - return "install"; - case "yarn": - return "add"; - case "pnpm": - return "add"; - case "bun": - return "install"; - } -}; export const clearQueue = () => { UPDATESQUEUE.length = 0; }; @@ -73,8 +61,8 @@ export const flushFileUpdates = async () => { }; export const flushPackageUpdates = async () => { const packageUpdates = UPDATESQUEUE.filter((u) => u.type === "package") as PackageUpdate[]; - const pM = getUserPkgManager(); - const instlCmd = installCommand(pM); + const pM = detectPackageManager(); + const instlCmd = getInstallCommand(pM); for (const update of packageUpdates) { await $`${pM} ${instlCmd} ${update.name}`; } From 6bd47042fa9e55c07c1d9318ff1dda12a8ae325e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 28 Dec 2023 22:36:02 +0000 Subject: [PATCH 042/290] Update deps --- packages/commands/package.json | 4 +- packages/core/package.json | 4 +- packages/ui/package.json | 2 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 399 +++++++++++++++------------------ 5 files changed, 187 insertions(+), 228 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 91b4789..d0f9f48 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.10.4", + "@types/node": "^20.10.5", "prettier": "^3.1.1", "tsup": "^8.0.1", "typescript": "^5.3.3" @@ -49,6 +49,6 @@ "@solid-cli/utils": "workspace:*", "execa": "^8.0.1", "picocolors": "^1.0.0", - "sucrase": "^3.34.0" + "sucrase": "^3.35.0" } } diff --git a/packages/core/package.json b/packages/core/package.json index 4398c62..993c970 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.3.100", + "@swc/core": "^1.3.101", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.10.4", + "@types/node": "^20.10.5", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 88bd288..6a35694 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.1", "typescript": "^5.3.3", - "@types/node": "20.10.4" + "@types/node": "20.10.5" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 08ce97b..1fd6300 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "20.10.4", + "@types/node": "20.10.5", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3", - "vitest": "^1.0.4" + "vitest": "^1.1.0" }, "publishConfig": { "access": "public" @@ -76,7 +76,7 @@ "@clack/core": "0.3.3", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.3.100", + "@swc/core": "^1.3.101", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d00f9ea..96129a7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 1.11.2 vitest: specifier: ^1.1.0 - version: 1.1.0 + version: 1.1.0(@types/node@20.10.5) packages/commands: dependencies: @@ -48,21 +48,21 @@ importers: specifier: ^1.0.0 version: 1.0.0 sucrase: - specifier: ^3.34.0 - version: 3.34.0 + specifier: ^3.35.0 + version: 3.35.0 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: ^20.10.4 - version: 20.10.4 + specifier: ^20.10.5 + version: 20.10.5 prettier: specifier: ^3.1.1 version: 3.1.1 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.3.100 - version: 1.3.100 + specifier: ^1.3.101 + version: 1.3.101 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -113,14 +113,14 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: ^20.10.4 - version: 20.10.4 + specifier: ^20.10.5 + version: 20.10.5 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -141,7 +141,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -150,7 +150,7 @@ importers: devDependencies: tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -176,11 +176,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.10.4 - version: 20.10.4 + specifier: 20.10.5 + version: 20.10.5 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -197,8 +197,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.3.100 - version: 1.3.100 + specifier: ^1.3.101 + version: 1.3.101 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -216,20 +216,20 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: 20.10.4 - version: 20.10.4 + specifier: 20.10.5 + version: 20.10.5 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.100)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 vitest: - specifier: ^1.0.4 - version: 1.0.4(@types/node@20.10.4) + specifier: ^1.1.0 + version: 1.1.0(@types/node@20.10.5) packages: @@ -694,6 +694,17 @@ packages: dev: true optional: true + /@isaacs/cliui@8.0.2: + resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} + engines: {node: '>=12'} + dependencies: + string-width: 5.1.2 + string-width-cjs: /string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: /strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: /wrap-ansi@7.0.0 + /@jest/schemas@29.6.3: resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -774,6 +785,12 @@ packages: detect-libc: 1.0.3 dev: true + /@pkgjs/parseargs@0.11.0: + resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} + engines: {node: '>=14'} + requiresBuild: true + optional: true + /@rollup/rollup-android-arm-eabi@4.9.1: resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} cpu: [arm] @@ -882,80 +899,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.3.100: - resolution: {integrity: sha512-XVWFsKe6ei+SsDbwmsuRkYck1SXRpO60Hioa4hoLwR8fxbA9eVp6enZtMxzVVMBi8ej5seZ4HZQeAWepbukiBw==} + /@swc/core-darwin-arm64@1.3.101: + resolution: {integrity: sha512-mNFK+uHNPRXSnfTOG34zJOeMl2waM4hF4a2NY7dkMXrPqw9CoJn4MwTXJcyMiSz1/BnNjjTCHF3Yhj0jPxmkzQ==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.3.100: - resolution: {integrity: sha512-KF/MXrnH1nakm1wbt4XV8FS7kvqD9TGmVxeJ0U4bbvxXMvzeYUurzg3AJUTXYmXDhH/VXOYJE5N5RkwZZPs5iA==} + /@swc/core-darwin-x64@1.3.101: + resolution: {integrity: sha512-B085j8XOx73Fg15KsHvzYWG262bRweGr3JooO1aW5ec5pYbz5Ew9VS5JKYS03w2UBSxf2maWdbPz2UFAxg0whw==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.3.100: - resolution: {integrity: sha512-p8hikNnAEJrw5vHCtKiFT4hdlQxk1V7vqPmvUDgL/qe2menQDK/i12tbz7/3BEQ4UqUPnvwpmVn2d19RdEMNxw==} + /@swc/core-linux-arm-gnueabihf@1.3.101: + resolution: {integrity: sha512-9xLKRb6zSzRGPqdz52Hy5GuB1lSjmLqa0lST6MTFads3apmx4Vgs8Y5NuGhx/h2I8QM4jXdLbpqQlifpzTlSSw==} + engines: {node: '>=10'} + cpu: [arm] + os: [linux] + requiresBuild: true + optional: true + + /@swc/core-linux-arm64-gnu@1.3.101: + resolution: {integrity: sha512-oE+r1lo7g/vs96Weh2R5l971dt+ZLuhaUX+n3BfDdPxNHfObXgKMjO7E+QS5RbGjv/AwiPCxQmbdCp/xN5ICJA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.3.100: - resolution: {integrity: sha512-BWx/0EeY89WC4q3AaIaBSGfQxkYxIlS3mX19dwy2FWJs/O+fMvF9oLk/CyJPOZzbp+1DjGeeoGFuDYpiNO91JA==} + /@swc/core-linux-arm64-musl@1.3.101: + resolution: {integrity: sha512-OGjYG3H4BMOTnJWJyBIovCez6KiHF30zMIu4+lGJTCrxRI2fAjGLml3PEXj8tC3FMcud7U2WUn6TdG0/te2k6g==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.3.100: - resolution: {integrity: sha512-XUdGu3dxAkjsahLYnm8WijPfKebo+jHgHphDxaW0ovI6sTdmEGFDew7QzKZRlbYL2jRkUuuKuDGvD6lO5frmhA==} + /@swc/core-linux-x64-gnu@1.3.101: + resolution: {integrity: sha512-/kBMcoF12PRO/lwa8Z7w4YyiKDcXQEiLvM+S3G9EvkoKYGgkkz4Q6PSNhF5rwg/E3+Hq5/9D2R+6nrkF287ihg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.100: - resolution: {integrity: sha512-PhoXKf+f0OaNW/GCuXjJ0/KfK9EJX7z2gko+7nVnEA0p3aaPtbP6cq1Ubbl6CMoPL+Ci3gZ7nYumDqXNc3CtLQ==} + /@swc/core-linux-x64-musl@1.3.101: + resolution: {integrity: sha512-kDN8lm4Eew0u1p+h1l3JzoeGgZPQ05qDE0czngnjmfpsH2sOZxVj1hdiCwS5lArpy7ktaLu5JdRnx70MkUzhXw==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.100: - resolution: {integrity: sha512-PwLADZN6F9cXn4Jw52FeP/MCLVHm8vwouZZSOoOScDtihjY495SSjdPnlosMaRSR4wJQssGwiD/4MbpgQPqbAw==} + /@swc/core-win32-arm64-msvc@1.3.101: + resolution: {integrity: sha512-9Wn8TTLWwJKw63K/S+jjrZb9yoJfJwCE2RV5vPCCWmlMf3U1AXj5XuWOLUX+Rp2sGKau7wZKsvywhheWm+qndQ==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.100: - resolution: {integrity: sha512-0f6nicKSLlDKlyPRl2JEmkpBV4aeDfRQg6n8mPqgL7bliZIcDahG0ej+HxgNjZfS3e0yjDxsNRa6sAqWU2Z60A==} + /@swc/core-win32-ia32-msvc@1.3.101: + resolution: {integrity: sha512-onO5KvICRVlu2xmr4//V2je9O2XgS1SGKpbX206KmmjcJhXN5EYLSxW9qgg+kgV5mip+sKTHTAu7IkzkAtElYA==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.100: - resolution: {integrity: sha512-b7J0rPoMkRTa3XyUGt8PwCaIBuYWsL2DqbirrQKRESzgCvif5iNpqaM6kjIjI/5y5q1Ycv564CB51YDpiS8EtQ==} + /@swc/core-win32-x64-msvc@1.3.101: + resolution: {integrity: sha512-T3GeJtNQV00YmiVw/88/nxJ/H43CJvFnpvBHCVn17xbahiVUOPOduh3rc9LgAkKiNt/aV8vU3OJR+6PhfMR7UQ==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.3.100: - resolution: {integrity: sha512-7dKgTyxJjlrMwFZYb1auj3Xq0D8ZBe+5oeIgfMlRU05doXZypYJe0LAk0yjj3WdbwYzpF+T1PLxwTWizI0pckw==} + /@swc/core@1.3.101: + resolution: {integrity: sha512-w5aQ9qYsd/IYmXADAnkXPGDMTqkQalIi+kfFf/MHRKTpaOL7DHjMXwPp/n8hJ0qNjRvchzmPtOqtPBiER50d8A==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -967,15 +992,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.3.100 - '@swc/core-darwin-x64': 1.3.100 - '@swc/core-linux-arm64-gnu': 1.3.100 - '@swc/core-linux-arm64-musl': 1.3.100 - '@swc/core-linux-x64-gnu': 1.3.100 - '@swc/core-linux-x64-musl': 1.3.100 - '@swc/core-win32-arm64-msvc': 1.3.100 - '@swc/core-win32-ia32-msvc': 1.3.100 - '@swc/core-win32-x64-msvc': 1.3.100 + '@swc/core-darwin-arm64': 1.3.101 + '@swc/core-darwin-x64': 1.3.101 + '@swc/core-linux-arm-gnueabihf': 1.3.101 + '@swc/core-linux-arm64-gnu': 1.3.101 + '@swc/core-linux-arm64-musl': 1.3.101 + '@swc/core-linux-x64-gnu': 1.3.101 + '@swc/core-linux-x64-musl': 1.3.101 + '@swc/core-win32-arm64-msvc': 1.3.101 + '@swc/core-win32-ia32-msvc': 1.3.101 + '@swc/core-win32-x64-msvc': 1.3.101 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -991,8 +1017,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.10.4: - resolution: {integrity: sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==} + /@types/node@20.10.5: + resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==} dependencies: undici-types: 5.26.5 dev: true @@ -1005,14 +1031,6 @@ packages: resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} dev: true - /@vitest/expect@1.0.4: - resolution: {integrity: sha512-/NRN9N88qjg3dkhmFcCBwhn/Ie4h064pY3iv7WLRsDJW7dXnEgeoa8W9zy7gIPluhz6CkgqiB3HmpIXgmEY5dQ==} - dependencies: - '@vitest/spy': 1.0.4 - '@vitest/utils': 1.0.4 - chai: 4.3.10 - dev: true - /@vitest/expect@1.1.0: resolution: {integrity: sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==} dependencies: @@ -1021,14 +1039,6 @@ packages: chai: 4.3.10 dev: true - /@vitest/runner@1.0.4: - resolution: {integrity: sha512-rhOQ9FZTEkV41JWXozFM8YgOqaG9zA7QXbhg5gy6mFOVqh4PcupirIJ+wN7QjeJt8S8nJRYuZH1OjJjsbxAXTQ==} - dependencies: - '@vitest/utils': 1.0.4 - p-limit: 5.0.0 - pathe: 1.1.1 - dev: true - /@vitest/runner@1.1.0: resolution: {integrity: sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==} dependencies: @@ -1037,14 +1047,6 @@ packages: pathe: 1.1.1 dev: true - /@vitest/snapshot@1.0.4: - resolution: {integrity: sha512-vkfXUrNyNRA/Gzsp2lpyJxh94vU2OHT1amoD6WuvUAA12n32xeVZQ0KjjQIf8F6u7bcq2A2k969fMVxEsxeKYA==} - dependencies: - magic-string: 0.30.5 - pathe: 1.1.1 - pretty-format: 29.7.0 - dev: true - /@vitest/snapshot@1.1.0: resolution: {integrity: sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==} dependencies: @@ -1053,26 +1055,12 @@ packages: pretty-format: 29.7.0 dev: true - /@vitest/spy@1.0.4: - resolution: {integrity: sha512-9ojTFRL1AJVh0hvfzAQpm0QS6xIS+1HFIw94kl/1ucTfGCaj1LV/iuJU4Y6cdR03EzPDygxTHwE1JOm+5RCcvA==} - dependencies: - tinyspy: 2.2.0 - dev: true - /@vitest/spy@1.1.0: resolution: {integrity: sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.0.4: - resolution: {integrity: sha512-gsswWDXxtt0QvtK/y/LWukN7sGMYmnCcv1qv05CsY6cU/Y1zpGX1QuvLs+GO1inczpE6Owixeel3ShkjhYtGfA==} - dependencies: - diff-sequences: 29.6.3 - loupe: 2.3.7 - pretty-format: 29.7.0 - dev: true - /@vitest/utils@1.1.0: resolution: {integrity: sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==} dependencies: @@ -1105,6 +1093,10 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} + /ansi-regex@6.0.1: + resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} + engines: {node: '>=12'} + /ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} @@ -1123,6 +1115,10 @@ packages: engines: {node: '>=10'} dev: true + /ansi-styles@6.2.1: + resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} + engines: {node: '>=12'} + /any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -1209,6 +1205,12 @@ packages: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 + dev: true + + /brace-expansion@2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + dependencies: + balanced-match: 1.0.2 /braces@3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} @@ -1381,6 +1383,7 @@ packages: /concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + dev: true /cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} @@ -1493,9 +1496,14 @@ packages: path-type: 4.0.0 dev: true + /eastasianwidth@0.2.0: + resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} + /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - dev: true + + /emoji-regex@9.2.2: + resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} /enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} @@ -1721,6 +1729,13 @@ packages: is-callable: 1.2.7 dev: true + /foreground-child@3.1.1: + resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} + engines: {node: '>=14'} + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 + /fs-extra@7.0.1: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} engines: {node: '>=6 <7 || >=8'} @@ -1746,9 +1761,6 @@ packages: minipass: 3.3.6 dev: false - /fs.realpath@1.0.0: - resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - /fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -1817,15 +1829,16 @@ packages: is-glob: 4.0.3 dev: true - /glob@7.1.6: - resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} + /glob@10.3.10: + resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 + foreground-child: 3.1.1 + jackspeak: 2.3.6 + minimatch: 9.0.3 + minipass: 5.0.0 + path-scurry: 1.10.1 /globalthis@1.0.3: resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} @@ -1945,15 +1958,6 @@ packages: engines: {node: '>=8'} dev: true - /inflight@1.0.6: - resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - - /inherits@2.0.4: - resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - /internal-slot@1.0.5: resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==} engines: {node: '>= 0.4'} @@ -2026,7 +2030,6 @@ packages: /is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - dev: true /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} @@ -2126,6 +2129,14 @@ packages: /isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} + /jackspeak@2.3.6: + resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} + engines: {node: '>=14'} + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + /jiti@1.21.0: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true @@ -2231,6 +2242,10 @@ packages: get-func-name: 2.0.2 dev: true + /lru-cache@10.1.0: + resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} + engines: {node: 14 || >=16.14} + /lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} dependencies: @@ -2325,6 +2340,13 @@ packages: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: brace-expansion: 1.1.11 + dev: true + + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} @@ -2345,7 +2367,6 @@ packages: /minipass@5.0.0: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - dev: false /minizlib@2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} @@ -2465,11 +2486,6 @@ packages: object-keys: 1.1.1 dev: true - /once@1.4.0: - resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - dependencies: - wrappy: 1.0.2 - /onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -2559,10 +2575,6 @@ packages: engines: {node: '>=8'} dev: true - /path-is-absolute@1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - /path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} @@ -2575,6 +2587,13 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true + /path-scurry@1.10.1: + resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + lru-cache: 10.1.0 + minipass: 5.0.0 + /path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} @@ -2994,7 +3013,14 @@ packages: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - dev: true + + /string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + dependencies: + eastasianwidth: 0.2.0 + emoji-regex: 9.2.2 + strip-ansi: 7.1.0 /string.prototype.trim@1.2.8: resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==} @@ -3027,6 +3053,12 @@ packages: dependencies: ansi-regex: 5.0.1 + /strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + dependencies: + ansi-regex: 6.0.1 + /strip-bom@3.0.0: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} @@ -3054,14 +3086,14 @@ packages: acorn: 8.10.0 dev: true - /sucrase@3.34.0: - resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==} - engines: {node: '>=8'} + /sucrase@3.35.0: + resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + engines: {node: '>=16 || 14 >=14.17'} hasBin: true dependencies: '@jridgewell/gen-mapping': 0.3.3 commander: 4.1.1 - glob: 7.1.6 + glob: 10.3.10 lines-and-columns: 1.2.4 mz: 2.7.0 pirates: 4.0.6 @@ -3178,7 +3210,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.1(@swc/core@1.3.100)(typescript@5.3.3): + /tsup@8.0.1(@swc/core@1.3.101)(typescript@5.3.3): resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} engines: {node: '>=18'} hasBin: true @@ -3197,7 +3229,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.3.100 + '@swc/core': 1.3.101 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3210,7 +3242,7 @@ packages: resolve-from: 5.0.0 rollup: 4.9.1 source-map: 0.8.0-beta.0 - sucrase: 3.34.0 + sucrase: 3.35.0 tree-kill: 1.2.2 typescript: 5.3.3 transitivePeerDependencies: @@ -3389,28 +3421,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.0.4(@types/node@20.10.4): - resolution: {integrity: sha512-9xQQtHdsz5Qn8hqbV7UKqkm8YkJhzT/zr41Dmt5N7AlD8hJXw/Z7y0QiD5I8lnTthV9Rvcvi0QW7PI0Fq83ZPg==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - dependencies: - cac: 6.7.14 - debug: 4.3.4(supports-color@5.5.0) - pathe: 1.1.1 - picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.10.4) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vite-node@1.1.0: + /vite-node@1.1.0(@types/node@20.10.5): resolution: {integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3419,7 +3430,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.10.4) + vite: 5.0.10(@types/node@20.10.5) transitivePeerDependencies: - '@types/node' - less @@ -3431,7 +3442,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.10.4): + /vite@5.0.10(@types/node@20.10.5): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3459,7 +3470,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.10.4 + '@types/node': 20.10.5 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3467,64 +3478,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.0.4(@types/node@20.10.4): - resolution: {integrity: sha512-s1GQHp/UOeWEo4+aXDOeFBJwFzL6mjycbQwwKWX2QcYfh/7tIerS59hWQ20mxzupTJluA2SdwiBuWwQHH67ckg==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': ^1.0.0 - '@vitest/ui': ^1.0.0 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - dependencies: - '@types/node': 20.10.4 - '@vitest/expect': 1.0.4 - '@vitest/runner': 1.0.4 - '@vitest/snapshot': 1.0.4 - '@vitest/spy': 1.0.4 - '@vitest/utils': 1.0.4 - acorn-walk: 8.3.1 - cac: 6.7.14 - chai: 4.3.10 - debug: 4.3.4(supports-color@5.5.0) - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.5 - pathe: 1.1.1 - picocolors: 1.0.0 - std-env: 3.6.0 - strip-literal: 1.3.0 - tinybench: 2.5.1 - tinypool: 0.8.1 - vite: 5.0.10(@types/node@20.10.4) - vite-node: 1.0.4(@types/node@20.10.4) - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vitest@1.1.0: + /vitest@1.1.0(@types/node@20.10.5): resolution: {integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3549,6 +3503,7 @@ packages: jsdom: optional: true dependencies: + '@types/node': 20.10.5 '@vitest/expect': 1.1.0 '@vitest/runner': 1.1.0 '@vitest/snapshot': 1.1.0 @@ -3567,8 +3522,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.8.1 - vite: 5.0.10(@types/node@20.10.4) - vite-node: 1.1.0 + vite: 5.0.10(@types/node@20.10.5) + vite-node: 1.1.0(@types/node@20.10.5) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -3674,10 +3629,14 @@ packages: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - dev: true - /wrappy@1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + /wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + dependencies: + ansi-styles: 6.2.1 + string-width: 5.1.2 + strip-ansi: 7.1.0 /y18n@4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} From fee96700fbac82ab3b39f5d53bfebd16e80c3d20 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:54:25 +0000 Subject: [PATCH 043/290] Bump deps --- package.json | 4 +- packages/commands/package.json | 4 +- packages/core/package.json | 4 +- packages/ui/package.json | 2 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 235 +++++++++++++++++---------------- 6 files changed, 133 insertions(+), 122 deletions(-) diff --git a/package.json b/package.json index a32ed58..b89457a 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.0.2", "prettier": "^3.1.1", - "turbo": "^1.11.2", - "vitest": "^1.1.0" + "turbo": "^1.11.3", + "vitest": "^1.1.2" }, "packageManager": "pnpm@8.7.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index d0f9f48..bdfd773 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.10.5", + "@types/node": "^20.10.6", "prettier": "^3.1.1", "tsup": "^8.0.1", "typescript": "^5.3.3" @@ -42,7 +42,7 @@ "access": "public" }, "dependencies": { - "@begit/core": "^0.0.11", + "@begit/core": "^0.0.12", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index 993c970..eefd1fc 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.3.101", + "@swc/core": "^1.3.102", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.10.5", + "@types/node": "^20.10.6", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 6a35694..85a999b 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.1", "typescript": "^5.3.3", - "@types/node": "20.10.5" + "@types/node": "20.10.6" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index f5dae00..e01bb9b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "20.10.5", + "@types/node": "20.10.6", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3", - "vitest": "^1.1.0" + "vitest": "^1.1.2" }, "publishConfig": { "access": "public" @@ -76,7 +76,7 @@ "@clack/core": "0.3.3", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.3.101", + "@swc/core": "^1.3.102", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96129a7..d2b93e9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,17 +18,17 @@ importers: specifier: ^3.1.1 version: 3.1.1 turbo: - specifier: ^1.11.2 - version: 1.11.2 + specifier: ^1.11.3 + version: 1.11.3 vitest: - specifier: ^1.1.0 - version: 1.1.0(@types/node@20.10.5) + specifier: ^1.1.2 + version: 1.1.2(@types/node@20.10.6) packages/commands: dependencies: '@begit/core': - specifier: ^0.0.11 - version: 0.0.11 + specifier: ^0.0.12 + version: 0.0.12 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -55,14 +55,14 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: ^20.10.5 - version: 20.10.5 + specifier: ^20.10.6 + version: 20.10.6 prettier: specifier: ^3.1.1 version: 3.1.1 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.3.101 - version: 1.3.101 + specifier: ^1.3.102 + version: 1.3.102 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -113,14 +113,14 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: ^20.10.5 - version: 20.10.5 + specifier: ^20.10.6 + version: 20.10.6 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -141,7 +141,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -150,7 +150,7 @@ importers: devDependencies: tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -176,11 +176,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.10.5 - version: 20.10.5 + specifier: 20.10.6 + version: 20.10.6 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -197,8 +197,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.3.101 - version: 1.3.101 + specifier: ^1.3.102 + version: 1.3.102 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -216,20 +216,20 @@ importers: specifier: ^0.17.7 version: 0.17.7 '@types/node': - specifier: 20.10.5 - version: 20.10.5 + specifier: 20.10.6 + version: 20.10.6 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.101)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 vitest: - specifier: ^1.1.0 - version: 1.1.0(@types/node@20.10.5) + specifier: ^1.1.2 + version: 1.1.2(@types/node@20.10.6) packages: @@ -262,8 +262,8 @@ packages: regenerator-runtime: 0.14.0 dev: true - /@begit/core@0.0.11: - resolution: {integrity: sha512-JwS7kubIw1FeLmrXR46z1QSBkXNMOZWYeziaMa9kqh/RBTi3Cb5ry1jO1oTBCYQfzldt/qDwQbGkwMPUR1qo3g==} + /@begit/core@0.0.12: + resolution: {integrity: sha512-L2p5O46opJM1ky7ITtglSqxxnw89SEh6Ey1Ki0Gqy1sjkervCOI0L2T7b1J5bSm3kKKIyDy5x7nl2dQGS6fkVg==} dependencies: tar: 6.2.0 dev: false @@ -899,88 +899,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.3.101: - resolution: {integrity: sha512-mNFK+uHNPRXSnfTOG34zJOeMl2waM4hF4a2NY7dkMXrPqw9CoJn4MwTXJcyMiSz1/BnNjjTCHF3Yhj0jPxmkzQ==} + /@swc/core-darwin-arm64@1.3.102: + resolution: {integrity: sha512-CJDxA5Wd2cUMULj3bjx4GEoiYyyiyL8oIOu4Nhrs9X+tlg8DnkCm4nI57RJGP8Mf6BaXPIJkHX8yjcefK2RlDA==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.3.101: - resolution: {integrity: sha512-B085j8XOx73Fg15KsHvzYWG262bRweGr3JooO1aW5ec5pYbz5Ew9VS5JKYS03w2UBSxf2maWdbPz2UFAxg0whw==} + /@swc/core-darwin-x64@1.3.102: + resolution: {integrity: sha512-X5akDkHwk6oAer49oER0qZMjNMkLH3IOZaV1m98uXIasAGyjo5WH1MKPeMLY1sY6V6TrufzwiSwD4ds571ytcg==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.101: - resolution: {integrity: sha512-9xLKRb6zSzRGPqdz52Hy5GuB1lSjmLqa0lST6MTFads3apmx4Vgs8Y5NuGhx/h2I8QM4jXdLbpqQlifpzTlSSw==} + /@swc/core-linux-arm-gnueabihf@1.3.102: + resolution: {integrity: sha512-kJH3XtZP9YQdjq/wYVBeFuiVQl4HaC4WwRrIxAHwe2OyvrwUI43dpW3LpxSggBnxXcVCXYWf36sTnv8S75o2Gw==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.3.101: - resolution: {integrity: sha512-oE+r1lo7g/vs96Weh2R5l971dt+ZLuhaUX+n3BfDdPxNHfObXgKMjO7E+QS5RbGjv/AwiPCxQmbdCp/xN5ICJA==} + /@swc/core-linux-arm64-gnu@1.3.102: + resolution: {integrity: sha512-flQP2WDyCgO24WmKA1wjjTx+xfCmavUete2Kp6yrM+631IHLGnr17eu7rYJ/d4EnDBId/ytMyrnWbTVkaVrpbQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.3.101: - resolution: {integrity: sha512-OGjYG3H4BMOTnJWJyBIovCez6KiHF30zMIu4+lGJTCrxRI2fAjGLml3PEXj8tC3FMcud7U2WUn6TdG0/te2k6g==} + /@swc/core-linux-arm64-musl@1.3.102: + resolution: {integrity: sha512-bQEQSnC44DyoIGLw1+fNXKVGoCHi7eJOHr8BdH0y1ooy9ArskMjwobBFae3GX4T1AfnrTaejyr0FvLYIb0Zkog==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.3.101: - resolution: {integrity: sha512-/kBMcoF12PRO/lwa8Z7w4YyiKDcXQEiLvM+S3G9EvkoKYGgkkz4Q6PSNhF5rwg/E3+Hq5/9D2R+6nrkF287ihg==} + /@swc/core-linux-x64-gnu@1.3.102: + resolution: {integrity: sha512-dFvnhpI478svQSxqISMt00MKTDS0e4YtIr+ioZDG/uJ/q+RpcNy3QI2KMm05Fsc8Y0d4krVtvCKWgfUMsJZXAg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.101: - resolution: {integrity: sha512-kDN8lm4Eew0u1p+h1l3JzoeGgZPQ05qDE0czngnjmfpsH2sOZxVj1hdiCwS5lArpy7ktaLu5JdRnx70MkUzhXw==} + /@swc/core-linux-x64-musl@1.3.102: + resolution: {integrity: sha512-+a0M3CvjeIRNA/jTCzWEDh2V+mhKGvLreHOL7J97oULZy5yg4gf7h8lQX9J8t9QLbf6fsk+0F8bVH1Ie/PbXjA==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.101: - resolution: {integrity: sha512-9Wn8TTLWwJKw63K/S+jjrZb9yoJfJwCE2RV5vPCCWmlMf3U1AXj5XuWOLUX+Rp2sGKau7wZKsvywhheWm+qndQ==} + /@swc/core-win32-arm64-msvc@1.3.102: + resolution: {integrity: sha512-w76JWLjkZNOfkB25nqdWUNCbt0zJ41CnWrJPZ+LxEai3zAnb2YtgB/cCIrwxDebRuMgE9EJXRj7gDDaTEAMOOQ==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.101: - resolution: {integrity: sha512-onO5KvICRVlu2xmr4//V2je9O2XgS1SGKpbX206KmmjcJhXN5EYLSxW9qgg+kgV5mip+sKTHTAu7IkzkAtElYA==} + /@swc/core-win32-ia32-msvc@1.3.102: + resolution: {integrity: sha512-vlDb09HiGqKwz+2cxDS9T5/461ipUQBplvuhW+cCbzzGuPq8lll2xeyZU0N1E4Sz3MVdSPx1tJREuRvlQjrwNg==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.101: - resolution: {integrity: sha512-T3GeJtNQV00YmiVw/88/nxJ/H43CJvFnpvBHCVn17xbahiVUOPOduh3rc9LgAkKiNt/aV8vU3OJR+6PhfMR7UQ==} + /@swc/core-win32-x64-msvc@1.3.102: + resolution: {integrity: sha512-E/jfSD7sShllxBwwgDPeXp1UxvIqehj/ShSUqq1pjR/IDRXngcRSXKJK92mJkNFY7suH6BcCWwzrxZgkO7sWmw==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.3.101: - resolution: {integrity: sha512-w5aQ9qYsd/IYmXADAnkXPGDMTqkQalIi+kfFf/MHRKTpaOL7DHjMXwPp/n8hJ0qNjRvchzmPtOqtPBiER50d8A==} + /@swc/core@1.3.102: + resolution: {integrity: sha512-OAjNLY/f6QWKSDzaM3bk31A+OYHu6cPa9P/rFIx8X5d24tHXUpRiiq6/PYI6SQRjUPlB72GjsjoEU8F+ALadHg==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -992,16 +992,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.3.101 - '@swc/core-darwin-x64': 1.3.101 - '@swc/core-linux-arm-gnueabihf': 1.3.101 - '@swc/core-linux-arm64-gnu': 1.3.101 - '@swc/core-linux-arm64-musl': 1.3.101 - '@swc/core-linux-x64-gnu': 1.3.101 - '@swc/core-linux-x64-musl': 1.3.101 - '@swc/core-win32-arm64-msvc': 1.3.101 - '@swc/core-win32-ia32-msvc': 1.3.101 - '@swc/core-win32-x64-msvc': 1.3.101 + '@swc/core-darwin-arm64': 1.3.102 + '@swc/core-darwin-x64': 1.3.102 + '@swc/core-linux-arm-gnueabihf': 1.3.102 + '@swc/core-linux-arm64-gnu': 1.3.102 + '@swc/core-linux-arm64-musl': 1.3.102 + '@swc/core-linux-x64-gnu': 1.3.102 + '@swc/core-linux-x64-musl': 1.3.102 + '@swc/core-win32-arm64-msvc': 1.3.102 + '@swc/core-win32-ia32-msvc': 1.3.102 + '@swc/core-win32-x64-msvc': 1.3.102 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1009,6 +1009,10 @@ packages: /@swc/types@0.1.5: resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==} + /@types/estree@1.0.5: + resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + dev: true + /@types/minimist@1.2.2: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} dev: true @@ -1017,8 +1021,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.10.5: - resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==} + /@types/node@20.10.6: + resolution: {integrity: sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==} dependencies: undici-types: 5.26.5 dev: true @@ -1031,40 +1035,41 @@ packages: resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} dev: true - /@vitest/expect@1.1.0: - resolution: {integrity: sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==} + /@vitest/expect@1.1.2: + resolution: {integrity: sha512-1aOqDLbgkvJ2e1nLQ/5dkUX54V1Alwt2e6M2u03Oy7wGbDYHV5ZLKm1XbcT45h8TMXtc2q/BPtkeIjyRv1oDHQ==} dependencies: - '@vitest/spy': 1.1.0 - '@vitest/utils': 1.1.0 + '@vitest/spy': 1.1.2 + '@vitest/utils': 1.1.2 chai: 4.3.10 dev: true - /@vitest/runner@1.1.0: - resolution: {integrity: sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==} + /@vitest/runner@1.1.2: + resolution: {integrity: sha512-oTqXCGtZzu9EaXq9cO/QDGnC721iryuTPs5rLyVZUJsdm33IQeIOwTRIWUB7EYFwpJsI+qMiCiuGZS49+DP5hA==} dependencies: - '@vitest/utils': 1.1.0 + '@vitest/utils': 1.1.2 p-limit: 5.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@1.1.0: - resolution: {integrity: sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==} + /@vitest/snapshot@1.1.2: + resolution: {integrity: sha512-hXXd5KjURGt6GCrmw55A+PNIlrOaE6x6KcdEANXac76xmvVbJZXSiNVJ1JuMCiyvLLTzdpPnrgWyCX9/CepFCQ==} dependencies: magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.1.0: - resolution: {integrity: sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==} + /@vitest/spy@1.1.2: + resolution: {integrity: sha512-1Nn70K3oY00lhThDXsVQxjslUvJij1YQDzH/4FMxMLgjYxB5u4Aw4yXeICNSSap04wyV2dtGL3RqdBGwoR3sPA==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.1.0: - resolution: {integrity: sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==} + /@vitest/utils@1.1.2: + resolution: {integrity: sha512-QrXfDieptshDkTkXnA+HmlVQto1h0jengbkSKcJjlbCMeXbSCr3AcALPPzozRQxEOKvFjqx9WHjljz62uxrGew==} dependencies: diff-sequences: 29.6.3 + estree-walker: 3.0.3 loupe: 2.3.7 pretty-format: 29.7.0 dev: true @@ -1634,6 +1639,12 @@ packages: hasBin: true dev: true + /estree-walker@3.0.3: + resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} + dependencies: + '@types/estree': 1.0.5 + dev: true + /execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} @@ -3210,7 +3221,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.1(@swc/core@1.3.101)(typescript@5.3.3): + /tsup@8.0.1(@swc/core@1.3.102)(typescript@5.3.3): resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} engines: {node: '>=18'} hasBin: true @@ -3229,7 +3240,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.3.101 + '@swc/core': 1.3.102 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3264,64 +3275,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.11.2: - resolution: {integrity: sha512-toFmRG/adriZY3hOps7nYCfqHAS+Ci6xqgX3fbo82kkLpC6OBzcXnleSwuPqjHVAaRNhVoB83L5njcE9Qwi2og==} + /turbo-darwin-64@1.11.3: + resolution: {integrity: sha512-IsOOg2bVbIt3o/X8Ew9fbQp5t1hTHN3fGNQYrPQwMR2W1kIAC6RfbVD4A9OeibPGyEPUpwOH79hZ9ydFH5kifw==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.11.2: - resolution: {integrity: sha512-FCsEDZ8BUSFYEOSC3rrARQrj7x2VOrmVcfrMUIhexTxproRh4QyMxLfr6LALk4ymx6jbDCxWa6Szal8ckldFbA==} + /turbo-darwin-arm64@1.11.3: + resolution: {integrity: sha512-FsJL7k0SaPbJzI/KCnrf/fi3PgCDCjTliMc/kEFkuWVA6Httc3Q4lxyLIIinz69q6JTx8wzh6yznUMzJRI3+dg==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.11.2: - resolution: {integrity: sha512-Vzda/o/QyEske5CxLf0wcu7UUS+7zB90GgHZV4tyN+WZtoouTvbwuvZ3V6b5Wgd3OJ/JwWR0CXDK7Sf4VEMr7A==} + /turbo-linux-64@1.11.3: + resolution: {integrity: sha512-SvW7pvTVRGsqtSkII5w+wriZXvxqkluw5FO/MNAdFw0qmoov+PZ237+37/NgArqE3zVn1GX9P6nUx9VO+xcQAg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.11.2: - resolution: {integrity: sha512-bRLwovQRz0yxDZrM4tQEAYV0fBHEaTzUF0JZ8RG1UmZt/CqtpnUrJpYb1VK8hj1z46z9YehARpYCwQ2K0qU4yw==} + /turbo-linux-arm64@1.11.3: + resolution: {integrity: sha512-YhUfBi1deB3m+3M55X458J6B7RsIS7UtM3P1z13cUIhF+pOt65BgnaSnkHLwETidmhRh8Dl3GelaQGrB3RdCDw==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.11.2: - resolution: {integrity: sha512-LgTWqkHAKgyVuLYcEPxZVGPInTjjeCnN5KQMdJ4uQZ+xMDROvMFS2rM93iQl4ieDJgidwHCxxCxaU9u8c3d/Kg==} + /turbo-windows-64@1.11.3: + resolution: {integrity: sha512-s+vEnuM2TiZuAUUUpmBHDr6vnNbJgj+5JYfnYmVklYs16kXh+EppafYQOAkcRIMAh7GjV3pLq5/uGqc7seZeHA==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.11.2: - resolution: {integrity: sha512-829aVBU7IX0c/B4G7g1VI8KniAGutHhIupkYMgF6xPkYVev2G3MYe6DMS/vsLt9GGM9ulDtdWxWrH5P2ngK8IQ==} + /turbo-windows-arm64@1.11.3: + resolution: {integrity: sha512-ZR5z5Zpc7cASwfdRAV5yNScCZBsgGSbcwiA/u3farCacbPiXsfoWUkz28iyrx21/TRW0bi6dbsB2v17swa8bjw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.11.2: - resolution: {integrity: sha512-jPC7LVQJzebs5gWf8FmEvsvXGNyKbN+O9qpvv98xpNaM59aS0/Irhd0H0KbcqnXfsz7ETlzOC3R+xFWthC4Z8A==} + /turbo@1.11.3: + resolution: {integrity: sha512-RCJOUFcFMQNIGKSjC9YmA5yVP1qtDiBA0Lv9VIgrXraI5Da1liVvl3VJPsoDNIR9eFMyA/aagx1iyj6UWem5hA==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.11.2 - turbo-darwin-arm64: 1.11.2 - turbo-linux-64: 1.11.2 - turbo-linux-arm64: 1.11.2 - turbo-windows-64: 1.11.2 - turbo-windows-arm64: 1.11.2 + turbo-darwin-64: 1.11.3 + turbo-darwin-arm64: 1.11.3 + turbo-linux-64: 1.11.3 + turbo-linux-arm64: 1.11.3 + turbo-windows-64: 1.11.3 + turbo-windows-arm64: 1.11.3 dev: true /type-detect@4.0.8: @@ -3421,8 +3432,8 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.1.0(@types/node@20.10.5): - resolution: {integrity: sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==} + /vite-node@1.1.2(@types/node@20.10.6): + resolution: {integrity: sha512-2S3Y7T68PMrBbFS2H9Oda2GeordkIU5gLx2toubxPUcFZ+LKZ9L6U69pLtofotwQUrb3NcUImP3fl9GfLplebA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -3430,7 +3441,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.10.5) + vite: 5.0.10(@types/node@20.10.6) transitivePeerDependencies: - '@types/node' - less @@ -3442,7 +3453,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.10.5): + /vite@5.0.10(@types/node@20.10.6): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3470,7 +3481,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.10.5 + '@types/node': 20.10.6 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3478,8 +3489,8 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.1.0(@types/node@20.10.5): - resolution: {integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==} + /vitest@1.1.2(@types/node@20.10.6): + resolution: {integrity: sha512-nEw58z0PFBARwo3hWx6aKmI0Rob2avL9Mt2IYW+5mH5dS4S39J+VLH9aG8x6KZIgyegdE1p7/3JjZ93FzVCsoQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -3503,12 +3514,12 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.10.5 - '@vitest/expect': 1.1.0 - '@vitest/runner': 1.1.0 - '@vitest/snapshot': 1.1.0 - '@vitest/spy': 1.1.0 - '@vitest/utils': 1.1.0 + '@types/node': 20.10.6 + '@vitest/expect': 1.1.2 + '@vitest/runner': 1.1.2 + '@vitest/snapshot': 1.1.2 + '@vitest/spy': 1.1.2 + '@vitest/utils': 1.1.2 acorn-walk: 8.3.1 cac: 6.7.14 chai: 4.3.10 @@ -3522,8 +3533,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.8.1 - vite: 5.0.10(@types/node@20.10.5) - vite-node: 1.1.0(@types/node@20.10.5) + vite: 5.0.10(@types/node@20.10.6) + vite-node: 1.1.2(@types/node@20.10.6) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From a3ab9b286afc0fe6e882c5e4aafcd83207485837 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 15 Jan 2024 21:19:15 +0000 Subject: [PATCH 044/290] Bump deps --- docs/package.json | 9 +- docs/pnpm-lock.yaml | 875 +++++++++++++++++++-------------- package.json | 4 +- packages/commands/package.json | 6 +- packages/core/package.json | 6 +- packages/ui/package.json | 2 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 230 ++++----- 8 files changed, 642 insertions(+), 498 deletions(-) diff --git a/docs/package.json b/docs/package.json index a7290e5..c1d33ff 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,14 +1,15 @@ { "private": true, + "type": "module", "scripts": { "docs:dev": "vitepress dev vitepress_docs", "docs:build": "vitepress build vitepress_docs", "docs:preview": "vitepress preview vitepress_docs" }, "devDependencies": { - "flexsearch": "^0.7.31", - "vitepress": "1.0.0-beta.5", - "vitepress-plugin-search": "1.0.4-alpha.20", - "vue": "^3.3.4" + "flexsearch": "^0.7.43", + "vitepress": "1.0.0-rc.37", + "vitepress-plugin-search": "1.0.4-alpha.22", + "vue": "^3.4.14" } } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 393c03e..4b5aa7d 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -4,192 +4,195 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -devDependencies: - flexsearch: - specifier: ^0.7.31 - version: 0.7.31 - vitepress: - specifier: 1.0.0-beta.5 - version: 1.0.0-beta.5(@algolia/client-search@4.18.0)(search-insights@2.7.0) - vitepress-plugin-search: - specifier: 1.0.4-alpha.20 - version: 1.0.4-alpha.20(flexsearch@0.7.31)(vitepress@1.0.0-beta.5)(vue@3.3.4) - vue: - specifier: ^3.3.4 - version: 3.3.4 +importers: + + .: + devDependencies: + flexsearch: + specifier: ^0.7.43 + version: 0.7.43 + vitepress: + specifier: 1.0.0-rc.37 + version: 1.0.0-rc.37(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vitepress-plugin-search: + specifier: 1.0.4-alpha.22 + version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.37)(vue@3.4.14) + vue: + specifier: ^3.4.14 + version: 3.4.14 packages: - /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0)(search-insights@2.7.0): + /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0): resolution: {integrity: sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==} dependencies: - '@algolia/autocomplete-plugin-algolia-insights': 1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0)(search-insights@2.7.0) - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0) + '@algolia/autocomplete-plugin-algolia-insights': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0) + '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) transitivePeerDependencies: - '@algolia/client-search' - algoliasearch - search-insights dev: true - /@algolia/autocomplete-plugin-algolia-insights@1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0)(search-insights@2.7.0): + /@algolia/autocomplete-plugin-algolia-insights@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0): resolution: {integrity: sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==} peerDependencies: search-insights: '>= 1 < 3' dependencies: - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0) - search-insights: 2.7.0 + '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) + search-insights: 2.13.0 transitivePeerDependencies: - '@algolia/client-search' - algoliasearch dev: true - /@algolia/autocomplete-preset-algolia@1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0): + /@algolia/autocomplete-preset-algolia@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1): resolution: {integrity: sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==} peerDependencies: '@algolia/client-search': '>= 4.9.1 < 6' algoliasearch: '>= 4.9.1 < 6' dependencies: - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0) - '@algolia/client-search': 4.18.0 - algoliasearch: 4.18.0 + '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) + '@algolia/client-search': 4.22.1 + algoliasearch: 4.22.1 dev: true - /@algolia/autocomplete-shared@1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0): + /@algolia/autocomplete-shared@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1): resolution: {integrity: sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==} peerDependencies: '@algolia/client-search': '>= 4.9.1 < 6' algoliasearch: '>= 4.9.1 < 6' dependencies: - '@algolia/client-search': 4.18.0 - algoliasearch: 4.18.0 + '@algolia/client-search': 4.22.1 + algoliasearch: 4.22.1 dev: true - /@algolia/cache-browser-local-storage@4.18.0: - resolution: {integrity: sha512-rUAs49NLlO8LVLgGzM4cLkw8NJLKguQLgvFmBEe3DyzlinoqxzQMHfKZs6TSq4LZfw/z8qHvRo8NcTAAUJQLcw==} + /@algolia/cache-browser-local-storage@4.22.1: + resolution: {integrity: sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g==} dependencies: - '@algolia/cache-common': 4.18.0 + '@algolia/cache-common': 4.22.1 dev: true - /@algolia/cache-common@4.18.0: - resolution: {integrity: sha512-BmxsicMR4doGbeEXQu8yqiGmiyvpNvejYJtQ7rvzttEAMxOPoWEHrWyzBQw4x7LrBY9pMrgv4ZlUaF8PGzewHg==} + /@algolia/cache-common@4.22.1: + resolution: {integrity: sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA==} dev: true - /@algolia/cache-in-memory@4.18.0: - resolution: {integrity: sha512-evD4dA1nd5HbFdufBxLqlJoob7E2ozlqJZuV3YlirNx5Na4q1LckIuzjNYZs2ddLzuTc/Xd5O3Ibf7OwPskHxw==} + /@algolia/cache-in-memory@4.22.1: + resolution: {integrity: sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw==} dependencies: - '@algolia/cache-common': 4.18.0 + '@algolia/cache-common': 4.22.1 dev: true - /@algolia/client-account@4.18.0: - resolution: {integrity: sha512-XsDnlROr3+Z1yjxBJjUMfMazi1V155kVdte6496atvBgOEtwCzTs3A+qdhfsAnGUvaYfBrBkL0ThnhMIBCGcew==} + /@algolia/client-account@4.22.1: + resolution: {integrity: sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw==} dependencies: - '@algolia/client-common': 4.18.0 - '@algolia/client-search': 4.18.0 - '@algolia/transporter': 4.18.0 + '@algolia/client-common': 4.22.1 + '@algolia/client-search': 4.22.1 + '@algolia/transporter': 4.22.1 dev: true - /@algolia/client-analytics@4.18.0: - resolution: {integrity: sha512-chEUSN4ReqU7uRQ1C8kDm0EiPE+eJeAXiWcBwLhEynfNuTfawN9P93rSZktj7gmExz0C8XmkbBU19IQ05wCNrQ==} + /@algolia/client-analytics@4.22.1: + resolution: {integrity: sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg==} dependencies: - '@algolia/client-common': 4.18.0 - '@algolia/client-search': 4.18.0 - '@algolia/requester-common': 4.18.0 - '@algolia/transporter': 4.18.0 + '@algolia/client-common': 4.22.1 + '@algolia/client-search': 4.22.1 + '@algolia/requester-common': 4.22.1 + '@algolia/transporter': 4.22.1 dev: true - /@algolia/client-common@4.18.0: - resolution: {integrity: sha512-7N+soJFP4wn8tjTr3MSUT/U+4xVXbz4jmeRfWfVAzdAbxLAQbHa0o/POSdTvQ8/02DjCLelloZ1bb4ZFVKg7Wg==} + /@algolia/client-common@4.22.1: + resolution: {integrity: sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==} dependencies: - '@algolia/requester-common': 4.18.0 - '@algolia/transporter': 4.18.0 + '@algolia/requester-common': 4.22.1 + '@algolia/transporter': 4.22.1 dev: true - /@algolia/client-personalization@4.18.0: - resolution: {integrity: sha512-+PeCjODbxtamHcPl+couXMeHEefpUpr7IHftj4Y4Nia1hj8gGq4VlIcqhToAw8YjLeCTfOR7r7xtj3pJcYdP8A==} + /@algolia/client-personalization@4.22.1: + resolution: {integrity: sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ==} dependencies: - '@algolia/client-common': 4.18.0 - '@algolia/requester-common': 4.18.0 - '@algolia/transporter': 4.18.0 + '@algolia/client-common': 4.22.1 + '@algolia/requester-common': 4.22.1 + '@algolia/transporter': 4.22.1 dev: true - /@algolia/client-search@4.18.0: - resolution: {integrity: sha512-F9xzQXTjm6UuZtnsLIew6KSraXQ0AzS/Ee+OD+mQbtcA/K1sg89tqb8TkwjtiYZ0oij13u3EapB3gPZwm+1Y6g==} + /@algolia/client-search@4.22.1: + resolution: {integrity: sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==} dependencies: - '@algolia/client-common': 4.18.0 - '@algolia/requester-common': 4.18.0 - '@algolia/transporter': 4.18.0 + '@algolia/client-common': 4.22.1 + '@algolia/requester-common': 4.22.1 + '@algolia/transporter': 4.22.1 dev: true - /@algolia/logger-common@4.18.0: - resolution: {integrity: sha512-46etYgSlkoKepkMSyaoriSn2JDgcrpc/nkOgou/lm0y17GuMl9oYZxwKKTSviLKI5Irk9nSKGwnBTQYwXOYdRg==} + /@algolia/logger-common@4.22.1: + resolution: {integrity: sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg==} dev: true - /@algolia/logger-console@4.18.0: - resolution: {integrity: sha512-3P3VUYMl9CyJbi/UU1uUNlf6Z8N2ltW3Oqhq/nR7vH0CjWv32YROq3iGWGxB2xt3aXobdUPXs6P0tHSKRmNA6g==} + /@algolia/logger-console@4.22.1: + resolution: {integrity: sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA==} dependencies: - '@algolia/logger-common': 4.18.0 + '@algolia/logger-common': 4.22.1 dev: true - /@algolia/requester-browser-xhr@4.18.0: - resolution: {integrity: sha512-/AcWHOBub2U4TE/bPi4Gz1XfuLK6/7dj4HJG+Z2SfQoS1RjNLshZclU3OoKIkFp8D2NC7+BNsPvr9cPLyW8nyQ==} + /@algolia/requester-browser-xhr@4.22.1: + resolution: {integrity: sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw==} dependencies: - '@algolia/requester-common': 4.18.0 + '@algolia/requester-common': 4.22.1 dev: true - /@algolia/requester-common@4.18.0: - resolution: {integrity: sha512-xlT8R1qYNRBCi1IYLsx7uhftzdfsLPDGudeQs+xvYB4sQ3ya7+ppolB/8m/a4F2gCkEO6oxpp5AGemM7kD27jA==} + /@algolia/requester-common@4.22.1: + resolution: {integrity: sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg==} dev: true - /@algolia/requester-node-http@4.18.0: - resolution: {integrity: sha512-TGfwj9aeTVgOUhn5XrqBhwUhUUDnGIKlI0kCBMdR58XfXcfdwomka+CPIgThRbfYw04oQr31A6/95ZH2QVJ9UQ==} + /@algolia/requester-node-http@4.22.1: + resolution: {integrity: sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA==} dependencies: - '@algolia/requester-common': 4.18.0 + '@algolia/requester-common': 4.22.1 dev: true - /@algolia/transporter@4.18.0: - resolution: {integrity: sha512-xbw3YRUGtXQNG1geYFEDDuFLZt4Z8YNKbamHPkzr3rWc6qp4/BqEeXcI2u/P/oMq2yxtXgMxrCxOPA8lyIe5jw==} + /@algolia/transporter@4.22.1: + resolution: {integrity: sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==} dependencies: - '@algolia/cache-common': 4.18.0 - '@algolia/logger-common': 4.18.0 - '@algolia/requester-common': 4.18.0 + '@algolia/cache-common': 4.22.1 + '@algolia/logger-common': 4.22.1 + '@algolia/requester-common': 4.22.1 dev: true - /@babel/helper-string-parser@7.22.5: - resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} + /@babel/helper-string-parser@7.23.4: + resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-identifier@7.22.5: - resolution: {integrity: sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==} + /@babel/helper-validator-identifier@7.22.20: + resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} dev: true - /@babel/parser@7.22.7: - resolution: {integrity: sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==} + /@babel/parser@7.23.6: + resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.23.6 dev: true - /@babel/types@7.22.5: - resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} + /@babel/types@7.23.6: + resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-string-parser': 7.22.5 - '@babel/helper-validator-identifier': 7.22.5 + '@babel/helper-string-parser': 7.23.4 + '@babel/helper-validator-identifier': 7.22.20 to-fast-properties: 2.0.0 dev: true - /@docsearch/css@3.5.1: - resolution: {integrity: sha512-2Pu9HDg/uP/IT10rbQ+4OrTQuxIWdKVUEdcw9/w7kZJv9NeHS6skJx1xuRiFyoGKwAzcHXnLp7csE99sj+O1YA==} + /@docsearch/css@3.5.2: + resolution: {integrity: sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA==} dev: true - /@docsearch/js@3.5.1(@algolia/client-search@4.18.0)(search-insights@2.7.0): - resolution: {integrity: sha512-EXi8de5njxgP6TV3N9ytnGRLG9zmBNTEZjR4VzwPcpPLbZxxTLG2gaFyJyKiFVQxHW/DPlMrDJA3qoRRGEkgZw==} + /@docsearch/js@3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-p1YFTCDflk8ieHgFJYfmyHBki1D61+U9idwrLh+GQQMrBSP3DLGKpy0XUJtPjAOPltcVbqsTjiPFfH7JImjUNg==} dependencies: - '@docsearch/react': 3.5.1(@algolia/client-search@4.18.0)(search-insights@2.7.0) - preact: 10.16.0 + '@docsearch/react': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) + preact: 10.19.3 transitivePeerDependencies: - '@algolia/client-search' - '@types/react' @@ -198,12 +201,13 @@ packages: - search-insights dev: true - /@docsearch/react@3.5.1(@algolia/client-search@4.18.0)(search-insights@2.7.0): - resolution: {integrity: sha512-t5mEODdLzZq4PTFAm/dvqcvZFdPDMdfPE5rJS5SC8OUq9mPzxEy6b+9THIqNM9P0ocCb4UC5jqBrxKclnuIbzQ==} + /@docsearch/react@3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-9Ahcrs5z2jq/DcAvYtvlqEBHImbm4YJI8M9y0x6Tqg598P40HTEkX7hsMcIuThI+hTFxRGZ9hll0Wygm2yEjng==} peerDependencies: '@types/react': '>= 16.8.0 < 19.0.0' react: '>= 16.8.0 < 19.0.0' react-dom: '>= 16.8.0 < 19.0.0' + search-insights: '>= 1 < 3' peerDependenciesMeta: '@types/react': optional: true @@ -211,18 +215,29 @@ packages: optional: true react-dom: optional: true + search-insights: + optional: true dependencies: - '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0)(search-insights@2.7.0) - '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.18.0)(algoliasearch@4.18.0) - '@docsearch/css': 3.5.1 - algoliasearch: 4.18.0 + '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0) + '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) + '@docsearch/css': 3.5.2 + algoliasearch: 4.22.1 + search-insights: 2.13.0 transitivePeerDependencies: - '@algolia/client-search' - - search-insights dev: true - /@esbuild/android-arm64@0.18.13: - resolution: {integrity: sha512-j7NhycJUoUAG5kAzGf4fPWfd17N6SM3o1X6MlXVqfHvs2buFraCJzos9vbeWjLxOyBKHyPOnuCuipbhvbYtTAg==} + /@esbuild/aix-ppc64@0.19.11: + resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.19.11: + resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -230,8 +245,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.18.13: - resolution: {integrity: sha512-KwqFhxRFMKZINHzCqf8eKxE0XqWlAVPRxwy6rc7CbVFxzUWB2sA/s3hbMZeemPdhN3fKBkqOaFhTbS8xJXYIWQ==} + /@esbuild/android-arm@0.19.11: + resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -239,8 +254,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.18.13: - resolution: {integrity: sha512-M2eZkRxR6WnWfVELHmv6MUoHbOqnzoTVSIxgtsyhm/NsgmL+uTmag/VVzdXvmahak1I6sOb1K/2movco5ikDJg==} + /@esbuild/android-x64@0.19.11: + resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -248,8 +263,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.18.13: - resolution: {integrity: sha512-f5goG30YgR1GU+fxtaBRdSW3SBG9pZW834Mmhxa6terzcboz7P2R0k4lDxlkP7NYRIIdBbWp+VgwQbmMH4yV7w==} + /@esbuild/darwin-arm64@0.19.11: + resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -257,8 +272,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.18.13: - resolution: {integrity: sha512-RIrxoKH5Eo+yE5BtaAIMZaiKutPhZjw+j0OCh8WdvKEKJQteacq0myZvBDLU+hOzQOZWJeDnuQ2xgSScKf1Ovw==} + /@esbuild/darwin-x64@0.19.11: + resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -266,8 +281,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.18.13: - resolution: {integrity: sha512-AfRPhHWmj9jGyLgW/2FkYERKmYR+IjYxf2rtSLmhOrPGFh0KCETFzSjx/JX/HJnvIqHt/DRQD/KAaVsUKoI3Xg==} + /@esbuild/freebsd-arm64@0.19.11: + resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -275,8 +290,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.18.13: - resolution: {integrity: sha512-pGzWWZJBInhIgdEwzn8VHUBang8UvFKsvjDkeJ2oyY5gZtAM6BaxK0QLCuZY+qoj/nx/lIaItH425rm/hloETA==} + /@esbuild/freebsd-x64@0.19.11: + resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -284,8 +299,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.18.13: - resolution: {integrity: sha512-hCzZbVJEHV7QM77fHPv2qgBcWxgglGFGCxk6KfQx6PsVIdi1u09X7IvgE9QKqm38OpkzaAkPnnPqwRsltvLkIQ==} + /@esbuild/linux-arm64@0.19.11: + resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -293,8 +308,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.18.13: - resolution: {integrity: sha512-4iMxLRMCxGyk7lEvkkvrxw4aJeC93YIIrfbBlUJ062kilUUnAiMb81eEkVvCVoh3ON283ans7+OQkuy1uHW+Hw==} + /@esbuild/linux-arm@0.19.11: + resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -302,8 +317,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.18.13: - resolution: {integrity: sha512-I3OKGbynl3AAIO6onXNrup/ttToE6Rv2XYfFgLK/wnr2J+1g+7k4asLrE+n7VMhaqX+BUnyWkCu27rl+62Adug==} + /@esbuild/linux-ia32@0.19.11: + resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -311,8 +326,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.18.13: - resolution: {integrity: sha512-8pcKDApAsKc6WW51ZEVidSGwGbebYw2qKnO1VyD8xd6JN0RN6EUXfhXmDk9Vc4/U3Y4AoFTexQewQDJGsBXBpg==} + /@esbuild/linux-loong64@0.19.11: + resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -320,8 +335,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.18.13: - resolution: {integrity: sha512-6GU+J1PLiVqWx8yoCK4Z0GnfKyCGIH5L2KQipxOtbNPBs+qNDcMJr9euxnyJ6FkRPyMwaSkjejzPSISD9hb+gg==} + /@esbuild/linux-mips64el@0.19.11: + resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -329,8 +344,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.18.13: - resolution: {integrity: sha512-pfn/OGZ8tyR8YCV7MlLl5hAit2cmS+j/ZZg9DdH0uxdCoJpV7+5DbuXrR+es4ayRVKIcfS9TTMCs60vqQDmh+w==} + /@esbuild/linux-ppc64@0.19.11: + resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -338,8 +353,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.18.13: - resolution: {integrity: sha512-aIbhU3LPg0lOSCfVeGHbmGYIqOtW6+yzO+Nfv57YblEK01oj0mFMtvDJlOaeAZ6z0FZ9D13oahi5aIl9JFphGg==} + /@esbuild/linux-riscv64@0.19.11: + resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -347,8 +362,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.18.13: - resolution: {integrity: sha512-Pct1QwF2sp+5LVi4Iu5Y+6JsGaV2Z2vm4O9Dd7XZ5tKYxEHjFtb140fiMcl5HM1iuv6xXO8O1Vrb1iJxHlv8UA==} + /@esbuild/linux-s390x@0.19.11: + resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -356,8 +371,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.18.13: - resolution: {integrity: sha512-zTrIP0KzYP7O0+3ZnmzvUKgGtUvf4+piY8PIO3V8/GfmVd3ZyHJGz7Ht0np3P1wz+I8qJ4rjwJKqqEAbIEPngA==} + /@esbuild/linux-x64@0.19.11: + resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -365,8 +380,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.18.13: - resolution: {integrity: sha512-I6zs10TZeaHDYoGxENuksxE1sxqZpCp+agYeW039yqFwh3MgVvdmXL5NMveImOC6AtpLvE4xG5ujVic4NWFIDQ==} + /@esbuild/netbsd-x64@0.19.11: + resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -374,8 +389,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.18.13: - resolution: {integrity: sha512-W5C5nczhrt1y1xPG5bV+0M12p2vetOGlvs43LH8SopQ3z2AseIROu09VgRqydx5qFN7y9qCbpgHLx0kb0TcW7g==} + /@esbuild/openbsd-x64@0.19.11: + resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -383,8 +398,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.18.13: - resolution: {integrity: sha512-X/xzuw4Hzpo/yq3YsfBbIsipNgmsm8mE/QeWbdGdTTeZ77fjxI2K0KP3AlhZ6gU3zKTw1bKoZTuKLnqcJ537qw==} + /@esbuild/sunos-x64@0.19.11: + resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -392,8 +407,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.18.13: - resolution: {integrity: sha512-4CGYdRQT/ILd+yLLE5i4VApMPfGE0RPc/wFQhlluDQCK09+b4JDbxzzjpgQqTPrdnP7r5KUtGVGZYclYiPuHrw==} + /@esbuild/win32-arm64@0.19.11: + resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -401,8 +416,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.18.13: - resolution: {integrity: sha512-D+wKZaRhQI+MUGMH+DbEr4owC2D7XnF+uyGiZk38QbgzLcofFqIOwFs7ELmIeU45CQgfHNy9Q+LKW3cE8g37Kg==} + /@esbuild/win32-ia32@0.19.11: + resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -410,8 +425,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.18.13: - resolution: {integrity: sha512-iVl6lehAfJS+VmpF3exKpNQ8b0eucf5VWfzR8S7xFve64NBNz2jPUgx1X93/kfnkfgP737O+i1k54SVQS7uVZA==} + /@esbuild/win32-x64@0.19.11: + resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -423,141 +438,246 @@ packages: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} dev: true - /@types/flexsearch@0.7.3: - resolution: {integrity: sha512-HXwADeHEP4exXkCIwy2n1+i0f1ilP1ETQOH5KDOugjkTFZPntWo0Gr8stZOaebkxsdx+k0X/K6obU/+it07ocg==} + /@rollup/rollup-android-arm-eabi@4.9.5: + resolution: {integrity: sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-android-arm64@4.9.5: + resolution: {integrity: sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-arm64@4.9.5: + resolution: {integrity: sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-darwin-x64@4.9.5: + resolution: {integrity: sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm-gnueabihf@4.9.5: + resolution: {integrity: sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.9.5: + resolution: {integrity: sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-musl@4.9.5: + resolution: {integrity: sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-riscv64-gnu@4.9.5: + resolution: {integrity: sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-gnu@4.9.5: + resolution: {integrity: sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-x64-musl@4.9.5: + resolution: {integrity: sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-arm64-msvc@4.9.5: + resolution: {integrity: sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==} + cpu: [arm64] + os: [win32] + requiresBuild: true dev: true + optional: true - /@types/linkify-it@3.0.2: - resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==} + /@rollup/rollup-win32-ia32-msvc@4.9.5: + resolution: {integrity: sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-win32-x64-msvc@4.9.5: + resolution: {integrity: sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@types/estree@1.0.5: + resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + dev: true + + /@types/flexsearch@0.7.6: + resolution: {integrity: sha512-H5IXcRn96/gaDmo+rDl2aJuIJsob8dgOXDqf8K0t8rWZd1AFNaaspmRsElESiU+EWE33qfbFPgI0OC/B1g9FCA==} + dev: true + + /@types/linkify-it@3.0.5: + resolution: {integrity: sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==} dev: true /@types/markdown-it@12.2.3: resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==} dependencies: - '@types/linkify-it': 3.0.2 - '@types/mdurl': 1.0.2 + '@types/linkify-it': 3.0.5 + '@types/mdurl': 1.0.5 + dev: true + + /@types/markdown-it@13.0.7: + resolution: {integrity: sha512-U/CBi2YUUcTHBt5tjO2r5QV/x0Po6nsYwQU4Y04fBS6vfoImaiZ6f8bi3CjTCxBPQSO1LMyUqkByzi8AidyxfA==} + dependencies: + '@types/linkify-it': 3.0.5 + '@types/mdurl': 1.0.5 dev: true - /@types/mdurl@1.0.2: - resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==} + /@types/mdurl@1.0.5: + resolution: {integrity: sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==} dev: true - /@types/web-bluetooth@0.0.17: - resolution: {integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==} + /@types/web-bluetooth@0.0.20: + resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} dev: true - /@vitejs/plugin-vue@4.2.3(vite@4.4.0-beta.3)(vue@3.3.4): - resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==} - engines: {node: ^14.18.0 || >=16.0.0} + /@vitejs/plugin-vue@5.0.3(vite@5.0.11)(vue@3.4.14): + resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==} + engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: - vite: ^4.0.0 + vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 4.4.0-beta.3 - vue: 3.3.4 + vite: 5.0.11 + vue: 3.4.14 dev: true - /@vue/compiler-core@3.3.4: - resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} + /@vue/compiler-core@3.4.14: + resolution: {integrity: sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg==} dependencies: - '@babel/parser': 7.22.7 - '@vue/shared': 3.3.4 + '@babel/parser': 7.23.6 + '@vue/shared': 3.4.14 + entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.0.2 dev: true - /@vue/compiler-dom@3.3.4: - resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} + /@vue/compiler-dom@3.4.14: + resolution: {integrity: sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ==} dependencies: - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/compiler-core': 3.4.14 + '@vue/shared': 3.4.14 dev: true - /@vue/compiler-sfc@3.3.4: - resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==} + /@vue/compiler-sfc@3.4.14: + resolution: {integrity: sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ==} dependencies: - '@babel/parser': 7.22.7 - '@vue/compiler-core': 3.3.4 - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-ssr': 3.3.4 - '@vue/reactivity-transform': 3.3.4 - '@vue/shared': 3.3.4 + '@babel/parser': 7.23.6 + '@vue/compiler-core': 3.4.14 + '@vue/compiler-dom': 3.4.14 + '@vue/compiler-ssr': 3.4.14 + '@vue/shared': 3.4.14 estree-walker: 2.0.2 - magic-string: 0.30.1 - postcss: 8.4.26 + magic-string: 0.30.5 + postcss: 8.4.33 source-map-js: 1.0.2 dev: true - /@vue/compiler-ssr@3.3.4: - resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==} + /@vue/compiler-ssr@3.4.14: + resolution: {integrity: sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q==} dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/compiler-dom': 3.4.14 + '@vue/shared': 3.4.14 dev: true - /@vue/devtools-api@6.5.0: - resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==} + /@vue/devtools-api@6.5.1: + resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} dev: true - /@vue/reactivity-transform@3.3.4: - resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==} + /@vue/reactivity@3.4.14: + resolution: {integrity: sha512-xRYwze5Q4tK7tT2J4uy4XLhK/AIXdU5EBUu9PLnIHcOKXO0uyXpNNMzlQKuq7B+zwtq6K2wuUL39pHA6ZQzObw==} dependencies: - '@babel/parser': 7.22.7 - '@vue/compiler-core': 3.3.4 - '@vue/shared': 3.3.4 - estree-walker: 2.0.2 - magic-string: 0.30.1 - dev: true - - /@vue/reactivity@3.3.4: - resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} - dependencies: - '@vue/shared': 3.3.4 + '@vue/shared': 3.4.14 dev: true - /@vue/runtime-core@3.3.4: - resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==} + /@vue/runtime-core@3.4.14: + resolution: {integrity: sha512-qu+NMkfujCoZL6cfqK5NOfxgXJROSlP2ZPs4CTcVR+mLrwl4TtycF5Tgo0QupkdBL+2kigc6EsJlTcuuZC1NaQ==} dependencies: - '@vue/reactivity': 3.3.4 - '@vue/shared': 3.3.4 + '@vue/reactivity': 3.4.14 + '@vue/shared': 3.4.14 dev: true - /@vue/runtime-dom@3.3.4: - resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==} + /@vue/runtime-dom@3.4.14: + resolution: {integrity: sha512-B85XmcR4E7XsirEHVqhmy4HPbRT9WLFWV9Uhie3OapV9m1MEN9+Er6hmUIE6d8/l2sUygpK9RstFM2bmHEUigA==} dependencies: - '@vue/runtime-core': 3.3.4 - '@vue/shared': 3.3.4 - csstype: 3.1.2 + '@vue/runtime-core': 3.4.14 + '@vue/shared': 3.4.14 + csstype: 3.1.3 dev: true - /@vue/server-renderer@3.3.4(vue@3.3.4): - resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==} + /@vue/server-renderer@3.4.14(vue@3.4.14): + resolution: {integrity: sha512-pwSKXQfYdJBTpvWHGEYI+akDE18TXAiLcGn+Q/2Fj8wQSHWztoo7PSvfMNqu6NDhp309QXXbPFEGCU5p85HqkA==} peerDependencies: - vue: 3.3.4 + vue: 3.4.14 dependencies: - '@vue/compiler-ssr': 3.3.4 - '@vue/shared': 3.3.4 - vue: 3.3.4 + '@vue/compiler-ssr': 3.4.14 + '@vue/shared': 3.4.14 + vue: 3.4.14 dev: true - /@vue/shared@3.3.4: - resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} + /@vue/shared@3.4.14: + resolution: {integrity: sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q==} dev: true - /@vueuse/core@10.2.1(vue@3.3.4): - resolution: {integrity: sha512-c441bfMbkAwTNwVRHQ0zdYZNETK//P84rC01aP2Uy/aRFCiie9NE/k9KdIXbno0eDYP5NPUuWv0aA/I4Unr/7w==} + /@vueuse/core@10.7.2(vue@3.4.14): + resolution: {integrity: sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ==} dependencies: - '@types/web-bluetooth': 0.0.17 - '@vueuse/metadata': 10.2.1 - '@vueuse/shared': 10.2.1(vue@3.3.4) - vue-demi: 0.14.5(vue@3.3.4) + '@types/web-bluetooth': 0.0.20 + '@vueuse/metadata': 10.7.2 + '@vueuse/shared': 10.7.2(vue@3.4.14) + vue-demi: 0.14.6(vue@3.4.14) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.2.1(focus-trap@7.5.2)(vue@3.3.4): - resolution: {integrity: sha512-FDP5lni+z9FjHE9H3xuvwSjoRV9U8jmDvJpmHPCBjUgPGYRynwb60eHWXCFJXLUtb4gSIHy0e+iaEbrKdalCkQ==} + /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.14): + resolution: {integrity: sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==} peerDependencies: async-validator: '*' axios: '*' @@ -597,61 +717,53 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.2.1(vue@3.3.4) - '@vueuse/shared': 10.2.1(vue@3.3.4) - focus-trap: 7.5.2 - vue-demi: 0.14.5(vue@3.3.4) + '@vueuse/core': 10.7.2(vue@3.4.14) + '@vueuse/shared': 10.7.2(vue@3.4.14) + focus-trap: 7.5.4 + vue-demi: 0.14.6(vue@3.4.14) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/metadata@10.2.1: - resolution: {integrity: sha512-3Gt68mY/i6bQvFqx7cuGBzrCCQu17OBaGWS5JdwISpMsHnMKKjC2FeB5OAfMcCQ0oINfADP3i9A4PPRo0peHdQ==} + /@vueuse/metadata@10.7.2: + resolution: {integrity: sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ==} dev: true - /@vueuse/shared@10.2.1(vue@3.3.4): - resolution: {integrity: sha512-QWHq2bSuGptkcxx4f4M/fBYC3Y8d3M2UYyLsyzoPgEoVzJURQ0oJeWXu79OiLlBb8gTKkqe4mO85T/sf39mmiw==} + /@vueuse/shared@10.7.2(vue@3.4.14): + resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} dependencies: - vue-demi: 0.14.5(vue@3.3.4) + vue-demi: 0.14.6(vue@3.4.14) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /algoliasearch@4.18.0: - resolution: {integrity: sha512-pCuVxC1SVcpc08ENH32T4sLKSyzoU7TkRIDBMwSLfIiW+fq4znOmWDkAygHZ6pRcO9I1UJdqlfgnV7TRj+MXrA==} + /algoliasearch@4.22.1: + resolution: {integrity: sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==} dependencies: - '@algolia/cache-browser-local-storage': 4.18.0 - '@algolia/cache-common': 4.18.0 - '@algolia/cache-in-memory': 4.18.0 - '@algolia/client-account': 4.18.0 - '@algolia/client-analytics': 4.18.0 - '@algolia/client-common': 4.18.0 - '@algolia/client-personalization': 4.18.0 - '@algolia/client-search': 4.18.0 - '@algolia/logger-common': 4.18.0 - '@algolia/logger-console': 4.18.0 - '@algolia/requester-browser-xhr': 4.18.0 - '@algolia/requester-common': 4.18.0 - '@algolia/requester-node-http': 4.18.0 - '@algolia/transporter': 4.18.0 - dev: true - - /ansi-sequence-parser@1.1.0: - resolution: {integrity: sha512-lEm8mt52to2fT8GhciPCGeCXACSz2UwIN4X2e2LJSnZ5uAbn2/dsYdOmUXq0AtWS5cpAupysIneExOgH0Vd2TQ==} + '@algolia/cache-browser-local-storage': 4.22.1 + '@algolia/cache-common': 4.22.1 + '@algolia/cache-in-memory': 4.22.1 + '@algolia/client-account': 4.22.1 + '@algolia/client-analytics': 4.22.1 + '@algolia/client-common': 4.22.1 + '@algolia/client-personalization': 4.22.1 + '@algolia/client-search': 4.22.1 + '@algolia/logger-common': 4.22.1 + '@algolia/logger-console': 4.22.1 + '@algolia/requester-browser-xhr': 4.22.1 + '@algolia/requester-common': 4.22.1 + '@algolia/requester-node-http': 4.22.1 + '@algolia/transporter': 4.22.1 dev: true /argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} dev: true - /body-scroll-lock@4.0.0-beta.0: - resolution: {integrity: sha512-a7tP5+0Mw3YlUJcGAKUqIBkYYGlYxk2fnCasq/FUph1hadxlTRjF+gAcZksxANnaMnALjxEddmSi/H3OR8ugcQ==} - dev: true - - /csstype@3.1.2: - resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} + /csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} dev: true /entities@3.0.1: @@ -659,52 +771,58 @@ packages: engines: {node: '>=0.12'} dev: true - /esbuild@0.18.13: - resolution: {integrity: sha512-vhg/WR/Oiu4oUIkVhmfcc23G6/zWuEQKFS+yiosSHe4aN6+DQRXIfeloYGibIfVhkr4wyfuVsGNLr+sQU1rWWw==} + /entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + dev: true + + /esbuild@0.19.11: + resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.18.13 - '@esbuild/android-arm64': 0.18.13 - '@esbuild/android-x64': 0.18.13 - '@esbuild/darwin-arm64': 0.18.13 - '@esbuild/darwin-x64': 0.18.13 - '@esbuild/freebsd-arm64': 0.18.13 - '@esbuild/freebsd-x64': 0.18.13 - '@esbuild/linux-arm': 0.18.13 - '@esbuild/linux-arm64': 0.18.13 - '@esbuild/linux-ia32': 0.18.13 - '@esbuild/linux-loong64': 0.18.13 - '@esbuild/linux-mips64el': 0.18.13 - '@esbuild/linux-ppc64': 0.18.13 - '@esbuild/linux-riscv64': 0.18.13 - '@esbuild/linux-s390x': 0.18.13 - '@esbuild/linux-x64': 0.18.13 - '@esbuild/netbsd-x64': 0.18.13 - '@esbuild/openbsd-x64': 0.18.13 - '@esbuild/sunos-x64': 0.18.13 - '@esbuild/win32-arm64': 0.18.13 - '@esbuild/win32-ia32': 0.18.13 - '@esbuild/win32-x64': 0.18.13 + '@esbuild/aix-ppc64': 0.19.11 + '@esbuild/android-arm': 0.19.11 + '@esbuild/android-arm64': 0.19.11 + '@esbuild/android-x64': 0.19.11 + '@esbuild/darwin-arm64': 0.19.11 + '@esbuild/darwin-x64': 0.19.11 + '@esbuild/freebsd-arm64': 0.19.11 + '@esbuild/freebsd-x64': 0.19.11 + '@esbuild/linux-arm': 0.19.11 + '@esbuild/linux-arm64': 0.19.11 + '@esbuild/linux-ia32': 0.19.11 + '@esbuild/linux-loong64': 0.19.11 + '@esbuild/linux-mips64el': 0.19.11 + '@esbuild/linux-ppc64': 0.19.11 + '@esbuild/linux-riscv64': 0.19.11 + '@esbuild/linux-s390x': 0.19.11 + '@esbuild/linux-x64': 0.19.11 + '@esbuild/netbsd-x64': 0.19.11 + '@esbuild/openbsd-x64': 0.19.11 + '@esbuild/sunos-x64': 0.19.11 + '@esbuild/win32-arm64': 0.19.11 + '@esbuild/win32-ia32': 0.19.11 + '@esbuild/win32-x64': 0.19.11 dev: true /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} dev: true - /flexsearch@0.7.31: - resolution: {integrity: sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==} + /flexsearch@0.7.43: + resolution: {integrity: sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==} dev: true - /focus-trap@7.5.2: - resolution: {integrity: sha512-p6vGNNWLDGwJCiEjkSK6oERj/hEyI9ITsSwIUICBoKLlWiTWXJRfQibCwcoi50rTZdbi87qDtUlMCmQwsGSgPw==} + /focus-trap@7.5.4: + resolution: {integrity: sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==} dependencies: tabbable: 6.2.0 dev: true - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} + /fsevents@2.3.3: + resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] requiresBuild: true @@ -715,18 +833,14 @@ packages: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} dev: true - /jsonc-parser@3.2.0: - resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} - dev: true - /linkify-it@4.0.1: resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==} dependencies: uc.micro: 1.0.6 dev: true - /magic-string@0.30.1: - resolution: {integrity: sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==} + /magic-string@0.30.5: + resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -736,8 +850,8 @@ packages: resolution: {integrity: sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==} dev: true - /markdown-it@13.0.1: - resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==} + /markdown-it@13.0.2: + resolution: {integrity: sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==} hasBin: true dependencies: argparse: 2.0.1 @@ -751,12 +865,12 @@ packages: resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} dev: true - /minisearch@6.1.0: - resolution: {integrity: sha512-PNxA/X8pWk+TiqPbsoIYH0GQ5Di7m6326/lwU/S4mlo4wGQddIcf/V//1f9TB0V4j59b57b+HZxt8h3iMROGvg==} + /minisearch@6.3.0: + resolution: {integrity: sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==} dev: true - /nanoid@3.3.6: - resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==} + /nanoid@3.3.7: + resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true dev: true @@ -765,39 +879,60 @@ packages: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true - /postcss@8.4.26: - resolution: {integrity: sha512-jrXHFF8iTloAenySjM/ob3gSj7pCu0Ji49hnjqzsgSRa50hkWCKD0HQ+gMNJkW38jBI68MpAAg7ZWwHwX8NMMw==} + /postcss@8.4.33: + resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} engines: {node: ^10 || ^12 || >=14} dependencies: - nanoid: 3.3.6 + nanoid: 3.3.7 picocolors: 1.0.0 source-map-js: 1.0.2 dev: true - /preact@10.16.0: - resolution: {integrity: sha512-XTSj3dJ4roKIC93pald6rWuB2qQJO9gO2iLLyTe87MrjQN+HklueLsmskbywEWqCHlclgz3/M4YLL2iBr9UmMA==} + /preact@10.19.3: + resolution: {integrity: sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==} dev: true - /rollup@3.26.2: - resolution: {integrity: sha512-6umBIGVz93er97pMgQO08LuH3m6PUb3jlDUUGFsNJB6VgTCUaDFpupf5JfU30529m/UKOgmiX+uY6Sx8cOYpLA==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} + /rollup@4.9.5: + resolution: {integrity: sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + dependencies: + '@types/estree': 1.0.5 optionalDependencies: - fsevents: 2.3.2 + '@rollup/rollup-android-arm-eabi': 4.9.5 + '@rollup/rollup-android-arm64': 4.9.5 + '@rollup/rollup-darwin-arm64': 4.9.5 + '@rollup/rollup-darwin-x64': 4.9.5 + '@rollup/rollup-linux-arm-gnueabihf': 4.9.5 + '@rollup/rollup-linux-arm64-gnu': 4.9.5 + '@rollup/rollup-linux-arm64-musl': 4.9.5 + '@rollup/rollup-linux-riscv64-gnu': 4.9.5 + '@rollup/rollup-linux-x64-gnu': 4.9.5 + '@rollup/rollup-linux-x64-musl': 4.9.5 + '@rollup/rollup-win32-arm64-msvc': 4.9.5 + '@rollup/rollup-win32-ia32-msvc': 4.9.5 + '@rollup/rollup-win32-x64-msvc': 4.9.5 + fsevents: 2.3.3 + dev: true + + /search-insights@2.13.0: + resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} + dev: true + + /shikiji-core@0.9.19: + resolution: {integrity: sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==} dev: true - /search-insights@2.7.0: - resolution: {integrity: sha512-GLbVaGgzYEKMvuJbHRhLi1qoBFnjXZGZ6l4LxOYPCp4lI2jDRB3jPU9/XNhMwv6kvnA9slTreq6pvK+b3o3aqg==} - engines: {node: '>=8.16.0'} + /shikiji-transformers@0.9.19: + resolution: {integrity: sha512-lGLI7Z8frQrIBbhZ74/eiJtxMoCQRbpaHEB+gcfvdIy+ZFaAtXncJGnc52932/UET+Y4GyKtwwC/vjWUCp+c/Q==} + dependencies: + shikiji: 0.9.19 dev: true - /shiki@0.14.3: - resolution: {integrity: sha512-U3S/a+b0KS+UkTyMjoNojvTgrBHjgp7L6ovhFVZsXmBGnVdQ4K4U9oK0z63w538S91ATngv1vXigHCSWOwnr+g==} + /shikiji@0.9.19: + resolution: {integrity: sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==} dependencies: - ansi-sequence-parser: 1.1.0 - jsonc-parser: 3.2.0 - vscode-oniguruma: 1.7.0 - vscode-textmate: 8.0.0 + shikiji-core: 0.9.19 dev: true /source-map-js@1.0.2: @@ -818,12 +953,12 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /vite@4.4.0-beta.3: - resolution: {integrity: sha512-IC/thYTvArOFRJ4qvvudnu4KKZOVc+gduS3I9OfC5SbP/Rf4kkP7z6Of2QpKeOSVqwIK24khW6VOUmVD/0yzSQ==} - engines: {node: ^14.18.0 || >=16.0.0} + /vite@5.0.11: + resolution: {integrity: sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: - '@types/node': '>= 14' + '@types/node': ^18.0.0 || >=20.0.0 less: '*' lightningcss: ^1.21.0 sass: '*' @@ -846,47 +981,57 @@ packages: terser: optional: true dependencies: - esbuild: 0.18.13 - postcss: 8.4.26 - rollup: 3.26.2 + esbuild: 0.19.11 + postcss: 8.4.33 + rollup: 4.9.5 optionalDependencies: - fsevents: 2.3.2 + fsevents: 2.3.3 dev: true - /vitepress-plugin-search@1.0.4-alpha.20(flexsearch@0.7.31)(vitepress@1.0.0-beta.5)(vue@3.3.4): - resolution: {integrity: sha512-zG+ev9pw1Mg7htABlFCNXb8XwnKN+qfTKw+vU0Ers6RIrABx+45EAAFBoaL1mEpl1FRFn1o/dQ7F4b8GP6HdGQ==} + /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.37)(vue@3.4.14): + resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: flexsearch: ^0.7.31 - vitepress: ^1.0.0-alpha.65 + vitepress: ^1.0.0-rc.35 vue: '3' dependencies: - '@types/flexsearch': 0.7.3 + '@types/flexsearch': 0.7.6 '@types/markdown-it': 12.2.3 - flexsearch: 0.7.31 + flexsearch: 0.7.43 glob-to-regexp: 0.4.1 - markdown-it: 13.0.1 - vitepress: 1.0.0-beta.5(@algolia/client-search@4.18.0)(search-insights@2.7.0) - vue: 3.3.4 + markdown-it: 13.0.2 + vitepress: 1.0.0-rc.37(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vue: 3.4.14 dev: true - /vitepress@1.0.0-beta.5(@algolia/client-search@4.18.0)(search-insights@2.7.0): - resolution: {integrity: sha512-/RjqqRsSEKkzF6HhK5e5Ij+bZ7ETb9jNCRRgIMm10gJ+ZLC3D1OqkE465lEqCeJUgt2HZ6jmWjDqIBfrJSpv7w==} + /vitepress@1.0.0-rc.37(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-Z2X+M0id+bUdxcWxvFRUzfLyV2GtPWRcejLSMGOHRiwA1DV/dNmELKJ3U9D1HBYQK0FBzunpuQD0a2jZ7FZvJA==} hasBin: true + peerDependencies: + markdown-it-mathjax3: ^4.3.2 + postcss: ^8.4.33 + peerDependenciesMeta: + markdown-it-mathjax3: + optional: true + postcss: + optional: true dependencies: - '@docsearch/css': 3.5.1 - '@docsearch/js': 3.5.1(@algolia/client-search@4.18.0)(search-insights@2.7.0) - '@vitejs/plugin-vue': 4.2.3(vite@4.4.0-beta.3)(vue@3.3.4) - '@vue/devtools-api': 6.5.0 - '@vueuse/core': 10.2.1(vue@3.3.4) - '@vueuse/integrations': 10.2.1(focus-trap@7.5.2)(vue@3.3.4) - body-scroll-lock: 4.0.0-beta.0 - focus-trap: 7.5.2 + '@docsearch/css': 3.5.2 + '@docsearch/js': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) + '@types/markdown-it': 13.0.7 + '@vitejs/plugin-vue': 5.0.3(vite@5.0.11)(vue@3.4.14) + '@vue/devtools-api': 6.5.1 + '@vueuse/core': 10.7.2(vue@3.4.14) + '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.14) + focus-trap: 7.5.4 mark.js: 8.11.1 - minisearch: 6.1.0 - shiki: 0.14.3 - vite: 4.4.0-beta.3 - vue: 3.3.4 + minisearch: 6.3.0 + shikiji: 0.9.19 + shikiji-core: 0.9.19 + shikiji-transformers: 0.9.19 + vite: 5.0.11 + vue: 3.4.14 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -911,19 +1056,12 @@ packages: - stylus - sugarss - terser + - typescript - universal-cookie dev: true - /vscode-oniguruma@1.7.0: - resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==} - dev: true - - /vscode-textmate@8.0.0: - resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} - dev: true - - /vue-demi@0.14.5(vue@3.3.4): - resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==} + /vue-demi@0.14.6(vue@3.4.14): + resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true requiresBuild: true @@ -934,15 +1072,20 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.3.4 + vue: 3.4.14 dev: true - /vue@3.3.4: - resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==} + /vue@3.4.14: + resolution: {integrity: sha512-Rop5Al/ZcBbBz+KjPZaZDgHDX0kUP4duEzDbm+1o91uxYUNmJrZSBuegsNIJvUGy+epLevNRNhLjm08VKTgGyw==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true dependencies: - '@vue/compiler-dom': 3.3.4 - '@vue/compiler-sfc': 3.3.4 - '@vue/runtime-dom': 3.3.4 - '@vue/server-renderer': 3.3.4(vue@3.3.4) - '@vue/shared': 3.3.4 + '@vue/compiler-dom': 3.4.14 + '@vue/compiler-sfc': 3.4.14 + '@vue/runtime-dom': 3.4.14 + '@vue/server-renderer': 3.4.14(vue@3.4.14) + '@vue/shared': 3.4.14 dev: true diff --git a/package.json b/package.json index b89457a..71c6eda 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,9 @@ "devDependencies": { "@changesets/cli": "2.27.1", "nodemon": "^3.0.2", - "prettier": "^3.1.1", + "prettier": "^3.2.2", "turbo": "^1.11.3", - "vitest": "^1.1.2" + "vitest": "^1.2.0" }, "packageManager": "pnpm@8.7.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index bdfd773..84df2e9 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -32,9 +32,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.10.6", - "prettier": "^3.1.1", + "@chialab/esbuild-plugin-meta-url": "^0.18.0", + "@types/node": "^20.11.2", + "prettier": "^3.2.2", "tsup": "^8.0.1", "typescript": "^5.3.3" }, diff --git a/packages/core/package.json b/packages/core/package.json index eefd1fc..2c74402 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.3.102", + "@swc/core": "^1.3.103", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -41,8 +41,8 @@ "build": "tsc && tsup" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "^20.10.6", + "@chialab/esbuild-plugin-meta-url": "^0.18.0", + "@types/node": "^20.11.2", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 85a999b..8029948 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.1", "typescript": "^5.3.3", - "@types/node": "20.10.6" + "@types/node": "20.11.2" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index e01bb9b..aac2211 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -62,12 +62,12 @@ "build": "tsc && tsup && jiti ./scripts/postBuild.ts" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.17.7", - "@types/node": "20.10.6", + "@chialab/esbuild-plugin-meta-url": "^0.18.0", + "@types/node": "20.11.2", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3", - "vitest": "^1.1.2" + "vitest": "^1.2.0" }, "publishConfig": { "access": "public" @@ -76,7 +76,7 @@ "@clack/core": "0.3.3", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.3.102", + "@swc/core": "^1.3.103", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d2b93e9..87bf97a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,14 +15,14 @@ importers: specifier: ^3.0.2 version: 3.0.2 prettier: - specifier: ^3.1.1 - version: 3.1.1 + specifier: ^3.2.2 + version: 3.2.2 turbo: specifier: ^1.11.3 version: 1.11.3 vitest: - specifier: ^1.1.2 - version: 1.1.2(@types/node@20.10.6) + specifier: ^1.2.0 + version: 1.2.0(@types/node@20.11.2) packages/commands: dependencies: @@ -52,17 +52,17 @@ importers: version: 3.35.0 devDependencies: '@chialab/esbuild-plugin-meta-url': - specifier: ^0.17.7 - version: 0.17.7 + specifier: ^0.18.0 + version: 0.18.0 '@types/node': - specifier: ^20.10.6 - version: 20.10.6 + specifier: ^20.11.2 + version: 20.11.2 prettier: - specifier: ^3.1.1 - version: 3.1.1 + specifier: ^3.2.2 + version: 3.2.2 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.3.102 - version: 1.3.102 + specifier: ^1.3.103 + version: 1.3.103 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -110,17 +110,17 @@ importers: version: 3.5.1 devDependencies: '@chialab/esbuild-plugin-meta-url': - specifier: ^0.17.7 - version: 0.17.7 + specifier: ^0.18.0 + version: 0.18.0 '@types/node': - specifier: ^20.10.6 - version: 20.10.6 + specifier: ^20.11.2 + version: 20.11.2 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -141,7 +141,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -150,7 +150,7 @@ importers: devDependencies: tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -176,11 +176,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.10.6 - version: 20.10.6 + specifier: 20.11.2 + version: 20.11.2 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -197,8 +197,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.3.102 - version: 1.3.102 + specifier: ^1.3.103 + version: 1.3.103 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -213,23 +213,23 @@ importers: version: 1.1.3 devDependencies: '@chialab/esbuild-plugin-meta-url': - specifier: ^0.17.7 - version: 0.17.7 + specifier: ^0.18.0 + version: 0.18.0 '@types/node': - specifier: 20.10.6 - version: 20.10.6 + specifier: 20.11.2 + version: 20.11.2 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.102)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 vitest: - specifier: ^1.1.2 - version: 1.1.2(@types/node@20.10.6) + specifier: ^1.2.0 + version: 1.2.0(@types/node@20.11.2) packages: @@ -451,34 +451,34 @@ packages: prettier: 2.8.8 dev: true - /@chialab/esbuild-plugin-meta-url@0.17.7: - resolution: {integrity: sha512-f4Eg/+XSrcf9JlYUjI8IEupMOuGR7P3hMlfdbE8aMHM0+PJSIYeFV+udMZyNmSpCYfO3dpVtdulv5QDZfTvzWg==} - engines: {node: '>=13'} + /@chialab/esbuild-plugin-meta-url@0.18.0: + resolution: {integrity: sha512-4O6epI7sDfS+tQz0KEutKlpfe97u5//qz7PC25F9CCptzcyB75F023IH8+48OmiF2JeXuqHDYI3/T2jBpG+HmA==} + engines: {node: '>=18'} dependencies: - '@chialab/esbuild-rna': 0.17.8 - '@chialab/estransform': 0.17.5 - '@chialab/node-resolve': 0.17.1 + '@chialab/esbuild-rna': 0.18.0 + '@chialab/estransform': 0.18.0 + '@chialab/node-resolve': 0.18.0 mime-types: 2.1.35 dev: true - /@chialab/esbuild-rna@0.17.8: - resolution: {integrity: sha512-hovU4W5zlyMnbJjexdczpQ9mcUfFsJuv9FWUhzpXiQwPprlp5lul+frTed9s8AyVDTDq2yq3Gx2Ac411QsXYGA==} - engines: {node: '>=13'} + /@chialab/esbuild-rna@0.18.0: + resolution: {integrity: sha512-7UdivnoeYFcMMKTcM2R8EKSJsRRnVhjuS79tLtkBmcZl13ZeGoLAUxA/fLx2Godr3yG7dhyr4Fj0QfJeVjNPmQ==} + engines: {node: '>=18'} dependencies: - '@chialab/estransform': 0.17.5 - '@chialab/node-resolve': 0.17.1 + '@chialab/estransform': 0.18.0 + '@chialab/node-resolve': 0.18.0 dev: true - /@chialab/estransform@0.17.5: - resolution: {integrity: sha512-maJUFkwk0ie0L4VvDO74NDYyRvaTQAI0qmSmrms8bZxUkZ+zQZd1ByWKDCYTRwtR6AOzTvgEOl2ZvEG+OUKv/A==} - engines: {node: '>=13'} + /@chialab/estransform@0.18.0: + resolution: {integrity: sha512-GqQV36E/NZeAKjxq178i6XlbN9B6cGYYliw1grWghGo9YE4r1yO0eylYm9WaaDvvO1ozN/arVvyQ9G1TNJsRsQ==} + engines: {node: '>=18'} dependencies: '@parcel/source-map': 2.1.1 dev: true - /@chialab/node-resolve@0.17.1: - resolution: {integrity: sha512-YWaK0MKKeB0FILI6j7qiAlGoSC9MqJZDFXzlAgfOaMCbn8Feqh6njxv7mI3oVkdi7QwV6zPRaTN6hKig/NriMA==} - engines: {node: '>=13'} + /@chialab/node-resolve@0.18.0: + resolution: {integrity: sha512-eV1m70Qn9pLY9xwFmZ2FlcOzwiaUywsJ7NB/ud8VB7DouvCQtIHkQ3Om7uPX0ojXGEG1LCyO96kZkvbNTxNu0Q==} + engines: {node: '>=18'} dev: true /@clack/core@0.3.3: @@ -899,88 +899,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.3.102: - resolution: {integrity: sha512-CJDxA5Wd2cUMULj3bjx4GEoiYyyiyL8oIOu4Nhrs9X+tlg8DnkCm4nI57RJGP8Mf6BaXPIJkHX8yjcefK2RlDA==} + /@swc/core-darwin-arm64@1.3.103: + resolution: {integrity: sha512-Dqqz48mvdm/3PHPPA6YeAEofkF9H5Krgqd/baPf0dXcarzng6U9Ilv2aCtDjq7dfI9jfkVCW5zuwq98PE2GEdw==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.3.102: - resolution: {integrity: sha512-X5akDkHwk6oAer49oER0qZMjNMkLH3IOZaV1m98uXIasAGyjo5WH1MKPeMLY1sY6V6TrufzwiSwD4ds571ytcg==} + /@swc/core-darwin-x64@1.3.103: + resolution: {integrity: sha512-mhUVSCEAyFLqtrDtwr9qPbe891J8cKxq53CD873/ZsUnyasHMPyWXzTvy9qjmbYyfDIArm6fGqjF5YsDKwGGNg==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.102: - resolution: {integrity: sha512-kJH3XtZP9YQdjq/wYVBeFuiVQl4HaC4WwRrIxAHwe2OyvrwUI43dpW3LpxSggBnxXcVCXYWf36sTnv8S75o2Gw==} + /@swc/core-linux-arm-gnueabihf@1.3.103: + resolution: {integrity: sha512-rYLmwxr01ZHOI6AzooqwB0DOkMm0oU8Jznk6uutV1lHgcwyxsNiC1Css8yf77Xr/sYTvKvuTfBjThqa5H716pA==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.3.102: - resolution: {integrity: sha512-flQP2WDyCgO24WmKA1wjjTx+xfCmavUete2Kp6yrM+631IHLGnr17eu7rYJ/d4EnDBId/ytMyrnWbTVkaVrpbQ==} + /@swc/core-linux-arm64-gnu@1.3.103: + resolution: {integrity: sha512-w+5XFpUqxiAGUBiyRyYR28Ghddp5uVyo+dHAkCnY1u3V6RsZkY3vRwmoXT7/HxVGV7csodJ1P9Cp9VaRnNvTKA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.3.102: - resolution: {integrity: sha512-bQEQSnC44DyoIGLw1+fNXKVGoCHi7eJOHr8BdH0y1ooy9ArskMjwobBFae3GX4T1AfnrTaejyr0FvLYIb0Zkog==} + /@swc/core-linux-arm64-musl@1.3.103: + resolution: {integrity: sha512-lS5p8ewAIar7adX6t0OrkICTcw92PXrn3ZmYyG5hvfjUg4RPQFjMfFMDQSne32ZJhGXHBf0LVm1R8wHwkcpwgA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.3.102: - resolution: {integrity: sha512-dFvnhpI478svQSxqISMt00MKTDS0e4YtIr+ioZDG/uJ/q+RpcNy3QI2KMm05Fsc8Y0d4krVtvCKWgfUMsJZXAg==} + /@swc/core-linux-x64-gnu@1.3.103: + resolution: {integrity: sha512-Lf2cHDoEPNB6TwexHBEZCsAO2C7beb0YljhtQS+QfjWLLVqCiwt5LRCPuKN2Bav7el9KZXOI5baXedUeFj0oFg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.102: - resolution: {integrity: sha512-+a0M3CvjeIRNA/jTCzWEDh2V+mhKGvLreHOL7J97oULZy5yg4gf7h8lQX9J8t9QLbf6fsk+0F8bVH1Ie/PbXjA==} + /@swc/core-linux-x64-musl@1.3.103: + resolution: {integrity: sha512-HR1Y9iiLEO3F49P47vjbHczBza9RbdXWRWC8NpcOcGJ4Wnw0c2DLWAh416fGH3VYCF/19EuglLEXhvSj0NXGuA==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.102: - resolution: {integrity: sha512-w76JWLjkZNOfkB25nqdWUNCbt0zJ41CnWrJPZ+LxEai3zAnb2YtgB/cCIrwxDebRuMgE9EJXRj7gDDaTEAMOOQ==} + /@swc/core-win32-arm64-msvc@1.3.103: + resolution: {integrity: sha512-3/GfROD1GPyf2hi6R0l4iZ5nrrKG8IU29hYhZCb7r0ZqhL/58kktVPlkib8X/EAJI8xbhM/NMl76h8ElrnyH5w==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.102: - resolution: {integrity: sha512-vlDb09HiGqKwz+2cxDS9T5/461ipUQBplvuhW+cCbzzGuPq8lll2xeyZU0N1E4Sz3MVdSPx1tJREuRvlQjrwNg==} + /@swc/core-win32-ia32-msvc@1.3.103: + resolution: {integrity: sha512-9ejEFjfgPi0ibNmtuiRbYq9p4RRV6oH1DN9XjkYM8zh2qHlpZHKQZ3n4eHS0VtJO4rEGZxL8ebcnTNs62wqJig==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.102: - resolution: {integrity: sha512-E/jfSD7sShllxBwwgDPeXp1UxvIqehj/ShSUqq1pjR/IDRXngcRSXKJK92mJkNFY7suH6BcCWwzrxZgkO7sWmw==} + /@swc/core-win32-x64-msvc@1.3.103: + resolution: {integrity: sha512-/1RvaOmZolXurWAUdnELYynVlFUiT0hj3PyTPoo+YK6+KV7er4EqUalRsoUf3zzGepQuhKFZFDpQn6Xi9kJX1A==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.3.102: - resolution: {integrity: sha512-OAjNLY/f6QWKSDzaM3bk31A+OYHu6cPa9P/rFIx8X5d24tHXUpRiiq6/PYI6SQRjUPlB72GjsjoEU8F+ALadHg==} + /@swc/core@1.3.103: + resolution: {integrity: sha512-PYtt8KzRXIFDwxeD7BA9ylmXNQ4hRVcmDVuAmL3yvL9rgx7Tn3qn6T37wiMVZnP1OjqGyhuHRPNycd+ssr+byw==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -992,16 +992,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.3.102 - '@swc/core-darwin-x64': 1.3.102 - '@swc/core-linux-arm-gnueabihf': 1.3.102 - '@swc/core-linux-arm64-gnu': 1.3.102 - '@swc/core-linux-arm64-musl': 1.3.102 - '@swc/core-linux-x64-gnu': 1.3.102 - '@swc/core-linux-x64-musl': 1.3.102 - '@swc/core-win32-arm64-msvc': 1.3.102 - '@swc/core-win32-ia32-msvc': 1.3.102 - '@swc/core-win32-x64-msvc': 1.3.102 + '@swc/core-darwin-arm64': 1.3.103 + '@swc/core-darwin-x64': 1.3.103 + '@swc/core-linux-arm-gnueabihf': 1.3.103 + '@swc/core-linux-arm64-gnu': 1.3.103 + '@swc/core-linux-arm64-musl': 1.3.103 + '@swc/core-linux-x64-gnu': 1.3.103 + '@swc/core-linux-x64-musl': 1.3.103 + '@swc/core-win32-arm64-msvc': 1.3.103 + '@swc/core-win32-ia32-msvc': 1.3.103 + '@swc/core-win32-x64-msvc': 1.3.103 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1021,8 +1021,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.10.6: - resolution: {integrity: sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==} + /@types/node@20.11.2: + resolution: {integrity: sha512-cZShBaVa+UO1LjWWBPmWRR4+/eY/JR/UIEcDlVsw3okjWEu+rB7/mH6X3B/L+qJVHDLjk9QW/y2upp9wp1yDXA==} dependencies: undici-types: 5.26.5 dev: true @@ -1035,38 +1035,38 @@ packages: resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} dev: true - /@vitest/expect@1.1.2: - resolution: {integrity: sha512-1aOqDLbgkvJ2e1nLQ/5dkUX54V1Alwt2e6M2u03Oy7wGbDYHV5ZLKm1XbcT45h8TMXtc2q/BPtkeIjyRv1oDHQ==} + /@vitest/expect@1.2.0: + resolution: {integrity: sha512-H+2bHzhyvgp32o7Pgj2h9RTHN0pgYaoi26Oo3mE+dCi1PAqV31kIIVfTbqMO3Bvshd5mIrJLc73EwSRrbol9Lw==} dependencies: - '@vitest/spy': 1.1.2 - '@vitest/utils': 1.1.2 + '@vitest/spy': 1.2.0 + '@vitest/utils': 1.2.0 chai: 4.3.10 dev: true - /@vitest/runner@1.1.2: - resolution: {integrity: sha512-oTqXCGtZzu9EaXq9cO/QDGnC721iryuTPs5rLyVZUJsdm33IQeIOwTRIWUB7EYFwpJsI+qMiCiuGZS49+DP5hA==} + /@vitest/runner@1.2.0: + resolution: {integrity: sha512-vaJkDoQaNUTroT70OhM0NPznP7H3WyRwt4LvGwCVYs/llLaqhoSLnlIhUClZpbF5RgAee29KRcNz0FEhYcgxqA==} dependencies: - '@vitest/utils': 1.1.2 + '@vitest/utils': 1.2.0 p-limit: 5.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@1.1.2: - resolution: {integrity: sha512-hXXd5KjURGt6GCrmw55A+PNIlrOaE6x6KcdEANXac76xmvVbJZXSiNVJ1JuMCiyvLLTzdpPnrgWyCX9/CepFCQ==} + /@vitest/snapshot@1.2.0: + resolution: {integrity: sha512-P33EE7TrVgB3HDLllrjK/GG6WSnmUtWohbwcQqmm7TAk9AVHpdgf7M3F3qRHKm6vhr7x3eGIln7VH052Smo6Kw==} dependencies: magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.1.2: - resolution: {integrity: sha512-1Nn70K3oY00lhThDXsVQxjslUvJij1YQDzH/4FMxMLgjYxB5u4Aw4yXeICNSSap04wyV2dtGL3RqdBGwoR3sPA==} + /@vitest/spy@1.2.0: + resolution: {integrity: sha512-MNxSAfxUaCeowqyyGwC293yZgk7cECZU9wGb8N1pYQ0yOn/SIr8t0l9XnGRdQZvNV/ZHBYu6GO/W3tj5K3VN1Q==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.1.2: - resolution: {integrity: sha512-QrXfDieptshDkTkXnA+HmlVQto1h0jengbkSKcJjlbCMeXbSCr3AcALPPzozRQxEOKvFjqx9WHjljz62uxrGew==} + /@vitest/utils@1.2.0: + resolution: {integrity: sha512-FyD5bpugsXlwVpTcGLDf3wSPYy8g541fQt14qtzo8mJ4LdEpDKZ9mQy2+qdJm2TZRpjY5JLXihXCgIxiRJgi5g==} dependencies: diff-sequences: 29.6.3 estree-walker: 3.0.3 @@ -2691,8 +2691,8 @@ packages: hasBin: true dev: true - /prettier@3.1.1: - resolution: {integrity: sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==} + /prettier@3.2.2: + resolution: {integrity: sha512-HTByuKZzw7utPiDO523Tt2pLtEyK7OibUD9suEJQrPUCYQqrHr74GGX6VidMrovbf/I50mPqr8j/II6oBAuc5A==} engines: {node: '>=14'} hasBin: true dev: true @@ -3221,7 +3221,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.1(@swc/core@1.3.102)(typescript@5.3.3): + /tsup@8.0.1(@swc/core@1.3.103)(typescript@5.3.3): resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} engines: {node: '>=18'} hasBin: true @@ -3240,7 +3240,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.3.102 + '@swc/core': 1.3.103 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3432,8 +3432,8 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.1.2(@types/node@20.10.6): - resolution: {integrity: sha512-2S3Y7T68PMrBbFS2H9Oda2GeordkIU5gLx2toubxPUcFZ+LKZ9L6U69pLtofotwQUrb3NcUImP3fl9GfLplebA==} + /vite-node@1.2.0(@types/node@20.11.2): + resolution: {integrity: sha512-ETnQTHeAbbOxl7/pyBck9oAPZZZo+kYnFt1uQDD+hPReOc+wCjXw4r4jHriBRuVDB5isHmPXxrfc1yJnfBERqg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -3441,7 +3441,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.10.6) + vite: 5.0.10(@types/node@20.11.2) transitivePeerDependencies: - '@types/node' - less @@ -3453,7 +3453,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.10.6): + /vite@5.0.10(@types/node@20.11.2): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3481,7 +3481,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.10.6 + '@types/node': 20.11.2 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3489,8 +3489,8 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.1.2(@types/node@20.10.6): - resolution: {integrity: sha512-nEw58z0PFBARwo3hWx6aKmI0Rob2avL9Mt2IYW+5mH5dS4S39J+VLH9aG8x6KZIgyegdE1p7/3JjZ93FzVCsoQ==} + /vitest@1.2.0(@types/node@20.11.2): + resolution: {integrity: sha512-Ixs5m7BjqvLHXcibkzKRQUvD/XLw0E3rvqaCMlrm/0LMsA0309ZqYvTlPzkhh81VlEyVZXFlwWnkhb6/UMtcaQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -3514,12 +3514,12 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.10.6 - '@vitest/expect': 1.1.2 - '@vitest/runner': 1.1.2 - '@vitest/snapshot': 1.1.2 - '@vitest/spy': 1.1.2 - '@vitest/utils': 1.1.2 + '@types/node': 20.11.2 + '@vitest/expect': 1.2.0 + '@vitest/runner': 1.2.0 + '@vitest/snapshot': 1.2.0 + '@vitest/spy': 1.2.0 + '@vitest/utils': 1.2.0 acorn-walk: 8.3.1 cac: 6.7.14 chai: 4.3.10 @@ -3533,8 +3533,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.8.1 - vite: 5.0.10(@types/node@20.10.6) - vite-node: 1.1.2(@types/node@20.10.6) + vite: 5.0.10(@types/node@20.11.2) + vite-node: 1.2.0(@types/node@20.11.2) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From a0044a2faed56cb6dbc1fa8d5aadbb8379004525 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:32:17 +0000 Subject: [PATCH 045/290] Bump deps --- docs/package.json | 4 +- docs/pnpm-lock.yaml | 230 +++++++++++++++++------------ package.json | 8 +- packages/commands/package.json | 4 +- packages/core/package.json | 6 +- packages/ui/package.json | 2 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 260 ++++++++++++++++----------------- 8 files changed, 283 insertions(+), 239 deletions(-) diff --git a/docs/package.json b/docs/package.json index c1d33ff..a632377 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,8 +8,8 @@ }, "devDependencies": { "flexsearch": "^0.7.43", - "vitepress": "1.0.0-rc.37", + "vitepress": "1.0.0-rc.41", "vitepress-plugin-search": "1.0.4-alpha.22", - "vue": "^3.4.14" + "vue": "^3.4.15" } } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 4b5aa7d..cbe41f6 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -12,14 +12,14 @@ importers: specifier: ^0.7.43 version: 0.7.43 vitepress: - specifier: 1.0.0-rc.37 - version: 1.0.0-rc.37(@algolia/client-search@4.22.1)(search-insights@2.13.0) + specifier: 1.0.0-rc.41 + version: 1.0.0-rc.41(@algolia/client-search@4.22.1)(search-insights@2.13.0) vitepress-plugin-search: specifier: 1.0.4-alpha.22 - version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.37)(vue@3.4.14) + version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.41)(vue@3.4.15) vue: - specifier: ^3.4.14 - version: 3.4.14 + specifier: ^3.4.15 + version: 3.4.15 packages: @@ -542,6 +542,16 @@ packages: dev: true optional: true + /@shikijs/core@1.0.0-beta.6: + resolution: {integrity: sha512-dHbpxvRz8G3NcEWLYh3TkVwqVswqDyHKHqWi+7c72hm+yIumYJwdDuQIEjT4z5qxNzyzKQGnEeb9b5jWPdy3vA==} + dev: true + + /@shikijs/transformers@1.0.0-beta.6: + resolution: {integrity: sha512-VuZ+drxEUO67uEEkpy2RTODjuO3oI49JW5JlNeqR7dHACbaybxKMwuf3g0EqqQ9ZpJ40YhdXy3GjCsohs6dSDw==} + dependencies: + shiki: 1.0.0-beta.6 + dev: true + /@types/estree@1.0.5: resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} dev: true @@ -576,107 +586,130 @@ packages: resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} dev: true - /@vitejs/plugin-vue@5.0.3(vite@5.0.11)(vue@3.4.14): + /@vitejs/plugin-vue@5.0.3(vite@5.0.12)(vue@3.4.15): resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.0.11 - vue: 3.4.14 + vite: 5.0.12 + vue: 3.4.15 dev: true - /@vue/compiler-core@3.4.14: - resolution: {integrity: sha512-ro4Zzl/MPdWs7XwxT7omHRxAjMbDFRZEEjD+2m3NBf8YzAe3HuoSEZosXQo+m1GQ1G3LQ1LdmNh1RKTYe+ssEg==} + /@vue/compiler-core@3.4.15: + resolution: {integrity: sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==} dependencies: '@babel/parser': 7.23.6 - '@vue/shared': 3.4.14 + '@vue/shared': 3.4.15 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.0.2 dev: true - /@vue/compiler-dom@3.4.14: - resolution: {integrity: sha512-nOZTY+veWNa0DKAceNWxorAbWm0INHdQq7cejFaWM1WYnoNSJbSEKYtE7Ir6lR/+mo9fttZpPVI9ZFGJ1juUEQ==} + /@vue/compiler-dom@3.4.15: + resolution: {integrity: sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==} dependencies: - '@vue/compiler-core': 3.4.14 - '@vue/shared': 3.4.14 + '@vue/compiler-core': 3.4.15 + '@vue/shared': 3.4.15 dev: true - /@vue/compiler-sfc@3.4.14: - resolution: {integrity: sha512-1vHc9Kv1jV+YBZC/RJxQJ9JCxildTI+qrhtDh6tPkR1O8S+olBUekimY0km0ZNn8nG1wjtFAe9XHij+YLR8cRQ==} + /@vue/compiler-sfc@3.4.15: + resolution: {integrity: sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==} dependencies: '@babel/parser': 7.23.6 - '@vue/compiler-core': 3.4.14 - '@vue/compiler-dom': 3.4.14 - '@vue/compiler-ssr': 3.4.14 - '@vue/shared': 3.4.14 + '@vue/compiler-core': 3.4.15 + '@vue/compiler-dom': 3.4.15 + '@vue/compiler-ssr': 3.4.15 + '@vue/shared': 3.4.15 estree-walker: 2.0.2 magic-string: 0.30.5 postcss: 8.4.33 source-map-js: 1.0.2 dev: true - /@vue/compiler-ssr@3.4.14: - resolution: {integrity: sha512-bXT6+oAGlFjTYVOTtFJ4l4Jab1wjsC0cfSfOe2B4Z0N2vD2zOBSQ9w694RsCfhjk+bC2DY5Gubb1rHZVii107Q==} + /@vue/compiler-ssr@3.4.15: + resolution: {integrity: sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==} dependencies: - '@vue/compiler-dom': 3.4.14 - '@vue/shared': 3.4.14 + '@vue/compiler-dom': 3.4.15 + '@vue/shared': 3.4.15 dev: true - /@vue/devtools-api@6.5.1: - resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} + /@vue/devtools-api@7.0.14: + resolution: {integrity: sha512-TluWR9qZ6aO11bwtYK8+fzXxBqLfsE0mWZz1q/EQBmO9k82Cm6deieLwNNXjNFJz7xutazoia5Qa+zTYkPPOfw==} + dependencies: + '@vue/devtools-kit': 7.0.14 dev: true - /@vue/reactivity@3.4.14: - resolution: {integrity: sha512-xRYwze5Q4tK7tT2J4uy4XLhK/AIXdU5EBUu9PLnIHcOKXO0uyXpNNMzlQKuq7B+zwtq6K2wuUL39pHA6ZQzObw==} + /@vue/devtools-kit@7.0.14: + resolution: {integrity: sha512-wAAJazr4hI0aVRpgWOCVPw+NzMQdthhnprHHIg4njp1MkKrpCNGQ7MtQbZF1AltAA7xpMCGyyt+0kYH0FqTiPg==} dependencies: - '@vue/shared': 3.4.14 + '@vue/devtools-schema': 7.0.14 + '@vue/devtools-shared': 7.0.14 + hookable: 5.5.3 + mitt: 3.0.1 + perfect-debounce: 1.0.0 + speakingurl: 14.0.1 + dev: true + + /@vue/devtools-schema@7.0.14: + resolution: {integrity: sha512-tpUeCLVrdHX+KzWMLTAwx/vAPFbo6jAUi7sr6Q+0mBIqIVSSIxNr5wEhegiFvYva+OtDeM2OrT+f7/X/5bvZNg==} dev: true - /@vue/runtime-core@3.4.14: - resolution: {integrity: sha512-qu+NMkfujCoZL6cfqK5NOfxgXJROSlP2ZPs4CTcVR+mLrwl4TtycF5Tgo0QupkdBL+2kigc6EsJlTcuuZC1NaQ==} + /@vue/devtools-shared@7.0.14: + resolution: {integrity: sha512-79RP1NDakBVWou9rDpVnT1WMjTbL1lJKm6YEOodjQ0dq5ehf0wsRbeYDhgAlnjehWRzTq5GAYFBFUPYBs0/QpA==} dependencies: - '@vue/reactivity': 3.4.14 - '@vue/shared': 3.4.14 + rfdc: 1.3.1 dev: true - /@vue/runtime-dom@3.4.14: - resolution: {integrity: sha512-B85XmcR4E7XsirEHVqhmy4HPbRT9WLFWV9Uhie3OapV9m1MEN9+Er6hmUIE6d8/l2sUygpK9RstFM2bmHEUigA==} + /@vue/reactivity@3.4.15: + resolution: {integrity: sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==} dependencies: - '@vue/runtime-core': 3.4.14 - '@vue/shared': 3.4.14 + '@vue/shared': 3.4.15 + dev: true + + /@vue/runtime-core@3.4.15: + resolution: {integrity: sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==} + dependencies: + '@vue/reactivity': 3.4.15 + '@vue/shared': 3.4.15 + dev: true + + /@vue/runtime-dom@3.4.15: + resolution: {integrity: sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==} + dependencies: + '@vue/runtime-core': 3.4.15 + '@vue/shared': 3.4.15 csstype: 3.1.3 dev: true - /@vue/server-renderer@3.4.14(vue@3.4.14): - resolution: {integrity: sha512-pwSKXQfYdJBTpvWHGEYI+akDE18TXAiLcGn+Q/2Fj8wQSHWztoo7PSvfMNqu6NDhp309QXXbPFEGCU5p85HqkA==} + /@vue/server-renderer@3.4.15(vue@3.4.15): + resolution: {integrity: sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==} peerDependencies: - vue: 3.4.14 + vue: 3.4.15 dependencies: - '@vue/compiler-ssr': 3.4.14 - '@vue/shared': 3.4.14 - vue: 3.4.14 + '@vue/compiler-ssr': 3.4.15 + '@vue/shared': 3.4.15 + vue: 3.4.15 dev: true - /@vue/shared@3.4.14: - resolution: {integrity: sha512-nmi3BtLpvqXAWoRZ6HQ+pFJOHBU4UnH3vD3opgmwXac7vhaHKA9nj1VeGjMggdB9eLtW83eHyPCmOU1qzdsC7Q==} + /@vue/shared@3.4.15: + resolution: {integrity: sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==} dev: true - /@vueuse/core@10.7.2(vue@3.4.14): + /@vueuse/core@10.7.2(vue@3.4.15): resolution: {integrity: sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ==} dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.7.2 - '@vueuse/shared': 10.7.2(vue@3.4.14) - vue-demi: 0.14.6(vue@3.4.14) + '@vueuse/shared': 10.7.2(vue@3.4.15) + vue-demi: 0.14.6(vue@3.4.15) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.14): + /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.15): resolution: {integrity: sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==} peerDependencies: async-validator: '*' @@ -717,10 +750,10 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.7.2(vue@3.4.14) - '@vueuse/shared': 10.7.2(vue@3.4.14) + '@vueuse/core': 10.7.2(vue@3.4.15) + '@vueuse/shared': 10.7.2(vue@3.4.15) focus-trap: 7.5.4 - vue-demi: 0.14.6(vue@3.4.14) + vue-demi: 0.14.6(vue@3.4.15) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -730,10 +763,10 @@ packages: resolution: {integrity: sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ==} dev: true - /@vueuse/shared@10.7.2(vue@3.4.14): + /@vueuse/shared@10.7.2(vue@3.4.15): resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} dependencies: - vue-demi: 0.14.6(vue@3.4.14) + vue-demi: 0.14.6(vue@3.4.15) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -833,6 +866,10 @@ packages: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} dev: true + /hookable@5.5.3: + resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} + dev: true + /linkify-it@4.0.1: resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==} dependencies: @@ -869,12 +906,20 @@ packages: resolution: {integrity: sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==} dev: true + /mitt@3.0.1: + resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==} + dev: true + /nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true dev: true + /perfect-debounce@1.0.0: + resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} + dev: true + /picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true @@ -892,6 +937,10 @@ packages: resolution: {integrity: sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==} dev: true + /rfdc@1.3.1: + resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==} + dev: true + /rollup@4.9.5: resolution: {integrity: sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -919,20 +968,10 @@ packages: resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} dev: true - /shikiji-core@0.9.19: - resolution: {integrity: sha512-AFJu/vcNT21t0e6YrfadZ+9q86gvPum6iywRyt1OtIPjPFe25RQnYJyxHQPMLKCCWA992TPxmEmbNcOZCAJclw==} - dev: true - - /shikiji-transformers@0.9.19: - resolution: {integrity: sha512-lGLI7Z8frQrIBbhZ74/eiJtxMoCQRbpaHEB+gcfvdIy+ZFaAtXncJGnc52932/UET+Y4GyKtwwC/vjWUCp+c/Q==} - dependencies: - shikiji: 0.9.19 - dev: true - - /shikiji@0.9.19: - resolution: {integrity: sha512-Kw2NHWktdcdypCj1GkKpXH4o6Vxz8B8TykPlPuLHOGSV8VkhoCLcFOH4k19K4LXAQYRQmxg+0X/eM+m2sLhAkg==} + /shiki@1.0.0-beta.6: + resolution: {integrity: sha512-lS60hZmzma3ZDVVjk0k33zwUgsB/12QfWNAsKy1gsGpG211JNfAdMN+FBGs4qTTxUNLqfS7nxmpckqDadIwiWQ==} dependencies: - shikiji-core: 0.9.19 + '@shikijs/core': 1.0.0-beta.6 dev: true /source-map-js@1.0.2: @@ -940,6 +979,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /speakingurl@14.0.1: + resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==} + engines: {node: '>=0.10.0'} + dev: true + /tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} dev: true @@ -953,8 +997,8 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /vite@5.0.11: - resolution: {integrity: sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==} + /vite@5.0.12: + resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -988,7 +1032,7 @@ packages: fsevents: 2.3.3 dev: true - /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.37)(vue@3.4.14): + /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.41)(vue@3.4.15): resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: @@ -1001,12 +1045,12 @@ packages: flexsearch: 0.7.43 glob-to-regexp: 0.4.1 markdown-it: 13.0.2 - vitepress: 1.0.0-rc.37(@algolia/client-search@4.22.1)(search-insights@2.13.0) - vue: 3.4.14 + vitepress: 1.0.0-rc.41(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vue: 3.4.15 dev: true - /vitepress@1.0.0-rc.37(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-Z2X+M0id+bUdxcWxvFRUzfLyV2GtPWRcejLSMGOHRiwA1DV/dNmELKJ3U9D1HBYQK0FBzunpuQD0a2jZ7FZvJA==} + /vitepress@1.0.0-rc.41(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-PAEoIIc9J//k/Wg39C6k86hZpXPmLZjRiTBwieDNeYGdevD7xr5Ve8o1W/w+e9dtyQMkuvzgianEamXDX3aj7g==} hasBin: true peerDependencies: markdown-it-mathjax3: ^4.3.2 @@ -1019,19 +1063,19 @@ packages: dependencies: '@docsearch/css': 3.5.2 '@docsearch/js': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) + '@shikijs/core': 1.0.0-beta.6 + '@shikijs/transformers': 1.0.0-beta.6 '@types/markdown-it': 13.0.7 - '@vitejs/plugin-vue': 5.0.3(vite@5.0.11)(vue@3.4.14) - '@vue/devtools-api': 6.5.1 - '@vueuse/core': 10.7.2(vue@3.4.14) - '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.14) + '@vitejs/plugin-vue': 5.0.3(vite@5.0.12)(vue@3.4.15) + '@vue/devtools-api': 7.0.14 + '@vueuse/core': 10.7.2(vue@3.4.15) + '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.15) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 6.3.0 - shikiji: 0.9.19 - shikiji-core: 0.9.19 - shikiji-transformers: 0.9.19 - vite: 5.0.11 - vue: 3.4.14 + shiki: 1.0.0-beta.6 + vite: 5.0.12 + vue: 3.4.15 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -1060,7 +1104,7 @@ packages: - universal-cookie dev: true - /vue-demi@0.14.6(vue@3.4.14): + /vue-demi@0.14.6(vue@3.4.15): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -1072,20 +1116,20 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.14 + vue: 3.4.15 dev: true - /vue@3.4.14: - resolution: {integrity: sha512-Rop5Al/ZcBbBz+KjPZaZDgHDX0kUP4duEzDbm+1o91uxYUNmJrZSBuegsNIJvUGy+epLevNRNhLjm08VKTgGyw==} + /vue@3.4.15: + resolution: {integrity: sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.14 - '@vue/compiler-sfc': 3.4.14 - '@vue/runtime-dom': 3.4.14 - '@vue/server-renderer': 3.4.14(vue@3.4.14) - '@vue/shared': 3.4.14 + '@vue/compiler-dom': 3.4.15 + '@vue/compiler-sfc': 3.4.15 + '@vue/runtime-dom': 3.4.15 + '@vue/server-renderer': 3.4.15(vue@3.4.15) + '@vue/shared': 3.4.15 dev: true diff --git a/package.json b/package.json index 71c6eda..6dee00d 100644 --- a/package.json +++ b/package.json @@ -35,10 +35,10 @@ ], "devDependencies": { "@changesets/cli": "2.27.1", - "nodemon": "^3.0.2", - "prettier": "^3.2.2", - "turbo": "^1.11.3", - "vitest": "^1.2.0" + "nodemon": "^3.0.3", + "prettier": "^3.2.5", + "turbo": "^1.12.2", + "vitest": "^1.2.2" }, "packageManager": "pnpm@8.7.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 84df2e9..f628b3a 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,8 +33,8 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.2", - "prettier": "^3.2.2", + "@types/node": "^20.11.16", + "prettier": "^3.2.5", "tsup": "^8.0.1", "typescript": "^5.3.3" }, diff --git a/packages/core/package.json b/packages/core/package.json index 2c74402..a1dcac0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,11 +29,11 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.3.103", + "@swc/core": "^1.4.0", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", - "smol-toml": "^1.1.3", + "smol-toml": "^1.1.4", "tiny-updater": "^3.5.1" }, "scripts": { @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.2", + "@types/node": "^20.11.16", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 8029948..369ddd4 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.1", "typescript": "^5.3.3", - "@types/node": "20.11.2" + "@types/node": "20.11.16" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index aac2211..88abf01 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "20.11.2", + "@types/node": "20.11.16", "jiti": "^1.21.0", "tsup": "^8.0.1", "typescript": "^5.3.3", - "vitest": "^1.2.0" + "vitest": "^1.2.2" }, "publishConfig": { "access": "public" @@ -76,10 +76,10 @@ "@clack/core": "0.3.3", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.3.103", + "@swc/core": "^1.4.0", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", - "smol-toml": "^1.1.3" + "smol-toml": "^1.1.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87bf97a..d5a7656 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,17 +12,17 @@ importers: specifier: 2.27.1 version: 2.27.1 nodemon: - specifier: ^3.0.2 - version: 3.0.2 + specifier: ^3.0.3 + version: 3.0.3 prettier: - specifier: ^3.2.2 - version: 3.2.2 + specifier: ^3.2.5 + version: 3.2.5 turbo: - specifier: ^1.11.3 - version: 1.11.3 + specifier: ^1.12.2 + version: 1.12.2 vitest: - specifier: ^1.2.0 - version: 1.2.0(@types/node@20.11.2) + specifier: ^1.2.2 + version: 1.2.2(@types/node@20.11.16) packages/commands: dependencies: @@ -55,14 +55,14 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.2 - version: 20.11.2 + specifier: ^20.11.16 + version: 20.11.16 prettier: - specifier: ^3.2.2 - version: 3.2.2 + specifier: ^3.2.5 + version: 3.2.5 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.3.103 - version: 1.3.103 + specifier: ^1.4.0 + version: 1.4.0 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -103,8 +103,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 smol-toml: - specifier: ^1.1.3 - version: 1.1.3 + specifier: ^1.1.4 + version: 1.1.4 tiny-updater: specifier: ^3.5.1 version: 3.5.1 @@ -113,14 +113,14 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.2 - version: 20.11.2 + specifier: ^20.11.16 + version: 20.11.16 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -141,7 +141,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -150,7 +150,7 @@ importers: devDependencies: tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -176,11 +176,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.2 - version: 20.11.2 + specifier: 20.11.16 + version: 20.11.16 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -197,8 +197,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.3.103 - version: 1.3.103 + specifier: ^1.4.0 + version: 1.4.0 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -209,27 +209,27 @@ importers: specifier: ^1.0.0 version: 1.0.0 smol-toml: - specifier: ^1.1.3 - version: 1.1.3 + specifier: ^1.1.4 + version: 1.1.4 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: 20.11.2 - version: 20.11.2 + specifier: 20.11.16 + version: 20.11.16 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.3.103)(typescript@5.3.3) + version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 vitest: - specifier: ^1.2.0 - version: 1.2.0(@types/node@20.11.2) + specifier: ^1.2.2 + version: 1.2.2(@types/node@20.11.16) packages: @@ -899,88 +899,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.3.103: - resolution: {integrity: sha512-Dqqz48mvdm/3PHPPA6YeAEofkF9H5Krgqd/baPf0dXcarzng6U9Ilv2aCtDjq7dfI9jfkVCW5zuwq98PE2GEdw==} + /@swc/core-darwin-arm64@1.4.0: + resolution: {integrity: sha512-UTJ/Vz+s7Pagef6HmufWt6Rs0aUu+EJF4Pzuwvr7JQQ5b1DZeAAUeUtkUTFx/PvCbM8Xfw4XdKBUZfrIKCfW8A==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.3.103: - resolution: {integrity: sha512-mhUVSCEAyFLqtrDtwr9qPbe891J8cKxq53CD873/ZsUnyasHMPyWXzTvy9qjmbYyfDIArm6fGqjF5YsDKwGGNg==} + /@swc/core-darwin-x64@1.4.0: + resolution: {integrity: sha512-f8v58u2GsGak8EtZFN9guXqE0Ep10Suny6xriaW2d8FGqESPyNrnBzli3aqkSeQk5gGqu2zJ7WiiKp3XoUOidA==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.3.103: - resolution: {integrity: sha512-rYLmwxr01ZHOI6AzooqwB0DOkMm0oU8Jznk6uutV1lHgcwyxsNiC1Css8yf77Xr/sYTvKvuTfBjThqa5H716pA==} + /@swc/core-linux-arm-gnueabihf@1.4.0: + resolution: {integrity: sha512-q2KAkBzmPcTnRij/Y1fgHCKAGevUX/H4uUESrw1J5gmUg9Qip6onKV80lTumA1/aooGJ18LOsB31qdbwmZk9OA==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.3.103: - resolution: {integrity: sha512-w+5XFpUqxiAGUBiyRyYR28Ghddp5uVyo+dHAkCnY1u3V6RsZkY3vRwmoXT7/HxVGV7csodJ1P9Cp9VaRnNvTKA==} + /@swc/core-linux-arm64-gnu@1.4.0: + resolution: {integrity: sha512-SknGu96W0mzHtLHWm+62fk5+Omp9fMPFO7AWyGFmz2tr8EgRRXtTSrBUnWhAbgcalnhen48GsvtMdxf1KNputg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.3.103: - resolution: {integrity: sha512-lS5p8ewAIar7adX6t0OrkICTcw92PXrn3ZmYyG5hvfjUg4RPQFjMfFMDQSne32ZJhGXHBf0LVm1R8wHwkcpwgA==} + /@swc/core-linux-arm64-musl@1.4.0: + resolution: {integrity: sha512-/k3TDvpBRMDNskHooNN1KqwUhcwkfBlIYxRTnJvsfT2C7My4pffR+4KXmt0IKynlTTbCdlU/4jgX4801FSuliw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.3.103: - resolution: {integrity: sha512-Lf2cHDoEPNB6TwexHBEZCsAO2C7beb0YljhtQS+QfjWLLVqCiwt5LRCPuKN2Bav7el9KZXOI5baXedUeFj0oFg==} + /@swc/core-linux-x64-gnu@1.4.0: + resolution: {integrity: sha512-GYsTMvNt5+WTVlwwQzOOWsPMw6P/F41u5PGHWmfev8Nd4QJ1h3rWPySKk4mV42IJwH9MgQCVSl3ygwNqwl6kFg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.3.103: - resolution: {integrity: sha512-HR1Y9iiLEO3F49P47vjbHczBza9RbdXWRWC8NpcOcGJ4Wnw0c2DLWAh416fGH3VYCF/19EuglLEXhvSj0NXGuA==} + /@swc/core-linux-x64-musl@1.4.0: + resolution: {integrity: sha512-jGVPdM/VwF7kK/uYRW5N6FwzKf/FnDjGIR3RPvQokjYJy7Auk+3Oj21C0Jev7sIT9RYnO/TrFEoEozKeD/z2Qw==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.3.103: - resolution: {integrity: sha512-3/GfROD1GPyf2hi6R0l4iZ5nrrKG8IU29hYhZCb7r0ZqhL/58kktVPlkib8X/EAJI8xbhM/NMl76h8ElrnyH5w==} + /@swc/core-win32-arm64-msvc@1.4.0: + resolution: {integrity: sha512-biHYm1AronEKlt47O/H8sSOBM2BKXMmWT+ApvlxUw50m1RGNnVnE0bgY7tylFuuSiWyXsQPJbmUV708JqORXVg==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.3.103: - resolution: {integrity: sha512-9ejEFjfgPi0ibNmtuiRbYq9p4RRV6oH1DN9XjkYM8zh2qHlpZHKQZ3n4eHS0VtJO4rEGZxL8ebcnTNs62wqJig==} + /@swc/core-win32-ia32-msvc@1.4.0: + resolution: {integrity: sha512-TL5L2tFQb19kJwv6+elToGBj74QXCn9j+hZfwQatvZEJRA5rDK16eH6oAE751dGUArhnWlW3Vj65hViPvTuycw==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.3.103: - resolution: {integrity: sha512-/1RvaOmZolXurWAUdnELYynVlFUiT0hj3PyTPoo+YK6+KV7er4EqUalRsoUf3zzGepQuhKFZFDpQn6Xi9kJX1A==} + /@swc/core-win32-x64-msvc@1.4.0: + resolution: {integrity: sha512-e2xVezU7XZ2Stzn4i7TOQe2Kn84oYdG0M3A7XI7oTdcpsKCcKwgiMoroiAhqCv+iN20KNqhnWwJiUiTj/qN5AA==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.3.103: - resolution: {integrity: sha512-PYtt8KzRXIFDwxeD7BA9ylmXNQ4hRVcmDVuAmL3yvL9rgx7Tn3qn6T37wiMVZnP1OjqGyhuHRPNycd+ssr+byw==} + /@swc/core@1.4.0: + resolution: {integrity: sha512-wc5DMI5BJftnK0Fyx9SNJKkA0+BZSJQx8430yutWmsILkHMBD3Yd9GhlMaxasab9RhgKqZp7Ht30hUYO5ZDvQg==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -992,16 +992,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.3.103 - '@swc/core-darwin-x64': 1.3.103 - '@swc/core-linux-arm-gnueabihf': 1.3.103 - '@swc/core-linux-arm64-gnu': 1.3.103 - '@swc/core-linux-arm64-musl': 1.3.103 - '@swc/core-linux-x64-gnu': 1.3.103 - '@swc/core-linux-x64-musl': 1.3.103 - '@swc/core-win32-arm64-msvc': 1.3.103 - '@swc/core-win32-ia32-msvc': 1.3.103 - '@swc/core-win32-x64-msvc': 1.3.103 + '@swc/core-darwin-arm64': 1.4.0 + '@swc/core-darwin-x64': 1.4.0 + '@swc/core-linux-arm-gnueabihf': 1.4.0 + '@swc/core-linux-arm64-gnu': 1.4.0 + '@swc/core-linux-arm64-musl': 1.4.0 + '@swc/core-linux-x64-gnu': 1.4.0 + '@swc/core-linux-x64-musl': 1.4.0 + '@swc/core-win32-arm64-msvc': 1.4.0 + '@swc/core-win32-ia32-msvc': 1.4.0 + '@swc/core-win32-x64-msvc': 1.4.0 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1021,8 +1021,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.2: - resolution: {integrity: sha512-cZShBaVa+UO1LjWWBPmWRR4+/eY/JR/UIEcDlVsw3okjWEu+rB7/mH6X3B/L+qJVHDLjk9QW/y2upp9wp1yDXA==} + /@types/node@20.11.16: + resolution: {integrity: sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==} dependencies: undici-types: 5.26.5 dev: true @@ -1035,38 +1035,38 @@ packages: resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} dev: true - /@vitest/expect@1.2.0: - resolution: {integrity: sha512-H+2bHzhyvgp32o7Pgj2h9RTHN0pgYaoi26Oo3mE+dCi1PAqV31kIIVfTbqMO3Bvshd5mIrJLc73EwSRrbol9Lw==} + /@vitest/expect@1.2.2: + resolution: {integrity: sha512-3jpcdPAD7LwHUUiT2pZTj2U82I2Tcgg2oVPvKxhn6mDI2On6tfvPQTjAI4628GUGDZrCm4Zna9iQHm5cEexOAg==} dependencies: - '@vitest/spy': 1.2.0 - '@vitest/utils': 1.2.0 + '@vitest/spy': 1.2.2 + '@vitest/utils': 1.2.2 chai: 4.3.10 dev: true - /@vitest/runner@1.2.0: - resolution: {integrity: sha512-vaJkDoQaNUTroT70OhM0NPznP7H3WyRwt4LvGwCVYs/llLaqhoSLnlIhUClZpbF5RgAee29KRcNz0FEhYcgxqA==} + /@vitest/runner@1.2.2: + resolution: {integrity: sha512-JctG7QZ4LSDXr5CsUweFgcpEvrcxOV1Gft7uHrvkQ+fsAVylmWQvnaAr/HDp3LAH1fztGMQZugIheTWjaGzYIg==} dependencies: - '@vitest/utils': 1.2.0 + '@vitest/utils': 1.2.2 p-limit: 5.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@1.2.0: - resolution: {integrity: sha512-P33EE7TrVgB3HDLllrjK/GG6WSnmUtWohbwcQqmm7TAk9AVHpdgf7M3F3qRHKm6vhr7x3eGIln7VH052Smo6Kw==} + /@vitest/snapshot@1.2.2: + resolution: {integrity: sha512-SmGY4saEw1+bwE1th6S/cZmPxz/Q4JWsl7LvbQIky2tKE35US4gd0Mjzqfr84/4OD0tikGWaWdMja/nWL5NIPA==} dependencies: magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.2.0: - resolution: {integrity: sha512-MNxSAfxUaCeowqyyGwC293yZgk7cECZU9wGb8N1pYQ0yOn/SIr8t0l9XnGRdQZvNV/ZHBYu6GO/W3tj5K3VN1Q==} + /@vitest/spy@1.2.2: + resolution: {integrity: sha512-k9Gcahssw8d7X3pSLq3e3XEu/0L78mUkCjivUqCQeXJm9clfXR/Td8+AP+VC1O6fKPIDLcHDTAmBOINVuv6+7g==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.2.0: - resolution: {integrity: sha512-FyD5bpugsXlwVpTcGLDf3wSPYy8g541fQt14qtzo8mJ4LdEpDKZ9mQy2+qdJm2TZRpjY5JLXihXCgIxiRJgi5g==} + /@vitest/utils@1.2.2: + resolution: {integrity: sha512-WKITBHLsBHlpjnDQahr+XK6RE7MiAsgrIkr0pGhQ9ygoxBfUeG0lUG5iLlzqjmKSlBv3+j5EGsriBzh+C3Tq9g==} dependencies: diff-sequences: 29.6.3 estree-walker: 3.0.3 @@ -1078,8 +1078,8 @@ packages: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} dev: true - /acorn-walk@8.3.1: - resolution: {integrity: sha512-TgUZgYvqZprrl7YldZNoa9OciCAyZR+Ejm9eXzKCmjsF5IKp/wgQ7Z/ZpjpGTIUPwrHQIcYeI8qDh4PsEwxMbw==} + /acorn-walk@8.3.2: + resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} engines: {node: '>=0.4.0'} dev: true @@ -2423,8 +2423,8 @@ packages: hasBin: true dev: true - /nodemon@3.0.2: - resolution: {integrity: sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA==} + /nodemon@3.0.3: + resolution: {integrity: sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==} engines: {node: '>=10'} hasBin: true dependencies: @@ -2691,8 +2691,8 @@ packages: hasBin: true dev: true - /prettier@3.2.2: - resolution: {integrity: sha512-HTByuKZzw7utPiDO523Tt2pLtEyK7OibUD9suEJQrPUCYQqrHr74GGX6VidMrovbf/I50mPqr8j/II6oBAuc5A==} + /prettier@3.2.5: + resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} engines: {node: '>=14'} hasBin: true dev: true @@ -2953,8 +2953,8 @@ packages: yargs: 15.4.1 dev: true - /smol-toml@1.1.3: - resolution: {integrity: sha512-qTyy6Owjho1ISBmxj4HdrFWB2kMQ5RczU6J04OqslSfdSH656OIHuomHS4ZDvhwm37nig/uXyiTMJxlC9zIVfw==} + /smol-toml@1.1.4: + resolution: {integrity: sha512-Y0OT8HezWsTNeEOSVxDnKOW/AyNXHQ4BwJNbAXlLTF5wWsBvrcHhIkE5Rf8kQMLmgf7nDX3PVOlgC6/Aiggu3Q==} engines: {node: '>= 18', pnpm: '>= 8'} dev: false @@ -3171,8 +3171,8 @@ packages: resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==} dev: true - /tinypool@0.8.1: - resolution: {integrity: sha512-zBTCK0cCgRROxvs9c0CGK838sPkeokNGdQVUUwHAbynHFlmyJYj825f/oRs528HaIJ97lo0pLIlDUzwN+IorWg==} + /tinypool@0.8.2: + resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==} engines: {node: '>=14.0.0'} dev: true @@ -3221,7 +3221,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.1(@swc/core@1.3.103)(typescript@5.3.3): + /tsup@8.0.1(@swc/core@1.4.0)(typescript@5.3.3): resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} engines: {node: '>=18'} hasBin: true @@ -3240,7 +3240,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.3.103 + '@swc/core': 1.4.0 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3275,64 +3275,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.11.3: - resolution: {integrity: sha512-IsOOg2bVbIt3o/X8Ew9fbQp5t1hTHN3fGNQYrPQwMR2W1kIAC6RfbVD4A9OeibPGyEPUpwOH79hZ9ydFH5kifw==} + /turbo-darwin-64@1.12.2: + resolution: {integrity: sha512-Aq/ePQ5KNx6XGwlZWTVTqpQYfysm1vkwkI6kAYgrX5DjMWn+tUXrSgNx4YNte0F+V4DQ7PtuWX+jRG0h0ZNg0A==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.11.3: - resolution: {integrity: sha512-FsJL7k0SaPbJzI/KCnrf/fi3PgCDCjTliMc/kEFkuWVA6Httc3Q4lxyLIIinz69q6JTx8wzh6yznUMzJRI3+dg==} + /turbo-darwin-arm64@1.12.2: + resolution: {integrity: sha512-wTr+dqkwJo/eXE+4SPTSeNBKyyfQJhI6I9sKVlCSBmtaNEqoGNgdVzgMUdqrg9AIFzLIiKO+zhfskNaSWpVFow==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.11.3: - resolution: {integrity: sha512-SvW7pvTVRGsqtSkII5w+wriZXvxqkluw5FO/MNAdFw0qmoov+PZ237+37/NgArqE3zVn1GX9P6nUx9VO+xcQAg==} + /turbo-linux-64@1.12.2: + resolution: {integrity: sha512-BggBKrLojGarDaa2zBo+kUR3fmjpd6bLA8Unm3Aa2oJw0UvEi3Brd+w9lNsPZHXXQYBUzNUY2gCdxf3RteWb0g==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.11.3: - resolution: {integrity: sha512-YhUfBi1deB3m+3M55X458J6B7RsIS7UtM3P1z13cUIhF+pOt65BgnaSnkHLwETidmhRh8Dl3GelaQGrB3RdCDw==} + /turbo-linux-arm64@1.12.2: + resolution: {integrity: sha512-v/apSRvVuwYjq1D9MJFsHv2EpGd1S4VoSdZvVfW6FaM06L8CFZa92urNR1svdGYN28YVKwK9Ikc9qudC6t/d5A==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.11.3: - resolution: {integrity: sha512-s+vEnuM2TiZuAUUUpmBHDr6vnNbJgj+5JYfnYmVklYs16kXh+EppafYQOAkcRIMAh7GjV3pLq5/uGqc7seZeHA==} + /turbo-windows-64@1.12.2: + resolution: {integrity: sha512-3uDdwXcRGkgopYFdPDpxQiuQjfQ12Fxq0fhj+iGymav0eWA4W4wzYwSdlUp6rT22qOBIzaEsrIspRwx1DsMkNg==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.11.3: - resolution: {integrity: sha512-ZR5z5Zpc7cASwfdRAV5yNScCZBsgGSbcwiA/u3farCacbPiXsfoWUkz28iyrx21/TRW0bi6dbsB2v17swa8bjw==} + /turbo-windows-arm64@1.12.2: + resolution: {integrity: sha512-zNIHnwtQfJSjFi7movwhPQh2rfrcKZ7Xv609EN1yX0gEp9GxooCUi2yNnBQ8wTqFjioA2M5hZtGJQ0RrKaEm/Q==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.11.3: - resolution: {integrity: sha512-RCJOUFcFMQNIGKSjC9YmA5yVP1qtDiBA0Lv9VIgrXraI5Da1liVvl3VJPsoDNIR9eFMyA/aagx1iyj6UWem5hA==} + /turbo@1.12.2: + resolution: {integrity: sha512-BcoQjBZ+LJCMdjzWhzQflOinUjek28rWXj07aaaAQ8T3Ehs0JFSjIsXOm4qIbo52G4xk3gFVcUtJhh/QRADl7g==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.11.3 - turbo-darwin-arm64: 1.11.3 - turbo-linux-64: 1.11.3 - turbo-linux-arm64: 1.11.3 - turbo-windows-64: 1.11.3 - turbo-windows-arm64: 1.11.3 + turbo-darwin-64: 1.12.2 + turbo-darwin-arm64: 1.12.2 + turbo-linux-64: 1.12.2 + turbo-linux-arm64: 1.12.2 + turbo-windows-64: 1.12.2 + turbo-windows-arm64: 1.12.2 dev: true /type-detect@4.0.8: @@ -3432,8 +3432,8 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.2.0(@types/node@20.11.2): - resolution: {integrity: sha512-ETnQTHeAbbOxl7/pyBck9oAPZZZo+kYnFt1uQDD+hPReOc+wCjXw4r4jHriBRuVDB5isHmPXxrfc1yJnfBERqg==} + /vite-node@1.2.2(@types/node@20.11.16): + resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -3441,7 +3441,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.2) + vite: 5.0.10(@types/node@20.11.16) transitivePeerDependencies: - '@types/node' - less @@ -3453,7 +3453,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.2): + /vite@5.0.10(@types/node@20.11.16): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3481,7 +3481,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.2 + '@types/node': 20.11.16 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3489,8 +3489,8 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.2.0(@types/node@20.11.2): - resolution: {integrity: sha512-Ixs5m7BjqvLHXcibkzKRQUvD/XLw0E3rvqaCMlrm/0LMsA0309ZqYvTlPzkhh81VlEyVZXFlwWnkhb6/UMtcaQ==} + /vitest@1.2.2(@types/node@20.11.16): + resolution: {integrity: sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -3514,13 +3514,13 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.2 - '@vitest/expect': 1.2.0 - '@vitest/runner': 1.2.0 - '@vitest/snapshot': 1.2.0 - '@vitest/spy': 1.2.0 - '@vitest/utils': 1.2.0 - acorn-walk: 8.3.1 + '@types/node': 20.11.16 + '@vitest/expect': 1.2.2 + '@vitest/runner': 1.2.2 + '@vitest/snapshot': 1.2.2 + '@vitest/spy': 1.2.2 + '@vitest/utils': 1.2.2 + acorn-walk: 8.3.2 cac: 6.7.14 chai: 4.3.10 debug: 4.3.4(supports-color@5.5.0) @@ -3532,9 +3532,9 @@ packages: std-env: 3.6.0 strip-literal: 1.3.0 tinybench: 2.5.1 - tinypool: 0.8.1 - vite: 5.0.10(@types/node@20.11.2) - vite-node: 1.2.0(@types/node@20.11.2) + tinypool: 0.8.2 + vite: 5.0.10(@types/node@20.11.16) + vite-node: 1.2.2(@types/node@20.11.16) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From aeeb71837582c2fbbb9668d5ab0949af1fda350f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:53:11 +0000 Subject: [PATCH 046/290] fix: tests feat: Bump SWC versions --- packages/swc-plugin-solid-cli/Cargo.lock | 917 ++++++++---------- packages/swc-plugin-solid-cli/Cargo.toml | 6 +- .../output/swc_plugin_solid_cli.wasm | Bin 850121 -> 768179 bytes packages/swc-plugin-solid-cli/src/lib.rs | 27 +- 4 files changed, 439 insertions(+), 511 deletions(-) diff --git a/packages/swc-plugin-solid-cli/Cargo.lock b/packages/swc-plugin-solid-cli/Cargo.lock index 6d4c603..1f9644e 100644 --- a/packages/swc-plugin-solid-cli/Cargo.lock +++ b/packages/swc-plugin-solid-cli/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -29,9 +29,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -40,21 +40,22 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -70,9 +71,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arrayvec" @@ -82,15 +83,14 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ast_node" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" +checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -112,9 +112,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "better_scoped_tls" @@ -148,9 +148,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -186,9 +186,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] @@ -221,7 +221,21 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.21", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "cargo_metadata" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +dependencies = [ + "camino", + "cargo-platform", + "semver 1.0.21", "serde", "serde_json", "thiserror", @@ -229,9 +243,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -244,9 +258,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -263,12 +277,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -276,9 +290,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "debugid" @@ -290,12 +304,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "deranged" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" - [[package]] name = "diff" version = "0.1.13" @@ -325,51 +333,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] -name = "enum-iterator" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.2.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.28", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fixedbitset" @@ -379,23 +362,22 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "from_variant" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" +checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ - "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -416,32 +398,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", "wasi", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -455,14 +425,14 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" @@ -475,9 +445,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "hex" @@ -485,11 +455,24 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hstr" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "phf", + "rustc-hash", + "smallvec", +] + [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -503,38 +486,37 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown 0.14.3", ] [[package]] name = "is-macro" -version = "0.3.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" dependencies = [ "Inflector", - "pmutil", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "is_ci" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "lazy_static" @@ -544,21 +526,21 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -566,9 +548,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "matchers" @@ -581,9 +563,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miette" @@ -618,9 +600,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -643,9 +625,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -665,9 +647,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -678,24 +660,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.5", "libc", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "overload" @@ -721,28 +703,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", "indexmap", @@ -750,20 +732,19 @@ dependencies = [ [[package]] name = "phf" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", - "proc-macro-hack", ] [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", @@ -771,32 +752,31 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pmutil" @@ -806,21 +786,9 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "pretty_assertions" version = "1.4.0" @@ -831,41 +799,11 @@ dependencies = [ "yansi", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -901,9 +839,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -926,18 +864,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", "rand_core", ] @@ -946,29 +872,26 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] @@ -982,13 +905,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -999,21 +922,21 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "relative-path" -version = "1.8.0" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" [[package]] name = "rend" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] @@ -1037,9 +960,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -1069,11 +992,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.7" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", @@ -1088,15 +1011,15 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "ryu-js" -version = "0.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6518fc26bced4d53678a22d6e423e9d8716377def84545fe328236e3af070e7f" +checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" [[package]] name = "scoped-tls" @@ -1127,9 +1050,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -1142,29 +1065,29 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -1172,10 +1095,10 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.10.1" +name = "sha2" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1184,9 +1107,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -1199,15 +1122,15 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smartstring" @@ -1222,15 +1145,15 @@ dependencies = [ [[package]] name = "smawk" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "sourcemap" -version = "6.4.0" +version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9221a6bba3e9cfa7decfe64edf5233311e1bf837ea3234df6e7f35836e1093d" +checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" dependencies = [ "data-encoding", "debugid", @@ -1242,12 +1165,6 @@ dependencies = [ "url", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "stacker" version = "0.1.15" @@ -1267,43 +1184,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", -] - [[package]] name = "string_enum" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" +checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1346,27 +1236,25 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.5.8" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8066e17abb484602da673e2d35138ab32ce53f26368d9c92113510e1659220b" +checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" dependencies = [ "bytecheck", + "hstr", "once_cell", "rkyv", "rustc-hash", "serde", - "string_cache", - "string_cache_codegen", - "triomphe", ] [[package]] name = "swc_cached" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b8051bbf1c23817f9f2912fce18d9a6efcaaf8f8e1a4c69dbaf72bcaf71136" +checksum = "630c761c74ac8021490b78578cc2223aa4a568241e26505c27bf0e4fd4ad8ec2" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "anyhow", "dashmap", "once_cell", @@ -1376,11 +1264,10 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.31.18" +version = "0.33.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e30cd01afa791b15263fcfe8f77ecbbd020ddef659f0f58d3c7b794ad65c1738" +checksum = "0a15b8a5ec7b3c87b5c602dec00caf3dbb07fe2daaaa1d144d0c00a612e0890c" dependencies = [ - "ahash 0.8.3", "anyhow", "ast_node", "atty", @@ -1398,7 +1285,6 @@ dependencies = [ "serde", "siphasher", "sourcemap", - "string_cache", "swc_atoms", "swc_eq_ignore_macros", "swc_visit", @@ -1410,34 +1296,36 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.7" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba1c7a40d38f9dd4e9a046975d3faf95af42937b34b2b963be4d8f01239584b" +checksum = "c29e3b76a63111ef318f161bc413dfc093f21da1afca9ba5cdd6442b7069d65b" dependencies = [ + "anyhow", "indexmap", "serde", "serde_json", + "sourcemap", + "swc_cached", "swc_config_macro", ] [[package]] name = "swc_config_macro" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" +checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "swc_core" -version = "0.79.51" +version = "0.90.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c4030b2c5887d0f2d3ce5ef4928c9377d731ce50336895cdeee162605a74ce" +checksum = "e84315f61728c129dd495f7cf7a5df9eb3966696e1cb569abfc92097daff2d34" dependencies = [ "once_cell", "swc_atoms", @@ -1457,14 +1345,15 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.107.3" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ce6ba552db5098e9e7b5e7fcc30ef1e9f2b33ec930a94489288e21f8e95b213" +checksum = "4f90ae61d067206a5ff0c3a63d7d279346fa6562c08e251e32a07654f5b9fab1" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.2", "bytecheck", "is-macro", "num-bigint", + "phf", "rkyv", "scoped-tls", "serde", @@ -1476,9 +1365,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.142.9" +version = "0.148.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b9c1920bee89a90cfd100d5c2d22e0557760a86cc00726935209635301b482" +checksum = "52858517008358500fcc328e268b0a9b8b244d883743f293310d7d11636c4fcc" dependencies = [ "memchr", "num-bigint", @@ -1495,24 +1384,22 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" +checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "swc_ecma_minifier" -version = "0.184.40" +version = "0.192.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b52e83587eef45091514c4c1d93d4a9e4e958f43cd9b56d19d4ebd8a878b1d5" +checksum = "35644f18401007715008829fd93d26359166b295d9152b2bd3dbf60e88065ab3" dependencies = [ - "ahash 0.8.3", "arrayvec", "indexmap", "num-bigint", @@ -1526,7 +1413,6 @@ dependencies = [ "serde", "serde_json", "swc_atoms", - "swc_cached", "swc_common", "swc_config", "swc_ecma_ast", @@ -1543,13 +1429,15 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.137.8" +version = "0.143.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8eaccdcfd630dfa46e90d2b9ea20260e20ad275361b747ad8c9b93300470627" +checksum = "98edd7196fbeda4a323c5a87da151bb7474ad01b606fc0572fde73c50e9f887e" dependencies = [ "either", + "new_debug_unreachable", "num-bigint", "num-traits", + "phf", "serde", "smallvec", "smartstring", @@ -1563,25 +1451,25 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.20.15" +version = "0.22.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35902aefa048253d193d7b0a4500f2bc98ed24f6607597ef967f612a2c4e45a2" +checksum = "9bfc1ad4ecd99954ab9304eaaeccce7ba5d1e2d27102eea78e6817d1d21bea58" dependencies = [ "anyhow", "hex", - "sha-1", + "sha2", "testing", "tracing", ] [[package]] name = "swc_ecma_transforms_base" -version = "0.130.14" +version = "0.137.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f477cba9333b082dc67c66fff068decf3678c572b55175678bc57fde582af72f" +checksum = "0daa5b2deffddd9716ba8b203d0782bbbbe9d86864c2cabcb47d20929c998c70" dependencies = [ "better_scoped_tls", - "bitflags 2.3.3", + "bitflags 2.4.2", "indexmap", "once_cell", "phf", @@ -1599,24 +1487,22 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_macros" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f59c4b6ed5d78d3ad9fc7c6f8ab4f85bba99573d31d9a2c0a712077a6b45efd2" +checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "swc_ecma_transforms_optimization" -version = "0.190.27" +version = "0.198.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74be6367b3830f4e2dcefb8c6b968600b3e1b3baf64872d365d0d5b89de55d61" +checksum = "e6219f0f3885d9b0ba85e30760fb869e219eb956ec3dbbc18f6915b41c3b193c" dependencies = [ - "ahash 0.8.3", "dashmap", "indexmap", "once_cell", @@ -1637,9 +1523,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.133.14" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c58533aa8ed009af31adf1fbcd4b4cfb437721122e1c2a4505bede26eb0cc50" +checksum = "35b17a7a967760a4fa784b746461dfae6fa67bd7ada40d13f5c66ecc4f837bc2" dependencies = [ "ansi_term", "anyhow", @@ -1647,7 +1533,7 @@ dependencies = [ "hex", "serde", "serde_json", - "sha-1", + "sha2", "sourcemap", "swc_common", "swc_ecma_ast", @@ -1663,11 +1549,10 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.16.15" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e4d2948720c9aa83915e01dd49f69837bd13a3eb60965a1ed5ba4e97555c" +checksum = "533b080d3745b61598963d177cd22e26d0b2cab26b761a7aa08d545bbb0ee886" dependencies = [ - "ahash 0.8.3", "indexmap", "rustc-hash", "swc_atoms", @@ -1681,9 +1566,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.120.11" +version = "0.127.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d757778f6789a54bf2739007057af2917a6ac3b1d686fb06b56b88feda24e4bc" +checksum = "998fccc5bc77e7fa8637ae17f9b4cb8ffc286d995559b6a11b38eedd5f5e6e83" dependencies = [ "indexmap", "num_cpus", @@ -1699,9 +1584,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.93.3" +version = "0.98.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b701da2f2b16308865e2ab18db13df60cdf563b243430ca99e8ad6f8b760d83a" +checksum = "95d322e023d73722c36db95c4bf438d9595bf0a80fe4e28c8f9aef7e7b8f853e" dependencies = [ "num-bigint", "swc_atoms", @@ -1713,21 +1598,20 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ - "pmutil", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "swc_error_reporters" -version = "0.15.18" +version = "0.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b190cdaf440a894db49d50bc497fcc14fdf0f013fdaf7be2e69874cd1b5d0" +checksum = "5aed28e3bcc05839332abfbdeeb49686083f5542452aed7662d76cf062f1cbbc" dependencies = [ "anyhow", "miette", @@ -1738,9 +1622,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.19.18" +version = "0.21.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cc84ef676e0901c5a7a01394b98f5219beee0e22f746fbe2c90ee998ceda15" +checksum = "06cc80877ed5595b496b7cce938483be24cfa6c358b8d17aff789961c31104a9" dependencies = [ "indexmap", "petgraph", @@ -1750,14 +1634,13 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" +checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ - "pmutil", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1771,20 +1654,20 @@ dependencies = [ [[package]] name = "swc_plugin_macro" -version = "0.9.15" +version = "0.9.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785309d342a69df4c929ee59e14e36889ca832f1d2a3c1d03c47c93126c72dbc" +checksum = "3232db481484070637b20a155c064096c0ea1ba04fa2247b89b618661b3574f4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "swc_plugin_proxy" -version = "0.36.3" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61b44c091eed6107b5d5970edb63acbe872e885495aae90de8450672d4b9868" +checksum = "31e73a136e0ba7cc97387ea925db61be0170fe541cb66558588604c0e0e494f9" dependencies = [ "better_scoped_tls", "rkyv", @@ -1796,9 +1679,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.19.21" +version = "0.21.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4560c944a65d817fba2fbfd39a914d04b446da9bb1f1c5d74b42a28259d733df" +checksum = "9e52754d1060c70b44e6d4d65ebfc7bde9769d5b0e6e8e1e6a4c051980459473" dependencies = [ "tracing", ] @@ -1811,14 +1694,14 @@ checksum = "ff9719b6085dd2824fd61938a881937be14b08f95e2d27c64c825a9f65e052ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "swc_visit" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3" +checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" dependencies = [ "either", "swc_visit_macros", @@ -1826,16 +1709,16 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" +checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" dependencies = [ "Inflector", "pmutil", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1851,9 +1734,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1868,22 +1751,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -1900,16 +1782,17 @@ dependencies = [ [[package]] name = "testing" -version = "0.33.21" +version = "0.35.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df186694fbd668f4c7c8071c5e442b0c8781c5282202724ac44dad6092f74802" +checksum = "4c090eccb0eab8cc5ef0667d76f0d8b6dfaf264ed76f94d24f72d54421604a8d" dependencies = [ "ansi_term", - "cargo_metadata", + "cargo_metadata 0.15.4", "difference", "once_cell", "pretty_assertions", "regex", + "serde", "serde_json", "swc_common", "swc_error_reporters", @@ -1920,19 +1803,18 @@ dependencies = [ [[package]] name = "testing_macros" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c15b796025051a07f1ac695ee0cac0883f05a0d510c9d171ef8d31a992e6a5" +checksum = "f9d3864d4184569c1428645a51a304b3b6e8d3094cd61fb3cce8dfdd9f6d0f72" dependencies = [ "anyhow", "glob", "once_cell", - "pmutil", "proc-macro2", "quote", "regex", "relative-path", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1948,22 +1830,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -1976,34 +1858,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" -dependencies = [ - "deranged", - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" - -[[package]] -name = "time-macros" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" -dependencies = [ - "time-core", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2021,11 +1875,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2033,20 +1886,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -2054,20 +1907,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -2081,16 +1934,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "triomphe" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" -dependencies = [ - "serde", - "stable_deref_trait", -] - [[package]] name = "typed-arena" version = "2.0.2" @@ -2099,27 +1942,27 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-id" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -2138,15 +1981,15 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2155,9 +1998,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "valuable" @@ -2167,17 +2010,14 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vergen" -version = "7.5.1" +version = "8.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" dependencies = [ "anyhow", - "cfg-if", - "enum-iterator", - "getset", + "cargo_metadata 0.18.1", + "regex", "rustversion", - "thiserror", - "time", ] [[package]] @@ -2210,9 +2050,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -2225,69 +2065,126 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.0", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "wyz" @@ -2303,3 +2200,23 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] diff --git a/packages/swc-plugin-solid-cli/Cargo.toml b/packages/swc-plugin-solid-cli/Cargo.toml index 91f1e06..edcc314 100644 --- a/packages/swc-plugin-solid-cli/Cargo.toml +++ b/packages/swc-plugin-solid-cli/Cargo.toml @@ -13,7 +13,7 @@ codegen-units = 1 [dependencies] serde = "1" serde_json = "1.0" -swc_core = { version = "0.79", features = [ +swc_core = { version = "0.90", features = [ "ecma_plugin_transform", "ecma_utils", "ecma_minifier", @@ -22,9 +22,9 @@ swc_core = { version = "0.79", features = [ "common", ] } [dev-dependencies] -swc_core = { version = "0.79", features = ["testing_transform", "ecma_parser"] } +swc_core = { version = "0.90", features = ["testing_transform", "ecma_parser"] } -testing = { version = "0.33" } +testing = { version = "0.35" } # .cargo/config defines few alias to build plugin. # cargo build-wasi generates wasm-wasi32 binary # cargo build-wasm32 generates wasm32-unknown-unknown binary. diff --git a/packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm b/packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm index d8f9eefeb131eb5956e84200986492bd34f2a1cd..376d98074e3a74f81f25df7a82d123db99872bbf 100644 GIT binary patch literal 768179 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�of6!1&)Lm+F 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%0AR_=af3Mc)Z##e=KVO&(S;zU*SMrd%x?rqW2(j6 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≫$u9w5sRuwvaD?^;YZB;X zvdCvuYN_tq7|{j`SWxJO%IO_&$LnS6&axd{kEnjSoR8hZfieAgbzjMDl*bCmK?*Ak zJ>?_83U_yW4y=aZTXrMFc?5VNXo5KrG%$9pr-3wH%})c>kQgvHL#HU*u~w&P>N@jV z3qHlOTal8Nq8y44PY4X=UQz8@Rh0JeqM#rBVd2cq>Aw)`4ht|(p&+*!kC+Sf-^bX= z!64P%y^^<(F00e4@EG3gwGZU%8G3Gy&#G!K*o-?@$3xX0?((#p#awG{ISJ3ToXu-e z!=JZKPJKDq#yV;V1896g-D(z21Zy9`V%z-}$<4(~39mKp1~goU>!#*BDv#F8Rtp2} z_4_>DwHUAGYHpNm5bM(#srGZ(g`(={;}eW^=_!nrz33;LU;03~`+$jpn&?6v4#oS;eoO#mRmy zkqs;XWZAHnOL^`<-7FjKtb3>CaduhO^RxuAJ?>2{PL5LcW`pku-lH?Kx$joexZTcT@_3L7XI6 zG3(5X7$aHpq!_JAZty8v1l|G7zZBYjs|b(nf#P&xtNQe(ti#dA*a4oCS3^;qm%*K@ z;%hjA1|l!6ov<|=%KE3p9Dq9QidpA`ghtkB ztK;`C_dAmB?8yArRU zChlHFK~sa&QDv!%#VgBe`sP0B^j@XI(aIW^?EBCq(c1>>nAy{US=4ux8m7UQRG0IM zaCkL8;NZ=mj}{I1m#X+zwfGy*>Vq22I(K`k%V%YX9a%4{T8^>0Q?%z@Mn**1ic`hP z`U2{p|F7)Yi{2<_8-|~g-ez8_X4DfVG#Un`p@yw+wb$r62@X!=#E2=QBR4~jsWf-D z(EYvDF}SN}HQux3%4%M0)qsI40zhWgAolhRmPi+w`mDaEEgd||DnFfH^xMm=8=PBT z9*VSF^Df<0D6&e=sL*yVvm;F?)ta7F4ST*Xqu!O5RNuo7y2YyljS~u{J~QyM+%bj* zR8-DW1m~p6Zi=kUQa08SGU_H=AI{qa$a}3N*y?27Sb&$NcOJeZI0Vk?iAoNKe#>y8Tt?3zZ8o?<^06lxd2|53g}FRPrfk{eCgO5dqkZ$X*f<31kCb83ak{ zoPCuO&k7xE8-E%iB`C#SFKAp>d%a$hZmtLPRG=MC%gl~+bGC^{G!ls|wO?^@5}?>^t~=I%4xT5E|zmInP<+T{J#LCM%G-gJc#!P_uGZ^!&{g~4t8?)6Of14qpA)0r0PxkWU zD>Udt91u`Qz7ETh@!;8pAR+Q5bGUeBRVtVZ?uU2=^OEV3IAJ`q9no<@0%!d8)d43q zOc27E(RO!t^-D4H=fu$Gfe~#fDA`bWB|osW3j%3DOX14?_yJH{INsA&ao&I$#f$Y$ z`R8!ZNG7ZI-vU`xa)7MyeS6X_ zOHR!b9AF@|Xcn<9R6yb(vm`E>#C5_R>l#MUcm@Rh)kkg(wS(0LNX=F@5cb_q3M=gw z3BAnBY=maC0uT2ivnx-EwjkunZM~S0H1dtLYAOi6ey|+(A#%#^G@T9&>Ns zmBg>lGcpKwVZKx++{J{Mn@TMxn$fa%Ntp7i8W1nv(11-dZIDGM&ebgjiL{h#N=)+p zegJ8O@zM>QWj4tBYRy4eeF*MZlv0yK-m(IPOH>qWo<35f4YeUfiA?UOdU-hvLeYoQ zPler;L?V`r{7e2GWyD$(kJ2hHZ^@C7OtLYr=WGx&!SS3`=6v^dve#Q$Wn`_u>>?u& z9r4-{DnAOOCS@)lQ1K168d-a@=F;gvaG@e>Eg@DhFyOH09r{L}!M*GfsJcTaTa7-u ztE52&NGG4K@n14amB#~Iwa)i_>?USWU&%FEStrV(!m6}P8A2a$)IJr6AHSX^AL=DGWx;0|{?!3@tGoJ&I}W3U%F&c3y33b~!3}lH( zb{v1zo-ZNY9kyPKLy}`1fuNc@X6gj23YF~EkPT>lyqbVZI1QxW}$n}C%n)kQ;K}l{8j=%OFjgK%azP8^<}mQv8N_r;7S2c z?+#rE>H7#5q0D_{ys%C*2K#_>;HH(03%}eJz-e80fX}SH9(Jp5(*L*%SM8p)=B55FzKq~md zd1DVVI#@*0Rt1TUM$2ow>0@NvH_yKn8b@JFepg#PJcn>hkjfj=YGuC~$J3mCO~N)AFjnsGc z>CReIsUkyIO!mibez2rYy>G2CdPhZr4tQizEO z()!A5x!vRRnm&buHgSy=jG zVLj>)w=O=_6LH)7hO_%@zRZD9lix1;$R3QyttBF>wTLXi$>gBpxv9wo+G zqJ%XLZ&YKd*#`uwanhK#2YF7tNe#Zc5k?}txjkYqhuBxC-nGr|J48(0V1O<0GAWFtN603a*z5;Y6V*F;i)^-EM|1OuXo zghP=KG}zgK2Jc#uC|Yhq6fL(Qik2*jKy-;BhrMt#W- zUv4drmJc_a8;_KRLo5yDiF_sWwZ3YGYDn7JNQp&PwFVFZjc>JVHe1LQENrO20tstw zrCI0&lC-KBhZ-p{J^~4>lR%vGRU=OceUQv$q;c>M(GJf>6pVq`yeKg009r9Do%^(8hLuo9 z?l1a9+lOb9zg-;bX$08DF4F&&0&J6_gD+*tOMdc|Y&<7>>mc|t``Vt@VCJCzfyZqz zxnbT(ScG~5j+Vl<_@kw$`y3-Rsz+5>Oxg#unW5d=90D0!@cfywbj$yj;vCZc z=iV_EW+{GUS=?jHQfny6buK%)U2IoW=h6(l?czOf0_UdZnYa;M#Mz?;WXB3D+t$}$ zfaD^}kk7xc0*d9cu2*7Hc7oT^+G15OEu$J>u`Na#(4wr9Q8*mr>?0=VY}AX1(`@+; zvvMuhuHR;9;9*!(uc(9C z$x|oRLVhgmiL<~a+NsgWF-@tr<~K-HEG%giJWal~qGa}9&e;*i2bxXpnU11(iLL1?0mmj87;xjtZ-ZM8Cv@%A4j3|tq97QC4N!k$!VtY*0~|bLWO{E588gz z`ACzWt}*O-MyI6|(SGtF)|yVuL}B+3FTX}-&*@er@e8#7+=~OP69tH?A-MTLdr~3( zF49?~x2`}Fnh$p)jy16da9?_gGsuu40VEQ@_=c|nsbme~W&}lbQgo~f*v+VtoeK%= z=#AaW-pxqmVDv>|uWkAPbJOmf*rL&Bvl> zRN{p8$WCHUGFfLLt~y@tnHINScmg7qhX*2uREq|tGy*!L3BlPRE=3Rk)(cnQhj|}_ zDh$47=&16O`-e~NANQ7xqW#95EEh%^8^r|?I>H{@yFfI8g3=RugO+}v_;%pWk69jR z6?lkW?PWYXGJ1LWT7GXaAjj<=6u6D38_)3iGSa{zJRslUJH;O*PHwx>1vmN)4xJur zsCrDuL#(KboAJ3t^V0gw$S*GIH)}0L1|@FysEMM4dim*g7+`wZ*Q?0e*U@K0{de+% zN8~&BfnAWMxLH0>{4;(KGFQci{QDr0DL-ppw&eE9@(nY4OS$f}MdDa*7IQ76%0tNb zk-cBCyMw7|m{kpP*TD(;vm?P=lqhG-IWBLV-@76DXBn%J)IZzzYFF+^lw1EC*ehic8 z3By+QmWCw`X(fOkVgJx&JMQDXCij=U;{iLpK1Ykwg=kPq3E}ua=c-~`N2oop5c$90 z(2{jp+~psFS8h|#1|PDJJ@r0Lv@EW7ucwD+i!A6%Um3zq^bezHiWKvKm#h7&$Lq+# z#r$rlK2}iju@*um3e_w7v(`TC`qFK+Udk*TR5=V?!S=O=Hz=msh z|9Hm@LU7vlNph#{fE0=?WBjRRu#1eu<1clpi3B6s%souIztqEXAbuLp5&nNr)s>Hp z=&`d(*onp<)u$3UrATW+sjcAQ8`gq(7d%34WuQ?UquSVmtRw`L5s21uW}n)+HE z+g!{1_tpc&<2}f3|A>^AO%LUOKEcz$u9J-B1hGz_$LTKzEBJKT<0!t>GJ{$`Qb@aS zELp`2NGm9cGeoniF-$zK>lM5vGCM(Ma?;OKOcSM#(W)T9Fc<8ZE!&6R4Zx(QVuS;0 zT>(7eG4;=m>2E~OG95v()X^Z!LL{}XxbG)^?`j|+A%GZc4jaEVqdXe zS}+jwVijx3vMU(;i>=w~{aj`3EX83cMB(+2V{$9K%MT+q(s%|Q^$imb6)sUpmX!4IzYa2RETNNGX zx?Zcby6<}AcEDbuZl^dG<+ysN_Bj5;WOvwFHD?qVURC$;9rzZGE zVEuTA0lhw{bX4Aal#87wZ3P+>3i}E(eSch0a4%P?MjjHdQFA7RMgWm=1BRV58zsRZ ztR=0zL0!v2W$9P&#<`AH06rz8mgyN>cwr8yxf{*$hPj5jjtjF#q1$`}4C(7CqF~ks zK zVLPn&0bs)!+?}B{or9JL?^*X;uxSFSVJqvdK@EL-3$(KPh;K z@!tYG%G%7EP2ln1HiBojz$2Z1BY3vzYF1Px-vM$A00N}g#O_Iy(8OUm50|AOTteUQ zR21!l^Wbpm|4k2%E%&(i0L*nEG$GMeQp0ER+PoxG^6G-&AI#a})l!Q06<^jGg))Cg zKlV-3kP>?Gy|3g~J5a3ig9_2`Ls!q{2XsCQZh7;MnOZsQJ5%da-S~_uryFcFRRnPK z#}D=PA-%;wU(mEGjQ#u3n+lk3nA2!D>{70~lGLs2S9_~d`VLDpmABXZ>GqDw@^%Rh z_7KZiXg?E!*vsWFhxl1lUqAwh7hOd{eq@9kJ^9tEc>#w=dej2UDd|zOLA`3}IlVM6ziU0QBB>TcB zYbn`5`-{qkCMlVbQNRWn`4`q@*uKX)g>cOnF@2lv2OY|ix2yAkEobm)RC=`R{Ug0R z3&nK$X*C}_ev>(KbL_p_V9pHem}JDD#3{zyJD6j57$hjh(s$;DcUj*N#C7s#$g?1J z%LnSm69nGCmlTVo!U!_fKV+fs?CZ;wgUwBrmxCagf3kIBOa#t(RQ64AJx{Ot5gd9D zV)yn^r?+Ia0l8QvOIX|E(53KUDPe)6nB^Fm2tOy#Lq~YVWKZJtT0%bgg6x8rwN2&E z+APtq75Mo4vXUR|QM=A|Qd#FmyHg2er^%1@-!XhuCaiwIe7|ZxAvTJ=lQ{MCZuOv; zsPU$l{!ZMD3Lb4pl^>_ud;?Wh7f3c}k!c#c;H$RL(hgNj|3X%V4VrR#r`(n4`cG|r zpw96Bc`o{*vS_QTFj?>aC|wrc^Q6+-BR|tU*i`tgySjH)P1=WlzI#wiK6M&2N8_U2 zpHoBaxJ%cC8g@!Kfm-3xJ$gC)vTZPwB4!M5JScF0DCkJ2a}9NTF@3<0548{LX7CO4 zT}(gQe}i7Nmv0{RH|!Kc4h_Fa$-;)ZRZ~p0_L($=hHjzx;<&m&LRrgrfSg2W zI)4Y#(1Fv;0jF)ZC1C=Z4;{%Z6+IAf@;}biortfmJDg}Yy7t<&Ct9QSNN(NKQ9ELh zidFl7+V&XTri@>`qo8`w78g-$@_f%Zo@oHgThLc;tMvBv)qcrGic^^sr?(!t*Cuau zfwXp3%JeghbB<}Bwe?xbyUugjUry3~8Cbt#f4GWM^idUMn@M}$ zr-Z?K+eh>}{j~5GL3ZRP5JK*0`O`s+O`(ckX_y3yN(4CnEBK~;2H5lX|}4w|>HP3YS9wwRliLU1lTEfSYS zhuy$=*jt~tUT@Xg@Q$ns;~0ed`U0uB@3fCJ7*DB2WombKCM+!bvm4qM&cKXBD z-X;Y%k{UBohih>P`Ndx6t&{EL`WZ#b?pX9&jp}i3LrbAuI|kE*awP`D9JeAn11g-J zl6*1?V0U=-Q3HDBMP9!D`>nhdy_VXepFM(Pp^xV}%YfIf;Wci&hMyz%{=e+K3$SI^ zS>Ji~dEE29_jLDdsnso8`y6#Z4i**_A`|oK-DBAnG8ia@qNu4Fs+g&v?)A9bZI$rU zbhp}(ViaOPQlS2g@d{Nsh~c5xn0e9}CX*B`v^Kl#&rTHIkV{>G*+$qVZl`@2|VuSuD+S zbkBBbN0J36jwA?Rfn}pB%zh+?TJeQ-;6EC)lwfZ{2beDXGj;!aRfa!Yd(w+X1>Pgo>rR(wajM^QBl}d?fRZl-ke?&QS z=J9+T5#R9{n%ol!GyYj>>K}Rh1j*kI3Jr7Uc^hzEQU7^XO2bi`gH< z2g0(gvH*oGMA(fX2W}*Z#=$@=Wo|@pNqN~lb zQF2o^V+cRWolONz?8-6|vFn^$QoUTTlMC{$CO~>1QU5w~Nq24nV~x|%MLwwD`?J^S$YEQ676RZ_68lC3Kj@m)yCKpEbvU> z=Jzv7kV8ps+6kTVsv`4I=af)`ls~dph92;!G3imJIrpQ)={ZMPSU_MkPy9?%xW#-@ zGn{^;Y2DH@J_$}w0wje!`CH{ICZED^`jx`Lg=hO9z=+atd`>_#21v`~syr)ET9LNj zpF}F383@ZLqhbvoXL5;evxy4^3Kg~h$x|yYMhQ^wX+Evq=ewi@G7@}u5P9`EJCv#JG=q~_k!YKG0j++@@vE4$Pd=(`JC~DXS_5^p1@TlpXW2_a4KGy~Ydz}=|0(+m zGE{}GQ=!IxxwAQL7x_O@G9k3~&5O|#ynSV>FsUf%mP||je(pm;%tR`Bs%&MkhN`n1g%Ra7;Ekk@YV_R5KI}+r*W`|fwAK3oH8}0jP#68 z0#imVY)l!Uo{3GUaK@BeI51_6++=-DxM=XU2ZjLm+c$tGm2~Jlh9Yd9OO6+9zCt~UL+}t!h ztltUp<&M`)Vce!a4U~2#qW)8Fm|jU{b-AfMXZeBSO|D4VjR8*HGMUlksb87#b6 zXo^8A7ATUx+p@XA0*$8kHlM0H0nXKqLU%GS1up^mNlikNnN}@i)w@=oiUlZ@ojMQ2 zbZK_6^VGA&;qs7Hyd4&cvYe*wazLU=fJ|~4As6$OM4qP4!ZdT=EhJo$)1#QaET>0w zlHq%PET?PkD>*${mD4H=_gyKxS5A)-_l0GO`@#rD($p-cM5|n@1(TntLi$6y4$hVX3e-nsr(F9aGUFl>yZlp1hmWIw7&nqa5(c|aIeDKYzmjR!F4Vc>LiUpbr_SN0pG`-Dsm&r@Hf(1>nqyuAq8+-zq-)S>s!LTiw+xcGL7|lAM~W z4E`(j1OL&0#h<$$+mj>Q@{MvJu5W#%@{cx^p0>5`TpyXph^>o%g^H8QanlsE*#|Wa zPbNYMg3;1OHIrWK$0OE5c-}h5kyyNPTzYj!^h!k{HF^~Oz2k4Pyyg2egOHe-qwDJ! zp}wWTyPN9Y@%E|Atf?Svy&n~v@L-r=L{H4{8ZzLYvuRy0r=73DblnFJNHwo6cVVgk4FV zb#$=3M2G5?TPmu*Yt#Y0xh0&*!1Ib!hWXsqgBV!GSsqS~)(~e*KM%znDq5@mq2Icp zIUrL+ko~+vH&kuVP|YRVliVembNkiZ?iNmhx?9aIdCICEbQyehQD!P^Ha-Fc6x|iz zf=_8A)ereIoO1cIfQH_$j&h0;@A{0^M+AoI-D@Ai`V$G1!&i66pt=dw(W7IxaFb}1 z5YLPn{;6I3b@MzH|H-u^x*Mq?$&S4|_K3ElS{66m0jHa$iYx3bepuRtimM08FYi{5 znGLhocmlwo&|?y5CUOM(WgiBiN(z|e%Eu}C1z$w7)hBT{KrlSj-&;=1`=`?$1eqKU z_<}V=SQoh-618z`$Cg6~Yb{feMJ+cdynxiHC2M#SU-hc*;=o{~+2J)pA}G2sROu2M&Q#2!U~-_&;px`tuRGnE{WDFG2zqw9^{q6-)qpiU#Y4&# zr@nIZ9rgfb0B-CDKpY`5Mg*$Zr=@Jo{!A=YazB4Lt!cVO>1pPmnws|dv`C%9las#> zvRIossAV#(iJn@5Fs%AlHHu9GljzlRX7o~$2i31JbuF%P1FhL}K)E}j*Bwp;+rUi{&!iw<}3i}SqDy$;z!>EJS-Rrewe z+54g%S>HAWO0fdIKvkhkYxxFQcL5fA$u&SC-&!Ob1-oKSilr$@1y&YE0a$p~{`o?% zZB@@c3~Z4$aV$4dDgOV1PG>-Zhc>{1a&h+Kryvt*L2e@(?ZM?Rn0Np`*qzH4#`SE0 z17d0iC=N`Wcs<|hr0J-qMMo44cfO+4y8Co-CnsL3=PWBC;)!QQmMvbyQ0Z?uQEr@A z%&42cFwaAL$&MR`%bE5Zp<9Q_p}YcefNY$YA1O!a`4R1%QrAmp7JryFnPcAN<`<4f z)YH5UkR`aHu?;m+mhQa??=9PB>?}y$7Ejftg4eg;h2^$>;SGw{OjJVsE~jWbBtCCw zu|C`ukP{Qfd>Zb|wQ`6bIt7!Z*b&vUohzX@{1!V>6yZ8LqGRQZKl8scF|!m4LKe)_ z8n7>iKn6uguIu_WeXgEd`Jm7)N>^h;!Km0(%%94+? z)ldHwoqoTaZ<@bd-SlkM+%S74M{%mpv>G>`Zr=P+^JdW~^`-SSr%hXGsxM&WzcoK$ z>SliwoW&e!_Q$y~MQp@VFTy7sH{$cCD>%pdgx%!9m;lD#w2Tfl8Ak-Xit2F}o>sr- zU+G~)zn<33?A;QDa}c0TFd_8wTZ7J4qLBrxh4Y1;R zXTGJ}h21&6P33WsP(k*$ULMAM3bG#t?^#^jf$$U-DFQx_EU7`J{s+=7izQCltHFId z3)nG75bN-ODSsfUavMxPa$<3mw)hJVxS~9&>;(NW3&7?J7O+h@;5ePP{Tx#xSb%B= zqUu#<04Ie)JXgjU2{e|-5CYV%6UG4uTNLrVHV#6O6CID}Gt)=k9RW+!za{dT(eW*H zT*s$F354!h93U}6b=t~E-_o(Rh~Eo^Q4guhbs&8x;=%L1316n%D&cn-I$dF&z={*R zUL}0(gtkujBov%1+jA6Wn1w$T;R^-CWqQCvg1qbmu(+jifh!P>ay{v0nkk%E_Fsbd zJaiBaO|czXpHKQ)0#Tx=^ul5glx>v(k8EJ2HwR^=3tCaoEMbIFlXb~A_|$sxnsvi# zW}6mc3w&S=wSyHp$PIVdh~nLFmpRt3L7IY!ZOGe6*@#kXxRkw}8+d%=?OZ7p4zf|h z+X-pKibLQLPAuD79am&+f;<(?kTeQBZk5)AqE)bQfOOedToE#wJNyKIN_bZI4Zw)n z>1jX(qJeE~3Q8*B6v!n)j{kX=9d1%Ed&#btL3IeS#v0boWZ~VVxJI6t0R;148#c>q z771x*Hg-#u{6>9;j2Gh_a6PS*Cu+wRkg7b=5y&dpS5g?!mWZ4p3j4E5VGPh7tU$T0 zvFk}|zDbX^z#VOi!6n<_(7hqyDUr-nW{OC(hz(Twa?BA<<&ki4t7MBB1tM|Eqn9Dc zdpmkhrknKeo}#x{4&E_TY61a*#pVvQHA?$lBfGU3jfj|@Y6}KhG9{%!(=Wk+A9NPb zdc6NQ*9X~+LDEAIOQZS%4YJrX$dzGwx!yiK_nxpIakskPJb$?tsyvXwA4IyQD{FV- zM@OA2@M+d3>D@#AVDf4*6lMD%+mM^xSUrdDhmNEJade6z{X~HTyhx^`K1Nz358-E0 zE*BfZ7veSgQUc72(b!-BWUJdisF0#1oKPu|cQYi}A`Bs?_)17}!b7Nh$_FVV>8u4} z8YZ0N=XTJdc8UvI#yPYRnF}i1St}eg-^^afA;~tS!zqqx#qKu>@oA?X0i8fKqzeNl zENGn*B??xgFun3%z~WA1rtpYk;SAfIiskjFtOD~}(ORpAd-Ee4QZe5KG;s7e4Hxq( zxVbXPvc9Z(yywZTN8HFeue%|se%!H3ELNr=&amEiB7F8@1exo!SJx|n$7F0mI?R8TL1Enb}rfxmB;f5ERiqX)?lMJprMi)oB4^i&} zs2@YX?gnJYZvgWsEKWaCU#^sJYn4~ZC4#HhQ?xk#mc?jiaiY9JPfw)q#9M*mAAh)| zq!J!E1g-Sq=k&ygsfitx$KSlWn0zC>+A5Fklo&HI96DTR-$QLj#cYkrLx!HP#S|hO zX=$=yb^<@y9b#^Lhh>CV*j9L}z!ngWPzuO<;}|h4`9J-+>Z)%*7Y*i|^p6QZLhdT1 z;vyNcmcUqa6V+8BVq5gk6A36yjdYP`JjK#@3l$uH3rfqPQ#~r1tz=8(;Ahbd1HDuI zt7luc7{#xB%YvP@iRQ^nP=I58WeLVtC*NE>`&{P?S6>1oxq6H2nnR+DL!^or?QzQQ z%#R`{56G=&oQ28$~e`nyK~YJ zpt3Xm*$z7_G&rf^L!JDV%G%Y>rB;4YB2vH?MKgmRA>7oNeOhiMtu}luyn)LM!b)=niAt_mwm}>UpH>N~7+2>s)+(tHWp+SlNz_7456vZevPIuplr|~Y2pPUwTZ(M!Q=#Y;~ zMt_fmBP^E`#ngVI@%Izox+dE#8+awtYQ%zV+Ri67VQSoQ^l@`H(f(jH=|=W?E~JC)F)#Kvps2X75i%8z#8 z$FBHB258GJbZ+9{aC|z9RRA!2WruDUEOg3==GL!e#X~^yDsqqNO||{%qTJZoHvB$L z9>Gx6Mj?Cj$$$qcW%Eyf&ag^bfTQ+GpV~URH(Z^%p{CA^Xy~Z}Y6bmg>TK|I zN@l7NYtRZGO&tpcV(PkS>IR-V>F*w?qoeA(Y|^Mu6FATW4)7`hkeD21LAyQziuzq5 z7KsRN2#Gh4*_D!S3iB!VENV#tVEl6%oxW*D1*peN1tB7)l3gb-AH!GaAuZKQpE?>O zT6t^;FWlEmcpjlq7l$4Cv>=u!qvG*$`4J8Et#9--LO#}CCQNKeyq!}^<$#f%x~xra zsFAu>I-t59Iz76u7+PBcB_Dt&@F_qK;skY)=jcJ{MRptH3){7gSBG1jaAWB)`sp9ALGgzsKSXYH7w--zk%p@kJN(o zAM5sY&5Vi~1QF8!{QXdR5w!9Ob_ah%2) zqf{tXj1opJMu|mKGs-bC4yh$95U>}SkMx(>4*iI2ll1Jkpqdd%)GTr}dMrMxc?Z*W z9-{K9um_IHodeY;{Yel}W7;o)S|uCRG$%5M%~Jn-RHs7?Q(#@14W&nQQB~Zp1HHMJ zneqtbMl}cCI07b-iV0;4m!DC}C4r_z`Q#;kT^oEVZB}(;l}7-*_4>4q1Lju_ft?L7 zL6KFj=mu?)j}of($A5)fe}!Dav6p~c|3TIsi25RsYev>#t&rcaFV_-n5O9HG>1xTZ zBs@)FxX%$8b8H_m#fl?ig1VF+(W_ZNBs?kWV^6}9eWkemC3h^Q5jJ9AqBS*P5=V66 zU|au#82Ahp3e5E2KZv^zVfFs4VSBpr-=IGoO~=beMYlKIn6gdk1i@HLT2p>_s|1dE zpvOGWKl_LVin^NzdTc`C7c%@!bBzKnIOW z+W^Y+5L;x@u5^o!|FXt{oXKOkl63)fnJZl8w_JuuLoO3zNcAXdYR}{|%$%%<4Rn3$ zmCEkJMbA+o_kGzgzwUS(b7!zIg(u`#RrDu3I z`WFTldM6c>bR_AfjdK?S7h;q(OYZ3bb_uE^IT)cxp*NZhJp}9Pw2P5da(6Cs;v@TU z;(c&q9a4u^XX#KqOF`LthCB!i$$$y)|E}i}MjtF?T2K8u_e}loxhNjR%zZTNb)yIe z;JiolOzPA!N8)>RtetxZ)4E%_-?|b+u&5>{snDlB8G1vQGM{CX(z)#S!B% zr;pY$2@fZuzYR;{ey zuU+vUDH$cqBBh`0as4&Tq7C>xPINN1YMp2!ker7$i`0zFqU07-6w1a(C!U{1N3v^n zX%-CwfYzBd*3F`g+AJbmA+t#7vcp<-4H7XXvxvZ*_^%=xE}D@o7jsYWEy^q+`982n ze!yfFVc^?3s?8#lJ3?w@UuIFUG>anZl`3#?1G2D&0A5%_#nKwu82{F|t(3s!^7>+b zd|Kky60_FvN?0v8D$*|xu5k?Cl|rC#KKG!y3O`o$p+EhTmz9It$rh5|$S@(Ria`$= z+#tBBp44-hSJ4cVV%xv0`0Sv1>Q~UWlp_INU97K{MQwD`Mnma+QA+NHmE7%iZ`z&q zvr=0Wtya6UOhDF(WTtXZWqF^h@F^-ED&U()sK=RS>iHOcMAGYlQ0S?eRD|Q7O3{?d zX$Grej!?bub@sAuBobDd`=H7?OxheD#dw3@$m^&5>c`E`@#bcJp4X8I*~9|;ebx=? z@5L^`sFWgov<me~3Q;ausq#rPBh}>c(&#Vbf1b&m9^TXbPq}?8kG1y8;p`pi zfple*3%W|5{$p4@he*JWC%M!#DGp48l&L}Wqpr5d)$$m{A=Pr1M>fksUEXc>9hVVA za$79KAP3Dt{;FI7-xIFO3Ty7H#eR)PEQYGhJL&;NlcJD|Pt1qG%tn)poHR-IdA-T8 z8La%7rUEg=P~UEvO5*PU<@)!c{!ksn{u4p8-PBsoWL={P(37B-wb!8uaDISy?txXQ zD-F4h3UJ`3a-Heu0nVgKA4)xFtM?l=3YK^sZLh=FN<$6fNVVq{tfaTp%~h>3G}!xK z{K59pVY}`_EwkQ=1`?X_m!?BCT9W>BuBa9cQail@?>0kDMM%fe{zY1-7Ge2TwTO?C zL{*F!6aA0P-I7}ma}+N`$K;7$GC*+3&JrOLg zVXvB^BEA9PiFX3pQ_df!V(kmRmQ=og+@K!OAqQeS#f4_TQHT{yOdb1MA+`lB5&8wQI;`lE{Mqxu%JtGS?3J&YFWh zXiG}x9_?iVjTJy-O?0n=z7B-qpjYs-J40l-lOo6sN8u8l5UO{zg_s}b z*2GZ$+_Y2s!^CM+9wARZqyV%yk0*)3sJE?Dnuu}}y3!dZxqD*n#8X`(G?R5Aory+8 z1DcGY8dLR-q}?PdVL1|2veF4pg}8pBC(s^ss(aQC0>BXg*+>yb-h2Te?LE)}z`*DL zz^dy)FafaaJiuBalE#ti9#{P$Wr%Sz#r$tGw8(Hp2@E`ecT;>v_rE49#7FvpP_q2gPc1#onpY;}c($ z4w=j&9{S1=NlAXW+%-rShJ(gpbeK~8@;8$rmKmwDNw83oj@<3!sYYGVXW6Qjrzop} zf`a@;ogkvuD#a+}o@g z92i`X0@v}Jpf}=G(5wJoiLQ37H)b%J!)EC3kyfw>5M#-+;16D(mvF|n=56+1u)aSx zlUE=nTaU-cILY>g3WV3B_gBKqCdpc~`TwWFEMusYZ3z%z+(wlJNVYOSYxBQ@1xV*W z0RrLfCqNWbqwyCfK+yDGlmJog6DOL9-6Ctj-})vEV1EYw6XWG6I8U}}4qo%fu==5+ zfL4}3krRRA*A9u_6uYLIa@$xdQ{tWZtm{d6f4TIpD*A@2(8nh@moTTLfD5A9r-G6K6+2L$L>K_xk~=)gY*Bjp9Yp1x8NV9I?l(%T;msuOl+Nh=qzint zGO-NfB6dX6q{bh^T2l1-)?ZUrne5}g<~irdNzoOPQQ`~c=jurG(*qeQ+U`?{pZ0E% z3a=-qZ7Cfv%F~I0%`Onk>aqr`Qm-t#Dvwi)!UB~ESbpa`Xftkh7$;^V2A-ujXcF6> zA6t1O^A8)aS!#drf1Sq38k~}(Y~;7PqJCGOAdy?}SwcteWQn;vd9s4bH)goJF~Q{x zG3eI@3Gl@m@T~Lm+68N+Ko5qvi|VLmaQxM!C@;8hw5a!&<)qOlM{x?7>dMg2ZBV8h z_Z*_ZIU;;B$QXtVqzpE&PaURvQb((Yg-UtnY<g zM`T1m!8)$;w$-7fEny`p1q;I6nQe&_J_~P$)r2J#XYD%;g&|Z}zBZ4N#-+4(a`>!l zxplR>E9P^woebTB_ zS;WH|3TCZX2TYZ=>DTPBh~$qlcNf%+g>2kT-7UFiTMMIbtBeZ0nrI3QeDL!sCr zCvTdR*^12hu*b4@DK{;=FUhD@>yk2J1|k{CchI-skAZ1ga3n4vaMV%E?)briojwwh zzz;J|Ng=YJ1)hsu`PqjSA}b!u44z^NpkxYl?8{R$UixTRm%fpel$SCM*-)3dM3t5zSh> zPOlA5G927RsZQg2qFbMLrz%!&GlCb@D~)vaeYH~uXX!rO8vl03IlB#xx9TyBuI2_a z+?;K%jsUv_tGqc-I%$o9o&$*qRUA!YQWBd=9Ehhnv1mo-(8GbedM6gGfbx+b5+TonBG=%Zcnte|Bp!q3QT{@$0bC}S)FJ7m zd=t39+g{CoGIc`!Ua`BvgP=6I9kTn-sSEvZn+4l6fPb|CV9--U93&CCO7eA}lbDNz z$SQl|_h&)?e3@kE!+%n;)e31f7s^1u!sopUIYJK$r9jXyTS}y>Z41V~xUo+bd9jqi z)EtZ|k>71SmN7hV^F=SHVt0@IvMQu~JwI;3 zW%tdh=lQpl|aI?#@Xk2F%a8H`!ZGD$>4-$MAt&oIe82>O5&2D>0p zn)gXzK+rMYZp%!+y@x!amq{j|nb{d!$1$Y>v8J^bet21PA_Ad|s+Alwq5Mi?)-$1a zXE46^=QyR>6C+E9`+RvCX?!~Esi8Cop{!IrY8r3ItO;le8#(Lw&HogIYch!mb9Kv<4J{EnX+@HkBKk3E6tS5z^s;agZ29W2ud53z#FAgVhUyR3ZqGyWg_Ny=T>R9dG+fRYorGn}cPi?|$j3}tv zD5z13w9B$`pjMZEUAu@~-}*8I`(ml>Yg&Ju+6mJt4+1ULi)Ugpek8|9ve5N72WQE} zs)Msk&A2|l!JT=Jw{5!UU9i&XAfS;0)rh#&q2h6ZZ`I(UQ81dmtj2cJREUn7t5Z@M z7LUaP#JO^+)^Y{QGF3~{DB54L50Mb{iG*r>w=Z=GB}Hq*E{YB1<-4EmE-7n0G9Po5 zX3Vse&Ae>I;)_A?k=g@ofwc;Sq291lwU`5`5=Kuz%N6gT4()d_Bz`qQ$zm^wZw|Z4 z>z)0$w!C7!bF6aGl0e)$a2sfgQ^S)n2pa=?>40d9AMK9LVm;B8pijpjHfS!>mbb_D zW6aRDEFir^AL>V*y;9Bx59Cy^kx67o5+9AkELiCtG=r&W9>^Foi43YgOa{^@c>w4% zRG#iMrP7X=Qow*-tz0;7am=;|Or%x>Gj)osv)k|}?PKcvP4>S?I~2=lq*S)pe4}4! zXI_02>1_Q-XDiCqW#y&y8+mEWe4Uq8cc>HAi^s>3DyeycT8?F|?XZVcv{fv7T7#{f zJOeFCZZFyP5S+uW#LSQp*TlI8ujq`tt}dnf?cMd@SwnGS*4Xu+iHuALn;f*fvC!VF z5Qw}hdjqp^vr}~2C}gROXPiyZxc44us)S?KW7jf%y~`N8dCmSv+%xu3AQKg*8fGOh zz`9HiLryZ4G$o$e#?{uVV8F6-&EO!mTfjX#U##~G*E59M4Ya+*X_5P1Gh*4|A zS8+^Fc0)suKvc1bfUEZTRuG)Ff0tu{Ud6&)`;5ESx4bEXR`aqc!w^_)#C}#o zZNM-%OIPIzw{wY^;TfOArVP*(g}o^QI}LhUD;4gn6^>0AhRfZpNUqE~pK!n$r6syf z?Nogc=7xw|1TH&+26`Y_tbEm?)i!_Y^NCn-s4w`5O&NefuU?MI^R$r!VB@B`+yvb! zdhB<{S6VV$eL%Y$K|`I`<_VfC3mpXUf8DFCd8!WJY*&cu5%vX-KluxP_-VPC+2J3> zMDN%Z4$+Z5A>WP>a5x`*vo*A#8W<*Zpo(*&=VkHAmUh{Gqj04<&uU=t0UpK?4h0W6 zmq4|ov@XsSPPJ%7C^so@fKR%v2h`HWFm{jVb9L;g)jj)oBGdhId!DKfcQ-ew4{VbL z!CFdOB?6xrIRlqw!IZ+>1J(LcR5)iT%tmD|sB}5xF@$HN^lp^Uy=e@1P9Z}fr9(1(Atj##QiA_{Wu%k_;=R@=3{tKX-m_DPtEA`It6hcODs+P-&Hm7AyCsUb){Xr>w6k$CQ??D!$D~JO7!E)WC}o<}r7aH=r$EiF=HsTZ8@DtibeY zqXPE_N{1625vfZSG;qFUM1xG$pS<5Wz9LTqsHj#RJLYPmx)8f_q>8k$9HgoFqHvK4 zi@5-5sYKq&qo5D^`!208&w5uW_aR?b_cou3T{L^fd$w=s2uItes*mX~5-P7bS4*u& zJec-7jrPHnjp{t@%T1?R`1`CruiIC@SDNx_N_)9Uju+K4VC7!H4M2PlN4x-Wupcjw z)#&{)w7G?jxI=pC#|!#ptFW3a83n+K@zm?`JEUz`NJ*eCe6ki-(l0x&Y9V~9SPDP8 z?QAuGDV$xP&!fcB4b5f4FOOM3_9=U=xMB8Kml-mVh9{%BQ;wn=tl*|^bqBDZ+yQ;u zXde99zj;s#Sq_6^yCVQ!Zy{g}BkdvZE^j21tb`XX0YDUw5~XqJ^XXdpN!vJRsA9Q3 z+fEiEuhvPIxz{Te!N?W>t zy-ft$wj%lI>KXDF@VI@IIJD1rs~(e5se}PZjtNbCCBNj%e>*>Ll3UC6X&f9O34O3T@dR4lztErZD zc&y&guV%GhQ&)?;lT~Te&0Z%n6@Jd-l6*G2WTU%r}3Kgr=K_v^sZ z>I3>WA5sarJI>�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 x}6#&z8U02xG2{)(w+u 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

7*P|RkGbGFnCjt5l5r!yQgyfY9~&Huj#XJ`O(ZR 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 literal 850121 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%0DaPt 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 z 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

}yQE ztaix{NwGOKI$4wK*ktCDV=}TPCDhC%{_x3IA?0J@X1fC)UR<#4gZ~;SU9-k(HdE+uVV627DYaKFKGNH-`cb`3*KBEbf($| zW4v}==kn=4?EF}v;o$qR6XY+#hn3FdJe;w% zvwq%LaJSd$(T%#3x3Luc&4M>hNh{z5c|JaJcwY6Z>h>O+{@Y1I0(Io{eNwMoR^QuK zv)Sh8j>ANY#Gb5uUAa-N+_C=FcNZKU?7VqyJ4YL%l*5|LVJBAT^tiC#?2DhJeBN)@ zn~q$3BND36ZM@z^xOc=J@$4)dp#WuJu#4}Qa}77^B+s^0G0SS;@M zbjO90le-rGboQHh$+IE+)mxe2(cIEgo;%aO@melkX~uTW-s+@^-DdpZ>$k=v$=9AK zO-Q|O=N@Urk{rwzw%|rKqAw{5rpNYGFluE{gor=+Bo65ZE5YT5{Vr$ zcHA$2VA*xPHg24evtEYRmUWjjn2D3>;Vz-9KU%MQ+R`UDoyH-sh<7m6J5X2@!Wu&L&0=7T1bbTu(|$ z*S|hqS%f{||Gq7HFQ@bI>^l?Xg4)|$*%jYq#>px+XYho34?pIk4$C^%KgHG5v|irZ zyh;B$`&ZS2FAajidoJ7+ow z7y9Yy_dV`O4KbN(Zb?2d63W@c%e&2Mt=sQc$%@Z@_+L9?dn^9%S(P`#UCQshYWC)s z`ww^o7dFw4V?^SY2Tdz{^|~#HHC6d$Dl|h)(e~l5IT>T_m8E$FU-sSCUm

&-8@3(C&pAy^j+= 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 F_Fw(tA~yg4 diff --git a/packages/swc-plugin-solid-cli/src/lib.rs b/packages/swc-plugin-solid-cli/src/lib.rs index 84eb859..84f43f1 100644 --- a/packages/swc-plugin-solid-cli/src/lib.rs +++ b/packages/swc-plugin-solid-cli/src/lib.rs @@ -97,6 +97,7 @@ impl TransformVisitor { prepend_stmt( &mut module.body, ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { + phase: Default::default(), specifiers: vec![specifier], src: Box::new(Str { span: DUMMY_SP, @@ -105,7 +106,7 @@ impl TransformVisitor { }), span: DUMMY_SP, type_only: false, - asserts: None, + with: None, })), ); } @@ -131,17 +132,21 @@ fn is_plugin_already_added( for (n, elem) in elems.iter().enumerate().take(elems.iter().len()) { // Assuming that plugins are always call expressions, and always imported as such // Can be fixed in the future by just visiting with self, and collecting all the identifiers that we find - if let Some(elem) = elem && let Expr::Call(call_expr) = elem.expr.as_expr() && let Callee::Expr(callee_expr) = &call_expr.callee { + if let Some(elem) = elem + && let Expr::Call(call_expr) = elem.expr.as_expr() + && let Callee::Expr(callee_expr) = &call_expr.callee + { if let Expr::Ident(i) = &**callee_expr { let local_name = i.sym.as_ref(); if plugin_name == local_name { // Checking if the import is from the same place - for import in &visitor.original_imports{ + for import in &visitor.original_imports { let imported_from = import.src.value.as_ref(); let import_names = get_import_names(import); - if import_names.contains(&local_name) && imported_from == plugin_import_path { + if import_names.contains(&local_name) && imported_from == plugin_import_path + { // Plugin already exists, so we don't need to add it - return n.try_into().unwrap() + return n.try_into().unwrap(); } } } @@ -227,7 +232,9 @@ fn generate_plugin_expr( let mut converted = to_expr(extra_config); if let Some(ExprOrSpread { expr, .. }) = &original_config { if let Expr::Call(call_expr) = &**expr { - if call_expr.args.len() > 0 && let Expr::Object(obj) = &*call_expr.args[0].expr { + if !call_expr.args.is_empty() + && let Expr::Object(obj) = &*call_expr.args[0].expr + { if let Expr::Object(new_cfg) = &converted { let merged = merge_objects(new_cfg, obj); converted = Expr::Object(ObjectLit { @@ -306,7 +313,11 @@ fn update_argument(visitor: &mut TransformVisitor, arg: &mut ExprOrSpread) { for prop_spread in new_props.iter_mut() { if let PropOrSpread::Prop(prop) = prop_spread { - if let Prop::KeyValue(key_value_prop) = &**prop && let Some(i) = key_value_prop.key.as_ident() && i.sym.to_string() == "plugins" && let Expr::Array(arr_lit) = &*key_value_prop.value { + if let Prop::KeyValue(key_value_prop) = &**prop + && let Some(i) = key_value_prop.key.as_ident() + && i.sym == "plugins" + && let Expr::Array(arr_lit) = &*key_value_prop.value + { *prop_spread = add_new_plugins(visitor, arr_lit); mutated_existing = true; } @@ -336,7 +347,7 @@ impl VisitMut for TransformVisitor { fn visit_mut_call_expr(&mut self, call_expr: &mut CallExpr) { if let Expr::Ident(i) = &**call_expr.callee.as_expr().unwrap() { - if i.sym.to_string() == "defineConfig" { + if i.sym == "defineConfig" { let config_arg = &mut call_expr.args[0]; update_argument(self, config_arg); } From 97eeee51552a14706698ba4796024be764e573fa Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:30:56 +0000 Subject: [PATCH 047/290] chore: bump deps --- package.json | 2 +- packages/commands/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6dee00d..fad26ee 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.0.3", "prettier": "^3.2.5", - "turbo": "^1.12.2", + "turbo": "^1.12.3", "vitest": "^1.2.2" }, "packageManager": "pnpm@8.7.5" diff --git a/packages/commands/package.json b/packages/commands/package.json index f628b3a..58f96e6 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -42,7 +42,7 @@ "access": "public" }, "dependencies": { - "@begit/core": "^0.0.12", + "@begit/core": "^0.0.13", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", From 8a31e99a16c5b06adae56372f94f2927686c2f0d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:41:00 +0000 Subject: [PATCH 048/290] fix: prevent readme from being updated if it already existed --- packages/commands/src/handlers/new.ts | 11 +++--- pnpm-lock.yaml | 52 +++++++++++++-------------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 10c844a..34be5c9 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -6,7 +6,7 @@ import { insertAtEnd, readFileToString } from "@solid-cli/utils/fs"; import { flushQueue } from "@solid-cli/utils/updates"; import { rm } from "fs/promises"; import { basename, join, resolve } from "path"; -import { Dirent, copyFileSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; +import { Dirent, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; import { downloadAndExtract } from "@begit/core"; import { transform } from "sucrase"; const gitIgnore = ` @@ -159,7 +159,7 @@ const handleNewStartProject = async (projectName: string) => { // If the user does not want ts, we create the project in a temp directory inside the project directory const tempDir = withTs ? projectName : join(projectName, ".solid-start"); - + const readmeAlreadyExists = existsSync(join(projectName, "README.md")); await spinnerify({ startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, @@ -178,8 +178,7 @@ const handleNewStartProject = async (projectName: string) => { // Add .gitignore writeFileSync(join(projectName, ".gitignore"), gitIgnore); - - await modifyReadme(projectName); + if (!readmeAlreadyExists) await modifyReadme(projectName); p.log.info(`${t.GET_STARTED} - cd ${projectName} @@ -232,6 +231,7 @@ export const handleNew = async ( // If the user does not want ts, we create the project in a temp directory inside the project directory const tempDir = withTs ? name : join(name, ".solid-start"); + const readmeAlreadyExists = existsSync(join(name, "README.md")); await spinnerify({ startText: t.CREATING_PROJECT, @@ -248,8 +248,7 @@ export const handleNew = async ( // Add .gitignore writeFileSync(join(name, ".gitignore"), gitIgnore); - - await modifyReadme(name ?? variation); + if (!readmeAlreadyExists) await modifyReadme(name ?? variation); p.log.info(`${t.GET_STARTED} - cd ${name} - npm install diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d5a7656..b4a3797 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.12.2 - version: 1.12.2 + specifier: ^1.12.3 + version: 1.12.3 vitest: specifier: ^1.2.2 version: 1.2.2(@types/node@20.11.16) @@ -27,8 +27,8 @@ importers: packages/commands: dependencies: '@begit/core': - specifier: ^0.0.12 - version: 0.0.12 + specifier: ^0.0.13 + version: 0.0.13 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -262,8 +262,8 @@ packages: regenerator-runtime: 0.14.0 dev: true - /@begit/core@0.0.12: - resolution: {integrity: sha512-L2p5O46opJM1ky7ITtglSqxxnw89SEh6Ey1Ki0Gqy1sjkervCOI0L2T7b1J5bSm3kKKIyDy5x7nl2dQGS6fkVg==} + /@begit/core@0.0.13: + resolution: {integrity: sha512-xKcBhH4EnGJ+k7zWo2OVUByEGRNGCgToaTacCWe5fh+6jLQw7MC7jjiR7an+CgxKKvnkNU/yl2/PbXZl9k9z0g==} dependencies: tar: 6.2.0 dev: false @@ -3275,64 +3275,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.12.2: - resolution: {integrity: sha512-Aq/ePQ5KNx6XGwlZWTVTqpQYfysm1vkwkI6kAYgrX5DjMWn+tUXrSgNx4YNte0F+V4DQ7PtuWX+jRG0h0ZNg0A==} + /turbo-darwin-64@1.12.3: + resolution: {integrity: sha512-dDglIaux+A4jOnB9CDH69sujmrnuLJLrKw1t3J+if6ySlFuxSwC++gDq9TVuOZo2+S7lFkGh+x5ytn3wp+jE8Q==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.12.2: - resolution: {integrity: sha512-wTr+dqkwJo/eXE+4SPTSeNBKyyfQJhI6I9sKVlCSBmtaNEqoGNgdVzgMUdqrg9AIFzLIiKO+zhfskNaSWpVFow==} + /turbo-darwin-arm64@1.12.3: + resolution: {integrity: sha512-5TqqeujEyHMoVUWGzSzUl5ERSg7HDCdbU3gBs5ziWTpFRpeJ/+Y15kYyZJcMQcubRIH3Y1hL/yA5IhlGdgXOMA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.12.2: - resolution: {integrity: sha512-BggBKrLojGarDaa2zBo+kUR3fmjpd6bLA8Unm3Aa2oJw0UvEi3Brd+w9lNsPZHXXQYBUzNUY2gCdxf3RteWb0g==} + /turbo-linux-64@1.12.3: + resolution: {integrity: sha512-yUreU+/gq4vlBtcdyfjz7slwz4zM1RG8sSXvyHmAS+QXqSrGkegg4qLl2fRbv/c3EyA/XbfcZuD6tcrXkejr6g==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.12.2: - resolution: {integrity: sha512-v/apSRvVuwYjq1D9MJFsHv2EpGd1S4VoSdZvVfW6FaM06L8CFZa92urNR1svdGYN28YVKwK9Ikc9qudC6t/d5A==} + /turbo-linux-arm64@1.12.3: + resolution: {integrity: sha512-XRwAsp2eRSqZmaMVNrmHoKqofeJMuD87zmefZLTRAObh38hIwKgyl2QRsJIbteob5RN77yFbv3lAJ36UIY5h7w==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.12.2: - resolution: {integrity: sha512-3uDdwXcRGkgopYFdPDpxQiuQjfQ12Fxq0fhj+iGymav0eWA4W4wzYwSdlUp6rT22qOBIzaEsrIspRwx1DsMkNg==} + /turbo-windows-64@1.12.3: + resolution: {integrity: sha512-CPnRfnUCtmFeShOtUdMCthySjmyHaoTyh9JueiYFvtCNeO3WfDMj63dpOQstQWHdJFYmIrIGfhAclcds9ePQYA==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.12.2: - resolution: {integrity: sha512-zNIHnwtQfJSjFi7movwhPQh2rfrcKZ7Xv609EN1yX0gEp9GxooCUi2yNnBQ8wTqFjioA2M5hZtGJQ0RrKaEm/Q==} + /turbo-windows-arm64@1.12.3: + resolution: {integrity: sha512-cYA/wlzvp4vlCNHYJ2AjNS3FLXWwUC/5CJompBkTeKFFB6AviE/iLkbIhFikCVSNXZk/3AGanpMUXIkt3bdlwg==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.12.2: - resolution: {integrity: sha512-BcoQjBZ+LJCMdjzWhzQflOinUjek28rWXj07aaaAQ8T3Ehs0JFSjIsXOm4qIbo52G4xk3gFVcUtJhh/QRADl7g==} + /turbo@1.12.3: + resolution: {integrity: sha512-a6q8I0TK9ohACYbkmxzG/JYPuDC4VCvfmXLTlf321qQ4BIAhoyaOj/O2g+zJ6L1vNYnZ82G4LrbMfgLLngbLsg==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.12.2 - turbo-darwin-arm64: 1.12.2 - turbo-linux-64: 1.12.2 - turbo-linux-arm64: 1.12.2 - turbo-windows-64: 1.12.2 - turbo-windows-arm64: 1.12.2 + turbo-darwin-64: 1.12.3 + turbo-darwin-arm64: 1.12.3 + turbo-linux-64: 1.12.3 + turbo-linux-arm64: 1.12.3 + turbo-windows-64: 1.12.3 + turbo-windows-arm64: 1.12.3 dev: true /type-detect@4.0.8: From 5ede362b182bf22ddd8a0357cabb23ac4abb3d1a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 8 Feb 2024 19:46:11 +0000 Subject: [PATCH 049/290] release: bump versions --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 58f96e6..dd7bd56 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.11", + "version": "0.0.12", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index a1dcac0..ca20092 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.19", + "version": "0.0.20", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 3751aaf..0332699 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.16", + "version": "0.0.17", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/ui/package.json b/packages/ui/package.json index 369ddd4..bb5b776 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.9", + "version": "0.0.10", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 88abf01..7d1a218 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.10", + "version": "0.0.11", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 1b9128e7e7758174b0c2180a9b6b1020fa56f73b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:12:08 +0000 Subject: [PATCH 050/290] chore: bump deps --- package.json | 2 +- packages/commands/package.json | 4 +- packages/core/package.json | 6 +- packages/create-solid/package.json | 2 +- packages/reactivity/package.json | 2 +- packages/swc-plugin-solid-cli/Cargo.lock | 123 ++++++------ .../output/swc_plugin_solid_cli.wasm | Bin 768179 -> 770715 bytes packages/ui/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 186 +++++++++--------- 10 files changed, 167 insertions(+), 168 deletions(-) diff --git a/package.json b/package.json index fad26ee..0bdba7e 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.0.3", "prettier": "^3.2.5", - "turbo": "^1.12.3", + "turbo": "^1.12.4", "vitest": "^1.2.2" }, "packageManager": "pnpm@8.7.5" diff --git a/packages/commands/package.json b/packages/commands/package.json index dd7bd56..af6a6b6 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,9 +33,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.16", + "@types/node": "^20.11.17", "prettier": "^3.2.5", - "tsup": "^8.0.1", + "tsup": "^8.0.2", "typescript": "^5.3.3" }, "publishConfig": { diff --git a/packages/core/package.json b/packages/core/package.json index ca20092..fc9140a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.0", + "@swc/core": "^1.4.1", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -42,9 +42,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.16", + "@types/node": "^20.11.17", "jiti": "^1.21.0", - "tsup": "^8.0.1", + "tsup": "^8.0.2", "typescript": "^5.3.3" }, "publishConfig": { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 0332699..b0c223d 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@solid-cli/commands": "workspace:*", "jiti": "^1.21.0", - "tsup": "^8.0.1", + "tsup": "^8.0.2", "typescript": "^5.3.3", "@clack/prompts": "0.7.0", "picocolors": "^1.0.0" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 03ac65e..6e36c3d 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,7 +28,7 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.0.1", + "tsup": "^8.0.2", "typescript": "^5.3.3" }, "publishConfig": { diff --git a/packages/swc-plugin-solid-cli/Cargo.lock b/packages/swc-plugin-solid-cli/Cargo.lock index 1f9644e..5952fed 100644 --- a/packages/swc-plugin-solid-cli/Cargo.lock +++ b/packages/swc-plugin-solid-cli/Cargo.lock @@ -29,9 +29,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -40,9 +40,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" dependencies = [ "cfg-if", "getrandom", @@ -206,9 +206,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -328,9 +328,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "equivalent" @@ -425,7 +425,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] @@ -445,9 +445,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "hex" @@ -486,9 +486,9 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -637,19 +637,18 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -660,7 +659,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.5", + "hermit-abi 0.3.6", "libc", ] @@ -1254,7 +1253,7 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "630c761c74ac8021490b78578cc2223aa4a568241e26505c27bf0e4fd4ad8ec2" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "anyhow", "dashmap", "once_cell", @@ -1264,9 +1263,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.16" +version = "0.33.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a15b8a5ec7b3c87b5c602dec00caf3dbb07fe2daaaa1d144d0c00a612e0890c" +checksum = "095c158fe55b36faeebb4274692643a6d7cdc5b7902e1d5968ddbe52b7de1d1c" dependencies = [ "anyhow", "ast_node", @@ -1296,9 +1295,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c29e3b76a63111ef318f161bc413dfc093f21da1afca9ba5cdd6442b7069d65b" +checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" dependencies = [ "anyhow", "indexmap", @@ -1323,9 +1322,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.90.3" +version = "0.90.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84315f61728c129dd495f7cf7a5df9eb3966696e1cb569abfc92097daff2d34" +checksum = "28da75904d199c7bb0a7ae7a6e07955ac70be3e759028f575d0aa3b7faa74ea0" dependencies = [ "once_cell", "swc_atoms", @@ -1345,9 +1344,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.112.0" +version = "0.112.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f90ae61d067206a5ff0c3a63d7d279346fa6562c08e251e32a07654f5b9fab1" +checksum = "852a48a24a2533de88298c6b25355bc68fdee31ac21cb4fb8939b7001715353c" dependencies = [ "bitflags 2.4.2", "bytecheck", @@ -1365,9 +1364,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.148.0" +version = "0.148.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52858517008358500fcc328e268b0a9b8b244d883743f293310d7d11636c4fcc" +checksum = "d79df3f8c5ed028fce5dc24acb83002c0854f8b9d7e893292aeee394a6b9eaf4" dependencies = [ "memchr", "num-bigint", @@ -1396,9 +1395,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.192.0" +version = "0.192.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35644f18401007715008829fd93d26359166b295d9152b2bd3dbf60e88065ab3" +checksum = "346fdd6d2e1204aac567a6c65590c1655a25deb11e8fb95fe7d6cf4fe6b54a5e" dependencies = [ "arrayvec", "indexmap", @@ -1429,9 +1428,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.143.0" +version = "0.143.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98edd7196fbeda4a323c5a87da151bb7474ad01b606fc0572fde73c50e9f887e" +checksum = "90ff55811ed5de14b05e9a2979bae2bce3c807582f559b4325948463265307d9" dependencies = [ "either", "new_debug_unreachable", @@ -1451,9 +1450,9 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.22.18" +version = "0.22.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfc1ad4ecd99954ab9304eaaeccce7ba5d1e2d27102eea78e6817d1d21bea58" +checksum = "b41fb62ef85a23515889fc99eac156f9afc4eb10c8eaadf70ffee53982b2ab82" dependencies = [ "anyhow", "hex", @@ -1464,9 +1463,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.137.0" +version = "0.137.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0daa5b2deffddd9716ba8b203d0782bbbbe9d86864c2cabcb47d20929c998c70" +checksum = "803bb435fdd532d5c931f0d487e48dbc94750d26c9336d79a6f1c04c62f08d93" dependencies = [ "better_scoped_tls", "bitflags 2.4.2", @@ -1499,9 +1498,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.198.0" +version = "0.198.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6219f0f3885d9b0ba85e30760fb869e219eb956ec3dbbc18f6915b41c3b193c" +checksum = "f3c6fffe4d6e3609fdd6c768cc063dbc9f5101f9be0db1168ec76ace979cf616" dependencies = [ "dashmap", "indexmap", @@ -1523,9 +1522,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.140.0" +version = "0.140.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b17a7a967760a4fa784b746461dfae6fa67bd7ada40d13f5c66ecc4f837bc2" +checksum = "74719bd3f5a1dc2927d0ed0ffdd44ec3430eb8561cc5d71f9f663d425a185062" dependencies = [ "ansi_term", "anyhow", @@ -1549,9 +1548,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.23.0" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533b080d3745b61598963d177cd22e26d0b2cab26b761a7aa08d545bbb0ee886" +checksum = "a0950f5344e7125bdcd42055eec6c2c0abe44b6952749967b206832c65e27623" dependencies = [ "indexmap", "rustc-hash", @@ -1566,9 +1565,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.127.0" +version = "0.127.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "998fccc5bc77e7fa8637ae17f9b4cb8ffc286d995559b6a11b38eedd5f5e6e83" +checksum = "8ff9e77ea18468895d26bd38656885860fede2acd24d1687f64363aaf8910441" dependencies = [ "indexmap", "num_cpus", @@ -1584,9 +1583,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.98.0" +version = "0.98.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d322e023d73722c36db95c4bf438d9595bf0a80fe4e28c8f9aef7e7b8f853e" +checksum = "cdb71511a816c7c84ddc96e6939389be261caf20858486a5e76948551f110e1f" dependencies = [ "num-bigint", "swc_atoms", @@ -1609,9 +1608,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.17.15" +version = "0.17.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aed28e3bcc05839332abfbdeeb49686083f5542452aed7662d76cf062f1cbbc" +checksum = "87dd7ff934a74cee8f2328c4fdd22113a36358ff390845f565bef1e1cf3b0f90" dependencies = [ "anyhow", "miette", @@ -1622,9 +1621,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.21.16" +version = "0.21.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cc80877ed5595b496b7cce938483be24cfa6c358b8d17aff789961c31104a9" +checksum = "ffd32eda2dd2c725f8d4448d0013c3b5466118e4ff5c30aff2c04f6750f7238b" dependencies = [ "indexmap", "petgraph", @@ -1665,9 +1664,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.41.0" +version = "0.41.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e73a136e0ba7cc97387ea925db61be0170fe541cb66558588604c0e0e494f9" +checksum = "e0481ceefd2f896c792692b18043e45b68614ae0266c65d4addbcf7f6c8090d6" dependencies = [ "better_scoped_tls", "rkyv", @@ -1679,9 +1678,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.21.17" +version = "0.21.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e52754d1060c70b44e6d4d65ebfc7bde9769d5b0e6e8e1e6a4c051980459473" +checksum = "1247df8abb51666eede165577d93c1476b6aca7ab7bf58e0fff6015fad6fb1b5" dependencies = [ "tracing", ] @@ -1782,9 +1781,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.35.17" +version = "0.35.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c090eccb0eab8cc5ef0667d76f0d8b6dfaf264ed76f94d24f72d54421604a8d" +checksum = "d90b0f069d03bcee35190a27083f968d93ca6359dcea51ba274a583dc2a3ec56" dependencies = [ "ansi_term", "cargo_metadata 0.15.4", @@ -1830,18 +1829,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", diff --git a/packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm b/packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm index 376d98074e3a74f81f25df7a82d123db99872bbf..61bed960597f37edd8303f9c789472e3e9a3edee 100644 GIT binary patch delta 127218 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 delta 125134 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≷pfBuuRfff<%p$c2yy!ghs9~LiMk!RI- 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 diff --git a/packages/ui/package.json b/packages/ui/package.json index bb5b776..2864900 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.0.1", + "tsup": "^8.0.2", "typescript": "^5.3.3", - "@types/node": "20.11.16" + "@types/node": "20.11.17" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 7d1a218..ccbe78d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,9 +63,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "20.11.16", + "@types/node": "20.11.17", "jiti": "^1.21.0", - "tsup": "^8.0.1", + "tsup": "^8.0.2", "typescript": "^5.3.3", "vitest": "^1.2.2" }, @@ -76,7 +76,7 @@ "@clack/core": "0.3.3", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.0", + "@swc/core": "^1.4.1", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b4a3797..db62aab 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.12.3 - version: 1.12.3 + specifier: ^1.12.4 + version: 1.12.4 vitest: specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.16) + version: 1.2.2(@types/node@20.11.17) packages/commands: dependencies: @@ -55,14 +55,14 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.16 - version: 20.11.16 + specifier: ^20.11.17 + version: 20.11.17 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: - specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) + specifier: ^8.0.2 + version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.1 + version: 1.4.1 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -113,14 +113,14 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.16 - version: 20.11.16 + specifier: ^20.11.17 + version: 20.11.17 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: - specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) + specifier: ^8.0.2 + version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -140,8 +140,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 tsup: - specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) + specifier: ^8.0.2 + version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -149,8 +149,8 @@ importers: packages/reactivity: devDependencies: tsup: - specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) + specifier: ^8.0.2 + version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -176,11 +176,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.16 - version: 20.11.16 + specifier: 20.11.17 + version: 20.11.17 tsup: - specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) + specifier: ^8.0.2 + version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -197,8 +197,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.1 + version: 1.4.1 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -216,20 +216,20 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: 20.11.16 - version: 20.11.16 + specifier: 20.11.17 + version: 20.11.17 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: - specifier: ^8.0.1 - version: 8.0.1(@swc/core@1.4.0)(typescript@5.3.3) + specifier: ^8.0.2 + version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 vitest: specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.16) + version: 1.2.2(@types/node@20.11.17) packages: @@ -899,88 +899,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.4.0: - resolution: {integrity: sha512-UTJ/Vz+s7Pagef6HmufWt6Rs0aUu+EJF4Pzuwvr7JQQ5b1DZeAAUeUtkUTFx/PvCbM8Xfw4XdKBUZfrIKCfW8A==} + /@swc/core-darwin-arm64@1.4.1: + resolution: {integrity: sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.0: - resolution: {integrity: sha512-f8v58u2GsGak8EtZFN9guXqE0Ep10Suny6xriaW2d8FGqESPyNrnBzli3aqkSeQk5gGqu2zJ7WiiKp3XoUOidA==} + /@swc/core-darwin-x64@1.4.1: + resolution: {integrity: sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.0: - resolution: {integrity: sha512-q2KAkBzmPcTnRij/Y1fgHCKAGevUX/H4uUESrw1J5gmUg9Qip6onKV80lTumA1/aooGJ18LOsB31qdbwmZk9OA==} + /@swc/core-linux-arm-gnueabihf@1.4.1: + resolution: {integrity: sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.0: - resolution: {integrity: sha512-SknGu96W0mzHtLHWm+62fk5+Omp9fMPFO7AWyGFmz2tr8EgRRXtTSrBUnWhAbgcalnhen48GsvtMdxf1KNputg==} + /@swc/core-linux-arm64-gnu@1.4.1: + resolution: {integrity: sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.0: - resolution: {integrity: sha512-/k3TDvpBRMDNskHooNN1KqwUhcwkfBlIYxRTnJvsfT2C7My4pffR+4KXmt0IKynlTTbCdlU/4jgX4801FSuliw==} + /@swc/core-linux-arm64-musl@1.4.1: + resolution: {integrity: sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.0: - resolution: {integrity: sha512-GYsTMvNt5+WTVlwwQzOOWsPMw6P/F41u5PGHWmfev8Nd4QJ1h3rWPySKk4mV42IJwH9MgQCVSl3ygwNqwl6kFg==} + /@swc/core-linux-x64-gnu@1.4.1: + resolution: {integrity: sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.0: - resolution: {integrity: sha512-jGVPdM/VwF7kK/uYRW5N6FwzKf/FnDjGIR3RPvQokjYJy7Auk+3Oj21C0Jev7sIT9RYnO/TrFEoEozKeD/z2Qw==} + /@swc/core-linux-x64-musl@1.4.1: + resolution: {integrity: sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.0: - resolution: {integrity: sha512-biHYm1AronEKlt47O/H8sSOBM2BKXMmWT+ApvlxUw50m1RGNnVnE0bgY7tylFuuSiWyXsQPJbmUV708JqORXVg==} + /@swc/core-win32-arm64-msvc@1.4.1: + resolution: {integrity: sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.0: - resolution: {integrity: sha512-TL5L2tFQb19kJwv6+elToGBj74QXCn9j+hZfwQatvZEJRA5rDK16eH6oAE751dGUArhnWlW3Vj65hViPvTuycw==} + /@swc/core-win32-ia32-msvc@1.4.1: + resolution: {integrity: sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.0: - resolution: {integrity: sha512-e2xVezU7XZ2Stzn4i7TOQe2Kn84oYdG0M3A7XI7oTdcpsKCcKwgiMoroiAhqCv+iN20KNqhnWwJiUiTj/qN5AA==} + /@swc/core-win32-x64-msvc@1.4.1: + resolution: {integrity: sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.0: - resolution: {integrity: sha512-wc5DMI5BJftnK0Fyx9SNJKkA0+BZSJQx8430yutWmsILkHMBD3Yd9GhlMaxasab9RhgKqZp7Ht30hUYO5ZDvQg==} + /@swc/core@1.4.1: + resolution: {integrity: sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -992,16 +992,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.0 - '@swc/core-darwin-x64': 1.4.0 - '@swc/core-linux-arm-gnueabihf': 1.4.0 - '@swc/core-linux-arm64-gnu': 1.4.0 - '@swc/core-linux-arm64-musl': 1.4.0 - '@swc/core-linux-x64-gnu': 1.4.0 - '@swc/core-linux-x64-musl': 1.4.0 - '@swc/core-win32-arm64-msvc': 1.4.0 - '@swc/core-win32-ia32-msvc': 1.4.0 - '@swc/core-win32-x64-msvc': 1.4.0 + '@swc/core-darwin-arm64': 1.4.1 + '@swc/core-darwin-x64': 1.4.1 + '@swc/core-linux-arm-gnueabihf': 1.4.1 + '@swc/core-linux-arm64-gnu': 1.4.1 + '@swc/core-linux-arm64-musl': 1.4.1 + '@swc/core-linux-x64-gnu': 1.4.1 + '@swc/core-linux-x64-musl': 1.4.1 + '@swc/core-win32-arm64-msvc': 1.4.1 + '@swc/core-win32-ia32-msvc': 1.4.1 + '@swc/core-win32-x64-msvc': 1.4.1 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1021,8 +1021,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.16: - resolution: {integrity: sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==} + /@types/node@20.11.17: + resolution: {integrity: sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==} dependencies: undici-types: 5.26.5 dev: true @@ -3221,8 +3221,8 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.1(@swc/core@1.4.0)(typescript@5.3.3): - resolution: {integrity: sha512-hvW7gUSG96j53ZTSlT4j/KL0q1Q2l6TqGBFc6/mu/L46IoNWqLLUzLRLP1R8Q7xrJTmkDxxDoojV5uCVs1sVOg==} + /tsup@8.0.2(@swc/core@1.4.1)(typescript@5.3.3): + resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -3240,7 +3240,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.4.0 + '@swc/core': 1.4.1 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3275,64 +3275,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.12.3: - resolution: {integrity: sha512-dDglIaux+A4jOnB9CDH69sujmrnuLJLrKw1t3J+if6ySlFuxSwC++gDq9TVuOZo2+S7lFkGh+x5ytn3wp+jE8Q==} + /turbo-darwin-64@1.12.4: + resolution: {integrity: sha512-dBwFxhp9isTa9RS/fz2gDVk5wWhKQsPQMozYhjM7TT4jTrnYn0ZJMzr7V3B/M/T8QF65TbniW7w1gtgxQgX5Zg==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.12.3: - resolution: {integrity: sha512-5TqqeujEyHMoVUWGzSzUl5ERSg7HDCdbU3gBs5ziWTpFRpeJ/+Y15kYyZJcMQcubRIH3Y1hL/yA5IhlGdgXOMA==} + /turbo-darwin-arm64@1.12.4: + resolution: {integrity: sha512-1Uo5iI6xsJ1j9ObsqxYRsa3W26mEbUe6fnj4rQYV6kDaqYD54oAMJ6hM53q9rB8JvFxwdrUXGp3PwTw9A0qqkA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.12.3: - resolution: {integrity: sha512-yUreU+/gq4vlBtcdyfjz7slwz4zM1RG8sSXvyHmAS+QXqSrGkegg4qLl2fRbv/c3EyA/XbfcZuD6tcrXkejr6g==} + /turbo-linux-64@1.12.4: + resolution: {integrity: sha512-ONg2aSqKP7LAQOg7ysmU5WpEQp4DGNxSlAiR7um+LKtbmC/UxogbR5+T+Uuq6zGuQ5kJyKjWJ4NhtvUswOqBsA==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.12.3: - resolution: {integrity: sha512-XRwAsp2eRSqZmaMVNrmHoKqofeJMuD87zmefZLTRAObh38hIwKgyl2QRsJIbteob5RN77yFbv3lAJ36UIY5h7w==} + /turbo-linux-arm64@1.12.4: + resolution: {integrity: sha512-9FPufkwdgfIKg/9jj87Cdtftw8o36y27/S2vLN7FTR2pp9c0MQiTBOLVYadUr1FlShupddmaMbTkXEhyt9SdrA==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.12.3: - resolution: {integrity: sha512-CPnRfnUCtmFeShOtUdMCthySjmyHaoTyh9JueiYFvtCNeO3WfDMj63dpOQstQWHdJFYmIrIGfhAclcds9ePQYA==} + /turbo-windows-64@1.12.4: + resolution: {integrity: sha512-2mOtxHW5Vjh/5rDVu/aFwsMzI+chs8XcEuJHlY1sYOpEymYTz+u6AXbnzRvwZFMrLKr7J7fQOGl+v96sLKbNdA==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.12.3: - resolution: {integrity: sha512-cYA/wlzvp4vlCNHYJ2AjNS3FLXWwUC/5CJompBkTeKFFB6AviE/iLkbIhFikCVSNXZk/3AGanpMUXIkt3bdlwg==} + /turbo-windows-arm64@1.12.4: + resolution: {integrity: sha512-nOY5wae9qnxPOpT1fRuYO0ks6dTwpKMPV6++VkDkamFDLFHUDVM/9kmD2UTeh1yyrKnrZksbb9zmShhmfj1wog==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.12.3: - resolution: {integrity: sha512-a6q8I0TK9ohACYbkmxzG/JYPuDC4VCvfmXLTlf321qQ4BIAhoyaOj/O2g+zJ6L1vNYnZ82G4LrbMfgLLngbLsg==} + /turbo@1.12.4: + resolution: {integrity: sha512-yUJ7elEUSToiGwFZogXpYKJpQ0BvaMbkEuQECIWtkBLcmWzlMOt6bActsIm29oN83mRU0WbzGt4e8H1KHWedhg==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.12.3 - turbo-darwin-arm64: 1.12.3 - turbo-linux-64: 1.12.3 - turbo-linux-arm64: 1.12.3 - turbo-windows-64: 1.12.3 - turbo-windows-arm64: 1.12.3 + turbo-darwin-64: 1.12.4 + turbo-darwin-arm64: 1.12.4 + turbo-linux-64: 1.12.4 + turbo-linux-arm64: 1.12.4 + turbo-windows-64: 1.12.4 + turbo-windows-arm64: 1.12.4 dev: true /type-detect@4.0.8: @@ -3432,7 +3432,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.2.2(@types/node@20.11.16): + /vite-node@1.2.2(@types/node@20.11.17): resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3441,7 +3441,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.16) + vite: 5.0.10(@types/node@20.11.17) transitivePeerDependencies: - '@types/node' - less @@ -3453,7 +3453,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.16): + /vite@5.0.10(@types/node@20.11.17): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3481,7 +3481,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.16 + '@types/node': 20.11.17 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3489,7 +3489,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.2.2(@types/node@20.11.16): + /vitest@1.2.2(@types/node@20.11.17): resolution: {integrity: sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3514,7 +3514,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.16 + '@types/node': 20.11.17 '@vitest/expect': 1.2.2 '@vitest/runner': 1.2.2 '@vitest/snapshot': 1.2.2 @@ -3533,8 +3533,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.8.2 - vite: 5.0.10(@types/node@20.11.16) - vite-node: 1.2.2(@types/node@20.11.16) + vite: 5.0.10(@types/node@20.11.17) + vite-node: 1.2.2(@types/node@20.11.17) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 9b6646d7f4865f82a7fc87433ad70979ce479de4 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:20:17 +0000 Subject: [PATCH 051/290] chore: update actions --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6f877b5..357d2cb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,15 +11,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 with: version: latest - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 - name: Install dependencies run: pnpm install --ignore-scripts From 3a99d9db5b3c07fcb093a0edc1bb6f8167db515e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:09:22 +0000 Subject: [PATCH 052/290] chore: bump deps --- docs/package.json | 4 +- docs/pnpm-lock.yaml | 178 ++++++++++++++++----------------- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- pnpm-lock.yaml | 40 ++++---- 7 files changed, 115 insertions(+), 115 deletions(-) diff --git a/docs/package.json b/docs/package.json index a632377..ea22902 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,8 +8,8 @@ }, "devDependencies": { "flexsearch": "^0.7.43", - "vitepress": "1.0.0-rc.41", + "vitepress": "1.0.0-rc.42", "vitepress-plugin-search": "1.0.4-alpha.22", - "vue": "^3.4.15" + "vue": "^3.4.19" } } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index cbe41f6..2089310 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -12,14 +12,14 @@ importers: specifier: ^0.7.43 version: 0.7.43 vitepress: - specifier: 1.0.0-rc.41 - version: 1.0.0-rc.41(@algolia/client-search@4.22.1)(search-insights@2.13.0) + specifier: 1.0.0-rc.42 + version: 1.0.0-rc.42(@algolia/client-search@4.22.1)(search-insights@2.13.0) vitepress-plugin-search: specifier: 1.0.4-alpha.22 - version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.41)(vue@3.4.15) + version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.42)(vue@3.4.19) vue: - specifier: ^3.4.15 - version: 3.4.15 + specifier: ^3.4.19 + version: 3.4.19 packages: @@ -167,8 +167,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/parser@7.23.6: - resolution: {integrity: sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==} + /@babel/parser@7.23.9: + resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==} engines: {node: '>=6.0.0'} hasBin: true dependencies: @@ -542,14 +542,14 @@ packages: dev: true optional: true - /@shikijs/core@1.0.0-beta.6: - resolution: {integrity: sha512-dHbpxvRz8G3NcEWLYh3TkVwqVswqDyHKHqWi+7c72hm+yIumYJwdDuQIEjT4z5qxNzyzKQGnEeb9b5jWPdy3vA==} + /@shikijs/core@1.1.2: + resolution: {integrity: sha512-ERVzNQz88ZkDqUpWeC57Kp+Kmx5RjqeDBR1M8AGWGom4yrkITiTfXCGmjchlDSw12MhDTuPYR4HVFW8uT61RaQ==} dev: true - /@shikijs/transformers@1.0.0-beta.6: - resolution: {integrity: sha512-VuZ+drxEUO67uEEkpy2RTODjuO3oI49JW5JlNeqR7dHACbaybxKMwuf3g0EqqQ9ZpJ40YhdXy3GjCsohs6dSDw==} + /@shikijs/transformers@1.1.2: + resolution: {integrity: sha512-tldkUMW7RBkU2F6eXbiRMw3ja+hQer1EjwhD2NGOv6K0pgZdVp3JKjU8uisRtg65tyBqrVHq7zlLHVk7EKmUZA==} dependencies: - shiki: 1.0.0-beta.6 + shiki: 1.1.2 dev: true /@types/estree@1.0.5: @@ -586,7 +586,7 @@ packages: resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} dev: true - /@vitejs/plugin-vue@5.0.3(vite@5.0.12)(vue@3.4.15): + /@vitejs/plugin-vue@5.0.3(vite@5.0.12)(vue@3.4.19): resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: @@ -594,45 +594,45 @@ packages: vue: ^3.2.25 dependencies: vite: 5.0.12 - vue: 3.4.15 + vue: 3.4.19 dev: true - /@vue/compiler-core@3.4.15: - resolution: {integrity: sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==} + /@vue/compiler-core@3.4.19: + resolution: {integrity: sha512-gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w==} dependencies: - '@babel/parser': 7.23.6 - '@vue/shared': 3.4.15 + '@babel/parser': 7.23.9 + '@vue/shared': 3.4.19 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.0.2 dev: true - /@vue/compiler-dom@3.4.15: - resolution: {integrity: sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==} + /@vue/compiler-dom@3.4.19: + resolution: {integrity: sha512-vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA==} dependencies: - '@vue/compiler-core': 3.4.15 - '@vue/shared': 3.4.15 + '@vue/compiler-core': 3.4.19 + '@vue/shared': 3.4.19 dev: true - /@vue/compiler-sfc@3.4.15: - resolution: {integrity: sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==} + /@vue/compiler-sfc@3.4.19: + resolution: {integrity: sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==} dependencies: - '@babel/parser': 7.23.6 - '@vue/compiler-core': 3.4.15 - '@vue/compiler-dom': 3.4.15 - '@vue/compiler-ssr': 3.4.15 - '@vue/shared': 3.4.15 + '@babel/parser': 7.23.9 + '@vue/compiler-core': 3.4.19 + '@vue/compiler-dom': 3.4.19 + '@vue/compiler-ssr': 3.4.19 + '@vue/shared': 3.4.19 estree-walker: 2.0.2 - magic-string: 0.30.5 + magic-string: 0.30.7 postcss: 8.4.33 source-map-js: 1.0.2 dev: true - /@vue/compiler-ssr@3.4.15: - resolution: {integrity: sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==} + /@vue/compiler-ssr@3.4.19: + resolution: {integrity: sha512-P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw==} dependencies: - '@vue/compiler-dom': 3.4.15 - '@vue/shared': 3.4.15 + '@vue/compiler-dom': 3.4.19 + '@vue/shared': 3.4.19 dev: true /@vue/devtools-api@7.0.14: @@ -662,54 +662,54 @@ packages: rfdc: 1.3.1 dev: true - /@vue/reactivity@3.4.15: - resolution: {integrity: sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==} + /@vue/reactivity@3.4.19: + resolution: {integrity: sha512-+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA==} dependencies: - '@vue/shared': 3.4.15 + '@vue/shared': 3.4.19 dev: true - /@vue/runtime-core@3.4.15: - resolution: {integrity: sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==} + /@vue/runtime-core@3.4.19: + resolution: {integrity: sha512-/Z3tFwOrerJB/oyutmJGoYbuoadphDcJAd5jOuJE86THNZji9pYjZroQ2NFsZkTxOq0GJbb+s2kxTYToDiyZzw==} dependencies: - '@vue/reactivity': 3.4.15 - '@vue/shared': 3.4.15 + '@vue/reactivity': 3.4.19 + '@vue/shared': 3.4.19 dev: true - /@vue/runtime-dom@3.4.15: - resolution: {integrity: sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==} + /@vue/runtime-dom@3.4.19: + resolution: {integrity: sha512-IyZzIDqfNCF0OyZOauL+F4yzjMPN2rPd8nhqPP2N1lBn3kYqJpPHHru+83Rkvo2lHz5mW+rEeIMEF9qY3PB94g==} dependencies: - '@vue/runtime-core': 3.4.15 - '@vue/shared': 3.4.15 + '@vue/runtime-core': 3.4.19 + '@vue/shared': 3.4.19 csstype: 3.1.3 dev: true - /@vue/server-renderer@3.4.15(vue@3.4.15): - resolution: {integrity: sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==} + /@vue/server-renderer@3.4.19(vue@3.4.19): + resolution: {integrity: sha512-eAj2p0c429RZyyhtMRnttjcSToch+kTWxFPHlzGMkR28ZbF1PDlTcmGmlDxccBuqNd9iOQ7xPRPAGgPVj+YpQw==} peerDependencies: - vue: 3.4.15 + vue: 3.4.19 dependencies: - '@vue/compiler-ssr': 3.4.15 - '@vue/shared': 3.4.15 - vue: 3.4.15 + '@vue/compiler-ssr': 3.4.19 + '@vue/shared': 3.4.19 + vue: 3.4.19 dev: true - /@vue/shared@3.4.15: - resolution: {integrity: sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g==} + /@vue/shared@3.4.19: + resolution: {integrity: sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==} dev: true - /@vueuse/core@10.7.2(vue@3.4.15): + /@vueuse/core@10.7.2(vue@3.4.19): resolution: {integrity: sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ==} dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.7.2 - '@vueuse/shared': 10.7.2(vue@3.4.15) - vue-demi: 0.14.6(vue@3.4.15) + '@vueuse/shared': 10.7.2(vue@3.4.19) + vue-demi: 0.14.6(vue@3.4.19) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.15): + /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.19): resolution: {integrity: sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==} peerDependencies: async-validator: '*' @@ -750,10 +750,10 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.7.2(vue@3.4.15) - '@vueuse/shared': 10.7.2(vue@3.4.15) + '@vueuse/core': 10.7.2(vue@3.4.19) + '@vueuse/shared': 10.7.2(vue@3.4.19) focus-trap: 7.5.4 - vue-demi: 0.14.6(vue@3.4.15) + vue-demi: 0.14.6(vue@3.4.19) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -763,10 +763,10 @@ packages: resolution: {integrity: sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ==} dev: true - /@vueuse/shared@10.7.2(vue@3.4.15): + /@vueuse/shared@10.7.2(vue@3.4.19): resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} dependencies: - vue-demi: 0.14.6(vue@3.4.15) + vue-demi: 0.14.6(vue@3.4.19) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -876,8 +876,8 @@ packages: uc.micro: 1.0.6 dev: true - /magic-string@0.30.5: - resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} + /magic-string@0.30.7: + resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -968,10 +968,10 @@ packages: resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} dev: true - /shiki@1.0.0-beta.6: - resolution: {integrity: sha512-lS60hZmzma3ZDVVjk0k33zwUgsB/12QfWNAsKy1gsGpG211JNfAdMN+FBGs4qTTxUNLqfS7nxmpckqDadIwiWQ==} + /shiki@1.1.2: + resolution: {integrity: sha512-qNzFwTv5uhEDNUIwp7wHjsrffVeLbmOgWnM5mZZhoiz7G2qAUvqVfUzuWfieD45/YAKipzCtdV9SndacKtABow==} dependencies: - '@shikijs/core': 1.0.0-beta.6 + '@shikijs/core': 1.1.2 dev: true /source-map-js@1.0.2: @@ -1032,7 +1032,7 @@ packages: fsevents: 2.3.3 dev: true - /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.41)(vue@3.4.15): + /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.42)(vue@3.4.19): resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: @@ -1045,16 +1045,16 @@ packages: flexsearch: 0.7.43 glob-to-regexp: 0.4.1 markdown-it: 13.0.2 - vitepress: 1.0.0-rc.41(@algolia/client-search@4.22.1)(search-insights@2.13.0) - vue: 3.4.15 + vitepress: 1.0.0-rc.42(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vue: 3.4.19 dev: true - /vitepress@1.0.0-rc.41(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-PAEoIIc9J//k/Wg39C6k86hZpXPmLZjRiTBwieDNeYGdevD7xr5Ve8o1W/w+e9dtyQMkuvzgianEamXDX3aj7g==} + /vitepress@1.0.0-rc.42(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-VeiVVXFblt/sjruFSJBNChMWwlztMrRMe8UXdNpf4e05mKtTYEY38MF5qoP90KxPTCfMQiKqwEGwXAGuOTK8HQ==} hasBin: true peerDependencies: markdown-it-mathjax3: ^4.3.2 - postcss: ^8.4.33 + postcss: ^8.4.34 peerDependenciesMeta: markdown-it-mathjax3: optional: true @@ -1063,19 +1063,19 @@ packages: dependencies: '@docsearch/css': 3.5.2 '@docsearch/js': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) - '@shikijs/core': 1.0.0-beta.6 - '@shikijs/transformers': 1.0.0-beta.6 + '@shikijs/core': 1.1.2 + '@shikijs/transformers': 1.1.2 '@types/markdown-it': 13.0.7 - '@vitejs/plugin-vue': 5.0.3(vite@5.0.12)(vue@3.4.15) + '@vitejs/plugin-vue': 5.0.3(vite@5.0.12)(vue@3.4.19) '@vue/devtools-api': 7.0.14 - '@vueuse/core': 10.7.2(vue@3.4.15) - '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.15) + '@vueuse/core': 10.7.2(vue@3.4.19) + '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.19) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 6.3.0 - shiki: 1.0.0-beta.6 + shiki: 1.1.2 vite: 5.0.12 - vue: 3.4.15 + vue: 3.4.19 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -1104,7 +1104,7 @@ packages: - universal-cookie dev: true - /vue-demi@0.14.6(vue@3.4.15): + /vue-demi@0.14.6(vue@3.4.19): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -1116,20 +1116,20 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.15 + vue: 3.4.19 dev: true - /vue@3.4.15: - resolution: {integrity: sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==} + /vue@3.4.19: + resolution: {integrity: sha512-W/7Fc9KUkajFU8dBeDluM4sRGc/aa4YJnOYck8dkjgZoXtVsn3OeTGni66FV1l3+nvPA7VBFYtPioaGKUmEADw==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.15 - '@vue/compiler-sfc': 3.4.15 - '@vue/runtime-dom': 3.4.15 - '@vue/server-renderer': 3.4.15(vue@3.4.15) - '@vue/shared': 3.4.15 + '@vue/compiler-dom': 3.4.19 + '@vue/compiler-sfc': 3.4.19 + '@vue/runtime-dom': 3.4.19 + '@vue/server-renderer': 3.4.19(vue@3.4.19) + '@vue/shared': 3.4.19 dev: true diff --git a/packages/commands/package.json b/packages/commands/package.json index af6a6b6..6e8d64c 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.17", + "@types/node": "^20.11.19", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.3.3" diff --git a/packages/core/package.json b/packages/core/package.json index fc9140a..a6f7602 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.17", + "@types/node": "^20.11.19", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 2864900..0f9d258 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.3.3", - "@types/node": "20.11.17" + "@types/node": "20.11.19" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index ccbe78d..51dc643 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,7 +63,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "20.11.17", + "@types/node": "20.11.19", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db62aab..de2982e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 1.12.4 vitest: specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.17) + version: 1.2.2(@types/node@20.11.19) packages/commands: dependencies: @@ -55,8 +55,8 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.17 - version: 20.11.17 + specifier: ^20.11.19 + version: 20.11.19 prettier: specifier: ^3.2.5 version: 3.2.5 @@ -113,8 +113,8 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.17 - version: 20.11.17 + specifier: ^20.11.19 + version: 20.11.19 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -176,8 +176,8 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.17 - version: 20.11.17 + specifier: 20.11.19 + version: 20.11.19 tsup: specifier: ^8.0.2 version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) @@ -216,8 +216,8 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: 20.11.17 - version: 20.11.17 + specifier: 20.11.19 + version: 20.11.19 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -229,7 +229,7 @@ importers: version: 5.3.3 vitest: specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.17) + version: 1.2.2(@types/node@20.11.19) packages: @@ -1021,8 +1021,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.17: - resolution: {integrity: sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==} + /@types/node@20.11.19: + resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==} dependencies: undici-types: 5.26.5 dev: true @@ -3432,7 +3432,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.2.2(@types/node@20.11.17): + /vite-node@1.2.2(@types/node@20.11.19): resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3441,7 +3441,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.17) + vite: 5.0.10(@types/node@20.11.19) transitivePeerDependencies: - '@types/node' - less @@ -3453,7 +3453,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.17): + /vite@5.0.10(@types/node@20.11.19): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3481,7 +3481,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.17 + '@types/node': 20.11.19 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3489,7 +3489,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.2.2(@types/node@20.11.17): + /vitest@1.2.2(@types/node@20.11.19): resolution: {integrity: sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3514,7 +3514,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.17 + '@types/node': 20.11.19 '@vitest/expect': 1.2.2 '@vitest/runner': 1.2.2 '@vitest/snapshot': 1.2.2 @@ -3533,8 +3533,8 @@ packages: strip-literal: 1.3.0 tinybench: 2.5.1 tinypool: 0.8.2 - vite: 5.0.10(@types/node@20.11.17) - vite-node: 1.2.2(@types/node@20.11.17) + vite: 5.0.10(@types/node@20.11.19) + vite-node: 1.2.2(@types/node@20.11.19) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 74c098f2c1eb596a372d45fa4af12bd2e463efbb Mon Sep 17 00:00:00 2001 From: Ricardo Devis Agullo Date: Mon, 19 Feb 2024 22:51:17 +0100 Subject: [PATCH 053/290] add .vinxi to the ignored build folders --- packages/commands/src/handlers/new.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 34be5c9..ef96cf7 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -16,6 +16,7 @@ dist .vercel .netlify netlify +.vinxi # Environment .env From 63c2beb1df4ed031a3cba001fe6aeaf4590fde8d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 20 Feb 2024 20:06:40 +0000 Subject: [PATCH 054/290] fix: ts to js transpilation --- packages/commands/package.json | 2 +- packages/commands/src/handlers/new.ts | 25 +++++-------------------- packages/create-solid/package.json | 2 +- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 6e8d64c..3f26100 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.12", + "version": "0.0.14", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index ef96cf7..bffa06e 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -41,10 +41,10 @@ Thumbs.db `; const startSupported = [ - "bare", "basic", - "experiments", + "bare", "hackernews", + "notes", "todomvc", "with-auth", "with-mdx", @@ -52,6 +52,9 @@ const startSupported = [ "with-solid-styled", "with-tailwindcss", "with-trpc", + "with-unocss", + "with-vitest", + "experiments", ] as const; const localSupported = ["ts", "js"] as const; const stackblitzSupported = ["bare"] as const; @@ -122,24 +125,6 @@ const handleTSConversion = async (tempDir: string, projectName: string) => { // Convert all ts files in temp directory into js recurseFiles(tempDir, convertToJS); - // Update package.json to remove type deps - const name = basename(resolve(projectName)); - const pkg_file = join(projectName, "package.json"); - const pkg_json = JSON.parse( - readFileSync(pkg_file, "utf-8") - .replace(/"name": ".+"/, (_m) => `"name": "${name}"`) - .replace(/"(.+)": "workspace:.+"/g, (_m, name) => `"${name}": "next"`), - ); - - delete pkg_json.dependencies["@types/cookie"]; - delete pkg_json.dependencies["@types/debug"]; - delete pkg_json.devDependencies["@types/babel__core"]; - delete pkg_json.devDependencies["@types/node"]; - delete pkg_json.devDependencies["typescript"]; - delete pkg_json.devDependencies["@types/wait-on"]; - - writeFileSync(pkg_file, JSON.stringify(pkg_json, null, 2)); - // Remove temp directory await rm(join(process.cwd(), tempDir), { recursive: true, diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index b0c223d..02cbe3a 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create-solid", - "version": "0.0.17", + "version": "0.0.19", "description": "A stripped down Solid CLI just for creating new projects", "author": "Thomas Beer & Rahul Batra", "license": "MIT", From 2e6bba3d9b186a764b2159acad90e0b7ee811d22 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 20 Feb 2024 20:32:02 +0000 Subject: [PATCH 055/290] Update package.json --- packages/create-solid/package.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 02cbe3a..f363c73 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,8 +1,11 @@ { - "name": "@solid-cli/create-solid", - "version": "0.0.19", - "description": "A stripped down Solid CLI just for creating new projects", - "author": "Thomas Beer & Rahul Batra", + "name": "create-solid", + "version": "0.5.0", + "description": "Create Solid apps with low configuration", + "author": "Thomas Beer", + "contributors": [ + "Rahul Batra" + ], "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { From 2cfd77ff026b24730f95909636de41cc10210d9c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:56:40 +0000 Subject: [PATCH 056/290] update README --- packages/create-solid/README.md | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/packages/create-solid/README.md b/packages/create-solid/README.md index 4849ea1..2e8a84c 100644 --- a/packages/create-solid/README.md +++ b/packages/create-solid/README.md @@ -1,5 +1,29 @@ -# @solid-cli/create-solid +--- +description: Create Solid apps in one command with create-solid. +--- -A minimal version of the [main CLI](https://www.npmjs.com/package/@solid-cli/core) just for creating new projects. +# Create Solid -Invoked with the `create-solid` command +The easiest way to get started with Solid is by using `create-solid`. This CLI tool enables you to quickly start building a new Solid application, with everything set up for you. You can create a new app using the default Solid template, by using one of the [Official SolidStart Examples](https://github.com/solidjs/solid-start/tree/main/examples). To get started, use the following command: + +```bash +#or +npm init solid@latest + +#or +pnpm create solid@latest + +# or +yarn create solid + +# or +bunx create-solid +``` + +## Why use Create Solid? + +`create-solid` allows you to create a new Solid app within seconds. It includes a number of benefits: + +- **Interactive Experience**: Running `npm init solid@latest` (with no arguments) launches an interactive experience that guides you through setting up a project. +- **Zero Dependencies**: Initializing a project is as quick as one second. Create Solid has zero dependencies. +- **Support for Examples**: Create Solid App can bootstrap your application using an example from the SolidStart official examples collection. From 186479abc79d1272a99763eb86ea834594f8cf97 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:09:28 +0000 Subject: [PATCH 057/290] Release --- packages/create-solid/README.md | 4 ++-- packages/create-solid/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-solid/README.md b/packages/create-solid/README.md index 2e8a84c..ce864de 100644 --- a/packages/create-solid/README.md +++ b/packages/create-solid/README.md @@ -4,7 +4,7 @@ description: Create Solid apps in one command with create-solid. # Create Solid -The easiest way to get started with Solid is by using `create-solid`. This CLI tool enables you to quickly start building a new Solid application, with everything set up for you. You can create a new app using the default Solid template, by using one of the [Official SolidStart Examples](https://github.com/solidjs/solid-start/tree/main/examples). To get started, use the following command: +The easiest way to get started with Solid is by using `create-solid`. This CLI tool enables you to quickly start building a new Solid application, with everything set up for you. You can create a new app using the default SolidStart template or use one of the [Official SolidStart Examples](https://github.com/solidjs/solid-start/tree/main/examples). To get started, use the following command: ```bash #or @@ -25,5 +25,5 @@ bunx create-solid `create-solid` allows you to create a new Solid app within seconds. It includes a number of benefits: - **Interactive Experience**: Running `npm init solid@latest` (with no arguments) launches an interactive experience that guides you through setting up a project. -- **Zero Dependencies**: Initializing a project is as quick as one second. Create Solid has zero dependencies. +- **Zero Dependencies**: Initializing a project is as quick as one second. Create Solid has zero runtime dependencies. - **Support for Examples**: Create Solid App can bootstrap your application using an example from the SolidStart official examples collection. diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index f363c73..b079bd8 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.0", + "version": "0.5.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 119cc7419a6e0d1cb8929dfae53d456e5b39f6b5 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 Feb 2024 00:59:21 +0000 Subject: [PATCH 058/290] chore: bump deps --- package.json | 4 +- packages/commands/package.json | 2 +- packages/core/package.json | 6 +- packages/ui/package.json | 4 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 1288 +++++++++++++++++++++++--------- 6 files changed, 953 insertions(+), 359 deletions(-) diff --git a/package.json b/package.json index 0bdba7e..62aec0c 100644 --- a/package.json +++ b/package.json @@ -35,10 +35,10 @@ ], "devDependencies": { "@changesets/cli": "2.27.1", - "nodemon": "^3.0.3", + "nodemon": "^3.1.0", "prettier": "^3.2.5", "turbo": "^1.12.4", - "vitest": "^1.2.2" + "vitest": "^1.3.1" }, "packageManager": "pnpm@8.7.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 3f26100..d9674a8 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.19", + "@types/node": "^20.11.20", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.3.3" diff --git a/packages/core/package.json b/packages/core/package.json index a6f7602..19c8a63 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -22,14 +22,14 @@ "dist" ], "dependencies": { - "@clack/core": "0.3.3", + "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", "@solid-cli/reactivity": "workspace:*", "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.1", + "@swc/core": "^1.4.2", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.19", + "@types/node": "^20.11.20", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 0f9d258..9cf1696 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,13 +29,13 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.3.3", - "@types/node": "20.11.19" + "@types/node": "20.11.20" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.3.3", + "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "picocolors": "^1.0.0", "@solid-cli/reactivity": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index 51dc643..8faee14 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,20 +63,20 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "20.11.19", + "@types/node": "20.11.20", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3", - "vitest": "^1.2.2" + "vitest": "^1.3.1" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.3.3", + "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.1", + "@swc/core": "^1.4.2", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index de2982e..886030b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: 2.27.1 version: 2.27.1 nodemon: - specifier: ^3.0.3 - version: 3.0.3 + specifier: ^3.1.0 + version: 3.1.0 prettier: specifier: ^3.2.5 version: 3.2.5 @@ -21,8 +21,8 @@ importers: specifier: ^1.12.4 version: 1.12.4 vitest: - specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.19) + specifier: ^1.3.1 + version: 1.3.1 packages/commands: dependencies: @@ -55,14 +55,14 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.19 - version: 20.11.19 + specifier: ^20.11.20 + version: 20.11.20 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -70,8 +70,8 @@ importers: packages/core: dependencies: '@clack/core': - specifier: 0.3.3 - version: 0.3.3 + specifier: 0.3.4 + version: 0.3.4 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.1 - version: 1.4.1 + specifier: ^1.4.2 + version: 1.4.2 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -113,14 +113,14 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.19 - version: 20.11.19 + specifier: ^20.11.20 + version: 20.11.20 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -141,7 +141,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -150,7 +150,7 @@ importers: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -160,8 +160,8 @@ importers: packages/ui: dependencies: '@clack/core': - specifier: 0.3.3 - version: 0.3.3 + specifier: 0.3.4 + version: 0.3.4 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -176,11 +176,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.19 - version: 20.11.19 + specifier: 20.11.20 + version: 20.11.20 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 @@ -188,8 +188,8 @@ importers: packages/utils: dependencies: '@clack/core': - specifier: 0.3.3 - version: 0.3.3 + specifier: 0.3.4 + version: 0.3.4 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -197,8 +197,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.1 - version: 1.4.1 + specifier: ^1.4.2 + version: 1.4.2 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -216,50 +216,50 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: 20.11.19 - version: 20.11.19 + specifier: 20.11.20 + version: 20.11.20 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.1)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) typescript: specifier: ^5.3.3 version: 5.3.3 vitest: - specifier: ^1.2.2 - version: 1.2.2(@types/node@20.11.19) + specifier: ^1.3.1 + version: 1.3.1(@types/node@20.11.20) packages: - /@babel/code-frame@7.22.13: - resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==} + /@babel/code-frame@7.23.5: + resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.22.13 + '@babel/highlight': 7.23.4 chalk: 2.4.2 dev: true - /@babel/helper-validator-identifier@7.22.15: - resolution: {integrity: sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==} + /@babel/helper-validator-identifier@7.22.20: + resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} dev: true - /@babel/highlight@7.22.13: - resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==} + /@babel/highlight@7.23.4: + resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.22.15 + '@babel/helper-validator-identifier': 7.22.20 chalk: 2.4.2 js-tokens: 4.0.0 dev: true - /@babel/runtime@7.22.15: - resolution: {integrity: sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==} + /@babel/runtime@7.23.9: + resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==} engines: {node: '>=6.9.0'} dependencies: - regenerator-runtime: 0.14.0 + regenerator-runtime: 0.14.1 dev: true /@begit/core@0.0.13: @@ -271,7 +271,7 @@ packages: /@changesets/apply-release-plan@7.0.0: resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/config': 3.0.0 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 @@ -283,18 +283,18 @@ packages: outdent: 0.5.0 prettier: 2.8.8 resolve-from: 5.0.0 - semver: 7.5.4 + semver: 7.6.0 dev: true /@changesets/assemble-release-plan@6.0.0: resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.0.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 - semver: 7.5.4 + semver: 7.6.0 dev: true /@changesets/changelog-git@0.2.0: @@ -307,7 +307,7 @@ packages: resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/apply-release-plan': 7.0.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 @@ -322,10 +322,10 @@ packages: '@changesets/types': 6.0.0 '@changesets/write': 0.3.0 '@manypkg/get-packages': 1.1.3 - '@types/semver': 7.5.1 + '@types/semver': 7.5.7 ansi-colors: 4.1.3 chalk: 2.4.2 - ci-info: 3.8.0 + ci-info: 3.9.0 enquirer: 2.4.1 external-editor: 3.1.0 fs-extra: 7.0.1 @@ -333,12 +333,12 @@ packages: meow: 6.1.1 outdent: 0.5.0 p-limit: 2.3.0 - preferred-pm: 3.1.2 + preferred-pm: 3.1.3 resolve-from: 5.0.0 - semver: 7.5.4 + semver: 7.6.0 spawndamnit: 2.0.0 term-size: 2.2.1 - tty-table: 4.2.1 + tty-table: 4.2.3 dev: true /@changesets/config@3.0.0: @@ -366,13 +366,13 @@ packages: '@manypkg/get-packages': 1.1.3 chalk: 2.4.2 fs-extra: 7.0.1 - semver: 7.5.4 + semver: 7.6.0 dev: true /@changesets/get-release-plan@4.0.0: resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/assemble-release-plan': 6.0.0 '@changesets/config': 3.0.0 '@changesets/pre': 2.0.0 @@ -388,7 +388,7 @@ packages: /@changesets/git@3.0.0: resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -413,7 +413,7 @@ packages: /@changesets/pre@2.0.0: resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -423,7 +423,7 @@ packages: /@changesets/read@0.6.0: resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/parse': 0.4.0 @@ -444,7 +444,7 @@ packages: /@changesets/write@0.3.0: resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -487,6 +487,13 @@ packages: picocolors: 1.0.0 sisteransi: 1.0.5 + /@clack/core@0.3.4: + resolution: {integrity: sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==} + dependencies: + picocolors: 1.0.0 + sisteransi: 1.0.5 + dev: false + /@clack/prompts@0.7.0: resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==} dependencies: @@ -496,6 +503,24 @@ packages: bundledDependencies: - is-unicode-supported + /@esbuild/aix-ppc64@0.19.12: + resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + + /@esbuild/android-arm64@0.19.12: + resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm64@0.19.9: resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==} engines: {node: '>=12'} @@ -505,6 +530,15 @@ packages: dev: true optional: true + /@esbuild/android-arm@0.19.12: + resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm@0.19.9: resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==} engines: {node: '>=12'} @@ -514,6 +548,15 @@ packages: dev: true optional: true + /@esbuild/android-x64@0.19.12: + resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-x64@0.19.9: resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==} engines: {node: '>=12'} @@ -523,6 +566,15 @@ packages: dev: true optional: true + /@esbuild/darwin-arm64@0.19.12: + resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-arm64@0.19.9: resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==} engines: {node: '>=12'} @@ -532,6 +584,15 @@ packages: dev: true optional: true + /@esbuild/darwin-x64@0.19.12: + resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-x64@0.19.9: resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==} engines: {node: '>=12'} @@ -541,6 +602,15 @@ packages: dev: true optional: true + /@esbuild/freebsd-arm64@0.19.12: + resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-arm64@0.19.9: resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==} engines: {node: '>=12'} @@ -550,6 +620,15 @@ packages: dev: true optional: true + /@esbuild/freebsd-x64@0.19.12: + resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-x64@0.19.9: resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==} engines: {node: '>=12'} @@ -559,6 +638,15 @@ packages: dev: true optional: true + /@esbuild/linux-arm64@0.19.12: + resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm64@0.19.9: resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==} engines: {node: '>=12'} @@ -568,6 +656,15 @@ packages: dev: true optional: true + /@esbuild/linux-arm@0.19.12: + resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm@0.19.9: resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==} engines: {node: '>=12'} @@ -577,6 +674,15 @@ packages: dev: true optional: true + /@esbuild/linux-ia32@0.19.12: + resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ia32@0.19.9: resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==} engines: {node: '>=12'} @@ -586,6 +692,15 @@ packages: dev: true optional: true + /@esbuild/linux-loong64@0.19.12: + resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-loong64@0.19.9: resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==} engines: {node: '>=12'} @@ -595,6 +710,15 @@ packages: dev: true optional: true + /@esbuild/linux-mips64el@0.19.12: + resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-mips64el@0.19.9: resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==} engines: {node: '>=12'} @@ -604,6 +728,15 @@ packages: dev: true optional: true + /@esbuild/linux-ppc64@0.19.12: + resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ppc64@0.19.9: resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==} engines: {node: '>=12'} @@ -613,6 +746,15 @@ packages: dev: true optional: true + /@esbuild/linux-riscv64@0.19.12: + resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-riscv64@0.19.9: resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==} engines: {node: '>=12'} @@ -622,6 +764,15 @@ packages: dev: true optional: true + /@esbuild/linux-s390x@0.19.12: + resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-s390x@0.19.9: resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==} engines: {node: '>=12'} @@ -631,6 +782,15 @@ packages: dev: true optional: true + /@esbuild/linux-x64@0.19.12: + resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-x64@0.19.9: resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==} engines: {node: '>=12'} @@ -640,6 +800,15 @@ packages: dev: true optional: true + /@esbuild/netbsd-x64@0.19.12: + resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/netbsd-x64@0.19.9: resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==} engines: {node: '>=12'} @@ -649,6 +818,15 @@ packages: dev: true optional: true + /@esbuild/openbsd-x64@0.19.12: + resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/openbsd-x64@0.19.9: resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==} engines: {node: '>=12'} @@ -658,6 +836,15 @@ packages: dev: true optional: true + /@esbuild/sunos-x64@0.19.12: + resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + /@esbuild/sunos-x64@0.19.9: resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==} engines: {node: '>=12'} @@ -667,6 +854,15 @@ packages: dev: true optional: true + /@esbuild/win32-arm64@0.19.12: + resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-arm64@0.19.9: resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==} engines: {node: '>=12'} @@ -676,6 +872,15 @@ packages: dev: true optional: true + /@esbuild/win32-ia32@0.19.12: + resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-ia32@0.19.9: resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==} engines: {node: '>=12'} @@ -685,6 +890,15 @@ packages: dev: true optional: true + /@esbuild/win32-x64@0.19.12: + resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-x64@0.19.9: resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==} engines: {node: '>=12'} @@ -740,7 +954,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -749,7 +963,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.22.15 + '@babel/runtime': 7.23.9 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -791,6 +1005,14 @@ packages: requiresBuild: true optional: true + /@rollup/rollup-android-arm-eabi@4.12.0: + resolution: {integrity: sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-android-arm-eabi@4.9.1: resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} cpu: [arm] @@ -799,6 +1021,14 @@ packages: dev: true optional: true + /@rollup/rollup-android-arm64@4.12.0: + resolution: {integrity: sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-android-arm64@4.9.1: resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} cpu: [arm64] @@ -807,6 +1037,14 @@ packages: dev: true optional: true + /@rollup/rollup-darwin-arm64@4.12.0: + resolution: {integrity: sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-darwin-arm64@4.9.1: resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} cpu: [arm64] @@ -815,6 +1053,14 @@ packages: dev: true optional: true + /@rollup/rollup-darwin-x64@4.12.0: + resolution: {integrity: sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-darwin-x64@4.9.1: resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} cpu: [x64] @@ -823,6 +1069,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm-gnueabihf@4.12.0: + resolution: {integrity: sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm-gnueabihf@4.9.1: resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} cpu: [arm] @@ -831,6 +1085,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm64-gnu@4.12.0: + resolution: {integrity: sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-gnu@4.9.1: resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} cpu: [arm64] @@ -839,6 +1101,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm64-musl@4.12.0: + resolution: {integrity: sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-musl@4.9.1: resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} cpu: [arm64] @@ -847,6 +1117,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-riscv64-gnu@4.12.0: + resolution: {integrity: sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-riscv64-gnu@4.9.1: resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} cpu: [riscv64] @@ -855,6 +1133,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-x64-gnu@4.12.0: + resolution: {integrity: sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-gnu@4.9.1: resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} cpu: [x64] @@ -863,6 +1149,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-x64-musl@4.12.0: + resolution: {integrity: sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-musl@4.9.1: resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} cpu: [x64] @@ -871,6 +1165,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-arm64-msvc@4.12.0: + resolution: {integrity: sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-arm64-msvc@4.9.1: resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} cpu: [arm64] @@ -879,6 +1181,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-ia32-msvc@4.12.0: + resolution: {integrity: sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-ia32-msvc@4.9.1: resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} cpu: [ia32] @@ -887,6 +1197,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-x64-msvc@4.12.0: + resolution: {integrity: sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-x64-msvc@4.9.1: resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} cpu: [x64] @@ -899,88 +1217,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.4.1: - resolution: {integrity: sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA==} + /@swc/core-darwin-arm64@1.4.2: + resolution: {integrity: sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.1: - resolution: {integrity: sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA==} + /@swc/core-darwin-x64@1.4.2: + resolution: {integrity: sha512-TYD28+dCQKeuxxcy7gLJUCFLqrwDZnHtC2z7cdeGfZpbI2mbfppfTf2wUPzqZk3gEC96zHd4Yr37V3Tvzar+lQ==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.1: - resolution: {integrity: sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ==} + /@swc/core-linux-arm-gnueabihf@1.4.2: + resolution: {integrity: sha512-Eyqipf7ZPGj0vplKHo8JUOoU1un2sg5PjJMpEesX0k+6HKE2T8pdyeyXODN0YTFqzndSa/J43EEPXm+rHAsLFQ==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.1: - resolution: {integrity: sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw==} + /@swc/core-linux-arm64-gnu@1.4.2: + resolution: {integrity: sha512-wZn02DH8VYPv3FC0ub4my52Rttsus/rFw+UUfzdb3tHMHXB66LqN+rR0ssIOZrH6K+VLN6qpTw9VizjyoH0BxA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.1: - resolution: {integrity: sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==} + /@swc/core-linux-arm64-musl@1.4.2: + resolution: {integrity: sha512-3G0D5z9hUj9bXNcwmA1eGiFTwe5rWkuL3DsoviTj73TKLpk7u64ND0XjEfO0huVv4vVu9H1jodrKb7nvln/dlw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.1: - resolution: {integrity: sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==} + /@swc/core-linux-x64-gnu@1.4.2: + resolution: {integrity: sha512-LFxn9U8cjmYHw3jrdPNqPAkBGglKE3tCZ8rA7hYyp0BFxuo7L2ZcEnPm4RFpmSCCsExFH+LEJWuMGgWERoktvg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.1: - resolution: {integrity: sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==} + /@swc/core-linux-x64-musl@1.4.2: + resolution: {integrity: sha512-dp0fAmreeVVYTUcb4u9njTPrYzKnbIH0EhH2qvC9GOYNNREUu2GezSIDgonjOXkHiTCvopG4xU7y56XtXj4VrQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.1: - resolution: {integrity: sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==} + /@swc/core-win32-arm64-msvc@1.4.2: + resolution: {integrity: sha512-HlVIiLMQkzthAdqMslQhDkoXJ5+AOLUSTV6fm6shFKZKqc/9cJvr4S8UveNERL9zUficA36yM3bbfo36McwnvQ==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.1: - resolution: {integrity: sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA==} + /@swc/core-win32-ia32-msvc@1.4.2: + resolution: {integrity: sha512-WCF8faPGjCl4oIgugkp+kL9nl3nUATlzKXCEGFowMEmVVCFM0GsqlmGdPp1pjZoWc9tpYanoXQDnp5IvlDSLhA==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.1: - resolution: {integrity: sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw==} + /@swc/core-win32-x64-msvc@1.4.2: + resolution: {integrity: sha512-oV71rwiSpA5xre2C5570BhCsg1HF97SNLsZ/12xv7zayGzqr3yvFALFJN8tHKpqUdCB4FGPjoP3JFdV3i+1wUw==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.1: - resolution: {integrity: sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ==} + /@swc/core@1.4.2: + resolution: {integrity: sha512-vWgY07R/eqj1/a0vsRKLI9o9klGZfpLNOVEnrv4nrccxBgYPjcf22IWwAoaBJ+wpA7Q4fVjCUM8lP0m01dpxcg==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -992,16 +1310,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.1 - '@swc/core-darwin-x64': 1.4.1 - '@swc/core-linux-arm-gnueabihf': 1.4.1 - '@swc/core-linux-arm64-gnu': 1.4.1 - '@swc/core-linux-arm64-musl': 1.4.1 - '@swc/core-linux-x64-gnu': 1.4.1 - '@swc/core-linux-x64-musl': 1.4.1 - '@swc/core-win32-arm64-msvc': 1.4.1 - '@swc/core-win32-ia32-msvc': 1.4.1 - '@swc/core-win32-x64-msvc': 1.4.1 + '@swc/core-darwin-arm64': 1.4.2 + '@swc/core-darwin-x64': 1.4.2 + '@swc/core-linux-arm-gnueabihf': 1.4.2 + '@swc/core-linux-arm64-gnu': 1.4.2 + '@swc/core-linux-arm64-musl': 1.4.2 + '@swc/core-linux-x64-gnu': 1.4.2 + '@swc/core-linux-x64-musl': 1.4.2 + '@swc/core-win32-arm64-msvc': 1.4.2 + '@swc/core-win32-ia32-msvc': 1.4.2 + '@swc/core-win32-x64-msvc': 1.4.2 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1013,60 +1331,60 @@ packages: resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} dev: true - /@types/minimist@1.2.2: - resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} + /@types/minimist@1.2.5: + resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} dev: true /@types/node@12.20.55: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.19: - resolution: {integrity: sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==} + /@types/node@20.11.20: + resolution: {integrity: sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==} dependencies: undici-types: 5.26.5 dev: true - /@types/normalize-package-data@2.4.1: - resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} + /@types/normalize-package-data@2.4.4: + resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true - /@types/semver@7.5.1: - resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==} + /@types/semver@7.5.7: + resolution: {integrity: sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==} dev: true - /@vitest/expect@1.2.2: - resolution: {integrity: sha512-3jpcdPAD7LwHUUiT2pZTj2U82I2Tcgg2oVPvKxhn6mDI2On6tfvPQTjAI4628GUGDZrCm4Zna9iQHm5cEexOAg==} + /@vitest/expect@1.3.1: + resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==} dependencies: - '@vitest/spy': 1.2.2 - '@vitest/utils': 1.2.2 + '@vitest/spy': 1.3.1 + '@vitest/utils': 1.3.1 chai: 4.3.10 dev: true - /@vitest/runner@1.2.2: - resolution: {integrity: sha512-JctG7QZ4LSDXr5CsUweFgcpEvrcxOV1Gft7uHrvkQ+fsAVylmWQvnaAr/HDp3LAH1fztGMQZugIheTWjaGzYIg==} + /@vitest/runner@1.3.1: + resolution: {integrity: sha512-5FzF9c3jG/z5bgCnjr8j9LNq/9OxV2uEBAITOXfoe3rdZJTdO7jzThth7FXv/6b+kdY65tpRQB7WaKhNZwX+Kg==} dependencies: - '@vitest/utils': 1.2.2 + '@vitest/utils': 1.3.1 p-limit: 5.0.0 pathe: 1.1.1 dev: true - /@vitest/snapshot@1.2.2: - resolution: {integrity: sha512-SmGY4saEw1+bwE1th6S/cZmPxz/Q4JWsl7LvbQIky2tKE35US4gd0Mjzqfr84/4OD0tikGWaWdMja/nWL5NIPA==} + /@vitest/snapshot@1.3.1: + resolution: {integrity: sha512-EF++BZbt6RZmOlE3SuTPu/NfwBF6q4ABS37HHXzs2LUVPBLx2QoY/K0fKpRChSo8eLiuxcbCVfqKgx/dplCDuQ==} dependencies: magic-string: 0.30.5 pathe: 1.1.1 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.2.2: - resolution: {integrity: sha512-k9Gcahssw8d7X3pSLq3e3XEu/0L78mUkCjivUqCQeXJm9clfXR/Td8+AP+VC1O6fKPIDLcHDTAmBOINVuv6+7g==} + /@vitest/spy@1.3.1: + resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.2.2: - resolution: {integrity: sha512-WKITBHLsBHlpjnDQahr+XK6RE7MiAsgrIkr0pGhQ9ygoxBfUeG0lUG5iLlzqjmKSlBv3+j5EGsriBzh+C3Tq9g==} + /@vitest/utils@1.3.1: + resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==} dependencies: diff-sequences: 29.6.3 estree-walker: 3.0.3 @@ -1141,11 +1459,12 @@ packages: sprintf-js: 1.0.3 dev: true - /array-buffer-byte-length@1.0.0: - resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} + /array-buffer-byte-length@1.0.1: + resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - is-array-buffer: 3.0.2 + call-bind: 1.0.7 + is-array-buffer: 3.0.4 dev: true /array-union@2.1.0: @@ -1157,23 +1476,24 @@ packages: resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.22.1 - es-shim-unscopables: 1.0.0 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.22.4 + es-shim-unscopables: 1.0.2 dev: true - /arraybuffer.prototype.slice@1.0.2: - resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==} + /arraybuffer.prototype.slice@1.0.3: + resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==} engines: {node: '>= 0.4'} dependencies: - array-buffer-byte-length: 1.0.0 - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.22.1 - get-intrinsic: 1.2.1 - is-array-buffer: 3.0.2 - is-shared-array-buffer: 1.0.2 + array-buffer-byte-length: 1.0.1 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.22.4 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 + is-array-buffer: 3.0.4 + is-shared-array-buffer: 1.0.3 dev: true /arrify@1.0.1: @@ -1185,9 +1505,11 @@ packages: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} dev: true - /available-typed-arrays@1.0.5: - resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} + /available-typed-arrays@1.0.7: + resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} + dependencies: + possible-typed-array-names: 1.0.0 dev: true /balanced-match@1.0.2: @@ -1245,11 +1567,15 @@ packages: engines: {node: '>=8'} dev: true - /call-bind@1.0.2: - resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==} + /call-bind@1.0.7: + resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} + engines: {node: '>= 0.4'} dependencies: - function-bind: 1.1.1 - get-intrinsic: 1.2.1 + es-define-property: 1.0.0 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + set-function-length: 1.2.1 dev: true /camelcase-keys@6.2.2: @@ -1279,6 +1605,19 @@ packages: type-detect: 4.0.8 dev: true + /chai@4.4.1: + resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} + engines: {node: '>=4'} + dependencies: + assertion-error: 1.1.0 + check-error: 1.0.3 + deep-eql: 4.1.3 + get-func-name: 2.0.2 + loupe: 2.3.7 + pathval: 1.1.1 + type-detect: 4.0.8 + dev: true + /chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} @@ -1320,13 +1659,28 @@ packages: fsevents: 2.3.3 dev: true + /chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} dev: false - /ci-info@3.8.0: - resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} + /ci-info@3.9.0: + resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} dev: true @@ -1466,11 +1820,21 @@ packages: clone: 1.0.4 dev: true - /define-properties@1.2.0: - resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==} + /define-data-property@1.1.4: + resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} + engines: {node: '>= 0.4'} + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + gopd: 1.0.1 + dev: true + + /define-properties@1.2.1: + resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} dependencies: - has-property-descriptors: 1.0.0 + define-data-property: 1.1.4 + has-property-descriptors: 1.0.2 object-keys: 1.1.1 dev: true @@ -1524,64 +1888,78 @@ packages: is-arrayish: 0.2.1 dev: true - /es-abstract@1.22.1: - resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==} + /es-abstract@1.22.4: + resolution: {integrity: sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==} engines: {node: '>= 0.4'} dependencies: - array-buffer-byte-length: 1.0.0 - arraybuffer.prototype.slice: 1.0.2 - available-typed-arrays: 1.0.5 - call-bind: 1.0.2 - es-set-tostringtag: 2.0.1 + array-buffer-byte-length: 1.0.1 + arraybuffer.prototype.slice: 1.0.3 + available-typed-arrays: 1.0.7 + call-bind: 1.0.7 + es-define-property: 1.0.0 + es-errors: 1.3.0 + es-set-tostringtag: 2.0.3 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.1 - get-symbol-description: 1.0.0 + get-intrinsic: 1.2.4 + get-symbol-description: 1.0.2 globalthis: 1.0.3 gopd: 1.0.1 - has: 1.0.3 - has-property-descriptors: 1.0.0 - has-proto: 1.0.1 + has-property-descriptors: 1.0.2 + has-proto: 1.0.3 has-symbols: 1.0.3 - internal-slot: 1.0.5 - is-array-buffer: 3.0.2 + hasown: 2.0.1 + internal-slot: 1.0.7 + is-array-buffer: 3.0.4 is-callable: 1.2.7 - is-negative-zero: 2.0.2 + is-negative-zero: 2.0.3 is-regex: 1.1.4 - is-shared-array-buffer: 1.0.2 + is-shared-array-buffer: 1.0.3 is-string: 1.0.7 - is-typed-array: 1.1.12 + is-typed-array: 1.1.13 is-weakref: 1.0.2 - object-inspect: 1.12.3 + object-inspect: 1.13.1 object-keys: 1.1.1 - object.assign: 4.1.4 - regexp.prototype.flags: 1.5.0 - safe-array-concat: 1.0.1 - safe-regex-test: 1.0.0 + object.assign: 4.1.5 + regexp.prototype.flags: 1.5.2 + safe-array-concat: 1.1.0 + safe-regex-test: 1.0.3 string.prototype.trim: 1.2.8 string.prototype.trimend: 1.0.7 string.prototype.trimstart: 1.0.7 - typed-array-buffer: 1.0.0 - typed-array-byte-length: 1.0.0 - typed-array-byte-offset: 1.0.0 - typed-array-length: 1.0.4 + typed-array-buffer: 1.0.2 + typed-array-byte-length: 1.0.1 + typed-array-byte-offset: 1.0.2 + typed-array-length: 1.0.5 unbox-primitive: 1.0.2 - which-typed-array: 1.1.11 + which-typed-array: 1.1.14 dev: true - /es-set-tostringtag@2.0.1: - resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} + /es-define-property@1.0.0: + resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.1 - has: 1.0.3 - has-tostringtag: 1.0.0 + get-intrinsic: 1.2.4 + dev: true + + /es-errors@1.3.0: + resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} + engines: {node: '>= 0.4'} dev: true - /es-shim-unscopables@1.0.0: - resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==} + /es-set-tostringtag@2.0.3: + resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.4 + has-tostringtag: 1.0.2 + hasown: 2.0.1 + dev: true + + /es-shim-unscopables@1.0.2: + resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} dependencies: - has: 1.0.3 + hasown: 2.0.1 dev: true /es-to-primitive@1.2.1: @@ -1593,6 +1971,37 @@ packages: is-symbol: 1.0.4 dev: true + /esbuild@0.19.12: + resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/aix-ppc64': 0.19.12 + '@esbuild/android-arm': 0.19.12 + '@esbuild/android-arm64': 0.19.12 + '@esbuild/android-x64': 0.19.12 + '@esbuild/darwin-arm64': 0.19.12 + '@esbuild/darwin-x64': 0.19.12 + '@esbuild/freebsd-arm64': 0.19.12 + '@esbuild/freebsd-x64': 0.19.12 + '@esbuild/linux-arm': 0.19.12 + '@esbuild/linux-arm64': 0.19.12 + '@esbuild/linux-ia32': 0.19.12 + '@esbuild/linux-loong64': 0.19.12 + '@esbuild/linux-mips64el': 0.19.12 + '@esbuild/linux-ppc64': 0.19.12 + '@esbuild/linux-riscv64': 0.19.12 + '@esbuild/linux-s390x': 0.19.12 + '@esbuild/linux-x64': 0.19.12 + '@esbuild/netbsd-x64': 0.19.12 + '@esbuild/openbsd-x64': 0.19.12 + '@esbuild/sunos-x64': 0.19.12 + '@esbuild/win32-arm64': 0.19.12 + '@esbuild/win32-ia32': 0.19.12 + '@esbuild/win32-x64': 0.19.12 + dev: true + /esbuild@0.19.9: resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} engines: {node: '>=12'} @@ -1623,8 +2032,8 @@ packages: '@esbuild/win32-x64': 0.19.9 dev: true - /escalade@3.1.1: - resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} + /escalade@3.1.2: + resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} dev: true @@ -1780,17 +2189,17 @@ packages: dev: true optional: true - /function-bind@1.1.1: - resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} + /function-bind@1.1.2: + resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} dev: true /function.prototype.name@1.1.6: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.22.1 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.22.4 functions-have-names: 1.2.3 dev: true @@ -1807,13 +2216,15 @@ packages: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} dev: true - /get-intrinsic@1.2.1: - resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==} + /get-intrinsic@1.2.4: + resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} + engines: {node: '>= 0.4'} dependencies: - function-bind: 1.1.1 - has: 1.0.3 - has-proto: 1.0.1 + es-errors: 1.3.0 + function-bind: 1.1.2 + has-proto: 1.0.3 has-symbols: 1.0.3 + hasown: 2.0.1 dev: true /get-stream@6.0.1: @@ -1825,12 +2236,13 @@ packages: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - /get-symbol-description@1.0.0: - resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} + /get-symbol-description@1.0.2: + resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 + call-bind: 1.0.7 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 dev: true /glob-parent@5.1.2: @@ -1855,7 +2267,7 @@ packages: resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} engines: {node: '>= 0.4'} dependencies: - define-properties: 1.2.0 + define-properties: 1.2.1 dev: true /globby@11.1.0: @@ -1873,7 +2285,7 @@ packages: /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: - get-intrinsic: 1.2.1 + get-intrinsic: 1.2.4 dev: true /graceful-fs@4.2.11: @@ -1901,14 +2313,14 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - /has-property-descriptors@1.0.0: - resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} + /has-property-descriptors@1.0.2: + resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} dependencies: - get-intrinsic: 1.2.1 + es-define-property: 1.0.0 dev: true - /has-proto@1.0.1: - resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} + /has-proto@1.0.3: + resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} dev: true @@ -1917,18 +2329,18 @@ packages: engines: {node: '>= 0.4'} dev: true - /has-tostringtag@1.0.0: - resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} + /has-tostringtag@1.0.2: + resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} dependencies: has-symbols: 1.0.3 dev: true - /has@1.0.3: - resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} - engines: {node: '>= 0.4.0'} + /hasown@2.0.1: + resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==} + engines: {node: '>= 0.4'} dependencies: - function-bind: 1.1.1 + function-bind: 1.1.2 dev: true /hosted-git-info@2.8.9: @@ -1969,25 +2381,25 @@ packages: engines: {node: '>=8'} dev: true - /internal-slot@1.0.5: - resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==} + /internal-slot@1.0.7: + resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==} engines: {node: '>= 0.4'} dependencies: - get-intrinsic: 1.2.1 - has: 1.0.3 - side-channel: 1.0.4 + es-errors: 1.3.0 + hasown: 2.0.1 + side-channel: 1.0.5 dev: true /ionstore@1.0.0: resolution: {integrity: sha512-ikEvmeZFh9u5SkjKbFqJlmmhaQTulB3P7QoSoZ/xL8EDP5uj5QWbPeKcQ8ZJtszBLHRRnhIJJE8P1dhFx/oCMw==} dev: false - /is-array-buffer@3.0.2: - resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==} + /is-array-buffer@3.0.4: + resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 - is-typed-array: 1.1.12 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 dev: true /is-arrayish@0.2.1: @@ -2011,8 +2423,8 @@ packages: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - has-tostringtag: 1.0.0 + call-bind: 1.0.7 + has-tostringtag: 1.0.2 dev: true /is-callable@1.2.7: @@ -2020,17 +2432,17 @@ packages: engines: {node: '>= 0.4'} dev: true - /is-core-module@2.13.0: - resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} + /is-core-module@2.13.1: + resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: - has: 1.0.3 + hasown: 2.0.1 dev: true /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-extglob@2.1.1: @@ -2049,8 +2461,8 @@ packages: is-extglob: 2.1.1 dev: true - /is-negative-zero@2.0.2: - resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} + /is-negative-zero@2.0.3: + resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} dev: true @@ -2058,7 +2470,7 @@ packages: resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-number@7.0.0: @@ -2075,14 +2487,15 @@ packages: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - has-tostringtag: 1.0.0 + call-bind: 1.0.7 + has-tostringtag: 1.0.2 dev: true - /is-shared-array-buffer@1.0.2: - resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} + /is-shared-array-buffer@1.0.3: + resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 + call-bind: 1.0.7 dev: true /is-stream@2.0.1: @@ -2098,7 +2511,7 @@ packages: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} engines: {node: '>= 0.4'} dependencies: - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /is-subdir@1.2.0: @@ -2115,17 +2528,17 @@ packages: has-symbols: 1.0.3 dev: true - /is-typed-array@1.1.12: - resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==} + /is-typed-array@1.1.13: + resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} dependencies: - which-typed-array: 1.1.11 + which-typed-array: 1.1.14 dev: true /is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} dependencies: - call-bind: 1.0.2 + call-bind: 1.0.7 dev: true /is-windows@1.0.2: @@ -2162,6 +2575,10 @@ packages: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} dev: true + /js-tokens@8.0.3: + resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==} + dev: true + /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -2278,6 +2695,13 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 dev: true + /magic-string@0.30.7: + resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + /map-obj@1.0.1: resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==} engines: {node: '>=0.10.0'} @@ -2292,7 +2716,7 @@ packages: resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} engines: {node: '>=8'} dependencies: - '@types/minimist': 1.2.2 + '@types/minimist': 1.2.5 camelcase-keys: 6.2.2 decamelize-keys: 1.1.1 hard-rejection: 2.1.0 @@ -2387,8 +2811,8 @@ packages: yallist: 4.0.0 dev: false - /mixme@0.5.9: - resolution: {integrity: sha512-VC5fg6ySUscaWUpI4gxCBTQMH2RdUpNrk+MsbpCYtIvf9SBJdiUey4qE7BXviJsJR4nDQxCZ+3yaYNW3guz/Pw==} + /mixme@0.5.10: + resolution: {integrity: sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==} engines: {node: '>= 8.0.0'} dev: true @@ -2423,17 +2847,17 @@ packages: hasBin: true dev: true - /nodemon@3.0.3: - resolution: {integrity: sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==} + /nodemon@3.1.0: + resolution: {integrity: sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==} engines: {node: '>=10'} hasBin: true dependencies: - chokidar: 3.5.3 + chokidar: 3.6.0 debug: 4.3.4(supports-color@5.5.0) ignore-by-default: 1.0.1 minimatch: 3.1.2 pstree.remy: 1.1.8 - semver: 7.5.4 + semver: 7.6.0 simple-update-notifier: 2.0.0 supports-color: 5.5.0 touch: 3.1.0 @@ -2451,7 +2875,7 @@ packages: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} dependencies: hosted-git-info: 2.8.9 - resolve: 1.22.4 + resolve: 1.22.8 semver: 5.7.2 validate-npm-package-license: 3.0.4 dev: true @@ -2478,8 +2902,8 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - /object-inspect@1.12.3: - resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} + /object-inspect@1.13.1: + resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} dev: true /object-keys@1.1.1: @@ -2487,12 +2911,12 @@ packages: engines: {node: '>= 0.4'} dev: true - /object.assign@4.1.4: - resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} + /object.assign@4.1.5: + resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 + call-bind: 1.0.7 + define-properties: 1.2.1 has-symbols: 1.0.3 object-keys: 1.1.1 dev: true @@ -2575,7 +2999,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.22.13 + '@babel/code-frame': 7.23.5 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -2614,6 +3038,10 @@ packages: resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==} dev: true + /pathe@1.1.2: + resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + dev: true + /pathval@1.1.1: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} dev: true @@ -2650,6 +3078,11 @@ packages: pathe: 1.1.1 dev: true + /possible-typed-array-names@1.0.0: + resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} + engines: {node: '>= 0.4'} + dev: true + /postcss-load-config@4.0.1: resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} @@ -2675,8 +3108,17 @@ packages: source-map-js: 1.0.2 dev: true - /preferred-pm@3.1.2: - resolution: {integrity: sha512-nk7dKrcW8hfCZ4H6klWcdRknBOXWzNQByJ0oJyX97BOupsYD+FzLS4hflgEu/uPUEHZCuRfMxzCBsuWd7OzT8Q==} + /postcss@8.4.35: + resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.0.2 + dev: true + + /preferred-pm@3.1.3: + resolution: {integrity: sha512-MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==} engines: {node: '>=10'} dependencies: find-up: 5.0.0 @@ -2745,7 +3187,7 @@ packages: resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} engines: {node: '>=8'} dependencies: - '@types/normalize-package-data': 2.4.1 + '@types/normalize-package-data': 2.4.4 normalize-package-data: 2.5.0 parse-json: 5.2.0 type-fest: 0.6.0 @@ -2776,17 +3218,18 @@ packages: strip-indent: 3.0.0 dev: true - /regenerator-runtime@0.14.0: - resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + /regenerator-runtime@0.14.1: + resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} dev: true - /regexp.prototype.flags@1.5.0: - resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==} + /regexp.prototype.flags@1.5.2: + resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - functions-have-names: 1.2.3 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-errors: 1.3.0 + set-function-name: 2.0.2 dev: true /require-directory@2.1.1: @@ -2803,11 +3246,11 @@ packages: engines: {node: '>=8'} dev: true - /resolve@1.22.4: - resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==} + /resolve@1.22.8: + resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true dependencies: - is-core-module: 2.13.0 + is-core-module: 2.13.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 dev: true @@ -2817,6 +3260,29 @@ packages: engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: true + /rollup@4.12.0: + resolution: {integrity: sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.12.0 + '@rollup/rollup-android-arm64': 4.12.0 + '@rollup/rollup-darwin-arm64': 4.12.0 + '@rollup/rollup-darwin-x64': 4.12.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.12.0 + '@rollup/rollup-linux-arm64-gnu': 4.12.0 + '@rollup/rollup-linux-arm64-musl': 4.12.0 + '@rollup/rollup-linux-riscv64-gnu': 4.12.0 + '@rollup/rollup-linux-x64-gnu': 4.12.0 + '@rollup/rollup-linux-x64-musl': 4.12.0 + '@rollup/rollup-win32-arm64-msvc': 4.12.0 + '@rollup/rollup-win32-ia32-msvc': 4.12.0 + '@rollup/rollup-win32-x64-msvc': 4.12.0 + fsevents: 2.3.3 + dev: true + /rollup@4.9.1: resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -2844,21 +3310,22 @@ packages: queue-microtask: 1.2.3 dev: true - /safe-array-concat@1.0.1: - resolution: {integrity: sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==} + /safe-array-concat@1.1.0: + resolution: {integrity: sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==} engines: {node: '>=0.4'} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 has-symbols: 1.0.3 isarray: 2.0.5 dev: true - /safe-regex-test@1.0.0: - resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} + /safe-regex-test@1.0.3: + resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 + call-bind: 1.0.7 + es-errors: 1.3.0 is-regex: 1.1.4 dev: true @@ -2871,8 +3338,8 @@ packages: hasBin: true dev: true - /semver@7.5.4: - resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + /semver@7.6.0: + resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} engines: {node: '>=10'} hasBin: true dependencies: @@ -2883,6 +3350,28 @@ packages: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true + /set-function-length@1.2.1: + resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==} + engines: {node: '>= 0.4'} + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + gopd: 1.0.1 + has-property-descriptors: 1.0.2 + dev: true + + /set-function-name@2.0.2: + resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} + engines: {node: '>= 0.4'} + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + functions-have-names: 1.2.3 + has-property-descriptors: 1.0.2 + dev: true + /shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} engines: {node: '>=0.10.0'} @@ -2905,12 +3394,14 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /side-channel@1.0.4: - resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} + /side-channel@1.0.5: + resolution: {integrity: sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 - object-inspect: 1.12.3 + call-bind: 1.0.7 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 + object-inspect: 1.13.1 dev: true /siginfo@2.0.0: @@ -2929,7 +3420,7 @@ packages: resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} engines: {node: '>=10'} dependencies: - semver: 7.5.4 + semver: 7.6.0 dev: true /sisteransi@1.0.5: @@ -2981,22 +3472,22 @@ packages: resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} dependencies: spdx-expression-parse: 3.0.1 - spdx-license-ids: 3.0.13 + spdx-license-ids: 3.0.17 dev: true - /spdx-exceptions@2.3.0: - resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==} + /spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} dev: true /spdx-expression-parse@3.0.1: resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} dependencies: - spdx-exceptions: 2.3.0 - spdx-license-ids: 3.0.13 + spdx-exceptions: 2.5.0 + spdx-license-ids: 3.0.17 dev: true - /spdx-license-ids@3.0.13: - resolution: {integrity: sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==} + /spdx-license-ids@3.0.17: + resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} dev: true /sprintf-js@1.0.3: @@ -3011,10 +3502,14 @@ packages: resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==} dev: true + /std-env@3.7.0: + resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} + dev: true + /stream-transform@2.1.3: resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} dependencies: - mixme: 0.5.9 + mixme: 0.5.10 dev: true /string-width@4.2.3: @@ -3037,25 +3532,25 @@ packages: resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.22.1 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.22.4 dev: true /string.prototype.trimend@1.0.7: resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.22.1 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.22.4 dev: true /string.prototype.trimstart@1.0.7: resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - es-abstract: 1.22.1 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.22.4 dev: true /strip-ansi@6.0.1: @@ -3091,10 +3586,10 @@ packages: min-indent: 1.0.1 dev: true - /strip-literal@1.3.0: - resolution: {integrity: sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==} + /strip-literal@2.0.0: + resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==} dependencies: - acorn: 8.10.0 + js-tokens: 8.0.3 dev: true /sucrase@3.35.0: @@ -3171,6 +3666,10 @@ packages: resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==} dev: true + /tinybench@2.6.0: + resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} + dev: true + /tinypool@0.8.2: resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==} engines: {node: '>=14.0.0'} @@ -3221,7 +3720,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.1)(typescript@5.3.3): + /tsup@8.0.2(@swc/core@1.4.2)(typescript@5.3.3): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -3240,7 +3739,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.4.1 + '@swc/core': 1.4.2 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3261,8 +3760,8 @@ packages: - ts-node dev: true - /tty-table@4.2.1: - resolution: {integrity: sha512-xz0uKo+KakCQ+Dxj1D/tKn2FSyreSYWzdkL/BYhgN6oMW808g8QRMuh1atAV9fjTPbWBjfbkKQpI/5rEcnAc7g==} + /tty-table@4.2.3: + resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==} engines: {node: '>=8.0.0'} hasBin: true dependencies: @@ -3355,42 +3854,48 @@ packages: engines: {node: '>=8'} dev: true - /typed-array-buffer@1.0.0: - resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==} + /typed-array-buffer@1.0.2: + resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 - is-typed-array: 1.1.12 + call-bind: 1.0.7 + es-errors: 1.3.0 + is-typed-array: 1.1.13 dev: true - /typed-array-byte-length@1.0.0: - resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==} + /typed-array-byte-length@1.0.1: + resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 + call-bind: 1.0.7 for-each: 0.3.3 - has-proto: 1.0.1 - is-typed-array: 1.1.12 + gopd: 1.0.1 + has-proto: 1.0.3 + is-typed-array: 1.1.13 dev: true - /typed-array-byte-offset@1.0.0: - resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==} + /typed-array-byte-offset@1.0.2: + resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.5 - call-bind: 1.0.2 + available-typed-arrays: 1.0.7 + call-bind: 1.0.7 for-each: 0.3.3 - has-proto: 1.0.1 - is-typed-array: 1.1.12 + gopd: 1.0.1 + has-proto: 1.0.3 + is-typed-array: 1.1.13 dev: true - /typed-array-length@1.0.4: - resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} + /typed-array-length@1.0.5: + resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==} + engines: {node: '>= 0.4'} dependencies: - call-bind: 1.0.2 + call-bind: 1.0.7 for-each: 0.3.3 - is-typed-array: 1.1.12 + gopd: 1.0.1 + has-proto: 1.0.3 + is-typed-array: 1.1.13 + possible-typed-array-names: 1.0.0 dev: true /typescript@5.3.3: @@ -3406,7 +3911,7 @@ packages: /unbox-primitive@1.0.2: resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} dependencies: - call-bind: 1.0.2 + call-bind: 1.0.7 has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 @@ -3432,8 +3937,8 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.2.2(@types/node@20.11.19): - resolution: {integrity: sha512-1as4rDTgVWJO3n1uHmUYqq7nsFgINQ9u+mRcXpjeOMJUmviqNKjcZB7UfRZrlM7MjYXMKpuWp5oGkjaFLnjawg==} + /vite-node@1.3.1(@types/node@20.11.20): + resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -3441,7 +3946,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.19) + vite: 5.0.10(@types/node@20.11.20) transitivePeerDependencies: - '@types/node' - less @@ -3453,7 +3958,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.19): + /vite@5.0.10(@types/node@20.11.20): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3481,7 +3986,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.19 + '@types/node': 20.11.20 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3489,15 +3994,50 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.2.2(@types/node@20.11.19): - resolution: {integrity: sha512-d5Ouvrnms3GD9USIK36KG8OZ5bEvKEkITFtnGv56HFaSlbItJuYr7hv2Lkn903+AvRAgSixiamozUVfORUekjw==} + /vite@5.1.4: + resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.19.12 + postcss: 8.4.35 + rollup: 4.12.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + + /vitest@1.3.1: + resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': ^1.0.0 - '@vitest/ui': ^1.0.0 + '@vitest/browser': 1.3.1 + '@vitest/ui': 1.3.1 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -3514,14 +4054,68 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.19 - '@vitest/expect': 1.2.2 - '@vitest/runner': 1.2.2 - '@vitest/snapshot': 1.2.2 - '@vitest/spy': 1.2.2 - '@vitest/utils': 1.2.2 + '@vitest/expect': 1.3.1 + '@vitest/runner': 1.3.1 + '@vitest/snapshot': 1.3.1 + '@vitest/spy': 1.3.1 + '@vitest/utils': 1.3.1 + acorn-walk: 8.3.2 + chai: 4.4.1 + debug: 4.3.4(supports-color@5.5.0) + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.7 + pathe: 1.1.2 + picocolors: 1.0.0 + std-env: 3.7.0 + strip-literal: 2.0.0 + tinybench: 2.6.0 + tinypool: 0.8.2 + vite: 5.1.4 + vite-node: 1.3.1(@types/node@20.11.20) + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vitest@1.3.1(@types/node@20.11.20): + resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': 1.3.1 + '@vitest/ui': 1.3.1 + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@types/node': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + dependencies: + '@types/node': 20.11.20 + '@vitest/expect': 1.3.1 + '@vitest/runner': 1.3.1 + '@vitest/snapshot': 1.3.1 + '@vitest/spy': 1.3.1 + '@vitest/utils': 1.3.1 acorn-walk: 8.3.2 - cac: 6.7.14 chai: 4.3.10 debug: 4.3.4(supports-color@5.5.0) execa: 8.0.1 @@ -3530,11 +4124,11 @@ packages: pathe: 1.1.1 picocolors: 1.0.0 std-env: 3.6.0 - strip-literal: 1.3.0 + strip-literal: 2.0.0 tinybench: 2.5.1 tinypool: 0.8.2 - vite: 5.0.10(@types/node@20.11.19) - vite-node: 1.2.2(@types/node@20.11.19) + vite: 5.0.10(@types/node@20.11.20) + vite-node: 1.3.1(@types/node@20.11.20) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -3590,15 +4184,15 @@ packages: path-exists: 4.0.0 dev: true - /which-typed-array@1.1.11: - resolution: {integrity: sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==} + /which-typed-array@1.1.14: + resolution: {integrity: sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==} engines: {node: '>= 0.4'} dependencies: - available-typed-arrays: 1.0.5 - call-bind: 1.0.2 + available-typed-arrays: 1.0.7 + call-bind: 1.0.7 for-each: 0.3.3 gopd: 1.0.1 - has-tostringtag: 1.0.0 + has-tostringtag: 1.0.2 dev: true /which@1.3.1: @@ -3705,7 +4299,7 @@ packages: engines: {node: '>=12'} dependencies: cliui: 8.0.1 - escalade: 3.1.1 + escalade: 3.1.2 get-caller-file: 2.0.5 require-directory: 2.1.1 string-width: 4.2.3 From b197fdb5b0103c4e6c766ae6090f098c20c2ff73 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:37:45 +0000 Subject: [PATCH 059/290] fix: dynamically size start project selector so it displays correctly on smaller terminals --- packages/commands/src/handlers/new.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index bffa06e..9cdf2a7 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -138,6 +138,7 @@ const handleNewStartProject = async (projectName: string) => { message: t.NEW_START, initialValue: "ts", options: startSupported.map((s) => ({ label: s, value: s })), + maxItems: process.stdout.rows - 4, }), ); From b211ffb3e9520d81e8fc3ab89d0587d2ed40c69c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:56:18 +0000 Subject: [PATCH 060/290] Bump versions --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index d9674a8..0cb79e9 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.14", + "version": "0.0.15", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index 19c8a63..667cb8c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.20", + "version": "0.0.21", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index b079bd8..0ec346a 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.1", + "version": "0.5.2", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From f4c0f42f7ca24326992c3202b8ac1ba911ea0e36 Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Sat, 2 Mar 2024 18:14:49 +0000 Subject: [PATCH 061/290] allow users to provide some cli arguments to create-solid add the possibility for users to provide cli arguments to the create-solid command streamlining common use cases the added arguements are: - `-p | --project-name` to specify the name of the project - `-s | --solid-start` to request the creation of a solid-start project --- packages/commands/src/handlers/new.ts | 23 ++++---- packages/create-solid/package.json | 4 +- packages/create-solid/src/index.ts | 20 ++++++- pnpm-lock.yaml | 83 +++++---------------------- 4 files changed, 49 insertions(+), 81 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 9cdf2a7..0bd12ce 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -132,7 +132,7 @@ const handleTSConversion = async (tempDir: string, projectName: string) => { }); }; -const handleNewStartProject = async (projectName: string) => { +const handleNewStartProject = async (projectName: string, variation?: AllSupported) => { const template = await cancelable( p.select({ message: t.NEW_START, @@ -142,7 +142,7 @@ const handleNewStartProject = async (projectName: string) => { }), ); - const withTs = await cancelable(p.confirm({ message: "Use Typescript?" })); + const withTs = variation ? variation !== "ts" : await cancelable(p.confirm({ message: "Use Typescript?" })); // If the user does not want ts, we create the project in a temp directory inside the project directory const tempDir = withTs ? projectName : join(projectName, ".solid-start"); @@ -173,12 +173,8 @@ const handleNewStartProject = async (projectName: string) => { - npm run dev`); }; -const handleAutocompleteNew = async () => { - const name = await cancelable( - p.text({ message: t.PROJECT_NAME, placeholder: "solid-project", defaultValue: "solid-project" }), - ); - - const isStart = await cancelable(p.confirm({ message: t.IS_START_PROJECT })); +const handleAutocompleteNew = async (name: string, isStart?: boolean) => { + isStart ??= await cancelable(p.confirm({ message: t.IS_START_PROJECT })); if (isStart) { handleNewStartProject(name); @@ -197,11 +193,16 @@ const handleAutocompleteNew = async () => { }; export const handleNew = async ( variation?: AllSupported, - name: string = "solid-project", + name?: string, stackblitz: boolean = false, + isStart?: boolean, ) => { + name ??= await cancelable( + p.text({ message: t.PROJECT_NAME, placeholder: "solid-project", defaultValue: "solid-project" }), + ); + if (!variation) { - await handleAutocompleteNew(); + await handleAutocompleteNew(name, isStart); return; } @@ -214,7 +215,7 @@ export const handleNew = async ( return; } - const withTs = await cancelable(p.confirm({ message: "Use Typescript?" })); + const withTs = variation ? variation === "ts" : await cancelable(p.confirm({ message: "Use Typescript?" })); // If the user does not want ts, we create the project in a temp directory inside the project directory const tempDir = withTs ? name : join(name, ".solid-start"); diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 0ec346a..028aa6f 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -39,5 +39,7 @@ "publishConfig": { "access": "public" }, - "dependencies": {} + "dependencies": { + "commander": "^12.0.0" + } } diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index d34feeb..1de216f 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -3,5 +3,23 @@ import { handleNew } from "@solid-cli/commands/new"; import color from "picocolors"; import { intro } from "@clack/prompts"; import { version } from "../package.json"; +import { program } from "commander"; + intro(`\n${color.bgCyan(color.black(` Create-Solid v${version}`))}`); -handleNew(); + +program + .allowExcessArguments(false) + .configureHelp({ + commandUsage: () => "create-solid [options]", + }) + .helpOption(undefined, "Shows this help message") + .option("-p, --project-name ", "The name of your project") + .option("-s, --solid-start", "Create a SolidStart project"); + +program.parse(); +const { projectName, solidStart } = program.opts<{ + projectName?: string; + solidStart?: boolean; +}>(); + +handleNew(undefined, projectName, false, solidStart); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 886030b..4a2b386 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 1.12.4 vitest: specifier: ^1.3.1 - version: 1.3.1 + version: 1.3.1(@types/node@20.11.20) packages/commands: dependencies: @@ -126,6 +126,10 @@ importers: version: 5.3.3 packages/create-solid: + dependencies: + commander: + specifier: ^12.0.0 + version: 12.0.0 devDependencies: '@clack/prompts': specifier: 0.7.0 @@ -1736,6 +1740,11 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} + /commander@12.0.0: + resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==} + engines: {node: '>=18'} + dev: false + /commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} @@ -3498,10 +3507,6 @@ packages: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} dev: true - /std-env@3.6.0: - resolution: {integrity: sha512-aFZ19IgVmhdB2uX599ve2kE6BIE3YMnQ6Gp6BURhW/oIzpXGKr878TQfAQZn1+i0Flcc/UKUy1gOlcfaUBCryg==} - dev: true - /std-env@3.7.0: resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} dev: true @@ -3662,10 +3667,6 @@ packages: when-exit: 2.1.1 dev: false - /tinybench@2.5.1: - resolution: {integrity: sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==} - dev: true - /tinybench@2.6.0: resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} dev: true @@ -3994,7 +3995,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.4: + /vite@5.1.4(@types/node@20.11.20): resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4022,6 +4023,7 @@ packages: terser: optional: true dependencies: + '@types/node': 20.11.20 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -4029,7 +4031,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.3.1: + /vitest@1.3.1(@types/node@20.11.20): resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4054,6 +4056,7 @@ packages: jsdom: optional: true dependencies: + '@types/node': 20.11.20 '@vitest/expect': 1.3.1 '@vitest/runner': 1.3.1 '@vitest/snapshot': 1.3.1 @@ -4071,63 +4074,7 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.4 - vite-node: 1.3.1(@types/node@20.11.20) - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vitest@1.3.1(@types/node@20.11.20): - resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.3.1 - '@vitest/ui': 1.3.1 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - dependencies: - '@types/node': 20.11.20 - '@vitest/expect': 1.3.1 - '@vitest/runner': 1.3.1 - '@vitest/snapshot': 1.3.1 - '@vitest/spy': 1.3.1 - '@vitest/utils': 1.3.1 - acorn-walk: 8.3.2 - chai: 4.3.10 - debug: 4.3.4(supports-color@5.5.0) - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.5 - pathe: 1.1.1 - picocolors: 1.0.0 - std-env: 3.6.0 - strip-literal: 2.0.0 - tinybench: 2.5.1 - tinypool: 0.8.2 - vite: 5.0.10(@types/node@20.11.20) + vite: 5.1.4(@types/node@20.11.20) vite-node: 1.3.1(@types/node@20.11.20) why-is-node-running: 2.2.2 transitivePeerDependencies: From 133ccd4d9ec86972fb728dc42f8ed9dd710827fe Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Sat, 2 Mar 2024 18:34:56 +0000 Subject: [PATCH 062/290] add translations to cli args --- packages/create-solid/package.json | 1 + packages/create-solid/src/index.ts | 9 +++--- .../utils/src/translations/translations.ts | 30 +++++++++++++++++++ pnpm-lock.yaml | 3 ++ 4 files changed, 39 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 028aa6f..6b3d54b 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -30,6 +30,7 @@ }, "devDependencies": { "@solid-cli/commands": "workspace:*", + "@solid-cli/utils": "workspace:*", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3", diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 1de216f..e209230 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -4,17 +4,18 @@ import color from "picocolors"; import { intro } from "@clack/prompts"; import { version } from "../package.json"; import { program } from "commander"; +import { t } from "@solid-cli/utils"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${version}`))}`); program .allowExcessArguments(false) .configureHelp({ - commandUsage: () => "create-solid [options]", + commandUsage: () => `create-solid [${t.OPTIONS}]`, }) - .helpOption(undefined, "Shows this help message") - .option("-p, --project-name ", "The name of your project") - .option("-s, --solid-start", "Create a SolidStart project"); + .helpOption(undefined, t.SHOWS_THIS_HELP_MESSAGE) + .option(`-p, --project-name <${t.VALUE}>`, t.NAME_OF_YOUR_PROJECT) + .option("-s, --solid-start", t.CREATE_START_PROJECT); program.parse(); const { projectName, solidStart } = program.opts<{ diff --git a/packages/utils/src/translations/translations.ts b/packages/utils/src/translations/translations.ts index 59a643e..0b3cd1f 100644 --- a/packages/utils/src/translations/translations.ts +++ b/packages/utils/src/translations/translations.ts @@ -323,6 +323,36 @@ const TRANSLATIONS = { fr: "Ouvert avec succès dans le navigateur", ja: "ブラウザで正常に開きました", }, + OPTIONS: { + en: "options", + es: "opciones", + fr: "choix", + ja: "オプション", + }, + SHOWS_THIS_HELP_MESSAGE: { + en: "Shows this help message", + es: "Muestra este mensaje de ayuda", + fr: "Affiche ce message d'aide", + ja: "このヘルプメッセージを表示します", + }, + VALUE: { + en: "value", + es: "valor", + fr: "valeur", + ja: "価値", + }, + NAME_OF_YOUR_PROJECT: { + en: "The name of your project", + es: "El nombre de tu proyecto", + fr: "Le nom de votre projet", + ja: "プロジェクトの名前", + }, + CREATE_START_PROJECT: { + en: "Create a SolidStart project", + es: "Crear un proyecto SolidStart", + fr: "Créer un projet SolidStart", + ja: "SolidStart プロジェクトを作成する", + }, } as const satisfies Translations; export const t = new Proxy(TRANSLATIONS, { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4a2b386..a83b283 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -137,6 +137,9 @@ importers: '@solid-cli/commands': specifier: workspace:* version: link:../commands + '@solid-cli/utils': + specifier: workspace:* + version: link:../utils jiti: specifier: ^1.21.0 version: 1.21.0 From 3b5f536b1721f8bb587f23558ab614a8bb1874c7 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:15:23 +0000 Subject: [PATCH 063/290] Move to `cmd-ts` for argument parsing --- packages/create-solid/package.json | 13 ++++--- packages/create-solid/src/index.ts | 36 +++++++++---------- .../utils/src/translations/translations.ts | 30 ---------------- pnpm-lock.yaml | 26 +++++++------- 4 files changed, 36 insertions(+), 69 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 6b3d54b..a13b0b5 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -29,18 +29,17 @@ "build": "tsc && tsup" }, "devDependencies": { + "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@solid-cli/utils": "workspace:*", + "@types/node": "^20.11.24", + "cmd-ts": "^0.13.0", "jiti": "^1.21.0", + "picocolors": "^1.0.0", "tsup": "^8.0.2", - "typescript": "^5.3.3", - "@clack/prompts": "0.7.0", - "picocolors": "^1.0.0" + "typescript": "^5.3.3" }, "publishConfig": { "access": "public" }, - "dependencies": { - "commander": "^12.0.0" - } + "dependencies": {} } diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index e209230..f689db1 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -3,24 +3,24 @@ import { handleNew } from "@solid-cli/commands/new"; import color from "picocolors"; import { intro } from "@clack/prompts"; import { version } from "../package.json"; -import { program } from "commander"; -import { t } from "@solid-cli/utils"; +import { command, run, option, string, boolean, flag, optional } from "cmd-ts"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${version}`))}`); -program - .allowExcessArguments(false) - .configureHelp({ - commandUsage: () => `create-solid [${t.OPTIONS}]`, - }) - .helpOption(undefined, t.SHOWS_THIS_HELP_MESSAGE) - .option(`-p, --project-name <${t.VALUE}>`, t.NAME_OF_YOUR_PROJECT) - .option("-s, --solid-start", t.CREATE_START_PROJECT); - -program.parse(); -const { projectName, solidStart } = program.opts<{ - projectName?: string; - solidStart?: boolean; -}>(); - -handleNew(undefined, projectName, false, solidStart); +const app = command({ + name: "create-solid", + description: "Create a new Solid project", + args: { + projectName: option({ type: optional(string), long: "project-name", short: "p", description: "Name of your project" }), + solidStart: flag({ + type: optional(boolean), + long: "solid-start", + short: "s", + description: "Create a SolidStart project", + }), + }, + handler: async ({ projectName, solidStart }) => { + await handleNew(undefined, projectName, false, solidStart); + }, +}); +run(app, process.argv.slice(2)); diff --git a/packages/utils/src/translations/translations.ts b/packages/utils/src/translations/translations.ts index 0b3cd1f..59a643e 100644 --- a/packages/utils/src/translations/translations.ts +++ b/packages/utils/src/translations/translations.ts @@ -323,36 +323,6 @@ const TRANSLATIONS = { fr: "Ouvert avec succès dans le navigateur", ja: "ブラウザで正常に開きました", }, - OPTIONS: { - en: "options", - es: "opciones", - fr: "choix", - ja: "オプション", - }, - SHOWS_THIS_HELP_MESSAGE: { - en: "Shows this help message", - es: "Muestra este mensaje de ayuda", - fr: "Affiche ce message d'aide", - ja: "このヘルプメッセージを表示します", - }, - VALUE: { - en: "value", - es: "valor", - fr: "valeur", - ja: "価値", - }, - NAME_OF_YOUR_PROJECT: { - en: "The name of your project", - es: "El nombre de tu proyecto", - fr: "Le nom de votre projet", - ja: "プロジェクトの名前", - }, - CREATE_START_PROJECT: { - en: "Create a SolidStart project", - es: "Crear un proyecto SolidStart", - fr: "Créer un projet SolidStart", - ja: "SolidStart プロジェクトを作成する", - }, } as const satisfies Translations; export const t = new Proxy(TRANSLATIONS, { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a83b283..cb2b197 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -126,10 +126,6 @@ importers: version: 5.3.3 packages/create-solid: - dependencies: - commander: - specifier: ^12.0.0 - version: 12.0.0 devDependencies: '@clack/prompts': specifier: 0.7.0 @@ -137,9 +133,12 @@ importers: '@solid-cli/commands': specifier: workspace:* version: link:../commands - '@solid-cli/utils': - specifier: workspace:* - version: link:../utils + '@types/node': + specifier: ^20.11.24 + version: 20.11.24 + cmd-ts: + specifier: ^0.13.0 + version: 0.13.0 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -1352,6 +1351,12 @@ packages: undici-types: 5.26.5 dev: true + /@types/node@20.11.24: + resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} + dependencies: + undici-types: 5.26.5 + dev: true + /@types/normalize-package-data@2.4.4: resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true @@ -1722,7 +1727,6 @@ packages: strip-ansi: 6.0.1 transitivePeerDependencies: - supports-color - dev: false /color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} @@ -1743,11 +1747,6 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - /commander@12.0.0: - resolution: {integrity: sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==} - engines: {node: '>=18'} - dev: false - /commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} @@ -1863,7 +1862,6 @@ packages: /didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - dev: false /diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} From 950327dbf9fbecd7ed406d78a8cd49e08d43ef61 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 4 Mar 2024 20:31:04 +0000 Subject: [PATCH 064/290] Bump deps --- docs/package.json | 4 +-- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- pnpm-lock.yaml | 46 +++++++++++++++------------------- 6 files changed, 26 insertions(+), 32 deletions(-) diff --git a/docs/package.json b/docs/package.json index ea22902..62dc7cf 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,8 +8,8 @@ }, "devDependencies": { "flexsearch": "^0.7.43", - "vitepress": "1.0.0-rc.42", + "vitepress": "1.0.0-rc.44", "vitepress-plugin-search": "1.0.4-alpha.22", - "vue": "^3.4.19" + "vue": "^3.4.21" } } diff --git a/packages/commands/package.json b/packages/commands/package.json index 0cb79e9..fcf469a 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.20", + "@types/node": "^20.11.24", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.3.3" diff --git a/packages/core/package.json b/packages/core/package.json index 667cb8c..6864907 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.20", + "@types/node": "^20.11.24", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3" diff --git a/packages/ui/package.json b/packages/ui/package.json index 9cf1696..c746f99 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.3.3", - "@types/node": "20.11.20" + "@types/node": "20.11.24" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 8faee14..b1102db 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,7 +63,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "20.11.20", + "@types/node": "20.11.24", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cb2b197..11a362e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 1.12.4 vitest: specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.20) + version: 1.3.1(@types/node@20.11.24) packages/commands: dependencies: @@ -55,8 +55,8 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.20 - version: 20.11.20 + specifier: ^20.11.24 + version: 20.11.24 prettier: specifier: ^3.2.5 version: 3.2.5 @@ -113,8 +113,8 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: ^20.11.20 - version: 20.11.20 + specifier: ^20.11.24 + version: 20.11.24 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -182,8 +182,8 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.20 - version: 20.11.20 + specifier: 20.11.24 + version: 20.11.24 tsup: specifier: ^8.0.2 version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) @@ -222,8 +222,8 @@ importers: specifier: ^0.18.0 version: 0.18.0 '@types/node': - specifier: 20.11.20 - version: 20.11.20 + specifier: 20.11.24 + version: 20.11.24 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -235,7 +235,7 @@ importers: version: 5.3.3 vitest: specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.20) + version: 1.3.1(@types/node@20.11.24) packages: @@ -1345,12 +1345,6 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.20: - resolution: {integrity: sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==} - dependencies: - undici-types: 5.26.5 - dev: true - /@types/node@20.11.24: resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} dependencies: @@ -3939,7 +3933,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.3.1(@types/node@20.11.20): + /vite-node@1.3.1(@types/node@20.11.24): resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3948,7 +3942,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.20) + vite: 5.0.10(@types/node@20.11.24) transitivePeerDependencies: - '@types/node' - less @@ -3960,7 +3954,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.20): + /vite@5.0.10(@types/node@20.11.24): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3988,7 +3982,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.20 + '@types/node': 20.11.24 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3996,7 +3990,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.4(@types/node@20.11.20): + /vite@5.1.4(@types/node@20.11.24): resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4024,7 +4018,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.20 + '@types/node': 20.11.24 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -4032,7 +4026,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.3.1(@types/node@20.11.20): + /vitest@1.3.1(@types/node@20.11.24): resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4057,7 +4051,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.20 + '@types/node': 20.11.24 '@vitest/expect': 1.3.1 '@vitest/runner': 1.3.1 '@vitest/snapshot': 1.3.1 @@ -4075,8 +4069,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.4(@types/node@20.11.20) - vite-node: 1.3.1(@types/node@20.11.20) + vite: 5.1.4(@types/node@20.11.24) + vite-node: 1.3.1(@types/node@20.11.24) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From f5c15eaa652a37427c489410d4457e21daf8c64e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:06:40 +0000 Subject: [PATCH 065/290] Update docs lockfile --- docs/pnpm-lock.yaml | 182 ++++++++++++++++++++++---------------------- 1 file changed, 91 insertions(+), 91 deletions(-) diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 2089310..45e3f82 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -12,14 +12,14 @@ importers: specifier: ^0.7.43 version: 0.7.43 vitepress: - specifier: 1.0.0-rc.42 - version: 1.0.0-rc.42(@algolia/client-search@4.22.1)(search-insights@2.13.0) + specifier: 1.0.0-rc.44 + version: 1.0.0-rc.44(@algolia/client-search@4.22.1)(search-insights@2.13.0) vitepress-plugin-search: specifier: 1.0.4-alpha.22 - version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.42)(vue@3.4.19) + version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.44)(vue@3.4.21) vue: - specifier: ^3.4.19 - version: 3.4.19 + specifier: ^3.4.21 + version: 3.4.21 packages: @@ -542,14 +542,14 @@ packages: dev: true optional: true - /@shikijs/core@1.1.2: - resolution: {integrity: sha512-ERVzNQz88ZkDqUpWeC57Kp+Kmx5RjqeDBR1M8AGWGom4yrkITiTfXCGmjchlDSw12MhDTuPYR4HVFW8uT61RaQ==} + /@shikijs/core@1.1.7: + resolution: {integrity: sha512-gTYLUIuD1UbZp/11qozD3fWpUTuMqPSf3svDMMrL0UmlGU7D9dPw/V1FonwAorCUJBltaaESxq90jrSjQyGixg==} dev: true - /@shikijs/transformers@1.1.2: - resolution: {integrity: sha512-tldkUMW7RBkU2F6eXbiRMw3ja+hQer1EjwhD2NGOv6K0pgZdVp3JKjU8uisRtg65tyBqrVHq7zlLHVk7EKmUZA==} + /@shikijs/transformers@1.1.7: + resolution: {integrity: sha512-lXz011ao4+rvweps/9h3CchBfzb1U5OtP5D51Tqc9lQYdLblWMIxQxH6Ybe1GeGINcEVM4goMyPrI0JvlIp4UQ==} dependencies: - shiki: 1.1.2 + shiki: 1.1.7 dev: true /@types/estree@1.0.5: @@ -586,53 +586,53 @@ packages: resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} dev: true - /@vitejs/plugin-vue@5.0.3(vite@5.0.12)(vue@3.4.19): - resolution: {integrity: sha512-b8S5dVS40rgHdDrw+DQi/xOM9ed+kSRZzfm1T74bMmBDCd8XO87NKlFYInzCtwvtWwXZvo1QxE2OSspTATWrbA==} + /@vitejs/plugin-vue@5.0.4(vite@5.1.5)(vue@3.4.21): + resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.0.12 - vue: 3.4.19 + vite: 5.1.5 + vue: 3.4.21 dev: true - /@vue/compiler-core@3.4.19: - resolution: {integrity: sha512-gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w==} + /@vue/compiler-core@3.4.21: + resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==} dependencies: '@babel/parser': 7.23.9 - '@vue/shared': 3.4.19 + '@vue/shared': 3.4.21 entities: 4.5.0 estree-walker: 2.0.2 source-map-js: 1.0.2 dev: true - /@vue/compiler-dom@3.4.19: - resolution: {integrity: sha512-vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA==} + /@vue/compiler-dom@3.4.21: + resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==} dependencies: - '@vue/compiler-core': 3.4.19 - '@vue/shared': 3.4.19 + '@vue/compiler-core': 3.4.21 + '@vue/shared': 3.4.21 dev: true - /@vue/compiler-sfc@3.4.19: - resolution: {integrity: sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==} + /@vue/compiler-sfc@3.4.21: + resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} dependencies: '@babel/parser': 7.23.9 - '@vue/compiler-core': 3.4.19 - '@vue/compiler-dom': 3.4.19 - '@vue/compiler-ssr': 3.4.19 - '@vue/shared': 3.4.19 + '@vue/compiler-core': 3.4.21 + '@vue/compiler-dom': 3.4.21 + '@vue/compiler-ssr': 3.4.21 + '@vue/shared': 3.4.21 estree-walker: 2.0.2 magic-string: 0.30.7 - postcss: 8.4.33 + postcss: 8.4.35 source-map-js: 1.0.2 dev: true - /@vue/compiler-ssr@3.4.19: - resolution: {integrity: sha512-P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw==} + /@vue/compiler-ssr@3.4.21: + resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==} dependencies: - '@vue/compiler-dom': 3.4.19 - '@vue/shared': 3.4.19 + '@vue/compiler-dom': 3.4.21 + '@vue/shared': 3.4.21 dev: true /@vue/devtools-api@7.0.14: @@ -662,54 +662,54 @@ packages: rfdc: 1.3.1 dev: true - /@vue/reactivity@3.4.19: - resolution: {integrity: sha512-+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA==} + /@vue/reactivity@3.4.21: + resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==} dependencies: - '@vue/shared': 3.4.19 + '@vue/shared': 3.4.21 dev: true - /@vue/runtime-core@3.4.19: - resolution: {integrity: sha512-/Z3tFwOrerJB/oyutmJGoYbuoadphDcJAd5jOuJE86THNZji9pYjZroQ2NFsZkTxOq0GJbb+s2kxTYToDiyZzw==} + /@vue/runtime-core@3.4.21: + resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==} dependencies: - '@vue/reactivity': 3.4.19 - '@vue/shared': 3.4.19 + '@vue/reactivity': 3.4.21 + '@vue/shared': 3.4.21 dev: true - /@vue/runtime-dom@3.4.19: - resolution: {integrity: sha512-IyZzIDqfNCF0OyZOauL+F4yzjMPN2rPd8nhqPP2N1lBn3kYqJpPHHru+83Rkvo2lHz5mW+rEeIMEF9qY3PB94g==} + /@vue/runtime-dom@3.4.21: + resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==} dependencies: - '@vue/runtime-core': 3.4.19 - '@vue/shared': 3.4.19 + '@vue/runtime-core': 3.4.21 + '@vue/shared': 3.4.21 csstype: 3.1.3 dev: true - /@vue/server-renderer@3.4.19(vue@3.4.19): - resolution: {integrity: sha512-eAj2p0c429RZyyhtMRnttjcSToch+kTWxFPHlzGMkR28ZbF1PDlTcmGmlDxccBuqNd9iOQ7xPRPAGgPVj+YpQw==} + /@vue/server-renderer@3.4.21(vue@3.4.21): + resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==} peerDependencies: - vue: 3.4.19 + vue: 3.4.21 dependencies: - '@vue/compiler-ssr': 3.4.19 - '@vue/shared': 3.4.19 - vue: 3.4.19 + '@vue/compiler-ssr': 3.4.21 + '@vue/shared': 3.4.21 + vue: 3.4.21 dev: true - /@vue/shared@3.4.19: - resolution: {integrity: sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==} + /@vue/shared@3.4.21: + resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} dev: true - /@vueuse/core@10.7.2(vue@3.4.19): + /@vueuse/core@10.7.2(vue@3.4.21): resolution: {integrity: sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ==} dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.7.2 - '@vueuse/shared': 10.7.2(vue@3.4.19) - vue-demi: 0.14.6(vue@3.4.19) + '@vueuse/shared': 10.7.2(vue@3.4.21) + vue-demi: 0.14.6(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.19): + /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.21): resolution: {integrity: sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==} peerDependencies: async-validator: '*' @@ -750,10 +750,10 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.7.2(vue@3.4.19) - '@vueuse/shared': 10.7.2(vue@3.4.19) + '@vueuse/core': 10.7.2(vue@3.4.21) + '@vueuse/shared': 10.7.2(vue@3.4.21) focus-trap: 7.5.4 - vue-demi: 0.14.6(vue@3.4.19) + vue-demi: 0.14.6(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -763,10 +763,10 @@ packages: resolution: {integrity: sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ==} dev: true - /@vueuse/shared@10.7.2(vue@3.4.19): + /@vueuse/shared@10.7.2(vue@3.4.21): resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} dependencies: - vue-demi: 0.14.6(vue@3.4.19) + vue-demi: 0.14.6(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -924,8 +924,8 @@ packages: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true - /postcss@8.4.33: - resolution: {integrity: sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==} + /postcss@8.4.35: + resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 @@ -968,10 +968,10 @@ packages: resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} dev: true - /shiki@1.1.2: - resolution: {integrity: sha512-qNzFwTv5uhEDNUIwp7wHjsrffVeLbmOgWnM5mZZhoiz7G2qAUvqVfUzuWfieD45/YAKipzCtdV9SndacKtABow==} + /shiki@1.1.7: + resolution: {integrity: sha512-9kUTMjZtcPH3i7vHunA6EraTPpPOITYTdA5uMrvsJRexktqP0s7P3s9HVK80b4pP42FRVe03D7fT3NmJv2yYhw==} dependencies: - '@shikijs/core': 1.1.2 + '@shikijs/core': 1.1.7 dev: true /source-map-js@1.0.2: @@ -997,8 +997,8 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /vite@5.0.12: - resolution: {integrity: sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==} + /vite@5.1.5: + resolution: {integrity: sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -1026,13 +1026,13 @@ packages: optional: true dependencies: esbuild: 0.19.11 - postcss: 8.4.33 + postcss: 8.4.35 rollup: 4.9.5 optionalDependencies: fsevents: 2.3.3 dev: true - /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.42)(vue@3.4.19): + /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.44)(vue@3.4.21): resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: @@ -1045,16 +1045,16 @@ packages: flexsearch: 0.7.43 glob-to-regexp: 0.4.1 markdown-it: 13.0.2 - vitepress: 1.0.0-rc.42(@algolia/client-search@4.22.1)(search-insights@2.13.0) - vue: 3.4.19 + vitepress: 1.0.0-rc.44(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vue: 3.4.21 dev: true - /vitepress@1.0.0-rc.42(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-VeiVVXFblt/sjruFSJBNChMWwlztMrRMe8UXdNpf4e05mKtTYEY38MF5qoP90KxPTCfMQiKqwEGwXAGuOTK8HQ==} + /vitepress@1.0.0-rc.44(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-tO5taxGI7fSpBK1D8zrZTyJJERlyU9nnt0jHSt3fywfq3VKn977Hg0wUuTkEmwXlFYwuW26+6+3xorf4nD3XvA==} hasBin: true peerDependencies: markdown-it-mathjax3: ^4.3.2 - postcss: ^8.4.34 + postcss: ^8.4.35 peerDependenciesMeta: markdown-it-mathjax3: optional: true @@ -1063,19 +1063,19 @@ packages: dependencies: '@docsearch/css': 3.5.2 '@docsearch/js': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) - '@shikijs/core': 1.1.2 - '@shikijs/transformers': 1.1.2 + '@shikijs/core': 1.1.7 + '@shikijs/transformers': 1.1.7 '@types/markdown-it': 13.0.7 - '@vitejs/plugin-vue': 5.0.3(vite@5.0.12)(vue@3.4.19) + '@vitejs/plugin-vue': 5.0.4(vite@5.1.5)(vue@3.4.21) '@vue/devtools-api': 7.0.14 - '@vueuse/core': 10.7.2(vue@3.4.19) - '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.19) + '@vueuse/core': 10.7.2(vue@3.4.21) + '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.21) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 6.3.0 - shiki: 1.1.2 - vite: 5.0.12 - vue: 3.4.19 + shiki: 1.1.7 + vite: 5.1.5 + vue: 3.4.21 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -1104,7 +1104,7 @@ packages: - universal-cookie dev: true - /vue-demi@0.14.6(vue@3.4.19): + /vue-demi@0.14.6(vue@3.4.21): resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} engines: {node: '>=12'} hasBin: true @@ -1116,20 +1116,20 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.19 + vue: 3.4.21 dev: true - /vue@3.4.19: - resolution: {integrity: sha512-W/7Fc9KUkajFU8dBeDluM4sRGc/aa4YJnOYck8dkjgZoXtVsn3OeTGni66FV1l3+nvPA7VBFYtPioaGKUmEADw==} + /vue@3.4.21: + resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.19 - '@vue/compiler-sfc': 3.4.19 - '@vue/runtime-dom': 3.4.19 - '@vue/server-renderer': 3.4.19(vue@3.4.19) - '@vue/shared': 3.4.19 + '@vue/compiler-dom': 3.4.21 + '@vue/compiler-sfc': 3.4.21 + '@vue/runtime-dom': 3.4.21 + '@vue/server-renderer': 3.4.21(vue@3.4.21) + '@vue/shared': 3.4.21 dev: true From 3b308ee4fd89beec8b4c6d61d0cfaf6023645a83 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 5 Mar 2024 23:28:32 +0000 Subject: [PATCH 066/290] Release --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index fcf469a..755c988 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.15", + "version": "0.0.16", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index 6864907..f971fe2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.21", + "version": "0.0.22", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index a13b0b5..29fb016 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.2", + "version": "0.5.3", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 325e4ef4bc8538021f62d567c28f3cd4f954ee4f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Mar 2024 16:39:19 +0000 Subject: [PATCH 067/290] Refactored package manager detection --- packages/commands/src/handlers/new.ts | 7 ++- packages/utils/src/package-manager/index.ts | 67 +++++++++++++-------- packages/utils/src/updates/index.ts | 2 +- 3 files changed, 46 insertions(+), 30 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 0bd12ce..01bee78 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -9,6 +9,7 @@ import { basename, join, resolve } from "path"; import { Dirent, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; import { downloadAndExtract } from "@begit/core"; import { transform } from "sucrase"; +import { detectPackageManager } from "@solid-cli/utils/package-manager"; const gitIgnore = ` dist .solid @@ -166,11 +167,11 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport // Add .gitignore writeFileSync(join(projectName, ".gitignore"), gitIgnore); if (!readmeAlreadyExists) await modifyReadme(projectName); - + const pM = detectPackageManager(); p.log.info(`${t.GET_STARTED} - cd ${projectName} - - npm install - - npm run dev`); + - ${pM.name} ${pM.installCommand} + - ${pM.name} ${pM.runScriptCommand("dev")}`); }; const handleAutocompleteNew = async (name: string, isStart?: boolean) => { diff --git a/packages/utils/src/package-manager/index.ts b/packages/utils/src/package-manager/index.ts index 88ff4c5..7b3d934 100644 --- a/packages/utils/src/package-manager/index.ts +++ b/packages/utils/src/package-manager/index.ts @@ -1,44 +1,59 @@ // Taken almost verbatim from https://github.com/solidjs/solid-start/blob/f351f42ba8566cbfa72b483dd63d4debcb386230/packages/create-solid/cli/index.js#L62C1-L80C2 -export const detectPackageManager = () => { +export const detectPackageManager = (): PackageManager => { // This environment variable is set by npm and yarn but pnpm seems less consistent const userAgent = process.env.npm_config_user_agent || ""; switch (true) { case userAgent.startsWith("yarn"): - return "yarn"; + return { + name: "yarn", + runner: "npx", + installCommand: "add", + runScriptCommand(s) { + return `run ${s}`; + }, + }; case userAgent.startsWith("pnpm"): - return "pnpm"; + return { + name: "pnpm", + runner: "pnpx", + installCommand: "add", + runScriptCommand(s) { + return s; + }, + }; case userAgent.startsWith("bun"): - return "bun"; + return { + name: "bun", + runner: "bunx", + installCommand: "add", + runScriptCommand(s) { + return s; + }, + }; default: - return "npm"; + return { + name: "npm", + runner: "npx", + installCommand: "install", + runScriptCommand(s) { + return `run ${s}`; + }, + }; } }; export const getInstallCommand = (packageManager: PackageManager): string => { - switch (packageManager) { - case "npm": - return "install"; - case "yarn": - return "add"; - case "pnpm": - return "add"; - case "bun": - return "add"; - } + return packageManager.installCommand; }; export const getRunnerCommand = (packageManager: PackageManager) => { - switch (packageManager) { - case "npm": - return "npx"; - case "yarn": - return "npx"; - case "pnpm": - return "pnpx"; - case "bun": - return "bunx"; - } + return packageManager.runner; }; -export type PackageManager = ReturnType; +export type PackageManager = { + name: string; + runner: string; + installCommand: string; + runScriptCommand: (script: string) => string; +}; diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index c6ac36b..749c841 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -64,7 +64,7 @@ export const flushPackageUpdates = async () => { const pM = detectPackageManager(); const instlCmd = getInstallCommand(pM); for (const update of packageUpdates) { - await $`${pM} ${instlCmd} ${update.name}`; + await $`${pM.name} ${instlCmd} ${update.name}`; } }; export const flushCommandUpdates = async () => { From ce2616e6687aed6fafad35983123e9c862fbe0d3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Mar 2024 16:41:47 +0000 Subject: [PATCH 068/290] Add custom messages depending on package manager to non-start projects --- packages/commands/src/handlers/new.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 01bee78..f0f239e 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -238,8 +238,9 @@ export const handleNew = async ( // Add .gitignore writeFileSync(join(name, ".gitignore"), gitIgnore); if (!readmeAlreadyExists) await modifyReadme(name ?? variation); + const pM = detectPackageManager(); p.log.info(`${t.GET_STARTED} - cd ${name} - - npm install - - npm run dev`); + - ${pM.name} ${pM.installCommand} + - ${pM.name} ${pM.runScriptCommand("dev")}`); }; From 604a0e1e0587c109b70627a0f42fef4bc20ba52f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Mar 2024 16:44:23 +0000 Subject: [PATCH 069/290] chore: bump deps --- package.json | 2 +- packages/commands/package.json | 6 +- packages/core/package.json | 8 +- packages/create-solid/package.json | 4 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 4 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 241 ++++++++++++++--------------- 8 files changed, 137 insertions(+), 138 deletions(-) diff --git a/package.json b/package.json index 62aec0c..04166e1 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.1.0", "prettier": "^3.2.5", - "turbo": "^1.12.4", + "turbo": "^1.12.5", "vitest": "^1.3.1" }, "packageManager": "pnpm@8.7.5" diff --git a/packages/commands/package.json b/packages/commands/package.json index 755c988..a1b4440 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -32,11 +32,11 @@ "build": "tsc && tsup" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.24", + "@chialab/esbuild-plugin-meta-url": "^0.18.2", + "@types/node": "^20.11.25", "prettier": "^3.2.5", "tsup": "^8.0.2", - "typescript": "^5.3.3" + "typescript": "^5.4.2" }, "publishConfig": { "access": "public" diff --git a/packages/core/package.json b/packages/core/package.json index f971fe2..bed2919 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.2", + "@swc/core": "^1.4.6", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -41,11 +41,11 @@ "build": "tsc && tsup" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "^20.11.24", + "@chialab/esbuild-plugin-meta-url": "^0.18.2", + "@types/node": "^20.11.25", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.3.3" + "typescript": "^5.4.2" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 29fb016..04c99ca 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.11.24", + "@types/node": "^20.11.25", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", "tsup": "^8.0.2", - "typescript": "^5.3.3" + "typescript": "^5.4.2" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 6e36c3d..2d9d46c 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -29,7 +29,7 @@ "author": "Thomas Beer", "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.3.3" + "typescript": "^5.4.2" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index c746f99..b052f6f 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -28,8 +28,8 @@ }, "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.3.3", - "@types/node": "20.11.24" + "typescript": "^5.4.2", + "@types/node": "20.11.25" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index b1102db..e24a7b6 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -62,11 +62,11 @@ "build": "tsc && tsup && jiti ./scripts/postBuild.ts" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.18.0", - "@types/node": "20.11.24", + "@chialab/esbuild-plugin-meta-url": "^0.18.2", + "@types/node": "20.11.25", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.3.3", + "typescript": "^5.4.2", "vitest": "^1.3.1" }, "publishConfig": { @@ -76,7 +76,7 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.2", + "@swc/core": "^1.4.6", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11a362e..602c29c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.12.4 - version: 1.12.4 + specifier: ^1.12.5 + version: 1.12.5 vitest: specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.24) + version: 1.3.1(@types/node@20.11.25) packages/commands: dependencies: @@ -52,20 +52,20 @@ importers: version: 3.35.0 devDependencies: '@chialab/esbuild-plugin-meta-url': - specifier: ^0.18.0 - version: 0.18.0 + specifier: ^0.18.2 + version: 0.18.2 '@types/node': - specifier: ^20.11.24 - version: 20.11.24 + specifier: ^20.11.25 + version: 20.11.25 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 packages/core: dependencies: @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.2 - version: 1.4.2 + specifier: ^1.4.6 + version: 1.4.6 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -110,20 +110,20 @@ importers: version: 3.5.1 devDependencies: '@chialab/esbuild-plugin-meta-url': - specifier: ^0.18.0 - version: 0.18.0 + specifier: ^0.18.2 + version: 0.18.2 '@types/node': - specifier: ^20.11.24 - version: 20.11.24 + specifier: ^20.11.25 + version: 20.11.25 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 packages/create-solid: devDependencies: @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.11.24 - version: 20.11.24 + specifier: ^20.11.25 + version: 20.11.25 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -147,19 +147,19 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 packages/reactivity: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 packages/swc-plugin-solid-cli: {} @@ -182,14 +182,14 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.24 - version: 20.11.24 + specifier: 20.11.25 + version: 20.11.25 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 packages/utils: dependencies: @@ -203,8 +203,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.2 - version: 1.4.2 + specifier: ^1.4.6 + version: 1.4.6 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -219,23 +219,23 @@ importers: version: 1.1.4 devDependencies: '@chialab/esbuild-plugin-meta-url': - specifier: ^0.18.0 - version: 0.18.0 + specifier: ^0.18.2 + version: 0.18.2 '@types/node': - specifier: 20.11.24 - version: 20.11.24 + specifier: 20.11.25 + version: 20.11.25 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3) + version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) typescript: - specifier: ^5.3.3 - version: 5.3.3 + specifier: ^5.4.2 + version: 5.4.2 vitest: specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.24) + version: 1.3.1(@types/node@20.11.25) packages: @@ -457,26 +457,25 @@ packages: prettier: 2.8.8 dev: true - /@chialab/esbuild-plugin-meta-url@0.18.0: - resolution: {integrity: sha512-4O6epI7sDfS+tQz0KEutKlpfe97u5//qz7PC25F9CCptzcyB75F023IH8+48OmiF2JeXuqHDYI3/T2jBpG+HmA==} + /@chialab/esbuild-plugin-meta-url@0.18.2: + resolution: {integrity: sha512-uIRIdLvYnw5mLrTRXY0BTgeZx6ANL2/OHkWFl8FaiTYNb7cyXmwEDRE1mh6kBXPRPtGuqv6XSpNX+koEkElu4g==} engines: {node: '>=18'} dependencies: - '@chialab/esbuild-rna': 0.18.0 - '@chialab/estransform': 0.18.0 - '@chialab/node-resolve': 0.18.0 + '@chialab/esbuild-rna': 0.18.2 + '@chialab/estransform': 0.18.1 mime-types: 2.1.35 dev: true - /@chialab/esbuild-rna@0.18.0: - resolution: {integrity: sha512-7UdivnoeYFcMMKTcM2R8EKSJsRRnVhjuS79tLtkBmcZl13ZeGoLAUxA/fLx2Godr3yG7dhyr4Fj0QfJeVjNPmQ==} + /@chialab/esbuild-rna@0.18.2: + resolution: {integrity: sha512-ckzskez7bxstVQ4c5cxbx0DRP2teldzrcSGQl2KPh1VJGdO2ZmRrb6vNkBBD5K3dx9tgTyvskWp4dV+Fbg07Ag==} engines: {node: '>=18'} dependencies: - '@chialab/estransform': 0.18.0 + '@chialab/estransform': 0.18.1 '@chialab/node-resolve': 0.18.0 dev: true - /@chialab/estransform@0.18.0: - resolution: {integrity: sha512-GqQV36E/NZeAKjxq178i6XlbN9B6cGYYliw1grWghGo9YE4r1yO0eylYm9WaaDvvO1ozN/arVvyQ9G1TNJsRsQ==} + /@chialab/estransform@0.18.1: + resolution: {integrity: sha512-W/WmjpQL2hndD0/XfR0FcPBAUj+aLNeoAVehOjV/Q9bSnioz0GVSAXXhzp59S33ZynxJBBfn8DNiMTVNJmk4Aw==} engines: {node: '>=18'} dependencies: '@parcel/source-map': 2.1.1 @@ -1223,88 +1222,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.4.2: - resolution: {integrity: sha512-1uSdAn1MRK5C1m/TvLZ2RDvr0zLvochgrZ2xL+lRzugLlCTlSA+Q4TWtrZaOz+vnnFVliCpw7c7qu0JouhgQIw==} + /@swc/core-darwin-arm64@1.4.6: + resolution: {integrity: sha512-bpggpx/BfLFyy48aUKq1PsNUxb7J6CINlpAUk0V4yXfmGnpZH80Gp1pM3GkFDQyCfq7L7IpjPrIjWQwCrL4hYw==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.2: - resolution: {integrity: sha512-TYD28+dCQKeuxxcy7gLJUCFLqrwDZnHtC2z7cdeGfZpbI2mbfppfTf2wUPzqZk3gEC96zHd4Yr37V3Tvzar+lQ==} + /@swc/core-darwin-x64@1.4.6: + resolution: {integrity: sha512-vJn+/ZuBTg+vtNkcmgZdH6FQpa0hFVdnB9bAeqYwKkyqP15zaPe6jfC+qL2y/cIeC7ASvHXEKrnCZgBLxfVQ9w==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.2: - resolution: {integrity: sha512-Eyqipf7ZPGj0vplKHo8JUOoU1un2sg5PjJMpEesX0k+6HKE2T8pdyeyXODN0YTFqzndSa/J43EEPXm+rHAsLFQ==} + /@swc/core-linux-arm-gnueabihf@1.4.6: + resolution: {integrity: sha512-hEmYcB/9XBAl02MtuVHszhNjQpjBzhk/NFulnU33tBMbNZpy2TN5yTsitezMq090QXdDz8sKIALApDyg07ZR8g==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.2: - resolution: {integrity: sha512-wZn02DH8VYPv3FC0ub4my52Rttsus/rFw+UUfzdb3tHMHXB66LqN+rR0ssIOZrH6K+VLN6qpTw9VizjyoH0BxA==} + /@swc/core-linux-arm64-gnu@1.4.6: + resolution: {integrity: sha512-/UCYIVoGpm2YVvGHZM2QOA3dexa28BjcpLAIYnoCbgH5f7ulDhE8FAIO/9pasj+kixDBsdqewHfsNXFYlgGJjQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.2: - resolution: {integrity: sha512-3G0D5z9hUj9bXNcwmA1eGiFTwe5rWkuL3DsoviTj73TKLpk7u64ND0XjEfO0huVv4vVu9H1jodrKb7nvln/dlw==} + /@swc/core-linux-arm64-musl@1.4.6: + resolution: {integrity: sha512-LGQsKJ8MA9zZ8xHCkbGkcPSmpkZL2O7drvwsGKynyCttHhpwVjj9lguhD4DWU3+FWIsjvho5Vu0Ggei8OYi/Lw==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.2: - resolution: {integrity: sha512-LFxn9U8cjmYHw3jrdPNqPAkBGglKE3tCZ8rA7hYyp0BFxuo7L2ZcEnPm4RFpmSCCsExFH+LEJWuMGgWERoktvg==} + /@swc/core-linux-x64-gnu@1.4.6: + resolution: {integrity: sha512-10JL2nLIreMQDKvq2TECnQe5fCuoqBHu1yW8aChqgHUyg9d7gfZX/kppUsuimqcgRBnS0AjTDAA+JF6UsG/2Yg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.2: - resolution: {integrity: sha512-dp0fAmreeVVYTUcb4u9njTPrYzKnbIH0EhH2qvC9GOYNNREUu2GezSIDgonjOXkHiTCvopG4xU7y56XtXj4VrQ==} + /@swc/core-linux-x64-musl@1.4.6: + resolution: {integrity: sha512-EGyjFVzVY6Do89x8sfah7I3cuP4MwtwzmA6OlfD/KASqfCFf5eIaEBMbajgR41bVfMV7lK72lwAIea5xEyq1AQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.2: - resolution: {integrity: sha512-HlVIiLMQkzthAdqMslQhDkoXJ5+AOLUSTV6fm6shFKZKqc/9cJvr4S8UveNERL9zUficA36yM3bbfo36McwnvQ==} + /@swc/core-win32-arm64-msvc@1.4.6: + resolution: {integrity: sha512-gfW9AuXvwSyK07Vb8Y8E9m2oJZk21WqcD+X4BZhkbKB0TCZK0zk1j/HpS2UFlr1JB2zPKPpSWLU3ll0GEHRG2A==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.2: - resolution: {integrity: sha512-WCF8faPGjCl4oIgugkp+kL9nl3nUATlzKXCEGFowMEmVVCFM0GsqlmGdPp1pjZoWc9tpYanoXQDnp5IvlDSLhA==} + /@swc/core-win32-ia32-msvc@1.4.6: + resolution: {integrity: sha512-ZuQm81FhhvNVYtVb9GfZ+Du6e7fZlkisWvuCeBeRiyseNt1tcrQ8J3V67jD2nxje8CVXrwG3oUIbPcybv2rxfQ==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.2: - resolution: {integrity: sha512-oV71rwiSpA5xre2C5570BhCsg1HF97SNLsZ/12xv7zayGzqr3yvFALFJN8tHKpqUdCB4FGPjoP3JFdV3i+1wUw==} + /@swc/core-win32-x64-msvc@1.4.6: + resolution: {integrity: sha512-UagPb7w5V0uzWSjrXwOavGa7s9iv3wrVdEgWy+/inm0OwY4lj3zpK9qDnMWAwYLuFwkI3UG4Q3dH8wD+CUUcjw==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.2: - resolution: {integrity: sha512-vWgY07R/eqj1/a0vsRKLI9o9klGZfpLNOVEnrv4nrccxBgYPjcf22IWwAoaBJ+wpA7Q4fVjCUM8lP0m01dpxcg==} + /@swc/core@1.4.6: + resolution: {integrity: sha512-A7iK9+1qzTCIuc3IYcS8gPHCm9bZVKUJrfNnwveZYyo6OFp3jLno4WOM2yBy5uqedgYATEiWgBYHKq37KrU6IA==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -1316,16 +1315,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.2 - '@swc/core-darwin-x64': 1.4.2 - '@swc/core-linux-arm-gnueabihf': 1.4.2 - '@swc/core-linux-arm64-gnu': 1.4.2 - '@swc/core-linux-arm64-musl': 1.4.2 - '@swc/core-linux-x64-gnu': 1.4.2 - '@swc/core-linux-x64-musl': 1.4.2 - '@swc/core-win32-arm64-msvc': 1.4.2 - '@swc/core-win32-ia32-msvc': 1.4.2 - '@swc/core-win32-x64-msvc': 1.4.2 + '@swc/core-darwin-arm64': 1.4.6 + '@swc/core-darwin-x64': 1.4.6 + '@swc/core-linux-arm-gnueabihf': 1.4.6 + '@swc/core-linux-arm64-gnu': 1.4.6 + '@swc/core-linux-arm64-musl': 1.4.6 + '@swc/core-linux-x64-gnu': 1.4.6 + '@swc/core-linux-x64-musl': 1.4.6 + '@swc/core-win32-arm64-msvc': 1.4.6 + '@swc/core-win32-ia32-msvc': 1.4.6 + '@swc/core-win32-x64-msvc': 1.4.6 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1345,8 +1344,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.24: - resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==} + /@types/node@20.11.25: + resolution: {integrity: sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==} dependencies: undici-types: 5.26.5 dev: true @@ -3716,7 +3715,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.2)(typescript@5.3.3): + /tsup@8.0.2(@swc/core@1.4.6)(typescript@5.4.2): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -3735,7 +3734,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.4.2 + '@swc/core': 1.4.6 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3750,7 +3749,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 - typescript: 5.3.3 + typescript: 5.4.2 transitivePeerDependencies: - supports-color - ts-node @@ -3770,64 +3769,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.12.4: - resolution: {integrity: sha512-dBwFxhp9isTa9RS/fz2gDVk5wWhKQsPQMozYhjM7TT4jTrnYn0ZJMzr7V3B/M/T8QF65TbniW7w1gtgxQgX5Zg==} + /turbo-darwin-64@1.12.5: + resolution: {integrity: sha512-0GZ8reftwNQgIQLHkHjHEXTc/Z1NJm+YjsrBP+qhM/7yIZ3TEy9gJhuogDt2U0xIWwFgisTyzbtU7xNaQydtoA==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.12.4: - resolution: {integrity: sha512-1Uo5iI6xsJ1j9ObsqxYRsa3W26mEbUe6fnj4rQYV6kDaqYD54oAMJ6hM53q9rB8JvFxwdrUXGp3PwTw9A0qqkA==} + /turbo-darwin-arm64@1.12.5: + resolution: {integrity: sha512-8WpOLNNzvH6kohQOjihD+gaWL+ZFNfjvBwhOF0rjEzvW+YR3Pa7KjhulrjWyeN2yMFqAPubTbZIGOz1EVXLuQA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.12.4: - resolution: {integrity: sha512-ONg2aSqKP7LAQOg7ysmU5WpEQp4DGNxSlAiR7um+LKtbmC/UxogbR5+T+Uuq6zGuQ5kJyKjWJ4NhtvUswOqBsA==} + /turbo-linux-64@1.12.5: + resolution: {integrity: sha512-INit73+bNUpwqGZCxgXCR3I+cQsdkQ3/LkfkgSOibkpg+oGqxJRzeXw3sp990d7SCoE8QOcs3iw+PtiFX/LDAA==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.12.4: - resolution: {integrity: sha512-9FPufkwdgfIKg/9jj87Cdtftw8o36y27/S2vLN7FTR2pp9c0MQiTBOLVYadUr1FlShupddmaMbTkXEhyt9SdrA==} + /turbo-linux-arm64@1.12.5: + resolution: {integrity: sha512-6lkRBvxtI/GQdGtaAec9LvVQUoRw6nXFp0kM+Eu+5PbZqq7yn6cMkgDJLI08zdeui36yXhone8XGI8pHg8bpUQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.12.4: - resolution: {integrity: sha512-2mOtxHW5Vjh/5rDVu/aFwsMzI+chs8XcEuJHlY1sYOpEymYTz+u6AXbnzRvwZFMrLKr7J7fQOGl+v96sLKbNdA==} + /turbo-windows-64@1.12.5: + resolution: {integrity: sha512-gQYbOhZg5Ww0bQ/bC0w/4W6yQRwBumUUnkB+QPo15VznwxZe2a7bo6JM+9Xy9dKLa/kn+p7zTqme4OEp6M3/Yg==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.12.4: - resolution: {integrity: sha512-nOY5wae9qnxPOpT1fRuYO0ks6dTwpKMPV6++VkDkamFDLFHUDVM/9kmD2UTeh1yyrKnrZksbb9zmShhmfj1wog==} + /turbo-windows-arm64@1.12.5: + resolution: {integrity: sha512-auvhZ9FrhnvQ4mgBlY9O68MT4dIfprYGvd2uPICba/mHUZZvVy5SGgbHJ0KbMwaJfnnFoPgLJO6M+3N2gDprKw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.12.4: - resolution: {integrity: sha512-yUJ7elEUSToiGwFZogXpYKJpQ0BvaMbkEuQECIWtkBLcmWzlMOt6bActsIm29oN83mRU0WbzGt4e8H1KHWedhg==} + /turbo@1.12.5: + resolution: {integrity: sha512-FATU5EnhrYG8RvQJYFJnDd18DpccDjyvd53hggw9T9JEg9BhWtIEoeaKtBjYbpXwOVrJQMDdXcIB4f2nD3QPPg==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.12.4 - turbo-darwin-arm64: 1.12.4 - turbo-linux-64: 1.12.4 - turbo-linux-arm64: 1.12.4 - turbo-windows-64: 1.12.4 - turbo-windows-arm64: 1.12.4 + turbo-darwin-64: 1.12.5 + turbo-darwin-arm64: 1.12.5 + turbo-linux-64: 1.12.5 + turbo-linux-arm64: 1.12.5 + turbo-windows-64: 1.12.5 + turbo-windows-arm64: 1.12.5 dev: true /type-detect@4.0.8: @@ -3894,8 +3893,8 @@ packages: possible-typed-array-names: 1.0.0 dev: true - /typescript@5.3.3: - resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + /typescript@5.4.2: + resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -3933,7 +3932,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.3.1(@types/node@20.11.24): + /vite-node@1.3.1(@types/node@20.11.25): resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3942,7 +3941,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.24) + vite: 5.0.10(@types/node@20.11.25) transitivePeerDependencies: - '@types/node' - less @@ -3954,7 +3953,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.24): + /vite@5.0.10(@types/node@20.11.25): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3982,7 +3981,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3990,7 +3989,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.4(@types/node@20.11.24): + /vite@5.1.4(@types/node@20.11.25): resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4018,7 +4017,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -4026,7 +4025,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.3.1(@types/node@20.11.24): + /vitest@1.3.1(@types/node@20.11.25): resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4051,7 +4050,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.24 + '@types/node': 20.11.25 '@vitest/expect': 1.3.1 '@vitest/runner': 1.3.1 '@vitest/snapshot': 1.3.1 @@ -4069,8 +4068,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.4(@types/node@20.11.24) - vite-node: 1.3.1(@types/node@20.11.24) + vite: 5.1.4(@types/node@20.11.25) + vite-node: 1.3.1(@types/node@20.11.25) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 2281938fd8ddcbf0562d9f34cc93e859dde3caca Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Mar 2024 16:46:47 +0000 Subject: [PATCH 070/290] release --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/utils/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index a1b4440..fcc4f57 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.16", + "version": "0.0.17", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index bed2919..c2b2bc1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.22", + "version": "0.0.23", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 04c99ca..7746880 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.3", + "version": "0.5.4", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index e24a7b6..fa889f7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.11", + "version": "0.0.12", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 3b6183f743228a4dfd0957973c1d985d225a7e87 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Mar 2024 16:49:13 +0000 Subject: [PATCH 071/290] fix: wrong command displayed for installing all dependencies into project --- packages/commands/src/handlers/new.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index f0f239e..f35fee4 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -170,7 +170,7 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport const pM = detectPackageManager(); p.log.info(`${t.GET_STARTED} - cd ${projectName} - - ${pM.name} ${pM.installCommand} + - ${pM.name} install - ${pM.name} ${pM.runScriptCommand("dev")}`); }; @@ -241,6 +241,6 @@ export const handleNew = async ( const pM = detectPackageManager(); p.log.info(`${t.GET_STARTED} - cd ${name} - - ${pM.name} ${pM.installCommand} + - ${pM.name} install - ${pM.name} ${pM.runScriptCommand("dev")}`); }; From 4f034b262d755e36574ef18552200dc4cc4aed13 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 9 Mar 2024 16:50:20 +0000 Subject: [PATCH 072/290] release --- packages/commands/package.json | 2 +- packages/create-solid/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index fcc4f57..8e3e834 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.17", + "version": "0.0.18", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 7746880..1bbee7c 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.4", + "version": "0.5.5", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 4369ef7fa174965ca0eaad9c0c2dbd3e596ab58d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 14 Mar 2024 20:48:16 +0000 Subject: [PATCH 073/290] chore: bump deps --- docs/package.json | 2 +- docs/pnpm-lock.yaml | 14 +-- packages/commands/package.json | 2 +- packages/core/package.json | 4 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 136 ++++++++++++++--------------- 8 files changed, 83 insertions(+), 83 deletions(-) diff --git a/docs/package.json b/docs/package.json index 62dc7cf..a39d338 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,7 +8,7 @@ }, "devDependencies": { "flexsearch": "^0.7.43", - "vitepress": "1.0.0-rc.44", + "vitepress": "1.0.0-rc.45", "vitepress-plugin-search": "1.0.4-alpha.22", "vue": "^3.4.21" } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 45e3f82..fdb0717 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -12,11 +12,11 @@ importers: specifier: ^0.7.43 version: 0.7.43 vitepress: - specifier: 1.0.0-rc.44 - version: 1.0.0-rc.44(@algolia/client-search@4.22.1)(search-insights@2.13.0) + specifier: 1.0.0-rc.45 + version: 1.0.0-rc.45(@algolia/client-search@4.22.1)(search-insights@2.13.0) vitepress-plugin-search: specifier: 1.0.4-alpha.22 - version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.44)(vue@3.4.21) + version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.45)(vue@3.4.21) vue: specifier: ^3.4.21 version: 3.4.21 @@ -1032,7 +1032,7 @@ packages: fsevents: 2.3.3 dev: true - /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.44)(vue@3.4.21): + /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.45)(vue@3.4.21): resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: @@ -1045,12 +1045,12 @@ packages: flexsearch: 0.7.43 glob-to-regexp: 0.4.1 markdown-it: 13.0.2 - vitepress: 1.0.0-rc.44(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vitepress: 1.0.0-rc.45(@algolia/client-search@4.22.1)(search-insights@2.13.0) vue: 3.4.21 dev: true - /vitepress@1.0.0-rc.44(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-tO5taxGI7fSpBK1D8zrZTyJJERlyU9nnt0jHSt3fywfq3VKn977Hg0wUuTkEmwXlFYwuW26+6+3xorf4nD3XvA==} + /vitepress@1.0.0-rc.45(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-/OiYsu5UKpQKA2c0BAZkfyywjfauDjvXyv6Mo4Ra57m5n4Bxg1HgUGoth1CLH2vwUbR/BHvDA9zOM0RDvgeSVQ==} hasBin: true peerDependencies: markdown-it-mathjax3: ^4.3.2 diff --git a/packages/commands/package.json b/packages/commands/package.json index 8e3e834..7030ba5 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.25", + "@types/node": "^20.11.27", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.4.2" diff --git a/packages/core/package.json b/packages/core/package.json index c2b2bc1..2b8dc6c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.6", + "@swc/core": "^1.4.8", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.25", + "@types/node": "^20.11.27", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.2" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 1bbee7c..c8820ac 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.11.25", + "@types/node": "^20.11.27", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index b052f6f..6c7451b 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.4.2", - "@types/node": "20.11.25" + "@types/node": "20.11.27" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index fa889f7..12825ce 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,7 +63,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.11.25", + "@types/node": "20.11.27", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.2", @@ -76,7 +76,7 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.6", + "@swc/core": "^1.4.8", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 602c29c..93eebc9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 1.12.5 vitest: specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.25) + version: 1.3.1(@types/node@20.11.27) packages/commands: dependencies: @@ -55,14 +55,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.25 - version: 20.11.25 + specifier: ^20.11.27 + version: 20.11.27 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) typescript: specifier: ^5.4.2 version: 5.4.2 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.6 - version: 1.4.6 + specifier: ^1.4.8 + version: 1.4.8 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -113,14 +113,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.25 - version: 20.11.25 + specifier: ^20.11.27 + version: 20.11.27 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) typescript: specifier: ^5.4.2 version: 5.4.2 @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.11.25 - version: 20.11.25 + specifier: ^20.11.27 + version: 20.11.27 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -147,7 +147,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) typescript: specifier: ^5.4.2 version: 5.4.2 @@ -156,7 +156,7 @@ importers: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) typescript: specifier: ^5.4.2 version: 5.4.2 @@ -182,11 +182,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.25 - version: 20.11.25 + specifier: 20.11.27 + version: 20.11.27 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) typescript: specifier: ^5.4.2 version: 5.4.2 @@ -203,8 +203,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.6 - version: 1.4.6 + specifier: ^1.4.8 + version: 1.4.8 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -222,20 +222,20 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.11.25 - version: 20.11.25 + specifier: 20.11.27 + version: 20.11.27 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.6)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) typescript: specifier: ^5.4.2 version: 5.4.2 vitest: specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.25) + version: 1.3.1(@types/node@20.11.27) packages: @@ -1222,88 +1222,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.4.6: - resolution: {integrity: sha512-bpggpx/BfLFyy48aUKq1PsNUxb7J6CINlpAUk0V4yXfmGnpZH80Gp1pM3GkFDQyCfq7L7IpjPrIjWQwCrL4hYw==} + /@swc/core-darwin-arm64@1.4.8: + resolution: {integrity: sha512-hhQCffRTgzpTIbngSnC30vV6IJVTI9FFBF954WEsshsecVoCGFiMwazBbrkLG+RwXENTrMhgeREEFh6R3KRgKQ==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.6: - resolution: {integrity: sha512-vJn+/ZuBTg+vtNkcmgZdH6FQpa0hFVdnB9bAeqYwKkyqP15zaPe6jfC+qL2y/cIeC7ASvHXEKrnCZgBLxfVQ9w==} + /@swc/core-darwin-x64@1.4.8: + resolution: {integrity: sha512-P3ZBw8Jr8rKhY/J8d+6WqWriqngGTgHwtFeJ8MIakQJTbdYbFgXSZxcvDiERg3psbGeFXaUaPI0GO6BXv9k/OQ==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.6: - resolution: {integrity: sha512-hEmYcB/9XBAl02MtuVHszhNjQpjBzhk/NFulnU33tBMbNZpy2TN5yTsitezMq090QXdDz8sKIALApDyg07ZR8g==} + /@swc/core-linux-arm-gnueabihf@1.4.8: + resolution: {integrity: sha512-PP9JIJt19bUWhAGcQW6qMwTjZOcMyzkvZa0/LWSlDm0ORYVLmDXUoeQbGD3e0Zju9UiZxyulnpjEN0ZihJgPTA==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.6: - resolution: {integrity: sha512-/UCYIVoGpm2YVvGHZM2QOA3dexa28BjcpLAIYnoCbgH5f7ulDhE8FAIO/9pasj+kixDBsdqewHfsNXFYlgGJjQ==} + /@swc/core-linux-arm64-gnu@1.4.8: + resolution: {integrity: sha512-HvEWnwKHkoVUr5iftWirTApFJ13hGzhAY2CMw4lz9lur2m+zhPviRRED0FCI6T95Knpv7+8eUOr98Z7ctrG6DQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.6: - resolution: {integrity: sha512-LGQsKJ8MA9zZ8xHCkbGkcPSmpkZL2O7drvwsGKynyCttHhpwVjj9lguhD4DWU3+FWIsjvho5Vu0Ggei8OYi/Lw==} + /@swc/core-linux-arm64-musl@1.4.8: + resolution: {integrity: sha512-kY8+qa7k/dEeBq9p0Hrta18QnJPpsiJvDQSLNaTIFpdM3aEM9zbkshWz8gaX5VVGUEALowCBUWqmzO4VaqM+2w==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.6: - resolution: {integrity: sha512-10JL2nLIreMQDKvq2TECnQe5fCuoqBHu1yW8aChqgHUyg9d7gfZX/kppUsuimqcgRBnS0AjTDAA+JF6UsG/2Yg==} + /@swc/core-linux-x64-gnu@1.4.8: + resolution: {integrity: sha512-0WWyIw432wpO/zeGblwq4f2YWam4pn8Z/Ig4KzHMgthR/KmiLU3f0Z7eo45eVmq5vcU7Os1zi/Zb65OOt09q/w==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.6: - resolution: {integrity: sha512-EGyjFVzVY6Do89x8sfah7I3cuP4MwtwzmA6OlfD/KASqfCFf5eIaEBMbajgR41bVfMV7lK72lwAIea5xEyq1AQ==} + /@swc/core-linux-x64-musl@1.4.8: + resolution: {integrity: sha512-p4yxvVS05rBNCrBaSTa20KK88vOwtg8ifTW7ec/yoab0bD5EwzzB8KbDmLLxE6uziFa0sdjF0dfRDwSZPex37Q==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.6: - resolution: {integrity: sha512-gfW9AuXvwSyK07Vb8Y8E9m2oJZk21WqcD+X4BZhkbKB0TCZK0zk1j/HpS2UFlr1JB2zPKPpSWLU3ll0GEHRG2A==} + /@swc/core-win32-arm64-msvc@1.4.8: + resolution: {integrity: sha512-jKuXihxAaqUnbFfvPxtmxjdJfs87F1GdBf33il+VUmSyWCP4BE6vW+/ReDAe8sRNsKyrZ3UH1vI5q1n64csBUA==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.6: - resolution: {integrity: sha512-ZuQm81FhhvNVYtVb9GfZ+Du6e7fZlkisWvuCeBeRiyseNt1tcrQ8J3V67jD2nxje8CVXrwG3oUIbPcybv2rxfQ==} + /@swc/core-win32-ia32-msvc@1.4.8: + resolution: {integrity: sha512-O0wT4AGHrX8aBeH6c2ADMHgagAJc5Kf6W48U5moyYDAkkVnKvtSc4kGhjWhe1Yl0sI0cpYh2In2FxvYsb44eWw==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.6: - resolution: {integrity: sha512-UagPb7w5V0uzWSjrXwOavGa7s9iv3wrVdEgWy+/inm0OwY4lj3zpK9qDnMWAwYLuFwkI3UG4Q3dH8wD+CUUcjw==} + /@swc/core-win32-x64-msvc@1.4.8: + resolution: {integrity: sha512-C2AYc3A2o+ECciqsJWRgIpp83Vk5EaRzHe7ed/xOWzVd0MsWR+fweEsyOjlmzHfpUxJSi46Ak3/BIZJlhZbXbg==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.6: - resolution: {integrity: sha512-A7iK9+1qzTCIuc3IYcS8gPHCm9bZVKUJrfNnwveZYyo6OFp3jLno4WOM2yBy5uqedgYATEiWgBYHKq37KrU6IA==} + /@swc/core@1.4.8: + resolution: {integrity: sha512-uY2RSJcFPgNOEg12RQZL197LZX+MunGiKxsbxmh22VfVxrOYGRvh4mPANFlrD1yb38CgmW1wI6YgIi8LkIwmWg==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -1315,16 +1315,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.6 - '@swc/core-darwin-x64': 1.4.6 - '@swc/core-linux-arm-gnueabihf': 1.4.6 - '@swc/core-linux-arm64-gnu': 1.4.6 - '@swc/core-linux-arm64-musl': 1.4.6 - '@swc/core-linux-x64-gnu': 1.4.6 - '@swc/core-linux-x64-musl': 1.4.6 - '@swc/core-win32-arm64-msvc': 1.4.6 - '@swc/core-win32-ia32-msvc': 1.4.6 - '@swc/core-win32-x64-msvc': 1.4.6 + '@swc/core-darwin-arm64': 1.4.8 + '@swc/core-darwin-x64': 1.4.8 + '@swc/core-linux-arm-gnueabihf': 1.4.8 + '@swc/core-linux-arm64-gnu': 1.4.8 + '@swc/core-linux-arm64-musl': 1.4.8 + '@swc/core-linux-x64-gnu': 1.4.8 + '@swc/core-linux-x64-musl': 1.4.8 + '@swc/core-win32-arm64-msvc': 1.4.8 + '@swc/core-win32-ia32-msvc': 1.4.8 + '@swc/core-win32-x64-msvc': 1.4.8 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1344,8 +1344,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.25: - resolution: {integrity: sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==} + /@types/node@20.11.27: + resolution: {integrity: sha512-qyUZfMnCg1KEz57r7pzFtSGt49f6RPkPBis3Vo4PbS7roQEDn22hiHzl/Lo1q4i4hDEgBJmBF/NTNg2XR0HbFg==} dependencies: undici-types: 5.26.5 dev: true @@ -3715,7 +3715,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.6)(typescript@5.4.2): + /tsup@8.0.2(@swc/core@1.4.8)(typescript@5.4.2): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -3734,7 +3734,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.4.6 + '@swc/core': 1.4.8 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3932,7 +3932,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.3.1(@types/node@20.11.25): + /vite-node@1.3.1(@types/node@20.11.27): resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3941,7 +3941,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.1 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.25) + vite: 5.0.10(@types/node@20.11.27) transitivePeerDependencies: - '@types/node' - less @@ -3953,7 +3953,7 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.25): + /vite@5.0.10(@types/node@20.11.27): resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -3981,7 +3981,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.25 + '@types/node': 20.11.27 esbuild: 0.19.9 postcss: 8.4.32 rollup: 4.9.1 @@ -3989,7 +3989,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.4(@types/node@20.11.25): + /vite@5.1.4(@types/node@20.11.27): resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4017,7 +4017,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.25 + '@types/node': 20.11.27 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -4025,7 +4025,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.3.1(@types/node@20.11.25): + /vitest@1.3.1(@types/node@20.11.27): resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4050,7 +4050,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.25 + '@types/node': 20.11.27 '@vitest/expect': 1.3.1 '@vitest/runner': 1.3.1 '@vitest/snapshot': 1.3.1 @@ -4068,8 +4068,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.4(@types/node@20.11.25) - vite-node: 1.3.1(@types/node@20.11.25) + vite: 5.1.4(@types/node@20.11.27) + vite-node: 1.3.1(@types/node@20.11.27) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 5c7ffc45261d61804572c8cda14946ecd1928ac5 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 17 Mar 2024 22:23:37 +0000 Subject: [PATCH 074/290] Update deps --- docs/pnpm-lock.yaml | 392 ++++++++++----------- package.json | 4 +- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 539 +++++++++++++++++++++-------- 8 files changed, 605 insertions(+), 342 deletions(-) diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index fdb0717..56d7d4f 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -167,16 +167,16 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/parser@7.23.9: - resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==} + /@babel/parser@7.24.0: + resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.23.6 + '@babel/types': 7.24.0 dev: true - /@babel/types@7.23.6: - resolution: {integrity: sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==} + /@babel/types@7.24.0: + resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.23.4 @@ -184,15 +184,15 @@ packages: to-fast-properties: 2.0.0 dev: true - /@docsearch/css@3.5.2: - resolution: {integrity: sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA==} + /@docsearch/css@3.6.0: + resolution: {integrity: sha512-+sbxb71sWre+PwDK7X2T8+bhS6clcVMLwBPznX45Qu6opJcgRjAp7gYSDzVFp187J+feSj5dNBN1mJoi6ckkUQ==} dev: true - /@docsearch/js@3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-p1YFTCDflk8ieHgFJYfmyHBki1D61+U9idwrLh+GQQMrBSP3DLGKpy0XUJtPjAOPltcVbqsTjiPFfH7JImjUNg==} + /@docsearch/js@3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-QujhqINEElrkIfKwyyyTfbsfMAYCkylInLYMRqHy7PHc8xTBQCow73tlo/Kc7oIwBrCLf0P3YhjlOeV4v8hevQ==} dependencies: - '@docsearch/react': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) - preact: 10.19.3 + '@docsearch/react': 3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0) + preact: 10.19.6 transitivePeerDependencies: - '@algolia/client-search' - '@types/react' @@ -201,8 +201,8 @@ packages: - search-insights dev: true - /@docsearch/react@3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-9Ahcrs5z2jq/DcAvYtvlqEBHImbm4YJI8M9y0x6Tqg598P40HTEkX7hsMcIuThI+hTFxRGZ9hll0Wygm2yEjng==} + /@docsearch/react@3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-HUFut4ztcVNmqy9gp/wxNbC7pTOHhgVVkHVGCACTuLhUKUhKAF9KYHJtMiLUJxEqiFLQiuri1fWF8zqwM/cu1w==} peerDependencies: '@types/react': '>= 16.8.0 < 19.0.0' react: '>= 16.8.0 < 19.0.0' @@ -220,15 +220,15 @@ packages: dependencies: '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0) '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) - '@docsearch/css': 3.5.2 + '@docsearch/css': 3.6.0 algoliasearch: 4.22.1 search-insights: 2.13.0 transitivePeerDependencies: - '@algolia/client-search' dev: true - /@esbuild/aix-ppc64@0.19.11: - resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==} + /@esbuild/aix-ppc64@0.19.12: + resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} engines: {node: '>=12'} cpu: [ppc64] os: [aix] @@ -236,8 +236,8 @@ packages: dev: true optional: true - /@esbuild/android-arm64@0.19.11: - resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==} + /@esbuild/android-arm64@0.19.12: + resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -245,8 +245,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.19.11: - resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==} + /@esbuild/android-arm@0.19.12: + resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -254,8 +254,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.19.11: - resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==} + /@esbuild/android-x64@0.19.12: + resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -263,8 +263,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.19.11: - resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==} + /@esbuild/darwin-arm64@0.19.12: + resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -272,8 +272,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.19.11: - resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==} + /@esbuild/darwin-x64@0.19.12: + resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -281,8 +281,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.19.11: - resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==} + /@esbuild/freebsd-arm64@0.19.12: + resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -290,8 +290,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.19.11: - resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==} + /@esbuild/freebsd-x64@0.19.12: + resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -299,8 +299,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.19.11: - resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==} + /@esbuild/linux-arm64@0.19.12: + resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -308,8 +308,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.19.11: - resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==} + /@esbuild/linux-arm@0.19.12: + resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -317,8 +317,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.19.11: - resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==} + /@esbuild/linux-ia32@0.19.12: + resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -326,8 +326,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.19.11: - resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==} + /@esbuild/linux-loong64@0.19.12: + resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -335,8 +335,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.19.11: - resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==} + /@esbuild/linux-mips64el@0.19.12: + resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -344,8 +344,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.19.11: - resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==} + /@esbuild/linux-ppc64@0.19.12: + resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -353,8 +353,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.19.11: - resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==} + /@esbuild/linux-riscv64@0.19.12: + resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -362,8 +362,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.19.11: - resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==} + /@esbuild/linux-s390x@0.19.12: + resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -371,8 +371,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.19.11: - resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==} + /@esbuild/linux-x64@0.19.12: + resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -380,8 +380,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.19.11: - resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==} + /@esbuild/netbsd-x64@0.19.12: + resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -389,8 +389,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.19.11: - resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==} + /@esbuild/openbsd-x64@0.19.12: + resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -398,8 +398,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.19.11: - resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==} + /@esbuild/sunos-x64@0.19.12: + resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -407,8 +407,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.19.11: - resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==} + /@esbuild/win32-arm64@0.19.12: + resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -416,8 +416,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.19.11: - resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==} + /@esbuild/win32-ia32@0.19.12: + resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -425,8 +425,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.19.11: - resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==} + /@esbuild/win32-x64@0.19.12: + resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -438,118 +438,118 @@ packages: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} dev: true - /@rollup/rollup-android-arm-eabi@4.9.5: - resolution: {integrity: sha512-idWaG8xeSRCfRq9KpRysDHJ/rEHBEXcHuJ82XY0yYFIWnLMjZv9vF/7DOq8djQ2n3Lk6+3qfSH8AqlmHlmi1MA==} + /@rollup/rollup-android-arm-eabi@4.13.0: + resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} cpu: [arm] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-android-arm64@4.9.5: - resolution: {integrity: sha512-f14d7uhAMtsCGjAYwZGv6TwuS3IFaM4ZnGMUn3aCBgkcHAYErhV1Ad97WzBvS2o0aaDv4mVz+syiN0ElMyfBPg==} + /@rollup/rollup-android-arm64@4.13.0: + resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} cpu: [arm64] os: [android] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-arm64@4.9.5: - resolution: {integrity: sha512-ndoXeLx455FffL68OIUrVr89Xu1WLzAG4n65R8roDlCoYiQcGGg6MALvs2Ap9zs7AHg8mpHtMpwC8jBBjZrT/w==} + /@rollup/rollup-darwin-arm64@4.13.0: + resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-darwin-x64@4.9.5: - resolution: {integrity: sha512-UmElV1OY2m/1KEEqTlIjieKfVwRg0Zwg4PLgNf0s3glAHXBN99KLpw5A5lrSYCa1Kp63czTpVll2MAqbZYIHoA==} + /@rollup/rollup-darwin-x64@4.13.0: + resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.9.5: - resolution: {integrity: sha512-Q0LcU61v92tQB6ae+udZvOyZ0wfpGojtAKrrpAaIqmJ7+psq4cMIhT/9lfV6UQIpeItnq/2QDROhNLo00lOD1g==} + /@rollup/rollup-linux-arm-gnueabihf@4.13.0: + resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} cpu: [arm] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.9.5: - resolution: {integrity: sha512-dkRscpM+RrR2Ee3eOQmRWFjmV/payHEOrjyq1VZegRUa5OrZJ2MAxBNs05bZuY0YCtpqETDy1Ix4i/hRqX98cA==} + /@rollup/rollup-linux-arm64-gnu@4.13.0: + resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.9.5: - resolution: {integrity: sha512-QaKFVOzzST2xzY4MAmiDmURagWLFh+zZtttuEnuNn19AiZ0T3fhPyjPPGwLNdiDT82ZE91hnfJsUiDwF9DClIQ==} + /@rollup/rollup-linux-arm64-musl@4.13.0: + resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.9.5: - resolution: {integrity: sha512-HeGqmRJuyVg6/X6MpE2ur7GbymBPS8Np0S/vQFHDmocfORT+Zt76qu+69NUoxXzGqVP1pzaY6QIi0FJWLC3OPA==} + /@rollup/rollup-linux-riscv64-gnu@4.13.0: + resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} cpu: [riscv64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.9.5: - resolution: {integrity: sha512-Dq1bqBdLaZ1Gb/l2e5/+o3B18+8TI9ANlA1SkejZqDgdU/jK/ThYaMPMJpVMMXy2uRHvGKbkz9vheVGdq3cJfA==} + /@rollup/rollup-linux-x64-gnu@4.13.0: + resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.9.5: - resolution: {integrity: sha512-ezyFUOwldYpj7AbkwyW9AJ203peub81CaAIVvckdkyH8EvhEIoKzaMFJj0G4qYJ5sw3BpqhFrsCc30t54HV8vg==} + /@rollup/rollup-linux-x64-musl@4.13.0: + resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.9.5: - resolution: {integrity: sha512-aHSsMnUw+0UETB0Hlv7B/ZHOGY5bQdwMKJSzGfDfvyhnpmVxLMGnQPGNE9wgqkLUs3+gbG1Qx02S2LLfJ5GaRQ==} + /@rollup/rollup-win32-arm64-msvc@4.13.0: + resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.9.5: - resolution: {integrity: sha512-AiqiLkb9KSf7Lj/o1U3SEP9Zn+5NuVKgFdRIZkvd4N0+bYrTOovVd0+LmYCPQGbocT4kvFyK+LXCDiXPBF3fyA==} + /@rollup/rollup-win32-ia32-msvc@4.13.0: + resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} cpu: [ia32] os: [win32] requiresBuild: true dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.9.5: - resolution: {integrity: sha512-1q+mykKE3Vot1kaFJIDoUFv5TuW+QQVaf2FmTT9krg86pQrGStOSJJ0Zil7CFagyxDuouTepzt5Y5TVzyajOdQ==} + /@rollup/rollup-win32-x64-msvc@4.13.0: + resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /@shikijs/core@1.1.7: - resolution: {integrity: sha512-gTYLUIuD1UbZp/11qozD3fWpUTuMqPSf3svDMMrL0UmlGU7D9dPw/V1FonwAorCUJBltaaESxq90jrSjQyGixg==} + /@shikijs/core@1.2.0: + resolution: {integrity: sha512-OlFvx+nyr5C8zpcMBnSGir0YPD6K11uYhouqhNmm1qLiis4GA7SsGtu07r9gKS9omks8RtQqHrJL4S+lqWK01A==} dev: true - /@shikijs/transformers@1.1.7: - resolution: {integrity: sha512-lXz011ao4+rvweps/9h3CchBfzb1U5OtP5D51Tqc9lQYdLblWMIxQxH6Ybe1GeGINcEVM4goMyPrI0JvlIp4UQ==} + /@shikijs/transformers@1.2.0: + resolution: {integrity: sha512-xKn7DtA65DQV4FOfYsrvqM80xOy2xuXnxWWKsZmHv1VII/IOuDUDsWDu3KnpeLH6wqNJWp1GRoNUsHR1aw/VhQ==} dependencies: - shiki: 1.1.7 + shiki: 1.2.0 dev: true /@types/estree@1.0.5: @@ -586,25 +586,25 @@ packages: resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} dev: true - /@vitejs/plugin-vue@5.0.4(vite@5.1.5)(vue@3.4.21): + /@vitejs/plugin-vue@5.0.4(vite@5.1.6)(vue@3.4.21): resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.1.5 + vite: 5.1.6 vue: 3.4.21 dev: true /@vue/compiler-core@3.4.21: resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==} dependencies: - '@babel/parser': 7.23.9 + '@babel/parser': 7.24.0 '@vue/shared': 3.4.21 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.0.2 + source-map-js: 1.1.0 dev: true /@vue/compiler-dom@3.4.21: @@ -617,15 +617,15 @@ packages: /@vue/compiler-sfc@3.4.21: resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} dependencies: - '@babel/parser': 7.23.9 + '@babel/parser': 7.24.0 '@vue/compiler-core': 3.4.21 '@vue/compiler-dom': 3.4.21 '@vue/compiler-ssr': 3.4.21 '@vue/shared': 3.4.21 estree-walker: 2.0.2 - magic-string: 0.30.7 - postcss: 8.4.35 - source-map-js: 1.0.2 + magic-string: 0.30.8 + postcss: 8.4.36 + source-map-js: 1.1.0 dev: true /@vue/compiler-ssr@3.4.21: @@ -635,29 +635,29 @@ packages: '@vue/shared': 3.4.21 dev: true - /@vue/devtools-api@7.0.14: - resolution: {integrity: sha512-TluWR9qZ6aO11bwtYK8+fzXxBqLfsE0mWZz1q/EQBmO9k82Cm6deieLwNNXjNFJz7xutazoia5Qa+zTYkPPOfw==} + /@vue/devtools-api@7.0.18(vue@3.4.21): + resolution: {integrity: sha512-rNLQ8A2eGmaXAen/xARLY6MVz7tzXFTDlrWJrpTD1VSU7vqmBn9qPIPjRkCdb8/2/En6RGsRebNSqfqh1Ck4pg==} dependencies: - '@vue/devtools-kit': 7.0.14 + '@vue/devtools-kit': 7.0.18(vue@3.4.21) + transitivePeerDependencies: + - vue dev: true - /@vue/devtools-kit@7.0.14: - resolution: {integrity: sha512-wAAJazr4hI0aVRpgWOCVPw+NzMQdthhnprHHIg4njp1MkKrpCNGQ7MtQbZF1AltAA7xpMCGyyt+0kYH0FqTiPg==} + /@vue/devtools-kit@7.0.18(vue@3.4.21): + resolution: {integrity: sha512-sLq9GZgoMG2/yb6HOjXE5PzHplV7+Xy3QvMo9Kz43Hhj0B0S0LYfk0EBdU5yZ84JRlH1LhJCp65y0L+NLbK09A==} + peerDependencies: + vue: ^3.0.0 dependencies: - '@vue/devtools-schema': 7.0.14 - '@vue/devtools-shared': 7.0.14 + '@vue/devtools-shared': 7.0.18 hookable: 5.5.3 mitt: 3.0.1 perfect-debounce: 1.0.0 speakingurl: 14.0.1 + vue: 3.4.21 dev: true - /@vue/devtools-schema@7.0.14: - resolution: {integrity: sha512-tpUeCLVrdHX+KzWMLTAwx/vAPFbo6jAUi7sr6Q+0mBIqIVSSIxNr5wEhegiFvYva+OtDeM2OrT+f7/X/5bvZNg==} - dev: true - - /@vue/devtools-shared@7.0.14: - resolution: {integrity: sha512-79RP1NDakBVWou9rDpVnT1WMjTbL1lJKm6YEOodjQ0dq5ehf0wsRbeYDhgAlnjehWRzTq5GAYFBFUPYBs0/QpA==} + /@vue/devtools-shared@7.0.18: + resolution: {integrity: sha512-j06/+32P+Uy39hT7g5MGNEkg2nY2DZJxpSnIxz+POm5FDkqT3o4jPsk3TAsKD15C4RoVasd0xIScU6Xf3Hf5aA==} dependencies: rfdc: 1.3.1 dev: true @@ -697,20 +697,20 @@ packages: resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} dev: true - /@vueuse/core@10.7.2(vue@3.4.21): - resolution: {integrity: sha512-AOyAL2rK0By62Hm+iqQn6Rbu8bfmbgaIMXcE3TSr7BdQ42wnSFlwIdPjInO62onYsEMK/yDMU8C6oGfDAtZ2qQ==} + /@vueuse/core@10.9.0(vue@3.4.21): + resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==} dependencies: '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 10.7.2 - '@vueuse/shared': 10.7.2(vue@3.4.21) - vue-demi: 0.14.6(vue@3.4.21) + '@vueuse/metadata': 10.9.0 + '@vueuse/shared': 10.9.0(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.7.2(focus-trap@7.5.4)(vue@3.4.21): - resolution: {integrity: sha512-+u3RLPFedjASs5EKPc69Ge49WNgqeMfSxFn+qrQTzblPXZg6+EFzhjarS5edj2qAf6xQ93f95TUxRwKStXj/sQ==} + /@vueuse/integrations@10.9.0(focus-trap@7.5.4)(vue@3.4.21): + resolution: {integrity: sha512-acK+A01AYdWSvL4BZmCoJAcyHJ6EqhmkQEXbQLwev1MY7NBnS+hcEMx/BzVoR9zKI+UqEPMD9u6PsyAuiTRT4Q==} peerDependencies: async-validator: '*' axios: '*' @@ -750,23 +750,23 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.7.2(vue@3.4.21) - '@vueuse/shared': 10.7.2(vue@3.4.21) + '@vueuse/core': 10.9.0(vue@3.4.21) + '@vueuse/shared': 10.9.0(vue@3.4.21) focus-trap: 7.5.4 - vue-demi: 0.14.6(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/metadata@10.7.2: - resolution: {integrity: sha512-kCWPb4J2KGrwLtn1eJwaJD742u1k5h6v/St5wFe8Quih90+k2a0JP8BS4Zp34XUuJqS2AxFYMb1wjUL8HfhWsQ==} + /@vueuse/metadata@10.9.0: + resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==} dev: true - /@vueuse/shared@10.7.2(vue@3.4.21): - resolution: {integrity: sha512-qFbXoxS44pi2FkgFjPvF4h7c9oMDutpyBdcJdMYIMg9XyXli2meFMuaKn+UMgsClo//Th6+beeCgqweT/79BVA==} + /@vueuse/shared@10.9.0(vue@3.4.21): + resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.6(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.21) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -809,35 +809,35 @@ packages: engines: {node: '>=0.12'} dev: true - /esbuild@0.19.11: - resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==} + /esbuild@0.19.12: + resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/aix-ppc64': 0.19.11 - '@esbuild/android-arm': 0.19.11 - '@esbuild/android-arm64': 0.19.11 - '@esbuild/android-x64': 0.19.11 - '@esbuild/darwin-arm64': 0.19.11 - '@esbuild/darwin-x64': 0.19.11 - '@esbuild/freebsd-arm64': 0.19.11 - '@esbuild/freebsd-x64': 0.19.11 - '@esbuild/linux-arm': 0.19.11 - '@esbuild/linux-arm64': 0.19.11 - '@esbuild/linux-ia32': 0.19.11 - '@esbuild/linux-loong64': 0.19.11 - '@esbuild/linux-mips64el': 0.19.11 - '@esbuild/linux-ppc64': 0.19.11 - '@esbuild/linux-riscv64': 0.19.11 - '@esbuild/linux-s390x': 0.19.11 - '@esbuild/linux-x64': 0.19.11 - '@esbuild/netbsd-x64': 0.19.11 - '@esbuild/openbsd-x64': 0.19.11 - '@esbuild/sunos-x64': 0.19.11 - '@esbuild/win32-arm64': 0.19.11 - '@esbuild/win32-ia32': 0.19.11 - '@esbuild/win32-x64': 0.19.11 + '@esbuild/aix-ppc64': 0.19.12 + '@esbuild/android-arm': 0.19.12 + '@esbuild/android-arm64': 0.19.12 + '@esbuild/android-x64': 0.19.12 + '@esbuild/darwin-arm64': 0.19.12 + '@esbuild/darwin-x64': 0.19.12 + '@esbuild/freebsd-arm64': 0.19.12 + '@esbuild/freebsd-x64': 0.19.12 + '@esbuild/linux-arm': 0.19.12 + '@esbuild/linux-arm64': 0.19.12 + '@esbuild/linux-ia32': 0.19.12 + '@esbuild/linux-loong64': 0.19.12 + '@esbuild/linux-mips64el': 0.19.12 + '@esbuild/linux-ppc64': 0.19.12 + '@esbuild/linux-riscv64': 0.19.12 + '@esbuild/linux-s390x': 0.19.12 + '@esbuild/linux-x64': 0.19.12 + '@esbuild/netbsd-x64': 0.19.12 + '@esbuild/openbsd-x64': 0.19.12 + '@esbuild/sunos-x64': 0.19.12 + '@esbuild/win32-arm64': 0.19.12 + '@esbuild/win32-ia32': 0.19.12 + '@esbuild/win32-x64': 0.19.12 dev: true /estree-walker@2.0.2: @@ -876,8 +876,8 @@ packages: uc.micro: 1.0.6 dev: true - /magic-string@0.30.7: - resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} + /magic-string@0.30.8: + resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -924,43 +924,43 @@ packages: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true - /postcss@8.4.35: - resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} + /postcss@8.4.36: + resolution: {integrity: sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.0.2 + source-map-js: 1.1.0 dev: true - /preact@10.19.3: - resolution: {integrity: sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==} + /preact@10.19.6: + resolution: {integrity: sha512-gympg+T2Z1fG1unB8NH29yHJwnEaCH37Z32diPDku316OTnRPeMbiRV9kTrfZpocXjdfnWuFUl/Mj4BHaf6gnw==} dev: true /rfdc@1.3.1: resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==} dev: true - /rollup@4.9.5: - resolution: {integrity: sha512-E4vQW0H/mbNMw2yLSqJyjtkHY9dslf/p0zuT1xehNRqUTBOFMqEjguDvqhXr7N7r/4ttb2jr4T41d3dncmIgbQ==} + /rollup@4.13.0: + resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true dependencies: '@types/estree': 1.0.5 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.5 - '@rollup/rollup-android-arm64': 4.9.5 - '@rollup/rollup-darwin-arm64': 4.9.5 - '@rollup/rollup-darwin-x64': 4.9.5 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.5 - '@rollup/rollup-linux-arm64-gnu': 4.9.5 - '@rollup/rollup-linux-arm64-musl': 4.9.5 - '@rollup/rollup-linux-riscv64-gnu': 4.9.5 - '@rollup/rollup-linux-x64-gnu': 4.9.5 - '@rollup/rollup-linux-x64-musl': 4.9.5 - '@rollup/rollup-win32-arm64-msvc': 4.9.5 - '@rollup/rollup-win32-ia32-msvc': 4.9.5 - '@rollup/rollup-win32-x64-msvc': 4.9.5 + '@rollup/rollup-android-arm-eabi': 4.13.0 + '@rollup/rollup-android-arm64': 4.13.0 + '@rollup/rollup-darwin-arm64': 4.13.0 + '@rollup/rollup-darwin-x64': 4.13.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 + '@rollup/rollup-linux-arm64-gnu': 4.13.0 + '@rollup/rollup-linux-arm64-musl': 4.13.0 + '@rollup/rollup-linux-riscv64-gnu': 4.13.0 + '@rollup/rollup-linux-x64-gnu': 4.13.0 + '@rollup/rollup-linux-x64-musl': 4.13.0 + '@rollup/rollup-win32-arm64-msvc': 4.13.0 + '@rollup/rollup-win32-ia32-msvc': 4.13.0 + '@rollup/rollup-win32-x64-msvc': 4.13.0 fsevents: 2.3.3 dev: true @@ -968,14 +968,14 @@ packages: resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} dev: true - /shiki@1.1.7: - resolution: {integrity: sha512-9kUTMjZtcPH3i7vHunA6EraTPpPOITYTdA5uMrvsJRexktqP0s7P3s9HVK80b4pP42FRVe03D7fT3NmJv2yYhw==} + /shiki@1.2.0: + resolution: {integrity: sha512-xLhiTMOIUXCv5DqJ4I70GgQCtdlzsTqFLZWcMHHG3TAieBUbvEGthdrlPDlX4mL/Wszx9C6rEcxU6kMlg4YlxA==} dependencies: - '@shikijs/core': 1.1.7 + '@shikijs/core': 1.2.0 dev: true - /source-map-js@1.0.2: - resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} + /source-map-js@1.1.0: + resolution: {integrity: sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==} engines: {node: '>=0.10.0'} dev: true @@ -997,8 +997,8 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /vite@5.1.5: - resolution: {integrity: sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q==} + /vite@5.1.6: + resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -1025,9 +1025,9 @@ packages: terser: optional: true dependencies: - esbuild: 0.19.11 - postcss: 8.4.35 - rollup: 4.9.5 + esbuild: 0.19.12 + postcss: 8.4.36 + rollup: 4.13.0 optionalDependencies: fsevents: 2.3.3 dev: true @@ -1061,20 +1061,20 @@ packages: postcss: optional: true dependencies: - '@docsearch/css': 3.5.2 - '@docsearch/js': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) - '@shikijs/core': 1.1.7 - '@shikijs/transformers': 1.1.7 + '@docsearch/css': 3.6.0 + '@docsearch/js': 3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0) + '@shikijs/core': 1.2.0 + '@shikijs/transformers': 1.2.0 '@types/markdown-it': 13.0.7 - '@vitejs/plugin-vue': 5.0.4(vite@5.1.5)(vue@3.4.21) - '@vue/devtools-api': 7.0.14 - '@vueuse/core': 10.7.2(vue@3.4.21) - '@vueuse/integrations': 10.7.2(focus-trap@7.5.4)(vue@3.4.21) + '@vitejs/plugin-vue': 5.0.4(vite@5.1.6)(vue@3.4.21) + '@vue/devtools-api': 7.0.18(vue@3.4.21) + '@vueuse/core': 10.9.0(vue@3.4.21) + '@vueuse/integrations': 10.9.0(focus-trap@7.5.4)(vue@3.4.21) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 6.3.0 - shiki: 1.1.7 - vite: 5.1.5 + shiki: 1.2.0 + vite: 5.1.6 vue: 3.4.21 transitivePeerDependencies: - '@algolia/client-search' @@ -1104,8 +1104,8 @@ packages: - universal-cookie dev: true - /vue-demi@0.14.6(vue@3.4.21): - resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==} + /vue-demi@0.14.7(vue@3.4.21): + resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} engines: {node: '>=12'} hasBin: true requiresBuild: true diff --git a/package.json b/package.json index 04166e1..6251325 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "nodemon": "^3.1.0", "prettier": "^3.2.5", "turbo": "^1.12.5", - "vitest": "^1.3.1" + "vitest": "^1.4.0" }, - "packageManager": "pnpm@8.7.5" + "packageManager": "pnpm@8.15.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 7030ba5..82f7798 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.27", + "@types/node": "^20.11.28", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.4.2" diff --git a/packages/core/package.json b/packages/core/package.json index 2b8dc6c..0600d3f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.27", + "@types/node": "^20.11.28", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.2" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index c8820ac..2fa1ecd 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.11.27", + "@types/node": "^20.11.28", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index 6c7451b..9b2c284 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.4.2", - "@types/node": "20.11.27" + "@types/node": "20.11.28" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 12825ce..b4b8cdf 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.11.27", + "@types/node": "20.11.28", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.2", - "vitest": "^1.3.1" + "vitest": "^1.4.0" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93eebc9..20bf953 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.12.5 version: 1.12.5 vitest: - specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.27) + specifier: ^1.4.0 + version: 1.4.0 packages/commands: dependencies: @@ -55,8 +55,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.27 - version: 20.11.27 + specifier: ^20.11.28 + version: 20.11.28 prettier: specifier: ^3.2.5 version: 3.2.5 @@ -113,8 +113,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.27 - version: 20.11.27 + specifier: ^20.11.28 + version: 20.11.28 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.11.27 - version: 20.11.27 + specifier: ^20.11.28 + version: 20.11.28 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -182,8 +182,8 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.27 - version: 20.11.27 + specifier: 20.11.28 + version: 20.11.28 tsup: specifier: ^8.0.2 version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) @@ -222,8 +222,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.11.27 - version: 20.11.27 + specifier: 20.11.28 + version: 20.11.28 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -234,8 +234,8 @@ importers: specifier: ^5.4.2 version: 5.4.2 vitest: - specifier: ^1.3.1 - version: 1.3.1(@types/node@20.11.27) + specifier: ^1.4.0 + version: 1.4.0(@types/node@20.11.28) packages: @@ -261,8 +261,8 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/runtime@7.23.9: - resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==} + /@babel/runtime@7.24.0: + resolution: {integrity: sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.1 @@ -277,7 +277,7 @@ packages: /@changesets/apply-release-plan@7.0.0: resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/config': 3.0.0 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 @@ -295,7 +295,7 @@ packages: /@changesets/assemble-release-plan@6.0.0: resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.0.0 '@changesets/types': 6.0.0 @@ -313,7 +313,7 @@ packages: resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/apply-release-plan': 7.0.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 @@ -328,7 +328,7 @@ packages: '@changesets/types': 6.0.0 '@changesets/write': 0.3.0 '@manypkg/get-packages': 1.1.3 - '@types/semver': 7.5.7 + '@types/semver': 7.5.8 ansi-colors: 4.1.3 chalk: 2.4.2 ci-info: 3.9.0 @@ -378,7 +378,7 @@ packages: /@changesets/get-release-plan@4.0.0: resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/config': 3.0.0 '@changesets/pre': 2.0.0 @@ -394,7 +394,7 @@ packages: /@changesets/git@3.0.0: resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -419,7 +419,7 @@ packages: /@changesets/pre@2.0.0: resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -429,7 +429,7 @@ packages: /@changesets/read@0.6.0: resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/parse': 0.4.0 @@ -450,7 +450,7 @@ packages: /@changesets/write@0.3.0: resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -959,7 +959,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -968,7 +968,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.23.9 + '@babel/runtime': 7.24.0 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -1018,6 +1018,14 @@ packages: dev: true optional: true + /@rollup/rollup-android-arm-eabi@4.13.0: + resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-android-arm-eabi@4.9.1: resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} cpu: [arm] @@ -1034,6 +1042,14 @@ packages: dev: true optional: true + /@rollup/rollup-android-arm64@4.13.0: + resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-android-arm64@4.9.1: resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} cpu: [arm64] @@ -1050,6 +1066,14 @@ packages: dev: true optional: true + /@rollup/rollup-darwin-arm64@4.13.0: + resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-darwin-arm64@4.9.1: resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} cpu: [arm64] @@ -1066,6 +1090,14 @@ packages: dev: true optional: true + /@rollup/rollup-darwin-x64@4.13.0: + resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-darwin-x64@4.9.1: resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} cpu: [x64] @@ -1082,6 +1114,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm-gnueabihf@4.13.0: + resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm-gnueabihf@4.9.1: resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} cpu: [arm] @@ -1098,6 +1138,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm64-gnu@4.13.0: + resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-gnu@4.9.1: resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} cpu: [arm64] @@ -1114,6 +1162,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm64-musl@4.13.0: + resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-musl@4.9.1: resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} cpu: [arm64] @@ -1130,6 +1186,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-riscv64-gnu@4.13.0: + resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-riscv64-gnu@4.9.1: resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} cpu: [riscv64] @@ -1146,6 +1210,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-x64-gnu@4.13.0: + resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-gnu@4.9.1: resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} cpu: [x64] @@ -1162,6 +1234,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-x64-musl@4.13.0: + resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-musl@4.9.1: resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} cpu: [x64] @@ -1178,6 +1258,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-arm64-msvc@4.13.0: + resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-arm64-msvc@4.9.1: resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} cpu: [arm64] @@ -1194,6 +1282,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-ia32-msvc@4.13.0: + resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-ia32-msvc@4.9.1: resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} cpu: [ia32] @@ -1210,6 +1306,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-x64-msvc@4.13.0: + resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-x64-msvc@4.9.1: resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} cpu: [x64] @@ -1344,8 +1448,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.27: - resolution: {integrity: sha512-qyUZfMnCg1KEz57r7pzFtSGt49f6RPkPBis3Vo4PbS7roQEDn22hiHzl/Lo1q4i4hDEgBJmBF/NTNg2XR0HbFg==} + /@types/node@20.11.28: + resolution: {integrity: sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==} dependencies: undici-types: 5.26.5 dev: true @@ -1354,42 +1458,42 @@ packages: resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} dev: true - /@types/semver@7.5.7: - resolution: {integrity: sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==} + /@types/semver@7.5.8: + resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} dev: true - /@vitest/expect@1.3.1: - resolution: {integrity: sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==} + /@vitest/expect@1.4.0: + resolution: {integrity: sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==} dependencies: - '@vitest/spy': 1.3.1 - '@vitest/utils': 1.3.1 - chai: 4.3.10 + '@vitest/spy': 1.4.0 + '@vitest/utils': 1.4.0 + chai: 4.4.1 dev: true - /@vitest/runner@1.3.1: - resolution: {integrity: sha512-5FzF9c3jG/z5bgCnjr8j9LNq/9OxV2uEBAITOXfoe3rdZJTdO7jzThth7FXv/6b+kdY65tpRQB7WaKhNZwX+Kg==} + /@vitest/runner@1.4.0: + resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==} dependencies: - '@vitest/utils': 1.3.1 + '@vitest/utils': 1.4.0 p-limit: 5.0.0 - pathe: 1.1.1 + pathe: 1.1.2 dev: true - /@vitest/snapshot@1.3.1: - resolution: {integrity: sha512-EF++BZbt6RZmOlE3SuTPu/NfwBF6q4ABS37HHXzs2LUVPBLx2QoY/K0fKpRChSo8eLiuxcbCVfqKgx/dplCDuQ==} + /@vitest/snapshot@1.4.0: + resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==} dependencies: - magic-string: 0.30.5 - pathe: 1.1.1 + magic-string: 0.30.7 + pathe: 1.1.2 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.3.1: - resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==} + /@vitest/spy@1.4.0: + resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.3.1: - resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==} + /@vitest/utils@1.4.0: + resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==} dependencies: diff-sequences: 29.6.3 estree-walker: 3.0.3 @@ -1483,7 +1587,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-shim-unscopables: 1.0.2 dev: true @@ -1494,7 +1598,7 @@ packages: array-buffer-byte-length: 1.0.1 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 es-errors: 1.3.0 get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 @@ -1580,7 +1684,7 @@ packages: es-errors: 1.3.0 function-bind: 1.1.2 get-intrinsic: 1.2.4 - set-function-length: 1.2.1 + set-function-length: 1.2.2 dev: true /camelcase-keys@6.2.2: @@ -1597,19 +1701,6 @@ packages: engines: {node: '>=6'} dev: true - /chai@4.3.10: - resolution: {integrity: sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==} - engines: {node: '>=4'} - dependencies: - assertion-error: 1.1.0 - check-error: 1.0.3 - deep-eql: 4.1.3 - get-func-name: 2.0.2 - loupe: 2.3.7 - pathval: 1.1.1 - type-detect: 4.0.8 - dev: true - /chai@4.4.1: resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} engines: {node: '>=4'} @@ -1786,6 +1877,33 @@ packages: stream-transform: 2.1.3 dev: true + /data-view-buffer@1.0.1: + resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-data-view: 1.0.1 + dev: true + + /data-view-byte-length@1.0.1: + resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-data-view: 1.0.1 + dev: true + + /data-view-byte-offset@1.0.0: + resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-data-view: 1.0.1 + dev: true + /debug@4.3.4(supports-color@5.5.0): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -1891,16 +2009,67 @@ packages: is-arrayish: 0.2.1 dev: true - /es-abstract@1.22.4: - resolution: {integrity: sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==} + /es-abstract@1.22.5: + resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==} + engines: {node: '>= 0.4'} + dependencies: + array-buffer-byte-length: 1.0.1 + arraybuffer.prototype.slice: 1.0.3 + available-typed-arrays: 1.0.7 + call-bind: 1.0.7 + es-define-property: 1.0.0 + es-errors: 1.3.0 + es-set-tostringtag: 2.0.3 + es-to-primitive: 1.2.1 + function.prototype.name: 1.1.6 + get-intrinsic: 1.2.4 + get-symbol-description: 1.0.2 + globalthis: 1.0.3 + gopd: 1.0.1 + has-property-descriptors: 1.0.2 + has-proto: 1.0.3 + has-symbols: 1.0.3 + hasown: 2.0.2 + internal-slot: 1.0.7 + is-array-buffer: 3.0.4 + is-callable: 1.2.7 + is-negative-zero: 2.0.3 + is-regex: 1.1.4 + is-shared-array-buffer: 1.0.3 + is-string: 1.0.7 + is-typed-array: 1.1.13 + is-weakref: 1.0.2 + object-inspect: 1.13.1 + object-keys: 1.1.1 + object.assign: 4.1.5 + regexp.prototype.flags: 1.5.2 + safe-array-concat: 1.1.2 + safe-regex-test: 1.0.3 + string.prototype.trim: 1.2.9 + string.prototype.trimend: 1.0.8 + string.prototype.trimstart: 1.0.7 + typed-array-buffer: 1.0.2 + typed-array-byte-length: 1.0.1 + typed-array-byte-offset: 1.0.2 + typed-array-length: 1.0.5 + unbox-primitive: 1.0.2 + which-typed-array: 1.1.15 + dev: true + + /es-abstract@1.23.1: + resolution: {integrity: sha512-r+YVn6hTqQb+P5kK0u3KeDqrmhHKm+OhU/Mw4jSL4eQtOxXmp75fXIUUb3sUqFZOlb/YtW5JRaIfEC3UyjYUZQ==} engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 arraybuffer.prototype.slice: 1.0.3 available-typed-arrays: 1.0.7 call-bind: 1.0.7 + data-view-buffer: 1.0.1 + data-view-byte-length: 1.0.1 + data-view-byte-offset: 1.0.0 es-define-property: 1.0.0 es-errors: 1.3.0 + es-object-atoms: 1.0.0 es-set-tostringtag: 2.0.3 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 @@ -1911,10 +2080,11 @@ packages: has-property-descriptors: 1.0.2 has-proto: 1.0.3 has-symbols: 1.0.3 - hasown: 2.0.1 + hasown: 2.0.2 internal-slot: 1.0.7 is-array-buffer: 3.0.4 is-callable: 1.2.7 + is-data-view: 1.0.1 is-negative-zero: 2.0.3 is-regex: 1.1.4 is-shared-array-buffer: 1.0.3 @@ -1925,17 +2095,17 @@ packages: object-keys: 1.1.1 object.assign: 4.1.5 regexp.prototype.flags: 1.5.2 - safe-array-concat: 1.1.0 + safe-array-concat: 1.1.2 safe-regex-test: 1.0.3 - string.prototype.trim: 1.2.8 - string.prototype.trimend: 1.0.7 + string.prototype.trim: 1.2.9 + string.prototype.trimend: 1.0.8 string.prototype.trimstart: 1.0.7 typed-array-buffer: 1.0.2 typed-array-byte-length: 1.0.1 typed-array-byte-offset: 1.0.2 typed-array-length: 1.0.5 unbox-primitive: 1.0.2 - which-typed-array: 1.1.14 + which-typed-array: 1.1.15 dev: true /es-define-property@1.0.0: @@ -1950,19 +2120,26 @@ packages: engines: {node: '>= 0.4'} dev: true + /es-object-atoms@1.0.0: + resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} + engines: {node: '>= 0.4'} + dependencies: + es-errors: 1.3.0 + dev: true + /es-set-tostringtag@2.0.3: resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} engines: {node: '>= 0.4'} dependencies: get-intrinsic: 1.2.4 has-tostringtag: 1.0.2 - hasown: 2.0.1 + hasown: 2.0.2 dev: true /es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} dependencies: - hasown: 2.0.1 + hasown: 2.0.2 dev: true /es-to-primitive@1.2.1: @@ -2202,7 +2379,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 functions-have-names: 1.2.3 dev: true @@ -2227,7 +2404,7 @@ packages: function-bind: 1.1.2 has-proto: 1.0.3 has-symbols: 1.0.3 - hasown: 2.0.1 + hasown: 2.0.2 dev: true /get-stream@6.0.1: @@ -2339,8 +2516,8 @@ packages: has-symbols: 1.0.3 dev: true - /hasown@2.0.1: - resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==} + /hasown@2.0.2: + resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} dependencies: function-bind: 1.1.2 @@ -2389,8 +2566,8 @@ packages: engines: {node: '>= 0.4'} dependencies: es-errors: 1.3.0 - hasown: 2.0.1 - side-channel: 1.0.5 + hasown: 2.0.2 + side-channel: 1.0.6 dev: true /ionstore@1.0.0: @@ -2438,7 +2615,14 @@ packages: /is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} dependencies: - hasown: 2.0.1 + hasown: 2.0.2 + dev: true + + /is-data-view@1.0.1: + resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} + engines: {node: '>= 0.4'} + dependencies: + is-typed-array: 1.1.13 dev: true /is-date-object@1.0.5: @@ -2535,7 +2719,7 @@ packages: resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} dependencies: - which-typed-array: 1.1.14 + which-typed-array: 1.1.15 dev: true /is-weakref@1.0.2: @@ -2691,15 +2875,15 @@ packages: yallist: 4.0.0 dev: true - /magic-string@0.30.5: - resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==} + /magic-string@0.30.7: + resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 dev: true - /magic-string@0.30.7: - resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} + /magic-string@0.30.8: + resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 @@ -2829,7 +3013,7 @@ packages: resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} dependencies: acorn: 8.10.0 - pathe: 1.1.1 + pathe: 1.1.2 pkg-types: 1.0.3 ufo: 1.3.0 dev: true @@ -3037,10 +3221,6 @@ packages: engines: {node: '>=8'} dev: true - /pathe@1.1.1: - resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==} - dev: true - /pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} dev: true @@ -3078,7 +3258,7 @@ packages: dependencies: jsonc-parser: 3.2.0 mlly: 1.4.2 - pathe: 1.1.1 + pathe: 1.1.2 dev: true /possible-typed-array-names@1.0.0: @@ -3102,8 +3282,8 @@ packages: yaml: 2.3.2 dev: true - /postcss@8.4.32: - resolution: {integrity: sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==} + /postcss@8.4.35: + resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 @@ -3111,13 +3291,13 @@ packages: source-map-js: 1.0.2 dev: true - /postcss@8.4.35: - resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} + /postcss@8.4.36: + resolution: {integrity: sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.0.2 + source-map-js: 1.1.0 dev: true /preferred-pm@3.1.3: @@ -3286,6 +3466,29 @@ packages: fsevents: 2.3.3 dev: true + /rollup@4.13.0: + resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.13.0 + '@rollup/rollup-android-arm64': 4.13.0 + '@rollup/rollup-darwin-arm64': 4.13.0 + '@rollup/rollup-darwin-x64': 4.13.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 + '@rollup/rollup-linux-arm64-gnu': 4.13.0 + '@rollup/rollup-linux-arm64-musl': 4.13.0 + '@rollup/rollup-linux-riscv64-gnu': 4.13.0 + '@rollup/rollup-linux-x64-gnu': 4.13.0 + '@rollup/rollup-linux-x64-musl': 4.13.0 + '@rollup/rollup-win32-arm64-msvc': 4.13.0 + '@rollup/rollup-win32-ia32-msvc': 4.13.0 + '@rollup/rollup-win32-x64-msvc': 4.13.0 + fsevents: 2.3.3 + dev: true + /rollup@4.9.1: resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -3313,8 +3516,8 @@ packages: queue-microtask: 1.2.3 dev: true - /safe-array-concat@1.1.0: - resolution: {integrity: sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==} + /safe-array-concat@1.1.2: + resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==} engines: {node: '>=0.4'} dependencies: call-bind: 1.0.7 @@ -3353,8 +3556,8 @@ packages: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true - /set-function-length@1.2.1: - resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==} + /set-function-length@1.2.2: + resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} dependencies: define-data-property: 1.1.4 @@ -3397,8 +3600,8 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /side-channel@1.0.5: - resolution: {integrity: sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==} + /side-channel@1.0.6: + resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 @@ -3457,6 +3660,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /source-map-js@1.1.0: + resolution: {integrity: sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==} + engines: {node: '>=0.10.0'} + dev: true + /source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} @@ -3527,21 +3735,22 @@ packages: emoji-regex: 9.2.2 strip-ansi: 7.1.0 - /string.prototype.trim@1.2.8: - resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==} + /string.prototype.trim@1.2.9: + resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.23.1 + es-object-atoms: 1.0.0 dev: true - /string.prototype.trimend@1.0.7: - resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==} + /string.prototype.trimend@1.0.8: + resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-object-atoms: 1.0.0 dev: true /string.prototype.trimstart@1.0.7: @@ -3549,7 +3758,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.4 + es-abstract: 1.22.5 dev: true /strip-ansi@6.0.1: @@ -3932,16 +4141,16 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.3.1(@types/node@20.11.27): - resolution: {integrity: sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==} + /vite-node@1.4.0(@types/node@20.11.28): + resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: cac: 6.7.14 debug: 4.3.4(supports-color@5.5.0) - pathe: 1.1.1 + pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.0.10(@types/node@20.11.27) + vite: 5.1.4(@types/node@20.11.28) transitivePeerDependencies: - '@types/node' - less @@ -3953,8 +4162,8 @@ packages: - terser dev: true - /vite@5.0.10(@types/node@20.11.27): - resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} + /vite@5.1.4(@types/node@20.11.28): + resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -3981,16 +4190,16 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.27 - esbuild: 0.19.9 - postcss: 8.4.32 - rollup: 4.9.1 + '@types/node': 20.11.28 + esbuild: 0.19.12 + postcss: 8.4.35 + rollup: 4.12.0 optionalDependencies: fsevents: 2.3.3 dev: true - /vite@5.1.4(@types/node@20.11.27): - resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} + /vite@5.1.6: + resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -4017,23 +4226,77 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.27 esbuild: 0.19.12 - postcss: 8.4.35 - rollup: 4.12.0 + postcss: 8.4.36 + rollup: 4.13.0 optionalDependencies: fsevents: 2.3.3 dev: true - /vitest@1.3.1(@types/node@20.11.27): - resolution: {integrity: sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==} + /vitest@1.4.0: + resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': 1.4.0 + '@vitest/ui': 1.4.0 + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@types/node': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + dependencies: + '@vitest/expect': 1.4.0 + '@vitest/runner': 1.4.0 + '@vitest/snapshot': 1.4.0 + '@vitest/spy': 1.4.0 + '@vitest/utils': 1.4.0 + acorn-walk: 8.3.2 + chai: 4.4.1 + debug: 4.3.4(supports-color@5.5.0) + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.8 + pathe: 1.1.2 + picocolors: 1.0.0 + std-env: 3.7.0 + strip-literal: 2.0.0 + tinybench: 2.6.0 + tinypool: 0.8.2 + vite: 5.1.6 + vite-node: 1.4.0(@types/node@20.11.28) + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vitest@1.4.0(@types/node@20.11.28): + resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.3.1 - '@vitest/ui': 1.3.1 + '@vitest/browser': 1.4.0 + '@vitest/ui': 1.4.0 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -4050,12 +4313,12 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.27 - '@vitest/expect': 1.3.1 - '@vitest/runner': 1.3.1 - '@vitest/snapshot': 1.3.1 - '@vitest/spy': 1.3.1 - '@vitest/utils': 1.3.1 + '@types/node': 20.11.28 + '@vitest/expect': 1.4.0 + '@vitest/runner': 1.4.0 + '@vitest/snapshot': 1.4.0 + '@vitest/spy': 1.4.0 + '@vitest/utils': 1.4.0 acorn-walk: 8.3.2 chai: 4.4.1 debug: 4.3.4(supports-color@5.5.0) @@ -4068,8 +4331,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.4(@types/node@20.11.27) - vite-node: 1.3.1(@types/node@20.11.27) + vite: 5.1.4(@types/node@20.11.28) + vite-node: 1.4.0(@types/node@20.11.28) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -4125,8 +4388,8 @@ packages: path-exists: 4.0.0 dev: true - /which-typed-array@1.1.14: - resolution: {integrity: sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==} + /which-typed-array@1.1.15: + resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} engines: {node: '>= 0.4'} dependencies: available-typed-arrays: 1.0.7 From 19883dae7ae28a4988473377a70b0fce28815201 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 24 Mar 2024 03:34:44 +0000 Subject: [PATCH 075/290] Bump deps --- package.json | 2 +- packages/commands/package.json | 4 +- packages/core/package.json | 4 +- packages/create-solid/package.json | 4 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 4 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 560 +++++++++++++++++++++-------- 8 files changed, 424 insertions(+), 160 deletions(-) diff --git a/package.json b/package.json index 6251325..5c3c718 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.1.0", "prettier": "^3.2.5", - "turbo": "^1.12.5", + "turbo": "^1.13.0", "vitest": "^1.4.0" }, "packageManager": "pnpm@8.15.5" diff --git a/packages/commands/package.json b/packages/commands/package.json index 82f7798..076ba2d 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,10 +33,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.28", + "@types/node": "^20.11.30", "prettier": "^3.2.5", "tsup": "^8.0.2", - "typescript": "^5.4.2" + "typescript": "^5.4.3" }, "publishConfig": { "access": "public" diff --git a/packages/core/package.json b/packages/core/package.json index 0600d3f..81702be 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,10 +42,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.28", + "@types/node": "^20.11.30", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.4.2" + "typescript": "^5.4.3" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 2fa1ecd..715d948 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.11.28", + "@types/node": "^20.11.30", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", "tsup": "^8.0.2", - "typescript": "^5.4.2" + "typescript": "^5.4.3" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 2d9d46c..4d72077 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -29,7 +29,7 @@ "author": "Thomas Beer", "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.4.2" + "typescript": "^5.4.3" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 9b2c284..52ea164 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -28,8 +28,8 @@ }, "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.4.2", - "@types/node": "20.11.28" + "typescript": "^5.4.3", + "@types/node": "20.11.30" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index b4b8cdf..2d9aecb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,10 +63,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.11.28", + "@types/node": "20.11.30", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.4.2", + "typescript": "^5.4.3", "vitest": "^1.4.0" }, "publishConfig": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 20bf953..4eeaf5b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.12.5 - version: 1.12.5 + specifier: ^1.13.0 + version: 1.13.0 vitest: specifier: ^1.4.0 version: 1.4.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.28 - version: 20.11.28 + specifier: ^20.11.30 + version: 20.11.30 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) typescript: - specifier: ^5.4.2 - version: 5.4.2 + specifier: ^5.4.3 + version: 5.4.3 packages/core: dependencies: @@ -113,17 +113,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.28 - version: 20.11.28 + specifier: ^20.11.30 + version: 20.11.30 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) typescript: - specifier: ^5.4.2 - version: 5.4.2 + specifier: ^5.4.3 + version: 5.4.3 packages/create-solid: devDependencies: @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.11.28 - version: 20.11.28 + specifier: ^20.11.30 + version: 20.11.30 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -147,19 +147,19 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) typescript: - specifier: ^5.4.2 - version: 5.4.2 + specifier: ^5.4.3 + version: 5.4.3 packages/reactivity: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) typescript: - specifier: ^5.4.2 - version: 5.4.2 + specifier: ^5.4.3 + version: 5.4.3 packages/swc-plugin-solid-cli: {} @@ -182,14 +182,14 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.28 - version: 20.11.28 + specifier: 20.11.30 + version: 20.11.30 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) typescript: - specifier: ^5.4.2 - version: 5.4.2 + specifier: ^5.4.3 + version: 5.4.3 packages/utils: dependencies: @@ -222,29 +222,29 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.11.28 - version: 20.11.28 + specifier: 20.11.30 + version: 20.11.30 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.2) + version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) typescript: - specifier: ^5.4.2 - version: 5.4.2 + specifier: ^5.4.3 + version: 5.4.3 vitest: specifier: ^1.4.0 - version: 1.4.0(@types/node@20.11.28) + version: 1.4.0(@types/node@20.11.30) packages: - /@babel/code-frame@7.23.5: - resolution: {integrity: sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==} + /@babel/code-frame@7.24.2: + resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.23.4 - chalk: 2.4.2 + '@babel/highlight': 7.24.2 + picocolors: 1.0.0 dev: true /@babel/helper-validator-identifier@7.22.20: @@ -252,17 +252,18 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/highlight@7.23.4: - resolution: {integrity: sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==} + /@babel/highlight@7.24.2: + resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-validator-identifier': 7.22.20 chalk: 2.4.2 js-tokens: 4.0.0 + picocolors: 1.0.0 dev: true - /@babel/runtime@7.24.0: - resolution: {integrity: sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==} + /@babel/runtime@7.24.1: + resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.1 @@ -277,7 +278,7 @@ packages: /@changesets/apply-release-plan@7.0.0: resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/config': 3.0.0 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 @@ -295,7 +296,7 @@ packages: /@changesets/assemble-release-plan@6.0.0: resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.0.0 '@changesets/types': 6.0.0 @@ -313,7 +314,7 @@ packages: resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/apply-release-plan': 7.0.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 @@ -378,7 +379,7 @@ packages: /@changesets/get-release-plan@4.0.0: resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/assemble-release-plan': 6.0.0 '@changesets/config': 3.0.0 '@changesets/pre': 2.0.0 @@ -394,7 +395,7 @@ packages: /@changesets/git@3.0.0: resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -419,7 +420,7 @@ packages: /@changesets/pre@2.0.0: resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -429,7 +430,7 @@ packages: /@changesets/read@0.6.0: resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/parse': 0.4.0 @@ -450,7 +451,7 @@ packages: /@changesets/write@0.3.0: resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -517,6 +518,15 @@ packages: dev: true optional: true + /@esbuild/aix-ppc64@0.20.2: + resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm64@0.19.12: resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} engines: {node: '>=12'} @@ -535,6 +545,15 @@ packages: dev: true optional: true + /@esbuild/android-arm64@0.20.2: + resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-arm@0.19.12: resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} engines: {node: '>=12'} @@ -553,6 +572,15 @@ packages: dev: true optional: true + /@esbuild/android-arm@0.20.2: + resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/android-x64@0.19.12: resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} engines: {node: '>=12'} @@ -571,6 +599,15 @@ packages: dev: true optional: true + /@esbuild/android-x64@0.20.2: + resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-arm64@0.19.12: resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} engines: {node: '>=12'} @@ -589,6 +626,15 @@ packages: dev: true optional: true + /@esbuild/darwin-arm64@0.20.2: + resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/darwin-x64@0.19.12: resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} engines: {node: '>=12'} @@ -607,6 +653,15 @@ packages: dev: true optional: true + /@esbuild/darwin-x64@0.20.2: + resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-arm64@0.19.12: resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} engines: {node: '>=12'} @@ -625,6 +680,15 @@ packages: dev: true optional: true + /@esbuild/freebsd-arm64@0.20.2: + resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/freebsd-x64@0.19.12: resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} engines: {node: '>=12'} @@ -643,6 +707,15 @@ packages: dev: true optional: true + /@esbuild/freebsd-x64@0.20.2: + resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm64@0.19.12: resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} engines: {node: '>=12'} @@ -661,6 +734,15 @@ packages: dev: true optional: true + /@esbuild/linux-arm64@0.20.2: + resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-arm@0.19.12: resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} engines: {node: '>=12'} @@ -679,6 +761,15 @@ packages: dev: true optional: true + /@esbuild/linux-arm@0.20.2: + resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ia32@0.19.12: resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} engines: {node: '>=12'} @@ -697,6 +788,15 @@ packages: dev: true optional: true + /@esbuild/linux-ia32@0.20.2: + resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-loong64@0.19.12: resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} engines: {node: '>=12'} @@ -715,6 +815,15 @@ packages: dev: true optional: true + /@esbuild/linux-loong64@0.20.2: + resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-mips64el@0.19.12: resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} engines: {node: '>=12'} @@ -733,6 +842,15 @@ packages: dev: true optional: true + /@esbuild/linux-mips64el@0.20.2: + resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-ppc64@0.19.12: resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} engines: {node: '>=12'} @@ -751,6 +869,15 @@ packages: dev: true optional: true + /@esbuild/linux-ppc64@0.20.2: + resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-riscv64@0.19.12: resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} engines: {node: '>=12'} @@ -769,6 +896,15 @@ packages: dev: true optional: true + /@esbuild/linux-riscv64@0.20.2: + resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-s390x@0.19.12: resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} engines: {node: '>=12'} @@ -787,6 +923,15 @@ packages: dev: true optional: true + /@esbuild/linux-s390x@0.20.2: + resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/linux-x64@0.19.12: resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} engines: {node: '>=12'} @@ -805,6 +950,15 @@ packages: dev: true optional: true + /@esbuild/linux-x64@0.20.2: + resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@esbuild/netbsd-x64@0.19.12: resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} engines: {node: '>=12'} @@ -823,6 +977,15 @@ packages: dev: true optional: true + /@esbuild/netbsd-x64@0.20.2: + resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/openbsd-x64@0.19.12: resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} engines: {node: '>=12'} @@ -841,6 +1004,15 @@ packages: dev: true optional: true + /@esbuild/openbsd-x64@0.20.2: + resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + /@esbuild/sunos-x64@0.19.12: resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} engines: {node: '>=12'} @@ -859,6 +1031,15 @@ packages: dev: true optional: true + /@esbuild/sunos-x64@0.20.2: + resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-arm64@0.19.12: resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} engines: {node: '>=12'} @@ -877,6 +1058,15 @@ packages: dev: true optional: true + /@esbuild/win32-arm64@0.20.2: + resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-ia32@0.19.12: resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} engines: {node: '>=12'} @@ -895,6 +1085,15 @@ packages: dev: true optional: true + /@esbuild/win32-ia32@0.20.2: + resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@esbuild/win32-x64@0.19.12: resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} engines: {node: '>=12'} @@ -913,6 +1112,15 @@ packages: dev: true optional: true + /@esbuild/win32-x64@0.20.2: + resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@isaacs/cliui@8.0.2: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -959,7 +1167,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -968,7 +1176,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -1448,8 +1656,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.28: - resolution: {integrity: sha512-M/GPWVS2wLkSkNHVeLkrF2fD5Lx5UC4PxA0uZcKc6QqbIQUJyW1jVjueJYi1z8n0I5PxYrtpnPnWglE+y9A0KA==} + /@types/node@20.11.30: + resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==} dependencies: undici-types: 5.26.5 dev: true @@ -1587,7 +1795,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.5 + es-abstract: 1.23.2 es-shim-unscopables: 1.0.2 dev: true @@ -1598,7 +1806,7 @@ packages: array-buffer-byte-length: 1.0.1 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.5 + es-abstract: 1.23.2 es-errors: 1.3.0 get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 @@ -2009,55 +2217,8 @@ packages: is-arrayish: 0.2.1 dev: true - /es-abstract@1.22.5: - resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==} - engines: {node: '>= 0.4'} - dependencies: - array-buffer-byte-length: 1.0.1 - arraybuffer.prototype.slice: 1.0.3 - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - es-define-property: 1.0.0 - es-errors: 1.3.0 - es-set-tostringtag: 2.0.3 - es-to-primitive: 1.2.1 - function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 - get-symbol-description: 1.0.2 - globalthis: 1.0.3 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - internal-slot: 1.0.7 - is-array-buffer: 3.0.4 - is-callable: 1.2.7 - is-negative-zero: 2.0.3 - is-regex: 1.1.4 - is-shared-array-buffer: 1.0.3 - is-string: 1.0.7 - is-typed-array: 1.1.13 - is-weakref: 1.0.2 - object-inspect: 1.13.1 - object-keys: 1.1.1 - object.assign: 4.1.5 - regexp.prototype.flags: 1.5.2 - safe-array-concat: 1.1.2 - safe-regex-test: 1.0.3 - string.prototype.trim: 1.2.9 - string.prototype.trimend: 1.0.8 - string.prototype.trimstart: 1.0.7 - typed-array-buffer: 1.0.2 - typed-array-byte-length: 1.0.1 - typed-array-byte-offset: 1.0.2 - typed-array-length: 1.0.5 - unbox-primitive: 1.0.2 - which-typed-array: 1.1.15 - dev: true - - /es-abstract@1.23.1: - resolution: {integrity: sha512-r+YVn6hTqQb+P5kK0u3KeDqrmhHKm+OhU/Mw4jSL4eQtOxXmp75fXIUUb3sUqFZOlb/YtW5JRaIfEC3UyjYUZQ==} + /es-abstract@1.23.2: + resolution: {integrity: sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==} engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 @@ -2099,11 +2260,11 @@ packages: safe-regex-test: 1.0.3 string.prototype.trim: 1.2.9 string.prototype.trimend: 1.0.8 - string.prototype.trimstart: 1.0.7 + string.prototype.trimstart: 1.0.8 typed-array-buffer: 1.0.2 typed-array-byte-length: 1.0.1 typed-array-byte-offset: 1.0.2 - typed-array-length: 1.0.5 + typed-array-length: 1.0.6 unbox-primitive: 1.0.2 which-typed-array: 1.1.15 dev: true @@ -2212,6 +2373,37 @@ packages: '@esbuild/win32-x64': 0.19.9 dev: true + /esbuild@0.20.2: + resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/aix-ppc64': 0.20.2 + '@esbuild/android-arm': 0.20.2 + '@esbuild/android-arm64': 0.20.2 + '@esbuild/android-x64': 0.20.2 + '@esbuild/darwin-arm64': 0.20.2 + '@esbuild/darwin-x64': 0.20.2 + '@esbuild/freebsd-arm64': 0.20.2 + '@esbuild/freebsd-x64': 0.20.2 + '@esbuild/linux-arm': 0.20.2 + '@esbuild/linux-arm64': 0.20.2 + '@esbuild/linux-ia32': 0.20.2 + '@esbuild/linux-loong64': 0.20.2 + '@esbuild/linux-mips64el': 0.20.2 + '@esbuild/linux-ppc64': 0.20.2 + '@esbuild/linux-riscv64': 0.20.2 + '@esbuild/linux-s390x': 0.20.2 + '@esbuild/linux-x64': 0.20.2 + '@esbuild/netbsd-x64': 0.20.2 + '@esbuild/openbsd-x64': 0.20.2 + '@esbuild/sunos-x64': 0.20.2 + '@esbuild/win32-arm64': 0.20.2 + '@esbuild/win32-ia32': 0.20.2 + '@esbuild/win32-x64': 0.20.2 + dev: true + /escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} @@ -2379,7 +2571,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.5 + es-abstract: 1.23.2 functions-have-names: 1.2.3 dev: true @@ -3186,7 +3378,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.23.5 + '@babel/code-frame': 7.24.2 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -3300,6 +3492,15 @@ packages: source-map-js: 1.1.0 dev: true + /postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.2.0 + dev: true + /preferred-pm@3.1.3: resolution: {integrity: sha512-MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==} engines: {node: '>=10'} @@ -3665,6 +3866,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + engines: {node: '>=0.10.0'} + dev: true + /source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} @@ -3741,7 +3947,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.1 + es-abstract: 1.23.2 es-object-atoms: 1.0.0 dev: true @@ -3753,12 +3959,13 @@ packages: es-object-atoms: 1.0.0 dev: true - /string.prototype.trimstart@1.0.7: - resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==} + /string.prototype.trimstart@1.0.8: + resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} + engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.22.5 + es-object-atoms: 1.0.0 dev: true /strip-ansi@6.0.1: @@ -3924,7 +4131,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.8)(typescript@5.4.2): + /tsup@8.0.2(@swc/core@1.4.8)(typescript@5.4.3): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -3958,7 +4165,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 - typescript: 5.4.2 + typescript: 5.4.3 transitivePeerDependencies: - supports-color - ts-node @@ -3978,64 +4185,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.12.5: - resolution: {integrity: sha512-0GZ8reftwNQgIQLHkHjHEXTc/Z1NJm+YjsrBP+qhM/7yIZ3TEy9gJhuogDt2U0xIWwFgisTyzbtU7xNaQydtoA==} + /turbo-darwin-64@1.13.0: + resolution: {integrity: sha512-ctHeJXtQgBcgxnCXwrJTGiq57HtwF7zWz5NTuSv//5yeU01BtQIt62ArKfjudOhRefWJbX3Z5srn88XTb9hfww==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.12.5: - resolution: {integrity: sha512-8WpOLNNzvH6kohQOjihD+gaWL+ZFNfjvBwhOF0rjEzvW+YR3Pa7KjhulrjWyeN2yMFqAPubTbZIGOz1EVXLuQA==} + /turbo-darwin-arm64@1.13.0: + resolution: {integrity: sha512-/Q9/pNFkF9w83tNxwMpgapwLYdQ12p8mpty2YQRoUiS9ClWkcqe136jR0mtuMqzlNlpREOFZaoyIthjt6Sdo0g==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.12.5: - resolution: {integrity: sha512-INit73+bNUpwqGZCxgXCR3I+cQsdkQ3/LkfkgSOibkpg+oGqxJRzeXw3sp990d7SCoE8QOcs3iw+PtiFX/LDAA==} + /turbo-linux-64@1.13.0: + resolution: {integrity: sha512-hgbT7o020BGV4L7Sd8hhFTd5zVKPKxbsr0dPfel/9NkdTmptz2aGZ0Vb2MAa18SY3XaCQpDxmdYuOzvvRpo5ZA==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.12.5: - resolution: {integrity: sha512-6lkRBvxtI/GQdGtaAec9LvVQUoRw6nXFp0kM+Eu+5PbZqq7yn6cMkgDJLI08zdeui36yXhone8XGI8pHg8bpUQ==} + /turbo-linux-arm64@1.13.0: + resolution: {integrity: sha512-WK01i2wDZARrV+HEs495A3hNeGMwQR5suYk7G+ceqqW7b+dOTlQdvUjnI3sg7wAnZPgjafFs/hoBaZdJjVa/nw==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.12.5: - resolution: {integrity: sha512-gQYbOhZg5Ww0bQ/bC0w/4W6yQRwBumUUnkB+QPo15VznwxZe2a7bo6JM+9Xy9dKLa/kn+p7zTqme4OEp6M3/Yg==} + /turbo-windows-64@1.13.0: + resolution: {integrity: sha512-hJgSZJZwlWHNwLEthaqJqJWGm4NqF5X/I7vE0sPE4i/jeDl8f0n1hcOkgJkJiNXVxhj+qy/9+4dzbPLKT9imaQ==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.12.5: - resolution: {integrity: sha512-auvhZ9FrhnvQ4mgBlY9O68MT4dIfprYGvd2uPICba/mHUZZvVy5SGgbHJ0KbMwaJfnnFoPgLJO6M+3N2gDprKw==} + /turbo-windows-arm64@1.13.0: + resolution: {integrity: sha512-L/ErxYoXeq8tmjU/AIGicC9VyBN1zdYw8JlM4yPmMI0pJdY8E4GaYK1IiIazqq7M72lmQhU/WW7fV9FqEktwrw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.12.5: - resolution: {integrity: sha512-FATU5EnhrYG8RvQJYFJnDd18DpccDjyvd53hggw9T9JEg9BhWtIEoeaKtBjYbpXwOVrJQMDdXcIB4f2nD3QPPg==} + /turbo@1.13.0: + resolution: {integrity: sha512-r02GtNmkOPcQvUzVE6lg474QVLyU02r3yh3lUGqrFHf5h5ZEjgDGWILsAUqplVqjri1Y/oOkTssks4CObTAaiw==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.12.5 - turbo-darwin-arm64: 1.12.5 - turbo-linux-64: 1.12.5 - turbo-linux-arm64: 1.12.5 - turbo-windows-64: 1.12.5 - turbo-windows-arm64: 1.12.5 + turbo-darwin-64: 1.13.0 + turbo-darwin-arm64: 1.13.0 + turbo-linux-64: 1.13.0 + turbo-linux-arm64: 1.13.0 + turbo-windows-64: 1.13.0 + turbo-windows-arm64: 1.13.0 dev: true /type-detect@4.0.8: @@ -4090,8 +4297,8 @@ packages: is-typed-array: 1.1.13 dev: true - /typed-array-length@1.0.5: - resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==} + /typed-array-length@1.0.6: + resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} engines: {node: '>= 0.4'} dependencies: call-bind: 1.0.7 @@ -4102,8 +4309,8 @@ packages: possible-typed-array-names: 1.0.0 dev: true - /typescript@5.4.2: - resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==} + /typescript@5.4.3: + resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -4141,7 +4348,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.4.0(@types/node@20.11.28): + /vite-node@1.4.0: resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4150,7 +4357,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.1.4(@types/node@20.11.28) + vite: 5.2.4 transitivePeerDependencies: - '@types/node' - less @@ -4162,7 +4369,28 @@ packages: - terser dev: true - /vite@5.1.4(@types/node@20.11.28): + /vite-node@1.4.0(@types/node@20.11.30): + resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + dependencies: + cac: 6.7.14 + debug: 4.3.4(supports-color@5.5.0) + pathe: 1.1.2 + picocolors: 1.0.0 + vite: 5.1.4(@types/node@20.11.30) + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + + /vite@5.1.4(@types/node@20.11.30): resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4190,7 +4418,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.28 + '@types/node': 20.11.30 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -4198,7 +4426,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.6: + /vite@5.1.6(@types/node@20.11.30): resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4226,6 +4454,7 @@ packages: terser: optional: true dependencies: + '@types/node': 20.11.30 esbuild: 0.19.12 postcss: 8.4.36 rollup: 4.13.0 @@ -4233,6 +4462,41 @@ packages: fsevents: 2.3.3 dev: true + /vite@5.2.4: + resolution: {integrity: sha512-vjFghvHWidBTinu5TCymJk/lRHlR5ljqB83yugr0HA1xspUPdOZHqbqDLnZ8f9/jINrtFHTCYYyIUi+o+Q5iyg==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.20.2 + postcss: 8.4.38 + rollup: 4.13.0 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vitest@1.4.0: resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} engines: {node: ^18.0.0 || >=20.0.0} @@ -4275,8 +4539,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.6 - vite-node: 1.4.0(@types/node@20.11.28) + vite: 5.2.4 + vite-node: 1.4.0 why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -4288,7 +4552,7 @@ packages: - terser dev: true - /vitest@1.4.0(@types/node@20.11.28): + /vitest@1.4.0(@types/node@20.11.30): resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4313,7 +4577,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.28 + '@types/node': 20.11.30 '@vitest/expect': 1.4.0 '@vitest/runner': 1.4.0 '@vitest/snapshot': 1.4.0 @@ -4324,15 +4588,15 @@ packages: debug: 4.3.4(supports-color@5.5.0) execa: 8.0.1 local-pkg: 0.5.0 - magic-string: 0.30.7 + magic-string: 0.30.8 pathe: 1.1.2 picocolors: 1.0.0 std-env: 3.7.0 strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.4(@types/node@20.11.28) - vite-node: 1.4.0(@types/node@20.11.28) + vite: 5.1.6(@types/node@20.11.30) + vite-node: 1.4.0(@types/node@20.11.30) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 3a4e453680ed824f85438afe4cfd6ada4e106eee Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 9 Apr 2024 20:59:41 +0100 Subject: [PATCH 076/290] chore: bump deps fix: ctrl+c now cancels prompts, closes #41 --- package.json | 2 +- packages/commands/package.json | 6 +- packages/core/package.json | 8 +- packages/create-solid/package.json | 4 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 4 +- .../ui/src/components/autocomplete/utils.ts | 3 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 230 +++++++++--------- 9 files changed, 132 insertions(+), 133 deletions(-) diff --git a/package.json b/package.json index 5c3c718..c000321 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.1.0", "prettier": "^3.2.5", - "turbo": "^1.13.0", + "turbo": "^1.13.2", "vitest": "^1.4.0" }, "packageManager": "pnpm@8.15.5" diff --git a/packages/commands/package.json b/packages/commands/package.json index 076ba2d..84c1867 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,16 +33,16 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.30", + "@types/node": "^20.12.6", "prettier": "^3.2.5", "tsup": "^8.0.2", - "typescript": "^5.4.3" + "typescript": "^5.4.4" }, "publishConfig": { "access": "public" }, "dependencies": { - "@begit/core": "^0.0.13", + "@begit/core": "^0.0.14", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index 81702be..21d30d7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,12 +29,12 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.8", + "@swc/core": "^1.4.13", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.4", - "tiny-updater": "^3.5.1" + "tiny-updater": "^3.5.2" }, "scripts": { "start": "jiti ./src/index.ts", @@ -42,10 +42,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.11.30", + "@types/node": "^20.12.6", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.4.3" + "typescript": "^5.4.4" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 715d948..8321012 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.11.30", + "@types/node": "^20.12.6", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", "tsup": "^8.0.2", - "typescript": "^5.4.3" + "typescript": "^5.4.4" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 4d72077..a510e53 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -29,7 +29,7 @@ "author": "Thomas Beer", "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.4.3" + "typescript": "^5.4.4" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 52ea164..bb32a7f 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -28,8 +28,8 @@ }, "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.4.3", - "@types/node": "20.11.30" + "typescript": "^5.4.4", + "@types/node": "20.12.6" }, "publishConfig": { "access": "public" diff --git a/packages/ui/src/components/autocomplete/utils.ts b/packages/ui/src/components/autocomplete/utils.ts index 8c28cfb..78c579f 100644 --- a/packages/ui/src/components/autocomplete/utils.ts +++ b/packages/ui/src/components/autocomplete/utils.ts @@ -1,4 +1,3 @@ -import { isCancel } from "@clack/core"; import { log } from "@clack/prompts"; import color from "picocolors"; // Taken from https://github.com/natemoo-re/clack/blob/main/packages/prompts/src/index.ts#L642 @@ -85,7 +84,7 @@ export { const cancelable = async (prompt: Promise, cancelMessage: string = "Canceled"): Promise => { const value = await prompt; - if (isCancel(value)) { + if (typeof value === "symbol") { log.warn(cancelMessage); process.exit(0); } diff --git a/packages/utils/package.json b/packages/utils/package.json index 2d9aecb..16d6fca 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,10 +63,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.11.30", + "@types/node": "20.12.6", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.4.3", + "typescript": "^5.4.4", "vitest": "^1.4.0" }, "publishConfig": { @@ -76,7 +76,7 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.8", + "@swc/core": "^1.4.13", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4eeaf5b..1d35fa3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.13.0 - version: 1.13.0 + specifier: ^1.13.2 + version: 1.13.2 vitest: specifier: ^1.4.0 version: 1.4.0 @@ -27,8 +27,8 @@ importers: packages/commands: dependencies: '@begit/core': - specifier: ^0.0.13 - version: 0.0.13 + specifier: ^0.0.14 + version: 0.0.14 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.30 - version: 20.11.30 + specifier: ^20.12.6 + version: 20.12.6 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) typescript: - specifier: ^5.4.3 - version: 5.4.3 + specifier: ^5.4.4 + version: 5.4.4 packages/core: dependencies: @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.8 - version: 1.4.8 + specifier: ^1.4.13 + version: 1.4.13 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -106,24 +106,24 @@ importers: specifier: ^1.1.4 version: 1.1.4 tiny-updater: - specifier: ^3.5.1 - version: 3.5.1 + specifier: ^3.5.2 + version: 3.5.2 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.11.30 - version: 20.11.30 + specifier: ^20.12.6 + version: 20.12.6 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) typescript: - specifier: ^5.4.3 - version: 5.4.3 + specifier: ^5.4.4 + version: 5.4.4 packages/create-solid: devDependencies: @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.11.30 - version: 20.11.30 + specifier: ^20.12.6 + version: 20.12.6 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -147,19 +147,19 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) typescript: - specifier: ^5.4.3 - version: 5.4.3 + specifier: ^5.4.4 + version: 5.4.4 packages/reactivity: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) typescript: - specifier: ^5.4.3 - version: 5.4.3 + specifier: ^5.4.4 + version: 5.4.4 packages/swc-plugin-solid-cli: {} @@ -182,14 +182,14 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.11.30 - version: 20.11.30 + specifier: 20.12.6 + version: 20.12.6 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) typescript: - specifier: ^5.4.3 - version: 5.4.3 + specifier: ^5.4.4 + version: 5.4.4 packages/utils: dependencies: @@ -203,8 +203,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.8 - version: 1.4.8 + specifier: ^1.4.13 + version: 1.4.13 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -222,20 +222,20 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.11.30 - version: 20.11.30 + specifier: 20.12.6 + version: 20.12.6 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.8)(typescript@5.4.3) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) typescript: - specifier: ^5.4.3 - version: 5.4.3 + specifier: ^5.4.4 + version: 5.4.4 vitest: specifier: ^1.4.0 - version: 1.4.0(@types/node@20.11.30) + version: 1.4.0(@types/node@20.12.6) packages: @@ -269,10 +269,10 @@ packages: regenerator-runtime: 0.14.1 dev: true - /@begit/core@0.0.13: - resolution: {integrity: sha512-xKcBhH4EnGJ+k7zWo2OVUByEGRNGCgToaTacCWe5fh+6jLQw7MC7jjiR7an+CgxKKvnkNU/yl2/PbXZl9k9z0g==} + /@begit/core@0.0.14: + resolution: {integrity: sha512-JdS9oiGi3ovrzF+8e/5jU9gRZlhhnt0oOf5G+ixfEt9CK37EMkhdRTg1LOJtRfQlbs6igpo0D5HXEvVqMZrV/A==} dependencies: - tar: 6.2.0 + tar: 6.2.1 dev: false /@changesets/apply-release-plan@7.0.0: @@ -1534,88 +1534,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.4.8: - resolution: {integrity: sha512-hhQCffRTgzpTIbngSnC30vV6IJVTI9FFBF954WEsshsecVoCGFiMwazBbrkLG+RwXENTrMhgeREEFh6R3KRgKQ==} + /@swc/core-darwin-arm64@1.4.13: + resolution: {integrity: sha512-36P72FLpm5iq85IvoEjBvi22DiqkkEIanJ1M0E8bkxcFHUbjBrYfPY9T6cpPyK5oQqkaTBvNAc3j1BlVD6IH6w==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.8: - resolution: {integrity: sha512-P3ZBw8Jr8rKhY/J8d+6WqWriqngGTgHwtFeJ8MIakQJTbdYbFgXSZxcvDiERg3psbGeFXaUaPI0GO6BXv9k/OQ==} + /@swc/core-darwin-x64@1.4.13: + resolution: {integrity: sha512-ye7OgKpDdyA8AMIVVdmD1ICDaFXgoEXORnVO8bBHyul0WN71yUBZMX+YxEx2lpWtiftA2vY/1MAuOR80vHkBCw==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.8: - resolution: {integrity: sha512-PP9JIJt19bUWhAGcQW6qMwTjZOcMyzkvZa0/LWSlDm0ORYVLmDXUoeQbGD3e0Zju9UiZxyulnpjEN0ZihJgPTA==} + /@swc/core-linux-arm-gnueabihf@1.4.13: + resolution: {integrity: sha512-+x593Jlmu4c3lJtZUKRejWpV2MAij1Js5nmQLLdjo6ChR2D4B2rzj3iMiKn5gITew7fraF9t3fvXALdWh7HmUg==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.8: - resolution: {integrity: sha512-HvEWnwKHkoVUr5iftWirTApFJ13hGzhAY2CMw4lz9lur2m+zhPviRRED0FCI6T95Knpv7+8eUOr98Z7ctrG6DQ==} + /@swc/core-linux-arm64-gnu@1.4.13: + resolution: {integrity: sha512-0x8OVw4dfyNerrs/9eZX9wNnmvwbwXSMCi+LbE6Xt1pXOIwvoLtFIXcV3NsrlkFboO3sr5UAQIwDxKqbIZA9pQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.8: - resolution: {integrity: sha512-kY8+qa7k/dEeBq9p0Hrta18QnJPpsiJvDQSLNaTIFpdM3aEM9zbkshWz8gaX5VVGUEALowCBUWqmzO4VaqM+2w==} + /@swc/core-linux-arm64-musl@1.4.13: + resolution: {integrity: sha512-Z9c4JiequtZvngPcxbCuAOkmWBxi2vInZbjjhD5I+Q9oiJdXUz1t2USGwsGPS41Xvk1BOA3ecK2Sn1ilY3titg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.8: - resolution: {integrity: sha512-0WWyIw432wpO/zeGblwq4f2YWam4pn8Z/Ig4KzHMgthR/KmiLU3f0Z7eo45eVmq5vcU7Os1zi/Zb65OOt09q/w==} + /@swc/core-linux-x64-gnu@1.4.13: + resolution: {integrity: sha512-ChatHtk+vX0Ke5QG+jO+rIapw/KwZsi9MedCBHFXHH6iWF4z8d51cJeN68ykcn+vAXzjNeFNdlNy5Vbkd1zAqg==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.8: - resolution: {integrity: sha512-p4yxvVS05rBNCrBaSTa20KK88vOwtg8ifTW7ec/yoab0bD5EwzzB8KbDmLLxE6uziFa0sdjF0dfRDwSZPex37Q==} + /@swc/core-linux-x64-musl@1.4.13: + resolution: {integrity: sha512-0Pz39YR530mXpsztwQkmEKdkkZy4fY4Smdh4pkm6Ly8Nndyo0te/l4bcAGqN24Jp7aVwF/QSy14SAtw4HRjU9g==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.8: - resolution: {integrity: sha512-jKuXihxAaqUnbFfvPxtmxjdJfs87F1GdBf33il+VUmSyWCP4BE6vW+/ReDAe8sRNsKyrZ3UH1vI5q1n64csBUA==} + /@swc/core-win32-arm64-msvc@1.4.13: + resolution: {integrity: sha512-LVZfhlD+jHcAbz5NN+gAJ1BEasB0WpcvUzcsJt0nQSRsojgzPzFjJ+fzEBnvT7SMtqKkrnVJ0OmDYeh88bDRpw==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.8: - resolution: {integrity: sha512-O0wT4AGHrX8aBeH6c2ADMHgagAJc5Kf6W48U5moyYDAkkVnKvtSc4kGhjWhe1Yl0sI0cpYh2In2FxvYsb44eWw==} + /@swc/core-win32-ia32-msvc@1.4.13: + resolution: {integrity: sha512-78hxHWUvUZtWsnhcf8DKwhBcNFJw+j4y4fN2B9ioXmBWX2tIyw+BqUHOrismOtjPihaZmwe/Ok2e4qmkawE2fw==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.8: - resolution: {integrity: sha512-C2AYc3A2o+ECciqsJWRgIpp83Vk5EaRzHe7ed/xOWzVd0MsWR+fweEsyOjlmzHfpUxJSi46Ak3/BIZJlhZbXbg==} + /@swc/core-win32-x64-msvc@1.4.13: + resolution: {integrity: sha512-WSfy1u2Xde6jU7UpHIInCUMW98Zw9iZglddKUAvmr1obkZji5U6EX0Oca3asEJdZPFb+2lMLjt0Mh5a1YisROg==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.8: - resolution: {integrity: sha512-uY2RSJcFPgNOEg12RQZL197LZX+MunGiKxsbxmh22VfVxrOYGRvh4mPANFlrD1yb38CgmW1wI6YgIi8LkIwmWg==} + /@swc/core@1.4.13: + resolution: {integrity: sha512-rOtusBE+2gaeRkAJn5E4zp5yzZekZOypzSOz5ZG6P1hFbd+Cc26fWEdK6sUSnrkkvTd0Oj33KXLB/4UkbK/UHA==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -1627,16 +1627,16 @@ packages: '@swc/counter': 0.1.2 '@swc/types': 0.1.5 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.8 - '@swc/core-darwin-x64': 1.4.8 - '@swc/core-linux-arm-gnueabihf': 1.4.8 - '@swc/core-linux-arm64-gnu': 1.4.8 - '@swc/core-linux-arm64-musl': 1.4.8 - '@swc/core-linux-x64-gnu': 1.4.8 - '@swc/core-linux-x64-musl': 1.4.8 - '@swc/core-win32-arm64-msvc': 1.4.8 - '@swc/core-win32-ia32-msvc': 1.4.8 - '@swc/core-win32-x64-msvc': 1.4.8 + '@swc/core-darwin-arm64': 1.4.13 + '@swc/core-darwin-x64': 1.4.13 + '@swc/core-linux-arm-gnueabihf': 1.4.13 + '@swc/core-linux-arm64-gnu': 1.4.13 + '@swc/core-linux-arm64-musl': 1.4.13 + '@swc/core-linux-x64-gnu': 1.4.13 + '@swc/core-linux-x64-musl': 1.4.13 + '@swc/core-win32-arm64-msvc': 1.4.13 + '@swc/core-win32-ia32-msvc': 1.4.13 + '@swc/core-win32-x64-msvc': 1.4.13 /@swc/counter@0.1.2: resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} @@ -1656,8 +1656,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.11.30: - resolution: {integrity: sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==} + /@types/node@20.12.6: + resolution: {integrity: sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==} dependencies: undici-types: 5.26.5 dev: true @@ -4037,8 +4037,8 @@ packages: engines: {node: '>= 0.4'} dev: true - /tar@6.2.0: - resolution: {integrity: sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==} + /tar@6.2.1: + resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} engines: {node: '>=10'} dependencies: chownr: 2.0.0 @@ -4069,8 +4069,8 @@ packages: resolution: {integrity: sha512-FYzA5Q5myp26PIZ4mx/03SreNgB1dGqcHJnj1Z8UVQ8/CBw0c6qRoPgRdk8rKpviY5diZyOmRGYMYKLYbjnmWQ==} dev: false - /tiny-updater@3.5.1: - resolution: {integrity: sha512-kh1922FSNPTmrdr353x+xJRTrrVFl9zq/Q1Vz47YNWhTO0jn3ZyZd6Cahe8qW5MLXg+gia+0G7b6HIgW7pbBMg==} + /tiny-updater@3.5.2: + resolution: {integrity: sha512-5EjK01h0rvgv+Eb0XaiTZJZR+ujdjCDHZ1ZCVCu+1h4+MyOYZ+za8UKuKdNOOOSKhkkC9B08o6ZhF4JnQg7ZLg==} dependencies: ionstore: 1.0.0 tiny-colors: 2.0.2 @@ -4131,7 +4131,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.8)(typescript@5.4.3): + /tsup@8.0.2(@swc/core@1.4.13)(typescript@5.4.4): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -4150,7 +4150,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.4.8 + '@swc/core': 1.4.13 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -4165,7 +4165,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 - typescript: 5.4.3 + typescript: 5.4.4 transitivePeerDependencies: - supports-color - ts-node @@ -4185,64 +4185,64 @@ packages: yargs: 17.7.2 dev: true - /turbo-darwin-64@1.13.0: - resolution: {integrity: sha512-ctHeJXtQgBcgxnCXwrJTGiq57HtwF7zWz5NTuSv//5yeU01BtQIt62ArKfjudOhRefWJbX3Z5srn88XTb9hfww==} + /turbo-darwin-64@1.13.2: + resolution: {integrity: sha512-CCSuD8CfmtncpohCuIgq7eAzUas0IwSbHfI8/Q3vKObTdXyN8vAo01gwqXjDGpzG9bTEVedD0GmLbD23dR0MLA==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.13.0: - resolution: {integrity: sha512-/Q9/pNFkF9w83tNxwMpgapwLYdQ12p8mpty2YQRoUiS9ClWkcqe136jR0mtuMqzlNlpREOFZaoyIthjt6Sdo0g==} + /turbo-darwin-arm64@1.13.2: + resolution: {integrity: sha512-0HySm06/D2N91rJJ89FbiI/AodmY8B3WDSFTVEpu2+8spUw7hOJ8okWOT0e5iGlyayUP9gr31eOeL3VFZkpfCw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.13.0: - resolution: {integrity: sha512-hgbT7o020BGV4L7Sd8hhFTd5zVKPKxbsr0dPfel/9NkdTmptz2aGZ0Vb2MAa18SY3XaCQpDxmdYuOzvvRpo5ZA==} + /turbo-linux-64@1.13.2: + resolution: {integrity: sha512-7HnibgbqZrjn4lcfIouzlPu8ZHSBtURG4c7Bedu7WJUDeZo+RE1crlrQm8wuwO54S0siYqUqo7GNHxu4IXbioQ==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.13.0: - resolution: {integrity: sha512-WK01i2wDZARrV+HEs495A3hNeGMwQR5suYk7G+ceqqW7b+dOTlQdvUjnI3sg7wAnZPgjafFs/hoBaZdJjVa/nw==} + /turbo-linux-arm64@1.13.2: + resolution: {integrity: sha512-sUq4dbpk6SNKg/Hkwn256Vj2AEYSQdG96repio894h5/LEfauIK2QYiC/xxAeW3WBMc6BngmvNyURIg7ltrePg==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.13.0: - resolution: {integrity: sha512-hJgSZJZwlWHNwLEthaqJqJWGm4NqF5X/I7vE0sPE4i/jeDl8f0n1hcOkgJkJiNXVxhj+qy/9+4dzbPLKT9imaQ==} + /turbo-windows-64@1.13.2: + resolution: {integrity: sha512-DqzhcrciWq3dpzllJR2VVIyOhSlXYCo4mNEWl98DJ3FZ08PEzcI3ceudlH6F0t/nIcfSItK1bDP39cs7YoZHEA==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.13.0: - resolution: {integrity: sha512-L/ErxYoXeq8tmjU/AIGicC9VyBN1zdYw8JlM4yPmMI0pJdY8E4GaYK1IiIazqq7M72lmQhU/WW7fV9FqEktwrw==} + /turbo-windows-arm64@1.13.2: + resolution: {integrity: sha512-WnPMrwfCXxK69CdDfS1/j2DlzcKxSmycgDAqV0XCYpK/812KB0KlvsVAt5PjEbZGXkY88pCJ1BLZHAjF5FcbqA==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.13.0: - resolution: {integrity: sha512-r02GtNmkOPcQvUzVE6lg474QVLyU02r3yh3lUGqrFHf5h5ZEjgDGWILsAUqplVqjri1Y/oOkTssks4CObTAaiw==} + /turbo@1.13.2: + resolution: {integrity: sha512-rX/d9f4MgRT3yK6cERPAkfavIxbpBZowDQpgvkYwGMGDQ0Nvw1nc0NVjruE76GrzXQqoxR1UpnmEP54vBARFHQ==} hasBin: true optionalDependencies: - turbo-darwin-64: 1.13.0 - turbo-darwin-arm64: 1.13.0 - turbo-linux-64: 1.13.0 - turbo-linux-arm64: 1.13.0 - turbo-windows-64: 1.13.0 - turbo-windows-arm64: 1.13.0 + turbo-darwin-64: 1.13.2 + turbo-darwin-arm64: 1.13.2 + turbo-linux-64: 1.13.2 + turbo-linux-arm64: 1.13.2 + turbo-windows-64: 1.13.2 + turbo-windows-arm64: 1.13.2 dev: true /type-detect@4.0.8: @@ -4309,8 +4309,8 @@ packages: possible-typed-array-names: 1.0.0 dev: true - /typescript@5.4.3: - resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} + /typescript@5.4.4: + resolution: {integrity: sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -4369,7 +4369,7 @@ packages: - terser dev: true - /vite-node@1.4.0(@types/node@20.11.30): + /vite-node@1.4.0(@types/node@20.12.6): resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4378,7 +4378,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.1.4(@types/node@20.11.30) + vite: 5.1.4(@types/node@20.12.6) transitivePeerDependencies: - '@types/node' - less @@ -4390,7 +4390,7 @@ packages: - terser dev: true - /vite@5.1.4(@types/node@20.11.30): + /vite@5.1.4(@types/node@20.12.6): resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4418,7 +4418,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.6 esbuild: 0.19.12 postcss: 8.4.35 rollup: 4.12.0 @@ -4426,7 +4426,7 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.1.6(@types/node@20.11.30): + /vite@5.1.6(@types/node@20.12.6): resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4454,7 +4454,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.6 esbuild: 0.19.12 postcss: 8.4.36 rollup: 4.13.0 @@ -4552,7 +4552,7 @@ packages: - terser dev: true - /vitest@1.4.0(@types/node@20.11.30): + /vitest@1.4.0(@types/node@20.12.6): resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4577,7 +4577,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.11.30 + '@types/node': 20.12.6 '@vitest/expect': 1.4.0 '@vitest/runner': 1.4.0 '@vitest/snapshot': 1.4.0 @@ -4595,8 +4595,8 @@ packages: strip-literal: 2.0.0 tinybench: 2.6.0 tinypool: 0.8.2 - vite: 5.1.6(@types/node@20.11.30) - vite-node: 1.4.0(@types/node@20.11.30) + vite: 5.1.6(@types/node@20.12.6) + vite-node: 1.4.0(@types/node@20.12.6) why-is-node-running: 2.2.2 transitivePeerDependencies: - less From 3c68d388d55691b2a53056fcb1d27f52c5383164 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 9 Apr 2024 21:20:06 +0100 Subject: [PATCH 077/290] feat: add project name as positional argument, closes #40 --- packages/create-solid/src/index.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index f689db1..fe08178 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -3,7 +3,7 @@ import { handleNew } from "@solid-cli/commands/new"; import color from "picocolors"; import { intro } from "@clack/prompts"; import { version } from "../package.json"; -import { command, run, option, string, boolean, flag, optional } from "cmd-ts"; +import { command, run, option, string, boolean, flag, optional, positional } from "cmd-ts"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${version}`))}`); @@ -11,7 +11,8 @@ const app = command({ name: "create-solid", description: "Create a new Solid project", args: { - projectName: option({ type: optional(string), long: "project-name", short: "p", description: "Name of your project" }), + projectNamePositional: positional({type: optional(string), displayName: "Project Name", description: "The name of the project to be generated"}), + projectNameOption: option({ type: optional(string), long: "project-name", short: "p", description: "Name of your project" }), solidStart: flag({ type: optional(boolean), long: "solid-start", @@ -19,8 +20,8 @@ const app = command({ description: "Create a SolidStart project", }), }, - handler: async ({ projectName, solidStart }) => { - await handleNew(undefined, projectName, false, solidStart); + handler: async ({ projectNameOption, solidStart, projectNamePositional }) => { + await handleNew(undefined, projectNamePositional ?? projectNameOption, false, solidStart); }, }); run(app, process.argv.slice(2)); From 567ff055ccb4978c4ff3f1a6c0c1b0dc97236dc8 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 9 Apr 2024 21:23:16 +0100 Subject: [PATCH 078/290] release --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 84c1867..d570e0f 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.18", + "version": "0.0.19", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index 21d30d7..f364aaa 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.23", + "version": "0.0.24", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 8321012..fef8600 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.5", + "version": "0.5.6", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/ui/package.json b/packages/ui/package.json index bb32a7f..601c986 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.10", + "version": "0.0.11", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 16d6fca..c53b9ba 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.12", + "version": "0.0.13", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From cf171f08f01728a3a6903c8abb68780a21416c0d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 10 Apr 2024 01:04:18 +0100 Subject: [PATCH 079/290] feat: switch to `begit`'s `downloadRepo` function, which has built-in error handling in case the cached tarball gets corrupted --- packages/commands/src/handlers/new.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index f35fee4..fa2d743 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -5,9 +5,9 @@ import { t } from "@solid-cli/utils"; import { insertAtEnd, readFileToString } from "@solid-cli/utils/fs"; import { flushQueue } from "@solid-cli/utils/updates"; import { rm } from "fs/promises"; -import { basename, join, resolve } from "path"; +import { join, resolve } from "path"; import { Dirent, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; -import { downloadAndExtract } from "@begit/core"; +import { downloadRepo } from "@begit/core"; import { transform } from "sucrase"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; const gitIgnore = ` @@ -155,7 +155,7 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport // const emitter = degit(`solidjs/solid-start/examples/${template}#main`); // emitter.on("info", ({ message }) => p.log.info(message)); // await emitter.clone(tempDir); - await downloadAndExtract({ + await downloadRepo({ repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, dest: tempDir, }); @@ -229,7 +229,7 @@ export const handleNew = async ( // const emitter = degit(`solidjs/templates/${variation}`); // emitter.on("info", ({ message }) => p.log.info(message)); // await emitter.clone(tempDir); - await downloadAndExtract({ repo: { owner: "solidjs", name: "templates", subdir: variation }, dest: tempDir }); + await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: variation }, dest: tempDir }); }, }); From f77a2c9a6cb65d39b792efb4e257f52790e4558f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 10 Apr 2024 01:05:27 +0100 Subject: [PATCH 080/290] remove commented code --- packages/commands/src/handlers/new.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index fa2d743..0dcb903 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -6,7 +6,7 @@ import { insertAtEnd, readFileToString } from "@solid-cli/utils/fs"; import { flushQueue } from "@solid-cli/utils/updates"; import { rm } from "fs/promises"; import { join, resolve } from "path"; -import { Dirent, copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "fs"; +import { Dirent, copyFileSync, existsSync, mkdirSync, readdirSync, writeFileSync } from "fs"; import { downloadRepo } from "@begit/core"; import { transform } from "sucrase"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; @@ -92,9 +92,6 @@ const convertToJS = async (file: Dirent, startPath: string) => { transforms: ["typescript", "jsx"], jsxRuntime: "preserve", }); - // code = await prettier.format(code, { - // parser: "babel", - // }); writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); } else { @@ -152,9 +149,6 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, fn: async () => { - // const emitter = degit(`solidjs/solid-start/examples/${template}#main`); - // emitter.on("info", ({ message }) => p.log.info(message)); - // await emitter.clone(tempDir); await downloadRepo({ repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, dest: tempDir, @@ -226,9 +220,6 @@ export const handleNew = async ( startText: t.CREATING_PROJECT, finishText: t.PROJECT_CREATED, fn: async () => { - // const emitter = degit(`solidjs/templates/${variation}`); - // emitter.on("info", ({ message }) => p.log.info(message)); - // await emitter.clone(tempDir); await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: variation }, dest: tempDir }); }, }); From b1f69ddbbf108fd74eebce274ee3ee58f03bb6ad Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 10 Apr 2024 01:18:56 +0100 Subject: [PATCH 081/290] - prettier now preserves line endings - format --- .prettierrc | 3 ++- docs/vitepress_docs/installation.md | 1 + packages/commands/src/lib/utils/helpers.ts | 4 ++-- packages/create-solid/src/index.ts | 13 +++++++++++-- packages/ui/src/components/form/index.ts | 1 - 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.prettierrc b/.prettierrc index 8af17f2..df8a347 100644 --- a/.prettierrc +++ b/.prettierrc @@ -7,5 +7,6 @@ "tabWidth": 2, "trailingComma": "all", "useTabs": true, - "quoteProps": "consistent" + "quoteProps": "consistent", + "endOfLine": "auto" } diff --git a/docs/vitepress_docs/installation.md b/docs/vitepress_docs/installation.md index 58474ed..4729ad2 100644 --- a/docs/vitepress_docs/installation.md +++ b/docs/vitepress_docs/installation.md @@ -7,6 +7,7 @@ npm install @solid-cli/core ``` Or installed globally: + ### UNIX/MacOS/Linux In order to install global packages on Unix based systems you will need to grant npm special system permissions using the `sudo` command, suffixed by the command you would like to run. diff --git a/packages/commands/src/lib/utils/helpers.ts b/packages/commands/src/lib/utils/helpers.ts index 1eea427..fbfe5ad 100644 --- a/packages/commands/src/lib/utils/helpers.ts +++ b/packages/commands/src/lib/utils/helpers.ts @@ -80,8 +80,8 @@ export async function findFiles( const fileMatch = Array.isArray(lookingFor) ? lookingFor.some((s) => (startsWith ? file.name.startsWith(s) : file.name.endsWith(s))) : startsWith - ? file.name.startsWith(lookingFor) - : file.name.endsWith(lookingFor); + ? file.name.startsWith(lookingFor) + : file.name.endsWith(lookingFor); if (fileMatch) { filePaths.push(resolve(startPath, file.name)); diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index fe08178..d18ee1f 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -11,8 +11,17 @@ const app = command({ name: "create-solid", description: "Create a new Solid project", args: { - projectNamePositional: positional({type: optional(string), displayName: "Project Name", description: "The name of the project to be generated"}), - projectNameOption: option({ type: optional(string), long: "project-name", short: "p", description: "Name of your project" }), + projectNamePositional: positional({ + type: optional(string), + displayName: "Project Name", + description: "The name of the project to be generated", + }), + projectNameOption: option({ + type: optional(string), + long: "project-name", + short: "p", + description: "Name of your project", + }), solidStart: flag({ type: optional(boolean), long: "solid-start", diff --git a/packages/ui/src/components/form/index.ts b/packages/ui/src/components/form/index.ts index bfbd08f..fc11479 100644 --- a/packages/ui/src/components/form/index.ts +++ b/packages/ui/src/components/form/index.ts @@ -22,6 +22,5 @@ export const form = async (fields: Field[]) => { returns.push({ name: field.name, value: r }); } - return returns; }; From 345117762aa8db67ec17c5bac3a5f9699606a8b1 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 14 Apr 2024 14:51:44 +0100 Subject: [PATCH 082/290] Add templatePositional argument Replace `p.log.info` with `p.note` Fix awful error messages --- packages/commands/src/handlers/new.ts | 33 +++++++++++++++++++-------- packages/create-solid/src/index.ts | 25 +++++++++++++++++--- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 0dcb903..6826d8c 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -60,8 +60,10 @@ const startSupported = [ const localSupported = ["ts", "js"] as const; const stackblitzSupported = ["bare"] as const; -type AllSupported = (typeof localSupported)[number] | (typeof stackblitzSupported)[number]; - +export type AllSupported = (typeof localSupported)[number] | (typeof stackblitzSupported)[number]; +export const isSupported = (template: string): template is AllSupported => { + return localSupported.indexOf(template as any) !== -1; +}; const modifyReadme = async (name: string) => { await insertAtEnd( `${name}/README.md`, @@ -162,10 +164,12 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport writeFileSync(join(projectName, ".gitignore"), gitIgnore); if (!readmeAlreadyExists) await modifyReadme(projectName); const pM = detectPackageManager(); - p.log.info(`${t.GET_STARTED} - - cd ${projectName} - - ${pM.name} install - - ${pM.name} ${pM.runScriptCommand("dev")}`); + p.note( + `cd ${projectName} +${pM.name} install +${pM.name} ${pM.runScriptCommand("dev")}`, + t.GET_STARTED, + ); }; const handleAutocompleteNew = async (name: string, isStart?: boolean) => { @@ -195,6 +199,13 @@ export const handleNew = async ( name ??= await cancelable( p.text({ message: t.PROJECT_NAME, placeholder: "solid-project", defaultValue: "solid-project" }), ); + await spinnerify({ + startText: "This will break", + finishText: "Should've broken", + fn: async () => { + throw new Error("Very broken"); + }, + }); if (!variation) { await handleAutocompleteNew(name, isStart); @@ -230,8 +241,10 @@ export const handleNew = async ( writeFileSync(join(name, ".gitignore"), gitIgnore); if (!readmeAlreadyExists) await modifyReadme(name ?? variation); const pM = detectPackageManager(); - p.log.info(`${t.GET_STARTED} - - cd ${name} - - ${pM.name} install - - ${pM.name} ${pM.runScriptCommand("dev")}`); + p.note( + `cd ${name} +${pM.name} install +${pM.name} ${pM.runScriptCommand("dev")}`, + t.GET_STARTED, + ); }; diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index d18ee1f..e331de8 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -1,5 +1,5 @@ #! /usr/bin/env node -import { handleNew } from "@solid-cli/commands/new"; +import { AllSupported, handleNew, isSupported } from "@solid-cli/commands/new"; import color from "picocolors"; import { intro } from "@clack/prompts"; import { version } from "../package.json"; @@ -16,6 +16,11 @@ const app = command({ displayName: "Project Name", description: "The name of the project to be generated", }), + templatePositional: positional({ + type: optional(string), + displayName: "Template name", + description: "Name of template to be initialised", + }), projectNameOption: option({ type: optional(string), long: "project-name", @@ -29,8 +34,22 @@ const app = command({ description: "Create a SolidStart project", }), }, - handler: async ({ projectNameOption, solidStart, projectNamePositional }) => { - await handleNew(undefined, projectNamePositional ?? projectNameOption, false, solidStart); + handler: async ({ projectNameOption, solidStart, projectNamePositional, templatePositional }) => { + if (templatePositional && !isSupported(templatePositional)) { + console.error(`Template "${templatePositional}" is not supported`); + process.exit(0); + } + try { + await handleNew( + templatePositional as AllSupported, + projectNamePositional ?? projectNameOption, + false, + solidStart, + ); + } catch (e) { + console.error(e); + process.exit(1); + } }, }); run(app, process.argv.slice(2)); From 0a6d88a3d012d40ec184cfc582d39070529b681b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 14 Apr 2024 14:52:17 +0100 Subject: [PATCH 083/290] Remove left over debugging code --- packages/commands/src/handlers/new.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 6826d8c..a348a90 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -199,13 +199,6 @@ export const handleNew = async ( name ??= await cancelable( p.text({ message: t.PROJECT_NAME, placeholder: "solid-project", defaultValue: "solid-project" }), ); - await spinnerify({ - startText: "This will break", - finishText: "Should've broken", - fn: async () => { - throw new Error("Very broken"); - }, - }); if (!variation) { await handleAutocompleteNew(name, isStart); From c73acaddbfe90f9b6eefffad2ee3d1ab7c69b487 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 14 Apr 2024 14:56:29 +0100 Subject: [PATCH 084/290] Release --- packages/commands/package.json | 2 +- packages/create-solid/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index d570e0f..5d3e827 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.19", + "version": "0.0.20", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index fef8600..b754f25 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.6", + "version": "0.5.7", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 19f7e878496db8a9c3b3d4aef656bb160062d3e6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 14 Apr 2024 16:26:11 +0100 Subject: [PATCH 085/290] Add `with-authjs` to Start's supported templates list --- packages/commands/src/handlers/new.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index a348a90..9988cc3 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -48,6 +48,7 @@ const startSupported = [ "notes", "todomvc", "with-auth", + "with-authjs", "with-mdx", "with-prisma", "with-solid-styled", From bcbf13f0be9c399d013afad3794330c8574af5ac Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 14 Apr 2024 16:34:08 +0100 Subject: [PATCH 086/290] Release --- packages/commands/package.json | 2 +- packages/create-solid/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 5d3e827..6189111 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.20", + "version": "0.0.21", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index b754f25..50d5d7d 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.7", + "version": "0.5.8", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 3d1b49a45c08c28bb22e50f1eb2a902e5680554e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 14 Apr 2024 21:52:21 +0100 Subject: [PATCH 087/290] bump deps --- package.json | 2 +- packages/commands/package.json | 6 +- packages/core/package.json | 4 +- packages/create-solid/package.json | 4 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 771 +++++------------------------ 8 files changed, 132 insertions(+), 667 deletions(-) diff --git a/package.json b/package.json index c000321..fe4af65 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "nodemon": "^3.1.0", "prettier": "^3.2.5", "turbo": "^1.13.2", - "vitest": "^1.4.0" + "vitest": "^1.5.0" }, "packageManager": "pnpm@8.15.5" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 6189111..7613e7a 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,16 +33,16 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.6", + "@types/node": "^20.12.7", "prettier": "^3.2.5", "tsup": "^8.0.2", - "typescript": "^5.4.4" + "typescript": "^5.4.5" }, "publishConfig": { "access": "public" }, "dependencies": { - "@begit/core": "^0.0.14", + "@begit/core": "^0.0.15", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index f364aaa..0dc998d 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -42,10 +42,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.6", + "@types/node": "^20.12.7", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.4.4" + "typescript": "^5.4.5" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 50d5d7d..205ed2b 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.12.6", + "@types/node": "^20.12.7", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", "tsup": "^8.0.2", - "typescript": "^5.4.4" + "typescript": "^5.4.5" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index a510e53..cb765c4 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -29,7 +29,7 @@ "author": "Thomas Beer", "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.4.4" + "typescript": "^5.4.5" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 601c986..7e71c29 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -28,8 +28,8 @@ }, "devDependencies": { "tsup": "^8.0.2", - "typescript": "^5.4.4", - "@types/node": "20.12.6" + "typescript": "^5.4.5", + "@types/node": "20.12.7" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index c53b9ba..b653bb2 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.12.6", + "@types/node": "20.12.7", "jiti": "^1.21.0", "tsup": "^8.0.2", - "typescript": "^5.4.4", - "vitest": "^1.4.0" + "typescript": "^5.4.5", + "vitest": "^1.5.0" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d35fa3..182d20a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,14 +21,14 @@ importers: specifier: ^1.13.2 version: 1.13.2 vitest: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.5.0 + version: 1.5.0(@types/node@20.12.7) packages/commands: dependencies: '@begit/core': - specifier: ^0.0.14 - version: 0.0.14 + specifier: ^0.0.15 + version: 0.0.15 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.6 - version: 20.12.6 + specifier: ^20.12.7 + version: 20.12.7 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) typescript: - specifier: ^5.4.4 - version: 5.4.4 + specifier: ^5.4.5 + version: 5.4.5 packages/core: dependencies: @@ -113,17 +113,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.6 - version: 20.12.6 + specifier: ^20.12.7 + version: 20.12.7 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) typescript: - specifier: ^5.4.4 - version: 5.4.4 + specifier: ^5.4.5 + version: 5.4.5 packages/create-solid: devDependencies: @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.12.6 - version: 20.12.6 + specifier: ^20.12.7 + version: 20.12.7 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -147,19 +147,19 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) typescript: - specifier: ^5.4.4 - version: 5.4.4 + specifier: ^5.4.5 + version: 5.4.5 packages/reactivity: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) typescript: - specifier: ^5.4.4 - version: 5.4.4 + specifier: ^5.4.5 + version: 5.4.5 packages/swc-plugin-solid-cli: {} @@ -182,14 +182,14 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.12.6 - version: 20.12.6 + specifier: 20.12.7 + version: 20.12.7 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) typescript: - specifier: ^5.4.4 - version: 5.4.4 + specifier: ^5.4.5 + version: 5.4.5 packages/utils: dependencies: @@ -222,20 +222,20 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.12.6 - version: 20.12.6 + specifier: 20.12.7 + version: 20.12.7 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.4) + version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) typescript: - specifier: ^5.4.4 - version: 5.4.4 + specifier: ^5.4.5 + version: 5.4.5 vitest: - specifier: ^1.4.0 - version: 1.4.0(@types/node@20.12.6) + specifier: ^1.5.0 + version: 1.5.0(@types/node@20.12.7) packages: @@ -269,10 +269,10 @@ packages: regenerator-runtime: 0.14.1 dev: true - /@begit/core@0.0.14: - resolution: {integrity: sha512-JdS9oiGi3ovrzF+8e/5jU9gRZlhhnt0oOf5G+ixfEt9CK37EMkhdRTg1LOJtRfQlbs6igpo0D5HXEvVqMZrV/A==} + /@begit/core@0.0.15: + resolution: {integrity: sha512-MbHsF4lhhfz09ZefjBGk+oXnkq/bpQ5fmu/xg8teTO1ELViaBRFo3oI5BZAyYHc+1q3kS93zVxTipGS7HtSscA==} dependencies: - tar: 6.2.1 + tar: 7.0.0 dev: false /@changesets/apply-release-plan@7.0.0: @@ -509,15 +509,6 @@ packages: bundledDependencies: - is-unicode-supported - /@esbuild/aix-ppc64@0.19.12: - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - requiresBuild: true - dev: true - optional: true - /@esbuild/aix-ppc64@0.20.2: resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} engines: {node: '>=12'} @@ -527,15 +518,6 @@ packages: dev: true optional: true - /@esbuild/android-arm64@0.19.12: - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm64@0.19.9: resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==} engines: {node: '>=12'} @@ -554,15 +536,6 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.19.12: - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.19.9: resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==} engines: {node: '>=12'} @@ -581,15 +554,6 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.19.12: - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-x64@0.19.9: resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==} engines: {node: '>=12'} @@ -608,15 +572,6 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.19.12: - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-arm64@0.19.9: resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==} engines: {node: '>=12'} @@ -635,15 +590,6 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.19.12: - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-x64@0.19.9: resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==} engines: {node: '>=12'} @@ -662,15 +608,6 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.19.12: - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-arm64@0.19.9: resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==} engines: {node: '>=12'} @@ -689,15 +626,6 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.19.12: - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-x64@0.19.9: resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==} engines: {node: '>=12'} @@ -716,15 +644,6 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.19.12: - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm64@0.19.9: resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==} engines: {node: '>=12'} @@ -743,15 +662,6 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.19.12: - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm@0.19.9: resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==} engines: {node: '>=12'} @@ -770,15 +680,6 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.19.12: - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ia32@0.19.9: resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==} engines: {node: '>=12'} @@ -797,15 +698,6 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.19.12: - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.19.9: resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==} engines: {node: '>=12'} @@ -824,15 +716,6 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.19.12: - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-mips64el@0.19.9: resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==} engines: {node: '>=12'} @@ -851,15 +734,6 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.19.12: - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ppc64@0.19.9: resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==} engines: {node: '>=12'} @@ -878,15 +752,6 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.19.12: - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-riscv64@0.19.9: resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==} engines: {node: '>=12'} @@ -905,15 +770,6 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.19.12: - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-s390x@0.19.9: resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==} engines: {node: '>=12'} @@ -932,15 +788,6 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.19.12: - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-x64@0.19.9: resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==} engines: {node: '>=12'} @@ -959,15 +806,6 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.19.12: - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/netbsd-x64@0.19.9: resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==} engines: {node: '>=12'} @@ -986,15 +824,6 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.19.12: - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/openbsd-x64@0.19.9: resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==} engines: {node: '>=12'} @@ -1013,15 +842,6 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.19.12: - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - /@esbuild/sunos-x64@0.19.9: resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==} engines: {node: '>=12'} @@ -1040,15 +860,6 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.19.12: - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-arm64@0.19.9: resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==} engines: {node: '>=12'} @@ -1067,15 +878,6 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.19.12: - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-ia32@0.19.9: resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==} engines: {node: '>=12'} @@ -1094,15 +896,6 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.19.12: - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-x64@0.19.9: resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==} engines: {node: '>=12'} @@ -1132,6 +925,13 @@ packages: wrap-ansi: 8.1.0 wrap-ansi-cjs: /wrap-ansi@7.0.0 + /@isaacs/fs-minipass@4.0.0: + resolution: {integrity: sha512-S00nN1Qt3z3dSP6Db45fj/mksrAq5XWNIJ/SWXGP8XPT2jrzEuYRCSEx08JpJwBcG2F1xgiOtBMGDU0AZHmxew==} + engines: {node: '>=18.0.0'} + dependencies: + minipass: 7.0.4 + dev: false + /@jest/schemas@29.6.3: resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} @@ -1218,14 +1018,6 @@ packages: requiresBuild: true optional: true - /@rollup/rollup-android-arm-eabi@4.12.0: - resolution: {integrity: sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-android-arm-eabi@4.13.0: resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} cpu: [arm] @@ -1242,14 +1034,6 @@ packages: dev: true optional: true - /@rollup/rollup-android-arm64@4.12.0: - resolution: {integrity: sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-android-arm64@4.13.0: resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} cpu: [arm64] @@ -1266,14 +1050,6 @@ packages: dev: true optional: true - /@rollup/rollup-darwin-arm64@4.12.0: - resolution: {integrity: sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-darwin-arm64@4.13.0: resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} cpu: [arm64] @@ -1290,14 +1066,6 @@ packages: dev: true optional: true - /@rollup/rollup-darwin-x64@4.12.0: - resolution: {integrity: sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-darwin-x64@4.13.0: resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} cpu: [x64] @@ -1314,14 +1082,6 @@ packages: dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.12.0: - resolution: {integrity: sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.13.0: resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} cpu: [arm] @@ -1338,14 +1098,6 @@ packages: dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.12.0: - resolution: {integrity: sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm64-gnu@4.13.0: resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} cpu: [arm64] @@ -1362,14 +1114,6 @@ packages: dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.12.0: - resolution: {integrity: sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm64-musl@4.13.0: resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} cpu: [arm64] @@ -1386,14 +1130,6 @@ packages: dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.12.0: - resolution: {integrity: sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-riscv64-gnu@4.13.0: resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} cpu: [riscv64] @@ -1410,14 +1146,6 @@ packages: dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.12.0: - resolution: {integrity: sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-x64-gnu@4.13.0: resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} cpu: [x64] @@ -1434,14 +1162,6 @@ packages: dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.12.0: - resolution: {integrity: sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-x64-musl@4.13.0: resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} cpu: [x64] @@ -1458,14 +1178,6 @@ packages: dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.12.0: - resolution: {integrity: sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-arm64-msvc@4.13.0: resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} cpu: [arm64] @@ -1482,14 +1194,6 @@ packages: dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.12.0: - resolution: {integrity: sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-ia32-msvc@4.13.0: resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} cpu: [ia32] @@ -1506,14 +1210,6 @@ packages: dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.12.0: - resolution: {integrity: sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-x64-msvc@4.13.0: resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} cpu: [x64] @@ -1656,8 +1352,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: true - /@types/node@20.12.6: - resolution: {integrity: sha512-3KurE8taB8GCvZBPngVbp0lk5CKi8M9f9k1rsADh0Evdz5SzJ+Q+Hx9uHoFGsLnLnd1xmkDQr2hVhlA0Mn0lKQ==} + /@types/node@20.12.7: + resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==} dependencies: undici-types: 5.26.5 dev: true @@ -1670,38 +1366,38 @@ packages: resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} dev: true - /@vitest/expect@1.4.0: - resolution: {integrity: sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==} + /@vitest/expect@1.5.0: + resolution: {integrity: sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==} dependencies: - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 + '@vitest/spy': 1.5.0 + '@vitest/utils': 1.5.0 chai: 4.4.1 dev: true - /@vitest/runner@1.4.0: - resolution: {integrity: sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==} + /@vitest/runner@1.5.0: + resolution: {integrity: sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==} dependencies: - '@vitest/utils': 1.4.0 + '@vitest/utils': 1.5.0 p-limit: 5.0.0 pathe: 1.1.2 dev: true - /@vitest/snapshot@1.4.0: - resolution: {integrity: sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==} + /@vitest/snapshot@1.5.0: + resolution: {integrity: sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==} dependencies: - magic-string: 0.30.7 + magic-string: 0.30.8 pathe: 1.1.2 pretty-format: 29.7.0 dev: true - /@vitest/spy@1.4.0: - resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==} + /@vitest/spy@1.5.0: + resolution: {integrity: sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==} dependencies: tinyspy: 2.2.0 dev: true - /@vitest/utils@1.4.0: - resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==} + /@vitest/utils@1.5.0: + resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==} dependencies: diff-sequences: 29.6.3 estree-walker: 3.0.3 @@ -1978,9 +1674,9 @@ packages: fsevents: 2.3.3 dev: true - /chownr@2.0.0: - resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} - engines: {node: '>=10'} + /chownr@3.0.0: + resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} + engines: {node: '>=18'} dev: false /ci-info@3.9.0: @@ -2312,37 +2008,6 @@ packages: is-symbol: 1.0.4 dev: true - /esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 - dev: true - /esbuild@0.19.9: resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} engines: {node: '>=12'} @@ -2546,13 +2211,6 @@ packages: universalify: 0.1.2 dev: true - /fs-minipass@2.1.0: - resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} - engines: {node: '>= 8'} - dependencies: - minipass: 3.3.6 - dev: false - /fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} @@ -3067,13 +2725,6 @@ packages: yallist: 4.0.0 dev: true - /magic-string@0.30.7: - resolution: {integrity: sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /magic-string@0.30.8: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} @@ -3171,23 +2822,21 @@ packages: kind-of: 6.0.3 dev: true - /minipass@3.3.6: - resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} - engines: {node: '>=8'} - dependencies: - yallist: 4.0.0 - dev: false - /minipass@5.0.0: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - /minizlib@2.1.2: - resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} - engines: {node: '>= 8'} + /minipass@7.0.4: + resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + engines: {node: '>=16 || 14 >=14.17'} + dev: false + + /minizlib@3.0.1: + resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} + engines: {node: '>= 18'} dependencies: - minipass: 3.3.6 - yallist: 4.0.0 + minipass: 7.0.4 + rimraf: 5.0.5 dev: false /mixme@0.5.10: @@ -3195,8 +2844,8 @@ packages: engines: {node: '>= 8.0.0'} dev: true - /mkdirp@1.0.4: - resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==} + /mkdirp@3.0.1: + resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} hasBin: true dev: false @@ -3474,24 +3123,6 @@ packages: yaml: 2.3.2 dev: true - /postcss@8.4.35: - resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.0.2 - dev: true - - /postcss@8.4.36: - resolution: {integrity: sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.1.0 - dev: true - /postcss@8.4.38: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} @@ -3644,28 +3275,13 @@ packages: engines: {iojs: '>=1.0.0', node: '>=0.10.0'} dev: true - /rollup@4.12.0: - resolution: {integrity: sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} + /rimraf@5.0.5: + resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} + engines: {node: '>=14'} hasBin: true dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.12.0 - '@rollup/rollup-android-arm64': 4.12.0 - '@rollup/rollup-darwin-arm64': 4.12.0 - '@rollup/rollup-darwin-x64': 4.12.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.12.0 - '@rollup/rollup-linux-arm64-gnu': 4.12.0 - '@rollup/rollup-linux-arm64-musl': 4.12.0 - '@rollup/rollup-linux-riscv64-gnu': 4.12.0 - '@rollup/rollup-linux-x64-gnu': 4.12.0 - '@rollup/rollup-linux-x64-musl': 4.12.0 - '@rollup/rollup-win32-arm64-msvc': 4.12.0 - '@rollup/rollup-win32-ia32-msvc': 4.12.0 - '@rollup/rollup-win32-x64-msvc': 4.12.0 - fsevents: 2.3.3 - dev: true + glob: 10.3.10 + dev: false /rollup@4.13.0: resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} @@ -3856,16 +3472,6 @@ packages: engines: {node: '>= 18', pnpm: '>= 8'} dev: false - /source-map-js@1.0.2: - resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} - engines: {node: '>=0.10.0'} - dev: true - - /source-map-js@1.1.0: - resolution: {integrity: sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==} - engines: {node: '>=0.10.0'} - dev: true - /source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} @@ -4037,16 +3643,16 @@ packages: engines: {node: '>= 0.4'} dev: true - /tar@6.2.1: - resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==} - engines: {node: '>=10'} + /tar@7.0.0: + resolution: {integrity: sha512-spRiR+tDOVD01YeeWBUbNa6HoQErjztT2BXxZWmxJDgaCVgZMO1RAoeKpybiUbr8FxKsUm/svtiEyIRZeWYhAw==} + engines: {node: '>=18'} dependencies: - chownr: 2.0.0 - fs-minipass: 2.1.0 + '@isaacs/fs-minipass': 4.0.0 + chownr: 3.0.0 minipass: 5.0.0 - minizlib: 2.1.2 - mkdirp: 1.0.4 - yallist: 4.0.0 + minizlib: 3.0.1 + mkdirp: 3.0.1 + yallist: 5.0.0 dev: false /term-size@2.2.1: @@ -4081,8 +3687,8 @@ packages: resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} dev: true - /tinypool@0.8.2: - resolution: {integrity: sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==} + /tinypool@0.8.3: + resolution: {integrity: sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==} engines: {node: '>=14.0.0'} dev: true @@ -4131,7 +3737,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.13)(typescript@5.4.4): + /tsup@8.0.2(@swc/core@1.4.13)(typescript@5.4.5): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -4165,7 +3771,7 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 - typescript: 5.4.4 + typescript: 5.4.5 transitivePeerDependencies: - supports-color - ts-node @@ -4309,8 +3915,8 @@ packages: possible-typed-array-names: 1.0.0 dev: true - /typescript@5.4.4: - resolution: {integrity: sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==} + /typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -4348,29 +3954,8 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-node@1.4.0: - resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - dependencies: - cac: 6.7.14 - debug: 4.3.4(supports-color@5.5.0) - pathe: 1.1.2 - picocolors: 1.0.0 - vite: 5.2.4 - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vite-node@1.4.0(@types/node@20.12.6): - resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} + /vite-node@1.5.0(@types/node@20.12.7): + resolution: {integrity: sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true dependencies: @@ -4378,7 +3963,7 @@ packages: debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.1.4(@types/node@20.12.6) + vite: 5.2.4(@types/node@20.12.7) transitivePeerDependencies: - '@types/node' - less @@ -4390,79 +3975,7 @@ packages: - terser dev: true - /vite@5.1.4(@types/node@20.12.6): - resolution: {integrity: sha512-n+MPqzq+d9nMVTKyewqw6kSt+R3CkvF9QAKY8obiQn8g1fwTscKxyfaYnC632HtBXAQGc1Yjomphwn1dtwGAHg==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.12.6 - esbuild: 0.19.12 - postcss: 8.4.35 - rollup: 4.12.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /vite@5.1.6(@types/node@20.12.6): - resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.12.6 - esbuild: 0.19.12 - postcss: 8.4.36 - rollup: 4.13.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /vite@5.2.4: + /vite@5.2.4(@types/node@20.12.7): resolution: {integrity: sha512-vjFghvHWidBTinu5TCymJk/lRHlR5ljqB83yugr0HA1xspUPdOZHqbqDLnZ8f9/jINrtFHTCYYyIUi+o+Q5iyg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -4490,6 +4003,7 @@ packages: terser: optional: true dependencies: + '@types/node': 20.12.7 esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.13.0 @@ -4497,15 +4011,15 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.4.0: - resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} + /vitest@1.5.0(@types/node@20.12.7): + resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.4.0 - '@vitest/ui': 1.4.0 + '@vitest/browser': 1.5.0 + '@vitest/ui': 1.5.0 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -4522,11 +4036,12 @@ packages: jsdom: optional: true dependencies: - '@vitest/expect': 1.4.0 - '@vitest/runner': 1.4.0 - '@vitest/snapshot': 1.4.0 - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 + '@types/node': 20.12.7 + '@vitest/expect': 1.5.0 + '@vitest/runner': 1.5.0 + '@vitest/snapshot': 1.5.0 + '@vitest/spy': 1.5.0 + '@vitest/utils': 1.5.0 acorn-walk: 8.3.2 chai: 4.4.1 debug: 4.3.4(supports-color@5.5.0) @@ -4538,65 +4053,9 @@ packages: std-env: 3.7.0 strip-literal: 2.0.0 tinybench: 2.6.0 - tinypool: 0.8.2 - vite: 5.2.4 - vite-node: 1.4.0 - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vitest@1.4.0(@types/node@20.12.6): - resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.4.0 - '@vitest/ui': 1.4.0 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - dependencies: - '@types/node': 20.12.6 - '@vitest/expect': 1.4.0 - '@vitest/runner': 1.4.0 - '@vitest/snapshot': 1.4.0 - '@vitest/spy': 1.4.0 - '@vitest/utils': 1.4.0 - acorn-walk: 8.3.2 - chai: 4.4.1 - debug: 4.3.4(supports-color@5.5.0) - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.8 - pathe: 1.1.2 - picocolors: 1.0.0 - std-env: 3.7.0 - strip-literal: 2.0.0 - tinybench: 2.6.0 - tinypool: 0.8.2 - vite: 5.1.6(@types/node@20.12.6) - vite-node: 1.4.0(@types/node@20.12.6) + tinypool: 0.8.3 + vite: 5.2.4(@types/node@20.12.7) + vite-node: 1.5.0(@types/node@20.12.7) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -4726,6 +4185,12 @@ packages: /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + dev: true + + /yallist@5.0.0: + resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} + engines: {node: '>=18'} + dev: false /yaml@2.3.2: resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} From ea7335e56866779975dcb3f2e2954bb0db6b0149 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:46:37 +0100 Subject: [PATCH 088/290] Update docs deps --- docs/package.json | 4 +- docs/pnpm-lock.yaml | 370 ++++++++++++++++++++++---------------------- 2 files changed, 187 insertions(+), 187 deletions(-) diff --git a/docs/package.json b/docs/package.json index a39d338..fc7fb0a 100644 --- a/docs/package.json +++ b/docs/package.json @@ -8,8 +8,8 @@ }, "devDependencies": { "flexsearch": "^0.7.43", - "vitepress": "1.0.0-rc.45", + "vitepress": "1.1.3", "vitepress-plugin-search": "1.0.4-alpha.22", - "vue": "^3.4.21" + "vue": "^3.4.23" } } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 56d7d4f..37323a0 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -12,14 +12,14 @@ importers: specifier: ^0.7.43 version: 0.7.43 vitepress: - specifier: 1.0.0-rc.45 - version: 1.0.0-rc.45(@algolia/client-search@4.22.1)(search-insights@2.13.0) + specifier: 1.1.3 + version: 1.1.3(@algolia/client-search@4.22.1)(search-insights@2.13.0) vitepress-plugin-search: specifier: 1.0.4-alpha.22 - version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.45)(vue@3.4.21) + version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.1.3)(vue@3.4.23) vue: - specifier: ^3.4.21 - version: 3.4.21 + specifier: ^3.4.23 + version: 3.4.23 packages: @@ -167,8 +167,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/parser@7.24.0: - resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==} + /@babel/parser@7.24.4: + resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==} engines: {node: '>=6.0.0'} hasBin: true dependencies: @@ -227,8 +227,8 @@ packages: - '@algolia/client-search' dev: true - /@esbuild/aix-ppc64@0.19.12: - resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==} + /@esbuild/aix-ppc64@0.20.2: + resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} engines: {node: '>=12'} cpu: [ppc64] os: [aix] @@ -236,8 +236,8 @@ packages: dev: true optional: true - /@esbuild/android-arm64@0.19.12: - resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==} + /@esbuild/android-arm64@0.20.2: + resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -245,8 +245,8 @@ packages: dev: true optional: true - /@esbuild/android-arm@0.19.12: - resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==} + /@esbuild/android-arm@0.20.2: + resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -254,8 +254,8 @@ packages: dev: true optional: true - /@esbuild/android-x64@0.19.12: - resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==} + /@esbuild/android-x64@0.20.2: + resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -263,8 +263,8 @@ packages: dev: true optional: true - /@esbuild/darwin-arm64@0.19.12: - resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==} + /@esbuild/darwin-arm64@0.20.2: + resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -272,8 +272,8 @@ packages: dev: true optional: true - /@esbuild/darwin-x64@0.19.12: - resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==} + /@esbuild/darwin-x64@0.20.2: + resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -281,8 +281,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-arm64@0.19.12: - resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==} + /@esbuild/freebsd-arm64@0.20.2: + resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -290,8 +290,8 @@ packages: dev: true optional: true - /@esbuild/freebsd-x64@0.19.12: - resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==} + /@esbuild/freebsd-x64@0.20.2: + resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -299,8 +299,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm64@0.19.12: - resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==} + /@esbuild/linux-arm64@0.20.2: + resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -308,8 +308,8 @@ packages: dev: true optional: true - /@esbuild/linux-arm@0.19.12: - resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==} + /@esbuild/linux-arm@0.20.2: + resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -317,8 +317,8 @@ packages: dev: true optional: true - /@esbuild/linux-ia32@0.19.12: - resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==} + /@esbuild/linux-ia32@0.20.2: + resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -326,8 +326,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64@0.19.12: - resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==} + /@esbuild/linux-loong64@0.20.2: + resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -335,8 +335,8 @@ packages: dev: true optional: true - /@esbuild/linux-mips64el@0.19.12: - resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==} + /@esbuild/linux-mips64el@0.20.2: + resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -344,8 +344,8 @@ packages: dev: true optional: true - /@esbuild/linux-ppc64@0.19.12: - resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==} + /@esbuild/linux-ppc64@0.20.2: + resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -353,8 +353,8 @@ packages: dev: true optional: true - /@esbuild/linux-riscv64@0.19.12: - resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==} + /@esbuild/linux-riscv64@0.20.2: + resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -362,8 +362,8 @@ packages: dev: true optional: true - /@esbuild/linux-s390x@0.19.12: - resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==} + /@esbuild/linux-s390x@0.20.2: + resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -371,8 +371,8 @@ packages: dev: true optional: true - /@esbuild/linux-x64@0.19.12: - resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==} + /@esbuild/linux-x64@0.20.2: + resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -380,8 +380,8 @@ packages: dev: true optional: true - /@esbuild/netbsd-x64@0.19.12: - resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==} + /@esbuild/netbsd-x64@0.20.2: + resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -389,8 +389,8 @@ packages: dev: true optional: true - /@esbuild/openbsd-x64@0.19.12: - resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==} + /@esbuild/openbsd-x64@0.20.2: + resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -398,8 +398,8 @@ packages: dev: true optional: true - /@esbuild/sunos-x64@0.19.12: - resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==} + /@esbuild/sunos-x64@0.20.2: + resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -407,8 +407,8 @@ packages: dev: true optional: true - /@esbuild/win32-arm64@0.19.12: - resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==} + /@esbuild/win32-arm64@0.20.2: + resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -416,8 +416,8 @@ packages: dev: true optional: true - /@esbuild/win32-ia32@0.19.12: - resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==} + /@esbuild/win32-ia32@0.20.2: + resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -425,8 +425,8 @@ packages: dev: true optional: true - /@esbuild/win32-x64@0.19.12: - resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==} + /@esbuild/win32-x64@0.20.2: + resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -542,14 +542,14 @@ packages: dev: true optional: true - /@shikijs/core@1.2.0: - resolution: {integrity: sha512-OlFvx+nyr5C8zpcMBnSGir0YPD6K11uYhouqhNmm1qLiis4GA7SsGtu07r9gKS9omks8RtQqHrJL4S+lqWK01A==} + /@shikijs/core@1.3.0: + resolution: {integrity: sha512-7fedsBfuILDTBmrYZNFI8B6ATTxhQAasUHllHmjvSZPnoq4bULWoTpHwmuQvZ8Aq03/tAa2IGo6RXqWtHdWaCA==} dev: true - /@shikijs/transformers@1.2.0: - resolution: {integrity: sha512-xKn7DtA65DQV4FOfYsrvqM80xOy2xuXnxWWKsZmHv1VII/IOuDUDsWDu3KnpeLH6wqNJWp1GRoNUsHR1aw/VhQ==} + /@shikijs/transformers@1.3.0: + resolution: {integrity: sha512-3mlpg2I9CjhjE96dEWQOGeCWoPcyTov3s4aAsHmgvnTHa8MBknEnCQy8/xivJPSpD+olqOqIEoHnLfbNJK29AA==} dependencies: - shiki: 1.2.0 + shiki: 1.3.0 dev: true /@types/estree@1.0.5: @@ -571,8 +571,8 @@ packages: '@types/mdurl': 1.0.5 dev: true - /@types/markdown-it@13.0.7: - resolution: {integrity: sha512-U/CBi2YUUcTHBt5tjO2r5QV/x0Po6nsYwQU4Y04fBS6vfoImaiZ6f8bi3CjTCxBPQSO1LMyUqkByzi8AidyxfA==} + /@types/markdown-it@14.0.1: + resolution: {integrity: sha512-6WfOG3jXR78DW8L5cTYCVVGAsIFZskRHCDo5tbqa+qtKVt4oDRVH7hyIWu1SpDQJlmIoEivNQZ5h+AGAOrgOtQ==} dependencies: '@types/linkify-it': 3.0.5 '@types/mdurl': 1.0.5 @@ -586,130 +586,130 @@ packages: resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} dev: true - /@vitejs/plugin-vue@5.0.4(vite@5.1.6)(vue@3.4.21): + /@vitejs/plugin-vue@5.0.4(vite@5.2.10)(vue@3.4.23): resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: vite: ^5.0.0 vue: ^3.2.25 dependencies: - vite: 5.1.6 - vue: 3.4.21 + vite: 5.2.10 + vue: 3.4.23 dev: true - /@vue/compiler-core@3.4.21: - resolution: {integrity: sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==} + /@vue/compiler-core@3.4.23: + resolution: {integrity: sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==} dependencies: - '@babel/parser': 7.24.0 - '@vue/shared': 3.4.21 + '@babel/parser': 7.24.4 + '@vue/shared': 3.4.23 entities: 4.5.0 estree-walker: 2.0.2 - source-map-js: 1.1.0 + source-map-js: 1.2.0 dev: true - /@vue/compiler-dom@3.4.21: - resolution: {integrity: sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==} + /@vue/compiler-dom@3.4.23: + resolution: {integrity: sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==} dependencies: - '@vue/compiler-core': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/compiler-core': 3.4.23 + '@vue/shared': 3.4.23 dev: true - /@vue/compiler-sfc@3.4.21: - resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==} + /@vue/compiler-sfc@3.4.23: + resolution: {integrity: sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==} dependencies: - '@babel/parser': 7.24.0 - '@vue/compiler-core': 3.4.21 - '@vue/compiler-dom': 3.4.21 - '@vue/compiler-ssr': 3.4.21 - '@vue/shared': 3.4.21 + '@babel/parser': 7.24.4 + '@vue/compiler-core': 3.4.23 + '@vue/compiler-dom': 3.4.23 + '@vue/compiler-ssr': 3.4.23 + '@vue/shared': 3.4.23 estree-walker: 2.0.2 magic-string: 0.30.8 - postcss: 8.4.36 - source-map-js: 1.1.0 + postcss: 8.4.38 + source-map-js: 1.2.0 dev: true - /@vue/compiler-ssr@3.4.21: - resolution: {integrity: sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==} + /@vue/compiler-ssr@3.4.23: + resolution: {integrity: sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==} dependencies: - '@vue/compiler-dom': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/compiler-dom': 3.4.23 + '@vue/shared': 3.4.23 dev: true - /@vue/devtools-api@7.0.18(vue@3.4.21): - resolution: {integrity: sha512-rNLQ8A2eGmaXAen/xARLY6MVz7tzXFTDlrWJrpTD1VSU7vqmBn9qPIPjRkCdb8/2/En6RGsRebNSqfqh1Ck4pg==} + /@vue/devtools-api@7.0.27(vue@3.4.23): + resolution: {integrity: sha512-BFCFCusSDcw2UcOFD/QeK7OxD1x2C/m+uAN30Q7jLKECSW53hmz0urzJmX834GuWDZX/hIxkyUKnLLfEIP1c/w==} dependencies: - '@vue/devtools-kit': 7.0.18(vue@3.4.21) + '@vue/devtools-kit': 7.0.27(vue@3.4.23) transitivePeerDependencies: - vue dev: true - /@vue/devtools-kit@7.0.18(vue@3.4.21): - resolution: {integrity: sha512-sLq9GZgoMG2/yb6HOjXE5PzHplV7+Xy3QvMo9Kz43Hhj0B0S0LYfk0EBdU5yZ84JRlH1LhJCp65y0L+NLbK09A==} + /@vue/devtools-kit@7.0.27(vue@3.4.23): + resolution: {integrity: sha512-/A5xM38pPCFX5Yhl/lRFAzjyK6VNsH670nww2WbjFKWqlu3I+lMxWKzQkCW6A1V8bduITgl2kHORfg2gTw6QaA==} peerDependencies: vue: ^3.0.0 dependencies: - '@vue/devtools-shared': 7.0.18 + '@vue/devtools-shared': 7.0.27 hookable: 5.5.3 mitt: 3.0.1 perfect-debounce: 1.0.0 speakingurl: 14.0.1 - vue: 3.4.21 + vue: 3.4.23 dev: true - /@vue/devtools-shared@7.0.18: - resolution: {integrity: sha512-j06/+32P+Uy39hT7g5MGNEkg2nY2DZJxpSnIxz+POm5FDkqT3o4jPsk3TAsKD15C4RoVasd0xIScU6Xf3Hf5aA==} + /@vue/devtools-shared@7.0.27: + resolution: {integrity: sha512-4VxtmZ6yjhiSloqZZq2UYU0TBGxOJ8GxWvp5OlAH70zYqi0FIAyWGPkOhvfoZ7DKQyv2UU0mmKzFHjsEkelGyQ==} dependencies: rfdc: 1.3.1 dev: true - /@vue/reactivity@3.4.21: - resolution: {integrity: sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==} + /@vue/reactivity@3.4.23: + resolution: {integrity: sha512-GlXR9PL+23fQ3IqnbSQ8OQKLodjqCyoCrmdLKZk3BP7jN6prWheAfU7a3mrltewTkoBm+N7qMEb372VHIkQRMQ==} dependencies: - '@vue/shared': 3.4.21 + '@vue/shared': 3.4.23 dev: true - /@vue/runtime-core@3.4.21: - resolution: {integrity: sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==} + /@vue/runtime-core@3.4.23: + resolution: {integrity: sha512-FeQ9MZEXoFzFkFiw9MQQ/FWs3srvrP+SjDKSeRIiQHIhtkzoj0X4rWQlRNHbGuSwLra6pMyjAttwixNMjc/xLw==} dependencies: - '@vue/reactivity': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/reactivity': 3.4.23 + '@vue/shared': 3.4.23 dev: true - /@vue/runtime-dom@3.4.21: - resolution: {integrity: sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==} + /@vue/runtime-dom@3.4.23: + resolution: {integrity: sha512-RXJFwwykZWBkMiTPSLEWU3kgVLNAfActBfWFlZd0y79FTUxexogd0PLG4HH2LfOktjRxV47Nulygh0JFXe5f9A==} dependencies: - '@vue/runtime-core': 3.4.21 - '@vue/shared': 3.4.21 + '@vue/runtime-core': 3.4.23 + '@vue/shared': 3.4.23 csstype: 3.1.3 dev: true - /@vue/server-renderer@3.4.21(vue@3.4.21): - resolution: {integrity: sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==} + /@vue/server-renderer@3.4.23(vue@3.4.23): + resolution: {integrity: sha512-LDwGHtnIzvKFNS8dPJ1SSU5Gvm36p2ck8wCZc52fc3k/IfjKcwCyrWEf0Yag/2wTFUBXrqizfhK9c/mC367dXQ==} peerDependencies: - vue: 3.4.21 + vue: 3.4.23 dependencies: - '@vue/compiler-ssr': 3.4.21 - '@vue/shared': 3.4.21 - vue: 3.4.21 + '@vue/compiler-ssr': 3.4.23 + '@vue/shared': 3.4.23 + vue: 3.4.23 dev: true - /@vue/shared@3.4.21: - resolution: {integrity: sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==} + /@vue/shared@3.4.23: + resolution: {integrity: sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==} dev: true - /@vueuse/core@10.9.0(vue@3.4.21): + /@vueuse/core@10.9.0(vue@3.4.23): resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==} dependencies: '@types/web-bluetooth': 0.0.20 '@vueuse/metadata': 10.9.0 - '@vueuse/shared': 10.9.0(vue@3.4.21) - vue-demi: 0.14.7(vue@3.4.21) + '@vueuse/shared': 10.9.0(vue@3.4.23) + vue-demi: 0.14.7(vue@3.4.23) transitivePeerDependencies: - '@vue/composition-api' - vue dev: true - /@vueuse/integrations@10.9.0(focus-trap@7.5.4)(vue@3.4.21): + /@vueuse/integrations@10.9.0(focus-trap@7.5.4)(vue@3.4.23): resolution: {integrity: sha512-acK+A01AYdWSvL4BZmCoJAcyHJ6EqhmkQEXbQLwev1MY7NBnS+hcEMx/BzVoR9zKI+UqEPMD9u6PsyAuiTRT4Q==} peerDependencies: async-validator: '*' @@ -750,10 +750,10 @@ packages: universal-cookie: optional: true dependencies: - '@vueuse/core': 10.9.0(vue@3.4.21) - '@vueuse/shared': 10.9.0(vue@3.4.21) + '@vueuse/core': 10.9.0(vue@3.4.23) + '@vueuse/shared': 10.9.0(vue@3.4.23) focus-trap: 7.5.4 - vue-demi: 0.14.7(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.23) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -763,10 +763,10 @@ packages: resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==} dev: true - /@vueuse/shared@10.9.0(vue@3.4.21): + /@vueuse/shared@10.9.0(vue@3.4.23): resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} dependencies: - vue-demi: 0.14.7(vue@3.4.21) + vue-demi: 0.14.7(vue@3.4.23) transitivePeerDependencies: - '@vue/composition-api' - vue @@ -809,35 +809,35 @@ packages: engines: {node: '>=0.12'} dev: true - /esbuild@0.19.12: - resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==} + /esbuild@0.20.2: + resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/aix-ppc64': 0.19.12 - '@esbuild/android-arm': 0.19.12 - '@esbuild/android-arm64': 0.19.12 - '@esbuild/android-x64': 0.19.12 - '@esbuild/darwin-arm64': 0.19.12 - '@esbuild/darwin-x64': 0.19.12 - '@esbuild/freebsd-arm64': 0.19.12 - '@esbuild/freebsd-x64': 0.19.12 - '@esbuild/linux-arm': 0.19.12 - '@esbuild/linux-arm64': 0.19.12 - '@esbuild/linux-ia32': 0.19.12 - '@esbuild/linux-loong64': 0.19.12 - '@esbuild/linux-mips64el': 0.19.12 - '@esbuild/linux-ppc64': 0.19.12 - '@esbuild/linux-riscv64': 0.19.12 - '@esbuild/linux-s390x': 0.19.12 - '@esbuild/linux-x64': 0.19.12 - '@esbuild/netbsd-x64': 0.19.12 - '@esbuild/openbsd-x64': 0.19.12 - '@esbuild/sunos-x64': 0.19.12 - '@esbuild/win32-arm64': 0.19.12 - '@esbuild/win32-ia32': 0.19.12 - '@esbuild/win32-x64': 0.19.12 + '@esbuild/aix-ppc64': 0.20.2 + '@esbuild/android-arm': 0.20.2 + '@esbuild/android-arm64': 0.20.2 + '@esbuild/android-x64': 0.20.2 + '@esbuild/darwin-arm64': 0.20.2 + '@esbuild/darwin-x64': 0.20.2 + '@esbuild/freebsd-arm64': 0.20.2 + '@esbuild/freebsd-x64': 0.20.2 + '@esbuild/linux-arm': 0.20.2 + '@esbuild/linux-arm64': 0.20.2 + '@esbuild/linux-ia32': 0.20.2 + '@esbuild/linux-loong64': 0.20.2 + '@esbuild/linux-mips64el': 0.20.2 + '@esbuild/linux-ppc64': 0.20.2 + '@esbuild/linux-riscv64': 0.20.2 + '@esbuild/linux-s390x': 0.20.2 + '@esbuild/linux-x64': 0.20.2 + '@esbuild/netbsd-x64': 0.20.2 + '@esbuild/openbsd-x64': 0.20.2 + '@esbuild/sunos-x64': 0.20.2 + '@esbuild/win32-arm64': 0.20.2 + '@esbuild/win32-ia32': 0.20.2 + '@esbuild/win32-x64': 0.20.2 dev: true /estree-walker@2.0.2: @@ -924,13 +924,13 @@ packages: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} dev: true - /postcss@8.4.36: - resolution: {integrity: sha512-/n7eumA6ZjFHAsbX30yhHup/IMkOmlmvtEi7P+6RMYf+bGJSUHc3geH4a0NSZxAz/RJfiS9tooCTs9LAVYUZKw==} + /postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.7 picocolors: 1.0.0 - source-map-js: 1.1.0 + source-map-js: 1.2.0 dev: true /preact@10.19.6: @@ -968,14 +968,14 @@ packages: resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} dev: true - /shiki@1.2.0: - resolution: {integrity: sha512-xLhiTMOIUXCv5DqJ4I70GgQCtdlzsTqFLZWcMHHG3TAieBUbvEGthdrlPDlX4mL/Wszx9C6rEcxU6kMlg4YlxA==} + /shiki@1.3.0: + resolution: {integrity: sha512-9aNdQy/etMXctnPzsje1h1XIGm9YfRcSksKOGqZWXA/qP9G18/8fpz5Bjpma8bOgz3tqIpjERAd6/lLjFyzoww==} dependencies: - '@shikijs/core': 1.2.0 + '@shikijs/core': 1.3.0 dev: true - /source-map-js@1.1.0: - resolution: {integrity: sha512-9vC2SfsJzlej6MAaMPLu8HiBSHGdRAJ9hVFYN1ibZoNkeanmDmLUcIrj6G9DGL7XMJ54AKg/G75akXl1/izTOw==} + /source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} dev: true @@ -997,8 +997,8 @@ packages: resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} dev: true - /vite@5.1.6: - resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} + /vite@5.2.10: + resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -1025,14 +1025,14 @@ packages: terser: optional: true dependencies: - esbuild: 0.19.12 - postcss: 8.4.36 + esbuild: 0.20.2 + postcss: 8.4.38 rollup: 4.13.0 optionalDependencies: fsevents: 2.3.3 dev: true - /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.0.0-rc.45)(vue@3.4.21): + /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.1.3)(vue@3.4.23): resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} engines: {node: ^14.13.1 || ^16.7.0 || >=18} peerDependencies: @@ -1045,16 +1045,16 @@ packages: flexsearch: 0.7.43 glob-to-regexp: 0.4.1 markdown-it: 13.0.2 - vitepress: 1.0.0-rc.45(@algolia/client-search@4.22.1)(search-insights@2.13.0) - vue: 3.4.21 + vitepress: 1.1.3(@algolia/client-search@4.22.1)(search-insights@2.13.0) + vue: 3.4.23 dev: true - /vitepress@1.0.0-rc.45(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-/OiYsu5UKpQKA2c0BAZkfyywjfauDjvXyv6Mo4Ra57m5n4Bxg1HgUGoth1CLH2vwUbR/BHvDA9zOM0RDvgeSVQ==} + /vitepress@1.1.3(@algolia/client-search@4.22.1)(search-insights@2.13.0): + resolution: {integrity: sha512-hGrIYN0w9IHWs0NQSnlMjKV/v/HLfD+Ywv5QdvCSkiT32mpNOOwUrZjnqZv/JL/WBPpUc94eghTUvmipxw0xrA==} hasBin: true peerDependencies: - markdown-it-mathjax3: ^4.3.2 - postcss: ^8.4.35 + markdown-it-mathjax3: ^4 + postcss: ^8 peerDependenciesMeta: markdown-it-mathjax3: optional: true @@ -1063,19 +1063,19 @@ packages: dependencies: '@docsearch/css': 3.6.0 '@docsearch/js': 3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0) - '@shikijs/core': 1.2.0 - '@shikijs/transformers': 1.2.0 - '@types/markdown-it': 13.0.7 - '@vitejs/plugin-vue': 5.0.4(vite@5.1.6)(vue@3.4.21) - '@vue/devtools-api': 7.0.18(vue@3.4.21) - '@vueuse/core': 10.9.0(vue@3.4.21) - '@vueuse/integrations': 10.9.0(focus-trap@7.5.4)(vue@3.4.21) + '@shikijs/core': 1.3.0 + '@shikijs/transformers': 1.3.0 + '@types/markdown-it': 14.0.1 + '@vitejs/plugin-vue': 5.0.4(vite@5.2.10)(vue@3.4.23) + '@vue/devtools-api': 7.0.27(vue@3.4.23) + '@vueuse/core': 10.9.0(vue@3.4.23) + '@vueuse/integrations': 10.9.0(focus-trap@7.5.4)(vue@3.4.23) focus-trap: 7.5.4 mark.js: 8.11.1 minisearch: 6.3.0 - shiki: 1.2.0 - vite: 5.1.6 - vue: 3.4.21 + shiki: 1.3.0 + vite: 5.2.10 + vue: 3.4.23 transitivePeerDependencies: - '@algolia/client-search' - '@types/node' @@ -1104,7 +1104,7 @@ packages: - universal-cookie dev: true - /vue-demi@0.14.7(vue@3.4.21): + /vue-demi@0.14.7(vue@3.4.23): resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} engines: {node: '>=12'} hasBin: true @@ -1116,20 +1116,20 @@ packages: '@vue/composition-api': optional: true dependencies: - vue: 3.4.21 + vue: 3.4.23 dev: true - /vue@3.4.21: - resolution: {integrity: sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==} + /vue@3.4.23: + resolution: {integrity: sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@vue/compiler-dom': 3.4.21 - '@vue/compiler-sfc': 3.4.21 - '@vue/runtime-dom': 3.4.21 - '@vue/server-renderer': 3.4.21(vue@3.4.21) - '@vue/shared': 3.4.21 + '@vue/compiler-dom': 3.4.23 + '@vue/compiler-sfc': 3.4.23 + '@vue/runtime-dom': 3.4.23 + '@vue/server-renderer': 3.4.23(vue@3.4.23) + '@vue/shared': 3.4.23 dev: true From 74ebd159316da6afe2cc4905db417c6d4c1bfd00 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 21 Apr 2024 21:48:47 +0100 Subject: [PATCH 089/290] bump deps --- packages/core/package.json | 2 +- packages/utils/package.json | 2 +- pnpm-lock.yaml | 413 +++++++++++++++++++++++++++++------- 3 files changed, 344 insertions(+), 73 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 0dc998d..b940eff 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.13", + "@swc/core": "^1.4.16", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index b653bb2..22354b1 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -76,7 +76,7 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.13", + "@swc/core": "^1.4.16", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 182d20a..31e7879 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,7 +22,7 @@ importers: version: 1.13.2 vitest: specifier: ^1.5.0 - version: 1.5.0(@types/node@20.12.7) + version: 1.5.0 packages/commands: dependencies: @@ -62,7 +62,7 @@ importers: version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -91,8 +91,8 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.13 - version: 1.4.13 + specifier: ^1.4.16 + version: 1.4.16 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -120,7 +120,7 @@ importers: version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -147,7 +147,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -156,7 +156,7 @@ importers: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -186,7 +186,7 @@ importers: version: 20.12.7 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -203,8 +203,8 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.13 - version: 1.4.13 + specifier: ^1.4.16 + version: 1.4.16 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -229,7 +229,7 @@ importers: version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.13)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -262,8 +262,8 @@ packages: picocolors: 1.0.0 dev: true - /@babel/runtime@7.24.1: - resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} + /@babel/runtime@7.24.4: + resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.14.1 @@ -278,7 +278,7 @@ packages: /@changesets/apply-release-plan@7.0.0: resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/config': 3.0.0 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 @@ -296,7 +296,7 @@ packages: /@changesets/assemble-release-plan@6.0.0: resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.0.0 '@changesets/types': 6.0.0 @@ -314,7 +314,7 @@ packages: resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/apply-release-plan': 7.0.0 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 @@ -379,7 +379,7 @@ packages: /@changesets/get-release-plan@4.0.0: resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/assemble-release-plan': 6.0.0 '@changesets/config': 3.0.0 '@changesets/pre': 2.0.0 @@ -395,7 +395,7 @@ packages: /@changesets/git@3.0.0: resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -420,7 +420,7 @@ packages: /@changesets/pre@2.0.0: resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -430,7 +430,7 @@ packages: /@changesets/read@0.6.0: resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/parse': 0.4.0 @@ -451,7 +451,7 @@ packages: /@changesets/write@0.3.0: resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -967,7 +967,7 @@ packages: /@manypkg/find-root@1.1.0: resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 @@ -976,7 +976,7 @@ packages: /@manypkg/get-packages@1.1.3: resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} dependencies: - '@babel/runtime': 7.24.1 + '@babel/runtime': 7.24.4 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -1026,6 +1026,14 @@ packages: dev: true optional: true + /@rollup/rollup-android-arm-eabi@4.16.1: + resolution: {integrity: sha512-92/y0TqNLRYOTXpm6Z7mnpvKAG9P7qmK7yJeRJSdzElNCUnsgbpAsGqerUboYRIQKzgfq4pWu9xVkgpWLfmNsw==} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-android-arm-eabi@4.9.1: resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} cpu: [arm] @@ -1042,6 +1050,14 @@ packages: dev: true optional: true + /@rollup/rollup-android-arm64@4.16.1: + resolution: {integrity: sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-android-arm64@4.9.1: resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} cpu: [arm64] @@ -1058,6 +1074,14 @@ packages: dev: true optional: true + /@rollup/rollup-darwin-arm64@4.16.1: + resolution: {integrity: sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-darwin-arm64@4.9.1: resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} cpu: [arm64] @@ -1074,6 +1098,14 @@ packages: dev: true optional: true + /@rollup/rollup-darwin-x64@4.16.1: + resolution: {integrity: sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-darwin-x64@4.9.1: resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} cpu: [x64] @@ -1090,6 +1122,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm-gnueabihf@4.16.1: + resolution: {integrity: sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm-gnueabihf@4.9.1: resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} cpu: [arm] @@ -1098,6 +1138,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm-musleabihf@4.16.1: + resolution: {integrity: sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-gnu@4.13.0: resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} cpu: [arm64] @@ -1106,6 +1154,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm64-gnu@4.16.1: + resolution: {integrity: sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-gnu@4.9.1: resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} cpu: [arm64] @@ -1122,6 +1178,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-arm64-musl@4.16.1: + resolution: {integrity: sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-arm64-musl@4.9.1: resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} cpu: [arm64] @@ -1130,6 +1194,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-powerpc64le-gnu@4.16.1: + resolution: {integrity: sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-riscv64-gnu@4.13.0: resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} cpu: [riscv64] @@ -1138,6 +1210,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-riscv64-gnu@4.16.1: + resolution: {integrity: sha512-uU8zuGkQfGqfD9w6VRJZI4IuG4JIfNxxJgEmLMAmPVHREKGsxFVfgHy5c6CexQF2vOfgjB33OsET3Vdn2lln9A==} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-riscv64-gnu@4.9.1: resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} cpu: [riscv64] @@ -1146,6 +1226,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-s390x-gnu@4.16.1: + resolution: {integrity: sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-gnu@4.13.0: resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} cpu: [x64] @@ -1154,6 +1242,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-x64-gnu@4.16.1: + resolution: {integrity: sha512-N2ZizKhUryqqrMfdCnjhJhZRgv61C6gK+hwVtCIKC8ts8J+go+vqENnGexwg21nHIOvLN5mBM8a7DI2vlyIOPg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-gnu@4.9.1: resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} cpu: [x64] @@ -1170,6 +1266,14 @@ packages: dev: true optional: true + /@rollup/rollup-linux-x64-musl@4.16.1: + resolution: {integrity: sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-linux-x64-musl@4.9.1: resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} cpu: [x64] @@ -1186,6 +1290,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-arm64-msvc@4.16.1: + resolution: {integrity: sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-arm64-msvc@4.9.1: resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} cpu: [arm64] @@ -1202,6 +1314,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-ia32-msvc@4.16.1: + resolution: {integrity: sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-ia32-msvc@4.9.1: resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} cpu: [ia32] @@ -1218,6 +1338,14 @@ packages: dev: true optional: true + /@rollup/rollup-win32-x64-msvc@4.16.1: + resolution: {integrity: sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /@rollup/rollup-win32-x64-msvc@4.9.1: resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} cpu: [x64] @@ -1230,88 +1358,88 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@swc/core-darwin-arm64@1.4.13: - resolution: {integrity: sha512-36P72FLpm5iq85IvoEjBvi22DiqkkEIanJ1M0E8bkxcFHUbjBrYfPY9T6cpPyK5oQqkaTBvNAc3j1BlVD6IH6w==} + /@swc/core-darwin-arm64@1.4.16: + resolution: {integrity: sha512-UOCcH1GvjRnnM/LWT6VCGpIk0OhHRq6v1U6QXuPt5wVsgXnXQwnf5k3sG5Cm56hQHDvhRPY6HCsHi/p0oek8oQ==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@swc/core-darwin-x64@1.4.13: - resolution: {integrity: sha512-ye7OgKpDdyA8AMIVVdmD1ICDaFXgoEXORnVO8bBHyul0WN71yUBZMX+YxEx2lpWtiftA2vY/1MAuOR80vHkBCw==} + /@swc/core-darwin-x64@1.4.16: + resolution: {integrity: sha512-t3bgqFoYLWvyVtVL6KkFNCINEoOrIlyggT/kJRgi1y0aXSr0oVgcrQ4ezJpdeahZZ4N+Q6vT3ffM30yIunELNA==} engines: {node: '>=10'} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@swc/core-linux-arm-gnueabihf@1.4.13: - resolution: {integrity: sha512-+x593Jlmu4c3lJtZUKRejWpV2MAij1Js5nmQLLdjo6ChR2D4B2rzj3iMiKn5gITew7fraF9t3fvXALdWh7HmUg==} + /@swc/core-linux-arm-gnueabihf@1.4.16: + resolution: {integrity: sha512-DvHuwvEF86YvSd0lwnzVcjOTZ0jcxewIbsN0vc/0fqm9qBdMMjr9ox6VCam1n3yYeRtj4VFgrjeNFksqbUejdQ==} engines: {node: '>=10'} cpu: [arm] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-gnu@1.4.13: - resolution: {integrity: sha512-0x8OVw4dfyNerrs/9eZX9wNnmvwbwXSMCi+LbE6Xt1pXOIwvoLtFIXcV3NsrlkFboO3sr5UAQIwDxKqbIZA9pQ==} + /@swc/core-linux-arm64-gnu@1.4.16: + resolution: {integrity: sha512-9Uu5YlPbyCvbidjKtYEsPpyZlu16roOZ5c2tP1vHfnU9bgf5Tz5q5VovSduNxPHx+ed2iC1b1URODHvDzbbDuQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-arm64-musl@1.4.13: - resolution: {integrity: sha512-Z9c4JiequtZvngPcxbCuAOkmWBxi2vInZbjjhD5I+Q9oiJdXUz1t2USGwsGPS41Xvk1BOA3ecK2Sn1ilY3titg==} + /@swc/core-linux-arm64-musl@1.4.16: + resolution: {integrity: sha512-/YZq/qB1CHpeoL0eMzyqK5/tYZn/rzKoCYDviFU4uduSUIJsDJQuQA/skdqUzqbheOXKAd4mnJ1hT04RbJ8FPQ==} engines: {node: '>=10'} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-gnu@1.4.13: - resolution: {integrity: sha512-ChatHtk+vX0Ke5QG+jO+rIapw/KwZsi9MedCBHFXHH6iWF4z8d51cJeN68ykcn+vAXzjNeFNdlNy5Vbkd1zAqg==} + /@swc/core-linux-x64-gnu@1.4.16: + resolution: {integrity: sha512-UUjaW5VTngZYDcA8yQlrFmqs1tLi1TxbKlnaJwoNhel9zRQ0yG1YEVGrzTvv4YApSuIiDK18t+Ip927bwucuVQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-linux-x64-musl@1.4.13: - resolution: {integrity: sha512-0Pz39YR530mXpsztwQkmEKdkkZy4fY4Smdh4pkm6Ly8Nndyo0te/l4bcAGqN24Jp7aVwF/QSy14SAtw4HRjU9g==} + /@swc/core-linux-x64-musl@1.4.16: + resolution: {integrity: sha512-aFhxPifevDTwEDKPi4eRYWzC0p/WYJeiFkkpNU5Uc7a7M5iMWPAbPFUbHesdlb9Jfqs5c07oyz86u+/HySBNPQ==} engines: {node: '>=10'} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@swc/core-win32-arm64-msvc@1.4.13: - resolution: {integrity: sha512-LVZfhlD+jHcAbz5NN+gAJ1BEasB0WpcvUzcsJt0nQSRsojgzPzFjJ+fzEBnvT7SMtqKkrnVJ0OmDYeh88bDRpw==} + /@swc/core-win32-arm64-msvc@1.4.16: + resolution: {integrity: sha512-bTD43MbhIHL2s5QgCwyleaGwl96Gk/scF2TaVKdUe4QlJCDV/YK9h5oIBAp63ckHtE8GHlH4c8dZNBiAXn4Org==} engines: {node: '>=10'} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-ia32-msvc@1.4.13: - resolution: {integrity: sha512-78hxHWUvUZtWsnhcf8DKwhBcNFJw+j4y4fN2B9ioXmBWX2tIyw+BqUHOrismOtjPihaZmwe/Ok2e4qmkawE2fw==} + /@swc/core-win32-ia32-msvc@1.4.16: + resolution: {integrity: sha512-/lmZeAN/qV5XbK2SEvi8e2RkIg8FQNYiSA8y2/Zb4gTUMKVO5JMLH0BSWMiIKMstKDPDSxMWgwJaQHF8UMyPmQ==} engines: {node: '>=10'} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@swc/core-win32-x64-msvc@1.4.13: - resolution: {integrity: sha512-WSfy1u2Xde6jU7UpHIInCUMW98Zw9iZglddKUAvmr1obkZji5U6EX0Oca3asEJdZPFb+2lMLjt0Mh5a1YisROg==} + /@swc/core-win32-x64-msvc@1.4.16: + resolution: {integrity: sha512-BPAfFfODWXtUu6SwaTTftDHvcbDyWBSI/oanUeRbQR5vVWkXoQ3cxLTsDluc3H74IqXS5z1Uyoe0vNo2hB1opA==} engines: {node: '>=10'} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@swc/core@1.4.13: - resolution: {integrity: sha512-rOtusBE+2gaeRkAJn5E4zp5yzZekZOypzSOz5ZG6P1hFbd+Cc26fWEdK6sUSnrkkvTd0Oj33KXLB/4UkbK/UHA==} + /@swc/core@1.4.16: + resolution: {integrity: sha512-Xaf+UBvW6JNuV131uvSNyMXHn+bh6LyKN4tbv7tOUFQpXyz/t9YWRE04emtlUW9Y0qrm/GKFCbY8n3z6BpZbTA==} engines: {node: '>=10'} requiresBuild: true peerDependencies: @@ -1320,25 +1448,27 @@ packages: '@swc/helpers': optional: true dependencies: - '@swc/counter': 0.1.2 - '@swc/types': 0.1.5 + '@swc/counter': 0.1.3 + '@swc/types': 0.1.6 optionalDependencies: - '@swc/core-darwin-arm64': 1.4.13 - '@swc/core-darwin-x64': 1.4.13 - '@swc/core-linux-arm-gnueabihf': 1.4.13 - '@swc/core-linux-arm64-gnu': 1.4.13 - '@swc/core-linux-arm64-musl': 1.4.13 - '@swc/core-linux-x64-gnu': 1.4.13 - '@swc/core-linux-x64-musl': 1.4.13 - '@swc/core-win32-arm64-msvc': 1.4.13 - '@swc/core-win32-ia32-msvc': 1.4.13 - '@swc/core-win32-x64-msvc': 1.4.13 - - /@swc/counter@0.1.2: - resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==} - - /@swc/types@0.1.5: - resolution: {integrity: sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==} + '@swc/core-darwin-arm64': 1.4.16 + '@swc/core-darwin-x64': 1.4.16 + '@swc/core-linux-arm-gnueabihf': 1.4.16 + '@swc/core-linux-arm64-gnu': 1.4.16 + '@swc/core-linux-arm64-musl': 1.4.16 + '@swc/core-linux-x64-gnu': 1.4.16 + '@swc/core-linux-x64-musl': 1.4.16 + '@swc/core-win32-arm64-msvc': 1.4.16 + '@swc/core-win32-ia32-msvc': 1.4.16 + '@swc/core-win32-x64-msvc': 1.4.16 + + /@swc/counter@0.1.3: + resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} + + /@swc/types@0.1.6: + resolution: {integrity: sha512-/JLo/l2JsT/LRd80C3HfbmVpxOAJ11FO2RCEslFrgzLltoP9j8XIbsyDcfCt2WWyX+CM96rBoNM+IToAkFOugg==} + dependencies: + '@swc/counter': 0.1.3 /@types/estree@1.0.5: resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} @@ -1491,7 +1621,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-shim-unscopables: 1.0.2 dev: true @@ -1502,7 +1632,7 @@ packages: array-buffer-byte-length: 1.0.1 call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-errors: 1.3.0 get-intrinsic: 1.2.4 is-array-buffer: 3.0.4 @@ -1913,8 +2043,8 @@ packages: is-arrayish: 0.2.1 dev: true - /es-abstract@1.23.2: - resolution: {integrity: sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==} + /es-abstract@1.23.3: + resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} engines: {node: '>= 0.4'} dependencies: array-buffer-byte-length: 1.0.1 @@ -2229,7 +2359,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 functions-have-names: 1.2.3 dev: true @@ -2616,6 +2746,10 @@ packages: resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==} dev: true + /js-tokens@9.0.0: + resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} + dev: true + /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -2725,6 +2859,12 @@ packages: yallist: 4.0.0 dev: true + /magic-string@0.30.10: + resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + dev: true + /magic-string@0.30.8: resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} engines: {node: '>=12'} @@ -3306,6 +3446,32 @@ packages: fsevents: 2.3.3 dev: true + /rollup@4.16.1: + resolution: {integrity: sha512-5CaD3MPDlPKfhqzRvWXK96G6ELJfPZNb3LHiZxTHgDdC6jvwfGz2E8nY+9g1ONk4ttHsK1WaFP19Js4PSr1E3g==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.16.1 + '@rollup/rollup-android-arm64': 4.16.1 + '@rollup/rollup-darwin-arm64': 4.16.1 + '@rollup/rollup-darwin-x64': 4.16.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.16.1 + '@rollup/rollup-linux-arm-musleabihf': 4.16.1 + '@rollup/rollup-linux-arm64-gnu': 4.16.1 + '@rollup/rollup-linux-arm64-musl': 4.16.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.16.1 + '@rollup/rollup-linux-riscv64-gnu': 4.16.1 + '@rollup/rollup-linux-s390x-gnu': 4.16.1 + '@rollup/rollup-linux-x64-gnu': 4.16.1 + '@rollup/rollup-linux-x64-musl': 4.16.1 + '@rollup/rollup-win32-arm64-msvc': 4.16.1 + '@rollup/rollup-win32-ia32-msvc': 4.16.1 + '@rollup/rollup-win32-x64-msvc': 4.16.1 + fsevents: 2.3.3 + dev: true + /rollup@4.9.1: resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -3553,7 +3719,7 @@ packages: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 - es-abstract: 1.23.2 + es-abstract: 1.23.3 es-object-atoms: 1.0.0 dev: true @@ -3613,6 +3779,12 @@ packages: js-tokens: 8.0.3 dev: true + /strip-literal@2.1.0: + resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} + dependencies: + js-tokens: 9.0.0 + dev: true + /sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} engines: {node: '>=16 || 14 >=14.17'} @@ -3687,11 +3859,20 @@ packages: resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} dev: true + /tinybench@2.8.0: + resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} + dev: true + /tinypool@0.8.3: resolution: {integrity: sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==} engines: {node: '>=14.0.0'} dev: true + /tinypool@0.8.4: + resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} + engines: {node: '>=14.0.0'} + dev: true + /tinyspy@2.2.0: resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==} engines: {node: '>=14.0.0'} @@ -3737,7 +3918,7 @@ packages: /ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - /tsup@8.0.2(@swc/core@1.4.13)(typescript@5.4.5): + /tsup@8.0.2(@swc/core@1.4.16)(typescript@5.4.5): resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} engines: {node: '>=18'} hasBin: true @@ -3756,7 +3937,7 @@ packages: typescript: optional: true dependencies: - '@swc/core': 1.4.13 + '@swc/core': 1.4.16 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3975,6 +4156,41 @@ packages: - terser dev: true + /vite@5.2.10: + resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.20.2 + postcss: 8.4.38 + rollup: 4.16.1 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vite@5.2.4(@types/node@20.12.7): resolution: {integrity: sha512-vjFghvHWidBTinu5TCymJk/lRHlR5ljqB83yugr0HA1xspUPdOZHqbqDLnZ8f9/jINrtFHTCYYyIUi+o+Q5iyg==} engines: {node: ^18.0.0 || >=20.0.0} @@ -4011,6 +4227,61 @@ packages: fsevents: 2.3.3 dev: true + /vitest@1.5.0: + resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': 1.5.0 + '@vitest/ui': 1.5.0 + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@types/node': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + dependencies: + '@vitest/expect': 1.5.0 + '@vitest/runner': 1.5.0 + '@vitest/snapshot': 1.5.0 + '@vitest/spy': 1.5.0 + '@vitest/utils': 1.5.0 + acorn-walk: 8.3.2 + chai: 4.4.1 + debug: 4.3.4(supports-color@5.5.0) + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.10 + pathe: 1.1.2 + picocolors: 1.0.0 + std-env: 3.7.0 + strip-literal: 2.1.0 + tinybench: 2.8.0 + tinypool: 0.8.4 + vite: 5.2.10 + vite-node: 1.5.0(@types/node@20.12.7) + why-is-node-running: 2.2.2 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: true + /vitest@1.5.0(@types/node@20.12.7): resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==} engines: {node: ^18.0.0 || >=20.0.0} From 4d7d9db56c990281a8e161588ec9d5d20a3dfe2c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 21 Apr 2024 22:03:58 +0100 Subject: [PATCH 090/290] update pnpm version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe4af65..390afe4 100644 --- a/package.json +++ b/package.json @@ -40,5 +40,5 @@ "turbo": "^1.13.2", "vitest": "^1.5.0" }, - "packageManager": "pnpm@8.15.5" + "packageManager": "pnpm@9.0.4" } From 6631c34ccbaa7a909b5bcbee9225dbc0bd40607f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 9 May 2024 18:37:38 +0100 Subject: [PATCH 091/290] bump deps --- package.json | 4 +- packages/commands/package.json | 6 +- packages/core/package.json | 6 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 5608 +++++++++++++++------------- 7 files changed, 3019 insertions(+), 2617 deletions(-) diff --git a/package.json b/package.json index 390afe4..e10a62e 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@changesets/cli": "2.27.1", "nodemon": "^3.1.0", "prettier": "^3.2.5", - "turbo": "^1.13.2", - "vitest": "^1.5.0" + "turbo": "^1.13.3", + "vitest": "^1.6.0" }, "packageManager": "pnpm@9.0.4" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 7613e7a..6770b45 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.7", + "@types/node": "^20.12.11", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.4.5" @@ -42,12 +42,12 @@ "access": "public" }, "dependencies": { - "@begit/core": "^0.0.15", + "@begit/core": "^0.0.16", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "execa": "^8.0.1", + "execa": "^9.0.1", "picocolors": "^1.0.0", "sucrase": "^3.35.0" } diff --git a/packages/core/package.json b/packages/core/package.json index b940eff..335d142 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,9 +29,9 @@ "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.4.16", + "@swc/core": "^1.5.5", "cmd-ts": "^0.13.0", - "execa": "^8.0.1", + "execa": "^9.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.4", "tiny-updater": "^3.5.2" @@ -42,7 +42,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.7", + "@types/node": "^20.12.11", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.5" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 205ed2b..33db45d 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,7 +31,7 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.12.7", + "@types/node": "^20.12.11", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", "picocolors": "^1.0.0", diff --git a/packages/ui/package.json b/packages/ui/package.json index 7e71c29..41ba2e2 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.4.5", - "@types/node": "20.12.7" + "@types/node": "20.12.11" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 22354b1..c49581d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,11 +63,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.12.7", + "@types/node": "20.12.11", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.5", - "vitest": "^1.5.0" + "vitest": "^1.6.0" }, "publishConfig": { "access": "public" @@ -76,9 +76,9 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.4.16", + "@swc/core": "^1.5.5", "cmd-ts": "^0.13.0", - "execa": "^8.0.1", + "execa": "^9.0.1", "picocolors": "^1.0.0", "smol-toml": "^1.1.4" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 31e7879..e1c92b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.0' +lockfileVersion: '9.0' settings: autoInstallPeers: true @@ -18,17 +18,17 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.13.2 - version: 1.13.2 + specifier: ^1.13.3 + version: 1.13.3 vitest: - specifier: ^1.5.0 - version: 1.5.0 + specifier: ^1.6.0 + version: 1.6.0(@types/node@20.12.11) packages/commands: dependencies: '@begit/core': - specifier: ^0.0.15 - version: 0.0.15 + specifier: ^0.0.16 + version: 0.0.16 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -42,8 +42,8 @@ importers: specifier: workspace:* version: link:../utils execa: - specifier: ^8.0.1 - version: 8.0.1 + specifier: ^9.0.1 + version: 9.0.1 picocolors: specifier: ^1.0.0 version: 1.0.0 @@ -55,14 +55,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.7 - version: 20.12.7 + specifier: ^20.12.11 + version: 20.12.11 prettier: specifier: ^3.2.5 version: 3.2.5 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -91,14 +91,14 @@ importers: specifier: workspace:* version: link:../utils '@swc/core': - specifier: ^1.4.16 - version: 1.4.16 + specifier: ^1.5.5 + version: 1.5.5 cmd-ts: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^8.0.1 - version: 8.0.1 + specifier: ^9.0.1 + version: 9.0.1 picocolors: specifier: ^1.0.0 version: 1.0.0 @@ -113,14 +113,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.7 - version: 20.12.7 + specifier: ^20.12.11 + version: 20.12.11 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -134,8 +134,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.12.7 - version: 20.12.7 + specifier: ^20.12.11 + version: 20.12.11 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -147,7 +147,7 @@ importers: version: 1.0.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -156,7 +156,7 @@ importers: devDependencies: tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -182,11 +182,11 @@ importers: version: 1.0.0 devDependencies: '@types/node': - specifier: 20.12.7 - version: 20.12.7 + specifier: 20.12.11 + version: 20.12.11 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 @@ -203,14 +203,14 @@ importers: specifier: workspace:* version: link:../reactivity '@swc/core': - specifier: ^1.4.16 - version: 1.4.16 + specifier: ^1.5.5 + version: 1.5.5 cmd-ts: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^8.0.1 - version: 8.0.1 + specifier: ^9.0.1 + version: 9.0.1 picocolors: specifier: ^1.0.0 version: 1.0.0 @@ -222,1723 +222,934 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.12.7 - version: 20.12.7 + specifier: 20.12.11 + version: 20.12.11 jiti: specifier: ^1.21.0 version: 1.21.0 tsup: specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.4.16)(typescript@5.4.5) + version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) typescript: specifier: ^5.4.5 version: 5.4.5 vitest: - specifier: ^1.5.0 - version: 1.5.0(@types/node@20.12.7) + specifier: ^1.6.0 + version: 1.6.0(@types/node@20.12.11) packages: - /@babel/code-frame@7.24.2: + '@babel/code-frame@7.24.2': resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} engines: {node: '>=6.9.0'} - dependencies: - '@babel/highlight': 7.24.2 - picocolors: 1.0.0 - dev: true - /@babel/helper-validator-identifier@7.22.20: + '@babel/helper-validator-identifier@7.22.20': resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} - dev: true - /@babel/highlight@7.24.2: + '@babel/highlight@7.24.2': resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-validator-identifier': 7.22.20 - chalk: 2.4.2 - js-tokens: 4.0.0 - picocolors: 1.0.0 - dev: true - /@babel/runtime@7.24.4: + '@babel/runtime@7.24.4': resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} engines: {node: '>=6.9.0'} - dependencies: - regenerator-runtime: 0.14.1 - dev: true - /@begit/core@0.0.15: - resolution: {integrity: sha512-MbHsF4lhhfz09ZefjBGk+oXnkq/bpQ5fmu/xg8teTO1ELViaBRFo3oI5BZAyYHc+1q3kS93zVxTipGS7HtSscA==} - dependencies: - tar: 7.0.0 - dev: false + '@begit/core@0.0.16': + resolution: {integrity: sha512-nSgezfX/ixRmVIXP0apKF3ZCeRlxlAD7usZqw0Ku4IExD6COJzT041FPm7vpAkrKxr3U54jHKb1fEeZVHBjEWg==} - /@changesets/apply-release-plan@7.0.0: + '@changesets/apply-release-plan@7.0.0': resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/config': 3.0.0 - '@changesets/get-version-range-type': 0.4.0 - '@changesets/git': 3.0.0 - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - detect-indent: 6.1.0 - fs-extra: 7.0.1 - lodash.startcase: 4.4.0 - outdent: 0.5.0 - prettier: 2.8.8 - resolve-from: 5.0.0 - semver: 7.6.0 - dev: true - /@changesets/assemble-release-plan@6.0.0: + '@changesets/assemble-release-plan@6.0.0': resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - semver: 7.6.0 - dev: true - /@changesets/changelog-git@0.2.0: + '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - dependencies: - '@changesets/types': 6.0.0 - dev: true - /@changesets/cli@2.27.1: + '@changesets/cli@2.27.1': resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} hasBin: true - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/apply-release-plan': 7.0.0 - '@changesets/assemble-release-plan': 6.0.0 - '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.0 - '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 - '@changesets/get-release-plan': 4.0.0 - '@changesets/git': 3.0.0 - '@changesets/logger': 0.1.0 - '@changesets/pre': 2.0.0 - '@changesets/read': 0.6.0 - '@changesets/types': 6.0.0 - '@changesets/write': 0.3.0 - '@manypkg/get-packages': 1.1.3 - '@types/semver': 7.5.8 - ansi-colors: 4.1.3 - chalk: 2.4.2 - ci-info: 3.9.0 - enquirer: 2.4.1 - external-editor: 3.1.0 - fs-extra: 7.0.1 - human-id: 1.0.2 - meow: 6.1.1 - outdent: 0.5.0 - p-limit: 2.3.0 - preferred-pm: 3.1.3 - resolve-from: 5.0.0 - semver: 7.6.0 - spawndamnit: 2.0.0 - term-size: 2.2.1 - tty-table: 4.2.3 - dev: true - /@changesets/config@3.0.0: + '@changesets/config@3.0.0': resolution: {integrity: sha512-o/rwLNnAo/+j9Yvw9mkBQOZySDYyOr/q+wptRLcAVGlU6djOeP9v1nlalbL9MFsobuBVQbZCTp+dIzdq+CLQUA==} - dependencies: - '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 - '@changesets/logger': 0.1.0 - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - fs-extra: 7.0.1 - micromatch: 4.0.5 - dev: true - /@changesets/errors@0.2.0: + '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} - dependencies: - extendable-error: 0.1.7 - dev: true - /@changesets/get-dependents-graph@2.0.0: + '@changesets/get-dependents-graph@2.0.0': resolution: {integrity: sha512-cafUXponivK4vBgZ3yLu944mTvam06XEn2IZGjjKc0antpenkYANXiiE6GExV/yKdsCnE8dXVZ25yGqLYZmScA==} - dependencies: - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - chalk: 2.4.2 - fs-extra: 7.0.1 - semver: 7.6.0 - dev: true - /@changesets/get-release-plan@4.0.0: + '@changesets/get-release-plan@4.0.0': resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/assemble-release-plan': 6.0.0 - '@changesets/config': 3.0.0 - '@changesets/pre': 2.0.0 - '@changesets/read': 0.6.0 - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - dev: true - /@changesets/get-version-range-type@0.4.0: + '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} - dev: true - /@changesets/git@3.0.0: + '@changesets/git@3.0.0': resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/errors': 0.2.0 - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - is-subdir: 1.2.0 - micromatch: 4.0.5 - spawndamnit: 2.0.0 - dev: true - /@changesets/logger@0.1.0: + '@changesets/logger@0.1.0': resolution: {integrity: sha512-pBrJm4CQm9VqFVwWnSqKEfsS2ESnwqwH+xR7jETxIErZcfd1u2zBSqrHbRHR7xjhSgep9x2PSKFKY//FAshA3g==} - dependencies: - chalk: 2.4.2 - dev: true - /@changesets/parse@0.4.0: + '@changesets/parse@0.4.0': resolution: {integrity: sha512-TS/9KG2CdGXS27S+QxbZXgr8uPsP4yNJYb4BC2/NeFUj80Rni3TeD2qwWmabymxmrLo7JEsytXH1FbpKTbvivw==} - dependencies: - '@changesets/types': 6.0.0 - js-yaml: 3.14.1 - dev: true - /@changesets/pre@2.0.0: + '@changesets/pre@2.0.0': resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/errors': 0.2.0 - '@changesets/types': 6.0.0 - '@manypkg/get-packages': 1.1.3 - fs-extra: 7.0.1 - dev: true - /@changesets/read@0.6.0: + '@changesets/read@0.6.0': resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/git': 3.0.0 - '@changesets/logger': 0.1.0 - '@changesets/parse': 0.4.0 - '@changesets/types': 6.0.0 - chalk: 2.4.2 - fs-extra: 7.0.1 - p-filter: 2.1.0 - dev: true - /@changesets/types@4.1.0: + '@changesets/types@4.1.0': resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} - dev: true - /@changesets/types@6.0.0: + '@changesets/types@6.0.0': resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} - dev: true - /@changesets/write@0.3.0: + '@changesets/write@0.3.0': resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/types': 6.0.0 - fs-extra: 7.0.1 - human-id: 1.0.2 - prettier: 2.8.8 - dev: true - /@chialab/esbuild-plugin-meta-url@0.18.2: + '@chialab/esbuild-plugin-meta-url@0.18.2': resolution: {integrity: sha512-uIRIdLvYnw5mLrTRXY0BTgeZx6ANL2/OHkWFl8FaiTYNb7cyXmwEDRE1mh6kBXPRPtGuqv6XSpNX+koEkElu4g==} engines: {node: '>=18'} - dependencies: - '@chialab/esbuild-rna': 0.18.2 - '@chialab/estransform': 0.18.1 - mime-types: 2.1.35 - dev: true - /@chialab/esbuild-rna@0.18.2: + '@chialab/esbuild-rna@0.18.2': resolution: {integrity: sha512-ckzskez7bxstVQ4c5cxbx0DRP2teldzrcSGQl2KPh1VJGdO2ZmRrb6vNkBBD5K3dx9tgTyvskWp4dV+Fbg07Ag==} engines: {node: '>=18'} - dependencies: - '@chialab/estransform': 0.18.1 - '@chialab/node-resolve': 0.18.0 - dev: true - /@chialab/estransform@0.18.1: + '@chialab/estransform@0.18.1': resolution: {integrity: sha512-W/WmjpQL2hndD0/XfR0FcPBAUj+aLNeoAVehOjV/Q9bSnioz0GVSAXXhzp59S33ZynxJBBfn8DNiMTVNJmk4Aw==} engines: {node: '>=18'} - dependencies: - '@parcel/source-map': 2.1.1 - dev: true - /@chialab/node-resolve@0.18.0: + '@chialab/node-resolve@0.18.0': resolution: {integrity: sha512-eV1m70Qn9pLY9xwFmZ2FlcOzwiaUywsJ7NB/ud8VB7DouvCQtIHkQ3Om7uPX0ojXGEG1LCyO96kZkvbNTxNu0Q==} engines: {node: '>=18'} - dev: true - /@clack/core@0.3.3: + '@clack/core@0.3.3': resolution: {integrity: sha512-5ZGyb75BUBjlll6eOa1m/IZBxwk91dooBWhPSL67sWcLS0zt9SnswRL0l26TVdBhb0wnWORRxUn//uH6n4z7+A==} - dependencies: - picocolors: 1.0.0 - sisteransi: 1.0.5 - /@clack/core@0.3.4: + '@clack/core@0.3.4': resolution: {integrity: sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==} - dependencies: - picocolors: 1.0.0 - sisteransi: 1.0.5 - dev: false - /@clack/prompts@0.7.0: + '@clack/prompts@0.7.0': resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==} - dependencies: - '@clack/core': 0.3.3 - picocolors: 1.0.0 - sisteransi: 1.0.5 bundledDependencies: - is-unicode-supported - /@esbuild/aix-ppc64@0.20.2: + '@esbuild/aix-ppc64@0.20.2': resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} engines: {node: '>=12'} cpu: [ppc64] os: [aix] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm64@0.19.9: + '@esbuild/android-arm64@0.19.9': resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm64@0.20.2: + '@esbuild/android-arm64@0.20.2': resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} engines: {node: '>=12'} cpu: [arm64] os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.19.9: + '@esbuild/android-arm@0.19.9': resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==} engines: {node: '>=12'} cpu: [arm] os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-arm@0.20.2: + '@esbuild/android-arm@0.20.2': resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} engines: {node: '>=12'} cpu: [arm] os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-x64@0.19.9: + '@esbuild/android-x64@0.19.9': resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==} engines: {node: '>=12'} cpu: [x64] os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/android-x64@0.20.2: + '@esbuild/android-x64@0.20.2': resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} engines: {node: '>=12'} cpu: [x64] os: [android] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-arm64@0.19.9: + '@esbuild/darwin-arm64@0.19.9': resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-arm64@0.20.2: + '@esbuild/darwin-arm64@0.20.2': resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-x64@0.19.9: + '@esbuild/darwin-x64@0.19.9': resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==} engines: {node: '>=12'} cpu: [x64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/darwin-x64@0.20.2: + '@esbuild/darwin-x64@0.20.2': resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} engines: {node: '>=12'} cpu: [x64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-arm64@0.19.9: + '@esbuild/freebsd-arm64@0.19.9': resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-arm64@0.20.2: + '@esbuild/freebsd-arm64@0.20.2': resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-x64@0.19.9: + '@esbuild/freebsd-x64@0.19.9': resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/freebsd-x64@0.20.2: + '@esbuild/freebsd-x64@0.20.2': resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm64@0.19.9: + '@esbuild/linux-arm64@0.19.9': resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==} engines: {node: '>=12'} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm64@0.20.2: + '@esbuild/linux-arm64@0.20.2': resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} engines: {node: '>=12'} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm@0.19.9: + '@esbuild/linux-arm@0.19.9': resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==} engines: {node: '>=12'} cpu: [arm] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-arm@0.20.2: + '@esbuild/linux-arm@0.20.2': resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} engines: {node: '>=12'} cpu: [arm] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ia32@0.19.9: + '@esbuild/linux-ia32@0.19.9': resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==} engines: {node: '>=12'} cpu: [ia32] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ia32@0.20.2: + '@esbuild/linux-ia32@0.20.2': resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} engines: {node: '>=12'} cpu: [ia32] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.19.9: + '@esbuild/linux-loong64@0.19.9': resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==} engines: {node: '>=12'} cpu: [loong64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-loong64@0.20.2: + '@esbuild/linux-loong64@0.20.2': resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} engines: {node: '>=12'} cpu: [loong64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-mips64el@0.19.9: + '@esbuild/linux-mips64el@0.19.9': resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-mips64el@0.20.2: + '@esbuild/linux-mips64el@0.20.2': resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ppc64@0.19.9: + '@esbuild/linux-ppc64@0.19.9': resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-ppc64@0.20.2: + '@esbuild/linux-ppc64@0.20.2': resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-riscv64@0.19.9: + '@esbuild/linux-riscv64@0.19.9': resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-riscv64@0.20.2: + '@esbuild/linux-riscv64@0.20.2': resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-s390x@0.19.9: + '@esbuild/linux-s390x@0.19.9': resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==} engines: {node: '>=12'} cpu: [s390x] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-s390x@0.20.2: + '@esbuild/linux-s390x@0.20.2': resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} engines: {node: '>=12'} cpu: [s390x] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-x64@0.19.9: + '@esbuild/linux-x64@0.19.9': resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==} engines: {node: '>=12'} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/linux-x64@0.20.2: + '@esbuild/linux-x64@0.20.2': resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} engines: {node: '>=12'} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@esbuild/netbsd-x64@0.19.9: + '@esbuild/netbsd-x64@0.19.9': resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/netbsd-x64@0.20.2: + '@esbuild/netbsd-x64@0.20.2': resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/openbsd-x64@0.19.9: + '@esbuild/openbsd-x64@0.19.9': resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/openbsd-x64@0.20.2: + '@esbuild/openbsd-x64@0.20.2': resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] - requiresBuild: true - dev: true - optional: true - /@esbuild/sunos-x64@0.19.9: + '@esbuild/sunos-x64@0.19.9': resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] - requiresBuild: true - dev: true - optional: true - /@esbuild/sunos-x64@0.20.2: + '@esbuild/sunos-x64@0.20.2': resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} engines: {node: '>=12'} cpu: [x64] os: [sunos] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-arm64@0.19.9: + '@esbuild/win32-arm64@0.19.9': resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==} engines: {node: '>=12'} cpu: [arm64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-arm64@0.20.2: + '@esbuild/win32-arm64@0.20.2': resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} engines: {node: '>=12'} cpu: [arm64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-ia32@0.19.9: + '@esbuild/win32-ia32@0.19.9': resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==} engines: {node: '>=12'} cpu: [ia32] os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-ia32@0.20.2: + '@esbuild/win32-ia32@0.20.2': resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-x64@0.19.9: + '@esbuild/win32-x64@0.19.9': resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@esbuild/win32-x64@0.20.2: + '@esbuild/win32-x64@0.20.2': resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} engines: {node: '>=12'} cpu: [x64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@isaacs/cliui@8.0.2: + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} - dependencies: - string-width: 5.1.2 - string-width-cjs: /string-width@4.2.3 - strip-ansi: 7.1.0 - strip-ansi-cjs: /strip-ansi@6.0.1 - wrap-ansi: 8.1.0 - wrap-ansi-cjs: /wrap-ansi@7.0.0 - /@isaacs/fs-minipass@4.0.0: + '@isaacs/fs-minipass@4.0.0': resolution: {integrity: sha512-S00nN1Qt3z3dSP6Db45fj/mksrAq5XWNIJ/SWXGP8XPT2jrzEuYRCSEx08JpJwBcG2F1xgiOtBMGDU0AZHmxew==} engines: {node: '>=18.0.0'} - dependencies: - minipass: 7.0.4 - dev: false - /@jest/schemas@29.6.3: + '@jest/schemas@29.6.3': resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@sinclair/typebox': 0.27.8 - dev: true - /@jridgewell/gen-mapping@0.3.3: + '@jridgewell/gen-mapping@0.3.3': resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.19 - /@jridgewell/resolve-uri@3.1.1: + '@jridgewell/resolve-uri@3.1.1': resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} - /@jridgewell/set-array@1.1.2: + '@jridgewell/set-array@1.1.2': resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} - /@jridgewell/sourcemap-codec@1.4.15: + '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - /@jridgewell/trace-mapping@0.3.19: + '@jridgewell/trace-mapping@0.3.19': resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} - dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 - /@manypkg/find-root@1.1.0: + '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} - dependencies: - '@babel/runtime': 7.24.4 - '@types/node': 12.20.55 - find-up: 4.1.0 - fs-extra: 8.1.0 - dev: true - /@manypkg/get-packages@1.1.3: + '@manypkg/get-packages@1.1.3': resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==} - dependencies: - '@babel/runtime': 7.24.4 - '@changesets/types': 4.1.0 - '@manypkg/find-root': 1.1.0 - fs-extra: 8.1.0 - globby: 11.1.0 - read-yaml-file: 1.1.0 - dev: true - /@nodelib/fs.scandir@2.1.5: + '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - run-parallel: 1.2.0 - dev: true - /@nodelib/fs.stat@2.0.5: + '@nodelib/fs.stat@2.0.5': resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} engines: {node: '>= 8'} - dev: true - /@nodelib/fs.walk@1.2.8: + '@nodelib/fs.walk@1.2.8': resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - dependencies: - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 - dev: true - /@parcel/source-map@2.1.1: + '@parcel/source-map@2.1.1': resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} engines: {node: ^12.18.3 || >=14} - dependencies: - detect-libc: 1.0.3 - dev: true - /@pkgjs/parseargs@0.11.0: + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - requiresBuild: true - optional: true - /@rollup/rollup-android-arm-eabi@4.13.0: - resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-android-arm-eabi@4.16.1: + '@rollup/rollup-android-arm-eabi@4.16.1': resolution: {integrity: sha512-92/y0TqNLRYOTXpm6Z7mnpvKAG9P7qmK7yJeRJSdzElNCUnsgbpAsGqerUboYRIQKzgfq4pWu9xVkgpWLfmNsw==} cpu: [arm] os: [android] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-android-arm-eabi@4.9.1: + '@rollup/rollup-android-arm-eabi@4.9.1': resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} cpu: [arm] os: [android] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-android-arm64@4.13.0: - resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-android-arm64@4.16.1: + '@rollup/rollup-android-arm64@4.16.1': resolution: {integrity: sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==} cpu: [arm64] os: [android] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-android-arm64@4.9.1: + '@rollup/rollup-android-arm64@4.9.1': resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} cpu: [arm64] os: [android] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-darwin-arm64@4.13.0: - resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-darwin-arm64@4.16.1: + '@rollup/rollup-darwin-arm64@4.16.1': resolution: {integrity: sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==} cpu: [arm64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-darwin-arm64@4.9.1: + '@rollup/rollup-darwin-arm64@4.9.1': resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} cpu: [arm64] os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-darwin-x64@4.13.0: - resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-darwin-x64@4.16.1: + '@rollup/rollup-darwin-x64@4.16.1': resolution: {integrity: sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==} cpu: [x64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-darwin-x64@4.9.1: + '@rollup/rollup-darwin-x64@4.9.1': resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} cpu: [x64] os: [darwin] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.13.0: - resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-arm-gnueabihf@4.16.1: + '@rollup/rollup-linux-arm-gnueabihf@4.16.1': resolution: {integrity: sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==} cpu: [arm] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.9.1: + '@rollup/rollup-linux-arm-gnueabihf@4.9.1': resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} cpu: [arm] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm-musleabihf@4.16.1: + '@rollup/rollup-linux-arm-musleabihf@4.16.1': resolution: {integrity: sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==} cpu: [arm] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm64-gnu@4.13.0: - resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} + '@rollup/rollup-linux-arm64-gnu@4.16.1': + resolution: {integrity: sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-arm64-gnu@4.16.1: - resolution: {integrity: sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm64-gnu@4.9.1: + '@rollup/rollup-linux-arm64-gnu@4.9.1': resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-arm64-musl@4.13.0: - resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm64-musl@4.16.1: + '@rollup/rollup-linux-arm64-musl@4.16.1': resolution: {integrity: sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-arm64-musl@4.9.1: + '@rollup/rollup-linux-arm64-musl@4.9.1': resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} cpu: [arm64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-powerpc64le-gnu@4.16.1: + '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': resolution: {integrity: sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==} cpu: [ppc64] os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-riscv64-gnu@4.13.0: - resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-riscv64-gnu@4.16.1: + '@rollup/rollup-linux-riscv64-gnu@4.16.1': resolution: {integrity: sha512-uU8zuGkQfGqfD9w6VRJZI4IuG4JIfNxxJgEmLMAmPVHREKGsxFVfgHy5c6CexQF2vOfgjB33OsET3Vdn2lln9A==} cpu: [riscv64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-riscv64-gnu@4.9.1: + '@rollup/rollup-linux-riscv64-gnu@4.9.1': resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} cpu: [riscv64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-s390x-gnu@4.16.1: + '@rollup/rollup-linux-s390x-gnu@4.16.1': resolution: {integrity: sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==} cpu: [s390x] os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-x64-gnu@4.13.0: - resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-x64-gnu@4.16.1: + '@rollup/rollup-linux-x64-gnu@4.16.1': resolution: {integrity: sha512-N2ZizKhUryqqrMfdCnjhJhZRgv61C6gK+hwVtCIKC8ts8J+go+vqENnGexwg21nHIOvLN5mBM8a7DI2vlyIOPg==} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-x64-gnu@4.9.1: + '@rollup/rollup-linux-x64-gnu@4.9.1': resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-x64-musl@4.13.0: - resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-x64-musl@4.16.1: + '@rollup/rollup-linux-x64-musl@4.16.1': resolution: {integrity: sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-linux-x64-musl@4.9.1: + '@rollup/rollup-linux-x64-musl@4.9.1': resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} cpu: [x64] os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-win32-arm64-msvc@4.13.0: - resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-arm64-msvc@4.16.1: + '@rollup/rollup-win32-arm64-msvc@4.16.1': resolution: {integrity: sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==} cpu: [arm64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-arm64-msvc@4.9.1: + '@rollup/rollup-win32-arm64-msvc@4.9.1': resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} cpu: [arm64] os: [win32] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-win32-ia32-msvc@4.13.0: - resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-ia32-msvc@4.16.1: + '@rollup/rollup-win32-ia32-msvc@4.16.1': resolution: {integrity: sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==} cpu: [ia32] os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-ia32-msvc@4.9.1: + '@rollup/rollup-win32-ia32-msvc@4.9.1': resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} cpu: [ia32] os: [win32] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-win32-x64-msvc@4.13.0: - resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-x64-msvc@4.16.1: + '@rollup/rollup-win32-x64-msvc@4.16.1': resolution: {integrity: sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==} cpu: [x64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@rollup/rollup-win32-x64-msvc@4.9.1: + '@rollup/rollup-win32-x64-msvc@4.9.1': resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} cpu: [x64] os: [win32] - requiresBuild: true - dev: true - optional: true - /@sinclair/typebox@0.27.8: + '@sec-ant/readable-stream@0.4.1': + resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} + + '@sinclair/typebox@0.27.8': resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - dev: true - /@swc/core-darwin-arm64@1.4.16: - resolution: {integrity: sha512-UOCcH1GvjRnnM/LWT6VCGpIk0OhHRq6v1U6QXuPt5wVsgXnXQwnf5k3sG5Cm56hQHDvhRPY6HCsHi/p0oek8oQ==} + '@sindresorhus/merge-streams@4.0.0': + resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} + engines: {node: '>=18'} + + '@swc/core-darwin-arm64@1.5.5': + resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} engines: {node: '>=10'} cpu: [arm64] os: [darwin] - requiresBuild: true - optional: true - /@swc/core-darwin-x64@1.4.16: - resolution: {integrity: sha512-t3bgqFoYLWvyVtVL6KkFNCINEoOrIlyggT/kJRgi1y0aXSr0oVgcrQ4ezJpdeahZZ4N+Q6vT3ffM30yIunELNA==} + '@swc/core-darwin-x64@1.5.5': + resolution: {integrity: sha512-XHWpKBIPKYLgh5/lV2PYjO84lkzf5JR51kjiloyz2Pa9HIV8tHoAP8bYdJwm4nUp2I7KcEh3pPH0AVu5LpxMKw==} engines: {node: '>=10'} cpu: [x64] os: [darwin] - requiresBuild: true - optional: true - /@swc/core-linux-arm-gnueabihf@1.4.16: - resolution: {integrity: sha512-DvHuwvEF86YvSd0lwnzVcjOTZ0jcxewIbsN0vc/0fqm9qBdMMjr9ox6VCam1n3yYeRtj4VFgrjeNFksqbUejdQ==} + '@swc/core-linux-arm-gnueabihf@1.5.5': + resolution: {integrity: sha512-vtoWNCWAe+CNSqtqIwFnIH48qgPPlUZKoQ4EVFeMM+7/kDi6SeNxoh5TierJs5bKAWxD49VkPvRoWFCk6V62mA==} engines: {node: '>=10'} cpu: [arm] os: [linux] - requiresBuild: true - optional: true - /@swc/core-linux-arm64-gnu@1.4.16: - resolution: {integrity: sha512-9Uu5YlPbyCvbidjKtYEsPpyZlu16roOZ5c2tP1vHfnU9bgf5Tz5q5VovSduNxPHx+ed2iC1b1URODHvDzbbDuQ==} + '@swc/core-linux-arm64-gnu@1.5.5': + resolution: {integrity: sha512-L4l7M78U6h/rCAxId+y5Vu+1KfDRF6dJZtitFcaT293guiUQFwJv8gLxI4Jh5wFtZ0fYd0QaCuvh2Ip79CzGMg==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - requiresBuild: true - optional: true - /@swc/core-linux-arm64-musl@1.4.16: - resolution: {integrity: sha512-/YZq/qB1CHpeoL0eMzyqK5/tYZn/rzKoCYDviFU4uduSUIJsDJQuQA/skdqUzqbheOXKAd4mnJ1hT04RbJ8FPQ==} + '@swc/core-linux-arm64-musl@1.5.5': + resolution: {integrity: sha512-DkzJc13ukXa7oJpyn24BjIgsiOybYrc+IxjsQyfNlDrrs1QXP4elStcpkD02SsIuSyHjZV8Hw2HFBMQB3OHPrA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] - requiresBuild: true - optional: true - /@swc/core-linux-x64-gnu@1.4.16: - resolution: {integrity: sha512-UUjaW5VTngZYDcA8yQlrFmqs1tLi1TxbKlnaJwoNhel9zRQ0yG1YEVGrzTvv4YApSuIiDK18t+Ip927bwucuVQ==} + '@swc/core-linux-x64-gnu@1.5.5': + resolution: {integrity: sha512-kj4ZwWJGeBEUzHrRQP2VudN+kkkYH7OI1dPVDc6kWQx5X4329JeKOas4qY0l7gDVjBbRwN9IbbPI6TIn2KfAug==} engines: {node: '>=10'} cpu: [x64] os: [linux] - requiresBuild: true - optional: true - /@swc/core-linux-x64-musl@1.4.16: - resolution: {integrity: sha512-aFhxPifevDTwEDKPi4eRYWzC0p/WYJeiFkkpNU5Uc7a7M5iMWPAbPFUbHesdlb9Jfqs5c07oyz86u+/HySBNPQ==} + '@swc/core-linux-x64-musl@1.5.5': + resolution: {integrity: sha512-6pTorCs4mYhPhYtC4jNOnhGgjNd3DZcRoZ9P0tzXXP69aCbYjvlgNH/NRvAROp9AaVFeZ7a7PmCWb6+Rbe7NKg==} engines: {node: '>=10'} cpu: [x64] os: [linux] - requiresBuild: true - optional: true - /@swc/core-win32-arm64-msvc@1.4.16: - resolution: {integrity: sha512-bTD43MbhIHL2s5QgCwyleaGwl96Gk/scF2TaVKdUe4QlJCDV/YK9h5oIBAp63ckHtE8GHlH4c8dZNBiAXn4Org==} + '@swc/core-win32-arm64-msvc@1.5.5': + resolution: {integrity: sha512-o0/9pstmEjwZyrY/bA+mymF0zH7E+GT/XCVqdKeWW9Wn3gTTyWa5MZnrFgI2THQ+AXwdglMB/Zo76ARQPaz/+A==} engines: {node: '>=10'} cpu: [arm64] os: [win32] - requiresBuild: true - optional: true - /@swc/core-win32-ia32-msvc@1.4.16: - resolution: {integrity: sha512-/lmZeAN/qV5XbK2SEvi8e2RkIg8FQNYiSA8y2/Zb4gTUMKVO5JMLH0BSWMiIKMstKDPDSxMWgwJaQHF8UMyPmQ==} + '@swc/core-win32-ia32-msvc@1.5.5': + resolution: {integrity: sha512-B+nypUwsmCuaH6RtKWgiPCb+ENjxstJPPJeMJvBqlJqyCaIkZzN4M07Ozi3xVv1VG21SRkd6G3xIqRoalrNc0Q==} engines: {node: '>=10'} cpu: [ia32] os: [win32] - requiresBuild: true - optional: true - /@swc/core-win32-x64-msvc@1.4.16: - resolution: {integrity: sha512-BPAfFfODWXtUu6SwaTTftDHvcbDyWBSI/oanUeRbQR5vVWkXoQ3cxLTsDluc3H74IqXS5z1Uyoe0vNo2hB1opA==} + '@swc/core-win32-x64-msvc@1.5.5': + resolution: {integrity: sha512-ry83ki9ZX0Q+GWGnqc2J618Z+FvKE8Ajn42F8EYi8Wj0q6Jz3mj+pJzgzakk2INm2ldEZ+FaRPipn4ozsZDcBg==} engines: {node: '>=10'} cpu: [x64] os: [win32] - requiresBuild: true - optional: true - /@swc/core@1.4.16: - resolution: {integrity: sha512-Xaf+UBvW6JNuV131uvSNyMXHn+bh6LyKN4tbv7tOUFQpXyz/t9YWRE04emtlUW9Y0qrm/GKFCbY8n3z6BpZbTA==} + '@swc/core@1.5.5': + resolution: {integrity: sha512-M8O22EEgdSONLd+7KRrXj8pn+RdAZZ7ISnPjE9KCQQlI0kkFNEquWR+uFdlFxQfwlyCe/Zb6uGXGDvtcov4IMg==} engines: {node: '>=10'} - requiresBuild: true peerDependencies: '@swc/helpers': ^0.5.0 peerDependenciesMeta: '@swc/helpers': optional: true - dependencies: - '@swc/counter': 0.1.3 - '@swc/types': 0.1.6 - optionalDependencies: - '@swc/core-darwin-arm64': 1.4.16 - '@swc/core-darwin-x64': 1.4.16 - '@swc/core-linux-arm-gnueabihf': 1.4.16 - '@swc/core-linux-arm64-gnu': 1.4.16 - '@swc/core-linux-arm64-musl': 1.4.16 - '@swc/core-linux-x64-gnu': 1.4.16 - '@swc/core-linux-x64-musl': 1.4.16 - '@swc/core-win32-arm64-msvc': 1.4.16 - '@swc/core-win32-ia32-msvc': 1.4.16 - '@swc/core-win32-x64-msvc': 1.4.16 - - /@swc/counter@0.1.3: + + '@swc/counter@0.1.3': resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} - /@swc/types@0.1.6: + '@swc/types@0.1.6': resolution: {integrity: sha512-/JLo/l2JsT/LRd80C3HfbmVpxOAJ11FO2RCEslFrgzLltoP9j8XIbsyDcfCt2WWyX+CM96rBoNM+IToAkFOugg==} - dependencies: - '@swc/counter': 0.1.3 - /@types/estree@1.0.5: + '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - dev: true - /@types/minimist@1.2.5: + '@types/minimist@1.2.5': resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} - dev: true - /@types/node@12.20.55: + '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - dev: true - /@types/node@20.12.7: - resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==} - dependencies: - undici-types: 5.26.5 - dev: true + '@types/node@20.12.11': + resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} - /@types/normalize-package-data@2.4.4: + '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} - dev: true - /@types/semver@7.5.8: + '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - dev: true - /@vitest/expect@1.5.0: - resolution: {integrity: sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==} - dependencies: - '@vitest/spy': 1.5.0 - '@vitest/utils': 1.5.0 - chai: 4.4.1 - dev: true + '@vitest/expect@1.6.0': + resolution: {integrity: sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==} - /@vitest/runner@1.5.0: - resolution: {integrity: sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==} - dependencies: - '@vitest/utils': 1.5.0 - p-limit: 5.0.0 - pathe: 1.1.2 - dev: true + '@vitest/runner@1.6.0': + resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==} - /@vitest/snapshot@1.5.0: - resolution: {integrity: sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==} - dependencies: - magic-string: 0.30.8 - pathe: 1.1.2 - pretty-format: 29.7.0 - dev: true + '@vitest/snapshot@1.6.0': + resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==} - /@vitest/spy@1.5.0: - resolution: {integrity: sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==} - dependencies: - tinyspy: 2.2.0 - dev: true + '@vitest/spy@1.6.0': + resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==} - /@vitest/utils@1.5.0: - resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==} - dependencies: - diff-sequences: 29.6.3 - estree-walker: 3.0.3 - loupe: 2.3.7 - pretty-format: 29.7.0 - dev: true + '@vitest/utils@1.6.0': + resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==} - /abbrev@1.1.1: + abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - dev: true - /acorn-walk@8.3.2: + acorn-walk@8.3.2: resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} engines: {node: '>=0.4.0'} - dev: true - /acorn@8.10.0: + acorn@8.10.0: resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} hasBin: true - dev: true - /ansi-colors@4.1.3: + ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} - dev: true - /ansi-regex@5.0.1: + ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - /ansi-regex@6.0.1: + ansi-regex@6.0.1: resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} engines: {node: '>=12'} - /ansi-styles@3.2.1: + ansi-styles@3.2.1: resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} engines: {node: '>=4'} - dependencies: - color-convert: 1.9.3 - dev: true - /ansi-styles@4.3.0: + ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - dependencies: - color-convert: 2.0.1 - /ansi-styles@5.2.0: + ansi-styles@5.2.0: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} engines: {node: '>=10'} - dev: true - /ansi-styles@6.2.1: + ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} engines: {node: '>=12'} - /any-promise@1.3.0: + any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - /anymatch@3.1.3: + anymatch@3.1.3: resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - dev: true - /argparse@1.0.10: + argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} - dependencies: - sprintf-js: 1.0.3 - dev: true - /array-buffer-byte-length@1.0.1: + array-buffer-byte-length@1.0.1: resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - is-array-buffer: 3.0.4 - dev: true - /array-union@2.1.0: + array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - dev: true - /array.prototype.flat@1.3.2: + array.prototype.flat@1.3.2: resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-shim-unscopables: 1.0.2 - dev: true - /arraybuffer.prototype.slice@1.0.3: + arraybuffer.prototype.slice@1.0.3: resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==} engines: {node: '>= 0.4'} - dependencies: - array-buffer-byte-length: 1.0.1 - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - is-array-buffer: 3.0.4 - is-shared-array-buffer: 1.0.3 - dev: true - /arrify@1.0.1: + arrify@1.0.1: resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==} engines: {node: '>=0.10.0'} - dev: true - /assertion-error@1.1.0: + assertion-error@1.1.0: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} - dev: true - /available-typed-arrays@1.0.7: + available-typed-arrays@1.0.7: resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} engines: {node: '>= 0.4'} - dependencies: - possible-typed-array-names: 1.0.0 - dev: true - /balanced-match@1.0.2: + balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - /better-path-resolve@1.0.0: + better-path-resolve@1.0.0: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} engines: {node: '>=4'} - dependencies: - is-windows: 1.0.2 - dev: true - /binary-extensions@2.2.0: + binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} - dev: true - /brace-expansion@1.1.11: + brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - dev: true - /brace-expansion@2.0.1: + brace-expansion@2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} - dependencies: - balanced-match: 1.0.2 - /braces@3.0.2: + braces@3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} - dependencies: - fill-range: 7.0.1 - dev: true - /breakword@1.0.6: + breakword@1.0.6: resolution: {integrity: sha512-yjxDAYyK/pBvws9H4xKYpLDpYKEH6CzrBPAuXq3x18I+c/2MkVtT3qAr7Oloi6Dss9qNhPVueAAVU1CSeNDIXw==} - dependencies: - wcwidth: 1.0.1 - dev: true - /bundle-require@4.0.1(esbuild@0.19.9): + bundle-require@4.0.1: resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} peerDependencies: esbuild: '>=0.17' - dependencies: - esbuild: 0.19.9 - load-tsconfig: 0.2.5 - dev: true - /cac@6.7.14: + cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} - dev: true - /call-bind@1.0.7: + call-bind@1.0.7: resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} engines: {node: '>= 0.4'} - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 - dev: true - /camelcase-keys@6.2.2: + camelcase-keys@6.2.2: resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==} engines: {node: '>=8'} - dependencies: - camelcase: 5.3.1 - map-obj: 4.3.0 - quick-lru: 4.0.1 - dev: true - /camelcase@5.3.1: + camelcase@5.3.1: resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} engines: {node: '>=6'} - dev: true - /chai@4.4.1: + chai@4.4.1: resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} engines: {node: '>=4'} - dependencies: - assertion-error: 1.1.0 - check-error: 1.0.3 - deep-eql: 4.1.3 - get-func-name: 2.0.2 - loupe: 2.3.7 - pathval: 1.1.1 - type-detect: 4.0.8 - dev: true - /chalk@2.4.2: + chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} - dependencies: - ansi-styles: 3.2.1 - escape-string-regexp: 1.0.5 - supports-color: 5.5.0 - dev: true - /chalk@4.1.2: + chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - /chardet@0.7.0: + chardet@0.7.0: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} - dev: true - /check-error@1.0.3: + check-error@1.0.3: resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} - dependencies: - get-func-name: 2.0.2 - dev: true - /chokidar@3.5.3: + chokidar@3.5.3: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /chokidar@3.6.0: + chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /chownr@3.0.0: + chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} - dev: false - /ci-info@3.9.0: + ci-info@3.9.0: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} - dev: true - /cliui@6.0.0: + cliui@6.0.0: resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 6.2.0 - dev: true - /cliui@8.0.1: + cliui@8.0.1: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - dev: true - /clone@1.0.4: + clone@1.0.4: resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} engines: {node: '>=0.8'} - dev: true - /cmd-ts@0.13.0: + cmd-ts@0.13.0: resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} - dependencies: - chalk: 4.1.2 - debug: 4.3.4(supports-color@5.5.0) - didyoumean: 1.2.2 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - /color-convert@1.9.3: + color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} - dependencies: - color-name: 1.1.3 - dev: true - /color-convert@2.0.1: + color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} - dependencies: - color-name: 1.1.4 - /color-name@1.1.3: + color-name@1.1.3: resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} - dev: true - /color-name@1.1.4: + color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - /commander@4.1.1: + commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} - /concat-map@0.0.1: + concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - dev: true - /cross-spawn@5.1.0: + cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} - dependencies: - lru-cache: 4.1.5 - shebang-command: 1.2.0 - which: 1.3.1 - dev: true - /cross-spawn@7.0.3: + cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - /csv-generate@3.4.3: + csv-generate@3.4.3: resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==} - dev: true - /csv-parse@4.16.3: + csv-parse@4.16.3: resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==} - dev: true - /csv-stringify@5.6.5: + csv-stringify@5.6.5: resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==} - dev: true - /csv@5.5.3: + csv@5.5.3: resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==} engines: {node: '>= 0.1.90'} - dependencies: - csv-generate: 3.4.3 - csv-parse: 4.16.3 - csv-stringify: 5.6.5 - stream-transform: 2.1.3 - dev: true - /data-view-buffer@1.0.1: + data-view-buffer@1.0.1: resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - dev: true - /data-view-byte-length@1.0.1: + data-view-byte-length@1.0.1: resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - dev: true - /data-view-byte-offset@1.0.0: + data-view-byte-offset@1.0.0: resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - dev: true - /debug@4.3.4(supports-color@5.5.0): + debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} peerDependencies: @@ -1946,1308 +1157,771 @@ packages: peerDependenciesMeta: supports-color: optional: true - dependencies: - ms: 2.1.2 - supports-color: 5.5.0 - /decamelize-keys@1.1.1: + decamelize-keys@1.1.1: resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} engines: {node: '>=0.10.0'} - dependencies: - decamelize: 1.2.0 - map-obj: 1.0.1 - dev: true - /decamelize@1.2.0: + decamelize@1.2.0: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} engines: {node: '>=0.10.0'} - dev: true - /deep-eql@4.1.3: + deep-eql@4.1.3: resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} engines: {node: '>=6'} - dependencies: - type-detect: 4.0.8 - dev: true - /defaults@1.0.4: + defaults@1.0.4: resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} - dependencies: - clone: 1.0.4 - dev: true - /define-data-property@1.1.4: + define-data-property@1.1.4: resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} engines: {node: '>= 0.4'} - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - gopd: 1.0.1 - dev: true - /define-properties@1.2.1: + define-properties@1.2.1: resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - has-property-descriptors: 1.0.2 - object-keys: 1.1.1 - dev: true - /detect-indent@6.1.0: + detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} - dev: true - /detect-libc@1.0.3: + detect-libc@1.0.3: resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} engines: {node: '>=0.10'} hasBin: true - dev: true - /didyoumean@1.2.2: + didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - /diff-sequences@29.6.3: + diff-sequences@29.6.3: resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dev: true - /dir-glob@3.0.1: + dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} - dependencies: - path-type: 4.0.0 - dev: true - /eastasianwidth@0.2.0: + eastasianwidth@0.2.0: resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==} - /emoji-regex@8.0.0: + emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - /emoji-regex@9.2.2: + emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - /enquirer@2.4.1: + enquirer@2.4.1: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} - dependencies: - ansi-colors: 4.1.3 - strip-ansi: 6.0.1 - dev: true - /error-ex@1.3.2: + error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} - dependencies: - is-arrayish: 0.2.1 - dev: true - /es-abstract@1.23.3: + es-abstract@1.23.3: resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} engines: {node: '>= 0.4'} - dependencies: - array-buffer-byte-length: 1.0.1 - arraybuffer.prototype.slice: 1.0.3 - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - data-view-buffer: 1.0.1 - data-view-byte-length: 1.0.1 - data-view-byte-offset: 1.0.0 - es-define-property: 1.0.0 - es-errors: 1.3.0 - es-object-atoms: 1.0.0 - es-set-tostringtag: 2.0.3 - es-to-primitive: 1.2.1 - function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 - get-symbol-description: 1.0.2 - globalthis: 1.0.3 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - internal-slot: 1.0.7 - is-array-buffer: 3.0.4 - is-callable: 1.2.7 - is-data-view: 1.0.1 - is-negative-zero: 2.0.3 - is-regex: 1.1.4 - is-shared-array-buffer: 1.0.3 - is-string: 1.0.7 - is-typed-array: 1.1.13 - is-weakref: 1.0.2 - object-inspect: 1.13.1 - object-keys: 1.1.1 - object.assign: 4.1.5 - regexp.prototype.flags: 1.5.2 - safe-array-concat: 1.1.2 - safe-regex-test: 1.0.3 - string.prototype.trim: 1.2.9 - string.prototype.trimend: 1.0.8 - string.prototype.trimstart: 1.0.8 - typed-array-buffer: 1.0.2 - typed-array-byte-length: 1.0.1 - typed-array-byte-offset: 1.0.2 - typed-array-length: 1.0.6 - unbox-primitive: 1.0.2 - which-typed-array: 1.1.15 - dev: true - /es-define-property@1.0.0: + es-define-property@1.0.0: resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} engines: {node: '>= 0.4'} - dependencies: - get-intrinsic: 1.2.4 - dev: true - /es-errors@1.3.0: + es-errors@1.3.0: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} - dev: true - /es-object-atoms@1.0.0: + es-object-atoms@1.0.0: resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - dev: true - /es-set-tostringtag@2.0.3: + es-set-tostringtag@2.0.3: resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} engines: {node: '>= 0.4'} - dependencies: - get-intrinsic: 1.2.4 - has-tostringtag: 1.0.2 - hasown: 2.0.2 - dev: true - /es-shim-unscopables@1.0.2: + es-shim-unscopables@1.0.2: resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} - dependencies: - hasown: 2.0.2 - dev: true - /es-to-primitive@1.2.1: + es-to-primitive@1.2.1: resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} engines: {node: '>= 0.4'} - dependencies: - is-callable: 1.2.7 - is-date-object: 1.0.5 - is-symbol: 1.0.4 - dev: true - /esbuild@0.19.9: + esbuild@0.19.9: resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} engines: {node: '>=12'} hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.19.9 - '@esbuild/android-arm64': 0.19.9 - '@esbuild/android-x64': 0.19.9 - '@esbuild/darwin-arm64': 0.19.9 - '@esbuild/darwin-x64': 0.19.9 - '@esbuild/freebsd-arm64': 0.19.9 - '@esbuild/freebsd-x64': 0.19.9 - '@esbuild/linux-arm': 0.19.9 - '@esbuild/linux-arm64': 0.19.9 - '@esbuild/linux-ia32': 0.19.9 - '@esbuild/linux-loong64': 0.19.9 - '@esbuild/linux-mips64el': 0.19.9 - '@esbuild/linux-ppc64': 0.19.9 - '@esbuild/linux-riscv64': 0.19.9 - '@esbuild/linux-s390x': 0.19.9 - '@esbuild/linux-x64': 0.19.9 - '@esbuild/netbsd-x64': 0.19.9 - '@esbuild/openbsd-x64': 0.19.9 - '@esbuild/sunos-x64': 0.19.9 - '@esbuild/win32-arm64': 0.19.9 - '@esbuild/win32-ia32': 0.19.9 - '@esbuild/win32-x64': 0.19.9 - dev: true - /esbuild@0.20.2: + esbuild@0.20.2: resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} engines: {node: '>=12'} hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/aix-ppc64': 0.20.2 - '@esbuild/android-arm': 0.20.2 - '@esbuild/android-arm64': 0.20.2 - '@esbuild/android-x64': 0.20.2 - '@esbuild/darwin-arm64': 0.20.2 - '@esbuild/darwin-x64': 0.20.2 - '@esbuild/freebsd-arm64': 0.20.2 - '@esbuild/freebsd-x64': 0.20.2 - '@esbuild/linux-arm': 0.20.2 - '@esbuild/linux-arm64': 0.20.2 - '@esbuild/linux-ia32': 0.20.2 - '@esbuild/linux-loong64': 0.20.2 - '@esbuild/linux-mips64el': 0.20.2 - '@esbuild/linux-ppc64': 0.20.2 - '@esbuild/linux-riscv64': 0.20.2 - '@esbuild/linux-s390x': 0.20.2 - '@esbuild/linux-x64': 0.20.2 - '@esbuild/netbsd-x64': 0.20.2 - '@esbuild/openbsd-x64': 0.20.2 - '@esbuild/sunos-x64': 0.20.2 - '@esbuild/win32-arm64': 0.20.2 - '@esbuild/win32-ia32': 0.20.2 - '@esbuild/win32-x64': 0.20.2 - dev: true - /escalade@3.1.2: + escalade@3.1.2: resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} engines: {node: '>=6'} - dev: true - /escape-string-regexp@1.0.5: + escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} - dev: true - /esprima@4.0.1: + esprima@4.0.1: resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} engines: {node: '>=4'} hasBin: true - dev: true - /estree-walker@3.0.3: + estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - dependencies: - '@types/estree': 1.0.5 - dev: true - /execa@5.1.1: + execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} engines: {node: '>=10'} - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - dev: true - /execa@8.0.1: + execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - dependencies: - cross-spawn: 7.0.3 - get-stream: 8.0.1 - human-signals: 5.0.0 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.1.0 - onetime: 6.0.0 - signal-exit: 4.1.0 - strip-final-newline: 3.0.0 - /extendable-error@0.1.7: + execa@9.0.1: + resolution: {integrity: sha512-U5ck8xJmf3sVebV1v+Hh436VWHVHUfzkdbKJynd3kCP9sQRDxCY5x2Tml5lGB7XM6lpj6ATfgWWqynDt2MBLJg==} + engines: {node: '>=18'} + + extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} - dev: true - /external-editor@3.1.0: + external-editor@3.1.0: resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} - dependencies: - chardet: 0.7.0 - iconv-lite: 0.4.24 - tmp: 0.0.33 - dev: true - /fast-glob@3.3.1: + fast-glob@3.3.1: resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - dev: true - /fastq@1.15.0: + fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} - dependencies: - reusify: 1.0.4 - dev: true - /fill-range@7.0.1: + figures@6.1.0: + resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} + engines: {node: '>=18'} + + fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} - dependencies: - to-regex-range: 5.0.1 - dev: true - /find-up@4.1.0: + find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} - dependencies: - locate-path: 5.0.0 - path-exists: 4.0.0 - dev: true - /find-up@5.0.0: + find-up@5.0.0: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} - dependencies: - locate-path: 6.0.0 - path-exists: 4.0.0 - dev: true - /find-yarn-workspace-root2@1.2.16: + find-yarn-workspace-root2@1.2.16: resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==} - dependencies: - micromatch: 4.0.5 - pkg-dir: 4.2.0 - dev: true - /for-each@0.3.3: + for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} - dependencies: - is-callable: 1.2.7 - dev: true - /foreground-child@3.1.1: + foreground-child@3.1.1: resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} engines: {node: '>=14'} - dependencies: - cross-spawn: 7.0.3 - signal-exit: 4.1.0 - /fs-extra@7.0.1: + fs-extra@7.0.1: resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==} engines: {node: '>=6 <7 || >=8'} - dependencies: - graceful-fs: 4.2.11 - jsonfile: 4.0.0 - universalify: 0.1.2 - dev: true - /fs-extra@8.1.0: + fs-extra@8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} - dependencies: - graceful-fs: 4.2.11 - jsonfile: 4.0.0 - universalify: 0.1.2 - dev: true - /fsevents@2.3.3: + fsevents@2.3.3: resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] - requiresBuild: true - dev: true - optional: true - /function-bind@1.1.2: + function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - dev: true - /function.prototype.name@1.1.6: + function.prototype.name@1.1.6: resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - functions-have-names: 1.2.3 - dev: true - /functions-have-names@1.2.3: + functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - dev: true - /get-caller-file@2.0.5: + get-caller-file@2.0.5: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - dev: true - /get-func-name@2.0.2: + get-func-name@2.0.2: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} - dev: true - /get-intrinsic@1.2.4: + get-intrinsic@1.2.4: resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - dev: true - /get-stream@6.0.1: + get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} - dev: true - /get-stream@8.0.1: + get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - /get-symbol-description@1.0.2: + get-stream@9.0.1: + resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} + engines: {node: '>=18'} + + get-symbol-description@1.0.2: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - dev: true - /glob-parent@5.1.2: + glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} - dependencies: - is-glob: 4.0.3 - dev: true - /glob@10.3.10: + glob@10.3.10: resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true - dependencies: - foreground-child: 3.1.1 - jackspeak: 2.3.6 - minimatch: 9.0.3 - minipass: 5.0.0 - path-scurry: 1.10.1 - /globalthis@1.0.3: + globalthis@1.0.3: resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} engines: {node: '>= 0.4'} - dependencies: - define-properties: 1.2.1 - dev: true - /globby@11.1.0: + globby@11.1.0: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} - dependencies: - array-union: 2.1.0 - dir-glob: 3.0.1 - fast-glob: 3.3.1 - ignore: 5.2.4 - merge2: 1.4.1 - slash: 3.0.0 - dev: true - /gopd@1.0.1: + gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - dependencies: - get-intrinsic: 1.2.4 - dev: true - /graceful-fs@4.2.11: + graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - dev: true - /grapheme-splitter@1.0.4: + grapheme-splitter@1.0.4: resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} - dev: true - /hard-rejection@2.1.0: + hard-rejection@2.1.0: resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==} engines: {node: '>=6'} - dev: true - /has-bigints@1.0.2: + has-bigints@1.0.2: resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} - dev: true - /has-flag@3.0.0: + has-flag@3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} - /has-flag@4.0.0: + has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - /has-property-descriptors@1.0.2: + has-property-descriptors@1.0.2: resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - dependencies: - es-define-property: 1.0.0 - dev: true - /has-proto@1.0.3: + has-proto@1.0.3: resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} engines: {node: '>= 0.4'} - dev: true - /has-symbols@1.0.3: + has-symbols@1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} - dev: true - /has-tostringtag@1.0.2: + has-tostringtag@1.0.2: resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} engines: {node: '>= 0.4'} - dependencies: - has-symbols: 1.0.3 - dev: true - /hasown@2.0.2: + hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} - dependencies: - function-bind: 1.1.2 - dev: true - /hosted-git-info@2.8.9: + hosted-git-info@2.8.9: resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} - dev: true - /human-id@1.0.2: + human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} - dev: true - /human-signals@2.1.0: + human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} engines: {node: '>=10.17.0'} - dev: true - /human-signals@5.0.0: + human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - /iconv-lite@0.4.24: + human-signals@7.0.0: + resolution: {integrity: sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==} + engines: {node: '>=18.18.0'} + + iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} - dependencies: - safer-buffer: 2.1.2 - dev: true - /ignore-by-default@1.0.1: + ignore-by-default@1.0.1: resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==} - dev: true - /ignore@5.2.4: + ignore@5.2.4: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} - dev: true - /indent-string@4.0.0: + indent-string@4.0.0: resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} engines: {node: '>=8'} - dev: true - /internal-slot@1.0.7: + internal-slot@1.0.7: resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==} engines: {node: '>= 0.4'} - dependencies: - es-errors: 1.3.0 - hasown: 2.0.2 - side-channel: 1.0.6 - dev: true - /ionstore@1.0.0: + ionstore@1.0.0: resolution: {integrity: sha512-ikEvmeZFh9u5SkjKbFqJlmmhaQTulB3P7QoSoZ/xL8EDP5uj5QWbPeKcQ8ZJtszBLHRRnhIJJE8P1dhFx/oCMw==} - dev: false - /is-array-buffer@3.0.4: + is-array-buffer@3.0.4: resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - dev: true - /is-arrayish@0.2.1: + is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - dev: true - /is-bigint@1.0.4: + is-bigint@1.0.4: resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} - dependencies: - has-bigints: 1.0.2 - dev: true - /is-binary-path@2.1.0: + is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} - dependencies: - binary-extensions: 2.2.0 - dev: true - /is-boolean-object@1.1.2: + is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - dev: true - /is-callable@1.2.7: + is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} - dev: true - /is-core-module@2.13.1: + is-core-module@2.13.1: resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} - dependencies: - hasown: 2.0.2 - dev: true - /is-data-view@1.0.1: + is-data-view@1.0.1: resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} engines: {node: '>= 0.4'} - dependencies: - is-typed-array: 1.1.13 - dev: true - /is-date-object@1.0.5: + is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - dev: true - /is-extglob@2.1.1: + is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} - dev: true - /is-fullwidth-code-point@3.0.0: + is-fullwidth-code-point@3.0.0: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - /is-glob@4.0.3: + is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} - dependencies: - is-extglob: 2.1.1 - dev: true - /is-negative-zero@2.0.3: + is-negative-zero@2.0.3: resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} engines: {node: '>= 0.4'} - dev: true - /is-number-object@1.0.7: + is-number-object@1.0.7: resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - dev: true - /is-number@7.0.0: + is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - dev: true - /is-plain-obj@1.1.0: + is-plain-obj@1.1.0: resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==} engines: {node: '>=0.10.0'} - dev: true - /is-regex@1.1.4: + is-plain-obj@4.1.0: + resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} + engines: {node: '>=12'} + + is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - dev: true - /is-shared-array-buffer@1.0.3: + is-shared-array-buffer@1.0.3: resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - dev: true - /is-stream@2.0.1: + is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} - dev: true - /is-stream@3.0.0: + is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - /is-string@1.0.7: + is-stream@4.0.1: + resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} + engines: {node: '>=18'} + + is-string@1.0.7: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} engines: {node: '>= 0.4'} - dependencies: - has-tostringtag: 1.0.2 - dev: true - /is-subdir@1.2.0: + is-subdir@1.2.0: resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==} engines: {node: '>=4'} - dependencies: - better-path-resolve: 1.0.0 - dev: true - /is-symbol@1.0.4: + is-symbol@1.0.4: resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} engines: {node: '>= 0.4'} - dependencies: - has-symbols: 1.0.3 - dev: true - /is-typed-array@1.1.13: + is-typed-array@1.1.13: resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} - dependencies: - which-typed-array: 1.1.15 - dev: true - /is-weakref@1.0.2: + is-unicode-supported@2.0.0: + resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==} + engines: {node: '>=18'} + + is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} - dependencies: - call-bind: 1.0.7 - dev: true - /is-windows@1.0.2: + is-windows@1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} engines: {node: '>=0.10.0'} - dev: true - /isarray@2.0.5: + isarray@2.0.5: resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - dev: true - /isexe@2.0.0: + isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - /jackspeak@2.3.6: + jackspeak@2.3.6: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - dependencies: - '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 - /jiti@1.21.0: + jiti@1.21.0: resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} hasBin: true - dev: true - /joycon@3.1.1: + joycon@3.1.1: resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} engines: {node: '>=10'} - dev: true - /js-tokens@4.0.0: + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - dev: true - - /js-tokens@8.0.3: - resolution: {integrity: sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==} - dev: true - /js-tokens@9.0.0: + js-tokens@9.0.0: resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} - dev: true - /js-yaml@3.14.1: + js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true - dependencies: - argparse: 1.0.10 - esprima: 4.0.1 - dev: true - /json-parse-even-better-errors@2.3.1: + json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - dev: true - /jsonc-parser@3.2.0: + jsonc-parser@3.2.0: resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} - dev: true - /jsonfile@4.0.0: + jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - optionalDependencies: - graceful-fs: 4.2.11 - dev: true - /kind-of@6.0.3: + kind-of@6.0.3: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} - dev: true - /kleur@4.1.5: + kleur@4.1.5: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} - dev: true - /lilconfig@2.1.0: + lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} - dev: true - /lines-and-columns@1.2.4: + lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - /load-tsconfig@0.2.5: + load-tsconfig@0.2.5: resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: true - /load-yaml-file@0.2.0: + load-yaml-file@0.2.0: resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} engines: {node: '>=6'} - dependencies: - graceful-fs: 4.2.11 - js-yaml: 3.14.1 - pify: 4.0.1 - strip-bom: 3.0.0 - dev: true - /local-pkg@0.5.0: + local-pkg@0.5.0: resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} engines: {node: '>=14'} - dependencies: - mlly: 1.4.2 - pkg-types: 1.0.3 - dev: true - /locate-path@5.0.0: + locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} - dependencies: - p-locate: 4.1.0 - dev: true - /locate-path@6.0.0: + locate-path@6.0.0: resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} engines: {node: '>=10'} - dependencies: - p-locate: 5.0.0 - dev: true - /lodash.sortby@4.7.0: + lodash.sortby@4.7.0: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} - dev: true - /lodash.startcase@4.4.0: + lodash.startcase@4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} - dev: true - /loupe@2.3.7: + loupe@2.3.7: resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} - dependencies: - get-func-name: 2.0.2 - dev: true - /lru-cache@10.1.0: + lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} - /lru-cache@4.1.5: + lru-cache@4.1.5: resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - dev: true - /lru-cache@6.0.0: + lru-cache@6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} - dependencies: - yallist: 4.0.0 - dev: true - /magic-string@0.30.10: + magic-string@0.30.10: resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - - /magic-string@0.30.8: - resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /map-obj@1.0.1: + map-obj@1.0.1: resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==} engines: {node: '>=0.10.0'} - dev: true - /map-obj@4.3.0: + map-obj@4.3.0: resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==} engines: {node: '>=8'} - dev: true - /meow@6.1.1: + meow@6.1.1: resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} engines: {node: '>=8'} - dependencies: - '@types/minimist': 1.2.5 - camelcase-keys: 6.2.2 - decamelize-keys: 1.1.1 - hard-rejection: 2.1.0 - minimist-options: 4.1.0 - normalize-package-data: 2.5.0 - read-pkg-up: 7.0.1 - redent: 3.0.0 - trim-newlines: 3.0.1 - type-fest: 0.13.1 - yargs-parser: 18.1.3 - dev: true - /merge-stream@2.0.0: + merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - /merge2@1.4.1: + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - dev: true - /micromatch@4.0.5: + micromatch@4.0.5: resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} engines: {node: '>=8.6'} - dependencies: - braces: 3.0.2 - picomatch: 2.3.1 - dev: true - /mime-db@1.52.0: + mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} - dev: true - /mime-types@2.1.35: + mime-types@2.1.35: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} - dependencies: - mime-db: 1.52.0 - dev: true - /mimic-fn@2.1.0: + mimic-fn@2.1.0: resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} engines: {node: '>=6'} - dev: true - /mimic-fn@4.0.0: + mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} - /min-indent@1.0.1: + min-indent@1.0.1: resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} engines: {node: '>=4'} - dev: true - /minimatch@3.1.2: + minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - dependencies: - brace-expansion: 1.1.11 - dev: true - /minimatch@9.0.3: + minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} - dependencies: - brace-expansion: 2.0.1 - /minimist-options@4.1.0: + minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} - dependencies: - arrify: 1.0.1 - is-plain-obj: 1.1.0 - kind-of: 6.0.3 - dev: true - /minipass@5.0.0: + minipass@5.0.0: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - /minipass@7.0.4: - resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==} + minipass@7.1.1: + resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} engines: {node: '>=16 || 14 >=14.17'} - dev: false - /minizlib@3.0.1: + minizlib@3.0.1: resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} engines: {node: '>= 18'} - dependencies: - minipass: 7.0.4 - rimraf: 5.0.5 - dev: false - /mixme@0.5.10: + mixme@0.5.10: resolution: {integrity: sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==} engines: {node: '>= 8.0.0'} - dev: true - /mkdirp@3.0.1: + mkdirp@3.0.1: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} hasBin: true - dev: false - /mlly@1.4.2: + mlly@1.4.2: resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} - dependencies: - acorn: 8.10.0 - pathe: 1.1.2 - pkg-types: 1.0.3 - ufo: 1.3.0 - dev: true - /ms@2.1.2: + ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - /mz@2.7.0: + mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - dependencies: - any-promise: 1.3.0 - object-assign: 4.1.1 - thenify-all: 1.6.0 - /nanoid@3.3.7: + nanoid@3.3.7: resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - dev: true - /nodemon@3.1.0: + nodemon@3.1.0: resolution: {integrity: sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==} engines: {node: '>=10'} hasBin: true - dependencies: - chokidar: 3.6.0 - debug: 4.3.4(supports-color@5.5.0) - ignore-by-default: 1.0.1 - minimatch: 3.1.2 - pstree.remy: 1.1.8 - semver: 7.6.0 - simple-update-notifier: 2.0.0 - supports-color: 5.5.0 - touch: 3.1.0 - undefsafe: 2.0.5 - dev: true - /nopt@1.0.10: + nopt@1.0.10: resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} hasBin: true - dependencies: - abbrev: 1.1.1 - dev: true - /normalize-package-data@2.5.0: + normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} - dependencies: - hosted-git-info: 2.8.9 - resolve: 1.22.8 - semver: 5.7.2 - validate-npm-package-license: 3.0.4 - dev: true - /normalize-path@3.0.0: + normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - dev: true - /npm-run-path@4.0.1: + npm-run-path@4.0.1: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'} - dependencies: - path-key: 3.1.1 - dev: true - /npm-run-path@5.1.0: + npm-run-path@5.1.0: resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - path-key: 4.0.0 - /object-assign@4.1.1: + npm-run-path@5.3.0: + resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + + object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - /object-inspect@1.13.1: + object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - dev: true - /object-keys@1.1.1: + object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} engines: {node: '>= 0.4'} - dev: true - /object.assign@4.1.5: + object.assign@4.1.5: resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - has-symbols: 1.0.3 - object-keys: 1.1.1 - dev: true - /onetime@5.1.2: + onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} - dependencies: - mimic-fn: 2.1.0 - dev: true - /onetime@6.0.0: + onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} - dependencies: - mimic-fn: 4.0.0 - /os-tmpdir@1.0.2: + os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} - dev: true - /outdent@0.5.0: + outdent@0.5.0: resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==} - dev: true - /p-filter@2.1.0: + p-filter@2.1.0: resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==} engines: {node: '>=8'} - dependencies: - p-map: 2.1.0 - dev: true - /p-limit@2.3.0: + p-limit@2.3.0: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} - dependencies: - p-try: 2.2.0 - dev: true - /p-limit@3.1.0: + p-limit@3.1.0: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - dependencies: - yocto-queue: 0.1.0 - dev: true - /p-limit@5.0.0: + p-limit@5.0.0: resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} engines: {node: '>=18'} - dependencies: - yocto-queue: 1.0.0 - dev: true - /p-locate@4.1.0: + p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} - dependencies: - p-limit: 2.3.0 - dev: true - /p-locate@5.0.0: + p-locate@5.0.0: resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} engines: {node: '>=10'} - dependencies: - p-limit: 3.1.0 - dev: true - /p-map@2.1.0: + p-map@2.1.0: resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==} engines: {node: '>=6'} - dev: true - /p-try@2.2.0: + p-try@2.2.0: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - dev: true - /parse-json@5.2.0: + parse-json@5.2.0: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} - dependencies: - '@babel/code-frame': 7.24.2 - error-ex: 1.3.2 - json-parse-even-better-errors: 2.3.1 - lines-and-columns: 1.2.4 - dev: true - /path-exists@4.0.0: + parse-ms@4.0.0: + resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} + engines: {node: '>=18'} + + path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} - dev: true - /path-key@3.1.1: + path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} - /path-key@4.0.0: + path-key@4.0.0: resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} engines: {node: '>=12'} - /path-parse@1.0.7: + path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - dev: true - /path-scurry@1.10.1: + path-scurry@1.10.1: resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 10.1.0 - minipass: 5.0.0 - /path-type@4.0.0: + path-type@4.0.0: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - dev: true - /pathe@1.1.2: + pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} - dev: true - /pathval@1.1.1: + pathval@1.1.1: resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} - dev: true - /picocolors@1.0.0: + picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - /picomatch@2.3.1: + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - dev: true - /pify@4.0.1: + pify@4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} - dev: true - /pirates@4.0.6: + pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} - /pkg-dir@4.2.0: + pkg-dir@4.2.0: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - dependencies: - find-up: 4.1.0 - dev: true - /pkg-types@1.0.3: + pkg-types@1.0.3: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} - dependencies: - jsonc-parser: 3.2.0 - mlly: 1.4.2 - pathe: 1.1.2 - dev: true - /possible-typed-array-names@1.0.0: + possible-typed-array-names@1.0.0: resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} engines: {node: '>= 0.4'} - dev: true - /postcss-load-config@4.0.1: + postcss-load-config@4.0.1: resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -3258,537 +1932,2624 @@ packages: optional: true ts-node: optional: true - dependencies: - lilconfig: 2.1.0 - yaml: 2.3.2 - dev: true - /postcss@8.4.38: + postcss@8.4.38: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.2.0 - dev: true - /preferred-pm@3.1.3: + preferred-pm@3.1.3: resolution: {integrity: sha512-MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==} engines: {node: '>=10'} - dependencies: - find-up: 5.0.0 - find-yarn-workspace-root2: 1.2.16 - path-exists: 4.0.0 - which-pm: 2.0.0 - dev: true - /prettier@2.8.8: + prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} hasBin: true - dev: true - /prettier@3.2.5: + prettier@3.2.5: resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} engines: {node: '>=14'} hasBin: true - dev: true - /pretty-format@29.7.0: + pretty-format@29.7.0: resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dependencies: - '@jest/schemas': 29.6.3 - ansi-styles: 5.2.0 - react-is: 18.2.0 - dev: true - /pseudomap@1.0.2: + pretty-ms@9.0.0: + resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==} + engines: {node: '>=18'} + + pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} - dev: true - /pstree.remy@1.1.8: + pstree.remy@1.1.8: resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==} - dev: true - /punycode@2.3.0: + punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} - dev: true - /queue-microtask@1.2.3: + queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - dev: true - /quick-lru@4.0.1: + quick-lru@4.0.1: resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==} engines: {node: '>=8'} - dev: true - /react-is@18.2.0: + react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - dev: true - /read-pkg-up@7.0.1: + read-pkg-up@7.0.1: resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} engines: {node: '>=8'} - dependencies: - find-up: 4.1.0 - read-pkg: 5.2.0 - type-fest: 0.8.1 - dev: true - /read-pkg@5.2.0: + read-pkg@5.2.0: resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} engines: {node: '>=8'} - dependencies: - '@types/normalize-package-data': 2.4.4 - normalize-package-data: 2.5.0 - parse-json: 5.2.0 - type-fest: 0.6.0 - dev: true - /read-yaml-file@1.1.0: + read-yaml-file@1.1.0: resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==} engines: {node: '>=6'} - dependencies: - graceful-fs: 4.2.11 - js-yaml: 3.14.1 - pify: 4.0.1 - strip-bom: 3.0.0 - dev: true - /readdirp@3.6.0: + readdirp@3.6.0: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.1 - dev: true - /redent@3.0.0: + redent@3.0.0: resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} engines: {node: '>=8'} - dependencies: - indent-string: 4.0.0 - strip-indent: 3.0.0 - dev: true - /regenerator-runtime@0.14.1: + regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - dev: true - /regexp.prototype.flags@1.5.2: + regexp.prototype.flags@1.5.2: resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-errors: 1.3.0 - set-function-name: 2.0.2 - dev: true - /require-directory@2.1.1: + require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} engines: {node: '>=0.10.0'} - dev: true - /require-main-filename@2.0.0: + require-main-filename@2.0.0: resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} - dev: true - /resolve-from@5.0.0: + resolve-from@5.0.0: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} - dev: true - /resolve@1.22.8: + resolve@1.22.8: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true - dependencies: - is-core-module: 2.13.1 - path-parse: 1.0.7 - supports-preserve-symlinks-flag: 1.0.0 - dev: true - /reusify@1.0.4: + reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - dev: true - /rimraf@5.0.5: + rimraf@5.0.5: resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} engines: {node: '>=14'} hasBin: true - dependencies: - glob: 10.3.10 - dev: false - - /rollup@4.13.0: - resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.13.0 - '@rollup/rollup-android-arm64': 4.13.0 - '@rollup/rollup-darwin-arm64': 4.13.0 - '@rollup/rollup-darwin-x64': 4.13.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 - '@rollup/rollup-linux-arm64-gnu': 4.13.0 - '@rollup/rollup-linux-arm64-musl': 4.13.0 - '@rollup/rollup-linux-riscv64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-musl': 4.13.0 - '@rollup/rollup-win32-arm64-msvc': 4.13.0 - '@rollup/rollup-win32-ia32-msvc': 4.13.0 - '@rollup/rollup-win32-x64-msvc': 4.13.0 - fsevents: 2.3.3 - dev: true - /rollup@4.16.1: + rollup@4.16.1: resolution: {integrity: sha512-5CaD3MPDlPKfhqzRvWXK96G6ELJfPZNb3LHiZxTHgDdC6jvwfGz2E8nY+9g1ONk4ttHsK1WaFP19Js4PSr1E3g==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.16.1 - '@rollup/rollup-android-arm64': 4.16.1 - '@rollup/rollup-darwin-arm64': 4.16.1 - '@rollup/rollup-darwin-x64': 4.16.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.16.1 - '@rollup/rollup-linux-arm-musleabihf': 4.16.1 - '@rollup/rollup-linux-arm64-gnu': 4.16.1 - '@rollup/rollup-linux-arm64-musl': 4.16.1 - '@rollup/rollup-linux-powerpc64le-gnu': 4.16.1 - '@rollup/rollup-linux-riscv64-gnu': 4.16.1 - '@rollup/rollup-linux-s390x-gnu': 4.16.1 - '@rollup/rollup-linux-x64-gnu': 4.16.1 - '@rollup/rollup-linux-x64-musl': 4.16.1 - '@rollup/rollup-win32-arm64-msvc': 4.16.1 - '@rollup/rollup-win32-ia32-msvc': 4.16.1 - '@rollup/rollup-win32-x64-msvc': 4.16.1 - fsevents: 2.3.3 - dev: true - /rollup@4.9.1: + rollup@4.9.1: resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.1 - '@rollup/rollup-android-arm64': 4.9.1 - '@rollup/rollup-darwin-arm64': 4.9.1 - '@rollup/rollup-darwin-x64': 4.9.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.1 - '@rollup/rollup-linux-arm64-gnu': 4.9.1 - '@rollup/rollup-linux-arm64-musl': 4.9.1 - '@rollup/rollup-linux-riscv64-gnu': 4.9.1 - '@rollup/rollup-linux-x64-gnu': 4.9.1 - '@rollup/rollup-linux-x64-musl': 4.9.1 - '@rollup/rollup-win32-arm64-msvc': 4.9.1 - '@rollup/rollup-win32-ia32-msvc': 4.9.1 - '@rollup/rollup-win32-x64-msvc': 4.9.1 - fsevents: 2.3.3 - dev: true - /run-parallel@1.2.0: + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - dependencies: - queue-microtask: 1.2.3 - dev: true - /safe-array-concat@1.1.2: + safe-array-concat@1.1.2: resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==} engines: {node: '>=0.4'} - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - has-symbols: 1.0.3 - isarray: 2.0.5 - dev: true - /safe-regex-test@1.0.3: + safe-regex-test@1.0.3: resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-regex: 1.1.4 - dev: true - /safer-buffer@2.1.2: + safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - dev: true - /semver@5.7.2: + semver@5.7.2: resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} hasBin: true - dev: true - /semver@7.6.0: + semver@7.6.0: resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} engines: {node: '>=10'} hasBin: true - dependencies: - lru-cache: 6.0.0 - dev: true - /set-blocking@2.0.0: + set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} - dev: true - /set-function-length@1.2.2: + set-function-length@1.2.2: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - dev: true - /set-function-name@2.0.2: + set-function-name@2.0.2: resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} engines: {node: '>= 0.4'} - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - functions-have-names: 1.2.3 - has-property-descriptors: 1.0.2 - dev: true - /shebang-command@1.2.0: + shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} engines: {node: '>=0.10.0'} - dependencies: - shebang-regex: 1.0.0 - dev: true - /shebang-command@2.0.0: + shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} - dependencies: - shebang-regex: 3.0.0 - /shebang-regex@1.0.0: + shebang-regex@1.0.0: resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==} engines: {node: '>=0.10.0'} - dev: true - /shebang-regex@3.0.0: + shebang-regex@3.0.0: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - /side-channel@1.0.6: + side-channel@1.0.6: resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - object-inspect: 1.13.1 - dev: true - /siginfo@2.0.0: + siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} - dev: true - /signal-exit@3.0.7: + signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - dev: true - /signal-exit@4.1.0: + signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - /simple-update-notifier@2.0.0: + simple-update-notifier@2.0.0: resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} engines: {node: '>=10'} - dependencies: - semver: 7.6.0 - dev: true - /sisteransi@1.0.5: + sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} - /slash@3.0.0: + slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - dev: true - /smartwrap@2.0.2: + smartwrap@2.0.2: resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==} engines: {node: '>=6'} hasBin: true - dependencies: - array.prototype.flat: 1.3.2 - breakword: 1.0.6 + + smol-toml@1.1.4: + resolution: {integrity: sha512-Y0OT8HezWsTNeEOSVxDnKOW/AyNXHQ4BwJNbAXlLTF5wWsBvrcHhIkE5Rf8kQMLmgf7nDX3PVOlgC6/Aiggu3Q==} + engines: {node: '>= 18', pnpm: '>= 8'} + + source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + engines: {node: '>=0.10.0'} + + source-map@0.8.0-beta.0: + resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} + engines: {node: '>= 8'} + + spawndamnit@2.0.0: + resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==} + + spdx-correct@3.2.0: + resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + + spdx-exceptions@2.5.0: + resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} + + spdx-expression-parse@3.0.1: + resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + + spdx-license-ids@3.0.17: + resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} + + sprintf-js@1.0.3: + resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} + + stackback@0.0.2: + resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} + + std-env@3.7.0: + resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} + + stream-transform@2.1.3: + resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} + + string-width@4.2.3: + resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} + engines: {node: '>=8'} + + string-width@5.1.2: + resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} + engines: {node: '>=12'} + + string.prototype.trim@1.2.9: + resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} + engines: {node: '>= 0.4'} + + string.prototype.trimend@1.0.8: + resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} + + string.prototype.trimstart@1.0.8: + resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} + engines: {node: '>= 0.4'} + + strip-ansi@6.0.1: + resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} + engines: {node: '>=8'} + + strip-ansi@7.1.0: + resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} + engines: {node: '>=12'} + + strip-bom@3.0.0: + resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} + engines: {node: '>=4'} + + strip-final-newline@2.0.0: + resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} + engines: {node: '>=6'} + + strip-final-newline@3.0.0: + resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} + engines: {node: '>=12'} + + strip-final-newline@4.0.0: + resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} + engines: {node: '>=18'} + + strip-indent@3.0.0: + resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} + engines: {node: '>=8'} + + strip-literal@2.1.0: + resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} + + sucrase@3.35.0: + resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + + supports-color@5.5.0: + resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} + engines: {node: '>=4'} + + supports-color@7.2.0: + resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} + engines: {node: '>=8'} + + supports-preserve-symlinks-flag@1.0.0: + resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} + engines: {node: '>= 0.4'} + + tar@7.1.0: + resolution: {integrity: sha512-ENhg4W6BmjYxl8GTaE7/h99f0aXiSWv4kikRZ9n2/JRxypZniE84ILZqimAhxxX7Zb8Px6pFdheW3EeHfhnXQQ==} + engines: {node: '>=18'} + + term-size@2.2.1: + resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} + engines: {node: '>=8'} + + thenify-all@1.6.0: + resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} + engines: {node: '>=0.8'} + + thenify@3.3.1: + resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + + tiny-colors@2.0.2: + resolution: {integrity: sha512-FYzA5Q5myp26PIZ4mx/03SreNgB1dGqcHJnj1Z8UVQ8/CBw0c6qRoPgRdk8rKpviY5diZyOmRGYMYKLYbjnmWQ==} + + tiny-updater@3.5.2: + resolution: {integrity: sha512-5EjK01h0rvgv+Eb0XaiTZJZR+ujdjCDHZ1ZCVCu+1h4+MyOYZ+za8UKuKdNOOOSKhkkC9B08o6ZhF4JnQg7ZLg==} + + tinybench@2.8.0: + resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} + + tinypool@0.8.4: + resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} + engines: {node: '>=14.0.0'} + + tinyspy@2.2.0: + resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==} + engines: {node: '>=14.0.0'} + + tmp@0.0.33: + resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} + engines: {node: '>=0.6.0'} + + to-regex-range@5.0.1: + resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} + engines: {node: '>=8.0'} + + touch@3.1.0: + resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==} + hasBin: true + + tr46@1.0.1: + resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + + tree-kill@1.2.2: + resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} + hasBin: true + + trim-newlines@3.0.1: + resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} + engines: {node: '>=8'} + + ts-interface-checker@0.1.13: + resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + + tsup@8.0.2: + resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + '@microsoft/api-extractor': ^7.36.0 + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.5.0' + peerDependenciesMeta: + '@microsoft/api-extractor': + optional: true + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + + tty-table@4.2.3: + resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==} + engines: {node: '>=8.0.0'} + hasBin: true + + turbo-darwin-64@1.13.3: + resolution: {integrity: sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==} + cpu: [x64] + os: [darwin] + + turbo-darwin-arm64@1.13.3: + resolution: {integrity: sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==} + cpu: [arm64] + os: [darwin] + + turbo-linux-64@1.13.3: + resolution: {integrity: sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==} + cpu: [x64] + os: [linux] + + turbo-linux-arm64@1.13.3: + resolution: {integrity: sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==} + cpu: [arm64] + os: [linux] + + turbo-windows-64@1.13.3: + resolution: {integrity: sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==} + cpu: [x64] + os: [win32] + + turbo-windows-arm64@1.13.3: + resolution: {integrity: sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==} + cpu: [arm64] + os: [win32] + + turbo@1.13.3: + resolution: {integrity: sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==} + hasBin: true + + type-detect@4.0.8: + resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} + engines: {node: '>=4'} + + type-fest@0.13.1: + resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==} + engines: {node: '>=10'} + + type-fest@0.6.0: + resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} + engines: {node: '>=8'} + + type-fest@0.8.1: + resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} + engines: {node: '>=8'} + + typed-array-buffer@1.0.2: + resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} + engines: {node: '>= 0.4'} + + typed-array-byte-length@1.0.1: + resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} + engines: {node: '>= 0.4'} + + typed-array-byte-offset@1.0.2: + resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} + engines: {node: '>= 0.4'} + + typed-array-length@1.0.6: + resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} + engines: {node: '>= 0.4'} + + typescript@5.4.5: + resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} + engines: {node: '>=14.17'} + hasBin: true + + ufo@1.3.0: + resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==} + + unbox-primitive@1.0.2: + resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} + + undefsafe@2.0.5: + resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} + + undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + + universalify@0.1.2: + resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} + engines: {node: '>= 4.0.0'} + + validate-npm-package-license@3.0.4: + resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + + vite-node@1.6.0: + resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + + vite@5.2.10: + resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + + vitest@1.6.0: + resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@edge-runtime/vm': '*' + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': 1.6.0 + '@vitest/ui': 1.6.0 + happy-dom: '*' + jsdom: '*' + peerDependenciesMeta: + '@edge-runtime/vm': + optional: true + '@types/node': + optional: true + '@vitest/browser': + optional: true + '@vitest/ui': + optional: true + happy-dom: + optional: true + jsdom: + optional: true + + wcwidth@1.0.1: + resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} + + webidl-conversions@4.0.2: + resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} + + whatwg-url@7.1.0: + resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} + + when-exit@2.1.1: + resolution: {integrity: sha512-XLipGldz/UcleuGaoQjbYuWwD+ICRnzIjlldtwTaTWr7aZz8yQW49rXk6MHQnh+KxOiWiJpM1vIyaxprOnlW4g==} + + which-boxed-primitive@1.0.2: + resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} + + which-module@2.0.1: + resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} + + which-pm@2.0.0: + resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==} + engines: {node: '>=8.15'} + + which-typed-array@1.1.15: + resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} + engines: {node: '>= 0.4'} + + which@1.3.1: + resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} + hasBin: true + + which@2.0.2: + resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} + engines: {node: '>= 8'} + hasBin: true + + why-is-node-running@2.2.2: + resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} + engines: {node: '>=8'} + hasBin: true + + wrap-ansi@6.2.0: + resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} + engines: {node: '>=8'} + + wrap-ansi@7.0.0: + resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} + engines: {node: '>=10'} + + wrap-ansi@8.1.0: + resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} + engines: {node: '>=12'} + + y18n@4.0.3: + resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} + + y18n@5.0.8: + resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} + engines: {node: '>=10'} + + yallist@2.1.2: + resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} + + yallist@4.0.0: + resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + + yallist@5.0.0: + resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} + engines: {node: '>=18'} + + yaml@2.3.2: + resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} + engines: {node: '>= 14'} + + yargs-parser@18.1.3: + resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} + engines: {node: '>=6'} + + yargs-parser@21.1.1: + resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} + engines: {node: '>=12'} + + yargs@15.4.1: + resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} + engines: {node: '>=8'} + + yargs@17.7.2: + resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} + engines: {node: '>=12'} + + yocto-queue@0.1.0: + resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} + engines: {node: '>=10'} + + yocto-queue@1.0.0: + resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} + engines: {node: '>=12.20'} + + yoctocolors@2.0.0: + resolution: {integrity: sha512-esbDnt0Z1zI1KgvOZU90hJbL6BkoUbrP9yy7ArNZ6TmxBxydMJTYMf9FZjmwwcA8ZgEQzriQ3hwZ0NYXhlFo8Q==} + engines: {node: '>=18'} + +snapshots: + + '@babel/code-frame@7.24.2': + dependencies: + '@babel/highlight': 7.24.2 + picocolors: 1.0.0 + + '@babel/helper-validator-identifier@7.22.20': {} + + '@babel/highlight@7.24.2': + dependencies: + '@babel/helper-validator-identifier': 7.22.20 + chalk: 2.4.2 + js-tokens: 4.0.0 + picocolors: 1.0.0 + + '@babel/runtime@7.24.4': + dependencies: + regenerator-runtime: 0.14.1 + + '@begit/core@0.0.16': + dependencies: + tar: 7.1.0 + + '@changesets/apply-release-plan@7.0.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/config': 3.0.0 + '@changesets/get-version-range-type': 0.4.0 + '@changesets/git': 3.0.0 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + detect-indent: 6.1.0 + fs-extra: 7.0.1 + lodash.startcase: 4.4.0 + outdent: 0.5.0 + prettier: 2.8.8 + resolve-from: 5.0.0 + semver: 7.6.0 + + '@changesets/assemble-release-plan@6.0.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/errors': 0.2.0 + '@changesets/get-dependents-graph': 2.0.0 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + semver: 7.6.0 + + '@changesets/changelog-git@0.2.0': + dependencies: + '@changesets/types': 6.0.0 + + '@changesets/cli@2.27.1': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/apply-release-plan': 7.0.0 + '@changesets/assemble-release-plan': 6.0.0 + '@changesets/changelog-git': 0.2.0 + '@changesets/config': 3.0.0 + '@changesets/errors': 0.2.0 + '@changesets/get-dependents-graph': 2.0.0 + '@changesets/get-release-plan': 4.0.0 + '@changesets/git': 3.0.0 + '@changesets/logger': 0.1.0 + '@changesets/pre': 2.0.0 + '@changesets/read': 0.6.0 + '@changesets/types': 6.0.0 + '@changesets/write': 0.3.0 + '@manypkg/get-packages': 1.1.3 + '@types/semver': 7.5.8 + ansi-colors: 4.1.3 + chalk: 2.4.2 + ci-info: 3.9.0 + enquirer: 2.4.1 + external-editor: 3.1.0 + fs-extra: 7.0.1 + human-id: 1.0.2 + meow: 6.1.1 + outdent: 0.5.0 + p-limit: 2.3.0 + preferred-pm: 3.1.3 + resolve-from: 5.0.0 + semver: 7.6.0 + spawndamnit: 2.0.0 + term-size: 2.2.1 + tty-table: 4.2.3 + + '@changesets/config@3.0.0': + dependencies: + '@changesets/errors': 0.2.0 + '@changesets/get-dependents-graph': 2.0.0 + '@changesets/logger': 0.1.0 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + fs-extra: 7.0.1 + micromatch: 4.0.5 + + '@changesets/errors@0.2.0': + dependencies: + extendable-error: 0.1.7 + + '@changesets/get-dependents-graph@2.0.0': + dependencies: + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + chalk: 2.4.2 + fs-extra: 7.0.1 + semver: 7.6.0 + + '@changesets/get-release-plan@4.0.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/assemble-release-plan': 6.0.0 + '@changesets/config': 3.0.0 + '@changesets/pre': 2.0.0 + '@changesets/read': 0.6.0 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + + '@changesets/get-version-range-type@0.4.0': {} + + '@changesets/git@3.0.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/errors': 0.2.0 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + is-subdir: 1.2.0 + micromatch: 4.0.5 + spawndamnit: 2.0.0 + + '@changesets/logger@0.1.0': + dependencies: + chalk: 2.4.2 + + '@changesets/parse@0.4.0': + dependencies: + '@changesets/types': 6.0.0 + js-yaml: 3.14.1 + + '@changesets/pre@2.0.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/errors': 0.2.0 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + fs-extra: 7.0.1 + + '@changesets/read@0.6.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/git': 3.0.0 + '@changesets/logger': 0.1.0 + '@changesets/parse': 0.4.0 + '@changesets/types': 6.0.0 + chalk: 2.4.2 + fs-extra: 7.0.1 + p-filter: 2.1.0 + + '@changesets/types@4.1.0': {} + + '@changesets/types@6.0.0': {} + + '@changesets/write@0.3.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/types': 6.0.0 + fs-extra: 7.0.1 + human-id: 1.0.2 + prettier: 2.8.8 + + '@chialab/esbuild-plugin-meta-url@0.18.2': + dependencies: + '@chialab/esbuild-rna': 0.18.2 + '@chialab/estransform': 0.18.1 + mime-types: 2.1.35 + + '@chialab/esbuild-rna@0.18.2': + dependencies: + '@chialab/estransform': 0.18.1 + '@chialab/node-resolve': 0.18.0 + + '@chialab/estransform@0.18.1': + dependencies: + '@parcel/source-map': 2.1.1 + + '@chialab/node-resolve@0.18.0': {} + + '@clack/core@0.3.3': + dependencies: + picocolors: 1.0.0 + sisteransi: 1.0.5 + + '@clack/core@0.3.4': + dependencies: + picocolors: 1.0.0 + sisteransi: 1.0.5 + + '@clack/prompts@0.7.0': + dependencies: + '@clack/core': 0.3.3 + picocolors: 1.0.0 + sisteransi: 1.0.5 + + '@esbuild/aix-ppc64@0.20.2': + optional: true + + '@esbuild/android-arm64@0.19.9': + optional: true + + '@esbuild/android-arm64@0.20.2': + optional: true + + '@esbuild/android-arm@0.19.9': + optional: true + + '@esbuild/android-arm@0.20.2': + optional: true + + '@esbuild/android-x64@0.19.9': + optional: true + + '@esbuild/android-x64@0.20.2': + optional: true + + '@esbuild/darwin-arm64@0.19.9': + optional: true + + '@esbuild/darwin-arm64@0.20.2': + optional: true + + '@esbuild/darwin-x64@0.19.9': + optional: true + + '@esbuild/darwin-x64@0.20.2': + optional: true + + '@esbuild/freebsd-arm64@0.19.9': + optional: true + + '@esbuild/freebsd-arm64@0.20.2': + optional: true + + '@esbuild/freebsd-x64@0.19.9': + optional: true + + '@esbuild/freebsd-x64@0.20.2': + optional: true + + '@esbuild/linux-arm64@0.19.9': + optional: true + + '@esbuild/linux-arm64@0.20.2': + optional: true + + '@esbuild/linux-arm@0.19.9': + optional: true + + '@esbuild/linux-arm@0.20.2': + optional: true + + '@esbuild/linux-ia32@0.19.9': + optional: true + + '@esbuild/linux-ia32@0.20.2': + optional: true + + '@esbuild/linux-loong64@0.19.9': + optional: true + + '@esbuild/linux-loong64@0.20.2': + optional: true + + '@esbuild/linux-mips64el@0.19.9': + optional: true + + '@esbuild/linux-mips64el@0.20.2': + optional: true + + '@esbuild/linux-ppc64@0.19.9': + optional: true + + '@esbuild/linux-ppc64@0.20.2': + optional: true + + '@esbuild/linux-riscv64@0.19.9': + optional: true + + '@esbuild/linux-riscv64@0.20.2': + optional: true + + '@esbuild/linux-s390x@0.19.9': + optional: true + + '@esbuild/linux-s390x@0.20.2': + optional: true + + '@esbuild/linux-x64@0.19.9': + optional: true + + '@esbuild/linux-x64@0.20.2': + optional: true + + '@esbuild/netbsd-x64@0.19.9': + optional: true + + '@esbuild/netbsd-x64@0.20.2': + optional: true + + '@esbuild/openbsd-x64@0.19.9': + optional: true + + '@esbuild/openbsd-x64@0.20.2': + optional: true + + '@esbuild/sunos-x64@0.19.9': + optional: true + + '@esbuild/sunos-x64@0.20.2': + optional: true + + '@esbuild/win32-arm64@0.19.9': + optional: true + + '@esbuild/win32-arm64@0.20.2': + optional: true + + '@esbuild/win32-ia32@0.19.9': + optional: true + + '@esbuild/win32-ia32@0.20.2': + optional: true + + '@esbuild/win32-x64@0.19.9': + optional: true + + '@esbuild/win32-x64@0.20.2': + optional: true + + '@isaacs/cliui@8.0.2': + dependencies: + string-width: 5.1.2 + string-width-cjs: string-width@4.2.3 + strip-ansi: 7.1.0 + strip-ansi-cjs: strip-ansi@6.0.1 + wrap-ansi: 8.1.0 + wrap-ansi-cjs: wrap-ansi@7.0.0 + + '@isaacs/fs-minipass@4.0.0': + dependencies: + minipass: 7.1.1 + + '@jest/schemas@29.6.3': + dependencies: + '@sinclair/typebox': 0.27.8 + + '@jridgewell/gen-mapping@0.3.3': + dependencies: + '@jridgewell/set-array': 1.1.2 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.19 + + '@jridgewell/resolve-uri@3.1.1': {} + + '@jridgewell/set-array@1.1.2': {} + + '@jridgewell/sourcemap-codec@1.4.15': {} + + '@jridgewell/trace-mapping@0.3.19': + dependencies: + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 + + '@manypkg/find-root@1.1.0': + dependencies: + '@babel/runtime': 7.24.4 + '@types/node': 12.20.55 + find-up: 4.1.0 + fs-extra: 8.1.0 + + '@manypkg/get-packages@1.1.3': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/types': 4.1.0 + '@manypkg/find-root': 1.1.0 + fs-extra: 8.1.0 + globby: 11.1.0 + read-yaml-file: 1.1.0 + + '@nodelib/fs.scandir@2.1.5': + dependencies: + '@nodelib/fs.stat': 2.0.5 + run-parallel: 1.2.0 + + '@nodelib/fs.stat@2.0.5': {} + + '@nodelib/fs.walk@1.2.8': + dependencies: + '@nodelib/fs.scandir': 2.1.5 + fastq: 1.15.0 + + '@parcel/source-map@2.1.1': + dependencies: + detect-libc: 1.0.3 + + '@pkgjs/parseargs@0.11.0': + optional: true + + '@rollup/rollup-android-arm-eabi@4.16.1': + optional: true + + '@rollup/rollup-android-arm-eabi@4.9.1': + optional: true + + '@rollup/rollup-android-arm64@4.16.1': + optional: true + + '@rollup/rollup-android-arm64@4.9.1': + optional: true + + '@rollup/rollup-darwin-arm64@4.16.1': + optional: true + + '@rollup/rollup-darwin-arm64@4.9.1': + optional: true + + '@rollup/rollup-darwin-x64@4.16.1': + optional: true + + '@rollup/rollup-darwin-x64@4.9.1': + optional: true + + '@rollup/rollup-linux-arm-gnueabihf@4.16.1': + optional: true + + '@rollup/rollup-linux-arm-gnueabihf@4.9.1': + optional: true + + '@rollup/rollup-linux-arm-musleabihf@4.16.1': + optional: true + + '@rollup/rollup-linux-arm64-gnu@4.16.1': + optional: true + + '@rollup/rollup-linux-arm64-gnu@4.9.1': + optional: true + + '@rollup/rollup-linux-arm64-musl@4.16.1': + optional: true + + '@rollup/rollup-linux-arm64-musl@4.9.1': + optional: true + + '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': + optional: true + + '@rollup/rollup-linux-riscv64-gnu@4.16.1': + optional: true + + '@rollup/rollup-linux-riscv64-gnu@4.9.1': + optional: true + + '@rollup/rollup-linux-s390x-gnu@4.16.1': + optional: true + + '@rollup/rollup-linux-x64-gnu@4.16.1': + optional: true + + '@rollup/rollup-linux-x64-gnu@4.9.1': + optional: true + + '@rollup/rollup-linux-x64-musl@4.16.1': + optional: true + + '@rollup/rollup-linux-x64-musl@4.9.1': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.16.1': + optional: true + + '@rollup/rollup-win32-arm64-msvc@4.9.1': + optional: true + + '@rollup/rollup-win32-ia32-msvc@4.16.1': + optional: true + + '@rollup/rollup-win32-ia32-msvc@4.9.1': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.16.1': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.9.1': + optional: true + + '@sec-ant/readable-stream@0.4.1': {} + + '@sinclair/typebox@0.27.8': {} + + '@sindresorhus/merge-streams@4.0.0': {} + + '@swc/core-darwin-arm64@1.5.5': + optional: true + + '@swc/core-darwin-x64@1.5.5': + optional: true + + '@swc/core-linux-arm-gnueabihf@1.5.5': + optional: true + + '@swc/core-linux-arm64-gnu@1.5.5': + optional: true + + '@swc/core-linux-arm64-musl@1.5.5': + optional: true + + '@swc/core-linux-x64-gnu@1.5.5': + optional: true + + '@swc/core-linux-x64-musl@1.5.5': + optional: true + + '@swc/core-win32-arm64-msvc@1.5.5': + optional: true + + '@swc/core-win32-ia32-msvc@1.5.5': + optional: true + + '@swc/core-win32-x64-msvc@1.5.5': + optional: true + + '@swc/core@1.5.5': + dependencies: + '@swc/counter': 0.1.3 + '@swc/types': 0.1.6 + optionalDependencies: + '@swc/core-darwin-arm64': 1.5.5 + '@swc/core-darwin-x64': 1.5.5 + '@swc/core-linux-arm-gnueabihf': 1.5.5 + '@swc/core-linux-arm64-gnu': 1.5.5 + '@swc/core-linux-arm64-musl': 1.5.5 + '@swc/core-linux-x64-gnu': 1.5.5 + '@swc/core-linux-x64-musl': 1.5.5 + '@swc/core-win32-arm64-msvc': 1.5.5 + '@swc/core-win32-ia32-msvc': 1.5.5 + '@swc/core-win32-x64-msvc': 1.5.5 + + '@swc/counter@0.1.3': {} + + '@swc/types@0.1.6': + dependencies: + '@swc/counter': 0.1.3 + + '@types/estree@1.0.5': {} + + '@types/minimist@1.2.5': {} + + '@types/node@12.20.55': {} + + '@types/node@20.12.11': + dependencies: + undici-types: 5.26.5 + + '@types/normalize-package-data@2.4.4': {} + + '@types/semver@7.5.8': {} + + '@vitest/expect@1.6.0': + dependencies: + '@vitest/spy': 1.6.0 + '@vitest/utils': 1.6.0 + chai: 4.4.1 + + '@vitest/runner@1.6.0': + dependencies: + '@vitest/utils': 1.6.0 + p-limit: 5.0.0 + pathe: 1.1.2 + + '@vitest/snapshot@1.6.0': + dependencies: + magic-string: 0.30.10 + pathe: 1.1.2 + pretty-format: 29.7.0 + + '@vitest/spy@1.6.0': + dependencies: + tinyspy: 2.2.0 + + '@vitest/utils@1.6.0': + dependencies: + diff-sequences: 29.6.3 + estree-walker: 3.0.3 + loupe: 2.3.7 + pretty-format: 29.7.0 + + abbrev@1.1.1: {} + + acorn-walk@8.3.2: {} + + acorn@8.10.0: {} + + ansi-colors@4.1.3: {} + + ansi-regex@5.0.1: {} + + ansi-regex@6.0.1: {} + + ansi-styles@3.2.1: + dependencies: + color-convert: 1.9.3 + + ansi-styles@4.3.0: + dependencies: + color-convert: 2.0.1 + + ansi-styles@5.2.0: {} + + ansi-styles@6.2.1: {} + + any-promise@1.3.0: {} + + anymatch@3.1.3: + dependencies: + normalize-path: 3.0.0 + picomatch: 2.3.1 + + argparse@1.0.10: + dependencies: + sprintf-js: 1.0.3 + + array-buffer-byte-length@1.0.1: + dependencies: + call-bind: 1.0.7 + is-array-buffer: 3.0.4 + + array-union@2.1.0: {} + + array.prototype.flat@1.3.2: + dependencies: + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.23.3 + es-shim-unscopables: 1.0.2 + + arraybuffer.prototype.slice@1.0.3: + dependencies: + array-buffer-byte-length: 1.0.1 + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.23.3 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 + is-array-buffer: 3.0.4 + is-shared-array-buffer: 1.0.3 + + arrify@1.0.1: {} + + assertion-error@1.1.0: {} + + available-typed-arrays@1.0.7: + dependencies: + possible-typed-array-names: 1.0.0 + + balanced-match@1.0.2: {} + + better-path-resolve@1.0.0: + dependencies: + is-windows: 1.0.2 + + binary-extensions@2.2.0: {} + + brace-expansion@1.1.11: + dependencies: + balanced-match: 1.0.2 + concat-map: 0.0.1 + + brace-expansion@2.0.1: + dependencies: + balanced-match: 1.0.2 + + braces@3.0.2: + dependencies: + fill-range: 7.0.1 + + breakword@1.0.6: + dependencies: + wcwidth: 1.0.1 + + bundle-require@4.0.1(esbuild@0.19.9): + dependencies: + esbuild: 0.19.9 + load-tsconfig: 0.2.5 + + cac@6.7.14: {} + + call-bind@1.0.7: + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + set-function-length: 1.2.2 + + camelcase-keys@6.2.2: + dependencies: + camelcase: 5.3.1 + map-obj: 4.3.0 + quick-lru: 4.0.1 + + camelcase@5.3.1: {} + + chai@4.4.1: + dependencies: + assertion-error: 1.1.0 + check-error: 1.0.3 + deep-eql: 4.1.3 + get-func-name: 2.0.2 + loupe: 2.3.7 + pathval: 1.1.1 + type-detect: 4.0.8 + + chalk@2.4.2: + dependencies: + ansi-styles: 3.2.1 + escape-string-regexp: 1.0.5 + supports-color: 5.5.0 + + chalk@4.1.2: + dependencies: + ansi-styles: 4.3.0 + supports-color: 7.2.0 + + chardet@0.7.0: {} + + check-error@1.0.3: + dependencies: + get-func-name: 2.0.2 + + chokidar@3.5.3: + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + + chokidar@3.6.0: + dependencies: + anymatch: 3.1.3 + braces: 3.0.2 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + + chownr@3.0.0: {} + + ci-info@3.9.0: {} + + cliui@6.0.0: + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 6.2.0 + + cliui@8.0.1: + dependencies: + string-width: 4.2.3 + strip-ansi: 6.0.1 + wrap-ansi: 7.0.0 + + clone@1.0.4: {} + + cmd-ts@0.13.0: + dependencies: + chalk: 4.1.2 + debug: 4.3.4(supports-color@5.5.0) + didyoumean: 1.2.2 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - supports-color + + color-convert@1.9.3: + dependencies: + color-name: 1.1.3 + + color-convert@2.0.1: + dependencies: + color-name: 1.1.4 + + color-name@1.1.3: {} + + color-name@1.1.4: {} + + commander@4.1.1: {} + + concat-map@0.0.1: {} + + cross-spawn@5.1.0: + dependencies: + lru-cache: 4.1.5 + shebang-command: 1.2.0 + which: 1.3.1 + + cross-spawn@7.0.3: + dependencies: + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 + + csv-generate@3.4.3: {} + + csv-parse@4.16.3: {} + + csv-stringify@5.6.5: {} + + csv@5.5.3: + dependencies: + csv-generate: 3.4.3 + csv-parse: 4.16.3 + csv-stringify: 5.6.5 + stream-transform: 2.1.3 + + data-view-buffer@1.0.1: + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-data-view: 1.0.1 + + data-view-byte-length@1.0.1: + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-data-view: 1.0.1 + + data-view-byte-offset@1.0.0: + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-data-view: 1.0.1 + + debug@4.3.4(supports-color@5.5.0): + dependencies: + ms: 2.1.2 + optionalDependencies: + supports-color: 5.5.0 + + decamelize-keys@1.1.1: + dependencies: + decamelize: 1.2.0 + map-obj: 1.0.1 + + decamelize@1.2.0: {} + + deep-eql@4.1.3: + dependencies: + type-detect: 4.0.8 + + defaults@1.0.4: + dependencies: + clone: 1.0.4 + + define-data-property@1.1.4: + dependencies: + es-define-property: 1.0.0 + es-errors: 1.3.0 + gopd: 1.0.1 + + define-properties@1.2.1: + dependencies: + define-data-property: 1.1.4 + has-property-descriptors: 1.0.2 + object-keys: 1.1.1 + + detect-indent@6.1.0: {} + + detect-libc@1.0.3: {} + + didyoumean@1.2.2: {} + + diff-sequences@29.6.3: {} + + dir-glob@3.0.1: + dependencies: + path-type: 4.0.0 + + eastasianwidth@0.2.0: {} + + emoji-regex@8.0.0: {} + + emoji-regex@9.2.2: {} + + enquirer@2.4.1: + dependencies: + ansi-colors: 4.1.3 + strip-ansi: 6.0.1 + + error-ex@1.3.2: + dependencies: + is-arrayish: 0.2.1 + + es-abstract@1.23.3: + dependencies: + array-buffer-byte-length: 1.0.1 + arraybuffer.prototype.slice: 1.0.3 + available-typed-arrays: 1.0.7 + call-bind: 1.0.7 + data-view-buffer: 1.0.1 + data-view-byte-length: 1.0.1 + data-view-byte-offset: 1.0.0 + es-define-property: 1.0.0 + es-errors: 1.3.0 + es-object-atoms: 1.0.0 + es-set-tostringtag: 2.0.3 + es-to-primitive: 1.2.1 + function.prototype.name: 1.1.6 + get-intrinsic: 1.2.4 + get-symbol-description: 1.0.2 + globalthis: 1.0.3 + gopd: 1.0.1 + has-property-descriptors: 1.0.2 + has-proto: 1.0.3 + has-symbols: 1.0.3 + hasown: 2.0.2 + internal-slot: 1.0.7 + is-array-buffer: 3.0.4 + is-callable: 1.2.7 + is-data-view: 1.0.1 + is-negative-zero: 2.0.3 + is-regex: 1.1.4 + is-shared-array-buffer: 1.0.3 + is-string: 1.0.7 + is-typed-array: 1.1.13 + is-weakref: 1.0.2 + object-inspect: 1.13.1 + object-keys: 1.1.1 + object.assign: 4.1.5 + regexp.prototype.flags: 1.5.2 + safe-array-concat: 1.1.2 + safe-regex-test: 1.0.3 + string.prototype.trim: 1.2.9 + string.prototype.trimend: 1.0.8 + string.prototype.trimstart: 1.0.8 + typed-array-buffer: 1.0.2 + typed-array-byte-length: 1.0.1 + typed-array-byte-offset: 1.0.2 + typed-array-length: 1.0.6 + unbox-primitive: 1.0.2 + which-typed-array: 1.1.15 + + es-define-property@1.0.0: + dependencies: + get-intrinsic: 1.2.4 + + es-errors@1.3.0: {} + + es-object-atoms@1.0.0: + dependencies: + es-errors: 1.3.0 + + es-set-tostringtag@2.0.3: + dependencies: + get-intrinsic: 1.2.4 + has-tostringtag: 1.0.2 + hasown: 2.0.2 + + es-shim-unscopables@1.0.2: + dependencies: + hasown: 2.0.2 + + es-to-primitive@1.2.1: + dependencies: + is-callable: 1.2.7 + is-date-object: 1.0.5 + is-symbol: 1.0.4 + + esbuild@0.19.9: + optionalDependencies: + '@esbuild/android-arm': 0.19.9 + '@esbuild/android-arm64': 0.19.9 + '@esbuild/android-x64': 0.19.9 + '@esbuild/darwin-arm64': 0.19.9 + '@esbuild/darwin-x64': 0.19.9 + '@esbuild/freebsd-arm64': 0.19.9 + '@esbuild/freebsd-x64': 0.19.9 + '@esbuild/linux-arm': 0.19.9 + '@esbuild/linux-arm64': 0.19.9 + '@esbuild/linux-ia32': 0.19.9 + '@esbuild/linux-loong64': 0.19.9 + '@esbuild/linux-mips64el': 0.19.9 + '@esbuild/linux-ppc64': 0.19.9 + '@esbuild/linux-riscv64': 0.19.9 + '@esbuild/linux-s390x': 0.19.9 + '@esbuild/linux-x64': 0.19.9 + '@esbuild/netbsd-x64': 0.19.9 + '@esbuild/openbsd-x64': 0.19.9 + '@esbuild/sunos-x64': 0.19.9 + '@esbuild/win32-arm64': 0.19.9 + '@esbuild/win32-ia32': 0.19.9 + '@esbuild/win32-x64': 0.19.9 + + esbuild@0.20.2: + optionalDependencies: + '@esbuild/aix-ppc64': 0.20.2 + '@esbuild/android-arm': 0.20.2 + '@esbuild/android-arm64': 0.20.2 + '@esbuild/android-x64': 0.20.2 + '@esbuild/darwin-arm64': 0.20.2 + '@esbuild/darwin-x64': 0.20.2 + '@esbuild/freebsd-arm64': 0.20.2 + '@esbuild/freebsd-x64': 0.20.2 + '@esbuild/linux-arm': 0.20.2 + '@esbuild/linux-arm64': 0.20.2 + '@esbuild/linux-ia32': 0.20.2 + '@esbuild/linux-loong64': 0.20.2 + '@esbuild/linux-mips64el': 0.20.2 + '@esbuild/linux-ppc64': 0.20.2 + '@esbuild/linux-riscv64': 0.20.2 + '@esbuild/linux-s390x': 0.20.2 + '@esbuild/linux-x64': 0.20.2 + '@esbuild/netbsd-x64': 0.20.2 + '@esbuild/openbsd-x64': 0.20.2 + '@esbuild/sunos-x64': 0.20.2 + '@esbuild/win32-arm64': 0.20.2 + '@esbuild/win32-ia32': 0.20.2 + '@esbuild/win32-x64': 0.20.2 + + escalade@3.1.2: {} + + escape-string-regexp@1.0.5: {} + + esprima@4.0.1: {} + + estree-walker@3.0.3: + dependencies: + '@types/estree': 1.0.5 + + execa@5.1.1: + dependencies: + cross-spawn: 7.0.3 + get-stream: 6.0.1 + human-signals: 2.1.0 + is-stream: 2.0.1 + merge-stream: 2.0.0 + npm-run-path: 4.0.1 + onetime: 5.1.2 + signal-exit: 3.0.7 + strip-final-newline: 2.0.0 + + execa@8.0.1: + dependencies: + cross-spawn: 7.0.3 + get-stream: 8.0.1 + human-signals: 5.0.0 + is-stream: 3.0.0 + merge-stream: 2.0.0 + npm-run-path: 5.1.0 + onetime: 6.0.0 + signal-exit: 4.1.0 + strip-final-newline: 3.0.0 + + execa@9.0.1: + dependencies: + '@sindresorhus/merge-streams': 4.0.0 + cross-spawn: 7.0.3 + figures: 6.1.0 + get-stream: 9.0.1 + human-signals: 7.0.0 + is-plain-obj: 4.1.0 + is-stream: 4.0.1 + npm-run-path: 5.3.0 + pretty-ms: 9.0.0 + signal-exit: 4.1.0 + strip-final-newline: 4.0.0 + yoctocolors: 2.0.0 + + extendable-error@0.1.7: {} + + external-editor@3.1.0: + dependencies: + chardet: 0.7.0 + iconv-lite: 0.4.24 + tmp: 0.0.33 + + fast-glob@3.3.1: + dependencies: + '@nodelib/fs.stat': 2.0.5 + '@nodelib/fs.walk': 1.2.8 + glob-parent: 5.1.2 + merge2: 1.4.1 + micromatch: 4.0.5 + + fastq@1.15.0: + dependencies: + reusify: 1.0.4 + + figures@6.1.0: + dependencies: + is-unicode-supported: 2.0.0 + + fill-range@7.0.1: + dependencies: + to-regex-range: 5.0.1 + + find-up@4.1.0: + dependencies: + locate-path: 5.0.0 + path-exists: 4.0.0 + + find-up@5.0.0: + dependencies: + locate-path: 6.0.0 + path-exists: 4.0.0 + + find-yarn-workspace-root2@1.2.16: + dependencies: + micromatch: 4.0.5 + pkg-dir: 4.2.0 + + for-each@0.3.3: + dependencies: + is-callable: 1.2.7 + + foreground-child@3.1.1: + dependencies: + cross-spawn: 7.0.3 + signal-exit: 4.1.0 + + fs-extra@7.0.1: + dependencies: + graceful-fs: 4.2.11 + jsonfile: 4.0.0 + universalify: 0.1.2 + + fs-extra@8.1.0: + dependencies: + graceful-fs: 4.2.11 + jsonfile: 4.0.0 + universalify: 0.1.2 + + fsevents@2.3.3: + optional: true + + function-bind@1.1.2: {} + + function.prototype.name@1.1.6: + dependencies: + call-bind: 1.0.7 + define-properties: 1.2.1 + es-abstract: 1.23.3 + functions-have-names: 1.2.3 + + functions-have-names@1.2.3: {} + + get-caller-file@2.0.5: {} + + get-func-name@2.0.2: {} + + get-intrinsic@1.2.4: + dependencies: + es-errors: 1.3.0 + function-bind: 1.1.2 + has-proto: 1.0.3 + has-symbols: 1.0.3 + hasown: 2.0.2 + + get-stream@6.0.1: {} + + get-stream@8.0.1: {} + + get-stream@9.0.1: + dependencies: + '@sec-ant/readable-stream': 0.4.1 + is-stream: 4.0.1 + + get-symbol-description@1.0.2: + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 + + glob-parent@5.1.2: + dependencies: + is-glob: 4.0.3 + + glob@10.3.10: + dependencies: + foreground-child: 3.1.1 + jackspeak: 2.3.6 + minimatch: 9.0.3 + minipass: 5.0.0 + path-scurry: 1.10.1 + + globalthis@1.0.3: + dependencies: + define-properties: 1.2.1 + + globby@11.1.0: + dependencies: + array-union: 2.1.0 + dir-glob: 3.0.1 + fast-glob: 3.3.1 + ignore: 5.2.4 + merge2: 1.4.1 + slash: 3.0.0 + + gopd@1.0.1: + dependencies: + get-intrinsic: 1.2.4 + + graceful-fs@4.2.11: {} + + grapheme-splitter@1.0.4: {} + + hard-rejection@2.1.0: {} + + has-bigints@1.0.2: {} + + has-flag@3.0.0: {} + + has-flag@4.0.0: {} + + has-property-descriptors@1.0.2: + dependencies: + es-define-property: 1.0.0 + + has-proto@1.0.3: {} + + has-symbols@1.0.3: {} + + has-tostringtag@1.0.2: + dependencies: + has-symbols: 1.0.3 + + hasown@2.0.2: + dependencies: + function-bind: 1.1.2 + + hosted-git-info@2.8.9: {} + + human-id@1.0.2: {} + + human-signals@2.1.0: {} + + human-signals@5.0.0: {} + + human-signals@7.0.0: {} + + iconv-lite@0.4.24: + dependencies: + safer-buffer: 2.1.2 + + ignore-by-default@1.0.1: {} + + ignore@5.2.4: {} + + indent-string@4.0.0: {} + + internal-slot@1.0.7: + dependencies: + es-errors: 1.3.0 + hasown: 2.0.2 + side-channel: 1.0.6 + + ionstore@1.0.0: {} + + is-array-buffer@3.0.4: + dependencies: + call-bind: 1.0.7 + get-intrinsic: 1.2.4 + + is-arrayish@0.2.1: {} + + is-bigint@1.0.4: + dependencies: + has-bigints: 1.0.2 + + is-binary-path@2.1.0: + dependencies: + binary-extensions: 2.2.0 + + is-boolean-object@1.1.2: + dependencies: + call-bind: 1.0.7 + has-tostringtag: 1.0.2 + + is-callable@1.2.7: {} + + is-core-module@2.13.1: + dependencies: + hasown: 2.0.2 + + is-data-view@1.0.1: + dependencies: + is-typed-array: 1.1.13 + + is-date-object@1.0.5: + dependencies: + has-tostringtag: 1.0.2 + + is-extglob@2.1.1: {} + + is-fullwidth-code-point@3.0.0: {} + + is-glob@4.0.3: + dependencies: + is-extglob: 2.1.1 + + is-negative-zero@2.0.3: {} + + is-number-object@1.0.7: + dependencies: + has-tostringtag: 1.0.2 + + is-number@7.0.0: {} + + is-plain-obj@1.1.0: {} + + is-plain-obj@4.1.0: {} + + is-regex@1.1.4: + dependencies: + call-bind: 1.0.7 + has-tostringtag: 1.0.2 + + is-shared-array-buffer@1.0.3: + dependencies: + call-bind: 1.0.7 + + is-stream@2.0.1: {} + + is-stream@3.0.0: {} + + is-stream@4.0.1: {} + + is-string@1.0.7: + dependencies: + has-tostringtag: 1.0.2 + + is-subdir@1.2.0: + dependencies: + better-path-resolve: 1.0.0 + + is-symbol@1.0.4: + dependencies: + has-symbols: 1.0.3 + + is-typed-array@1.1.13: + dependencies: + which-typed-array: 1.1.15 + + is-unicode-supported@2.0.0: {} + + is-weakref@1.0.2: + dependencies: + call-bind: 1.0.7 + + is-windows@1.0.2: {} + + isarray@2.0.5: {} + + isexe@2.0.0: {} + + jackspeak@2.3.6: + dependencies: + '@isaacs/cliui': 8.0.2 + optionalDependencies: + '@pkgjs/parseargs': 0.11.0 + + jiti@1.21.0: {} + + joycon@3.1.1: {} + + js-tokens@4.0.0: {} + + js-tokens@9.0.0: {} + + js-yaml@3.14.1: + dependencies: + argparse: 1.0.10 + esprima: 4.0.1 + + json-parse-even-better-errors@2.3.1: {} + + jsonc-parser@3.2.0: {} + + jsonfile@4.0.0: + optionalDependencies: + graceful-fs: 4.2.11 + + kind-of@6.0.3: {} + + kleur@4.1.5: {} + + lilconfig@2.1.0: {} + + lines-and-columns@1.2.4: {} + + load-tsconfig@0.2.5: {} + + load-yaml-file@0.2.0: + dependencies: + graceful-fs: 4.2.11 + js-yaml: 3.14.1 + pify: 4.0.1 + strip-bom: 3.0.0 + + local-pkg@0.5.0: + dependencies: + mlly: 1.4.2 + pkg-types: 1.0.3 + + locate-path@5.0.0: + dependencies: + p-locate: 4.1.0 + + locate-path@6.0.0: + dependencies: + p-locate: 5.0.0 + + lodash.sortby@4.7.0: {} + + lodash.startcase@4.4.0: {} + + loupe@2.3.7: + dependencies: + get-func-name: 2.0.2 + + lru-cache@10.1.0: {} + + lru-cache@4.1.5: + dependencies: + pseudomap: 1.0.2 + yallist: 2.1.2 + + lru-cache@6.0.0: + dependencies: + yallist: 4.0.0 + + magic-string@0.30.10: + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 + + map-obj@1.0.1: {} + + map-obj@4.3.0: {} + + meow@6.1.1: + dependencies: + '@types/minimist': 1.2.5 + camelcase-keys: 6.2.2 + decamelize-keys: 1.1.1 + hard-rejection: 2.1.0 + minimist-options: 4.1.0 + normalize-package-data: 2.5.0 + read-pkg-up: 7.0.1 + redent: 3.0.0 + trim-newlines: 3.0.1 + type-fest: 0.13.1 + yargs-parser: 18.1.3 + + merge-stream@2.0.0: {} + + merge2@1.4.1: {} + + micromatch@4.0.5: + dependencies: + braces: 3.0.2 + picomatch: 2.3.1 + + mime-db@1.52.0: {} + + mime-types@2.1.35: + dependencies: + mime-db: 1.52.0 + + mimic-fn@2.1.0: {} + + mimic-fn@4.0.0: {} + + min-indent@1.0.1: {} + + minimatch@3.1.2: + dependencies: + brace-expansion: 1.1.11 + + minimatch@9.0.3: + dependencies: + brace-expansion: 2.0.1 + + minimist-options@4.1.0: + dependencies: + arrify: 1.0.1 + is-plain-obj: 1.1.0 + kind-of: 6.0.3 + + minipass@5.0.0: {} + + minipass@7.1.1: {} + + minizlib@3.0.1: + dependencies: + minipass: 7.1.1 + rimraf: 5.0.5 + + mixme@0.5.10: {} + + mkdirp@3.0.1: {} + + mlly@1.4.2: + dependencies: + acorn: 8.10.0 + pathe: 1.1.2 + pkg-types: 1.0.3 + ufo: 1.3.0 + + ms@2.1.2: {} + + mz@2.7.0: + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + + nanoid@3.3.7: {} + + nodemon@3.1.0: + dependencies: + chokidar: 3.6.0 + debug: 4.3.4(supports-color@5.5.0) + ignore-by-default: 1.0.1 + minimatch: 3.1.2 + pstree.remy: 1.1.8 + semver: 7.6.0 + simple-update-notifier: 2.0.0 + supports-color: 5.5.0 + touch: 3.1.0 + undefsafe: 2.0.5 + + nopt@1.0.10: + dependencies: + abbrev: 1.1.1 + + normalize-package-data@2.5.0: + dependencies: + hosted-git-info: 2.8.9 + resolve: 1.22.8 + semver: 5.7.2 + validate-npm-package-license: 3.0.4 + + normalize-path@3.0.0: {} + + npm-run-path@4.0.1: + dependencies: + path-key: 3.1.1 + + npm-run-path@5.1.0: + dependencies: + path-key: 4.0.0 + + npm-run-path@5.3.0: + dependencies: + path-key: 4.0.0 + + object-assign@4.1.1: {} + + object-inspect@1.13.1: {} + + object-keys@1.1.1: {} + + object.assign@4.1.5: + dependencies: + call-bind: 1.0.7 + define-properties: 1.2.1 + has-symbols: 1.0.3 + object-keys: 1.1.1 + + onetime@5.1.2: + dependencies: + mimic-fn: 2.1.0 + + onetime@6.0.0: + dependencies: + mimic-fn: 4.0.0 + + os-tmpdir@1.0.2: {} + + outdent@0.5.0: {} + + p-filter@2.1.0: + dependencies: + p-map: 2.1.0 + + p-limit@2.3.0: + dependencies: + p-try: 2.2.0 + + p-limit@3.1.0: + dependencies: + yocto-queue: 0.1.0 + + p-limit@5.0.0: + dependencies: + yocto-queue: 1.0.0 + + p-locate@4.1.0: + dependencies: + p-limit: 2.3.0 + + p-locate@5.0.0: + dependencies: + p-limit: 3.1.0 + + p-map@2.1.0: {} + + p-try@2.2.0: {} + + parse-json@5.2.0: + dependencies: + '@babel/code-frame': 7.24.2 + error-ex: 1.3.2 + json-parse-even-better-errors: 2.3.1 + lines-and-columns: 1.2.4 + + parse-ms@4.0.0: {} + + path-exists@4.0.0: {} + + path-key@3.1.1: {} + + path-key@4.0.0: {} + + path-parse@1.0.7: {} + + path-scurry@1.10.1: + dependencies: + lru-cache: 10.1.0 + minipass: 5.0.0 + + path-type@4.0.0: {} + + pathe@1.1.2: {} + + pathval@1.1.1: {} + + picocolors@1.0.0: {} + + picomatch@2.3.1: {} + + pify@4.0.1: {} + + pirates@4.0.6: {} + + pkg-dir@4.2.0: + dependencies: + find-up: 4.1.0 + + pkg-types@1.0.3: + dependencies: + jsonc-parser: 3.2.0 + mlly: 1.4.2 + pathe: 1.1.2 + + possible-typed-array-names@1.0.0: {} + + postcss-load-config@4.0.1(postcss@8.4.38): + dependencies: + lilconfig: 2.1.0 + yaml: 2.3.2 + optionalDependencies: + postcss: 8.4.38 + + postcss@8.4.38: + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.2.0 + + preferred-pm@3.1.3: + dependencies: + find-up: 5.0.0 + find-yarn-workspace-root2: 1.2.16 + path-exists: 4.0.0 + which-pm: 2.0.0 + + prettier@2.8.8: {} + + prettier@3.2.5: {} + + pretty-format@29.7.0: + dependencies: + '@jest/schemas': 29.6.3 + ansi-styles: 5.2.0 + react-is: 18.2.0 + + pretty-ms@9.0.0: + dependencies: + parse-ms: 4.0.0 + + pseudomap@1.0.2: {} + + pstree.remy@1.1.8: {} + + punycode@2.3.0: {} + + queue-microtask@1.2.3: {} + + quick-lru@4.0.1: {} + + react-is@18.2.0: {} + + read-pkg-up@7.0.1: + dependencies: + find-up: 4.1.0 + read-pkg: 5.2.0 + type-fest: 0.8.1 + + read-pkg@5.2.0: + dependencies: + '@types/normalize-package-data': 2.4.4 + normalize-package-data: 2.5.0 + parse-json: 5.2.0 + type-fest: 0.6.0 + + read-yaml-file@1.1.0: + dependencies: + graceful-fs: 4.2.11 + js-yaml: 3.14.1 + pify: 4.0.1 + strip-bom: 3.0.0 + + readdirp@3.6.0: + dependencies: + picomatch: 2.3.1 + + redent@3.0.0: + dependencies: + indent-string: 4.0.0 + strip-indent: 3.0.0 + + regenerator-runtime@0.14.1: {} + + regexp.prototype.flags@1.5.2: + dependencies: + call-bind: 1.0.7 + define-properties: 1.2.1 + es-errors: 1.3.0 + set-function-name: 2.0.2 + + require-directory@2.1.1: {} + + require-main-filename@2.0.0: {} + + resolve-from@5.0.0: {} + + resolve@1.22.8: + dependencies: + is-core-module: 2.13.1 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + + reusify@1.0.4: {} + + rimraf@5.0.5: + dependencies: + glob: 10.3.10 + + rollup@4.16.1: + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.16.1 + '@rollup/rollup-android-arm64': 4.16.1 + '@rollup/rollup-darwin-arm64': 4.16.1 + '@rollup/rollup-darwin-x64': 4.16.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.16.1 + '@rollup/rollup-linux-arm-musleabihf': 4.16.1 + '@rollup/rollup-linux-arm64-gnu': 4.16.1 + '@rollup/rollup-linux-arm64-musl': 4.16.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.16.1 + '@rollup/rollup-linux-riscv64-gnu': 4.16.1 + '@rollup/rollup-linux-s390x-gnu': 4.16.1 + '@rollup/rollup-linux-x64-gnu': 4.16.1 + '@rollup/rollup-linux-x64-musl': 4.16.1 + '@rollup/rollup-win32-arm64-msvc': 4.16.1 + '@rollup/rollup-win32-ia32-msvc': 4.16.1 + '@rollup/rollup-win32-x64-msvc': 4.16.1 + fsevents: 2.3.3 + + rollup@4.9.1: + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.9.1 + '@rollup/rollup-android-arm64': 4.9.1 + '@rollup/rollup-darwin-arm64': 4.9.1 + '@rollup/rollup-darwin-x64': 4.9.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.9.1 + '@rollup/rollup-linux-arm64-gnu': 4.9.1 + '@rollup/rollup-linux-arm64-musl': 4.9.1 + '@rollup/rollup-linux-riscv64-gnu': 4.9.1 + '@rollup/rollup-linux-x64-gnu': 4.9.1 + '@rollup/rollup-linux-x64-musl': 4.9.1 + '@rollup/rollup-win32-arm64-msvc': 4.9.1 + '@rollup/rollup-win32-ia32-msvc': 4.9.1 + '@rollup/rollup-win32-x64-msvc': 4.9.1 + fsevents: 2.3.3 + + run-parallel@1.2.0: + dependencies: + queue-microtask: 1.2.3 + + safe-array-concat@1.1.2: + dependencies: + call-bind: 1.0.7 + get-intrinsic: 1.2.4 + has-symbols: 1.0.3 + isarray: 2.0.5 + + safe-regex-test@1.0.3: + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + is-regex: 1.1.4 + + safer-buffer@2.1.2: {} + + semver@5.7.2: {} + + semver@7.6.0: + dependencies: + lru-cache: 6.0.0 + + set-blocking@2.0.0: {} + + set-function-length@1.2.2: + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + function-bind: 1.1.2 + get-intrinsic: 1.2.4 + gopd: 1.0.1 + has-property-descriptors: 1.0.2 + + set-function-name@2.0.2: + dependencies: + define-data-property: 1.1.4 + es-errors: 1.3.0 + functions-have-names: 1.2.3 + has-property-descriptors: 1.0.2 + + shebang-command@1.2.0: + dependencies: + shebang-regex: 1.0.0 + + shebang-command@2.0.0: + dependencies: + shebang-regex: 3.0.0 + + shebang-regex@1.0.0: {} + + shebang-regex@3.0.0: {} + + side-channel@1.0.6: + dependencies: + call-bind: 1.0.7 + es-errors: 1.3.0 + get-intrinsic: 1.2.4 + object-inspect: 1.13.1 + + siginfo@2.0.0: {} + + signal-exit@3.0.7: {} + + signal-exit@4.1.0: {} + + simple-update-notifier@2.0.0: + dependencies: + semver: 7.6.0 + + sisteransi@1.0.5: {} + + slash@3.0.0: {} + + smartwrap@2.0.2: + dependencies: + array.prototype.flat: 1.3.2 + breakword: 1.0.6 grapheme-splitter: 1.0.4 strip-ansi: 6.0.1 wcwidth: 1.0.1 yargs: 15.4.1 - dev: true - /smol-toml@1.1.4: - resolution: {integrity: sha512-Y0OT8HezWsTNeEOSVxDnKOW/AyNXHQ4BwJNbAXlLTF5wWsBvrcHhIkE5Rf8kQMLmgf7nDX3PVOlgC6/Aiggu3Q==} - engines: {node: '>= 18', pnpm: '>= 8'} - dev: false + smol-toml@1.1.4: {} - /source-map-js@1.2.0: - resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} - engines: {node: '>=0.10.0'} - dev: true + source-map-js@1.2.0: {} - /source-map@0.8.0-beta.0: - resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} - engines: {node: '>= 8'} + source-map@0.8.0-beta.0: dependencies: whatwg-url: 7.1.0 - dev: true - /spawndamnit@2.0.0: - resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==} + spawndamnit@2.0.0: dependencies: cross-spawn: 5.1.0 signal-exit: 3.0.7 - dev: true - /spdx-correct@3.2.0: - resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} + spdx-correct@3.2.0: dependencies: spdx-expression-parse: 3.0.1 spdx-license-ids: 3.0.17 - dev: true - /spdx-exceptions@2.5.0: - resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} - dev: true + spdx-exceptions@2.5.0: {} - /spdx-expression-parse@3.0.1: - resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} + spdx-expression-parse@3.0.1: dependencies: spdx-exceptions: 2.5.0 spdx-license-ids: 3.0.17 - dev: true - /spdx-license-ids@3.0.17: - resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} - dev: true + spdx-license-ids@3.0.17: {} - /sprintf-js@1.0.3: - resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} - dev: true + sprintf-js@1.0.3: {} - /stackback@0.0.2: - resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - dev: true + stackback@0.0.2: {} - /std-env@3.7.0: - resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} - dev: true + std-env@3.7.0: {} - /stream-transform@2.1.3: - resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} + stream-transform@2.1.3: dependencies: mixme: 0.5.10 - dev: true - /string-width@4.2.3: - resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} - engines: {node: '>=8'} + string-width@4.2.3: dependencies: emoji-regex: 8.0.0 is-fullwidth-code-point: 3.0.0 strip-ansi: 6.0.1 - /string-width@5.1.2: - resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} - engines: {node: '>=12'} + string-width@5.1.2: dependencies: eastasianwidth: 0.2.0 emoji-regex: 9.2.2 strip-ansi: 7.1.0 - /string.prototype.trim@1.2.9: - resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} - engines: {node: '>= 0.4'} + string.prototype.trim@1.2.9: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 es-abstract: 1.23.3 es-object-atoms: 1.0.0 - dev: true - /string.prototype.trimend@1.0.8: - resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} + string.prototype.trimend@1.0.8: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 - dev: true - /string.prototype.trimstart@1.0.8: - resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} - engines: {node: '>= 0.4'} + string.prototype.trimstart@1.0.8: dependencies: call-bind: 1.0.7 define-properties: 1.2.1 es-object-atoms: 1.0.0 - dev: true - /strip-ansi@6.0.1: - resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} - engines: {node: '>=8'} + strip-ansi@6.0.1: dependencies: ansi-regex: 5.0.1 - /strip-ansi@7.1.0: - resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} - engines: {node: '>=12'} + strip-ansi@7.1.0: dependencies: ansi-regex: 6.0.1 - /strip-bom@3.0.0: - resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} - engines: {node: '>=4'} - dev: true + strip-bom@3.0.0: {} - /strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - dev: true + strip-final-newline@2.0.0: {} - /strip-final-newline@3.0.0: - resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} - engines: {node: '>=12'} + strip-final-newline@3.0.0: {} - /strip-indent@3.0.0: - resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} - engines: {node: '>=8'} - dependencies: - min-indent: 1.0.1 - dev: true + strip-final-newline@4.0.0: {} - /strip-literal@2.0.0: - resolution: {integrity: sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==} + strip-indent@3.0.0: dependencies: - js-tokens: 8.0.3 - dev: true + min-indent: 1.0.1 - /strip-literal@2.1.0: - resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} + strip-literal@2.1.0: dependencies: js-tokens: 9.0.0 - dev: true - /sucrase@3.35.0: - resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} - engines: {node: '>=16 || 14 >=14.17'} - hasBin: true + sucrase@3.35.0: dependencies: '@jridgewell/gen-mapping': 0.3.3 commander: 4.1.1 @@ -3798,146 +4559,73 @@ packages: pirates: 4.0.6 ts-interface-checker: 0.1.13 - /supports-color@5.5.0: - resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} - engines: {node: '>=4'} + supports-color@5.5.0: dependencies: has-flag: 3.0.0 - /supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} + supports-color@7.2.0: dependencies: has-flag: 4.0.0 - /supports-preserve-symlinks-flag@1.0.0: - resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} - engines: {node: '>= 0.4'} - dev: true + supports-preserve-symlinks-flag@1.0.0: {} - /tar@7.0.0: - resolution: {integrity: sha512-spRiR+tDOVD01YeeWBUbNa6HoQErjztT2BXxZWmxJDgaCVgZMO1RAoeKpybiUbr8FxKsUm/svtiEyIRZeWYhAw==} - engines: {node: '>=18'} + tar@7.1.0: dependencies: '@isaacs/fs-minipass': 4.0.0 chownr: 3.0.0 - minipass: 5.0.0 + minipass: 7.1.1 minizlib: 3.0.1 mkdirp: 3.0.1 yallist: 5.0.0 - dev: false - /term-size@2.2.1: - resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} - engines: {node: '>=8'} - dev: true + term-size@2.2.1: {} - /thenify-all@1.6.0: - resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} - engines: {node: '>=0.8'} + thenify-all@1.6.0: dependencies: thenify: 3.3.1 - /thenify@3.3.1: - resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + thenify@3.3.1: dependencies: any-promise: 1.3.0 - /tiny-colors@2.0.2: - resolution: {integrity: sha512-FYzA5Q5myp26PIZ4mx/03SreNgB1dGqcHJnj1Z8UVQ8/CBw0c6qRoPgRdk8rKpviY5diZyOmRGYMYKLYbjnmWQ==} - dev: false + tiny-colors@2.0.2: {} - /tiny-updater@3.5.2: - resolution: {integrity: sha512-5EjK01h0rvgv+Eb0XaiTZJZR+ujdjCDHZ1ZCVCu+1h4+MyOYZ+za8UKuKdNOOOSKhkkC9B08o6ZhF4JnQg7ZLg==} + tiny-updater@3.5.2: dependencies: ionstore: 1.0.0 tiny-colors: 2.0.2 when-exit: 2.1.1 - dev: false - - /tinybench@2.6.0: - resolution: {integrity: sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==} - dev: true - - /tinybench@2.8.0: - resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} - dev: true - /tinypool@0.8.3: - resolution: {integrity: sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==} - engines: {node: '>=14.0.0'} - dev: true + tinybench@2.8.0: {} - /tinypool@0.8.4: - resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} - engines: {node: '>=14.0.0'} - dev: true + tinypool@0.8.4: {} - /tinyspy@2.2.0: - resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==} - engines: {node: '>=14.0.0'} - dev: true + tinyspy@2.2.0: {} - /tmp@0.0.33: - resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} - engines: {node: '>=0.6.0'} + tmp@0.0.33: dependencies: os-tmpdir: 1.0.2 - dev: true - /to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 - dev: true - /touch@3.1.0: - resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==} - hasBin: true + touch@3.1.0: dependencies: nopt: 1.0.10 - dev: true - /tr46@1.0.1: - resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + tr46@1.0.1: dependencies: punycode: 2.3.0 - dev: true - /tree-kill@1.2.2: - resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} - hasBin: true - dev: true + tree-kill@1.2.2: {} - /trim-newlines@3.0.1: - resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} - engines: {node: '>=8'} - dev: true + trim-newlines@3.0.1: {} - /ts-interface-checker@0.1.13: - resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + ts-interface-checker@0.1.13: {} - /tsup@8.0.2(@swc/core@1.4.16)(typescript@5.4.5): - resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} - engines: {node: '>=18'} - hasBin: true - peerDependencies: - '@microsoft/api-extractor': ^7.36.0 - '@swc/core': ^1 - postcss: ^8.4.12 - typescript: '>=4.5.0' - peerDependenciesMeta: - '@microsoft/api-extractor': - optional: true - '@swc/core': - optional: true - postcss: - optional: true - typescript: - optional: true + tsup@8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5): dependencies: - '@swc/core': 1.4.16 bundle-require: 4.0.1(esbuild@0.19.9) cac: 6.7.14 chokidar: 3.5.3 @@ -3946,22 +4634,21 @@ packages: execa: 5.1.1 globby: 11.1.0 joycon: 3.1.1 - postcss-load-config: 4.0.1 + postcss-load-config: 4.0.1(postcss@8.4.38) resolve-from: 5.0.0 rollup: 4.9.1 source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 + optionalDependencies: + '@swc/core': 1.5.5 + postcss: 8.4.38 typescript: 5.4.5 transitivePeerDependencies: - supports-color - ts-node - dev: true - /tty-table@4.2.3: - resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==} - engines: {node: '>=8.0.0'} - hasBin: true + tty-table@4.2.3: dependencies: chalk: 4.1.2 csv: 5.5.3 @@ -3970,111 +4657,57 @@ packages: strip-ansi: 6.0.1 wcwidth: 1.0.1 yargs: 17.7.2 - dev: true - /turbo-darwin-64@1.13.2: - resolution: {integrity: sha512-CCSuD8CfmtncpohCuIgq7eAzUas0IwSbHfI8/Q3vKObTdXyN8vAo01gwqXjDGpzG9bTEVedD0GmLbD23dR0MLA==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true + turbo-darwin-64@1.13.3: optional: true - /turbo-darwin-arm64@1.13.2: - resolution: {integrity: sha512-0HySm06/D2N91rJJ89FbiI/AodmY8B3WDSFTVEpu2+8spUw7hOJ8okWOT0e5iGlyayUP9gr31eOeL3VFZkpfCw==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true + turbo-darwin-arm64@1.13.3: optional: true - /turbo-linux-64@1.13.2: - resolution: {integrity: sha512-7HnibgbqZrjn4lcfIouzlPu8ZHSBtURG4c7Bedu7WJUDeZo+RE1crlrQm8wuwO54S0siYqUqo7GNHxu4IXbioQ==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true + turbo-linux-64@1.13.3: optional: true - /turbo-linux-arm64@1.13.2: - resolution: {integrity: sha512-sUq4dbpk6SNKg/Hkwn256Vj2AEYSQdG96repio894h5/LEfauIK2QYiC/xxAeW3WBMc6BngmvNyURIg7ltrePg==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true + turbo-linux-arm64@1.13.3: optional: true - /turbo-windows-64@1.13.2: - resolution: {integrity: sha512-DqzhcrciWq3dpzllJR2VVIyOhSlXYCo4mNEWl98DJ3FZ08PEzcI3ceudlH6F0t/nIcfSItK1bDP39cs7YoZHEA==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true + turbo-windows-64@1.13.3: optional: true - /turbo-windows-arm64@1.13.2: - resolution: {integrity: sha512-WnPMrwfCXxK69CdDfS1/j2DlzcKxSmycgDAqV0XCYpK/812KB0KlvsVAt5PjEbZGXkY88pCJ1BLZHAjF5FcbqA==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true + turbo-windows-arm64@1.13.3: optional: true - /turbo@1.13.2: - resolution: {integrity: sha512-rX/d9f4MgRT3yK6cERPAkfavIxbpBZowDQpgvkYwGMGDQ0Nvw1nc0NVjruE76GrzXQqoxR1UpnmEP54vBARFHQ==} - hasBin: true + turbo@1.13.3: optionalDependencies: - turbo-darwin-64: 1.13.2 - turbo-darwin-arm64: 1.13.2 - turbo-linux-64: 1.13.2 - turbo-linux-arm64: 1.13.2 - turbo-windows-64: 1.13.2 - turbo-windows-arm64: 1.13.2 - dev: true - - /type-detect@4.0.8: - resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} - engines: {node: '>=4'} - dev: true + turbo-darwin-64: 1.13.3 + turbo-darwin-arm64: 1.13.3 + turbo-linux-64: 1.13.3 + turbo-linux-arm64: 1.13.3 + turbo-windows-64: 1.13.3 + turbo-windows-arm64: 1.13.3 - /type-fest@0.13.1: - resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==} - engines: {node: '>=10'} - dev: true + type-detect@4.0.8: {} - /type-fest@0.6.0: - resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} - engines: {node: '>=8'} - dev: true + type-fest@0.13.1: {} - /type-fest@0.8.1: - resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} - engines: {node: '>=8'} - dev: true + type-fest@0.6.0: {} - /typed-array-buffer@1.0.2: - resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} - engines: {node: '>= 0.4'} + type-fest@0.8.1: {} + + typed-array-buffer@1.0.2: dependencies: call-bind: 1.0.7 es-errors: 1.3.0 is-typed-array: 1.1.13 - dev: true - /typed-array-byte-length@1.0.1: - resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} - engines: {node: '>= 0.4'} + typed-array-byte-length@1.0.1: dependencies: call-bind: 1.0.7 for-each: 0.3.3 gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 - dev: true - /typed-array-byte-offset@1.0.2: - resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} - engines: {node: '>= 0.4'} + typed-array-byte-offset@1.0.2: dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.7 @@ -4082,11 +4715,8 @@ packages: gopd: 1.0.1 has-proto: 1.0.3 is-typed-array: 1.1.13 - dev: true - /typed-array-length@1.0.6: - resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} - engines: {node: '>= 0.4'} + typed-array-length@1.0.6: dependencies: call-bind: 1.0.7 for-each: 0.3.3 @@ -4094,57 +4724,36 @@ packages: has-proto: 1.0.3 is-typed-array: 1.1.13 possible-typed-array-names: 1.0.0 - dev: true - /typescript@5.4.5: - resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} - engines: {node: '>=14.17'} - hasBin: true - dev: true + typescript@5.4.5: {} - /ufo@1.3.0: - resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==} - dev: true + ufo@1.3.0: {} - /unbox-primitive@1.0.2: - resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} + unbox-primitive@1.0.2: dependencies: call-bind: 1.0.7 has-bigints: 1.0.2 has-symbols: 1.0.3 which-boxed-primitive: 1.0.2 - dev: true - /undefsafe@2.0.5: - resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} - dev: true + undefsafe@2.0.5: {} - /undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} - dev: true + undici-types@5.26.5: {} - /universalify@0.1.2: - resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} - engines: {node: '>= 4.0.0'} - dev: true + universalify@0.1.2: {} - /validate-npm-package-license@3.0.4: - resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} + validate-npm-package-license@3.0.4: dependencies: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - dev: true - /vite-node@1.5.0(@types/node@20.12.7): - resolution: {integrity: sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true + vite-node@1.6.0(@types/node@20.12.11): dependencies: cac: 6.7.14 debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.2.4(@types/node@20.12.7) + vite: 5.2.10(@types/node@20.12.11) transitivePeerDependencies: - '@types/node' - less @@ -4154,109 +4763,23 @@ packages: - sugarss - supports-color - terser - dev: true - /vite@5.2.10: - resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true + vite@5.2.10(@types/node@20.12.11): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.16.1 optionalDependencies: + '@types/node': 20.12.11 fsevents: 2.3.3 - dev: true - - /vite@5.2.4(@types/node@20.12.7): - resolution: {integrity: sha512-vjFghvHWidBTinu5TCymJk/lRHlR5ljqB83yugr0HA1xspUPdOZHqbqDLnZ8f9/jINrtFHTCYYyIUi+o+Q5iyg==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - '@types/node': 20.12.7 - esbuild: 0.20.2 - postcss: 8.4.38 - rollup: 4.13.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - /vitest@1.5.0: - resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.5.0 - '@vitest/ui': 1.5.0 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true + vitest@1.6.0(@types/node@20.12.11): dependencies: - '@vitest/expect': 1.5.0 - '@vitest/runner': 1.5.0 - '@vitest/snapshot': 1.5.0 - '@vitest/spy': 1.5.0 - '@vitest/utils': 1.5.0 + '@vitest/expect': 1.6.0 + '@vitest/runner': 1.6.0 + '@vitest/snapshot': 1.6.0 + '@vitest/spy': 1.6.0 + '@vitest/utils': 1.6.0 acorn-walk: 8.3.2 chai: 4.4.1 debug: 4.3.4(supports-color@5.5.0) @@ -4269,65 +4792,11 @@ packages: strip-literal: 2.1.0 tinybench: 2.8.0 tinypool: 0.8.4 - vite: 5.2.10 - vite-node: 1.5.0(@types/node@20.12.7) - why-is-node-running: 2.2.2 - transitivePeerDependencies: - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - dev: true - - /vitest@1.5.0(@types/node@20.12.7): - resolution: {integrity: sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.5.0 - '@vitest/ui': 1.5.0 - happy-dom: '*' - jsdom: '*' - peerDependenciesMeta: - '@edge-runtime/vm': - optional: true - '@types/node': - optional: true - '@vitest/browser': - optional: true - '@vitest/ui': - optional: true - happy-dom: - optional: true - jsdom: - optional: true - dependencies: - '@types/node': 20.12.7 - '@vitest/expect': 1.5.0 - '@vitest/runner': 1.5.0 - '@vitest/snapshot': 1.5.0 - '@vitest/spy': 1.5.0 - '@vitest/utils': 1.5.0 - acorn-walk: 8.3.2 - chai: 4.4.1 - debug: 4.3.4(supports-color@5.5.0) - execa: 8.0.1 - local-pkg: 0.5.0 - magic-string: 0.30.8 - pathe: 1.1.2 - picocolors: 1.0.0 - std-env: 3.7.0 - strip-literal: 2.0.0 - tinybench: 2.6.0 - tinypool: 0.8.3 - vite: 5.2.4(@types/node@20.12.7) - vite-node: 1.5.0(@types/node@20.12.7) + vite: 5.2.10(@types/node@20.12.11) + vite-node: 1.6.0(@types/node@20.12.11) why-is-node-running: 2.2.2 + optionalDependencies: + '@types/node': 20.12.11 transitivePeerDependencies: - less - lightningcss @@ -4336,154 +4805,95 @@ packages: - sugarss - supports-color - terser - dev: true - /wcwidth@1.0.1: - resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} + wcwidth@1.0.1: dependencies: defaults: 1.0.4 - dev: true - /webidl-conversions@4.0.2: - resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} - dev: true + webidl-conversions@4.0.2: {} - /whatwg-url@7.1.0: - resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} + whatwg-url@7.1.0: dependencies: lodash.sortby: 4.7.0 tr46: 1.0.1 webidl-conversions: 4.0.2 - dev: true - /when-exit@2.1.1: - resolution: {integrity: sha512-XLipGldz/UcleuGaoQjbYuWwD+ICRnzIjlldtwTaTWr7aZz8yQW49rXk6MHQnh+KxOiWiJpM1vIyaxprOnlW4g==} - dev: false + when-exit@2.1.1: {} - /which-boxed-primitive@1.0.2: - resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} + which-boxed-primitive@1.0.2: dependencies: is-bigint: 1.0.4 is-boolean-object: 1.1.2 is-number-object: 1.0.7 is-string: 1.0.7 is-symbol: 1.0.4 - dev: true - /which-module@2.0.1: - resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} - dev: true + which-module@2.0.1: {} - /which-pm@2.0.0: - resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==} - engines: {node: '>=8.15'} + which-pm@2.0.0: dependencies: load-yaml-file: 0.2.0 path-exists: 4.0.0 - dev: true - /which-typed-array@1.1.15: - resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} - engines: {node: '>= 0.4'} + which-typed-array@1.1.15: dependencies: available-typed-arrays: 1.0.7 call-bind: 1.0.7 for-each: 0.3.3 gopd: 1.0.1 has-tostringtag: 1.0.2 - dev: true - /which@1.3.1: - resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} - hasBin: true + which@1.3.1: dependencies: isexe: 2.0.0 - dev: true - /which@2.0.2: - resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} - engines: {node: '>= 8'} - hasBin: true + which@2.0.2: dependencies: isexe: 2.0.0 - /why-is-node-running@2.2.2: - resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} - engines: {node: '>=8'} - hasBin: true + why-is-node-running@2.2.2: dependencies: siginfo: 2.0.0 stackback: 0.0.2 - dev: true - /wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} + wrap-ansi@6.2.0: dependencies: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - dev: true - /wrap-ansi@7.0.0: - resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} - engines: {node: '>=10'} + wrap-ansi@7.0.0: dependencies: ansi-styles: 4.3.0 string-width: 4.2.3 strip-ansi: 6.0.1 - /wrap-ansi@8.1.0: - resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} - engines: {node: '>=12'} + wrap-ansi@8.1.0: dependencies: ansi-styles: 6.2.1 string-width: 5.1.2 strip-ansi: 7.1.0 - /y18n@4.0.3: - resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} - dev: true + y18n@4.0.3: {} - /y18n@5.0.8: - resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} - engines: {node: '>=10'} - dev: true + y18n@5.0.8: {} - /yallist@2.1.2: - resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} - dev: true + yallist@2.1.2: {} - /yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - dev: true + yallist@4.0.0: {} - /yallist@5.0.0: - resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} - engines: {node: '>=18'} - dev: false + yallist@5.0.0: {} - /yaml@2.3.2: - resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} - engines: {node: '>= 14'} - dev: true + yaml@2.3.2: {} - /yargs-parser@18.1.3: - resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} - engines: {node: '>=6'} + yargs-parser@18.1.3: dependencies: camelcase: 5.3.1 decamelize: 1.2.0 - dev: true - /yargs-parser@21.1.1: - resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} - engines: {node: '>=12'} - dev: true + yargs-parser@21.1.1: {} - /yargs@15.4.1: - resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} - engines: {node: '>=8'} + yargs@15.4.1: dependencies: cliui: 6.0.0 decamelize: 1.2.0 @@ -4496,11 +4906,8 @@ packages: which-module: 2.0.1 y18n: 4.0.3 yargs-parser: 18.1.3 - dev: true - /yargs@17.7.2: - resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} - engines: {node: '>=12'} + yargs@17.7.2: dependencies: cliui: 8.0.1 escalade: 3.1.2 @@ -4509,14 +4916,9 @@ packages: string-width: 4.2.3 y18n: 5.0.8 yargs-parser: 21.1.1 - dev: true - /yocto-queue@0.1.0: - resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} - engines: {node: '>=10'} - dev: true + yocto-queue@0.1.0: {} - /yocto-queue@1.0.0: - resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} - engines: {node: '>=12.20'} - dev: true + yocto-queue@1.0.0: {} + + yoctocolors@2.0.0: {} From 5262f09ee2838d6d834ec8313a68f459bc422b88 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 9 May 2024 22:20:35 +0100 Subject: [PATCH 092/290] remove `packageManager` field --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index e10a62e..5624708 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,5 @@ "prettier": "^3.2.5", "turbo": "^1.13.3", "vitest": "^1.6.0" - }, - "packageManager": "pnpm@9.0.4" + } } From be8e5b71ec394d1e7e1f58681ae29cce839845a9 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 10 May 2024 13:38:18 +0100 Subject: [PATCH 093/290] fix types in `open` --- packages/utils/src/open/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/utils/src/open/index.ts b/packages/utils/src/open/index.ts index 68ce0da..3aac69e 100644 --- a/packages/utils/src/open/index.ts +++ b/packages/utils/src/open/index.ts @@ -1,5 +1,5 @@ // Taken verbatim from https://github.com/withastro/astro/blob/main/packages/astro/src/cli/docs/open.ts -import type { ExecaChildProcess } from "execa"; +import type { Result } from "execa"; import { execa } from "execa"; /** @@ -27,7 +27,7 @@ const getPlatformSpecificCommand = (): [string] | [string, string[]] => { } }; -export async function openInBrowser(url: string): Promise { +export async function openInBrowser(url: string): Promise { const [command, args = []] = getPlatformSpecificCommand(); return execa(command, [...args, encodeURI(url)]); } From a5cf3178bd97af3091aa88ecb88f660f40692b94 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Sat, 11 May 2024 19:11:04 -0400 Subject: [PATCH 094/290] Update transformPlugins to fit beta 2 config. --- packages/utils/src/transform/index.ts | 36 ++---- packages/utils/src/transform/parse.ts | 111 ++++++++++++++++++ .../utils/tests/plugin_transforms.test.ts | 24 ++-- 3 files changed, 133 insertions(+), 38 deletions(-) create mode 100644 packages/utils/src/transform/parse.ts diff --git a/packages/utils/src/transform/index.ts b/packages/utils/src/transform/index.ts index e8c24fd..59f3164 100644 --- a/packages/utils/src/transform/index.ts +++ b/packages/utils/src/transform/index.ts @@ -1,39 +1,19 @@ -import { transform } from "@swc/core"; -import { fileURLToPath } from "url"; +import { addPlugins } from "./parse"; + export type Config = { name: string; contents: string; }; + +// TODO: Handle case when vite config is a function + export const transformPlugins = async ( new_plugins: PluginOptions[], config: Config, - force_transform = false, - merge_configs = false, - wasm_path = fileURLToPath(new URL("../../../swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm", import.meta.url)), + _force_transform = false, + _merge_configs = false, ) => { - const res = await transform(config.contents, { - filename: config.name, - jsc: { - parser: { - syntax: "typescript", - tsx: false, - }, - target: "es2022", - experimental: { - plugins: [ - [ - wasm_path, - { - additionalPlugins: new_plugins, - forceTransform: force_transform, - mergeConfigs: merge_configs, - }, - ], - ], - }, - }, - }); - return res.code; + return addPlugins(config, new_plugins).code; }; // All the integrations/packages that we support // export const supported = ["unocss", "vitepwa", "solid-devtools"] as const; diff --git a/packages/utils/src/transform/parse.ts b/packages/utils/src/transform/parse.ts new file mode 100644 index 0000000..f8c96ef --- /dev/null +++ b/packages/utils/src/transform/parse.ts @@ -0,0 +1,111 @@ +import { parseModule, ASTNode, ProxifiedModule, generateCode } from "magicast"; +import { Config, PluginOptions } from "."; + +type ASTNodeFull = ASTNode & { + key?: ASTNodeFull; + value?: ASTNodeFull; + name?: string; + body?: ASTNodeFull[] | ASTNodeFull; +}; + +type ArrayExpression = Extract; + +const isNodeFunction = (node: ASTNodeFull) => node.type === "BlockStatement" || node.type === "ArrowFunctionExpression"; + +const getReturnStatement = (node: ASTNodeFull | undefined) => { + if (!node) return; + if (node.type === "BlockStatement" && node.body) { + let returnStatement; + + for (const leaf of node.body) { + if (leaf.type === "ReturnStatement") { + returnStatement = leaf; + break; + } + } + + return returnStatement; + } +}; + +const findOrCreatePluginsProperty = (node: ASTNodeFull) => { + if (node.type === "ObjectExpression" && node.properties) { + for (const leaf of node.properties) { + if ( + leaf.type === "ObjectProperty" && + leaf.key.loc?.identifierName === "plugins" && + leaf.value.type === "ArrayExpression" + ) { + return leaf.value; + } + } + + const value: ArrayExpression = { + type: "ArrayExpression", + elements: [], + }; + + node.properties.push({ + type: "ObjectProperty", + key: { + type: "Identifier", + name: "plugins", + }, + computed: false, + shorthand: false, + value, + }); + + return value; + } +}; + +const findPlugins = (mod: ProxifiedModule) => { + const props: ASTNodeFull[] = mod.exports.default.$args[0].$ast.properties; + + for (const prop of props) { + const key = prop.key?.name; + if (key === "vite") { + const isProperty = prop.type === "ObjectProperty"; + const isMethod = prop.type === "ObjectMethod"; + + if (isMethod || (isProperty && isNodeFunction(prop.value))) { + const returnValue = getReturnStatement( + isProperty && prop.value.type === "ArrowFunctionExpression" && prop.value.body.type === "BlockStatement" + ? prop.value.body + : isMethod && prop.body.body + ? prop.body + : undefined, + ); + + if (!returnValue) break; + + const arg = returnValue.argument; + if (arg?.type === "ObjectExpression") { + return findOrCreatePluginsProperty(arg); + } + } else if (isProperty && prop.value.type === "ObjectExpression") { + return findOrCreatePluginsProperty(prop.value); + } + + break; + } + } +}; + +export const addPlugins = (config: Config, plugins: PluginOptions[]) => { + const mod = parseModule(config.contents, { trailingComma: false, flowObjectCommas: false }); + + const current = findPlugins(mod); + + for (const plugin of plugins) { + mod.imports.$add({ + from: plugin.importSource, + imported: plugin.isDefault ? "default" : plugin.importName, + local: plugin.importName, + }); + current?.elements.push(`${plugin.importName}({})` as any); + } + + return generateCode(mod); +}; diff --git a/packages/utils/tests/plugin_transforms.test.ts b/packages/utils/tests/plugin_transforms.test.ts index 55459f1..2f962b1 100644 --- a/packages/utils/tests/plugin_transforms.test.ts +++ b/packages/utils/tests/plugin_transforms.test.ts @@ -12,22 +12,26 @@ const examplePlugin: PluginOptions = { describe("transformPlugins", () => { test("Config is updated properly", async () => { const config: Config = { - name: "vite.config.ts", - contents: `import solid from "solid-start/vite"; - // Simulates a vite config + name: "app.config.ts", + contents: `import { defineConfig } from "@solidjs/start/config"; + // Simulates an app config export default defineConfig({ - plugins: [solid()], + vite: { + plugins: [solid()] + } }); `, }; const expected = `import examplePlugin from "example"; - import solid from "solid-start/vite"; - // Simulates a vite config + import { defineConfig } from "@solidjs/start/config"; + // Simulates an app config export default defineConfig({ - plugins: [ - solid(), - examplePlugin({}) - ] + vite: { + plugins: [ + solid(), + examplePlugin({}) + ] + } });`; const result = await transformPlugins([examplePlugin], config); From 1ef6b0c11e4546ff955defe70721275b5ba3ed77 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Sat, 11 May 2024 20:44:46 -0400 Subject: [PATCH 095/290] Formatting, refactor old start file names to new. Add magicast and update plugin additions. Update test --- packages/commands/src/handlers/add.ts | 33 ++++++- packages/commands/src/handlers/new.ts | 8 +- .../commands/src/handlers/start/adapter.ts | 13 +-- packages/commands/src/handlers/start/mode.ts | 13 +-- packages/commands/src/lib/utils/helpers.ts | 18 ++-- .../tests/assets/sample_unocss_result.txt | 6 +- .../tests/assets/sample_vite_config.txt | 8 +- .../tests/config_manipulation.test.ts | 14 +-- packages/core/src/commands/index.ts | 6 ++ packages/core/src/commands/start.ts | 3 + packages/core/src/index.ts | 1 + packages/utils/package.json | 1 + packages/utils/src/config/index.ts | 9 ++ packages/utils/src/start/add_api.ts | 4 + packages/utils/src/start/add_data.ts | 4 + packages/utils/src/start/add_route.ts | 6 ++ packages/utils/src/start/index.ts | 2 +- packages/utils/src/transform/index.ts | 4 +- packages/utils/src/transform/parse.ts | 8 +- .../utils/tests/plugin_transforms.test.ts | 91 +++++++++++++++---- pnpm-lock.yaml | 49 ++++++++++ 21 files changed, 225 insertions(+), 76 deletions(-) diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index eafa288..a3a479f 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -5,7 +5,7 @@ import * as p from "@clack/prompts"; import color from "picocolors"; import { primitives, loadPrimitives } from "@solid-cli/utils/primitives"; import { t } from "@solid-cli/utils"; -import { fileExists, getRootFile, getViteConfig, validateFilePath } from "../lib/utils/helpers"; +import { fileExists, getRootFile, getAppConfig, validateFilePath } from "../lib/utils/helpers"; import { writeFile, readFile } from "@solid-cli/utils/fs"; import { transformPlugins, type PluginOptions } from "@solid-cli/utils/transform"; import { @@ -17,10 +17,13 @@ import { queueUpdate, summarizeUpdates, } from "@solid-cli/utils/updates"; + const handleAutocompleteAdd = async () => { const supportedIntegrations = (Object.keys(integrations) as Supported[]).map((value) => ({ label: value, value })); const opts = () => [...supportedIntegrations, ...primitives()]; + loadPrimitives().catch((e) => p.log.error(e)); + const a = await cancelable( autocomplete({ message: t.ADD_PACKAGES, @@ -32,6 +35,7 @@ const handleAutocompleteAdd = async () => { p.log.warn(t.NOTHING_SELECTED); return; } + const shouldInstall = await cancelable( p.select({ options: [ @@ -64,6 +68,7 @@ const isIntegration = (str: string) => { */ const transformPrimitives = async (ps: string[]) => { if (!ps.length) return []; + if (!primitives().length) { await spinnerify({ startText: t.LOADING_PRIMITIVES, @@ -71,10 +76,14 @@ const transformPrimitives = async (ps: string[]) => { fn: loadPrimitives, }); } + const mappedInput = ps.map((p) => p.replace("@solid-primitives/", "")); + return primitives().filter((p) => mappedInput.includes(p.value.replace("@solid-primitives/", ""))); }; + type Configs = Integrations[keyof Integrations][]; + export const handleAdd = async (packages?: string[], forceTransform: boolean = false) => { if (!packages?.length) { const autocompleted = await handleAutocompleteAdd(); @@ -101,7 +110,7 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f }) .filter((p) => p) as Configs; - const viteConfig = await getViteConfig(); + const appConfig = await getAppConfig(); for (let i = 0; i < configs.length; i++) { const config = configs[i]; @@ -120,17 +129,19 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f fn: async () => { const code = await transformPlugins( configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[], - { name: viteConfig, contents: (await readFile(viteConfig)).toString() }, + { name: appConfig, contents: (await readFile(appConfig)).toString() }, forceTransform, undefined, ); - writeFile(viteConfig, code); + await writeFile(appConfig, code); }, }); p.log.info("Preparing post install steps for integrations"); + let projectRoot = await getRootFile(); setRootFile(projectRoot); + if (!fileExists(projectRoot)) { p.log.error(color.red(`Can't find root file \`${projectRoot.split("/")[1]}\`.`)); await cancelable( @@ -138,7 +149,7 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f message: `Type path to root: `, validate(value) { if (!value.length) return `Path can not be empty`; - const path = validateFilePath(value, ["root.tsx", "index.tsx"]); + const path = validateFilePath(value, ["app.tsx", "index.tsx"]); if (!path) return `File at \`${value}\` not found. Please try again`; else setRootFile(path); }, @@ -156,33 +167,45 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f }, }); if (UPDATESQUEUE.length === 0) return; + const { fileUpdates, packageUpdates, commandUpdates } = summarizeUpdates(); + // Inspired by Qwik's CLI if (fileUpdates.length) p.log.message([`${color.cyan("Modify")}`, ...fileUpdates.map((f) => ` - ${f}`)].join("\n")); + if (packageUpdates.length) p.log.message([`${color.cyan("Install")}`, ...packageUpdates.map((p) => ` - ${p}`)].join("\n")); + if (commandUpdates.length) p.log.message([`${color.cyan("Run commands")}`, ...commandUpdates.map((p) => ` - ${p}`)].join("\n")); + const confirmed = await p.confirm({ message: "Do you wish to continue?" }); if (!confirmed || p.isCancel(confirmed)) return; + await spinnerify({ startText: "Writing files...", finishText: "Updates written", fn: flushFileUpdates }); await spinnerify({ startText: "Installing packages...", finishText: "Packages installed", fn: flushPackageUpdates }); await spinnerify({ startText: "Running setup commands", finishText: "Setup commands ran", fn: flushCommandUpdates }); + clearQueue(); + const postInstalls = configs.filter((c) => c.postInstall); if (postInstalls.length === 0) return; + p.log.message( `${postInstalls.length} ${ postInstalls.length === 1 ? "package has" : "packages have" } post install steps that need to run.`, ); + const pInstallConfirmed = await p.confirm({ message: "Do you wish to continue?" }); if (!pInstallConfirmed || p.isCancel(pInstallConfirmed)) return; + p.log.info("Running post installs"); // Run postInstalls for (const cfg of configs) { await cfg.postInstall?.(); } + p.log.success("Post install steps complete!"); // await spinnerify({ // startText: t.POST_INSTALL, diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 9988cc3..54ffe8a 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -167,8 +167,8 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport const pM = detectPackageManager(); p.note( `cd ${projectName} -${pM.name} install -${pM.name} ${pM.runScriptCommand("dev")}`, + ${pM.name} install + ${pM.name} ${pM.runScriptCommand("dev")}`, t.GET_STARTED, ); }; @@ -237,8 +237,8 @@ export const handleNew = async ( const pM = detectPackageManager(); p.note( `cd ${name} -${pM.name} install -${pM.name} ${pM.runScriptCommand("dev")}`, + ${pM.name} install + ${pM.name} ${pM.runScriptCommand("dev")}`, t.GET_STARTED, ); }; diff --git a/packages/commands/src/handlers/start/adapter.ts b/packages/commands/src/handlers/start/adapter.ts index 7d18982..b17edb6 100644 --- a/packages/commands/src/handlers/start/adapter.ts +++ b/packages/commands/src/handlers/start/adapter.ts @@ -33,18 +33,11 @@ export const handleAdapter = async (name?: string, forceTransform = false) => { } const sym = Symbol(name).toString(); let code = await transformPlugins( - [ - { - importName: "solid", - importSource: "solid-start/vite", - isDefault: true, - options: { adapter: sym }, - }, - ], - { name: "vite.config.ts", contents: (await readFile("vite.config.ts")).toString() }, + [], + { name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, forceTransform, ); code = `import ${name} from "solid-start-${name}";\n` + code; code = code.replace(`"${sym}"`, `${name}({})`); - await writeFile("vite.config.ts", code); + await writeFile("app.config.ts", code); }; diff --git a/packages/commands/src/handlers/start/mode.ts b/packages/commands/src/handlers/start/mode.ts index e7244ee..c4d0780 100644 --- a/packages/commands/src/handlers/start/mode.ts +++ b/packages/commands/src/handlers/start/mode.ts @@ -29,18 +29,11 @@ export const handleMode = async (mode?: SupportedModes) => { p.log.info("Updating config"); if (mode != "ssg") { const newConfig = await transformPlugins( - [ - { - importName: "solid", - importSource: "solid-start/vite", - isDefault: true, - options: { ssr: mode === "ssr" }, - }, - ], - { name: "vite.config.ts", contents: (await readFile("vite.config.ts")).toString() }, + [], + { name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, true, true, ); - await writeFile("vite.config.ts", newConfig); + await writeFile("app.config.ts", newConfig); } }; diff --git a/packages/commands/src/lib/utils/helpers.ts b/packages/commands/src/lib/utils/helpers.ts index fbfe5ad..ca27ccd 100644 --- a/packages/commands/src/lib/utils/helpers.ts +++ b/packages/commands/src/lib/utils/helpers.ts @@ -14,7 +14,7 @@ export const getProjectRoot = async () => { export const getRootFile = async () => { if (await isSolidStart()) { - return "src/root.tsx"; + return "src/app.tsx"; } return "src/index.tsx"; }; @@ -92,30 +92,30 @@ export async function findFiles( return filePaths; } -export const getViteConfig = async () => { - let configFile = "vite.config.ts"; +export const getAppConfig = async () => { + let configFile = "app.config.ts"; const existsHere = fileExists(configFile); if (!existsHere) { const root = await getProjectRoot(); - const existsInRoot = validateFilePath(root, "vite.config"); + const existsInRoot = validateFilePath(root, "app.config"); if (existsInRoot) { const correctConfig = await cancelable( p.confirm({ - message: `Could not find vite config in current directory, but found vite config in \`${root}\`. Is this the correct vite config?`, + message: `Could not find app config in current directory, but found app config in \`${root}\`. Is this the correct vite config?`, }), ); if (correctConfig) return existsInRoot; } - p.log.error(color.red(`Can't find vite config`)); + p.log.error(color.red(`Can't find app.config file`)); await cancelable( p.text({ - message: "Type path to vite config: ", + message: "Type path to app config: ", validate(value) { - const path = validateFilePath(value, "vite.config"); - if (!path) return `Vite config not found. Please try again`; + const path = validateFilePath(value, "app.config"); + if (!path) return `App config not found. Please try again`; else { configFile = path; } diff --git a/packages/commands/tests/assets/sample_unocss_result.txt b/packages/commands/tests/assets/sample_unocss_result.txt index 5ae2640..90217f1 100644 --- a/packages/commands/tests/assets/sample_unocss_result.txt +++ b/packages/commands/tests/assets/sample_unocss_result.txt @@ -1,9 +1,11 @@ import UnoCss from "unocss/vite"; -import solid from "solid-start/vite"; -// Simulates a vite config +import { defineConfig } from "@solidjs/start/config"; +// Simulates an app config export default defineConfig({ + vite: { plugins: [ solid(), UnoCss({}) ] + } }); diff --git a/packages/commands/tests/assets/sample_vite_config.txt b/packages/commands/tests/assets/sample_vite_config.txt index b501a09..50315ba 100644 --- a/packages/commands/tests/assets/sample_vite_config.txt +++ b/packages/commands/tests/assets/sample_vite_config.txt @@ -1,5 +1,7 @@ -import solid from "solid-start/vite"; -// Simulates a vite config +import { defineConfig } from "@solidjs/start/config"; +// Simulates an app config export default defineConfig({ - plugins: [solid()], + vite: { + plugins: [solid()] + } }); diff --git a/packages/commands/tests/config_manipulation.test.ts b/packages/commands/tests/config_manipulation.test.ts index d94c0fb..9ef0a98 100644 --- a/packages/commands/tests/config_manipulation.test.ts +++ b/packages/commands/tests/config_manipulation.test.ts @@ -2,6 +2,7 @@ import { describe, expect, it, vi } from "vitest"; import { handleAdd } from "../src/handlers/add"; import { readFile as readFile1 } from "fs"; import { UPDATESQUEUE } from "../../utils/src/updates"; + const readFile = async (path: string): Promise => { return await new Promise((res) => // Can't use readFile from fs/promises because we've mocked it @@ -12,13 +13,13 @@ const removeWhitespace = (str: string) => str.replace(/\s/g, ""); vi.mock("fs/promises", () => { return { readFile: async (name: string) => { - if (name === "vite.config.ts") { + if (name === "app.config.ts") { const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_vite_config.txt"); return sampleConfig; } return "{}"; }, - writeFile: async (contents: string) => { + writeFile: async (_, contents: string) => { return contents; }, }; @@ -45,10 +46,9 @@ vi.mock("@solid-cli/utils/updates", async () => { vi.mock("../src/lib/utils/helpers.ts", async () => { return { - getViteConfig: async (): Promise => new Promise((r) => r("vite.config.ts")), - fileExists: (path: string) => - path.includes("vite_config") || path.includes("root.tsx") || path.includes("index.tsx"), - getRootFile: async (): Promise => new Promise((r) => r("./src/root.tsx")), + getAppConfig: async (): Promise => new Promise((r) => r("app.config.ts")), + fileExists: (path: string) => path.includes("app_config") || path.includes("app.tsx") || path.includes("index.tsx"), + getRootFile: async (): Promise => new Promise((r) => r("./src/app.tsx")), }; }); describe("Update config", () => { @@ -59,7 +59,7 @@ describe("Update config", () => { const expected = await readFile("./packages/commands/tests/assets/sample_unocss_result.txt"); // @ts-ignore - const newConfig = UPDATESQUEUE.find((u) => u.name === "vite.config.ts")?.contents; + const newConfig = UPDATESQUEUE.find((u) => u.name === "app.config.ts")?.contents; expect(removeWhitespace(expected)).toBe(removeWhitespace(newConfig)); }, { timeout: 50000 }, diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts index e06da10..8d4bcaf 100644 --- a/packages/core/src/commands/index.ts +++ b/packages/core/src/commands/index.ts @@ -7,6 +7,7 @@ import { cancelable } from "@solid-cli/ui"; import { PossibleFields, setField, t } from "@solid-cli/utils"; import { spinnerify } from "@solid-cli/ui"; import { handleNew, handleAdd } from "@solid-cli/commands"; + const add = command({ name: "add", description: t.ADD_DESC, @@ -21,6 +22,7 @@ const add = command({ await handleAdd(packages, forceTransform); }, }); + const new_ = command({ name: "new", description: t.NEW_DESC, @@ -51,6 +53,7 @@ const new_ = command({ await handleNew(variation, name, stackblitz); }, }); + const docs = command({ name: "docs", args: { @@ -80,6 +83,7 @@ const docs = command({ }); }, }); + const set = command({ name: "set", args: { field: positional({ type: oneOf(PossibleFields) }), value: positional({ type: string }) }, @@ -87,6 +91,7 @@ const set = command({ await setField(field, value); }, }); + const playground = command({ name: "playground", args: {}, @@ -98,6 +103,7 @@ const playground = command({ }); }, }); + export default { add, docs, diff --git a/packages/core/src/commands/start.ts b/packages/core/src/commands/start.ts index 5900eb2..8f2640c 100644 --- a/packages/core/src/commands/start.ts +++ b/packages/core/src/commands/start.ts @@ -24,6 +24,7 @@ const mode = command({ await handleMode(mode); }, }); + const route = command({ name: "route", args: { @@ -38,6 +39,7 @@ const route = command({ await handleRoute(path, name); }, }); + const data = command({ name: "data", args: { @@ -52,6 +54,7 @@ const data = command({ await handleData(path, name); }, }); + const adapter = command({ name: "adapter", args: { diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 69d759f..2ec94ff 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -17,6 +17,7 @@ import { handleNew, handleRoute, } from "@solid-cli/commands"; + const possibleActions = () => [ { value: "add", label: t.ACTION_ADD, hint: "solid add ..." }, diff --git a/packages/utils/package.json b/packages/utils/package.json index c49581d..4a84512 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -65,6 +65,7 @@ "@chialab/esbuild-plugin-meta-url": "^0.18.2", "@types/node": "20.12.11", "jiti": "^1.21.0", + "magicast": "^0.3.4", "tsup": "^8.0.2", "typescript": "^5.4.5", "vitest": "^1.6.0" diff --git a/packages/utils/src/config/index.ts b/packages/utils/src/config/index.ts index b0f2488..9f095d2 100644 --- a/packages/utils/src/config/index.ts +++ b/packages/utils/src/config/index.ts @@ -3,13 +3,19 @@ import { homedir } from "../paths"; import { join } from "path"; import { parse, stringify } from "smol-toml"; import { createSignal } from "@solid-cli/reactivity"; + export const PossibleFields = ["lang"] as const; + const defaultConfig = { lang: Intl.DateTimeFormat().resolvedOptions().locale.split("-")[0], } as Record; + type Field = (typeof PossibleFields)[number]; + const configPath: string = join(homedir(), "/solid-cli.config.toml"); + export const [config, setConfig] = createSignal(defaultConfig); + export const readConfig = async () => { try { const file = await readFile(configPath, "utf-8"); @@ -18,9 +24,11 @@ export const readConfig = async () => { await writeConfig(); } }; + export const writeConfig = async () => { await writeFile(configPath, stringify(config())); }; + export const setField = async (field: Field, value: any) => { if (!(field in defaultConfig)) { throw new Error(`Field ${field} does not exist`); @@ -28,6 +36,7 @@ export const setField = async (field: Field, value: any) => { setConfig((prev) => ({ ...prev, [field]: value })); await writeConfig(); }; + export const getField = (field: Field) => { if (!config()[field] && defaultConfig[field]) setField(field, defaultConfig[field]); return config()[field]; diff --git a/packages/utils/src/start/add_api.ts b/packages/utils/src/start/add_api.ts index 2602166..41fbf35 100644 --- a/packages/utils/src/start/add_api.ts +++ b/packages/utils/src/start/add_api.ts @@ -3,8 +3,12 @@ import { writeChecked } from "../fs"; export const createApi = async (path: string, name?: string) => { const path_parts = path.split("/"); + path_parts.unshift("src", "routes", "api"); + await mkdir(path_parts.join("/"), { recursive: true }); + path_parts.push(name ? `${name}.ts` : "hello.ts"); + await writeChecked(path_parts.join("/"), ""); }; diff --git a/packages/utils/src/start/add_data.ts b/packages/utils/src/start/add_data.ts index eca4aa7..ea2dc01 100644 --- a/packages/utils/src/start/add_data.ts +++ b/packages/utils/src/start/add_data.ts @@ -3,8 +3,12 @@ import { writeChecked } from "../fs"; export const createData = async (path: string, name?: string) => { const path_parts = path.split("/"); + path_parts.unshift("src", "routes"); + await mkdir(path_parts.join("/"), { recursive: true }); + path_parts.push(name ? `${name}.data.ts` : "Index.data.ts"); + await writeChecked(path_parts.join("/"), ""); }; diff --git a/packages/utils/src/start/add_route.ts b/packages/utils/src/start/add_route.ts index fecb3b4..93a6461 100644 --- a/packages/utils/src/start/add_route.ts +++ b/packages/utils/src/start/add_route.ts @@ -1,13 +1,19 @@ import { mkdir } from "fs/promises"; import { writeChecked } from "../fs"; + const default_file = `export default function Route() { return <>; } `; + export const createRoute = async (path: string, name?: string) => { const path_parts = path.split("/"); + path_parts.unshift("src", "routes"); + await mkdir(path_parts.join("/"), { recursive: true }); + path_parts.push(name ? `(${name}).tsx` : "index.tsx"); + await writeChecked(path_parts.join("/"), default_file); }; diff --git a/packages/utils/src/start/index.ts b/packages/utils/src/start/index.ts index ae286b1..30e7de5 100644 --- a/packages/utils/src/start/index.ts +++ b/packages/utils/src/start/index.ts @@ -8,7 +8,7 @@ export const isSolidStart = async () => { const allDeps = deps.concat(devDeps); for (let i = 0; i < allDeps.length; i++) { const dep = allDeps[i]; - if (dep === "solid-start") return true; + if (dep === "@solidjs/start") return true; } return false; }; diff --git a/packages/utils/src/transform/index.ts b/packages/utils/src/transform/index.ts index 59f3164..239ba54 100644 --- a/packages/utils/src/transform/index.ts +++ b/packages/utils/src/transform/index.ts @@ -1,3 +1,4 @@ +import { parseModule } from "magicast"; import { addPlugins } from "./parse"; export type Config = { @@ -13,7 +14,8 @@ export const transformPlugins = async ( _force_transform = false, _merge_configs = false, ) => { - return addPlugins(config, new_plugins).code; + const mod = parseModule(config.contents, { trailingComma: false, flowObjectCommas: false }); + return addPlugins(mod, new_plugins).code; }; // All the integrations/packages that we support // export const supported = ["unocss", "vitepwa", "solid-devtools"] as const; diff --git a/packages/utils/src/transform/parse.ts b/packages/utils/src/transform/parse.ts index f8c96ef..e576f2a 100644 --- a/packages/utils/src/transform/parse.ts +++ b/packages/utils/src/transform/parse.ts @@ -1,5 +1,5 @@ -import { parseModule, ASTNode, ProxifiedModule, generateCode } from "magicast"; -import { Config, PluginOptions } from "."; +import { ASTNode, ProxifiedModule, generateCode } from "magicast"; +import { PluginOptions } from "."; type ASTNodeFull = ASTNode & { key?: ASTNodeFull; @@ -93,8 +93,8 @@ const findPlugins = (mod: ProxifiedModule) => { } }; -export const addPlugins = (config: Config, plugins: PluginOptions[]) => { - const mod = parseModule(config.contents, { trailingComma: false, flowObjectCommas: false }); +export const addPlugins = (mod: ProxifiedModule, plugins: PluginOptions[]) => { + // const mod = parseModule(config.contents, { trailingComma: false, flowObjectCommas: false }); const current = findPlugins(mod); diff --git a/packages/utils/tests/plugin_transforms.test.ts b/packages/utils/tests/plugin_transforms.test.ts index 2f962b1..7c6cb40 100644 --- a/packages/utils/tests/plugin_transforms.test.ts +++ b/packages/utils/tests/plugin_transforms.test.ts @@ -3,6 +3,45 @@ import { Config, transformPlugins } from "../src/transform"; import { PluginOptions } from "../src/transform"; const removeWhitespace = (str: string) => str.replace(/\s/g, ""); + +const makeExampleConfig = ( + plugins: string[], + imports: string[] = [], + functionVersion: "arrow" | "method" | "none" = "none", +) => { + const pluginsStr = `plugins: [${plugins.join(", ")}]`; + const viteOptionStr = + functionVersion === "arrow" + ? // @prettier-ignore + ` + vite: (options) => { + return {${pluginsStr}}; + }` + : functionVersion === "method" + ? // @prettier-ignore + ` + vite(options) { + return {${pluginsStr}}; + }` + : // @prettier-ignore + ` + vite: { + ${pluginsStr} + }`; + + const result = + // @prettier-ignore + `${imports.join("\n")} + import { defineConfig } from "@solidjs/start/config"; + + // Simulates an app config + export default defineConfig({ + ${viteOptionStr} + });`; + + return result; +}; + const examplePlugin: PluginOptions = { importName: "examplePlugin", importSource: "example", @@ -10,29 +49,41 @@ const examplePlugin: PluginOptions = { options: {}, }; describe("transformPlugins", () => { - test("Config is updated properly", async () => { + test("Object config is updated properly", async () => { + const config: Config = { + name: "app.config.ts", + contents: makeExampleConfig(["solid()"]), + }; + const expected = makeExampleConfig(["solid()", "examplePlugin({})"], ['import examplePlugin from "example";']); + const result = await transformPlugins([examplePlugin], config); + + expect(removeWhitespace(result)).toBe(removeWhitespace(expected)); + }); + test("Arrow-function config is updated properly", async () => { + const config: Config = { + name: "app.config.ts", + contents: makeExampleConfig(["solid()"], [], "arrow"), + }; + const expected = makeExampleConfig( + ["solid()", "examplePlugin({})"], + ['import examplePlugin from "example";'], + "arrow", + ); + const result = await transformPlugins([examplePlugin], config); + + expect(removeWhitespace(result)).toBe(removeWhitespace(expected)); + }); + + test("Object method config is updated properly", async () => { const config: Config = { name: "app.config.ts", - contents: `import { defineConfig } from "@solidjs/start/config"; - // Simulates an app config - export default defineConfig({ - vite: { - plugins: [solid()] - } - }); - `, + contents: makeExampleConfig(["solid()"], [], "method"), }; - const expected = `import examplePlugin from "example"; - import { defineConfig } from "@solidjs/start/config"; - // Simulates an app config - export default defineConfig({ - vite: { - plugins: [ - solid(), - examplePlugin({}) - ] - } - });`; + const expected = makeExampleConfig( + ["solid()", "examplePlugin({})"], + ['import examplePlugin from "example";'], + "method", + ); const result = await transformPlugins([examplePlugin], config); expect(removeWhitespace(result)).toBe(removeWhitespace(expected)); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e1c92b8..5e0055e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -227,6 +227,9 @@ importers: jiti: specifier: ^1.21.0 version: 1.21.0 + magicast: + specifier: ^0.3.4 + version: 0.3.4 tsup: specifier: ^8.0.2 version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) @@ -243,18 +246,35 @@ packages: resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.24.1': + resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.22.20': resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.24.5': + resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} + engines: {node: '>=6.9.0'} + '@babel/highlight@7.24.2': resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} engines: {node: '>=6.9.0'} + '@babel/parser@7.24.5': + resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} + engines: {node: '>=6.0.0'} + hasBin: true + '@babel/runtime@7.24.4': resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} engines: {node: '>=6.9.0'} + '@babel/types@7.24.5': + resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} + engines: {node: '>=6.9.0'} + '@begit/core@0.0.16': resolution: {integrity: sha512-nSgezfX/ixRmVIXP0apKF3ZCeRlxlAD7usZqw0Ku4IExD6COJzT041FPm7vpAkrKxr3U54jHKb1fEeZVHBjEWg==} @@ -1679,6 +1699,9 @@ packages: magic-string@0.30.10: resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} + magicast@0.3.4: + resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==} + map-obj@1.0.1: resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==} engines: {node: '>=0.10.0'} @@ -2262,6 +2285,10 @@ packages: resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} engines: {node: '>=0.6.0'} + to-fast-properties@2.0.0: + resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} + engines: {node: '>=4'} + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -2564,8 +2591,12 @@ snapshots: '@babel/highlight': 7.24.2 picocolors: 1.0.0 + '@babel/helper-string-parser@7.24.1': {} + '@babel/helper-validator-identifier@7.22.20': {} + '@babel/helper-validator-identifier@7.24.5': {} + '@babel/highlight@7.24.2': dependencies: '@babel/helper-validator-identifier': 7.22.20 @@ -2573,10 +2604,20 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.0.0 + '@babel/parser@7.24.5': + dependencies: + '@babel/types': 7.24.5 + '@babel/runtime@7.24.4': dependencies: regenerator-runtime: 0.14.1 + '@babel/types@7.24.5': + dependencies: + '@babel/helper-string-parser': 7.24.1 + '@babel/helper-validator-identifier': 7.24.5 + to-fast-properties: 2.0.0 + '@begit/core@0.0.16': dependencies: tar: 7.1.0 @@ -4009,6 +4050,12 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + magicast@0.3.4: + dependencies: + '@babel/parser': 7.24.5 + '@babel/types': 7.24.5 + source-map-js: 1.2.0 + map-obj@1.0.1: {} map-obj@4.3.0: {} @@ -4606,6 +4653,8 @@ snapshots: dependencies: os-tmpdir: 1.0.2 + to-fast-properties@2.0.0: {} + to-regex-range@5.0.1: dependencies: is-number: 7.0.0 From 0a745bb07a0dc78df0dc4809ad737226e5bdcd6f Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 14 May 2024 22:10:11 +0200 Subject: [PATCH 096/290] feat: vitest integration (#42) * feat: vitest integration * update README.md --- README.md | 2 +- packages/commands/src/lib/integrations.ts | 59 +++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ac1727f..811dbaf 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ A custom-built CLI for creating and managing SolidJS apps and projects. - [ ] PostCSS - [x] UnoCSS - [ ] Vanilla Extract - - [ ] Vitest + - [x] Vitest - [ ] Tauri - [ ] Playwright - [ ] Utilities diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index ddf3b47..52c14a9 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -1,4 +1,5 @@ import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs"; +import { readFile, writeFile } from "fs/promises"; import { fileExists, validateFilePath } from "./utils/helpers"; import { $ } from "execa"; import { getRunnerCommand, detectPackageManager } from "@solid-cli/utils/package-manager"; @@ -108,4 +109,62 @@ export const integrations = { await insertAtBeginning(path, `import "solid-devtools";\n`); }, }, + "vitest": { + installs: [ + "vitest", + "jsdom", + "@solidjs/testing-library", + "@testing-library/user-event", + "@testing-library/jest-dom", + ], + additionalConfig: async () => { + try { + p.log.info("Adding test script to package.json"); + const packageJsonString = await readFile("package.json", "utf8"); + const packageJson = JSON.parse(packageJsonString); + if (!/\bvitest\b/.test(packageJson.scripts.test || "")) { + packageJson.scripts.test = "vitest"; + await writeFile("package.json", JSON.stringify(packageJson, null, 2) + "\n", "utf8"); + } + const hasTs = fileExists("tsconfig.json"); + if (hasTs) { + p.log.info("Adding testing types to tsconfig.json"); + const tsConfigString = await readFile("tsconfig.json", "utf8"); + const tsConfig = JSON.parse(tsConfigString); + if (!tsConfig.compilerOptions) { + tsConfig.compilerOptions = {}; + } + tsConfig.compilerOptions.types = [ + ...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]), + ]; + await writeFile("tsconfig.json", JSON.stringify(tsConfig, null, 2) + "\n", "utf8"); + } + if ( + packageJson.dependencies["@solidjs/start"] && + ["ts", "mjs", "cjs", "js"].every( + (suffix) => !fileExists(`vite.config.${suffix}`) && !fileExists(`vitest.config.${suffix}`), + ) + ) { + const suffix = hasTs ? "ts" : "mjs"; + p.log.info(`Adding vitest.config.${suffix}`); + await writeFile( + `vitest.config.${suffix}`, + `import solid from "vite-plugin-solid"; +import { defineConfig } from "vitest/config"; + +export default defineConfig({ + plugins: [solid()], + resolve: { + conditions: ["development", "browser"], + }, +}); +`, + "utf-8", + ); + } + } catch (err) { + console.error(err); + } + }, + }, }; From 03bf06804b291ad5bff73b30fa2c32f353b0c2e9 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Fri, 17 May 2024 09:07:03 -0400 Subject: [PATCH 097/290] Update parse to add vite property if it doesn't exist. --- packages/utils/src/transform/parse.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/utils/src/transform/parse.ts b/packages/utils/src/transform/parse.ts index e576f2a..63581d5 100644 --- a/packages/utils/src/transform/parse.ts +++ b/packages/utils/src/transform/parse.ts @@ -60,9 +60,10 @@ const findOrCreatePluginsProperty = (node: ASTNodeFull) => { } }; -const findPlugins = (mod: ProxifiedModule) => { +const findPlugins = (mod: ProxifiedModule): ArrayExpression | undefined => { const props: ASTNodeFull[] = mod.exports.default.$args[0].$ast.properties; + let viteFound = false; for (const prop of props) { const key = prop.key?.name; if (key === "vite") { @@ -88,9 +89,22 @@ const findPlugins = (mod: ProxifiedModule) => { return findOrCreatePluginsProperty(prop.value); } + viteFound = true; + break; } } + + if (!viteFound) { + props.push({ + type: "ObjectProperty", + computed: false, + shorthand: false, + value: { type: "ObjectExpression", properties: [] }, + key: { name: "vite", type: "Identifier" }, + }); + return findPlugins(mod); + } }; export const addPlugins = (mod: ProxifiedModule, plugins: PluginOptions[]) => { From 6db84e473f5b1d1c1d20b70d9cd1d01348ec3d58 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Fri, 17 May 2024 09:18:05 -0400 Subject: [PATCH 098/290] Add test for transforming plugins when no vite property defined. --- packages/utils/tests/plugin_transforms.test.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/utils/tests/plugin_transforms.test.ts b/packages/utils/tests/plugin_transforms.test.ts index 7c6cb40..8c14573 100644 --- a/packages/utils/tests/plugin_transforms.test.ts +++ b/packages/utils/tests/plugin_transforms.test.ts @@ -49,6 +49,22 @@ const examplePlugin: PluginOptions = { options: {}, }; describe("transformPlugins", () => { + test("No vite property defined config is updated properly", async () => { + const config: Config = { + name: "app.config.ts", + contents: ` + import { defineConfig } from "@solidjs/start/config"; + + // Simulates an app config + export default defineConfig({ + }); + `, + }; + const expected = makeExampleConfig(["examplePlugin({})"], ['import examplePlugin from "example";']); + const result = await transformPlugins([examplePlugin], config); + + expect(removeWhitespace(result)).toBe(removeWhitespace(expected)); + }); test("Object config is updated properly", async () => { const config: Config = { name: "app.config.ts", From 3ae2e722f5f720b98625083b1b709c92b1242520 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 17 May 2024 18:33:36 +0100 Subject: [PATCH 099/290] Add `installsDev` --- packages/commands/src/handlers/add.ts | 5 +++-- packages/commands/src/lib/integrations.ts | 5 +++-- packages/utils/src/updates/index.ts | 4 ++-- .../utils/tsup.config.bundled_l54xtac2cje.mjs | 17 +++++++++++++++++ 4 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 packages/utils/tsup.config.bundled_l54xtac2cje.mjs diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index eafa288..b910fec 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -105,11 +105,12 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f for (let i = 0; i < configs.length; i++) { const config = configs[i]; - config.installs.forEach((p) => queueUpdate({ type: "package", name: p })); + config.installs.forEach((p) => queueUpdate({ type: "package", name: p, dev: false })); + config.installsDev?.forEach((p) => queueUpdate({ type: "package", name: p, dev: true })); } // Queue primitives for (const primitive of await transformPrimitives(possiblePrimitives)) { - queueUpdate({ type: "package", name: primitive.value }); + queueUpdate({ type: "package", name: primitive.value, dev: false }); } if (!configs.length) return; diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index 52c14a9..09f1bee 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -7,8 +7,8 @@ import { createSignal } from "@solid-cli/reactivity"; import * as p from "@clack/prompts"; import color from "picocolors"; import { cancelable } from "@solid-cli/ui"; -import { PluginOptions } from "@chialab/esbuild-plugin-meta-url"; import { flushQueue } from "@solid-cli/utils/updates"; +import { PluginOptions } from "@solid-cli/utils/transform"; // All the integrations/packages that we support export type Supported = keyof typeof integrations; @@ -16,6 +16,7 @@ export type Supported = keyof typeof integrations; export type IntegrationsValue = { pluginOptions?: PluginOptions; installs: string[]; + installsDev?: string[]; additionalConfig?: () => Promise; postInstall?: () => Promise; }; @@ -24,7 +25,7 @@ export type Integrations = Record; export const [rootFile, setRootFile] = createSignal(undefined); -export const integrations = { +export const integrations: Record = { "tailwind": { installs: ["tailwindcss", "postcss", "autoprefixer"], postInstall: async () => { diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index 749c841..5eeeabc 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -7,7 +7,7 @@ declare global { // Batch all updates here, so we can confirm with the user then flush export const UPDATESQUEUE: Update[] = globalThis.UPDATESQUEUE ?? []; globalThis.UPDATESQUEUE = UPDATESQUEUE; -type PackageUpdate = { type: "package"; name: string }; +type PackageUpdate = { type: "package"; name: string; dev: boolean }; type CommandUpdate = { type: "command"; name: string }; type FileUpdate = { type: "file"; name: string; contents: string; checked: boolean }; // Don't bother explicitly handling plugin updates, since they're just a file update @@ -64,7 +64,7 @@ export const flushPackageUpdates = async () => { const pM = detectPackageManager(); const instlCmd = getInstallCommand(pM); for (const update of packageUpdates) { - await $`${pM.name} ${instlCmd} ${update.name}`; + await $`${pM.name} ${instlCmd}${update.dev ? " -D " : " "}${update.name}`; } }; export const flushCommandUpdates = async () => { diff --git a/packages/utils/tsup.config.bundled_l54xtac2cje.mjs b/packages/utils/tsup.config.bundled_l54xtac2cje.mjs new file mode 100644 index 0000000..0bea7b2 --- /dev/null +++ b/packages/utils/tsup.config.bundled_l54xtac2cje.mjs @@ -0,0 +1,17 @@ +// tsup.config.ts +import { defineConfig } from "tsup"; +import metaUrlPlugin from "@chialab/esbuild-plugin-meta-url"; +var tsup_config_default = defineConfig({ + entry: ["src"], + target: "esnext", + format: ["esm", "cjs"], + splitting: false, + sourcemap: true, + clean: true, + minify: true, + esbuildPlugins: [metaUrlPlugin()] +}); +export { + tsup_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidHN1cC5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9faW5qZWN0ZWRfZmlsZW5hbWVfXyA9IFwiQzpcXFxcVXNlcnNcXFxcdGhvbWFcXFxcRGV2ZWxvcG1lbnRcXFxcdHlwZXNjcmlwdFxcXFxzb2xpZC1jbGlcXFxccGFja2FnZXNcXFxcdXRpbHNcXFxcdHN1cC5jb25maWcudHNcIjtjb25zdCBfX2luamVjdGVkX2Rpcm5hbWVfXyA9IFwiQzpcXFxcVXNlcnNcXFxcdGhvbWFcXFxcRGV2ZWxvcG1lbnRcXFxcdHlwZXNjcmlwdFxcXFxzb2xpZC1jbGlcXFxccGFja2FnZXNcXFxcdXRpbHNcIjtjb25zdCBfX2luamVjdGVkX2ltcG9ydF9tZXRhX3VybF9fID0gXCJmaWxlOi8vL0M6L1VzZXJzL3Rob21hL0RldmVsb3BtZW50L3R5cGVzY3JpcHQvc29saWQtY2xpL3BhY2thZ2VzL3V0aWxzL3RzdXAuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInRzdXBcIjtcclxuaW1wb3J0IG1ldGFVcmxQbHVnaW4gZnJvbSBcIkBjaGlhbGFiL2VzYnVpbGQtcGx1Z2luLW1ldGEtdXJsXCI7XHJcblxyXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xyXG5cdGVudHJ5OiBbXCJzcmNcIl0sXHJcblx0dGFyZ2V0OiBcImVzbmV4dFwiLFxyXG5cdGZvcm1hdDogW1wiZXNtXCIsIFwiY2pzXCJdLFxyXG5cdHNwbGl0dGluZzogZmFsc2UsXHJcblx0c291cmNlbWFwOiB0cnVlLFxyXG5cdGNsZWFuOiB0cnVlLFxyXG5cdG1pbmlmeTogdHJ1ZSxcclxuXHRlc2J1aWxkUGx1Z2luczogW21ldGFVcmxQbHVnaW4oKV0sXHJcbn0pO1xyXG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQXdWLFNBQVMsb0JBQW9CO0FBQ3JYLE9BQU8sbUJBQW1CO0FBRTFCLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzNCLE9BQU8sQ0FBQyxLQUFLO0FBQUEsRUFDYixRQUFRO0FBQUEsRUFDUixRQUFRLENBQUMsT0FBTyxLQUFLO0FBQUEsRUFDckIsV0FBVztBQUFBLEVBQ1gsV0FBVztBQUFBLEVBQ1gsT0FBTztBQUFBLEVBQ1AsUUFBUTtBQUFBLEVBQ1IsZ0JBQWdCLENBQUMsY0FBYyxDQUFDO0FBQ2pDLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg== From a25d573a97fe37ca3360cd4a9e0c4402b544d2fa Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 17 May 2024 19:55:42 +0100 Subject: [PATCH 100/290] - Fix errors when path doesn't exist - Only attempt to find vite config when it's needed --- packages/commands/src/handlers/add.ts | 42 +++++++++++----------- packages/commands/src/lib/integrations.ts | 14 ++++---- packages/commands/src/lib/utils/helpers.ts | 15 +++++--- packages/core/src/index.ts | 24 ++++++++----- packages/utils/src/updates/index.ts | 11 ++++-- 5 files changed, 63 insertions(+), 43 deletions(-) diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index b910fec..272ce93 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -39,9 +39,8 @@ const handleAutocompleteAdd = async () => { { label: t.NO, value: false }, { label: t.YES_FORCE, value: [true, "force"] }, ], - message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)} ${ - " " + color.yellow(a.map((opt) => opt.label).join(" ")) + " " - } \n${color.red(S_BAR)} `, + message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)} ${" " + color.yellow(a.map((opt) => opt.label).join(" ")) + " " + } \n${color.red(S_BAR)} `, }), ); @@ -101,7 +100,6 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f }) .filter((p) => p) as Configs; - const viteConfig = await getViteConfig(); for (let i = 0; i < configs.length; i++) { const config = configs[i]; @@ -114,20 +112,23 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f } if (!configs.length) return; - - await spinnerify({ - startText: "Processing config", - finishText: "Config processed", - fn: async () => { - const code = await transformPlugins( - configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[], - { name: viteConfig, contents: (await readFile(viteConfig)).toString() }, - forceTransform, - undefined, - ); - writeFile(viteConfig, code); - }, - }); + const pluginOptions = configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[]; + if (pluginOptions.length) { + const viteConfig = await getViteConfig(); + await spinnerify({ + startText: "Processing config", + finishText: "Config processed", + fn: async () => { + const code = await transformPlugins( + pluginOptions, + { name: viteConfig, contents: (await readFile(viteConfig)).toString() }, + forceTransform, + undefined, + ); + writeFile(viteConfig, code); + }, + }); + } p.log.info("Preparing post install steps for integrations"); let projectRoot = await getRootFile(); @@ -161,7 +162,7 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f // Inspired by Qwik's CLI if (fileUpdates.length) p.log.message([`${color.cyan("Modify")}`, ...fileUpdates.map((f) => ` - ${f}`)].join("\n")); if (packageUpdates.length) - p.log.message([`${color.cyan("Install")}`, ...packageUpdates.map((p) => ` - ${p}`)].join("\n")); + p.log.message([`${color.cyan("Install")}`, ...packageUpdates.map((p) => ` - ${p.name}` + (p.dev ? " (dev)" : ""))].join("\n")); if (commandUpdates.length) p.log.message([`${color.cyan("Run commands")}`, ...commandUpdates.map((p) => ` - ${p}`)].join("\n")); const confirmed = await p.confirm({ message: "Do you wish to continue?" }); @@ -173,8 +174,7 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f const postInstalls = configs.filter((c) => c.postInstall); if (postInstalls.length === 0) return; p.log.message( - `${postInstalls.length} ${ - postInstalls.length === 1 ? "package has" : "packages have" + `${postInstalls.length} ${postInstalls.length === 1 ? "package has" : "packages have" } post install steps that need to run.`, ); const pInstallConfirmed = await p.confirm({ message: "Do you wish to continue?" }); diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index 09f1bee..8aef2c8 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -80,7 +80,8 @@ export const integrations: Record = { isDefault: true, options: {}, }, - installs: ["unocss"], + installs: [""], + installsDev: ["unocss"], additionalConfig: async () => { const path = rootFile(); if (!path) return; @@ -111,7 +112,8 @@ export const integrations: Record = { }, }, "vitest": { - installs: [ + installs: [], + installsDev: [ "vitest", "jsdom", "@solidjs/testing-library", @@ -120,7 +122,7 @@ export const integrations: Record = { ], additionalConfig: async () => { try { - p.log.info("Adding test script to package.json"); + p.log.info("Adding test script to package.json"); const packageJsonString = await readFile("package.json", "utf8"); const packageJson = JSON.parse(packageJsonString); if (!/\bvitest\b/.test(packageJson.scripts.test || "")) { @@ -129,7 +131,7 @@ export const integrations: Record = { } const hasTs = fileExists("tsconfig.json"); if (hasTs) { - p.log.info("Adding testing types to tsconfig.json"); + p.log.info("Adding testing types to tsconfig.json"); const tsConfigString = await readFile("tsconfig.json", "utf8"); const tsConfig = JSON.parse(tsConfigString); if (!tsConfig.compilerOptions) { @@ -146,8 +148,8 @@ export const integrations: Record = { (suffix) => !fileExists(`vite.config.${suffix}`) && !fileExists(`vitest.config.${suffix}`), ) ) { - const suffix = hasTs ? "ts" : "mjs"; - p.log.info(`Adding vitest.config.${suffix}`); + const suffix = hasTs ? "ts" : "mjs"; + p.log.info(`Adding vitest.config.${suffix}`); await writeFile( `vitest.config.${suffix}`, `import solid from "vite-plugin-solid"; diff --git a/packages/commands/src/lib/utils/helpers.ts b/packages/commands/src/lib/utils/helpers.ts index fbfe5ad..7cfcb73 100644 --- a/packages/commands/src/lib/utils/helpers.ts +++ b/packages/commands/src/lib/utils/helpers.ts @@ -27,7 +27,12 @@ export function validateFilePath(path: string, lookingFor: string): string | und export function validateFilePath(path: string, lookingFor: string[]): string | undefined; export function validateFilePath(path: string, lookingFor: string | string[]): string | undefined { path = resolve(path); - const isDir = lstatSync(path).isDirectory(); + let isDir: boolean; + try { + console.log(path) + isDir = lstatSync(path).isDirectory(); + } + catch (e) { return undefined } if (isDir) { const files = readdirSync(path, { withFileTypes: true }); @@ -58,9 +63,11 @@ export async function findFiles( let { depth = Infinity, ignoreDirs = ["node_modules", "."], startsWith = true } = opts; startPath = resolve(startPath); - - const isDir = lstatSync(startPath).isDirectory(); - + let isDir: boolean; + try { + isDir = lstatSync(startPath).isDirectory(); + } + catch (e) { return [] }; if (!isDir) { startPath = resolve(startPath.slice(0, startPath.lastIndexOf("/"))); } diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 69d759f..60139e5 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -94,17 +94,23 @@ const main = async () => { version, }); const args = process.argv.slice(2); + try { - if (args.length === 0) { - await provideSuggestions(); - return; - } + if (args.length === 0) { + await provideSuggestions(); + return; + } - if (args.length === 1 && args[0] === "start") { - await provideStartSuggestions(); - return; - } + if (args.length === 1 && args[0] === "start") { + await provideStartSuggestions(); + return; + } - await run(cli, args); + await run(cli, args); + } + catch (e) { + console.error(e); + process.exit(1); + } }; main(); diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index 5eeeabc..e996680 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -13,7 +13,7 @@ type FileUpdate = { type: "file"; name: string; contents: string; checked: boole // Don't bother explicitly handling plugin updates, since they're just a file update export type Update = PackageUpdate | CommandUpdate | FileUpdate; type UpdateSummary = { - packageUpdates: string[]; + packageUpdates: PackageUpdate[]; commandUpdates: string[]; fileUpdates: string[]; }; @@ -23,7 +23,7 @@ export const clearQueue = () => { }; export const summarizeUpdates = (): UpdateSummary => { const fileUpdates = UPDATESQUEUE.filter((u) => u.type === "file").map((s) => s.name); - const packageUpdates = UPDATESQUEUE.filter((u) => u.type === "package").map((s) => s.name); + const packageUpdates = UPDATESQUEUE.filter((u) => u.type === "package") as PackageUpdate[]; const commandUpdates = UPDATESQUEUE.filter((u) => u.type === "command").map((s) => s.name); return { packageUpdates, commandUpdates, fileUpdates }; }; @@ -64,7 +64,12 @@ export const flushPackageUpdates = async () => { const pM = detectPackageManager(); const instlCmd = getInstallCommand(pM); for (const update of packageUpdates) { - await $`${pM.name} ${instlCmd}${update.dev ? " -D " : " "}${update.name}`; + if (update.dev) { + await $`${pM.name} ${instlCmd} -D ${update.name}`; + } + else { + await $`${pM.name} ${instlCmd} ${update.name}`; + } } }; export const flushCommandUpdates = async () => { From cb012f8ef9e0d53d3a8f4154e69b046ec59565e3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 17 May 2024 19:57:02 +0100 Subject: [PATCH 101/290] Remove bundled tsup config --- .../utils/tsup.config.bundled_l54xtac2cje.mjs | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 packages/utils/tsup.config.bundled_l54xtac2cje.mjs diff --git a/packages/utils/tsup.config.bundled_l54xtac2cje.mjs b/packages/utils/tsup.config.bundled_l54xtac2cje.mjs deleted file mode 100644 index 0bea7b2..0000000 --- a/packages/utils/tsup.config.bundled_l54xtac2cje.mjs +++ /dev/null @@ -1,17 +0,0 @@ -// tsup.config.ts -import { defineConfig } from "tsup"; -import metaUrlPlugin from "@chialab/esbuild-plugin-meta-url"; -var tsup_config_default = defineConfig({ - entry: ["src"], - target: "esnext", - format: ["esm", "cjs"], - splitting: false, - sourcemap: true, - clean: true, - minify: true, - esbuildPlugins: [metaUrlPlugin()] -}); -export { - tsup_config_default as default -}; -//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidHN1cC5jb25maWcudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9faW5qZWN0ZWRfZmlsZW5hbWVfXyA9IFwiQzpcXFxcVXNlcnNcXFxcdGhvbWFcXFxcRGV2ZWxvcG1lbnRcXFxcdHlwZXNjcmlwdFxcXFxzb2xpZC1jbGlcXFxccGFja2FnZXNcXFxcdXRpbHNcXFxcdHN1cC5jb25maWcudHNcIjtjb25zdCBfX2luamVjdGVkX2Rpcm5hbWVfXyA9IFwiQzpcXFxcVXNlcnNcXFxcdGhvbWFcXFxcRGV2ZWxvcG1lbnRcXFxcdHlwZXNjcmlwdFxcXFxzb2xpZC1jbGlcXFxccGFja2FnZXNcXFxcdXRpbHNcIjtjb25zdCBfX2luamVjdGVkX2ltcG9ydF9tZXRhX3VybF9fID0gXCJmaWxlOi8vL0M6L1VzZXJzL3Rob21hL0RldmVsb3BtZW50L3R5cGVzY3JpcHQvc29saWQtY2xpL3BhY2thZ2VzL3V0aWxzL3RzdXAuY29uZmlnLnRzXCI7aW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInRzdXBcIjtcclxuaW1wb3J0IG1ldGFVcmxQbHVnaW4gZnJvbSBcIkBjaGlhbGFiL2VzYnVpbGQtcGx1Z2luLW1ldGEtdXJsXCI7XHJcblxyXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xyXG5cdGVudHJ5OiBbXCJzcmNcIl0sXHJcblx0dGFyZ2V0OiBcImVzbmV4dFwiLFxyXG5cdGZvcm1hdDogW1wiZXNtXCIsIFwiY2pzXCJdLFxyXG5cdHNwbGl0dGluZzogZmFsc2UsXHJcblx0c291cmNlbWFwOiB0cnVlLFxyXG5cdGNsZWFuOiB0cnVlLFxyXG5cdG1pbmlmeTogdHJ1ZSxcclxuXHRlc2J1aWxkUGx1Z2luczogW21ldGFVcmxQbHVnaW4oKV0sXHJcbn0pO1xyXG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQXdWLFNBQVMsb0JBQW9CO0FBQ3JYLE9BQU8sbUJBQW1CO0FBRTFCLElBQU8sc0JBQVEsYUFBYTtBQUFBLEVBQzNCLE9BQU8sQ0FBQyxLQUFLO0FBQUEsRUFDYixRQUFRO0FBQUEsRUFDUixRQUFRLENBQUMsT0FBTyxLQUFLO0FBQUEsRUFDckIsV0FBVztBQUFBLEVBQ1gsV0FBVztBQUFBLEVBQ1gsT0FBTztBQUFBLEVBQ1AsUUFBUTtBQUFBLEVBQ1IsZ0JBQWdCLENBQUMsY0FBYyxDQUFDO0FBQ2pDLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg== From bbfe8046b930ee7681b9cac1a1b3e900e59025f4 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Fri, 17 May 2024 15:57:35 -0700 Subject: [PATCH 102/290] remove generic netlify folder from the gitignore We need this so devs can enable netlify features directly. --- packages/commands/src/handlers/new.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 54ffe8a..2f5fcd3 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -16,7 +16,6 @@ dist .output .vercel .netlify -netlify .vinxi # Environment From 60e2dcd78c7ad119d7390fec83e631d6ad3207d1 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Wed, 15 May 2024 23:32:45 +0200 Subject: [PATCH 103/290] feat: tauri integration --- README.md | 2 +- packages/commands/src/lib/integrations.ts | 63 ++++++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 811dbaf..3e4293c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ A custom-built CLI for creating and managing SolidJS apps and projects. - [x] UnoCSS - [ ] Vanilla Extract - [x] Vitest - - [ ] Tauri + - [x] Tauri - [ ] Playwright - [ ] Utilities - [ ] eslint-plugin-solid diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index 8aef2c8..336fb43 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -125,9 +125,14 @@ export const integrations: Record = { p.log.info("Adding test script to package.json"); const packageJsonString = await readFile("package.json", "utf8"); const packageJson = JSON.parse(packageJsonString); + if (!packageJson.scripts) { packageJson.scripts = {}; } if (!/\bvitest\b/.test(packageJson.scripts.test || "")) { packageJson.scripts.test = "vitest"; - await writeFile("package.json", JSON.stringify(packageJson, null, 2) + "\n", "utf8"); + await writeFile( + "package.json", + JSON.stringify(packageJson, null, /^(\t|\s+)/m.exec(packageJsonString)?.[0] || 2) + "\n", + "utf8" + ); } const hasTs = fileExists("tsconfig.json"); if (hasTs) { @@ -140,7 +145,11 @@ export const integrations: Record = { tsConfig.compilerOptions.types = [ ...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]), ]; - await writeFile("tsconfig.json", JSON.stringify(tsConfig, null, 2) + "\n", "utf8"); + await writeFile( + "tsconfig.json", + JSON.stringify(tsConfig, null, /^(\t|\s+)/m.exec(tsConfigString)?.[0] || 2) + "\n", + "utf8" + ); } if ( packageJson.dependencies["@solidjs/start"] && @@ -170,4 +179,54 @@ export default defineConfig({ } }, }, + "tauri-v1.x": { + installs: ["@tauri-apps/cli"], + postInstall: async () => { + try { + const packageJsonString = await readFile("package.json", "utf8"); + const packageJson = JSON.parse(packageJsonString); + if (!packageJson.scripts) { packageJson.scripts = {}; } + packageJson.scripts.tauri = "tauri"; + await writeFile( + "package.json", + JSON.stringify(packageJson, null, /^(\t|\s+)/m.exec(packageJsonString)?.[0] || 2) + "\n", + "utf8" + ); + await flushQueue(); + const name = packageJson.name; + const pM = detectPackageManager(); + await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`; + p.outro(`Make sure you have installed all prerequisites: https://tauri.app/v1/guides/getting-started/prerequisites + + Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`); + } catch (err) { + console.error(err); + } + }, + }, + "tauri-v2.x": { + installs: ["@tauri-apps/cli@next"], + postInstall: async () => { + try { + const packageJsonString = await readFile("package.json", "utf8"); + const packageJson = JSON.parse(packageJsonString); + if (!packageJson.scripts) { packageJson.scripts = {}; } + packageJson.scripts.tauri = "tauri"; + await writeFile( + "package.json", + JSON.stringify(packageJson, null, /^(\t|\s+)/m.exec(packageJsonString)?.[0] || 2) + "\n", + "utf8" + ); + await flushQueue(); + const name = packageJson.name; + const pM = detectPackageManager(); + await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`; + p.outro(`Make sure you have installed all prerequisites: https://v2.tauri.app/start/prerequisites/ + + Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`); + } catch (err) { + console.error(err); + } + }, + }, }; From 91e83c211f67b987ce05e0bde39b1e51a53e73e9 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Sat, 18 May 2024 21:57:13 +0200 Subject: [PATCH 104/290] remove stray getAppConfig + refactor --- packages/commands/src/handlers/add.ts | 2 - packages/commands/src/lib/integrations.ts | 89 ++++---- packages/commands/src/lib/utils/helpers.ts | 229 +++++++++++---------- 3 files changed, 162 insertions(+), 158 deletions(-) diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index 5b1f48c..1667521 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -109,8 +109,6 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f }) .filter((p) => p) as Configs; - const appConfig = await getAppConfig(); - for (let i = 0; i < configs.length; i++) { const config = configs[i]; config.installs.forEach((p) => queueUpdate({ type: "package", name: p, dev: false })); diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts index 336fb43..04b2049 100644 --- a/packages/commands/src/lib/integrations.ts +++ b/packages/commands/src/lib/integrations.ts @@ -1,6 +1,6 @@ import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs"; -import { readFile, writeFile } from "fs/promises"; -import { fileExists, validateFilePath } from "./utils/helpers"; +import { writeFile } from "fs/promises"; +import { fileExists, manipulateJsonFile, validateFilePath } from "./utils/helpers"; import { $ } from "execa"; import { getRunnerCommand, detectPackageManager } from "@solid-cli/utils/package-manager"; import { createSignal } from "@solid-cli/reactivity"; @@ -123,36 +123,30 @@ export const integrations: Record = { additionalConfig: async () => { try { p.log.info("Adding test script to package.json"); - const packageJsonString = await readFile("package.json", "utf8"); - const packageJson = JSON.parse(packageJsonString); - if (!packageJson.scripts) { packageJson.scripts = {}; } - if (!/\bvitest\b/.test(packageJson.scripts.test || "")) { - packageJson.scripts.test = "vitest"; - await writeFile( - "package.json", - JSON.stringify(packageJson, null, /^(\t|\s+)/m.exec(packageJsonString)?.[0] || 2) + "\n", - "utf8" - ); - } + let hasStart = false; + manipulateJsonFile("package.json", (packageJson) => { + if (!packageJson.scripts) { packageJson.scripts = {}; } + if (!/\bvitest\b/.test(packageJson.scripts.test || "")) { + packageJson.scripts.test = "vitest"; + } + hasStart = packageJson.dependencies["@solidjs/start"] + return packageJson; + }); const hasTs = fileExists("tsconfig.json"); - if (hasTs) { + if (hasTs) { p.log.info("Adding testing types to tsconfig.json"); - const tsConfigString = await readFile("tsconfig.json", "utf8"); - const tsConfig = JSON.parse(tsConfigString); - if (!tsConfig.compilerOptions) { - tsConfig.compilerOptions = {}; - } - tsConfig.compilerOptions.types = [ - ...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]), - ]; - await writeFile( - "tsconfig.json", - JSON.stringify(tsConfig, null, /^(\t|\s+)/m.exec(tsConfigString)?.[0] || 2) + "\n", - "utf8" - ); + manipulateJsonFile("tsconfig.json", (tsConfig) => { + if (!tsConfig.compilerOptions) { + tsConfig.compilerOptions = {}; + } + tsConfig.compilerOptions.types = [ + ...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]), + ]; + return tsConfig; + }); } if ( - packageJson.dependencies["@solidjs/start"] && + hasStart && ["ts", "mjs", "cjs", "js"].every( (suffix) => !fileExists(`vite.config.${suffix}`) && !fileExists(`vitest.config.${suffix}`), ) @@ -183,20 +177,17 @@ export default defineConfig({ installs: ["@tauri-apps/cli"], postInstall: async () => { try { - const packageJsonString = await readFile("package.json", "utf8"); - const packageJson = JSON.parse(packageJsonString); - if (!packageJson.scripts) { packageJson.scripts = {}; } - packageJson.scripts.tauri = "tauri"; - await writeFile( - "package.json", - JSON.stringify(packageJson, null, /^(\t|\s+)/m.exec(packageJsonString)?.[0] || 2) + "\n", - "utf8" - ); + let name = ""; + manipulateJsonFile("package.json", (packageJson) => { + if (!packageJson.scripts) { packageJson.scripts = {}; } + packageJson.scripts.tauri = "tauri"; + name = packageJson.name; + return packageJson; + }); await flushQueue(); - const name = packageJson.name; const pM = detectPackageManager(); await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`; - p.outro(`Make sure you have installed all prerequisites: https://tauri.app/v1/guides/getting-started/prerequisites + p.note(`Make sure you have installed all prerequisites: https://tauri.app/v1/guides/getting-started/prerequisites Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`); } catch (err) { @@ -208,20 +199,17 @@ export default defineConfig({ installs: ["@tauri-apps/cli@next"], postInstall: async () => { try { - const packageJsonString = await readFile("package.json", "utf8"); - const packageJson = JSON.parse(packageJsonString); - if (!packageJson.scripts) { packageJson.scripts = {}; } - packageJson.scripts.tauri = "tauri"; - await writeFile( - "package.json", - JSON.stringify(packageJson, null, /^(\t|\s+)/m.exec(packageJsonString)?.[0] || 2) + "\n", - "utf8" - ); + let name = ""; + manipulateJsonFile("package.json", (packageJson) => { + if (!packageJson.scripts) { packageJson.scripts = {}; } + packageJson.scripts.tauri = "tauri"; + name = packageJson.name; + return packageJson; + }) await flushQueue(); - const name = packageJson.name; const pM = detectPackageManager(); await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`; - p.outro(`Make sure you have installed all prerequisites: https://v2.tauri.app/start/prerequisites/ + p.note(`Make sure you have installed all prerequisites: https://v2.tauri.app/start/prerequisites/ Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`); } catch (err) { @@ -230,3 +218,4 @@ export default defineConfig({ }, }, }; + diff --git a/packages/commands/src/lib/utils/helpers.ts b/packages/commands/src/lib/utils/helpers.ts index c56ac54..8fd03dd 100644 --- a/packages/commands/src/lib/utils/helpers.ts +++ b/packages/commands/src/lib/utils/helpers.ts @@ -1,4 +1,5 @@ import { existsSync, lstatSync, readdirSync } from "fs"; +import { readFile, writeFile } from "fs/promises"; import { isSolidStart } from "@solid-cli/utils"; import { join, resolve } from "path"; import { $ } from "execa"; @@ -7,129 +8,145 @@ import * as p from "@clack/prompts"; import color from "picocolors"; export const getProjectRoot = async () => { - const { stdout } = await $`npm root`; + const { stdout } = await $`npm root`; - return stdout.slice(0, stdout.lastIndexOf("/")); + return stdout.slice(0, stdout.lastIndexOf("/")); }; export const getRootFile = async () => { - if (await isSolidStart()) { - return "src/app.tsx"; - } - return "src/index.tsx"; + if (await isSolidStart()) { + return "src/app.tsx"; + } + return "src/index.tsx"; }; export const fileExists = (path: string) => { - return existsSync(path); + return existsSync(path); }; export function validateFilePath(path: string, lookingFor: string): string | undefined; export function validateFilePath(path: string, lookingFor: string[]): string | undefined; export function validateFilePath(path: string, lookingFor: string | string[]): string | undefined { - path = resolve(path); - let isDir: boolean; - try { - console.log(path) - isDir = lstatSync(path).isDirectory(); - } - catch (e) { return undefined } - if (isDir) { - const files = readdirSync(path, { withFileTypes: true }); - - const config = files.find((file) => { - if (Array.isArray(lookingFor)) { - return lookingFor.some((s) => file.name.startsWith(s)); - } - - return file.name.startsWith(lookingFor); - }); - return config ? join(path, config.name) : undefined; - } - - const pathIsValid = Array.isArray(lookingFor) - ? lookingFor.some((s) => path.startsWith(s)) - : path.startsWith(lookingFor); - - const exists = fileExists(path) && pathIsValid; - - return exists ? path : undefined; + path = resolve(path); + let isDir: boolean; + try { + console.log(path); + isDir = lstatSync(path).isDirectory(); + } catch (e) { + return undefined; + } + if (isDir) { + const files = readdirSync(path, { withFileTypes: true }); + + const config = files.find((file) => { + if (Array.isArray(lookingFor)) { + return lookingFor.some((s) => file.name.startsWith(s)); + } + + return file.name.startsWith(lookingFor); + }); + return config ? join(path, config.name) : undefined; + } + + const pathIsValid = Array.isArray(lookingFor) + ? lookingFor.some((s) => path.startsWith(s)) + : path.startsWith(lookingFor); + + const exists = fileExists(path) && pathIsValid; + + return exists ? path : undefined; } export async function findFiles( - startPath: string, - lookingFor: string | string[], - opts: { depth?: number; ignoreDirs?: string[]; startsWith?: boolean }, + startPath: string, + lookingFor: string | string[], + opts: { depth?: number; ignoreDirs?: string[]; startsWith?: boolean }, ): Promise { - let { depth = Infinity, ignoreDirs = ["node_modules", "."], startsWith = true } = opts; - - startPath = resolve(startPath); - let isDir: boolean; - try { - isDir = lstatSync(startPath).isDirectory(); - } - catch (e) { return [] }; - if (!isDir) { - startPath = resolve(startPath.slice(0, startPath.lastIndexOf("/"))); - } - - let filePaths: string[] = []; - - const files = readdirSync(startPath, { withFileTypes: true }); - - for (const file of files) { - if (file.isDirectory() && !ignoreDirs.some((s) => file.name.includes(s))) { - if (Number.isFinite(depth) && depth-- <= 0) continue; - filePaths = filePaths.concat(await findFiles(resolve(startPath, file.name), lookingFor, opts)); - continue; - } - - if (file.isFile()) { - const fileMatch = Array.isArray(lookingFor) - ? lookingFor.some((s) => (startsWith ? file.name.startsWith(s) : file.name.endsWith(s))) - : startsWith - ? file.name.startsWith(lookingFor) - : file.name.endsWith(lookingFor); - - if (fileMatch) { - filePaths.push(resolve(startPath, file.name)); - } - } - } - - return filePaths; + let { depth = Infinity, ignoreDirs = ["node_modules", "."], startsWith = true } = opts; + + startPath = resolve(startPath); + let isDir: boolean; + try { + isDir = lstatSync(startPath).isDirectory(); + } catch (e) { + return []; + } + if (!isDir) { + startPath = resolve(startPath.slice(0, startPath.lastIndexOf("/"))); + } + + let filePaths: string[] = []; + + const files = readdirSync(startPath, { withFileTypes: true }); + + for (const file of files) { + if (file.isDirectory() && !ignoreDirs.some((s) => file.name.includes(s))) { + if (Number.isFinite(depth) && depth-- <= 0) continue; + filePaths = filePaths.concat(await findFiles(resolve(startPath, file.name), lookingFor, opts)); + continue; + } + + if (file.isFile()) { + const fileMatch = Array.isArray(lookingFor) + ? lookingFor.some((s) => (startsWith ? file.name.startsWith(s) : file.name.endsWith(s))) + : startsWith + ? file.name.startsWith(lookingFor) + : file.name.endsWith(lookingFor); + + if (fileMatch) { + filePaths.push(resolve(startPath, file.name)); + } + } + } + + return filePaths; } export const getAppConfig = async () => { - let configFile = "app.config.ts"; - - const existsHere = fileExists(configFile); - - if (!existsHere) { - const root = await getProjectRoot(); - const existsInRoot = validateFilePath(root, "app.config"); - if (existsInRoot) { - const correctConfig = await cancelable( - p.confirm({ - message: `Could not find app config in current directory, but found app config in \`${root}\`. Is this the correct vite config?`, - }), - ); - if (correctConfig) return existsInRoot; - } - - p.log.error(color.red(`Can't find app.config file`)); - await cancelable( - p.text({ - message: "Type path to app config: ", - validate(value) { - const path = validateFilePath(value, "app.config"); - if (!path) return `App config not found. Please try again`; - else { - configFile = path; - } - }, - }), - ); - } - - return configFile; + let configFile = "app.config.ts"; + + const existsHere = fileExists(configFile); + + if (!existsHere) { + const root = await getProjectRoot(); + const existsInRoot = validateFilePath(root, "app.config"); + if (existsInRoot) { + const correctConfig = await cancelable( + p.confirm({ + message: `Could not find app config in current directory, but found app config in \`${root}\`. Is this the correct vite config?`, + }), + ); + if (correctConfig) return existsInRoot; + } + + p.log.error(color.red(`Can't find app.config file`)); + await cancelable( + p.text({ + message: "Type path to app config: ", + validate(value) { + const path = validateFilePath(value, "app.config"); + if (!path) return `App config not found. Please try again`; + else { + configFile = path; + } + }, + }), + ); + } + + return configFile; }; + +export async function manipulateJsonFile(name: string, manipulate: (obj: Record) => Record) { + try { + const jsonString = await readFile(name, "utf8"); + const jsonObj = JSON.parse(jsonString); + await writeFile( + name, + JSON.stringify(manipulate(jsonObj), null, /^(\t|\s+)/m.exec(jsonString)?.[0] || 2) + "\n", + "utf8", + ); + } catch (error) { + p.log.error(color.red(error ? error.toString() : `unknown error when manipulating ${name}`)); + } +} From 17cdba5fcac6a8d8edf022d1394a929adf8ddd87 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Sat, 18 May 2024 17:09:07 -0400 Subject: [PATCH 105/290] Add vite config handling for SPAs. --- packages/commands/src/handlers/add.ts | 38 ++++++++++--------- .../commands/src/handlers/start/adapter.ts | 2 +- packages/commands/src/handlers/start/mode.ts | 2 +- packages/commands/src/lib/utils/helpers.ts | 16 ++++---- .../tests/config_manipulation.test.ts | 2 +- packages/utils/src/transform/index.ts | 18 ++++++++- .../utils/tests/plugin_transforms.test.ts | 30 +++++++++++++++ 7 files changed, 78 insertions(+), 30 deletions(-) diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts index 5b1f48c..5c8a4e6 100644 --- a/packages/commands/src/handlers/add.ts +++ b/packages/commands/src/handlers/add.ts @@ -4,8 +4,8 @@ import { Integrations, Supported, integrations, setRootFile } from "../lib/integ import * as p from "@clack/prompts"; import color from "picocolors"; import { primitives, loadPrimitives } from "@solid-cli/utils/primitives"; -import { t } from "@solid-cli/utils"; -import { fileExists, getRootFile, getAppConfig, validateFilePath } from "../lib/utils/helpers"; +import { isSolidStart, t } from "@solid-cli/utils"; +import { fileExists, getRootFile, getConfigFile, validateFilePath } from "../lib/utils/helpers"; import { writeFile, readFile } from "@solid-cli/utils/fs"; import { transformPlugins, type PluginOptions } from "@solid-cli/utils/transform"; import { @@ -43,8 +43,9 @@ const handleAutocompleteAdd = async () => { { label: t.NO, value: false }, { label: t.YES_FORCE, value: [true, "force"] }, ], - message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)} ${" " + color.yellow(a.map((opt) => opt.label).join(" ")) + " " - } \n${color.red(S_BAR)} `, + message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)} ${ + " " + color.yellow(a.map((opt) => opt.label).join(" ")) + " " + } \n${color.red(S_BAR)} `, }), ); @@ -109,7 +110,9 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f }) .filter((p) => p) as Configs; - const appConfig = await getAppConfig(); + const configType = (await isSolidStart()) ? "app" : "vite"; + + const configFile = await getConfigFile(configType); for (let i = 0; i < configs.length; i++) { const config = configs[i]; @@ -124,20 +127,19 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f if (!configs.length) return; const pluginOptions = configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[]; if (pluginOptions.length) { - const appConfig = await getAppConfig(); await spinnerify({ - startText: "Processing config", - finishText: "Config processed", - fn: async () => { - const code = await transformPlugins( - configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[], - { name: appConfig, contents: (await readFile(appConfig)).toString() }, - forceTransform, - undefined, - ); - await writeFile(appConfig, code); - }, - }); + startText: "Processing config", + finishText: "Config processed", + fn: async () => { + const code = await transformPlugins( + configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[], + { type: configType, name: configFile, contents: (await readFile(configFile)).toString() }, + forceTransform, + undefined, + ); + await writeFile(configFile, code); + }, + }); } p.log.info("Preparing post install steps for integrations"); diff --git a/packages/commands/src/handlers/start/adapter.ts b/packages/commands/src/handlers/start/adapter.ts index b17edb6..f2b6ef3 100644 --- a/packages/commands/src/handlers/start/adapter.ts +++ b/packages/commands/src/handlers/start/adapter.ts @@ -34,7 +34,7 @@ export const handleAdapter = async (name?: string, forceTransform = false) => { const sym = Symbol(name).toString(); let code = await transformPlugins( [], - { name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, + { type: "app", name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, forceTransform, ); code = `import ${name} from "solid-start-${name}";\n` + code; diff --git a/packages/commands/src/handlers/start/mode.ts b/packages/commands/src/handlers/start/mode.ts index c4d0780..c3e5a2b 100644 --- a/packages/commands/src/handlers/start/mode.ts +++ b/packages/commands/src/handlers/start/mode.ts @@ -30,7 +30,7 @@ export const handleMode = async (mode?: SupportedModes) => { if (mode != "ssg") { const newConfig = await transformPlugins( [], - { name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, + { type: "app", name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, true, true, ); diff --git a/packages/commands/src/lib/utils/helpers.ts b/packages/commands/src/lib/utils/helpers.ts index c56ac54..d37f629 100644 --- a/packages/commands/src/lib/utils/helpers.ts +++ b/packages/commands/src/lib/utils/helpers.ts @@ -99,30 +99,30 @@ export async function findFiles( return filePaths; } -export const getAppConfig = async () => { - let configFile = "app.config.ts"; +export const getConfigFile = async (file: "app" | "vite" = "app") => { + let configFile = `${file}.config.ts`; const existsHere = fileExists(configFile); if (!existsHere) { const root = await getProjectRoot(); - const existsInRoot = validateFilePath(root, "app.config"); + const existsInRoot = validateFilePath(root, `${file}.config`); if (existsInRoot) { const correctConfig = await cancelable( p.confirm({ - message: `Could not find app config in current directory, but found app config in \`${root}\`. Is this the correct vite config?`, + message: `Could not find ${file} config in current directory, but found ${file} config in \`${root}\`. Is this the correct ${file} config?`, }), ); if (correctConfig) return existsInRoot; } - p.log.error(color.red(`Can't find app.config file`)); + p.log.error(color.red(`Can't find ${file}.config file`)); await cancelable( p.text({ - message: "Type path to app config: ", + message: `Type path to ${file} config: `, validate(value) { - const path = validateFilePath(value, "app.config"); - if (!path) return `App config not found. Please try again`; + const path = validateFilePath(value, `${file}.config`); + if (!path) return `${file} config not found. Please try again`; else { configFile = path; } diff --git a/packages/commands/tests/config_manipulation.test.ts b/packages/commands/tests/config_manipulation.test.ts index 9ef0a98..2a40415 100644 --- a/packages/commands/tests/config_manipulation.test.ts +++ b/packages/commands/tests/config_manipulation.test.ts @@ -46,7 +46,7 @@ vi.mock("@solid-cli/utils/updates", async () => { vi.mock("../src/lib/utils/helpers.ts", async () => { return { - getAppConfig: async (): Promise => new Promise((r) => r("app.config.ts")), + getConfigFile: async (file): Promise => new Promise((r) => r(`${file}.config.ts`)), fileExists: (path: string) => path.includes("app_config") || path.includes("app.tsx") || path.includes("index.tsx"), getRootFile: async (): Promise => new Promise((r) => r("./src/app.tsx")), }; diff --git a/packages/utils/src/transform/index.ts b/packages/utils/src/transform/index.ts index 239ba54..7d7ff72 100644 --- a/packages/utils/src/transform/index.ts +++ b/packages/utils/src/transform/index.ts @@ -1,7 +1,9 @@ -import { parseModule } from "magicast"; +import { generateCode, parseModule } from "magicast"; +import { addVitePlugin } from "magicast/helpers"; import { addPlugins } from "./parse"; export type Config = { + type: "app" | "vite"; name: string; contents: string; }; @@ -15,6 +17,20 @@ export const transformPlugins = async ( _merge_configs = false, ) => { const mod = parseModule(config.contents, { trailingComma: false, flowObjectCommas: false }); + + if (config.type === "vite") { + for (const plugin of new_plugins) { + addVitePlugin(mod, { + imported: plugin.isDefault ? "default" : plugin.importName, + from: plugin.importSource, + constructor: plugin.importName, + options: plugin.options, + }); + } + + return generateCode(mod).code; + } + return addPlugins(mod, new_plugins).code; }; // All the integrations/packages that we support diff --git a/packages/utils/tests/plugin_transforms.test.ts b/packages/utils/tests/plugin_transforms.test.ts index 8c14573..9a69428 100644 --- a/packages/utils/tests/plugin_transforms.test.ts +++ b/packages/utils/tests/plugin_transforms.test.ts @@ -49,8 +49,36 @@ const examplePlugin: PluginOptions = { options: {}, }; describe("transformPlugins", () => { + test("SPA config is updated properly", async () => { + const config: Config = { + type: "vite", + name: "vite.config.ts", + contents: ` + import { defineConfig } from "vite"; + + // Simulates a vite config + export default defineConfig({ +plugins: [] + }); + `, + }; + const expected = ` + import examplePlugin from "example"; + import { defineConfig } from "vite"; + + // Simulates a vite config + export default defineConfig({ + plugins: [examplePlugin({})] + }); + `; + + const result = await transformPlugins([examplePlugin], config); + + expect(removeWhitespace(result)).toBe(removeWhitespace(expected)); + }); test("No vite property defined config is updated properly", async () => { const config: Config = { + type: "app", name: "app.config.ts", contents: ` import { defineConfig } from "@solidjs/start/config"; @@ -67,6 +95,7 @@ describe("transformPlugins", () => { }); test("Object config is updated properly", async () => { const config: Config = { + type: "app", name: "app.config.ts", contents: makeExampleConfig(["solid()"]), }; @@ -77,6 +106,7 @@ describe("transformPlugins", () => { }); test("Arrow-function config is updated properly", async () => { const config: Config = { + type: "app", name: "app.config.ts", contents: makeExampleConfig(["solid()"], [], "arrow"), }; From f950b519939a0e6ac49fd633f36dfd26218307d7 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Sat, 18 May 2024 17:12:22 -0400 Subject: [PATCH 106/290] Revert config manipulation test change. --- packages/commands/tests/config_manipulation.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/commands/tests/config_manipulation.test.ts b/packages/commands/tests/config_manipulation.test.ts index 2a40415..fa48979 100644 --- a/packages/commands/tests/config_manipulation.test.ts +++ b/packages/commands/tests/config_manipulation.test.ts @@ -46,7 +46,7 @@ vi.mock("@solid-cli/utils/updates", async () => { vi.mock("../src/lib/utils/helpers.ts", async () => { return { - getConfigFile: async (file): Promise => new Promise((r) => r(`${file}.config.ts`)), + getConfigFile: async (): Promise => new Promise((r) => r("app.config.ts")), fileExists: (path: string) => path.includes("app_config") || path.includes("app.tsx") || path.includes("index.tsx"), getRootFile: async (): Promise => new Promise((r) => r("./src/app.tsx")), }; From 0c4ffb3332391576961f96d232874f71ff3900a5 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 May 2024 12:43:35 +0100 Subject: [PATCH 107/290] remove swc plugin --- packages/swc-plugin-solid-cli/.cargo/config | 5 - packages/swc-plugin-solid-cli/.gitignore | 4 - packages/swc-plugin-solid-cli/Cargo.lock | 2221 ----------------- packages/swc-plugin-solid-cli/Cargo.toml | 30 - packages/swc-plugin-solid-cli/README.md | 3 - .../output/swc_plugin_solid_cli.wasm | Bin 770715 -> 0 bytes packages/swc-plugin-solid-cli/package.json | 25 - .../swc-plugin-solid-cli/rust-toolchain.toml | 2 - packages/swc-plugin-solid-cli/src/config.rs | 41 - packages/swc-plugin-solid-cli/src/lib.rs | 372 --- .../swc-plugin-solid-cli/tests/fixture.rs | 65 - .../fixture/basic_tests/basic_config/code.js | 2 - .../basic_tests/basic_config/output.js | 5 - .../basic_tests/non_destructive/code.js | 1 - .../basic_tests/non_destructive/output.js | 7 - .../basic_tests/plugin_already_exists/code.js | 5 - .../plugin_already_exists/output.js | 5 - .../same_name_different_import/code.js | 4 - .../same_name_different_import/output.js | 5 - .../basic_tests/same_name_same_import/code.js | 4 - .../same_name_same_import/output.js | 4 - .../basic_tests/without_plugins/code.js | 1 - .../basic_tests/without_plugins/output.js | 4 - .../fixture/merge_tests/same_flag/code.js | 5 - .../fixture/merge_tests/same_flag/output.js | 9 - .../fixture/merge_tests/test_merging/code.js | 5 - .../merge_tests/test_merging/output.js | 10 - 27 files changed, 2844 deletions(-) delete mode 100644 packages/swc-plugin-solid-cli/.cargo/config delete mode 100644 packages/swc-plugin-solid-cli/.gitignore delete mode 100644 packages/swc-plugin-solid-cli/Cargo.lock delete mode 100644 packages/swc-plugin-solid-cli/Cargo.toml delete mode 100644 packages/swc-plugin-solid-cli/README.md delete mode 100644 packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm delete mode 100644 packages/swc-plugin-solid-cli/package.json delete mode 100644 packages/swc-plugin-solid-cli/rust-toolchain.toml delete mode 100644 packages/swc-plugin-solid-cli/src/config.rs delete mode 100644 packages/swc-plugin-solid-cli/src/lib.rs delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture.rs delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/output.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/code.js delete mode 100644 packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/output.js diff --git a/packages/swc-plugin-solid-cli/.cargo/config b/packages/swc-plugin-solid-cli/.cargo/config deleted file mode 100644 index eaa0fee..0000000 --- a/packages/swc-plugin-solid-cli/.cargo/config +++ /dev/null @@ -1,5 +0,0 @@ -# These command aliases are not final, may change -[alias] -# Alias to build actual plugin binary for the specified target. -build-wasi = "build --target wasm32-wasi" -build-wasm32 = "build --target wasm32-unknown-unknown" diff --git a/packages/swc-plugin-solid-cli/.gitignore b/packages/swc-plugin-solid-cli/.gitignore deleted file mode 100644 index 28aa12d..0000000 --- a/packages/swc-plugin-solid-cli/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target -^target/ -target -output/*.rlib \ No newline at end of file diff --git a/packages/swc-plugin-solid-cli/Cargo.lock b/packages/swc-plugin-solid-cli/Cargo.lock deleted file mode 100644 index 5952fed..0000000 --- a/packages/swc-plugin-solid-cli/Cargo.lock +++ /dev/null @@ -1,2221 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "ast_node" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "better_scoped_tls" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de" -dependencies = [ - "scoped-tls", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.21", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver 1.0.21", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "debugid" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d" -dependencies = [ - "serde", - "uuid", -] - -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - -[[package]] -name = "difference" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "from_variant" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" -dependencies = [ - "proc-macro2", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hstr" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "phf", - "rustc-hash", - "smallvec", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "indexmap" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" -dependencies = [ - "equivalent", - "hashbrown 0.14.3", -] - -[[package]] -name = "is-macro" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" -dependencies = [ - "Inflector", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "is_ci" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "miette" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c90329e44f9208b55f45711f9558cec15d7ef8295cc65ecd6d4188ae8edc58c" -dependencies = [ - "atty", - "backtrace", - "miette-derive", - "once_cell", - "owo-colors", - "supports-color", - "supports-hyperlinks", - "supports-unicode", - "terminal_size", - "textwrap", - "thiserror", - "unicode-width", -] - -[[package]] -name = "miette-derive" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b5bc45b761bcf1b5e6e6c4128cd93b84c218721a8d9b894aa0aff4ed180174c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", - "serde", -] - -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.6", - "libc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "owo-colors" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pmutil" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] -name = "proc-macro2" -version = "1.0.78" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "radix_fmt" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.4.5", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "relative-path" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" - -[[package]] -name = "rend" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" - -[[package]] -name = "ryu-js" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" -dependencies = [ - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.196" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "serde_json" -version = "1.0.113" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "smawk" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" - -[[package]] -name = "sourcemap" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" -dependencies = [ - "data-encoding", - "debugid", - "if_chain", - "rustc_version", - "serde", - "serde_json", - "unicode-id", - "url", -] - -[[package]] -name = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "string_enum" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "supports-color" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" -dependencies = [ - "atty", - "is_ci", -] - -[[package]] -name = "supports-hyperlinks" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590b34f7c5f01ecc9d78dba4b3f445f31df750a67621cf31626f3b7441ce6406" -dependencies = [ - "atty", -] - -[[package]] -name = "supports-unicode" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b945e45b417b125a8ec51f1b7df2f8df7920367700d1f98aedd21e5735f8b2" -dependencies = [ - "atty", -] - -[[package]] -name = "swc-plugin-solid-cli" -version = "0.1.0" -dependencies = [ - "serde", - "serde_json", - "swc_core", - "testing", -] - -[[package]] -name = "swc_atoms" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" -dependencies = [ - "bytecheck", - "hstr", - "once_cell", - "rkyv", - "rustc-hash", - "serde", -] - -[[package]] -name = "swc_cached" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630c761c74ac8021490b78578cc2223aa4a568241e26505c27bf0e4fd4ad8ec2" -dependencies = [ - "ahash 0.8.8", - "anyhow", - "dashmap", - "once_cell", - "regex", - "serde", -] - -[[package]] -name = "swc_common" -version = "0.33.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "095c158fe55b36faeebb4274692643a6d7cdc5b7902e1d5968ddbe52b7de1d1c" -dependencies = [ - "anyhow", - "ast_node", - "atty", - "better_scoped_tls", - "bytecheck", - "cfg-if", - "either", - "from_variant", - "new_debug_unreachable", - "num-bigint", - "once_cell", - "parking_lot", - "rkyv", - "rustc-hash", - "serde", - "siphasher", - "sourcemap", - "swc_atoms", - "swc_eq_ignore_macros", - "swc_visit", - "termcolor", - "tracing", - "unicode-width", - "url", -] - -[[package]] -name = "swc_config" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" -dependencies = [ - "anyhow", - "indexmap", - "serde", - "serde_json", - "sourcemap", - "swc_cached", - "swc_config_macro", -] - -[[package]] -name = "swc_config_macro" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2574f75082322a27d990116cd2a24de52945fc94172b24ca0b3e9e2a6ceb6b" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_core" -version = "0.90.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28da75904d199c7bb0a7ae7a6e07955ac70be3e759028f575d0aa3b7faa74ea0" -dependencies = [ - "once_cell", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_minifier", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_testing", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_plugin", - "swc_plugin_macro", - "swc_plugin_proxy", - "vergen", -] - -[[package]] -name = "swc_ecma_ast" -version = "0.112.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852a48a24a2533de88298c6b25355bc68fdee31ac21cb4fb8939b7001715353c" -dependencies = [ - "bitflags 2.4.2", - "bytecheck", - "is-macro", - "num-bigint", - "phf", - "rkyv", - "scoped-tls", - "serde", - "string_enum", - "swc_atoms", - "swc_common", - "unicode-id", -] - -[[package]] -name = "swc_ecma_codegen" -version = "0.148.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79df3f8c5ed028fce5dc24acb83002c0854f8b9d7e893292aeee394a6b9eaf4" -dependencies = [ - "memchr", - "num-bigint", - "once_cell", - "rustc-hash", - "serde", - "sourcemap", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen_macros", - "tracing", -] - -[[package]] -name = "swc_ecma_codegen_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_minifier" -version = "0.192.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346fdd6d2e1204aac567a6c65590c1655a25deb11e8fb95fe7d6cf4fe6b54a5e" -dependencies = [ - "arrayvec", - "indexmap", - "num-bigint", - "num_cpus", - "once_cell", - "parking_lot", - "radix_fmt", - "regex", - "rustc-hash", - "ryu-js", - "serde", - "serde_json", - "swc_atoms", - "swc_common", - "swc_config", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_optimization", - "swc_ecma_usage_analyzer", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_timer", - "tracing", -] - -[[package]] -name = "swc_ecma_parser" -version = "0.143.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ff55811ed5de14b05e9a2979bae2bce3c807582f559b4325948463265307d9" -dependencies = [ - "either", - "new_debug_unreachable", - "num-bigint", - "num-traits", - "phf", - "serde", - "smallvec", - "smartstring", - "stacker", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "tracing", - "typed-arena", -] - -[[package]] -name = "swc_ecma_testing" -version = "0.22.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41fb62ef85a23515889fc99eac156f9afc4eb10c8eaadf70ffee53982b2ab82" -dependencies = [ - "anyhow", - "hex", - "sha2", - "testing", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_base" -version = "0.137.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803bb435fdd532d5c931f0d487e48dbc94750d26c9336d79a6f1c04c62f08d93" -dependencies = [ - "better_scoped_tls", - "bitflags 2.4.2", - "indexmap", - "once_cell", - "phf", - "rustc-hash", - "serde", - "smallvec", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_utils", - "swc_ecma_visit", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_macros" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e309b88f337da54ef7fe4c5b99c2c522927071f797ee6c9fb8b6bf2d100481" -dependencies = [ - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "swc_ecma_transforms_optimization" -version = "0.198.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c6fffe4d6e3609fdd6c768cc063dbc9f5101f9be0db1168ec76ace979cf616" -dependencies = [ - "dashmap", - "indexmap", - "once_cell", - "petgraph", - "rustc-hash", - "serde_json", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_parser", - "swc_ecma_transforms_base", - "swc_ecma_transforms_macros", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_fast_graph", - "tracing", -] - -[[package]] -name = "swc_ecma_transforms_testing" -version = "0.140.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74719bd3f5a1dc2927d0ed0ffdd44ec3430eb8561cc5d71f9f663d425a185062" -dependencies = [ - "ansi_term", - "anyhow", - "base64", - "hex", - "serde", - "serde_json", - "sha2", - "sourcemap", - "swc_common", - "swc_ecma_ast", - "swc_ecma_codegen", - "swc_ecma_parser", - "swc_ecma_testing", - "swc_ecma_transforms_base", - "swc_ecma_utils", - "swc_ecma_visit", - "tempfile", - "testing", -] - -[[package]] -name = "swc_ecma_usage_analyzer" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0950f5344e7125bdcd42055eec6c2c0abe44b6952749967b206832c65e27623" -dependencies = [ - "indexmap", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_utils", - "swc_ecma_visit", - "swc_timer", - "tracing", -] - -[[package]] -name = "swc_ecma_utils" -version = "0.127.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e77ea18468895d26bd38656885860fede2acd24d1687f64363aaf8910441" -dependencies = [ - "indexmap", - "num_cpus", - "once_cell", - "rustc-hash", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_ecma_visit", - "tracing", - "unicode-id", -] - -[[package]] -name = "swc_ecma_visit" -version = "0.98.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb71511a816c7c84ddc96e6939389be261caf20858486a5e76948551f110e1f" -dependencies = [ - "num-bigint", - "swc_atoms", - "swc_common", - "swc_ecma_ast", - "swc_visit", - "tracing", -] - -[[package]] -name = "swc_eq_ignore_macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "swc_error_reporters" -version = "0.17.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dd7ff934a74cee8f2328c4fdd22113a36358ff390845f565bef1e1cf3b0f90" -dependencies = [ - "anyhow", - "miette", - "once_cell", - "parking_lot", - "swc_common", -] - -[[package]] -name = "swc_fast_graph" -version = "0.21.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd32eda2dd2c725f8d4448d0013c3b5466118e4ff5c30aff2c04f6750f7238b" -dependencies = [ - "indexmap", - "petgraph", - "rustc-hash", - "swc_common", -] - -[[package]] -name = "swc_macros_common" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "swc_plugin" -version = "0.90.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5df720531bfbd7ceb1139319c39c20c446abfb8f7e0eb47b104205a71152b4" -dependencies = [ - "once_cell", -] - -[[package]] -name = "swc_plugin_macro" -version = "0.9.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3232db481484070637b20a155c064096c0ea1ba04fa2247b89b618661b3574f4" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "swc_plugin_proxy" -version = "0.41.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0481ceefd2f896c792692b18043e45b68614ae0266c65d4addbcf7f6c8090d6" -dependencies = [ - "better_scoped_tls", - "rkyv", - "swc_common", - "swc_ecma_ast", - "swc_trace_macro", - "tracing", -] - -[[package]] -name = "swc_timer" -version = "0.21.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1247df8abb51666eede165577d93c1476b6aca7ab7bf58e0fff6015fad6fb1b5" -dependencies = [ - "tracing", -] - -[[package]] -name = "swc_trace_macro" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff9719b6085dd2824fd61938a881937be14b08f95e2d27c64c825a9f65e052ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "swc_visit" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" -dependencies = [ - "either", - "swc_visit_macros", -] - -[[package]] -name = "swc_visit_macros" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" -dependencies = [ - "Inflector", - "pmutil", - "proc-macro2", - "quote", - "swc_macros_common", - "syn 2.0.48", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tempfile" -version = "3.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "testing" -version = "0.35.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90b0f069d03bcee35190a27083f968d93ca6359dcea51ba274a583dc2a3ec56" -dependencies = [ - "ansi_term", - "cargo_metadata 0.15.4", - "difference", - "once_cell", - "pretty_assertions", - "regex", - "serde", - "serde_json", - "swc_common", - "swc_error_reporters", - "testing_macros", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "testing_macros" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d3864d4184569c1428645a51a304b3b6e8d3094cd61fb3cce8dfdd9f6d0f72" -dependencies = [ - "anyhow", - "glob", - "once_cell", - "proc-macro2", - "quote", - "regex", - "relative-path", - "syn 2.0.48", -] - -[[package]] -name = "textwrap" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" -dependencies = [ - "smawk", - "unicode-linebreak", - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-id" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-linebreak" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vergen" -version = "8.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" -dependencies = [ - "anyhow", - "cargo_metadata 0.18.1", - "regex", - "rustversion", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" -dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] diff --git a/packages/swc-plugin-solid-cli/Cargo.toml b/packages/swc-plugin-solid-cli/Cargo.toml deleted file mode 100644 index edcc314..0000000 --- a/packages/swc-plugin-solid-cli/Cargo.toml +++ /dev/null @@ -1,30 +0,0 @@ -[package] -name = "swc-plugin-solid-cli" -version = "0.1.0" -edition = "2021" - -[lib] -crate-type = ["cdylib", "rlib"] - -[profile.release] -lto = true -strip = "symbols" -codegen-units = 1 -[dependencies] -serde = "1" -serde_json = "1.0" -swc_core = { version = "0.90", features = [ - "ecma_plugin_transform", - "ecma_utils", - "ecma_minifier", - "ecma_visit", - "ecma_ast", - "common", -] } -[dev-dependencies] -swc_core = { version = "0.90", features = ["testing_transform", "ecma_parser"] } - -testing = { version = "0.35" } -# .cargo/config defines few alias to build plugin. -# cargo build-wasi generates wasm-wasi32 binary -# cargo build-wasm32 generates wasm32-unknown-unknown binary. diff --git a/packages/swc-plugin-solid-cli/README.md b/packages/swc-plugin-solid-cli/README.md deleted file mode 100644 index e0e27ac..0000000 --- a/packages/swc-plugin-solid-cli/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @solid-cli/swc-plugin-solid-cli - -An SWC plugin for updating a project's vite config, primarily used by the CLI to add new vite plugins and automatically configure them with sensible defaults diff --git a/packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm b/packages/swc-plugin-solid-cli/output/swc_plugin_solid_cli.wasm deleted file mode 100644 index 61bed960597f37edd8303f9c789472e3e9a3edee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 770715 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≈jj{EE5x<3B(=o^k3Twiaw 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%0DV z_*Ce1jWpJS$);m#3n~>%E39FxUlmpyhy zG4FR3^o}WE@*R^*<;L|1t%PxPO#Zf;vHSkR4W%;UdYJsSe758se!Wln~GK(r8!0L@_4kUwnJ9 z0!W$A15ZtG5KN9@%-(v)|cugsxWy4S%mRph<8iZL@g#?(AK7V zDp%egov6d)^0leWw_nrtiZh!qnS0)x*>yxeICA(YCO_F0AF)?S>7+fg6O)DS5wgBi zZyXO{_F(b{3Tay?@7vmR<^U!)ZE}s_YpTuN%lwAP>U8PXizRCwoo9|=GAd(Gdlx@o z{;rsbpqI0siFyI(7hGQdA-RGBtMNhiINy#R$;PyG@>r`*Ae<-jG^9S*eccHALSU}d z?|te6o%DQnY<3zr;~DQxl^H#L7KN?K!Fq(^KFL`sE+v~VEqE{||Eun)_MwoEhX~eK zXvZt=<{HsoR$e8b)(1Gv^iz~P-aA=s1P@H!C%4jaRL;Nd3&9VQ7x&2=RgZAmCd3ws z$?vzuQbGsWI#k#qG1(#M)4sijqYhcJC1CRU6=_we$$Ve@*w$cjlGKZogFPNqNo?7e ze6zmDciRTv4cpjqG1<(2*WG$|{k!FCJ23ft>F%F?RkL^AVJpVuHvy%4ua+!$`HHO! zla+IgpX=Q$Ix@yqj>&!{dk)9#yZv2)y$X{bTzlu?&giVsX0OHM*A|LjB)^Vra%8W= z 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 Self; -} -#[derive(Serialize, Deserialize, Default, Debug)] -#[serde(rename_all = "camelCase")] -pub struct PluginConfig { - pub import_name: String, - pub import_source: String, - pub is_default: bool, - pub options: Value, -} - -impl PluginConfig { - fn test() -> Self { - Self { - import_name: "UnoCss".to_string(), - import_source: "unocss/vite".to_string(), - is_default: true, - options: json!({}), - } - } -} - -#[derive(Serialize, Deserialize, Default, Debug)] -#[serde(rename_all = "camelCase")] -pub struct Config { - pub additional_plugins: Vec, - pub force_transform: bool, - pub merge_configs: bool, -} -impl Testing for Config { - fn test() -> Self { - Self { - additional_plugins: vec![PluginConfig::test()], - force_transform: true, - merge_configs: false, - } - } -} diff --git a/packages/swc-plugin-solid-cli/src/lib.rs b/packages/swc-plugin-solid-cli/src/lib.rs deleted file mode 100644 index 84f43f1..0000000 --- a/packages/swc-plugin-solid-cli/src/lib.rs +++ /dev/null @@ -1,372 +0,0 @@ -#![feature(let_chains)] -use std::collections::HashMap; -pub mod config; -use config::Config; -use serde_json::Value; - -use swc_core::common::DUMMY_SP; -use swc_core::ecma::ast::{ - ArrayLit, Bool, Callee, ExprOrSpread, ImportDecl, ImportDefaultSpecifier, ImportNamedSpecifier, - ImportSpecifier, KeyValueProp, Lit, Module, ModuleDecl, ModuleItem, Null, ObjectLit, Prop, - PropName, PropOrSpread, Str, -}; -use swc_core::ecma::utils::{prepend_stmt, swc_common, ExprExt}; - -use swc_core::ecma::{ - ast::{CallExpr, Expr, Ident, Program}, - visit::{as_folder, FoldWith, VisitMut, VisitMutWith}, -}; -use swc_core::plugin::errors::HANDLER; -use swc_core::plugin::{plugin_transform, proxies::TransformPluginProgramMetadata}; - -pub struct TransformVisitor { - original_imports: Vec, - new_imports: HashMap, - config: Config, -} -impl TransformVisitor { - pub fn new(config: Config) -> Self { - Self { - original_imports: Default::default(), - new_imports: Default::default(), - config, - } - } -} -/** - * Converts from serde_json's `Value` format to an swc `Expr`, which can then just be passed - */ -fn to_expr(val: &Value) -> Expr { - match val { - Value::Null => Expr::Lit(Lit::Null(Null { span: DUMMY_SP })), - Value::Number(n) => Expr::Lit(Lit::Num(n.as_f64().unwrap().into())), - Value::Bool(b) => Expr::Lit(Lit::Bool(Bool { - span: DUMMY_SP, - value: *b, - })), - Value::String(s) => Expr::Lit(Lit::Str(Str { - span: DUMMY_SP, - value: s.clone().into(), - raw: None, - })), - Value::Array(arr) => Expr::Array(ArrayLit { - span: DUMMY_SP, - elems: arr - .iter() - .map(|v| { - Some(ExprOrSpread { - spread: None, - expr: Box::new(to_expr(v)), - }) - }) - .collect(), - }), - Value::Object(obj) => Expr::Object(ObjectLit { - span: DUMMY_SP, - props: obj - .iter() - .map(|(k, v)| { - PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp { - key: PropName::Ident(Ident::new(k.clone().into(), DUMMY_SP)), - value: Box::new(to_expr(v)), - }))) - }) - .collect(), - }), - } -} -impl TransformVisitor { - // Taken almost verbatim from https://github.com/modderme123/swc-plugin-jsx-dom-expressions - pub fn insert_imports(&mut self, module: &mut Module) { - let mut entries = self.new_imports.drain().collect::>(); - entries.sort_by(|(a, _), (b, _)| a.cmp(b)); - for (name, val) in entries { - let specifier = if val.1 { - ImportSpecifier::Default(ImportDefaultSpecifier { - local: val.0, - span: DUMMY_SP, - }) - } else { - ImportSpecifier::Named(ImportNamedSpecifier { - local: val.0, - imported: None, - span: DUMMY_SP, - is_type_only: false, - }) - }; - prepend_stmt( - &mut module.body, - ModuleItem::ModuleDecl(ModuleDecl::Import(ImportDecl { - phase: Default::default(), - specifiers: vec![specifier], - src: Box::new(Str { - span: DUMMY_SP, - value: name.into(), - raw: None, - }), - span: DUMMY_SP, - type_only: false, - with: None, - })), - ); - } - } -} -fn get_import_names(import_decl: &ImportDecl) -> Vec<&str> { - import_decl - .specifiers - .iter() - .map(|s| match s { - ImportSpecifier::Named(s) => s.local.sym.as_ref(), - ImportSpecifier::Default(s) => s.local.sym.as_ref(), - ImportSpecifier::Namespace(s) => s.local.sym.as_ref(), - }) - .collect() -} -fn is_plugin_already_added( - visitor: &TransformVisitor, - elems: &[Option], - plugin_name: &str, - plugin_import_path: &str, -) -> i32 { - for (n, elem) in elems.iter().enumerate().take(elems.iter().len()) { - // Assuming that plugins are always call expressions, and always imported as such - // Can be fixed in the future by just visiting with self, and collecting all the identifiers that we find - if let Some(elem) = elem - && let Expr::Call(call_expr) = elem.expr.as_expr() - && let Callee::Expr(callee_expr) = &call_expr.callee - { - if let Expr::Ident(i) = &**callee_expr { - let local_name = i.sym.as_ref(); - if plugin_name == local_name { - // Checking if the import is from the same place - for import in &visitor.original_imports { - let imported_from = import.src.value.as_ref(); - let import_names = get_import_names(import); - if import_names.contains(&local_name) && imported_from == plugin_import_path - { - // Plugin already exists, so we don't need to add it - return n.try_into().unwrap(); - } - } - } - } - } - } - -1 -} -fn get_key_name(key: &PropName) -> String { - match key { - PropName::Ident(i) => i.sym.to_string(), - PropName::Str(s) => s.value.to_string(), - PropName::Num(n) => n.value.to_string(), - PropName::BigInt(b) => b.value.to_string(), - PropName::Computed(_) => { - HANDLER.with(|handler| { - handler - .struct_span_err( - DUMMY_SP, - "Plugin already exists, and force_transform is not enabled", - ) - .emit() - }); - panic!(); - } - } -} -/** - * Merge two objects. - * `obj1` takes precedence. - */ -fn merge_objects(obj1: &ObjectLit, obj2: &ObjectLit) -> Vec { - // Storing string here gives a really quick way to access the prop name - let mut new_props: Vec<(String, &PropOrSpread)> = vec![]; - for prop in &obj1.props { - if let PropOrSpread::Prop(p) = prop { - if let Prop::KeyValue(key_val) = &**p { - let name = get_key_name(&key_val.key); - new_props.push((name, prop)) - } - } - } - for prop in &obj2.props { - if let PropOrSpread::Prop(p) = prop { - if let Prop::KeyValue(key_val) = &**p { - let prop_name = &get_key_name(&key_val.key); - let mut exists = false; - for (name, _) in &new_props { - if prop_name == name { - exists = true; - } - } - if exists { - continue; - } - // We can now add this prop - new_props.push((prop_name.to_owned(), prop)) - } - } - } - let mut data_to_ret = vec![]; - for (_, prop) in new_props { - data_to_ret.push(prop.clone()); - } - data_to_ret -} -fn generate_plugin_expr( - name: &str, - extra_config: &Value, - original_config: &Option, -) -> Option { - Some(ExprOrSpread { - spread: None, - expr: Box::new(Expr::Call(CallExpr { - span: Default::default(), - callee: Callee::Expr(Box::new(Expr::Ident(Ident::new( - name.into(), - swc_common::DUMMY_SP, - )))), - args: vec![ExprOrSpread { - spread: None, - expr: Box::new({ - let mut converted = to_expr(extra_config); - if let Some(ExprOrSpread { expr, .. }) = &original_config { - if let Expr::Call(call_expr) = &**expr { - if !call_expr.args.is_empty() - && let Expr::Object(obj) = &*call_expr.args[0].expr - { - if let Expr::Object(new_cfg) = &converted { - let merged = merge_objects(new_cfg, obj); - converted = Expr::Object(ObjectLit { - span: DUMMY_SP, - props: merged, - }) - } - } - } - } - converted - }), - }], - type_args: None, - })), - }) -} -fn add_new_plugins(visitor: &mut TransformVisitor, arr_lit: &ArrayLit) -> PropOrSpread { - let mut elems: Vec> = arr_lit.elems.clone(); - for plugin_config in &visitor.config.additional_plugins { - // Checking if plugin already exists - let ind = is_plugin_already_added( - visitor, - &elems, - &plugin_config.import_name, - &plugin_config.import_source, - ); - if ind != -1 && !visitor.config.force_transform { - HANDLER.with(|handler| { - handler - .struct_span_err( - DUMMY_SP, - "Plugin already exists, and force_transform is not enabled", - ) - .emit() - }); - } - // The plugin must already exist, so we can just mutate what's already there - if ind != -1 { - let plugin_expr = generate_plugin_expr( - &plugin_config.import_name, - &plugin_config.options, - &elems[ind as usize], - ); - elems[ind as usize] = plugin_expr; - continue; - } - let plugin_expr = - generate_plugin_expr(&plugin_config.import_name, &plugin_config.options, &None); - elems.push(plugin_expr); - // Add to imports - visitor.new_imports.insert( - plugin_config.import_source.clone(), - ( - Ident::new( - plugin_config.import_name.clone().into(), - swc_common::DUMMY_SP, - ), - plugin_config.is_default, - ), - ); - } - // Building new prop - PropOrSpread::Prop(Box::new(Prop::KeyValue(KeyValueProp { - key: PropName::Ident(Ident::new("plugins".into(), swc_common::DUMMY_SP)), - value: Box::new(Expr::Array(ArrayLit { - span: Default::default(), - elems, - })), - }))) -} -fn update_argument(visitor: &mut TransformVisitor, arg: &mut ExprOrSpread) { - if let Expr::Object(obj) = arg.expr.as_expr() { - let mut new_props: Vec = obj.props.clone(); - let mut mutated_existing = false; - - for prop_spread in new_props.iter_mut() { - if let PropOrSpread::Prop(prop) = prop_spread { - if let Prop::KeyValue(key_value_prop) = &**prop - && let Some(i) = key_value_prop.key.as_ident() - && i.sym == "plugins" - && let Expr::Array(arr_lit) = &*key_value_prop.value - { - *prop_spread = add_new_plugins(visitor, arr_lit); - mutated_existing = true; - } - } - } - if !mutated_existing { - // `plugins` prop doesn't exist. So we need to create it - new_props.push(add_new_plugins( - visitor, - &ArrayLit { - span: Default::default(), - elems: vec![], - }, - )); - } - // Can add new props to the obj here - arg.expr = Box::new(Expr::Object(ObjectLit { - span: Default::default(), - props: new_props, - })) - } -} -impl VisitMut for TransformVisitor { - // Implement necessary visit_mut_* methods for actual custom transform. - // A comprehensive list of possible visitor methods can be found here: - // https://rustdoc.swc.rs/swc_ecma_visit/trait.VisitMut.html - - fn visit_mut_call_expr(&mut self, call_expr: &mut CallExpr) { - if let Expr::Ident(i) = &**call_expr.callee.as_expr().unwrap() { - if i.sym == "defineConfig" { - let config_arg = &mut call_expr.args[0]; - update_argument(self, config_arg); - } - } - } - fn visit_mut_import_decl(&mut self, n: &mut ImportDecl) { - self.original_imports.push(n.clone()); - } - fn visit_mut_module(&mut self, module: &mut Module) { - module.visit_mut_children_with(self); - self.insert_imports(module); - } -} - -#[plugin_transform] -pub fn process_transform(program: Program, metadata: TransformPluginProgramMetadata) -> Program { - let plugin_config = metadata.get_transform_plugin_config(); - let config: config::Config = plugin_config - .and_then(|json| serde_json::from_str(&json).ok()) - .unwrap(); - program.fold_with(&mut as_folder(TransformVisitor::new(config))) -} diff --git a/packages/swc-plugin-solid-cli/tests/fixture.rs b/packages/swc-plugin-solid-cli/tests/fixture.rs deleted file mode 100644 index 8513854..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture.rs +++ /dev/null @@ -1,65 +0,0 @@ -use std::path::PathBuf; - -use serde_json::json; -use swc_core::common::{chain, Mark}; -use swc_core::{ - ecma::parser::{EsConfig, Syntax}, - ecma::transforms::base::resolver, - ecma::transforms::testing::test_fixture, - ecma::visit::as_folder, -}; - -use swc_plugin_solid_cli::config::{Config, PluginConfig, Testing}; -use swc_plugin_solid_cli::TransformVisitor; -use testing::fixture; - -fn syntax() -> Syntax { - Syntax::Es(EsConfig { - jsx: true, - ..Default::default() - }) -} - -#[fixture("tests/fixture/basic_tests/**/code.js")] -fn jsx_dom_expressions_fixture_babel(input: PathBuf) { - let output = input.parent().unwrap().join("output.js"); - - test_fixture( - syntax(), - &|_t| { - chain!( - resolver(Mark::new(), Mark::new(), false), - as_folder(TransformVisitor::new(Config::test())) - ) - }, - &input, - &output, - Default::default(), - ); -} -#[fixture("tests/fixture/merge_tests/**/code.js")] -fn merge_tests(input: PathBuf) { - let output = input.parent().unwrap().join("output.js"); - - test_fixture( - syntax(), - &|_t| { - chain!( - resolver(Mark::new(), Mark::new(), false), - as_folder(TransformVisitor::new(Config { - additional_plugins: vec![PluginConfig { - import_name: "UnoCss".to_string(), - import_source: "unocss/vite".to_string(), - is_default: true, - options: json!({"flag2": false}), - }], - force_transform: true, - merge_configs: true, - })) - ) - }, - &input, - &output, - Default::default(), - ); -} diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/code.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/code.js deleted file mode 100644 index 421eb55..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/code.js +++ /dev/null @@ -1,2 +0,0 @@ -import { defineConfig } from "vite"; -export default defineConfig({ plugins: [solid()] }); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/output.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/output.js deleted file mode 100644 index f3faa3a..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/output.js +++ /dev/null @@ -1,5 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [solid(), UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/code.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/code.js deleted file mode 100644 index 34c5847..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/code.js +++ /dev/null @@ -1 +0,0 @@ -export default defineConfig({}, false); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/output.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/output.js deleted file mode 100644 index fb466e0..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/non_destructive/output.js +++ /dev/null @@ -1,7 +0,0 @@ -import UnoCss from "unocss/vite"; -export default defineConfig( - { - plugins: [UnoCss({})], - }, - false, -); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/code.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/code.js deleted file mode 100644 index f3faa3a..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/code.js +++ /dev/null @@ -1,5 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [solid(), UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/output.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/output.js deleted file mode 100644 index f3faa3a..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/plugin_already_exists/output.js +++ /dev/null @@ -1,5 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [solid(), UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/code.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/code.js deleted file mode 100644 index 462ea7d..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/code.js +++ /dev/null @@ -1,4 +0,0 @@ -import UnoCss from "not_unocss/vite"; -export default defineConfig({ - plugins: [UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/output.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/output.js deleted file mode 100644 index b225752..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_different_import/output.js +++ /dev/null @@ -1,5 +0,0 @@ -import UnoCss from "unocss/vite"; -import UnoCss1 from "not_unocss/vite"; -export default defineConfig({ - plugins: [UnoCss1({}), UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/code.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/code.js deleted file mode 100644 index 15c091f..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/code.js +++ /dev/null @@ -1,4 +0,0 @@ -import UnoCss from "unocss/vite"; -export default defineConfig({ - plugins: [UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/output.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/output.js deleted file mode 100644 index 15c091f..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/same_name_same_import/output.js +++ /dev/null @@ -1,4 +0,0 @@ -import UnoCss from "unocss/vite"; -export default defineConfig({ - plugins: [UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/code.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/code.js deleted file mode 100644 index bc5959a..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/code.js +++ /dev/null @@ -1 +0,0 @@ -export default defineConfig({}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/output.js b/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/output.js deleted file mode 100644 index 15c091f..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/basic_tests/without_plugins/output.js +++ /dev/null @@ -1,4 +0,0 @@ -import UnoCss from "unocss/vite"; -export default defineConfig({ - plugins: [UnoCss({})], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/code.js b/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/code.js deleted file mode 100644 index 84813d6..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/code.js +++ /dev/null @@ -1,5 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [UnoCss({ flag2: true })], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/output.js b/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/output.js deleted file mode 100644 index 8486d14..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/same_flag/output.js +++ /dev/null @@ -1,9 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [ - UnoCss({ - flag2: false, - }), - ], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/code.js b/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/code.js deleted file mode 100644 index 1d4308f..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/code.js +++ /dev/null @@ -1,5 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [UnoCss({ flag: true })], -}); diff --git a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/output.js b/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/output.js deleted file mode 100644 index 327b0f0..0000000 --- a/packages/swc-plugin-solid-cli/tests/fixture/merge_tests/test_merging/output.js +++ /dev/null @@ -1,10 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -export default defineConfig({ - plugins: [ - UnoCss({ - flag2: false, - flag: true, - }), - ], -}); From 36b0d4e5215133de965b3061293aae74169122a8 Mon Sep 17 00:00:00 2001 From: dev-rb Date: Sun, 19 May 2024 13:10:14 -0400 Subject: [PATCH 108/290] Update config manipulation test. --- .../tests/assets/sample_app_config.txt | 7 +++ ...esult.txt => sample_unocss_app_result.txt} | 0 .../assets/sample_unocss_vite_result.txt | 9 ++++ .../tests/assets/sample_vite_config.txt | 6 +-- .../tests/config_manipulation.test.ts | 52 ++++++++++++++----- .../utils/tests/plugin_transforms.test.ts | 1 + 6 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 packages/commands/tests/assets/sample_app_config.txt rename packages/commands/tests/assets/{sample_unocss_result.txt => sample_unocss_app_result.txt} (100%) create mode 100644 packages/commands/tests/assets/sample_unocss_vite_result.txt diff --git a/packages/commands/tests/assets/sample_app_config.txt b/packages/commands/tests/assets/sample_app_config.txt new file mode 100644 index 0000000..50315ba --- /dev/null +++ b/packages/commands/tests/assets/sample_app_config.txt @@ -0,0 +1,7 @@ +import { defineConfig } from "@solidjs/start/config"; +// Simulates an app config +export default defineConfig({ + vite: { + plugins: [solid()] + } +}); diff --git a/packages/commands/tests/assets/sample_unocss_result.txt b/packages/commands/tests/assets/sample_unocss_app_result.txt similarity index 100% rename from packages/commands/tests/assets/sample_unocss_result.txt rename to packages/commands/tests/assets/sample_unocss_app_result.txt diff --git a/packages/commands/tests/assets/sample_unocss_vite_result.txt b/packages/commands/tests/assets/sample_unocss_vite_result.txt new file mode 100644 index 0000000..c5d2c91 --- /dev/null +++ b/packages/commands/tests/assets/sample_unocss_vite_result.txt @@ -0,0 +1,9 @@ +import UnoCss from "unocss/vite"; +import { defineConfig } from "vite"; +// Simulates an app config +export default defineConfig({ + plugins: [ + solid(), + UnoCss({}) + ] +}); diff --git a/packages/commands/tests/assets/sample_vite_config.txt b/packages/commands/tests/assets/sample_vite_config.txt index 50315ba..0faac72 100644 --- a/packages/commands/tests/assets/sample_vite_config.txt +++ b/packages/commands/tests/assets/sample_vite_config.txt @@ -1,7 +1,5 @@ -import { defineConfig } from "@solidjs/start/config"; +import { defineConfig } from "vite"; // Simulates an app config export default defineConfig({ - vite: { - plugins: [solid()] - } + plugins: [solid()] }); diff --git a/packages/commands/tests/config_manipulation.test.ts b/packages/commands/tests/config_manipulation.test.ts index fa48979..aec0f98 100644 --- a/packages/commands/tests/config_manipulation.test.ts +++ b/packages/commands/tests/config_manipulation.test.ts @@ -9,14 +9,21 @@ const readFile = async (path: string): Promise => { readFile1(path, (_, data) => res(data.toString())), ); }; + const removeWhitespace = (str: string) => str.replace(/\s/g, ""); + vi.mock("fs/promises", () => { return { readFile: async (name: string) => { if (name === "app.config.ts") { + const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_app_config.txt"); + return sampleConfig; + } + if (name === "vite.config.ts") { const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_vite_config.txt"); return sampleConfig; } + return "{}"; }, writeFile: async (_, contents: string) => { @@ -46,22 +53,41 @@ vi.mock("@solid-cli/utils/updates", async () => { vi.mock("../src/lib/utils/helpers.ts", async () => { return { - getConfigFile: async (): Promise => new Promise((r) => r("app.config.ts")), - fileExists: (path: string) => path.includes("app_config") || path.includes("app.tsx") || path.includes("index.tsx"), + getConfigFile: async (file: string): Promise => new Promise((r) => r(`${file}.config.ts`)), + fileExists: (path: string) => + path.includes("vite_config") || + path.includes("app_config") || + path.includes("app.tsx") || + path.includes("index.tsx"), getRootFile: async (): Promise => new Promise((r) => r("./src/app.tsx")), }; }); + +let testingSolidStart = false; + +vi.mock("@solid-cli/utils", async () => { + return { + isSolidStart: async () => new Promise((r) => r(testingSolidStart)), + }; +}); + describe("Update config", () => { - it( - "Adds a plugin properly to the config", - async () => { - await handleAdd(["unocss"]); + it("Adds a plugin properly to the app config", { timeout: 50000 }, async () => { + testingSolidStart = true; + await handleAdd(["unocss"]); - const expected = await readFile("./packages/commands/tests/assets/sample_unocss_result.txt"); - // @ts-ignore - const newConfig = UPDATESQUEUE.find((u) => u.name === "app.config.ts")?.contents; - expect(removeWhitespace(expected)).toBe(removeWhitespace(newConfig)); - }, - { timeout: 50000 }, - ); + const expected = await readFile("./packages/commands/tests/assets/sample_unocss_app_result.txt"); + // @ts-ignore + const newConfig = UPDATESQUEUE.find((u) => u.name === "app.config.ts")?.contents; + expect(removeWhitespace(newConfig)).toBe(removeWhitespace(expected)); + }); + it("Adds a plugin properly to the vite config", { timeout: 50000 }, async () => { + testingSolidStart = false; + await handleAdd(["unocss"]); + + const expected = await readFile("./packages/commands/tests/assets/sample_unocss_vite_result.txt"); + // @ts-ignore + const newConfig = UPDATESQUEUE.find((u) => u.name === "vite.config.ts")?.contents; + expect(removeWhitespace(newConfig)).toBe(removeWhitespace(expected)); + }); }); diff --git a/packages/utils/tests/plugin_transforms.test.ts b/packages/utils/tests/plugin_transforms.test.ts index 9a69428..c065043 100644 --- a/packages/utils/tests/plugin_transforms.test.ts +++ b/packages/utils/tests/plugin_transforms.test.ts @@ -122,6 +122,7 @@ plugins: [] test("Object method config is updated properly", async () => { const config: Config = { + type: "app", name: "app.config.ts", contents: makeExampleConfig(["solid()"], [], "method"), }; From 6be1b79ae4ebac75b3d1118cf9b32a5df6a4c84a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 May 2024 22:31:26 +0100 Subject: [PATCH 109/290] remove core dependency on `swc-plugin-solid-cli` --- packages/core/package.json | 1 - pnpm-lock.yaml | 5 ----- 2 files changed, 6 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 335d142..d8f0873 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -26,7 +26,6 @@ "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", "@solid-cli/reactivity": "workspace:*", - "@solid-cli/swc-plugin-solid-cli": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "@swc/core": "^1.5.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e0055e..e6c946e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,9 +81,6 @@ importers: '@solid-cli/reactivity': specifier: workspace:* version: link:../reactivity - '@solid-cli/swc-plugin-solid-cli': - specifier: workspace:* - version: link:../swc-plugin-solid-cli '@solid-cli/ui': specifier: workspace:* version: link:../ui @@ -161,8 +158,6 @@ importers: specifier: ^5.4.5 version: 5.4.5 - packages/swc-plugin-solid-cli: {} - packages/ui: dependencies: '@clack/core': From 5847362394d5c0ccca11c3f95af6deab671473c3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 May 2024 23:10:03 +0100 Subject: [PATCH 110/290] update deps remove swc core as dep --- package.json | 2 +- packages/commands/package.json | 6 +- packages/core/package.json | 9 +- packages/create-solid/package.json | 4 +- packages/ui/package.json | 4 +- packages/utils/package.json | 9 +- pnpm-lock.yaml | 164 ++++++++++++++--------------- 7 files changed, 96 insertions(+), 102 deletions(-) diff --git a/package.json b/package.json index 5624708..f9b21a4 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.1", + "@changesets/cli": "2.27.2", "nodemon": "^3.1.0", "prettier": "^3.2.5", "turbo": "^1.13.3", diff --git a/packages/commands/package.json b/packages/commands/package.json index 6770b45..8952bc1 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.11", + "@types/node": "^20.12.12", "prettier": "^3.2.5", "tsup": "^8.0.2", "typescript": "^5.4.5" @@ -47,8 +47,8 @@ "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "execa": "^9.0.1", - "picocolors": "^1.0.0", + "execa": "^9.1.0", + "picocolors": "^1.0.1", "sucrase": "^3.35.0" } } diff --git a/packages/core/package.json b/packages/core/package.json index d8f0873..4f103d0 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -28,11 +28,10 @@ "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "@swc/core": "^1.5.5", "cmd-ts": "^0.13.0", - "execa": "^9.0.1", - "picocolors": "^1.0.0", - "smol-toml": "^1.1.4", + "execa": "^9.1.0", + "picocolors": "^1.0.1", + "smol-toml": "^1.2.0", "tiny-updater": "^3.5.2" }, "scripts": { @@ -41,7 +40,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.11", + "@types/node": "^20.12.12", "jiti": "^1.21.0", "tsup": "^8.0.2", "typescript": "^5.4.5" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 33db45d..d313869 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,10 +31,10 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.12.11", + "@types/node": "^20.12.12", "cmd-ts": "^0.13.0", "jiti": "^1.21.0", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "tsup": "^8.0.2", "typescript": "^5.4.5" }, diff --git a/packages/ui/package.json b/packages/ui/package.json index 41ba2e2..509191a 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -29,7 +29,7 @@ "devDependencies": { "tsup": "^8.0.2", "typescript": "^5.4.5", - "@types/node": "20.12.11" + "@types/node": "20.12.12" }, "publishConfig": { "access": "public" @@ -37,7 +37,7 @@ "dependencies": { "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "@solid-cli/reactivity": "workspace:*", "@solid-cli/utils": "workspace:*" } diff --git a/packages/utils/package.json b/packages/utils/package.json index 4a84512..132a545 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,7 +63,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.12.11", + "@types/node": "20.12.12", "jiti": "^1.21.0", "magicast": "^0.3.4", "tsup": "^8.0.2", @@ -77,10 +77,9 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", - "@swc/core": "^1.5.5", "cmd-ts": "^0.13.0", - "execa": "^9.0.1", - "picocolors": "^1.0.0", - "smol-toml": "^1.1.4" + "execa": "^9.1.0", + "picocolors": "^1.0.1", + "smol-toml": "^1.2.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6c946e..a4aa00a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.27.1 - version: 2.27.1 + specifier: 2.27.2 + version: 2.27.2 nodemon: specifier: ^3.1.0 version: 3.1.0 @@ -22,7 +22,7 @@ importers: version: 1.13.3 vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.12.11) + version: 1.6.0(@types/node@20.12.12) packages/commands: dependencies: @@ -42,11 +42,11 @@ importers: specifier: workspace:* version: link:../utils execa: - specifier: ^9.0.1 - version: 9.0.1 + specifier: ^9.1.0 + version: 9.1.0 picocolors: - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 sucrase: specifier: ^3.35.0 version: 3.35.0 @@ -55,8 +55,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.11 - version: 20.12.11 + specifier: ^20.12.12 + version: 20.12.12 prettier: specifier: ^3.2.5 version: 3.2.5 @@ -87,21 +87,18 @@ importers: '@solid-cli/utils': specifier: workspace:* version: link:../utils - '@swc/core': - specifier: ^1.5.5 - version: 1.5.5 cmd-ts: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^9.0.1 - version: 9.0.1 + specifier: ^9.1.0 + version: 9.1.0 picocolors: - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 smol-toml: - specifier: ^1.1.4 - version: 1.1.4 + specifier: ^1.2.0 + version: 1.2.0 tiny-updater: specifier: ^3.5.2 version: 3.5.2 @@ -110,8 +107,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.11 - version: 20.12.11 + specifier: ^20.12.12 + version: 20.12.12 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -131,8 +128,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.12.11 - version: 20.12.11 + specifier: ^20.12.12 + version: 20.12.12 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -140,8 +137,8 @@ importers: specifier: ^1.21.0 version: 1.21.0 picocolors: - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 tsup: specifier: ^8.0.2 version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) @@ -173,12 +170,12 @@ importers: specifier: workspace:* version: link:../utils picocolors: - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 devDependencies: '@types/node': - specifier: 20.12.11 - version: 20.12.11 + specifier: 20.12.12 + version: 20.12.12 tsup: specifier: ^8.0.2 version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) @@ -197,28 +194,25 @@ importers: '@solid-cli/reactivity': specifier: workspace:* version: link:../reactivity - '@swc/core': - specifier: ^1.5.5 - version: 1.5.5 cmd-ts: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^9.0.1 - version: 9.0.1 + specifier: ^9.1.0 + version: 9.1.0 picocolors: - specifier: ^1.0.0 - version: 1.0.0 + specifier: ^1.0.1 + version: 1.0.1 smol-toml: - specifier: ^1.1.4 - version: 1.1.4 + specifier: ^1.2.0 + version: 1.2.0 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.12.11 - version: 20.12.11 + specifier: 20.12.12 + version: 20.12.12 jiti: specifier: ^1.21.0 version: 1.21.0 @@ -233,7 +227,7 @@ importers: version: 5.4.5 vitest: specifier: ^1.6.0 - version: 1.6.0(@types/node@20.12.11) + version: 1.6.0(@types/node@20.12.12) packages: @@ -245,10 +239,6 @@ packages: resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.22.20': - resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} - engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.24.5': resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} engines: {node: '>=6.9.0'} @@ -273,8 +263,8 @@ packages: '@begit/core@0.0.16': resolution: {integrity: sha512-nSgezfX/ixRmVIXP0apKF3ZCeRlxlAD7usZqw0Ku4IExD6COJzT041FPm7vpAkrKxr3U54jHKb1fEeZVHBjEWg==} - '@changesets/apply-release-plan@7.0.0': - resolution: {integrity: sha512-vfi69JR416qC9hWmFGSxj7N6wA5J222XNBmezSVATPWDVPIF7gkd4d8CpbEbXmRWbVrkoli3oerGS6dcL/BGsQ==} + '@changesets/apply-release-plan@7.0.1': + resolution: {integrity: sha512-aPdSq/R++HOyfEeBGjEe6LNG8gs0KMSyRETD/J2092OkNq8mOioAxyKjMbvVUdzgr/HTawzMOz7lfw339KnsCA==} '@changesets/assemble-release-plan@6.0.0': resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} @@ -282,8 +272,8 @@ packages: '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.1': - resolution: {integrity: sha512-iJ91xlvRnnrJnELTp4eJJEOPjgpF3NOh4qeQehM6Ugiz9gJPRZ2t+TsXun6E3AMN4hScZKjqVXl0TX+C7AB3ZQ==} + '@changesets/cli@2.27.2': + resolution: {integrity: sha512-6/kADjKMOrlLwNr/Y5HAq7T9oGOA2Lq5A59AGtwQCCiXuSGp4EgszzdJFeBiF8pdz7Wn1HaLzSUBhAaNToEJqg==} hasBin: true '@changesets/config@3.0.0': @@ -322,8 +312,8 @@ packages: '@changesets/types@6.0.0': resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} - '@changesets/write@0.3.0': - resolution: {integrity: sha512-slGLb21fxZVUYbyea+94uFiD6ntQW0M2hIKNznFizDhZPDgn2c/fv1UzzlW43RVzh1BEDuIqW6hzlJ1OflNmcw==} + '@changesets/write@0.3.1': + resolution: {integrity: sha512-SyGtMXzH3qFqlHKcvFY2eX+6b0NGiFcNav8AFsYwy5l8hejOeoeTDemu5Yjmke2V5jpzY+pBvM0vCCQ3gdZpfw==} '@chialab/esbuild-plugin-meta-url@0.18.2': resolution: {integrity: sha512-uIRIdLvYnw5mLrTRXY0BTgeZx6ANL2/OHkWFl8FaiTYNb7cyXmwEDRE1mh6kBXPRPtGuqv6XSpNX+koEkElu4g==} @@ -917,8 +907,8 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@20.12.11': - resolution: {integrity: sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==} + '@types/node@20.12.12': + resolution: {integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -1293,8 +1283,8 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - execa@9.0.1: - resolution: {integrity: sha512-U5ck8xJmf3sVebV1v+Hh436VWHVHUfzkdbKJynd3kCP9sQRDxCY5x2Tml5lGB7XM6lpj6ATfgWWqynDt2MBLJg==} + execa@9.1.0: + resolution: {integrity: sha512-lSgHc4Elo2m6bUDhc3Hl/VxvUDJdQWI40RZ4KMY9bKRc+hgMOT7II/JjbNDhI8VnMtrCb7U/fhpJIkLORZozWw==} engines: {node: '>=18'} extendable-error@0.1.7: @@ -1916,6 +1906,9 @@ packages: picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + picocolors@1.0.1: + resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} @@ -2138,9 +2131,9 @@ packages: engines: {node: '>=6'} hasBin: true - smol-toml@1.1.4: - resolution: {integrity: sha512-Y0OT8HezWsTNeEOSVxDnKOW/AyNXHQ4BwJNbAXlLTF5wWsBvrcHhIkE5Rf8kQMLmgf7nDX3PVOlgC6/Aiggu3Q==} - engines: {node: '>= 18', pnpm: '>= 8'} + smol-toml@1.2.0: + resolution: {integrity: sha512-KObxdQANC/xje3OoatMbSwQf2XAvJ0RbK+4nmQRszFNZptbNRnMWqbLF/zb4sMi9xJ6HNyhWXeuZ9zC/I/XY7w==} + engines: {node: '>= 18', pnpm: '>= 9'} source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} @@ -2584,20 +2577,18 @@ snapshots: '@babel/code-frame@7.24.2': dependencies: '@babel/highlight': 7.24.2 - picocolors: 1.0.0 + picocolors: 1.0.1 '@babel/helper-string-parser@7.24.1': {} - '@babel/helper-validator-identifier@7.22.20': {} - '@babel/helper-validator-identifier@7.24.5': {} '@babel/highlight@7.24.2': dependencies: - '@babel/helper-validator-identifier': 7.22.20 + '@babel/helper-validator-identifier': 7.24.5 chalk: 2.4.2 js-tokens: 4.0.0 - picocolors: 1.0.0 + picocolors: 1.0.1 '@babel/parser@7.24.5': dependencies: @@ -2617,7 +2608,7 @@ snapshots: dependencies: tar: 7.1.0 - '@changesets/apply-release-plan@7.0.0': + '@changesets/apply-release-plan@7.0.1': dependencies: '@babel/runtime': 7.24.4 '@changesets/config': 3.0.0 @@ -2646,10 +2637,10 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.1': + '@changesets/cli@2.27.2': dependencies: '@babel/runtime': 7.24.4 - '@changesets/apply-release-plan': 7.0.0 + '@changesets/apply-release-plan': 7.0.1 '@changesets/assemble-release-plan': 6.0.0 '@changesets/changelog-git': 0.2.0 '@changesets/config': 3.0.0 @@ -2661,7 +2652,7 @@ snapshots: '@changesets/pre': 2.0.0 '@changesets/read': 0.6.0 '@changesets/types': 6.0.0 - '@changesets/write': 0.3.0 + '@changesets/write': 0.3.1 '@manypkg/get-packages': 1.1.3 '@types/semver': 7.5.8 ansi-colors: 4.1.3 @@ -2757,7 +2748,7 @@ snapshots: '@changesets/types@6.0.0': {} - '@changesets/write@0.3.0': + '@changesets/write@0.3.1': dependencies: '@babel/runtime': 7.24.4 '@changesets/types': 6.0.0 @@ -2784,18 +2775,18 @@ snapshots: '@clack/core@0.3.3': dependencies: - picocolors: 1.0.0 + picocolors: 1.0.1 sisteransi: 1.0.5 '@clack/core@0.3.4': dependencies: - picocolors: 1.0.0 + picocolors: 1.0.1 sisteransi: 1.0.5 '@clack/prompts@0.7.0': dependencies: '@clack/core': 0.3.3 - picocolors: 1.0.0 + picocolors: 1.0.1 sisteransi: 1.0.5 '@esbuild/aix-ppc64@0.20.2': @@ -3140,12 +3131,15 @@ snapshots: '@swc/core-win32-arm64-msvc': 1.5.5 '@swc/core-win32-ia32-msvc': 1.5.5 '@swc/core-win32-x64-msvc': 1.5.5 + optional: true - '@swc/counter@0.1.3': {} + '@swc/counter@0.1.3': + optional: true '@swc/types@0.1.6': dependencies: '@swc/counter': 0.1.3 + optional: true '@types/estree@1.0.5': {} @@ -3153,7 +3147,7 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@20.12.11': + '@types/node@20.12.12': dependencies: undici-types: 5.26.5 @@ -3663,7 +3657,7 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - execa@9.0.1: + execa@9.1.0: dependencies: '@sindresorhus/merge-streams': 4.0.0 cross-spawn: 7.0.3 @@ -4255,6 +4249,8 @@ snapshots: picocolors@1.0.0: {} + picocolors@1.0.1: {} + picomatch@2.3.1: {} pify@4.0.1: {} @@ -4283,7 +4279,7 @@ snapshots: postcss@8.4.38: dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 + picocolors: 1.0.1 source-map-js: 1.2.0 preferred-pm@3.1.3: @@ -4499,7 +4495,7 @@ snapshots: wcwidth: 1.0.1 yargs: 15.4.1 - smol-toml@1.1.4: {} + smol-toml@1.2.0: {} source-map-js@1.2.0: {} @@ -4791,13 +4787,13 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vite-node@1.6.0(@types/node@20.12.11): + vite-node@1.6.0(@types/node@20.12.12): dependencies: cac: 6.7.14 debug: 4.3.4(supports-color@5.5.0) pathe: 1.1.2 - picocolors: 1.0.0 - vite: 5.2.10(@types/node@20.12.11) + picocolors: 1.0.1 + vite: 5.2.10(@types/node@20.12.12) transitivePeerDependencies: - '@types/node' - less @@ -4808,16 +4804,16 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@20.12.11): + vite@5.2.10(@types/node@20.12.12): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.16.1 optionalDependencies: - '@types/node': 20.12.11 + '@types/node': 20.12.12 fsevents: 2.3.3 - vitest@1.6.0(@types/node@20.12.11): + vitest@1.6.0(@types/node@20.12.12): dependencies: '@vitest/expect': 1.6.0 '@vitest/runner': 1.6.0 @@ -4836,11 +4832,11 @@ snapshots: strip-literal: 2.1.0 tinybench: 2.8.0 tinypool: 0.8.4 - vite: 5.2.10(@types/node@20.12.11) - vite-node: 1.6.0(@types/node@20.12.11) + vite: 5.2.10(@types/node@20.12.12) + vite-node: 1.6.0(@types/node@20.12.12) why-is-node-running: 2.2.2 optionalDependencies: - '@types/node': 20.12.11 + '@types/node': 20.12.12 transitivePeerDependencies: - less - lightningcss From 7528767d2399bec3fd32d9eb7fda407195566642 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 21 May 2024 13:34:49 +0100 Subject: [PATCH 111/290] remove swc plugin references --- .prettierignore | 1 - package.json | 2 +- packages/utils/package.json | 2 +- packages/utils/scripts/postBuild.ts | 9 --------- pnpm-lock.yaml | 10 +++++----- 5 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 packages/utils/scripts/postBuild.ts diff --git a/.prettierignore b/.prettierignore index 1ef1d53..39e2e9f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,2 @@ **/*.rs **/*.yaml -packages/swc-plugin-solid-cli \ No newline at end of file diff --git a/package.json b/package.json index f9b21a4..0e87800 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.2", + "@changesets/cli": "2.27.3", "nodemon": "^3.1.0", "prettier": "^3.2.5", "turbo": "^1.13.3", diff --git a/packages/utils/package.json b/packages/utils/package.json index 132a545..bfd04f8 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -59,7 +59,7 @@ }, "scripts": { "test": "vitest run", - "build": "tsc && tsup && jiti ./scripts/postBuild.ts" + "build": "tsc && tsup" }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", diff --git a/packages/utils/scripts/postBuild.ts b/packages/utils/scripts/postBuild.ts deleted file mode 100644 index c67b979..0000000 --- a/packages/utils/scripts/postBuild.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { readdir, copyFile, unlink } from "fs/promises"; -const main = async () => { - const files = await readdir("./dist"); - const name = files.find((f) => f.startsWith("swc_plugin_solid_cli")); - if (!name) throw new Error("No file found"); - await copyFile(`./dist/${name}`, `./dist/transform/${name}`); - await unlink(`./dist/${name}`); -}; -main().catch(console.error); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a4aa00a..9c39a37 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.27.2 - version: 2.27.2 + specifier: 2.27.3 + version: 2.27.3 nodemon: specifier: ^3.1.0 version: 3.1.0 @@ -272,8 +272,8 @@ packages: '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.2': - resolution: {integrity: sha512-6/kADjKMOrlLwNr/Y5HAq7T9oGOA2Lq5A59AGtwQCCiXuSGp4EgszzdJFeBiF8pdz7Wn1HaLzSUBhAaNToEJqg==} + '@changesets/cli@2.27.3': + resolution: {integrity: sha512-ve/VpWApILlSs8cr0okNx5C2LKRawI9XZgvfmf58S8sar2nhx5DPJREFXYZBahs0FeTfvH0rdVl+nGe8QF45Ig==} hasBin: true '@changesets/config@3.0.0': @@ -2637,7 +2637,7 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.2': + '@changesets/cli@2.27.3': dependencies: '@babel/runtime': 7.24.4 '@changesets/apply-release-plan': 7.0.1 From a4de28ff5545e6d09d03ef32490170e0504248e8 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 21 May 2024 13:50:19 +0100 Subject: [PATCH 112/290] release --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 8952bc1..5de1b03 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.21", + "version": "0.0.22", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index 4f103d0..fcf2e6b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.24", + "version": "0.0.25", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index d313869..8b32d97 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.8", + "version": "0.5.9", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/ui/package.json b/packages/ui/package.json index 509191a..864a8e1 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.11", + "version": "0.0.12", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { diff --git a/packages/utils/package.json b/packages/utils/package.json index bfd04f8..cb99527 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.13", + "version": "0.0.14", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From a2884734a127f27c2911f50e0ee693fa354c800a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 28 May 2024 01:05:58 +0100 Subject: [PATCH 113/290] Roll back execa --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/utils/package.json | 2 +- packages/utils/src/open/index.ts | 4 +- pnpm-lock.yaml | 119 ++----------------------------- 5 files changed, 12 insertions(+), 117 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 5de1b03..0c87a3b 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -47,7 +47,7 @@ "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", - "execa": "^9.1.0", + "execa": "^8.0.1", "picocolors": "^1.0.1", "sucrase": "^3.35.0" } diff --git a/packages/core/package.json b/packages/core/package.json index fcf2e6b..f0fd760 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "cmd-ts": "^0.13.0", - "execa": "^9.1.0", + "execa": "^8.0.1", "picocolors": "^1.0.1", "smol-toml": "^1.2.0", "tiny-updater": "^3.5.2" diff --git a/packages/utils/package.json b/packages/utils/package.json index cb99527..0dcda08 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -78,7 +78,7 @@ "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "cmd-ts": "^0.13.0", - "execa": "^9.1.0", + "execa": "^8.0.1", "picocolors": "^1.0.1", "smol-toml": "^1.2.0" } diff --git a/packages/utils/src/open/index.ts b/packages/utils/src/open/index.ts index 3aac69e..68ce0da 100644 --- a/packages/utils/src/open/index.ts +++ b/packages/utils/src/open/index.ts @@ -1,5 +1,5 @@ // Taken verbatim from https://github.com/withastro/astro/blob/main/packages/astro/src/cli/docs/open.ts -import type { Result } from "execa"; +import type { ExecaChildProcess } from "execa"; import { execa } from "execa"; /** @@ -27,7 +27,7 @@ const getPlatformSpecificCommand = (): [string] | [string, string[]] => { } }; -export async function openInBrowser(url: string): Promise { +export async function openInBrowser(url: string): Promise { const [command, args = []] = getPlatformSpecificCommand(); return execa(command, [...args, encodeURI(url)]); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9c39a37..72b23f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -42,8 +42,8 @@ importers: specifier: workspace:* version: link:../utils execa: - specifier: ^9.1.0 - version: 9.1.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.1 version: 1.0.1 @@ -91,8 +91,8 @@ importers: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^9.1.0 - version: 9.1.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.1 version: 1.0.1 @@ -198,8 +198,8 @@ importers: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^9.1.0 - version: 9.1.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.1 version: 1.0.1 @@ -813,16 +813,9 @@ packages: cpu: [x64] os: [win32] - '@sec-ant/readable-stream@0.4.1': - resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} - '@sinclair/typebox@0.27.8': resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} - '@sindresorhus/merge-streams@4.0.0': - resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} - engines: {node: '>=18'} - '@swc/core-darwin-arm64@1.5.5': resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} engines: {node: '>=10'} @@ -1283,10 +1276,6 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - execa@9.1.0: - resolution: {integrity: sha512-lSgHc4Elo2m6bUDhc3Hl/VxvUDJdQWI40RZ4KMY9bKRc+hgMOT7II/JjbNDhI8VnMtrCb7U/fhpJIkLORZozWw==} - engines: {node: '>=18'} - extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} @@ -1301,10 +1290,6 @@ packages: fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} - figures@6.1.0: - resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} - engines: {node: '>=18'} - fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -1369,10 +1354,6 @@ packages: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - get-stream@9.0.1: - resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} - engines: {node: '>=18'} - get-symbol-description@1.0.2: resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} engines: {node: '>= 0.4'} @@ -1451,10 +1432,6 @@ packages: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - human-signals@7.0.0: - resolution: {integrity: sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==} - engines: {node: '>=18.18.0'} - iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -1538,10 +1515,6 @@ packages: resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==} engines: {node: '>=0.10.0'} - is-plain-obj@4.1.0: - resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} - engines: {node: '>=12'} - is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -1558,10 +1531,6 @@ packages: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - is-stream@4.0.1: - resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} - engines: {node: '>=18'} - is-string@1.0.7: resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} engines: {node: '>= 0.4'} @@ -1578,10 +1547,6 @@ packages: resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} engines: {node: '>= 0.4'} - is-unicode-supported@2.0.0: - resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==} - engines: {node: '>=18'} - is-weakref@1.0.2: resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} @@ -1796,10 +1761,6 @@ packages: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'} - npm-run-path@5.1.0: - resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - npm-run-path@5.3.0: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1870,10 +1831,6 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} - parse-ms@4.0.0: - resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} - engines: {node: '>=18'} - path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -1966,10 +1923,6 @@ packages: resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - pretty-ms@9.0.0: - resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==} - engines: {node: '>=18'} - pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -2209,10 +2162,6 @@ packages: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} - strip-final-newline@4.0.0: - resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} - engines: {node: '>=18'} - strip-indent@3.0.0: resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} engines: {node: '>=8'} @@ -2568,10 +2517,6 @@ packages: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} - yoctocolors@2.0.0: - resolution: {integrity: sha512-esbDnt0Z1zI1KgvOZU90hJbL6BkoUbrP9yy7ArNZ6TmxBxydMJTYMf9FZjmwwcA8ZgEQzriQ3hwZ0NYXhlFo8Q==} - engines: {node: '>=18'} - snapshots: '@babel/code-frame@7.24.2': @@ -3080,12 +3025,8 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.9.1': optional: true - '@sec-ant/readable-stream@0.4.1': {} - '@sinclair/typebox@0.27.8': {} - '@sindresorhus/merge-streams@4.0.0': {} - '@swc/core-darwin-arm64@1.5.5': optional: true @@ -3652,26 +3593,11 @@ snapshots: human-signals: 5.0.0 is-stream: 3.0.0 merge-stream: 2.0.0 - npm-run-path: 5.1.0 + npm-run-path: 5.3.0 onetime: 6.0.0 signal-exit: 4.1.0 strip-final-newline: 3.0.0 - execa@9.1.0: - dependencies: - '@sindresorhus/merge-streams': 4.0.0 - cross-spawn: 7.0.3 - figures: 6.1.0 - get-stream: 9.0.1 - human-signals: 7.0.0 - is-plain-obj: 4.1.0 - is-stream: 4.0.1 - npm-run-path: 5.3.0 - pretty-ms: 9.0.0 - signal-exit: 4.1.0 - strip-final-newline: 4.0.0 - yoctocolors: 2.0.0 - extendable-error@0.1.7: {} external-editor@3.1.0: @@ -3692,10 +3618,6 @@ snapshots: dependencies: reusify: 1.0.4 - figures@6.1.0: - dependencies: - is-unicode-supported: 2.0.0 - fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 @@ -3766,11 +3688,6 @@ snapshots: get-stream@8.0.1: {} - get-stream@9.0.1: - dependencies: - '@sec-ant/readable-stream': 0.4.1 - is-stream: 4.0.1 - get-symbol-description@1.0.2: dependencies: call-bind: 1.0.7 @@ -3842,8 +3759,6 @@ snapshots: human-signals@5.0.0: {} - human-signals@7.0.0: {} - iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2 @@ -3914,8 +3829,6 @@ snapshots: is-plain-obj@1.1.0: {} - is-plain-obj@4.1.0: {} - is-regex@1.1.4: dependencies: call-bind: 1.0.7 @@ -3929,8 +3842,6 @@ snapshots: is-stream@3.0.0: {} - is-stream@4.0.1: {} - is-string@1.0.7: dependencies: has-tostringtag: 1.0.2 @@ -3947,8 +3858,6 @@ snapshots: dependencies: which-typed-array: 1.1.15 - is-unicode-supported@2.0.0: {} - is-weakref@1.0.2: dependencies: call-bind: 1.0.7 @@ -4158,10 +4067,6 @@ snapshots: dependencies: path-key: 3.1.1 - npm-run-path@5.1.0: - dependencies: - path-key: 4.0.0 - npm-run-path@5.3.0: dependencies: path-key: 4.0.0 @@ -4226,8 +4131,6 @@ snapshots: json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 - parse-ms@4.0.0: {} - path-exists@4.0.0: {} path-key@3.1.1: {} @@ -4299,10 +4202,6 @@ snapshots: ansi-styles: 5.2.0 react-is: 18.2.0 - pretty-ms@9.0.0: - dependencies: - parse-ms: 4.0.0 - pseudomap@1.0.2: {} pstree.remy@1.1.8: {} @@ -4577,8 +4476,6 @@ snapshots: strip-final-newline@3.0.0: {} - strip-final-newline@4.0.0: {} - strip-indent@3.0.0: dependencies: min-indent: 1.0.1 @@ -4960,5 +4857,3 @@ snapshots: yocto-queue@0.1.0: {} yocto-queue@1.0.0: {} - - yoctocolors@2.0.0: {} From 9cbdce2bab4a8898f101f3d050de1b5522441fae Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 28 May 2024 01:11:23 +0100 Subject: [PATCH 114/290] Release Fixes #49 --- packages/create-solid/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 8b32d97..4771ae8 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.9", + "version": "0.5.10", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From d0b5b8d8821b3a7aadb364d2bc6e2884d95f903e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 28 May 2024 19:08:33 +0100 Subject: [PATCH 115/290] Added `with-drizzle` example Released --- packages/commands/package.json | 2 +- packages/commands/src/handlers/new.ts | 1 + packages/create-solid/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 0c87a3b..29c1a61 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.22", + "version": "0.0.23", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 2f5fcd3..ee50e3e 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -48,6 +48,7 @@ const startSupported = [ "todomvc", "with-auth", "with-authjs", + "with-drizzle", "with-mdx", "with-prisma", "with-solid-styled", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 4771ae8..73bc29f 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.10", + "version": "0.5.11", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From bdaebed4b78a667ea08dc4cb289fcc44b7e4cd1a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:26:06 +0100 Subject: [PATCH 116/290] Fixed `next steps` formatting --- packages/commands/src/handlers/new.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index ee50e3e..dc01211 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -167,8 +167,8 @@ const handleNewStartProject = async (projectName: string, variation?: AllSupport const pM = detectPackageManager(); p.note( `cd ${projectName} - ${pM.name} install - ${pM.name} ${pM.runScriptCommand("dev")}`, +${pM.name} install +${pM.name} ${pM.runScriptCommand("dev")}`, t.GET_STARTED, ); }; @@ -237,8 +237,8 @@ export const handleNew = async ( const pM = detectPackageManager(); p.note( `cd ${name} - ${pM.name} install - ${pM.name} ${pM.runScriptCommand("dev")}`, +${pM.name} install +${pM.name} ${pM.runScriptCommand("dev")}`, t.GET_STARTED, ); }; From b54a60c48cc92d2614bd42e20f2e73f04d441f16 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:07:02 +0100 Subject: [PATCH 117/290] Updated `turbo` to 2.0 --- package.json | 5 +++-- pnpm-lock.yaml | 58 +++++++++++++++++++++++++------------------------- turbo.json | 34 +++++++++++++++++------------ 3 files changed, 52 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 0e87800..8d84fcd 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,8 @@ "@changesets/cli": "2.27.3", "nodemon": "^3.1.0", "prettier": "^3.2.5", - "turbo": "^1.13.3", + "turbo": "^2.0.6", "vitest": "^1.6.0" - } + }, + "packageManager": "pnpm@9.4.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 72b23f4..51270b7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,8 +18,8 @@ importers: specifier: ^3.2.5 version: 3.2.5 turbo: - specifier: ^1.13.3 - version: 1.13.3 + specifier: ^2.0.6 + version: 2.0.6 vitest: specifier: ^1.6.0 version: 1.6.0(@types/node@20.12.12) @@ -2272,38 +2272,38 @@ packages: engines: {node: '>=8.0.0'} hasBin: true - turbo-darwin-64@1.13.3: - resolution: {integrity: sha512-glup8Qx1qEFB5jerAnXbS8WrL92OKyMmg5Hnd4PleLljAeYmx+cmmnsmLT7tpaVZIN58EAAwu8wHC6kIIqhbWA==} + turbo-darwin-64@2.0.6: + resolution: {integrity: sha512-XpgBwWj3Ggmz/gQVqXdMKXHC1iFPMDiuwugLwSzE7Ih0O13JuNtYZKhQnopvbDQnFQCeRq2Vsm5OTWabg/oB/g==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@1.13.3: - resolution: {integrity: sha512-/np2xD+f/+9qY8BVtuOQXRq5f9LehCFxamiQnwdqWm5iZmdjygC5T3uVSYuagVFsZKMvX3ycySwh8dylGTl6lg==} + turbo-darwin-arm64@2.0.6: + resolution: {integrity: sha512-RfeZYXIAkiA21E8lsvfptGTqz/256YD+eI1x37fedfvnHFWuIMFZGAOwJxtZc6QasQunDZ9TRRREbJNI68tkIw==} cpu: [arm64] os: [darwin] - turbo-linux-64@1.13.3: - resolution: {integrity: sha512-G+HGrau54iAnbXLfl+N/PynqpDwi/uDzb6iM9hXEDG+yJnSJxaHMShhOkXYJPk9offm9prH33Khx2scXrYVW1g==} + turbo-linux-64@2.0.6: + resolution: {integrity: sha512-92UDa0xNQQbx0HdSp9ag3YSS3xPdavhc7q9q9mxIAcqyjjD6VElA4Y85m4F/DDGE5SolCrvBz2sQhVmkOd6Caw==} cpu: [x64] os: [linux] - turbo-linux-arm64@1.13.3: - resolution: {integrity: sha512-qWwEl5VR02NqRyl68/3pwp3c/olZuSp+vwlwrunuoNTm6JXGLG5pTeme4zoHNnk0qn4cCX7DFrOboArlYxv0wQ==} + turbo-linux-arm64@2.0.6: + resolution: {integrity: sha512-eQKu6utCVUkIH2kqOzD8OS6E0ba6COjWm6PRDTNCHQRljZW503ycaTUIdMOiJrVg1MkEjDyOReUg8s8D18aJ4Q==} cpu: [arm64] os: [linux] - turbo-windows-64@1.13.3: - resolution: {integrity: sha512-Nudr4bRChfJzBPzEmpVV85VwUYRCGKecwkBFpbp2a4NtrJ3+UP1VZES653ckqCu2FRyRuS0n03v9euMbAvzH+Q==} + turbo-windows-64@2.0.6: + resolution: {integrity: sha512-+9u4EPrpoeHYCQ46dRcou9kbkSoelhOelHNcbs2d86D6ruYD/oIAHK9qgYK8LeARRz0jxhZIA/dWYdYsxJJWkw==} cpu: [x64] os: [win32] - turbo-windows-arm64@1.13.3: - resolution: {integrity: sha512-ouJCgsVLd3icjRLmRvHQDDZnmGzT64GBupM1Y+TjtYn2LVaEBoV6hicFy8x5DUpnqdLy+YpCzRMkWlwhmkX7sQ==} + turbo-windows-arm64@2.0.6: + resolution: {integrity: sha512-rdrKL+p+EjtdDVg0wQ/7yTbzkIYrnb0Pw4IKcjsy3M0RqUM9UcEi67b94XOAyTa5a0GqJL1+tUj2ebsFGPgZbg==} cpu: [arm64] os: [win32] - turbo@1.13.3: - resolution: {integrity: sha512-n17HJv4F4CpsYTvKzUJhLbyewbXjq1oLCi90i5tW1TiWDz16ML1eDG7wi5dHaKxzh5efIM56SITnuVbMq5dk4g==} + turbo@2.0.6: + resolution: {integrity: sha512-/Ftmxd5Mq//a9yMonvmwENNUN65jOVTwhhBPQjEtNZutYT9YKyzydFGLyVM1nzhpLWahQSMamRc/RDBv5EapzA==} hasBin: true type-detect@4.0.8: @@ -4595,32 +4595,32 @@ snapshots: wcwidth: 1.0.1 yargs: 17.7.2 - turbo-darwin-64@1.13.3: + turbo-darwin-64@2.0.6: optional: true - turbo-darwin-arm64@1.13.3: + turbo-darwin-arm64@2.0.6: optional: true - turbo-linux-64@1.13.3: + turbo-linux-64@2.0.6: optional: true - turbo-linux-arm64@1.13.3: + turbo-linux-arm64@2.0.6: optional: true - turbo-windows-64@1.13.3: + turbo-windows-64@2.0.6: optional: true - turbo-windows-arm64@1.13.3: + turbo-windows-arm64@2.0.6: optional: true - turbo@1.13.3: + turbo@2.0.6: optionalDependencies: - turbo-darwin-64: 1.13.3 - turbo-darwin-arm64: 1.13.3 - turbo-linux-64: 1.13.3 - turbo-linux-arm64: 1.13.3 - turbo-windows-64: 1.13.3 - turbo-windows-arm64: 1.13.3 + turbo-darwin-64: 2.0.6 + turbo-darwin-arm64: 2.0.6 + turbo-linux-64: 2.0.6 + turbo-linux-arm64: 2.0.6 + turbo-windows-64: 2.0.6 + turbo-windows-arm64: 2.0.6 type-detect@4.0.8: {} diff --git a/turbo.json b/turbo.json index b8c62ae..dc2279d 100644 --- a/turbo.json +++ b/turbo.json @@ -1,16 +1,22 @@ { - "$schema": "https://turbo.build/schema.json", - "pipeline": { - "build": { - "dependsOn": ["^build"], - "outputs": ["dist/**"] - }, - "test": { - "dependsOn": ["^test"] - }, - "dev": { - "cache": false, - "persistent": true - } - } + "$schema": "https://turbo.build/schema.json", + "tasks": { + "build": { + "dependsOn": [ + "^build" + ], + "outputs": [ + "dist/**" + ] + }, + "test": { + "dependsOn": [ + "^test" + ] + }, + "dev": { + "cache": false, + "persistent": true + } + } } From 98ac9c787a63586149a5c2e1448b6cb8fb7ed4b6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:08:50 +0100 Subject: [PATCH 118/290] Updated all deps --- package.json | 8 +- packages/commands/package.json | 10 +- packages/core/package.json | 12 +- packages/create-solid/package.json | 8 +- packages/reactivity/package.json | 4 +- packages/ui/package.json | 6 +- packages/utils/package.json | 12 +- pnpm-lock.yaml | 2264 ++++++---------------------- 8 files changed, 522 insertions(+), 1802 deletions(-) diff --git a/package.json b/package.json index 8d84fcd..e8194fc 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.3", - "nodemon": "^3.1.0", - "prettier": "^3.2.5", + "@changesets/cli": "2.27.7", + "nodemon": "^3.1.4", + "prettier": "^3.3.3", "turbo": "^2.0.6", - "vitest": "^1.6.0" + "vitest": "^2.0.2" }, "packageManager": "pnpm@9.4.0" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 29c1a61..20fae66 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,16 +33,16 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.12", - "prettier": "^3.2.5", - "tsup": "^8.0.2", - "typescript": "^5.4.5" + "@types/node": "^20.14.10", + "prettier": "^3.3.3", + "tsup": "^8.1.0", + "typescript": "^5.5.3" }, "publishConfig": { "access": "public" }, "dependencies": { - "@begit/core": "^0.0.16", + "@begit/core": "^0.0.18", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index f0fd760..6e2299a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,9 +29,9 @@ "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "cmd-ts": "^0.13.0", - "execa": "^8.0.1", + "execa": "^9.3.0", "picocolors": "^1.0.1", - "smol-toml": "^1.2.0", + "smol-toml": "^1.2.2", "tiny-updater": "^3.5.2" }, "scripts": { @@ -40,10 +40,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.12.12", - "jiti": "^1.21.0", - "tsup": "^8.0.2", - "typescript": "^5.4.5" + "@types/node": "^20.14.10", + "jiti": "^1.21.6", + "tsup": "^8.1.0", + "typescript": "^5.5.3" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 73bc29f..988c7a9 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.12.12", + "@types/node": "^20.14.10", "cmd-ts": "^0.13.0", - "jiti": "^1.21.0", + "jiti": "^1.21.6", "picocolors": "^1.0.1", - "tsup": "^8.0.2", - "typescript": "^5.4.5" + "tsup": "^8.1.0", + "typescript": "^5.5.3" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index cb765c4..d1601d6 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,8 +28,8 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.0.2", - "typescript": "^5.4.5" + "tsup": "^8.1.0", + "typescript": "^5.5.3" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 864a8e1..d6144c1 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.0.2", - "typescript": "^5.4.5", - "@types/node": "20.12.12" + "tsup": "^8.1.0", + "typescript": "^5.5.3", + "@types/node": "20.14.10" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 0dcda08..38454ff 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,12 +63,12 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.12.12", - "jiti": "^1.21.0", + "@types/node": "20.14.10", + "jiti": "^1.21.6", "magicast": "^0.3.4", - "tsup": "^8.0.2", - "typescript": "^5.4.5", - "vitest": "^1.6.0" + "tsup": "^8.1.0", + "typescript": "^5.5.3", + "vitest": "^2.0.2" }, "publishConfig": { "access": "public" @@ -80,6 +80,6 @@ "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.1", - "smol-toml": "^1.2.0" + "smol-toml": "^1.2.2" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 51270b7..80db6ef 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,26 +9,26 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.27.3 - version: 2.27.3 + specifier: 2.27.7 + version: 2.27.7 nodemon: - specifier: ^3.1.0 - version: 3.1.0 + specifier: ^3.1.4 + version: 3.1.4 prettier: - specifier: ^3.2.5 - version: 3.2.5 + specifier: ^3.3.3 + version: 3.3.3 turbo: specifier: ^2.0.6 version: 2.0.6 vitest: - specifier: ^1.6.0 - version: 1.6.0(@types/node@20.12.12) + specifier: ^2.0.2 + version: 2.0.2(@types/node@20.14.10) packages/commands: dependencies: '@begit/core': - specifier: ^0.0.16 - version: 0.0.16 + specifier: ^0.0.18 + version: 0.0.18 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.12 - version: 20.12.12 + specifier: ^20.14.10 + version: 20.14.10 prettier: - specifier: ^3.2.5 - version: 3.2.5 + specifier: ^3.3.3 + version: 3.3.3 tsup: - specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) + specifier: ^8.1.0 + version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) typescript: - specifier: ^5.4.5 - version: 5.4.5 + specifier: ^5.5.3 + version: 5.5.3 packages/core: dependencies: @@ -91,14 +91,14 @@ importers: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^8.0.1 - version: 8.0.1 + specifier: ^9.3.0 + version: 9.3.0 picocolors: specifier: ^1.0.1 version: 1.0.1 smol-toml: - specifier: ^1.2.0 - version: 1.2.0 + specifier: ^1.2.2 + version: 1.2.2 tiny-updater: specifier: ^3.5.2 version: 3.5.2 @@ -107,17 +107,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.12.12 - version: 20.12.12 + specifier: ^20.14.10 + version: 20.14.10 jiti: - specifier: ^1.21.0 - version: 1.21.0 + specifier: ^1.21.6 + version: 1.21.6 tsup: - specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) + specifier: ^8.1.0 + version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) typescript: - specifier: ^5.4.5 - version: 5.4.5 + specifier: ^5.5.3 + version: 5.5.3 packages/create-solid: devDependencies: @@ -128,32 +128,32 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.12.12 - version: 20.12.12 + specifier: ^20.14.10 + version: 20.14.10 cmd-ts: specifier: ^0.13.0 version: 0.13.0 jiti: - specifier: ^1.21.0 - version: 1.21.0 + specifier: ^1.21.6 + version: 1.21.6 picocolors: specifier: ^1.0.1 version: 1.0.1 tsup: - specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) + specifier: ^8.1.0 + version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) typescript: - specifier: ^5.4.5 - version: 5.4.5 + specifier: ^5.5.3 + version: 5.5.3 packages/reactivity: devDependencies: tsup: - specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) + specifier: ^8.1.0 + version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) typescript: - specifier: ^5.4.5 - version: 5.4.5 + specifier: ^5.5.3 + version: 5.5.3 packages/ui: dependencies: @@ -174,14 +174,14 @@ importers: version: 1.0.1 devDependencies: '@types/node': - specifier: 20.12.12 - version: 20.12.12 + specifier: 20.14.10 + version: 20.14.10 tsup: - specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) + specifier: ^8.1.0 + version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) typescript: - specifier: ^5.4.5 - version: 5.4.5 + specifier: ^5.5.3 + version: 5.5.3 packages/utils: dependencies: @@ -204,36 +204,36 @@ importers: specifier: ^1.0.1 version: 1.0.1 smol-toml: - specifier: ^1.2.0 - version: 1.2.0 + specifier: ^1.2.2 + version: 1.2.2 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.12.12 - version: 20.12.12 + specifier: 20.14.10 + version: 20.14.10 jiti: - specifier: ^1.21.0 - version: 1.21.0 + specifier: ^1.21.6 + version: 1.21.6 magicast: specifier: ^0.3.4 version: 0.3.4 tsup: - specifier: ^8.0.2 - version: 8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5) + specifier: ^8.1.0 + version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) typescript: - specifier: ^5.4.5 - version: 5.4.5 + specifier: ^5.5.3 + version: 5.5.3 vitest: - specifier: ^1.6.0 - version: 1.6.0(@types/node@20.12.12) + specifier: ^2.0.2 + version: 2.0.2(@types/node@20.14.10) packages: - '@babel/code-frame@7.24.2': - resolution: {integrity: sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==} - engines: {node: '>=6.9.0'} + '@ampproject/remapping@2.3.0': + resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} + engines: {node: '>=6.0.0'} '@babel/helper-string-parser@7.24.1': resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} @@ -243,10 +243,6 @@ packages: resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} engines: {node: '>=6.9.0'} - '@babel/highlight@7.24.2': - resolution: {integrity: sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==} - engines: {node: '>=6.9.0'} - '@babel/parser@7.24.5': resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} engines: {node: '>=6.0.0'} @@ -260,33 +256,33 @@ packages: resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} engines: {node: '>=6.9.0'} - '@begit/core@0.0.16': - resolution: {integrity: sha512-nSgezfX/ixRmVIXP0apKF3ZCeRlxlAD7usZqw0Ku4IExD6COJzT041FPm7vpAkrKxr3U54jHKb1fEeZVHBjEWg==} + '@begit/core@0.0.18': + resolution: {integrity: sha512-5CIC3Gr4+bS0lXviSpJusCNGTJwnt8ihx+NLA5eJP6ZnVqXu9LYT65ivs3vlEWrexwhYWF+7jx1H0hRt5g69Xw==} - '@changesets/apply-release-plan@7.0.1': - resolution: {integrity: sha512-aPdSq/R++HOyfEeBGjEe6LNG8gs0KMSyRETD/J2092OkNq8mOioAxyKjMbvVUdzgr/HTawzMOz7lfw339KnsCA==} + '@changesets/apply-release-plan@7.0.4': + resolution: {integrity: sha512-HLFwhKWayKinWAul0Vj+76jVx1Pc2v55MGPVjZ924Y/ROeSsBMFutv9heHmCUj48lJyRfOTJG5+ar+29FUky/A==} - '@changesets/assemble-release-plan@6.0.0': - resolution: {integrity: sha512-4QG7NuisAjisbW4hkLCmGW2lRYdPrKzro+fCtZaILX+3zdUELSvYjpL4GTv0E4aM9Mef3PuIQp89VmHJ4y2bfw==} + '@changesets/assemble-release-plan@6.0.3': + resolution: {integrity: sha512-bLNh9/Lgl1VwkjWZTq8JmRqH+hj7/Yzfz0jsQ/zJJ+FTmVqmqPj3szeKOri8O/hEM8JmHW019vh2gTO9iq5Cuw==} '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.3': - resolution: {integrity: sha512-ve/VpWApILlSs8cr0okNx5C2LKRawI9XZgvfmf58S8sar2nhx5DPJREFXYZBahs0FeTfvH0rdVl+nGe8QF45Ig==} + '@changesets/cli@2.27.7': + resolution: {integrity: sha512-6lr8JltiiXPIjDeYg4iM2MeePP6VN/JkmqBsVA5XRiy01hGS3y629LtSDvKcycj/w/5Eur1rEwby/MjcYS+e2A==} hasBin: true - '@changesets/config@3.0.0': - resolution: {integrity: sha512-o/rwLNnAo/+j9Yvw9mkBQOZySDYyOr/q+wptRLcAVGlU6djOeP9v1nlalbL9MFsobuBVQbZCTp+dIzdq+CLQUA==} + '@changesets/config@3.0.2': + resolution: {integrity: sha512-cdEhS4t8woKCX2M8AotcV2BOWnBp09sqICxKapgLHf9m5KdENpWjyrFNMjkLqGJtUys9U+w93OxWT0czorVDfw==} '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} - '@changesets/get-dependents-graph@2.0.0': - resolution: {integrity: sha512-cafUXponivK4vBgZ3yLu944mTvam06XEn2IZGjjKc0antpenkYANXiiE6GExV/yKdsCnE8dXVZ25yGqLYZmScA==} + '@changesets/get-dependents-graph@2.1.1': + resolution: {integrity: sha512-LRFjjvigBSzfnPU2n/AhFsuWR5DK++1x47aq6qZ8dzYsPtS/I5mNhIGAS68IAxh1xjO9BTtz55FwefhANZ+FCA==} - '@changesets/get-release-plan@4.0.0': - resolution: {integrity: sha512-9L9xCUeD/Tb6L/oKmpm8nyzsOzhdNBBbt/ZNcjynbHC07WW4E1eX8NMGC5g5SbM5z/V+MOrYsJ4lRW41GCbg3w==} + '@changesets/get-release-plan@4.0.3': + resolution: {integrity: sha512-6PLgvOIwTSdJPTtpdcr3sLtGatT+Jr22+cQwEBJBy6wP0rjB4yJ9lv583J9fVpn1bfQlBkDa8JxbS2g/n9lIyA==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -306,6 +302,9 @@ packages: '@changesets/read@0.6.0': resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} + '@changesets/should-skip-package@0.1.0': + resolution: {integrity: sha512-FxG6Mhjw7yFStlSM7Z0Gmg3RiyQ98d/9VpQAZ3Fzr59dCOM9G6ZdYbjiSAt0XtFr9JR5U2tBaJWPjrkGGc618g==} + '@changesets/types@4.1.0': resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} @@ -348,11 +347,11 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.19.9': - resolution: {integrity: sha512-q4cR+6ZD0938R19MyEW3jEsMzbb/1rulLXiNAJQADD/XYp7pT+rOS5JGxvpRW8dFDEfjW4wLgC/3FXIw4zYglQ==} + '@esbuild/aix-ppc64@0.21.5': + resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} engines: {node: '>=12'} - cpu: [arm64] - os: [android] + cpu: [ppc64] + os: [aix] '@esbuild/android-arm64@0.20.2': resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} @@ -360,10 +359,10 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm@0.19.9': - resolution: {integrity: sha512-jkYjjq7SdsWuNI6b5quymW0oC83NN5FdRPuCbs9HZ02mfVdAP8B8eeqLSYU3gb6OJEaY5CQabtTFbqBf26H3GA==} + '@esbuild/android-arm64@0.21.5': + resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} engines: {node: '>=12'} - cpu: [arm] + cpu: [arm64] os: [android] '@esbuild/android-arm@0.20.2': @@ -372,10 +371,10 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-x64@0.19.9': - resolution: {integrity: sha512-KOqoPntWAH6ZxDwx1D6mRntIgZh9KodzgNOy5Ebt9ghzffOk9X2c1sPwtM9P+0eXbefnDhqYfkh5PLP5ULtWFA==} + '@esbuild/android-arm@0.21.5': + resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} engines: {node: '>=12'} - cpu: [x64] + cpu: [arm] os: [android] '@esbuild/android-x64@0.20.2': @@ -384,11 +383,11 @@ packages: cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.19.9': - resolution: {integrity: sha512-KBJ9S0AFyLVx2E5D8W0vExqRW01WqRtczUZ8NRu+Pi+87opZn5tL4Y0xT0mA4FtHctd0ZgwNoN639fUUGlNIWw==} + '@esbuild/android-x64@0.21.5': + resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] + cpu: [x64] + os: [android] '@esbuild/darwin-arm64@0.20.2': resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} @@ -396,10 +395,10 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.19.9': - resolution: {integrity: sha512-vE0VotmNTQaTdX0Q9dOHmMTao6ObjyPm58CHZr1UK7qpNleQyxlFlNCaHsHx6Uqv86VgPmR4o2wdNq3dP1qyDQ==} + '@esbuild/darwin-arm64@0.21.5': + resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} engines: {node: '>=12'} - cpu: [x64] + cpu: [arm64] os: [darwin] '@esbuild/darwin-x64@0.20.2': @@ -408,11 +407,11 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.19.9': - resolution: {integrity: sha512-uFQyd/o1IjiEk3rUHSwUKkqZwqdvuD8GevWF065eqgYfexcVkxh+IJgwTaGZVu59XczZGcN/YMh9uF1fWD8j1g==} + '@esbuild/darwin-x64@0.21.5': + resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] + cpu: [x64] + os: [darwin] '@esbuild/freebsd-arm64@0.20.2': resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} @@ -420,10 +419,10 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.19.9': - resolution: {integrity: sha512-WMLgWAtkdTbTu1AWacY7uoj/YtHthgqrqhf1OaEWnZb7PQgpt8eaA/F3LkV0E6K/Lc0cUr/uaVP/49iE4M4asA==} + '@esbuild/freebsd-arm64@0.21.5': + resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} engines: {node: '>=12'} - cpu: [x64] + cpu: [arm64] os: [freebsd] '@esbuild/freebsd-x64@0.20.2': @@ -432,11 +431,11 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.19.9': - resolution: {integrity: sha512-PiPblfe1BjK7WDAKR1Cr9O7VVPqVNpwFcPWgfn4xu0eMemzRp442hXyzF/fSwgrufI66FpHOEJk0yYdPInsmyQ==} + '@esbuild/freebsd-x64@0.21.5': + resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} engines: {node: '>=12'} - cpu: [arm64] - os: [linux] + cpu: [x64] + os: [freebsd] '@esbuild/linux-arm64@0.20.2': resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} @@ -444,10 +443,10 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.19.9': - resolution: {integrity: sha512-C/ChPohUYoyUaqn1h17m/6yt6OB14hbXvT8EgM1ZWaiiTYz7nWZR0SYmMnB5BzQA4GXl3BgBO1l8MYqL/He3qw==} + '@esbuild/linux-arm64@0.21.5': + resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} engines: {node: '>=12'} - cpu: [arm] + cpu: [arm64] os: [linux] '@esbuild/linux-arm@0.20.2': @@ -456,10 +455,10 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.19.9': - resolution: {integrity: sha512-f37i/0zE0MjDxijkPSQw1CO/7C27Eojqb+r3BbHVxMLkj8GCa78TrBZzvPyA/FNLUMzP3eyHCVkAopkKVja+6Q==} + '@esbuild/linux-arm@0.21.5': + resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} engines: {node: '>=12'} - cpu: [ia32] + cpu: [arm] os: [linux] '@esbuild/linux-ia32@0.20.2': @@ -468,10 +467,10 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.19.9': - resolution: {integrity: sha512-t6mN147pUIf3t6wUt3FeumoOTPfmv9Cc6DQlsVBpB7eCpLOqQDyWBP1ymXn1lDw4fNUSb/gBcKAmvTP49oIkaA==} + '@esbuild/linux-ia32@0.21.5': + resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} engines: {node: '>=12'} - cpu: [loong64] + cpu: [ia32] os: [linux] '@esbuild/linux-loong64@0.20.2': @@ -480,10 +479,10 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.19.9': - resolution: {integrity: sha512-jg9fujJTNTQBuDXdmAg1eeJUL4Jds7BklOTkkH80ZgQIoCTdQrDaHYgbFZyeTq8zbY+axgptncko3v9p5hLZtw==} + '@esbuild/linux-loong64@0.21.5': + resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} engines: {node: '>=12'} - cpu: [mips64el] + cpu: [loong64] os: [linux] '@esbuild/linux-mips64el@0.20.2': @@ -492,10 +491,10 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.19.9': - resolution: {integrity: sha512-tkV0xUX0pUUgY4ha7z5BbDS85uI7ABw3V1d0RNTii7E9lbmV8Z37Pup2tsLV46SQWzjOeyDi1Q7Wx2+QM8WaCQ==} + '@esbuild/linux-mips64el@0.21.5': + resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} engines: {node: '>=12'} - cpu: [ppc64] + cpu: [mips64el] os: [linux] '@esbuild/linux-ppc64@0.20.2': @@ -504,10 +503,10 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.19.9': - resolution: {integrity: sha512-DfLp8dj91cufgPZDXr9p3FoR++m3ZJ6uIXsXrIvJdOjXVREtXuQCjfMfvmc3LScAVmLjcfloyVtpn43D56JFHg==} + '@esbuild/linux-ppc64@0.21.5': + resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} engines: {node: '>=12'} - cpu: [riscv64] + cpu: [ppc64] os: [linux] '@esbuild/linux-riscv64@0.20.2': @@ -516,10 +515,10 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.19.9': - resolution: {integrity: sha512-zHbglfEdC88KMgCWpOl/zc6dDYJvWGLiUtmPRsr1OgCViu3z5GncvNVdf+6/56O2Ca8jUU+t1BW261V6kp8qdw==} + '@esbuild/linux-riscv64@0.21.5': + resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} engines: {node: '>=12'} - cpu: [s390x] + cpu: [riscv64] os: [linux] '@esbuild/linux-s390x@0.20.2': @@ -528,10 +527,10 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.19.9': - resolution: {integrity: sha512-JUjpystGFFmNrEHQnIVG8hKwvA2DN5o7RqiO1CVX8EN/F/gkCjkUMgVn6hzScpwnJtl2mPR6I9XV1oW8k9O+0A==} + '@esbuild/linux-s390x@0.21.5': + resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} engines: {node: '>=12'} - cpu: [x64] + cpu: [s390x] os: [linux] '@esbuild/linux-x64@0.20.2': @@ -540,11 +539,11 @@ packages: cpu: [x64] os: [linux] - '@esbuild/netbsd-x64@0.19.9': - resolution: {integrity: sha512-GThgZPAwOBOsheA2RUlW5UeroRfESwMq/guy8uEe3wJlAOjpOXuSevLRd70NZ37ZrpO6RHGHgEHvPg1h3S1Jug==} + '@esbuild/linux-x64@0.21.5': + resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} engines: {node: '>=12'} cpu: [x64] - os: [netbsd] + os: [linux] '@esbuild/netbsd-x64@0.20.2': resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} @@ -552,11 +551,11 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/openbsd-x64@0.19.9': - resolution: {integrity: sha512-Ki6PlzppaFVbLnD8PtlVQfsYw4S9n3eQl87cqgeIw+O3sRr9IghpfSKY62mggdt1yCSZ8QWvTZ9jo9fjDSg9uw==} + '@esbuild/netbsd-x64@0.21.5': + resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} engines: {node: '>=12'} cpu: [x64] - os: [openbsd] + os: [netbsd] '@esbuild/openbsd-x64@0.20.2': resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} @@ -564,11 +563,11 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.19.9': - resolution: {integrity: sha512-MLHj7k9hWh4y1ddkBpvRj2b9NCBhfgBt3VpWbHQnXRedVun/hC7sIyTGDGTfsGuXo4ebik2+3ShjcPbhtFwWDw==} + '@esbuild/openbsd-x64@0.21.5': + resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} engines: {node: '>=12'} cpu: [x64] - os: [sunos] + os: [openbsd] '@esbuild/sunos-x64@0.20.2': resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} @@ -576,11 +575,11 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.19.9': - resolution: {integrity: sha512-GQoa6OrQ8G08guMFgeXPH7yE/8Dt0IfOGWJSfSH4uafwdC7rWwrfE6P9N8AtPGIjUzdo2+7bN8Xo3qC578olhg==} + '@esbuild/sunos-x64@0.21.5': + resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} engines: {node: '>=12'} - cpu: [arm64] - os: [win32] + cpu: [x64] + os: [sunos] '@esbuild/win32-arm64@0.20.2': resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} @@ -588,10 +587,10 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.19.9': - resolution: {integrity: sha512-UOozV7Ntykvr5tSOlGCrqU3NBr3d8JqPes0QWN2WOXfvkWVGRajC+Ym0/Wj88fUgecUCLDdJPDF0Nna2UK3Qtg==} + '@esbuild/win32-arm64@0.21.5': + resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} engines: {node: '>=12'} - cpu: [ia32] + cpu: [arm64] os: [win32] '@esbuild/win32-ia32@0.20.2': @@ -600,10 +599,10 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.19.9': - resolution: {integrity: sha512-oxoQgglOP7RH6iasDrhY+R/3cHrfwIDvRlT4CGChflq6twk8iENeVvMJjmvBb94Ik1Z+93iGO27err7w6l54GQ==} + '@esbuild/win32-ia32@0.21.5': + resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} engines: {node: '>=12'} - cpu: [x64] + cpu: [ia32] os: [win32] '@esbuild/win32-x64@0.20.2': @@ -612,6 +611,12 @@ packages: cpu: [x64] os: [win32] + '@esbuild/win32-x64@0.21.5': + resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} @@ -620,14 +625,14 @@ packages: resolution: {integrity: sha512-S00nN1Qt3z3dSP6Db45fj/mksrAq5XWNIJ/SWXGP8XPT2jrzEuYRCSEx08JpJwBcG2F1xgiOtBMGDU0AZHmxew==} engines: {node: '>=18.0.0'} - '@jest/schemas@29.6.3': - resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - '@jridgewell/gen-mapping@0.3.3': resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} + '@jridgewell/gen-mapping@0.3.5': + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + engines: {node: '>=6.0.0'} + '@jridgewell/resolve-uri@3.1.1': resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} @@ -636,12 +641,19 @@ packages: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} + '@jridgewell/set-array@1.2.1': + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} + engines: {node: '>=6.0.0'} + '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} '@jridgewell/trace-mapping@0.3.19': resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} + '@jridgewell/trace-mapping@0.3.25': + resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -673,51 +685,26 @@ packages: cpu: [arm] os: [android] - '@rollup/rollup-android-arm-eabi@4.9.1': - resolution: {integrity: sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm64@4.16.1': resolution: {integrity: sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==} cpu: [arm64] os: [android] - '@rollup/rollup-android-arm64@4.9.1': - resolution: {integrity: sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==} - cpu: [arm64] - os: [android] - '@rollup/rollup-darwin-arm64@4.16.1': resolution: {integrity: sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-arm64@4.9.1': - resolution: {integrity: sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.16.1': resolution: {integrity: sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==} cpu: [x64] os: [darwin] - '@rollup/rollup-darwin-x64@4.9.1': - resolution: {integrity: sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==} - cpu: [x64] - os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.16.1': resolution: {integrity: sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.9.1': - resolution: {integrity: sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.16.1': resolution: {integrity: sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==} cpu: [arm] @@ -728,21 +715,11 @@ packages: cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.9.1': - resolution: {integrity: sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-musl@4.16.1': resolution: {integrity: sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.9.1': - resolution: {integrity: sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': resolution: {integrity: sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==} cpu: [ppc64] @@ -753,11 +730,6 @@ packages: cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.9.1': - resolution: {integrity: sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==} - cpu: [riscv64] - os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.16.1': resolution: {integrity: sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==} cpu: [s390x] @@ -768,53 +740,32 @@ packages: cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.9.1': - resolution: {integrity: sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-musl@4.16.1': resolution: {integrity: sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.9.1': - resolution: {integrity: sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==} - cpu: [x64] - os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.16.1': resolution: {integrity: sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.9.1': - resolution: {integrity: sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==} - cpu: [arm64] - os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.16.1': resolution: {integrity: sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.9.1': - resolution: {integrity: sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.16.1': resolution: {integrity: sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==} cpu: [x64] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.9.1': - resolution: {integrity: sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==} - cpu: [x64] - os: [win32] + '@sec-ant/readable-stream@0.4.1': + resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} - '@sinclair/typebox@0.27.8': - resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} + '@sindresorhus/merge-streams@4.0.0': + resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} + engines: {node: '>=18'} '@swc/core-darwin-arm64@1.5.5': resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} @@ -894,48 +845,36 @@ packages: '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - '@types/minimist@1.2.5': - resolution: {integrity: sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==} - '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@20.12.12': - resolution: {integrity: sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==} - - '@types/normalize-package-data@2.4.4': - resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} + '@types/node@20.14.10': + resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@vitest/expect@1.6.0': - resolution: {integrity: sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==} + '@vitest/expect@2.0.2': + resolution: {integrity: sha512-nKAvxBYqcDugYZ4nJvnm5OR8eDJdgWjk4XM9owQKUjzW70q0icGV2HVnQOyYsp906xJaBDUXw0+9EHw2T8e0mQ==} - '@vitest/runner@1.6.0': - resolution: {integrity: sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==} + '@vitest/pretty-format@2.0.2': + resolution: {integrity: sha512-SBCyOXfGVvddRd9r2PwoVR0fonQjh9BMIcBMlSzbcNwFfGr6ZhOhvBzurjvi2F4ryut2HcqiFhNeDVGwru8tLg==} - '@vitest/snapshot@1.6.0': - resolution: {integrity: sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==} + '@vitest/runner@2.0.2': + resolution: {integrity: sha512-OCh437Vi8Wdbif1e0OvQcbfM3sW4s2lpmOjAE7qfLrpzJX2M7J1IQlNvEcb/fu6kaIB9n9n35wS0G2Q3en5kHg==} - '@vitest/spy@1.6.0': - resolution: {integrity: sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==} + '@vitest/snapshot@2.0.2': + resolution: {integrity: sha512-Yc2ewhhZhx+0f9cSUdfzPRcsM6PhIb+S43wxE7OG0kTxqgqzo8tHkXFuFlndXeDMp09G3sY/X5OAo/RfYydf1g==} - '@vitest/utils@1.6.0': - resolution: {integrity: sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==} + '@vitest/spy@2.0.2': + resolution: {integrity: sha512-MgwJ4AZtCgqyp2d7WcQVE8aNG5vQ9zu9qMPYQHjsld/QVsrvg78beNrXdO4HYkP0lDahCO3P4F27aagIag+SGQ==} + + '@vitest/utils@2.0.2': + resolution: {integrity: sha512-pxCY1v7kmOCWYWjzc0zfjGTA3Wmn8PKnlPvSrsA643P1NHl1fOyXj2Q9SaNlrlFE+ivCsxM80Ov3AR82RmHCWQ==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - acorn-walk@8.3.2: - resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==} - engines: {node: '>=0.4.0'} - - acorn@8.10.0: - resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} - engines: {node: '>=0.4.0'} - hasBin: true - ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} @@ -956,10 +895,6 @@ packages: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - ansi-styles@5.2.0: - resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} - engines: {node: '>=10'} - ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} engines: {node: '>=12'} @@ -974,32 +909,13 @@ packages: argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} - array-buffer-byte-length@1.0.1: - resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==} - engines: {node: '>= 0.4'} - array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - array.prototype.flat@1.3.2: - resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} - engines: {node: '>= 0.4'} - - arraybuffer.prototype.slice@1.0.3: - resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==} - engines: {node: '>= 0.4'} - - arrify@1.0.1: - resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==} - engines: {node: '>=0.10.0'} - - assertion-error@1.1.0: - resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} - - available-typed-arrays@1.0.7: - resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==} - engines: {node: '>= 0.4'} + assertion-error@2.0.1: + resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} + engines: {node: '>=12'} balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} @@ -1022,9 +938,6 @@ packages: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} - breakword@1.0.6: - resolution: {integrity: sha512-yjxDAYyK/pBvws9H4xKYpLDpYKEH6CzrBPAuXq3x18I+c/2MkVtT3qAr7Oloi6Dss9qNhPVueAAVU1CSeNDIXw==} - bundle-require@4.0.1: resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1035,21 +948,9 @@ packages: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} - call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} - engines: {node: '>= 0.4'} - - camelcase-keys@6.2.2: - resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==} - engines: {node: '>=8'} - - camelcase@5.3.1: - resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==} - engines: {node: '>=6'} - - chai@4.4.1: - resolution: {integrity: sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==} - engines: {node: '>=4'} + chai@5.1.1: + resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==} + engines: {node: '>=12'} chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -1062,12 +963,9 @@ packages: chardet@0.7.0: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} - check-error@1.0.3: - resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==} - - chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} + check-error@2.1.1: + resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} + engines: {node: '>= 16'} chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} @@ -1081,17 +979,6 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} - cliui@6.0.0: - resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==} - - cliui@8.0.1: - resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} - engines: {node: '>=12'} - - clone@1.0.4: - resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} - engines: {node: '>=0.8'} - cmd-ts@0.13.0: resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} @@ -1122,31 +1009,6 @@ packages: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} - csv-generate@3.4.3: - resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==} - - csv-parse@4.16.3: - resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==} - - csv-stringify@5.6.5: - resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==} - - csv@5.5.3: - resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==} - engines: {node: '>= 0.1.90'} - - data-view-buffer@1.0.1: - resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==} - engines: {node: '>= 0.4'} - - data-view-byte-length@1.0.1: - resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==} - engines: {node: '>= 0.4'} - - data-view-byte-offset@1.0.0: - resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==} - engines: {node: '>= 0.4'} - debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -1156,29 +1018,19 @@ packages: supports-color: optional: true - decamelize-keys@1.1.1: - resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} - engines: {node: '>=0.10.0'} - - decamelize@1.2.0: - resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} - engines: {node: '>=0.10.0'} + debug@4.3.5: + resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true - deep-eql@4.1.3: - resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==} + deep-eql@5.0.2: + resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} - defaults@1.0.4: - resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==} - - define-data-property@1.1.4: - resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==} - engines: {node: '>= 0.4'} - - define-properties@1.2.1: - resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==} - engines: {node: '>= 0.4'} - detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} @@ -1191,10 +1043,6 @@ packages: didyoumean@1.2.2: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - diff-sequences@29.6.3: - resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} - dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} @@ -1212,49 +1060,15 @@ packages: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} - error-ex@1.3.2: - resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} - - es-abstract@1.23.3: - resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==} - engines: {node: '>= 0.4'} - - es-define-property@1.0.0: - resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} - engines: {node: '>= 0.4'} - - es-errors@1.3.0: - resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} - engines: {node: '>= 0.4'} - - es-object-atoms@1.0.0: - resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==} - engines: {node: '>= 0.4'} - - es-set-tostringtag@2.0.3: - resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==} - engines: {node: '>= 0.4'} - - es-shim-unscopables@1.0.2: - resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==} - - es-to-primitive@1.2.1: - resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} - engines: {node: '>= 0.4'} - - esbuild@0.19.9: - resolution: {integrity: sha512-U9CHtKSy+EpPsEBa+/A2gMs/h3ylBC0H0KSqIg7tpztHerLi6nrrcoUJAkNCEPumx8yJ+Byic4BVwHgRbN0TBg==} - engines: {node: '>=12'} - hasBin: true - esbuild@0.20.2: resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} engines: {node: '>=12'} hasBin: true - escalade@3.1.2: - resolution: {integrity: sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==} - engines: {node: '>=6'} + esbuild@0.21.5: + resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} + engines: {node: '>=12'} + hasBin: true escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} @@ -1276,6 +1090,10 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} + execa@9.3.0: + resolution: {integrity: sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==} + engines: {node: ^18.19.0 || >=20.5.0} + extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} @@ -1290,6 +1108,10 @@ packages: fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + figures@6.1.0: + resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} + engines: {node: '>=18'} + fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -1305,9 +1127,6 @@ packages: find-yarn-workspace-root2@1.2.16: resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==} - for-each@0.3.3: - resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} - foreground-child@3.1.1: resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} engines: {node: '>=14'} @@ -1325,27 +1144,9 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] - function-bind@1.1.2: - resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - - function.prototype.name@1.1.6: - resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==} - engines: {node: '>= 0.4'} - - functions-have-names@1.2.3: - resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - - get-caller-file@2.0.5: - resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} - engines: {node: 6.* || 8.* || >= 10.*} - get-func-name@2.0.2: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} - get-intrinsic@1.2.4: - resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} - engines: {node: '>= 0.4'} - get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} @@ -1354,9 +1155,9 @@ packages: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - get-symbol-description@1.0.2: - resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==} - engines: {node: '>= 0.4'} + get-stream@9.0.1: + resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} + engines: {node: '>=18'} glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} @@ -1367,30 +1168,13 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - globalthis@1.0.3: - resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} - engines: {node: '>= 0.4'} - globby@11.1.0: resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} engines: {node: '>=10'} - gopd@1.0.1: - resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - grapheme-splitter@1.0.4: - resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} - - hard-rejection@2.1.0: - resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==} - engines: {node: '>=6'} - - has-bigints@1.0.2: - resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} - has-flag@3.0.0: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} @@ -1399,28 +1183,6 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - has-property-descriptors@1.0.2: - resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} - - has-proto@1.0.3: - resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==} - engines: {node: '>= 0.4'} - - has-symbols@1.0.3: - resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} - engines: {node: '>= 0.4'} - - has-tostringtag@1.0.2: - resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==} - engines: {node: '>= 0.4'} - - hasown@2.0.2: - resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} - engines: {node: '>= 0.4'} - - hosted-git-info@2.8.9: - resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} - human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} @@ -1432,6 +1194,10 @@ packages: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} + human-signals@7.0.0: + resolution: {integrity: sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==} + engines: {node: '>=18.18.0'} + iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -1443,50 +1209,13 @@ packages: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} - indent-string@4.0.0: - resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==} - engines: {node: '>=8'} - - internal-slot@1.0.7: - resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==} - engines: {node: '>= 0.4'} - ionstore@1.0.0: resolution: {integrity: sha512-ikEvmeZFh9u5SkjKbFqJlmmhaQTulB3P7QoSoZ/xL8EDP5uj5QWbPeKcQ8ZJtszBLHRRnhIJJE8P1dhFx/oCMw==} - is-array-buffer@3.0.4: - resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==} - engines: {node: '>= 0.4'} - - is-arrayish@0.2.1: - resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} - - is-bigint@1.0.4: - resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} - is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} - is-boolean-object@1.1.2: - resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} - engines: {node: '>= 0.4'} - - is-callable@1.2.7: - resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} - engines: {node: '>= 0.4'} - - is-core-module@2.13.1: - resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==} - - is-data-view@1.0.1: - resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==} - engines: {node: '>= 0.4'} - - is-date-object@1.0.5: - resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} - engines: {node: '>= 0.4'} - is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} @@ -1499,29 +1228,13 @@ packages: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} engines: {node: '>=0.10.0'} - is-negative-zero@2.0.3: - resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==} - engines: {node: '>= 0.4'} - - is-number-object@1.0.7: - resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} - engines: {node: '>= 0.4'} - is-number@7.0.0: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-plain-obj@1.1.0: - resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==} - engines: {node: '>=0.10.0'} - - is-regex@1.1.4: - resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} - engines: {node: '>= 0.4'} - - is-shared-array-buffer@1.0.3: - resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==} - engines: {node: '>= 0.4'} + is-plain-obj@4.1.0: + resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} + engines: {node: '>=12'} is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} @@ -1531,32 +1244,22 @@ packages: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - is-string@1.0.7: - resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} - engines: {node: '>= 0.4'} + is-stream@4.0.1: + resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} + engines: {node: '>=18'} is-subdir@1.2.0: resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==} engines: {node: '>=4'} - is-symbol@1.0.4: - resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} - engines: {node: '>= 0.4'} - - is-typed-array@1.1.13: - resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==} - engines: {node: '>= 0.4'} - - is-weakref@1.0.2: - resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} + is-unicode-supported@2.0.0: + resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==} + engines: {node: '>=18'} is-windows@1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} engines: {node: '>=0.10.0'} - isarray@2.0.5: - resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==} - isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} @@ -1564,41 +1267,21 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - jiti@1.21.0: - resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==} + jiti@1.21.6: + resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} hasBin: true joycon@3.1.1: resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} engines: {node: '>=10'} - js-tokens@4.0.0: - resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - - js-tokens@9.0.0: - resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==} - js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true - json-parse-even-better-errors@2.3.1: - resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} - - jsonc-parser@3.2.0: - resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==} - jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - kind-of@6.0.3: - resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} - engines: {node: '>=0.10.0'} - - kleur@4.1.5: - resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} - engines: {node: '>=6'} - lilconfig@2.1.0: resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} engines: {node: '>=10'} @@ -1614,10 +1297,6 @@ packages: resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} engines: {node: '>=6'} - local-pkg@0.5.0: - resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==} - engines: {node: '>=14'} - locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} @@ -1632,8 +1311,8 @@ packages: lodash.startcase@4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} - loupe@2.3.7: - resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==} + loupe@3.1.1: + resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==} lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} @@ -1652,18 +1331,6 @@ packages: magicast@0.3.4: resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==} - map-obj@1.0.1: - resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==} - engines: {node: '>=0.10.0'} - - map-obj@4.3.0: - resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==} - engines: {node: '>=8'} - - meow@6.1.1: - resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} - engines: {node: '>=8'} - merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -1691,10 +1358,6 @@ packages: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} - min-indent@1.0.1: - resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==} - engines: {node: '>=4'} - minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -1702,33 +1365,26 @@ packages: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} - minimist-options@4.1.0: - resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} - engines: {node: '>= 6'} - minipass@5.0.0: resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} engines: {node: '>=8'} - minipass@7.1.1: - resolution: {integrity: sha512-UZ7eQ+h8ywIRAW1hIEl2AqdwzJucU/Kp59+8kkZeSvafXhZjul247BvIJjEVFVeON6d7lM46XX1HXCduKAS8VA==} + minipass@7.1.2: + resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} engines: {node: '>=16 || 14 >=14.17'} minizlib@3.0.1: resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} engines: {node: '>= 18'} - mixme@0.5.10: - resolution: {integrity: sha512-5H76ANWinB1H3twpJ6JY8uvAtpmFvHNArpilJAjXRKXSDDLPIMoZArw5SH0q9z+lLs8IrMw7Q2VWpWimFKFT1Q==} - engines: {node: '>= 8.0.0'} - mkdirp@3.0.1: resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} engines: {node: '>=10'} hasBin: true - mlly@1.4.2: - resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==} + mri@1.2.0: + resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} + engines: {node: '>=4'} ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} @@ -1741,8 +1397,8 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nodemon@3.1.0: - resolution: {integrity: sha512-xqlktYlDMCepBJd43ZQhjWwMw2obW/JRvkrLxq5RCNcuDDX1DbcPT+qT1IlIIdf+DhnWs90JpTMe+Y5KxOchvA==} + nodemon@3.1.4: + resolution: {integrity: sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==} engines: {node: '>=10'} hasBin: true @@ -1750,9 +1406,6 @@ packages: resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} hasBin: true - normalize-package-data@2.5.0: - resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} - normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} @@ -1769,17 +1422,6 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - object-inspect@1.13.1: - resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} - - object-keys@1.1.1: - resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} - engines: {node: '>= 0.4'} - - object.assign@4.1.5: - resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==} - engines: {node: '>= 0.4'} - onetime@5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} engines: {node: '>=6'} @@ -1807,10 +1449,6 @@ packages: resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} engines: {node: '>=10'} - p-limit@5.0.0: - resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==} - engines: {node: '>=18'} - p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} @@ -1827,9 +1465,9 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - parse-json@5.2.0: - resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} - engines: {node: '>=8'} + parse-ms@4.0.0: + resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} + engines: {node: '>=18'} path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} @@ -1843,9 +1481,6 @@ packages: resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} engines: {node: '>=12'} - path-parse@1.0.7: - resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} - path-scurry@1.10.1: resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==} engines: {node: '>=16 || 14 >=14.17'} @@ -1857,11 +1492,9 @@ packages: pathe@1.1.2: resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} - pathval@1.1.1: - resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==} - - picocolors@1.0.0: - resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} + pathval@2.0.0: + resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} + engines: {node: '>= 14.16'} picocolors@1.0.1: resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} @@ -1882,13 +1515,6 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - pkg-types@1.0.3: - resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} - - possible-typed-array-names@1.0.0: - resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} - engines: {node: '>= 0.4'} - postcss-load-config@4.0.1: resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} @@ -1914,14 +1540,14 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} + prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} engines: {node: '>=14'} hasBin: true - pretty-format@29.7.0: - resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==} - engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + pretty-ms@9.0.0: + resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==} + engines: {node: '>=18'} pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -1936,21 +1562,6 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - quick-lru@4.0.1: - resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==} - engines: {node: '>=8'} - - react-is@18.2.0: - resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - - read-pkg-up@7.0.1: - resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==} - engines: {node: '>=8'} - - read-pkg@5.2.0: - resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} - engines: {node: '>=8'} - read-yaml-file@1.1.0: resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==} engines: {node: '>=6'} @@ -1959,32 +1570,13 @@ packages: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} - redent@3.0.0: - resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==} - engines: {node: '>=8'} - regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - regexp.prototype.flags@1.5.2: - resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==} - engines: {node: '>= 0.4'} - - require-directory@2.1.1: - resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} - engines: {node: '>=0.10.0'} - - require-main-filename@2.0.0: - resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==} - resolve-from@5.0.0: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} - resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} - hasBin: true - reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} @@ -1999,45 +1591,17 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rollup@4.9.1: - resolution: {integrity: sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - safe-array-concat@1.1.2: - resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==} - engines: {node: '>=0.4'} - - safe-regex-test@1.0.3: - resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==} - engines: {node: '>= 0.4'} - safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - semver@5.7.2: - resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} - hasBin: true - semver@7.6.0: resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} engines: {node: '>=10'} hasBin: true - set-blocking@2.0.0: - resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} - - set-function-length@1.2.2: - resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} - engines: {node: '>= 0.4'} - - set-function-name@2.0.2: - resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==} - engines: {node: '>= 0.4'} - shebang-command@1.2.0: resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} engines: {node: '>=0.10.0'} @@ -2054,10 +1618,6 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - side-channel@1.0.6: - resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} - engines: {node: '>= 0.4'} - siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} @@ -2079,14 +1639,9 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - smartwrap@2.0.2: - resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==} - engines: {node: '>=6'} - hasBin: true - - smol-toml@1.2.0: - resolution: {integrity: sha512-KObxdQANC/xje3OoatMbSwQf2XAvJ0RbK+4nmQRszFNZptbNRnMWqbLF/zb4sMi9xJ6HNyhWXeuZ9zC/I/XY7w==} - engines: {node: '>= 18', pnpm: '>= 9'} + smol-toml@1.2.2: + resolution: {integrity: sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==} + engines: {node: '>= 18'} source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} @@ -2099,18 +1654,6 @@ packages: spawndamnit@2.0.0: resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==} - spdx-correct@3.2.0: - resolution: {integrity: sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==} - - spdx-exceptions@2.5.0: - resolution: {integrity: sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==} - - spdx-expression-parse@3.0.1: - resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==} - - spdx-license-ids@3.0.17: - resolution: {integrity: sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==} - sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} @@ -2120,9 +1663,6 @@ packages: std-env@3.7.0: resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} - stream-transform@2.1.3: - resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==} - string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} @@ -2131,17 +1671,6 @@ packages: resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==} engines: {node: '>=12'} - string.prototype.trim@1.2.9: - resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==} - engines: {node: '>= 0.4'} - - string.prototype.trimend@1.0.8: - resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==} - - string.prototype.trimstart@1.0.8: - resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==} - engines: {node: '>= 0.4'} - strip-ansi@6.0.1: resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} engines: {node: '>=8'} @@ -2162,12 +1691,9 @@ packages: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} - strip-indent@3.0.0: - resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==} - engines: {node: '>=8'} - - strip-literal@2.1.0: - resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==} + strip-final-newline@4.0.0: + resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} + engines: {node: '>=18'} sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} @@ -2182,12 +1708,8 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} - supports-preserve-symlinks-flag@1.0.0: - resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} - engines: {node: '>= 0.4'} - - tar@7.1.0: - resolution: {integrity: sha512-ENhg4W6BmjYxl8GTaE7/h99f0aXiSWv4kikRZ9n2/JRxypZniE84ILZqimAhxxX7Zb8Px6pFdheW3EeHfhnXQQ==} + tar@7.4.0: + resolution: {integrity: sha512-XQs0S8fuAkQWuqhDeCdMlJXDX80D7EOVLDPVFkna9yQfzS+PHKgfxcei0jf6/+QAWcjqrnC8uM3fSAnrQl+XYg==} engines: {node: '>=18'} term-size@2.2.1: @@ -2210,12 +1732,16 @@ packages: tinybench@2.8.0: resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} - tinypool@0.8.4: - resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==} + tinypool@1.0.0: + resolution: {integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==} + engines: {node: ^18.0.0 || >=20.0.0} + + tinyrainbow@1.2.0: + resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} engines: {node: '>=14.0.0'} - tinyspy@2.2.0: - resolution: {integrity: sha512-d2eda04AN/cPOR89F7Xv5bK/jrQEhmcLFe6HFldoeO9AJtps+fqEnh486vnT/8y4bw38pSyxDcTCAq+Ks2aJTg==} + tinyspy@3.0.0: + resolution: {integrity: sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==} engines: {node: '>=14.0.0'} tmp@0.0.33: @@ -2241,15 +1767,11 @@ packages: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true - trim-newlines@3.0.1: - resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==} - engines: {node: '>=8'} - ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.0.2: - resolution: {integrity: sha512-NY8xtQXdH7hDUAZwcQdY/Vzlw9johQsaqf7iwZ6g1DOUlFYQ5/AtVAjTvihhEyeRlGo4dLRVHtrRaL35M1daqQ==} + tsup@8.1.0: + resolution: {integrity: sha512-UFdfCAXukax+U6KzeTNO2kAARHcWxmKsnvSPXUcfA1D+kU05XDccCrkffCQpFaWDsZfV0jMyTsxU39VfCp6EOg==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -2267,11 +1789,6 @@ packages: typescript: optional: true - tty-table@4.2.3: - resolution: {integrity: sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==} - engines: {node: '>=8.0.0'} - hasBin: true - turbo-darwin-64@2.0.6: resolution: {integrity: sha512-XpgBwWj3Ggmz/gQVqXdMKXHC1iFPMDiuwugLwSzE7Ih0O13JuNtYZKhQnopvbDQnFQCeRq2Vsm5OTWabg/oB/g==} cpu: [x64] @@ -2306,49 +1823,11 @@ packages: resolution: {integrity: sha512-/Ftmxd5Mq//a9yMonvmwENNUN65jOVTwhhBPQjEtNZutYT9YKyzydFGLyVM1nzhpLWahQSMamRc/RDBv5EapzA==} hasBin: true - type-detect@4.0.8: - resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} - engines: {node: '>=4'} - - type-fest@0.13.1: - resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==} - engines: {node: '>=10'} - - type-fest@0.6.0: - resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} - engines: {node: '>=8'} - - type-fest@0.8.1: - resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} - engines: {node: '>=8'} - - typed-array-buffer@1.0.2: - resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==} - engines: {node: '>= 0.4'} - - typed-array-byte-length@1.0.1: - resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==} - engines: {node: '>= 0.4'} - - typed-array-byte-offset@1.0.2: - resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==} - engines: {node: '>= 0.4'} - - typed-array-length@1.0.6: - resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==} - engines: {node: '>= 0.4'} - - typescript@5.4.5: - resolution: {integrity: sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==} + typescript@5.5.3: + resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} engines: {node: '>=14.17'} hasBin: true - ufo@1.3.0: - resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==} - - unbox-primitive@1.0.2: - resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} - undefsafe@2.0.5: resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} @@ -2359,11 +1838,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - validate-npm-package-license@3.0.4: - resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} - - vite-node@1.6.0: - resolution: {integrity: sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==} + vite-node@2.0.2: + resolution: {integrity: sha512-w4vkSz1Wo+NIQg8pjlEn0jQbcM/0D+xVaYjhw3cvarTanLLBh54oNiRbsT8PNK5GfuST0IlVXjsNRoNlqvY/fw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -2395,15 +1871,15 @@ packages: terser: optional: true - vitest@1.6.0: - resolution: {integrity: sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==} + vitest@2.0.2: + resolution: {integrity: sha512-WlpZ9neRIjNBIOQwBYfBSr0+of5ZCbxT2TVGKW4Lv0c8+srCFIiRdsP7U009t8mMn821HQ4XKgkx5dVWpyoyLw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 1.6.0 - '@vitest/ui': 1.6.0 + '@vitest/browser': 2.0.2 + '@vitest/ui': 2.0.2 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2420,9 +1896,6 @@ packages: jsdom: optional: true - wcwidth@1.0.1: - resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==} - webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -2432,20 +1905,10 @@ packages: when-exit@2.1.1: resolution: {integrity: sha512-XLipGldz/UcleuGaoQjbYuWwD+ICRnzIjlldtwTaTWr7aZz8yQW49rXk6MHQnh+KxOiWiJpM1vIyaxprOnlW4g==} - which-boxed-primitive@1.0.2: - resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} - - which-module@2.0.1: - resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==} - which-pm@2.0.0: resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==} engines: {node: '>=8.15'} - which-typed-array@1.1.15: - resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==} - engines: {node: '>= 0.4'} - which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} hasBin: true @@ -2460,10 +1923,6 @@ packages: engines: {node: '>=8'} hasBin: true - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - wrap-ansi@7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} @@ -2472,13 +1931,6 @@ packages: resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} engines: {node: '>=12'} - y18n@4.0.3: - resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} - - y18n@5.0.8: - resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} - engines: {node: '>=10'} - yallist@2.1.2: resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} @@ -2493,48 +1945,25 @@ packages: resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} engines: {node: '>= 14'} - yargs-parser@18.1.3: - resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} - engines: {node: '>=6'} - - yargs-parser@21.1.1: - resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} - engines: {node: '>=12'} - - yargs@15.4.1: - resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==} - engines: {node: '>=8'} - - yargs@17.7.2: - resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} - engines: {node: '>=12'} - yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - yocto-queue@1.0.0: - resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} - engines: {node: '>=12.20'} + yoctocolors@2.1.1: + resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==} + engines: {node: '>=18'} snapshots: - '@babel/code-frame@7.24.2': + '@ampproject/remapping@2.3.0': dependencies: - '@babel/highlight': 7.24.2 - picocolors: 1.0.1 + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 '@babel/helper-string-parser@7.24.1': {} '@babel/helper-validator-identifier@7.24.5': {} - '@babel/highlight@7.24.2': - dependencies: - '@babel/helper-validator-identifier': 7.24.5 - chalk: 2.4.2 - js-tokens: 4.0.0 - picocolors: 1.0.1 - '@babel/parser@7.24.5': dependencies: '@babel/types': 7.24.5 @@ -2549,16 +1978,17 @@ snapshots: '@babel/helper-validator-identifier': 7.24.5 to-fast-properties: 2.0.0 - '@begit/core@0.0.16': + '@begit/core@0.0.18': dependencies: - tar: 7.1.0 + tar: 7.4.0 - '@changesets/apply-release-plan@7.0.1': + '@changesets/apply-release-plan@7.0.4': dependencies: '@babel/runtime': 7.24.4 - '@changesets/config': 3.0.0 + '@changesets/config': 3.0.2 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.0 + '@changesets/should-skip-package': 0.1.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 detect-indent: 6.1.0 @@ -2569,11 +1999,12 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.0 - '@changesets/assemble-release-plan@6.0.0': + '@changesets/assemble-release-plan@6.0.3': dependencies: '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 + '@changesets/get-dependents-graph': 2.1.1 + '@changesets/should-skip-package': 0.1.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 semver: 7.6.0 @@ -2582,20 +2013,21 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.3': + '@changesets/cli@2.27.7': dependencies: '@babel/runtime': 7.24.4 - '@changesets/apply-release-plan': 7.0.1 - '@changesets/assemble-release-plan': 6.0.0 + '@changesets/apply-release-plan': 7.0.4 + '@changesets/assemble-release-plan': 6.0.3 '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.0 + '@changesets/config': 3.0.2 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 - '@changesets/get-release-plan': 4.0.0 + '@changesets/get-dependents-graph': 2.1.1 + '@changesets/get-release-plan': 4.0.3 '@changesets/git': 3.0.0 '@changesets/logger': 0.1.0 '@changesets/pre': 2.0.0 '@changesets/read': 0.6.0 + '@changesets/should-skip-package': 0.1.0 '@changesets/types': 6.0.0 '@changesets/write': 0.3.1 '@manypkg/get-packages': 1.1.3 @@ -2607,7 +2039,7 @@ snapshots: external-editor: 3.1.0 fs-extra: 7.0.1 human-id: 1.0.2 - meow: 6.1.1 + mri: 1.2.0 outdent: 0.5.0 p-limit: 2.3.0 preferred-pm: 3.1.3 @@ -2615,12 +2047,11 @@ snapshots: semver: 7.6.0 spawndamnit: 2.0.0 term-size: 2.2.1 - tty-table: 4.2.3 - '@changesets/config@3.0.0': + '@changesets/config@3.0.2': dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.0.0 + '@changesets/get-dependents-graph': 2.1.1 '@changesets/logger': 0.1.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -2631,7 +2062,7 @@ snapshots: dependencies: extendable-error: 0.1.7 - '@changesets/get-dependents-graph@2.0.0': + '@changesets/get-dependents-graph@2.1.1': dependencies: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -2639,11 +2070,11 @@ snapshots: fs-extra: 7.0.1 semver: 7.6.0 - '@changesets/get-release-plan@4.0.0': + '@changesets/get-release-plan@4.0.3': dependencies: '@babel/runtime': 7.24.4 - '@changesets/assemble-release-plan': 6.0.0 - '@changesets/config': 3.0.0 + '@changesets/assemble-release-plan': 6.0.3 + '@changesets/config': 3.0.2 '@changesets/pre': 2.0.0 '@changesets/read': 0.6.0 '@changesets/types': 6.0.0 @@ -2689,6 +2120,12 @@ snapshots: fs-extra: 7.0.1 p-filter: 2.1.0 + '@changesets/should-skip-package@0.1.0': + dependencies: + '@babel/runtime': 7.24.4 + '@changesets/types': 6.0.0 + '@manypkg/get-packages': 1.1.3 + '@changesets/types@4.1.0': {} '@changesets/types@6.0.0': {} @@ -2737,138 +2174,141 @@ snapshots: '@esbuild/aix-ppc64@0.20.2': optional: true - '@esbuild/android-arm64@0.19.9': + '@esbuild/aix-ppc64@0.21.5': optional: true '@esbuild/android-arm64@0.20.2': optional: true - '@esbuild/android-arm@0.19.9': + '@esbuild/android-arm64@0.21.5': optional: true '@esbuild/android-arm@0.20.2': optional: true - '@esbuild/android-x64@0.19.9': + '@esbuild/android-arm@0.21.5': optional: true '@esbuild/android-x64@0.20.2': optional: true - '@esbuild/darwin-arm64@0.19.9': + '@esbuild/android-x64@0.21.5': optional: true '@esbuild/darwin-arm64@0.20.2': optional: true - '@esbuild/darwin-x64@0.19.9': + '@esbuild/darwin-arm64@0.21.5': optional: true '@esbuild/darwin-x64@0.20.2': optional: true - '@esbuild/freebsd-arm64@0.19.9': + '@esbuild/darwin-x64@0.21.5': optional: true '@esbuild/freebsd-arm64@0.20.2': optional: true - '@esbuild/freebsd-x64@0.19.9': + '@esbuild/freebsd-arm64@0.21.5': optional: true '@esbuild/freebsd-x64@0.20.2': optional: true - '@esbuild/linux-arm64@0.19.9': + '@esbuild/freebsd-x64@0.21.5': optional: true '@esbuild/linux-arm64@0.20.2': optional: true - '@esbuild/linux-arm@0.19.9': + '@esbuild/linux-arm64@0.21.5': optional: true '@esbuild/linux-arm@0.20.2': optional: true - '@esbuild/linux-ia32@0.19.9': + '@esbuild/linux-arm@0.21.5': optional: true '@esbuild/linux-ia32@0.20.2': optional: true - '@esbuild/linux-loong64@0.19.9': + '@esbuild/linux-ia32@0.21.5': optional: true '@esbuild/linux-loong64@0.20.2': optional: true - '@esbuild/linux-mips64el@0.19.9': + '@esbuild/linux-loong64@0.21.5': optional: true '@esbuild/linux-mips64el@0.20.2': optional: true - '@esbuild/linux-ppc64@0.19.9': + '@esbuild/linux-mips64el@0.21.5': optional: true '@esbuild/linux-ppc64@0.20.2': optional: true - '@esbuild/linux-riscv64@0.19.9': + '@esbuild/linux-ppc64@0.21.5': optional: true '@esbuild/linux-riscv64@0.20.2': optional: true - '@esbuild/linux-s390x@0.19.9': + '@esbuild/linux-riscv64@0.21.5': optional: true '@esbuild/linux-s390x@0.20.2': optional: true - '@esbuild/linux-x64@0.19.9': + '@esbuild/linux-s390x@0.21.5': optional: true '@esbuild/linux-x64@0.20.2': optional: true - '@esbuild/netbsd-x64@0.19.9': + '@esbuild/linux-x64@0.21.5': optional: true '@esbuild/netbsd-x64@0.20.2': optional: true - '@esbuild/openbsd-x64@0.19.9': + '@esbuild/netbsd-x64@0.21.5': optional: true '@esbuild/openbsd-x64@0.20.2': optional: true - '@esbuild/sunos-x64@0.19.9': + '@esbuild/openbsd-x64@0.21.5': optional: true '@esbuild/sunos-x64@0.20.2': optional: true - '@esbuild/win32-arm64@0.19.9': + '@esbuild/sunos-x64@0.21.5': optional: true '@esbuild/win32-arm64@0.20.2': optional: true - '@esbuild/win32-ia32@0.19.9': + '@esbuild/win32-arm64@0.21.5': optional: true '@esbuild/win32-ia32@0.20.2': optional: true - '@esbuild/win32-x64@0.19.9': + '@esbuild/win32-ia32@0.21.5': optional: true '@esbuild/win32-x64@0.20.2': optional: true + '@esbuild/win32-x64@0.21.5': + optional: true + '@isaacs/cliui@8.0.2': dependencies: string-width: 5.1.2 @@ -2880,11 +2320,7 @@ snapshots: '@isaacs/fs-minipass@4.0.0': dependencies: - minipass: 7.1.1 - - '@jest/schemas@29.6.3': - dependencies: - '@sinclair/typebox': 0.27.8 + minipass: 7.1.2 '@jridgewell/gen-mapping@0.3.3': dependencies: @@ -2892,10 +2328,18 @@ snapshots: '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.19 + '@jridgewell/gen-mapping@0.3.5': + dependencies: + '@jridgewell/set-array': 1.2.1 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.25 + '@jridgewell/resolve-uri@3.1.1': {} '@jridgewell/set-array@1.1.2': {} + '@jridgewell/set-array@1.2.1': {} + '@jridgewell/sourcemap-codec@1.4.15': {} '@jridgewell/trace-mapping@0.3.19': @@ -2903,6 +2347,11 @@ snapshots: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping@0.3.25': + dependencies: + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 + '@manypkg/find-root@1.1.0': dependencies: '@babel/runtime': 7.24.4 @@ -2941,91 +2390,54 @@ snapshots: '@rollup/rollup-android-arm-eabi@4.16.1': optional: true - '@rollup/rollup-android-arm-eabi@4.9.1': - optional: true - '@rollup/rollup-android-arm64@4.16.1': optional: true - '@rollup/rollup-android-arm64@4.9.1': - optional: true - '@rollup/rollup-darwin-arm64@4.16.1': optional: true - '@rollup/rollup-darwin-arm64@4.9.1': - optional: true - '@rollup/rollup-darwin-x64@4.16.1': optional: true - '@rollup/rollup-darwin-x64@4.9.1': - optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.16.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.9.1': - optional: true - '@rollup/rollup-linux-arm-musleabihf@4.16.1': optional: true '@rollup/rollup-linux-arm64-gnu@4.16.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.9.1': - optional: true - '@rollup/rollup-linux-arm64-musl@4.16.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.9.1': - optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': optional: true '@rollup/rollup-linux-riscv64-gnu@4.16.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.9.1': - optional: true - '@rollup/rollup-linux-s390x-gnu@4.16.1': optional: true '@rollup/rollup-linux-x64-gnu@4.16.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.9.1': - optional: true - '@rollup/rollup-linux-x64-musl@4.16.1': optional: true - '@rollup/rollup-linux-x64-musl@4.9.1': - optional: true - '@rollup/rollup-win32-arm64-msvc@4.16.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.9.1': - optional: true - '@rollup/rollup-win32-ia32-msvc@4.16.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.9.1': - optional: true - '@rollup/rollup-win32-x64-msvc@4.16.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.9.1': - optional: true + '@sec-ant/readable-stream@0.4.1': {} - '@sinclair/typebox@0.27.8': {} + '@sindresorhus/merge-streams@4.0.0': {} '@swc/core-darwin-arm64@1.5.5': optional: true @@ -3084,53 +2496,49 @@ snapshots: '@types/estree@1.0.5': {} - '@types/minimist@1.2.5': {} - '@types/node@12.20.55': {} - '@types/node@20.12.12': + '@types/node@20.14.10': dependencies: undici-types: 5.26.5 - '@types/normalize-package-data@2.4.4': {} - '@types/semver@7.5.8': {} - '@vitest/expect@1.6.0': + '@vitest/expect@2.0.2': dependencies: - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - chai: 4.4.1 + '@vitest/spy': 2.0.2 + '@vitest/utils': 2.0.2 + chai: 5.1.1 + tinyrainbow: 1.2.0 - '@vitest/runner@1.6.0': + '@vitest/pretty-format@2.0.2': dependencies: - '@vitest/utils': 1.6.0 - p-limit: 5.0.0 + tinyrainbow: 1.2.0 + + '@vitest/runner@2.0.2': + dependencies: + '@vitest/utils': 2.0.2 pathe: 1.1.2 - '@vitest/snapshot@1.6.0': + '@vitest/snapshot@2.0.2': dependencies: + '@vitest/pretty-format': 2.0.2 magic-string: 0.30.10 pathe: 1.1.2 - pretty-format: 29.7.0 - '@vitest/spy@1.6.0': + '@vitest/spy@2.0.2': dependencies: - tinyspy: 2.2.0 + tinyspy: 3.0.0 - '@vitest/utils@1.6.0': + '@vitest/utils@2.0.2': dependencies: - diff-sequences: 29.6.3 + '@vitest/pretty-format': 2.0.2 estree-walker: 3.0.3 - loupe: 2.3.7 - pretty-format: 29.7.0 + loupe: 3.1.1 + tinyrainbow: 1.2.0 abbrev@1.1.1: {} - acorn-walk@8.3.2: {} - - acorn@8.10.0: {} - ansi-colors@4.1.3: {} ansi-regex@5.0.1: {} @@ -3145,8 +2553,6 @@ snapshots: dependencies: color-convert: 2.0.1 - ansi-styles@5.2.0: {} - ansi-styles@6.2.1: {} any-promise@1.3.0: {} @@ -3160,38 +2566,9 @@ snapshots: dependencies: sprintf-js: 1.0.3 - array-buffer-byte-length@1.0.1: - dependencies: - call-bind: 1.0.7 - is-array-buffer: 3.0.4 - array-union@2.1.0: {} - array.prototype.flat@1.3.2: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-shim-unscopables: 1.0.2 - - arraybuffer.prototype.slice@1.0.3: - dependencies: - array-buffer-byte-length: 1.0.1 - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - is-array-buffer: 3.0.4 - is-shared-array-buffer: 1.0.3 - - arrify@1.0.1: {} - - assertion-error@1.1.0: {} - - available-typed-arrays@1.0.7: - dependencies: - possible-typed-array-names: 1.0.0 + assertion-error@2.0.1: {} balanced-match@1.0.2: {} @@ -3214,42 +2591,20 @@ snapshots: dependencies: fill-range: 7.0.1 - breakword@1.0.6: - dependencies: - wcwidth: 1.0.1 - - bundle-require@4.0.1(esbuild@0.19.9): + bundle-require@4.0.1(esbuild@0.21.5): dependencies: - esbuild: 0.19.9 + esbuild: 0.21.5 load-tsconfig: 0.2.5 cac@6.7.14: {} - call-bind@1.0.7: - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - set-function-length: 1.2.2 - - camelcase-keys@6.2.2: - dependencies: - camelcase: 5.3.1 - map-obj: 4.3.0 - quick-lru: 4.0.1 - - camelcase@5.3.1: {} - - chai@4.4.1: + chai@5.1.1: dependencies: - assertion-error: 1.1.0 - check-error: 1.0.3 - deep-eql: 4.1.3 - get-func-name: 2.0.2 - loupe: 2.3.7 - pathval: 1.1.1 - type-detect: 4.0.8 + assertion-error: 2.0.1 + check-error: 2.1.1 + deep-eql: 5.0.2 + loupe: 3.1.1 + pathval: 2.0.0 chalk@2.4.2: dependencies: @@ -3264,21 +2619,7 @@ snapshots: chardet@0.7.0: {} - check-error@1.0.3: - dependencies: - get-func-name: 2.0.2 - - chokidar@3.5.3: - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 + check-error@2.1.1: {} chokidar@3.6.0: dependencies: @@ -3296,20 +2637,6 @@ snapshots: ci-info@3.9.0: {} - cliui@6.0.0: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 6.2.0 - - cliui@8.0.1: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - - clone@1.0.4: {} - cmd-ts@0.13.0: dependencies: chalk: 4.1.2 @@ -3347,69 +2674,17 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - csv-generate@3.4.3: {} - - csv-parse@4.16.3: {} - - csv-stringify@5.6.5: {} - - csv@5.5.3: - dependencies: - csv-generate: 3.4.3 - csv-parse: 4.16.3 - csv-stringify: 5.6.5 - stream-transform: 2.1.3 - - data-view-buffer@1.0.1: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - - data-view-byte-length@1.0.1: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - - data-view-byte-offset@1.0.0: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-data-view: 1.0.1 - debug@4.3.4(supports-color@5.5.0): dependencies: ms: 2.1.2 optionalDependencies: supports-color: 5.5.0 - decamelize-keys@1.1.1: - dependencies: - decamelize: 1.2.0 - map-obj: 1.0.1 - - decamelize@1.2.0: {} - - deep-eql@4.1.3: + debug@4.3.5: dependencies: - type-detect: 4.0.8 - - defaults@1.0.4: - dependencies: - clone: 1.0.4 - - define-data-property@1.1.4: - dependencies: - es-define-property: 1.0.0 - es-errors: 1.3.0 - gopd: 1.0.1 + ms: 2.1.2 - define-properties@1.2.1: - dependencies: - define-data-property: 1.1.4 - has-property-descriptors: 1.0.2 - object-keys: 1.1.1 + deep-eql@5.0.2: {} detect-indent@6.1.0: {} @@ -3417,8 +2692,6 @@ snapshots: didyoumean@1.2.2: {} - diff-sequences@29.6.3: {} - dir-glob@3.0.1: dependencies: path-type: 4.0.0 @@ -3434,110 +2707,6 @@ snapshots: ansi-colors: 4.1.3 strip-ansi: 6.0.1 - error-ex@1.3.2: - dependencies: - is-arrayish: 0.2.1 - - es-abstract@1.23.3: - dependencies: - array-buffer-byte-length: 1.0.1 - arraybuffer.prototype.slice: 1.0.3 - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - data-view-buffer: 1.0.1 - data-view-byte-length: 1.0.1 - data-view-byte-offset: 1.0.0 - es-define-property: 1.0.0 - es-errors: 1.3.0 - es-object-atoms: 1.0.0 - es-set-tostringtag: 2.0.3 - es-to-primitive: 1.2.1 - function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 - get-symbol-description: 1.0.2 - globalthis: 1.0.3 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - internal-slot: 1.0.7 - is-array-buffer: 3.0.4 - is-callable: 1.2.7 - is-data-view: 1.0.1 - is-negative-zero: 2.0.3 - is-regex: 1.1.4 - is-shared-array-buffer: 1.0.3 - is-string: 1.0.7 - is-typed-array: 1.1.13 - is-weakref: 1.0.2 - object-inspect: 1.13.1 - object-keys: 1.1.1 - object.assign: 4.1.5 - regexp.prototype.flags: 1.5.2 - safe-array-concat: 1.1.2 - safe-regex-test: 1.0.3 - string.prototype.trim: 1.2.9 - string.prototype.trimend: 1.0.8 - string.prototype.trimstart: 1.0.8 - typed-array-buffer: 1.0.2 - typed-array-byte-length: 1.0.1 - typed-array-byte-offset: 1.0.2 - typed-array-length: 1.0.6 - unbox-primitive: 1.0.2 - which-typed-array: 1.1.15 - - es-define-property@1.0.0: - dependencies: - get-intrinsic: 1.2.4 - - es-errors@1.3.0: {} - - es-object-atoms@1.0.0: - dependencies: - es-errors: 1.3.0 - - es-set-tostringtag@2.0.3: - dependencies: - get-intrinsic: 1.2.4 - has-tostringtag: 1.0.2 - hasown: 2.0.2 - - es-shim-unscopables@1.0.2: - dependencies: - hasown: 2.0.2 - - es-to-primitive@1.2.1: - dependencies: - is-callable: 1.2.7 - is-date-object: 1.0.5 - is-symbol: 1.0.4 - - esbuild@0.19.9: - optionalDependencies: - '@esbuild/android-arm': 0.19.9 - '@esbuild/android-arm64': 0.19.9 - '@esbuild/android-x64': 0.19.9 - '@esbuild/darwin-arm64': 0.19.9 - '@esbuild/darwin-x64': 0.19.9 - '@esbuild/freebsd-arm64': 0.19.9 - '@esbuild/freebsd-x64': 0.19.9 - '@esbuild/linux-arm': 0.19.9 - '@esbuild/linux-arm64': 0.19.9 - '@esbuild/linux-ia32': 0.19.9 - '@esbuild/linux-loong64': 0.19.9 - '@esbuild/linux-mips64el': 0.19.9 - '@esbuild/linux-ppc64': 0.19.9 - '@esbuild/linux-riscv64': 0.19.9 - '@esbuild/linux-s390x': 0.19.9 - '@esbuild/linux-x64': 0.19.9 - '@esbuild/netbsd-x64': 0.19.9 - '@esbuild/openbsd-x64': 0.19.9 - '@esbuild/sunos-x64': 0.19.9 - '@esbuild/win32-arm64': 0.19.9 - '@esbuild/win32-ia32': 0.19.9 - '@esbuild/win32-x64': 0.19.9 - esbuild@0.20.2: optionalDependencies: '@esbuild/aix-ppc64': 0.20.2 @@ -3564,7 +2733,31 @@ snapshots: '@esbuild/win32-ia32': 0.20.2 '@esbuild/win32-x64': 0.20.2 - escalade@3.1.2: {} + esbuild@0.21.5: + optionalDependencies: + '@esbuild/aix-ppc64': 0.21.5 + '@esbuild/android-arm': 0.21.5 + '@esbuild/android-arm64': 0.21.5 + '@esbuild/android-x64': 0.21.5 + '@esbuild/darwin-arm64': 0.21.5 + '@esbuild/darwin-x64': 0.21.5 + '@esbuild/freebsd-arm64': 0.21.5 + '@esbuild/freebsd-x64': 0.21.5 + '@esbuild/linux-arm': 0.21.5 + '@esbuild/linux-arm64': 0.21.5 + '@esbuild/linux-ia32': 0.21.5 + '@esbuild/linux-loong64': 0.21.5 + '@esbuild/linux-mips64el': 0.21.5 + '@esbuild/linux-ppc64': 0.21.5 + '@esbuild/linux-riscv64': 0.21.5 + '@esbuild/linux-s390x': 0.21.5 + '@esbuild/linux-x64': 0.21.5 + '@esbuild/netbsd-x64': 0.21.5 + '@esbuild/openbsd-x64': 0.21.5 + '@esbuild/sunos-x64': 0.21.5 + '@esbuild/win32-arm64': 0.21.5 + '@esbuild/win32-ia32': 0.21.5 + '@esbuild/win32-x64': 0.21.5 escape-string-regexp@1.0.5: {} @@ -3598,6 +2791,21 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 + execa@9.3.0: + dependencies: + '@sindresorhus/merge-streams': 4.0.0 + cross-spawn: 7.0.3 + figures: 6.1.0 + get-stream: 9.0.1 + human-signals: 7.0.0 + is-plain-obj: 4.1.0 + is-stream: 4.0.1 + npm-run-path: 5.3.0 + pretty-ms: 9.0.0 + signal-exit: 4.1.0 + strip-final-newline: 4.0.0 + yoctocolors: 2.1.1 + extendable-error@0.1.7: {} external-editor@3.1.0: @@ -3618,6 +2826,10 @@ snapshots: dependencies: reusify: 1.0.4 + figures@6.1.0: + dependencies: + is-unicode-supported: 2.0.0 + fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 @@ -3637,10 +2849,6 @@ snapshots: micromatch: 4.0.5 pkg-dir: 4.2.0 - for-each@0.3.3: - dependencies: - is-callable: 1.2.7 - foreground-child@3.1.1: dependencies: cross-spawn: 7.0.3 @@ -3661,38 +2869,16 @@ snapshots: fsevents@2.3.3: optional: true - function-bind@1.1.2: {} - - function.prototype.name@1.1.6: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - functions-have-names: 1.2.3 - - functions-have-names@1.2.3: {} - - get-caller-file@2.0.5: {} - get-func-name@2.0.2: {} - get-intrinsic@1.2.4: - dependencies: - es-errors: 1.3.0 - function-bind: 1.1.2 - has-proto: 1.0.3 - has-symbols: 1.0.3 - hasown: 2.0.2 - get-stream@6.0.1: {} get-stream@8.0.1: {} - get-symbol-description@1.0.2: + get-stream@9.0.1: dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 + '@sec-ant/readable-stream': 0.4.1 + is-stream: 4.0.1 glob-parent@5.1.2: dependencies: @@ -3706,10 +2892,6 @@ snapshots: minipass: 5.0.0 path-scurry: 1.10.1 - globalthis@1.0.3: - dependencies: - define-properties: 1.2.1 - globby@11.1.0: dependencies: array-union: 2.1.0 @@ -3719,46 +2901,20 @@ snapshots: merge2: 1.4.1 slash: 3.0.0 - gopd@1.0.1: - dependencies: - get-intrinsic: 1.2.4 - graceful-fs@4.2.11: {} - grapheme-splitter@1.0.4: {} - - hard-rejection@2.1.0: {} - - has-bigints@1.0.2: {} - has-flag@3.0.0: {} has-flag@4.0.0: {} - has-property-descriptors@1.0.2: - dependencies: - es-define-property: 1.0.0 - - has-proto@1.0.3: {} - - has-symbols@1.0.3: {} - - has-tostringtag@1.0.2: - dependencies: - has-symbols: 1.0.3 - - hasown@2.0.2: - dependencies: - function-bind: 1.1.2 - - hosted-git-info@2.8.9: {} - human-id@1.0.2: {} human-signals@2.1.0: {} human-signals@5.0.0: {} + human-signals@7.0.0: {} + iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2 @@ -3767,50 +2923,12 @@ snapshots: ignore@5.2.4: {} - indent-string@4.0.0: {} - - internal-slot@1.0.7: - dependencies: - es-errors: 1.3.0 - hasown: 2.0.2 - side-channel: 1.0.6 - ionstore@1.0.0: {} - is-array-buffer@3.0.4: - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - - is-arrayish@0.2.1: {} - - is-bigint@1.0.4: - dependencies: - has-bigints: 1.0.2 - is-binary-path@2.1.0: dependencies: binary-extensions: 2.2.0 - is-boolean-object@1.1.2: - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - - is-callable@1.2.7: {} - - is-core-module@2.13.1: - dependencies: - hasown: 2.0.2 - - is-data-view@1.0.1: - dependencies: - is-typed-array: 1.1.13 - - is-date-object@1.0.5: - dependencies: - has-tostringtag: 1.0.2 - is-extglob@2.1.1: {} is-fullwidth-code-point@3.0.0: {} @@ -3819,53 +2937,24 @@ snapshots: dependencies: is-extglob: 2.1.1 - is-negative-zero@2.0.3: {} - - is-number-object@1.0.7: - dependencies: - has-tostringtag: 1.0.2 - is-number@7.0.0: {} - is-plain-obj@1.1.0: {} - - is-regex@1.1.4: - dependencies: - call-bind: 1.0.7 - has-tostringtag: 1.0.2 - - is-shared-array-buffer@1.0.3: - dependencies: - call-bind: 1.0.7 + is-plain-obj@4.1.0: {} is-stream@2.0.1: {} is-stream@3.0.0: {} - is-string@1.0.7: - dependencies: - has-tostringtag: 1.0.2 + is-stream@4.0.1: {} is-subdir@1.2.0: dependencies: better-path-resolve: 1.0.0 - is-symbol@1.0.4: - dependencies: - has-symbols: 1.0.3 - - is-typed-array@1.1.13: - dependencies: - which-typed-array: 1.1.15 - - is-weakref@1.0.2: - dependencies: - call-bind: 1.0.7 + is-unicode-supported@2.0.0: {} is-windows@1.0.2: {} - isarray@2.0.5: {} - isexe@2.0.0: {} jackspeak@2.3.6: @@ -3874,31 +2963,19 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@1.21.0: {} + jiti@1.21.6: {} joycon@3.1.1: {} - js-tokens@4.0.0: {} - - js-tokens@9.0.0: {} - js-yaml@3.14.1: dependencies: argparse: 1.0.10 esprima: 4.0.1 - json-parse-even-better-errors@2.3.1: {} - - jsonc-parser@3.2.0: {} - jsonfile@4.0.0: optionalDependencies: graceful-fs: 4.2.11 - kind-of@6.0.3: {} - - kleur@4.1.5: {} - lilconfig@2.1.0: {} lines-and-columns@1.2.4: {} @@ -3912,11 +2989,6 @@ snapshots: pify: 4.0.1 strip-bom: 3.0.0 - local-pkg@0.5.0: - dependencies: - mlly: 1.4.2 - pkg-types: 1.0.3 - locate-path@5.0.0: dependencies: p-locate: 4.1.0 @@ -3929,7 +3001,7 @@ snapshots: lodash.startcase@4.4.0: {} - loupe@2.3.7: + loupe@3.1.1: dependencies: get-func-name: 2.0.2 @@ -3954,24 +3026,6 @@ snapshots: '@babel/types': 7.24.5 source-map-js: 1.2.0 - map-obj@1.0.1: {} - - map-obj@4.3.0: {} - - meow@6.1.1: - dependencies: - '@types/minimist': 1.2.5 - camelcase-keys: 6.2.2 - decamelize-keys: 1.1.1 - hard-rejection: 2.1.0 - minimist-options: 4.1.0 - normalize-package-data: 2.5.0 - read-pkg-up: 7.0.1 - redent: 3.0.0 - trim-newlines: 3.0.1 - type-fest: 0.13.1 - yargs-parser: 18.1.3 - merge-stream@2.0.0: {} merge2@1.4.1: {} @@ -3991,8 +3045,6 @@ snapshots: mimic-fn@4.0.0: {} - min-indent@1.0.1: {} - minimatch@3.1.2: dependencies: brace-expansion: 1.1.11 @@ -4001,31 +3053,18 @@ snapshots: dependencies: brace-expansion: 2.0.1 - minimist-options@4.1.0: - dependencies: - arrify: 1.0.1 - is-plain-obj: 1.1.0 - kind-of: 6.0.3 - minipass@5.0.0: {} - minipass@7.1.1: {} + minipass@7.1.2: {} minizlib@3.0.1: dependencies: - minipass: 7.1.1 + minipass: 7.1.2 rimraf: 5.0.5 - mixme@0.5.10: {} - mkdirp@3.0.1: {} - mlly@1.4.2: - dependencies: - acorn: 8.10.0 - pathe: 1.1.2 - pkg-types: 1.0.3 - ufo: 1.3.0 + mri@1.2.0: {} ms@2.1.2: {} @@ -4037,7 +3076,7 @@ snapshots: nanoid@3.3.7: {} - nodemon@3.1.0: + nodemon@3.1.4: dependencies: chokidar: 3.6.0 debug: 4.3.4(supports-color@5.5.0) @@ -4054,13 +3093,6 @@ snapshots: dependencies: abbrev: 1.1.1 - normalize-package-data@2.5.0: - dependencies: - hosted-git-info: 2.8.9 - resolve: 1.22.8 - semver: 5.7.2 - validate-npm-package-license: 3.0.4 - normalize-path@3.0.0: {} npm-run-path@4.0.1: @@ -4073,17 +3105,6 @@ snapshots: object-assign@4.1.1: {} - object-inspect@1.13.1: {} - - object-keys@1.1.1: {} - - object.assign@4.1.5: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - has-symbols: 1.0.3 - object-keys: 1.1.1 - onetime@5.1.2: dependencies: mimic-fn: 2.1.0 @@ -4108,10 +3129,6 @@ snapshots: dependencies: yocto-queue: 0.1.0 - p-limit@5.0.0: - dependencies: - yocto-queue: 1.0.0 - p-locate@4.1.0: dependencies: p-limit: 2.3.0 @@ -4124,12 +3141,7 @@ snapshots: p-try@2.2.0: {} - parse-json@5.2.0: - dependencies: - '@babel/code-frame': 7.24.2 - error-ex: 1.3.2 - json-parse-even-better-errors: 2.3.1 - lines-and-columns: 1.2.4 + parse-ms@4.0.0: {} path-exists@4.0.0: {} @@ -4137,8 +3149,6 @@ snapshots: path-key@4.0.0: {} - path-parse@1.0.7: {} - path-scurry@1.10.1: dependencies: lru-cache: 10.1.0 @@ -4148,9 +3158,7 @@ snapshots: pathe@1.1.2: {} - pathval@1.1.1: {} - - picocolors@1.0.0: {} + pathval@2.0.0: {} picocolors@1.0.1: {} @@ -4164,14 +3172,6 @@ snapshots: dependencies: find-up: 4.1.0 - pkg-types@1.0.3: - dependencies: - jsonc-parser: 3.2.0 - mlly: 1.4.2 - pathe: 1.1.2 - - possible-typed-array-names@1.0.0: {} - postcss-load-config@4.0.1(postcss@8.4.38): dependencies: lilconfig: 2.1.0 @@ -4194,13 +3194,11 @@ snapshots: prettier@2.8.8: {} - prettier@3.2.5: {} + prettier@3.3.3: {} - pretty-format@29.7.0: + pretty-ms@9.0.0: dependencies: - '@jest/schemas': 29.6.3 - ansi-styles: 5.2.0 - react-is: 18.2.0 + parse-ms: 4.0.0 pseudomap@1.0.2: {} @@ -4210,23 +3208,6 @@ snapshots: queue-microtask@1.2.3: {} - quick-lru@4.0.1: {} - - react-is@18.2.0: {} - - read-pkg-up@7.0.1: - dependencies: - find-up: 4.1.0 - read-pkg: 5.2.0 - type-fest: 0.8.1 - - read-pkg@5.2.0: - dependencies: - '@types/normalize-package-data': 2.4.4 - normalize-package-data: 2.5.0 - parse-json: 5.2.0 - type-fest: 0.6.0 - read-yaml-file@1.1.0: dependencies: graceful-fs: 4.2.11 @@ -4238,32 +3219,10 @@ snapshots: dependencies: picomatch: 2.3.1 - redent@3.0.0: - dependencies: - indent-string: 4.0.0 - strip-indent: 3.0.0 - regenerator-runtime@0.14.1: {} - regexp.prototype.flags@1.5.2: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-errors: 1.3.0 - set-function-name: 2.0.2 - - require-directory@2.1.1: {} - - require-main-filename@2.0.0: {} - resolve-from@5.0.0: {} - resolve@1.22.8: - dependencies: - is-core-module: 2.13.1 - path-parse: 1.0.7 - supports-preserve-symlinks-flag: 1.0.0 - reusify@1.0.4: {} rimraf@5.0.5: @@ -4292,66 +3251,16 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.16.1 fsevents: 2.3.3 - rollup@4.9.1: - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.9.1 - '@rollup/rollup-android-arm64': 4.9.1 - '@rollup/rollup-darwin-arm64': 4.9.1 - '@rollup/rollup-darwin-x64': 4.9.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.9.1 - '@rollup/rollup-linux-arm64-gnu': 4.9.1 - '@rollup/rollup-linux-arm64-musl': 4.9.1 - '@rollup/rollup-linux-riscv64-gnu': 4.9.1 - '@rollup/rollup-linux-x64-gnu': 4.9.1 - '@rollup/rollup-linux-x64-musl': 4.9.1 - '@rollup/rollup-win32-arm64-msvc': 4.9.1 - '@rollup/rollup-win32-ia32-msvc': 4.9.1 - '@rollup/rollup-win32-x64-msvc': 4.9.1 - fsevents: 2.3.3 - run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 - safe-array-concat@1.1.2: - dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 - has-symbols: 1.0.3 - isarray: 2.0.5 - - safe-regex-test@1.0.3: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-regex: 1.1.4 - safer-buffer@2.1.2: {} - semver@5.7.2: {} - semver@7.6.0: dependencies: lru-cache: 6.0.0 - set-blocking@2.0.0: {} - - set-function-length@1.2.2: - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - function-bind: 1.1.2 - get-intrinsic: 1.2.4 - gopd: 1.0.1 - has-property-descriptors: 1.0.2 - - set-function-name@2.0.2: - dependencies: - define-data-property: 1.1.4 - es-errors: 1.3.0 - functions-have-names: 1.2.3 - has-property-descriptors: 1.0.2 - shebang-command@1.2.0: dependencies: shebang-regex: 1.0.0 @@ -4364,13 +3273,6 @@ snapshots: shebang-regex@3.0.0: {} - side-channel@1.0.6: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - get-intrinsic: 1.2.4 - object-inspect: 1.13.1 - siginfo@2.0.0: {} signal-exit@3.0.7: {} @@ -4385,16 +3287,7 @@ snapshots: slash@3.0.0: {} - smartwrap@2.0.2: - dependencies: - array.prototype.flat: 1.3.2 - breakword: 1.0.6 - grapheme-splitter: 1.0.4 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - yargs: 15.4.1 - - smol-toml@1.2.0: {} + smol-toml@1.2.2: {} source-map-js@1.2.0: {} @@ -4407,30 +3300,12 @@ snapshots: cross-spawn: 5.1.0 signal-exit: 3.0.7 - spdx-correct@3.2.0: - dependencies: - spdx-expression-parse: 3.0.1 - spdx-license-ids: 3.0.17 - - spdx-exceptions@2.5.0: {} - - spdx-expression-parse@3.0.1: - dependencies: - spdx-exceptions: 2.5.0 - spdx-license-ids: 3.0.17 - - spdx-license-ids@3.0.17: {} - sprintf-js@1.0.3: {} stackback@0.0.2: {} std-env@3.7.0: {} - stream-transform@2.1.3: - dependencies: - mixme: 0.5.10 - string-width@4.2.3: dependencies: emoji-regex: 8.0.0 @@ -4443,25 +3318,6 @@ snapshots: emoji-regex: 9.2.2 strip-ansi: 7.1.0 - string.prototype.trim@1.2.9: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-abstract: 1.23.3 - es-object-atoms: 1.0.0 - - string.prototype.trimend@1.0.8: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - - string.prototype.trimstart@1.0.8: - dependencies: - call-bind: 1.0.7 - define-properties: 1.2.1 - es-object-atoms: 1.0.0 - strip-ansi@6.0.1: dependencies: ansi-regex: 5.0.1 @@ -4476,13 +3332,7 @@ snapshots: strip-final-newline@3.0.0: {} - strip-indent@3.0.0: - dependencies: - min-indent: 1.0.1 - - strip-literal@2.1.0: - dependencies: - js-tokens: 9.0.0 + strip-final-newline@4.0.0: {} sucrase@3.35.0: dependencies: @@ -4502,13 +3352,11 @@ snapshots: dependencies: has-flag: 4.0.0 - supports-preserve-symlinks-flag@1.0.0: {} - - tar@7.1.0: + tar@7.4.0: dependencies: '@isaacs/fs-minipass': 4.0.0 chownr: 3.0.0 - minipass: 7.1.1 + minipass: 7.1.2 minizlib: 3.0.1 mkdirp: 3.0.1 yallist: 5.0.0 @@ -4533,9 +3381,11 @@ snapshots: tinybench@2.8.0: {} - tinypool@0.8.4: {} + tinypool@1.0.0: {} + + tinyrainbow@1.2.0: {} - tinyspy@2.2.0: {} + tinyspy@3.0.0: {} tmp@0.0.33: dependencies: @@ -4557,44 +3407,32 @@ snapshots: tree-kill@1.2.2: {} - trim-newlines@3.0.1: {} - ts-interface-checker@0.1.13: {} - tsup@8.0.2(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.4.5): + tsup@8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3): dependencies: - bundle-require: 4.0.1(esbuild@0.19.9) + bundle-require: 4.0.1(esbuild@0.21.5) cac: 6.7.14 - chokidar: 3.5.3 + chokidar: 3.6.0 debug: 4.3.4(supports-color@5.5.0) - esbuild: 0.19.9 + esbuild: 0.21.5 execa: 5.1.1 globby: 11.1.0 joycon: 3.1.1 postcss-load-config: 4.0.1(postcss@8.4.38) resolve-from: 5.0.0 - rollup: 4.9.1 + rollup: 4.16.1 source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.4.5 + typescript: 5.5.3 transitivePeerDependencies: - supports-color - ts-node - tty-table@4.2.3: - dependencies: - chalk: 4.1.2 - csv: 5.5.3 - kleur: 4.1.5 - smartwrap: 2.0.2 - strip-ansi: 6.0.1 - wcwidth: 1.0.1 - yargs: 17.7.2 - turbo-darwin-64@2.0.6: optional: true @@ -4622,56 +3460,7 @@ snapshots: turbo-windows-64: 2.0.6 turbo-windows-arm64: 2.0.6 - type-detect@4.0.8: {} - - type-fest@0.13.1: {} - - type-fest@0.6.0: {} - - type-fest@0.8.1: {} - - typed-array-buffer@1.0.2: - dependencies: - call-bind: 1.0.7 - es-errors: 1.3.0 - is-typed-array: 1.1.13 - - typed-array-byte-length@1.0.1: - dependencies: - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-proto: 1.0.3 - is-typed-array: 1.1.13 - - typed-array-byte-offset@1.0.2: - dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-proto: 1.0.3 - is-typed-array: 1.1.13 - - typed-array-length@1.0.6: - dependencies: - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-proto: 1.0.3 - is-typed-array: 1.1.13 - possible-typed-array-names: 1.0.0 - - typescript@5.4.5: {} - - ufo@1.3.0: {} - - unbox-primitive@1.0.2: - dependencies: - call-bind: 1.0.7 - has-bigints: 1.0.2 - has-symbols: 1.0.3 - which-boxed-primitive: 1.0.2 + typescript@5.5.3: {} undefsafe@2.0.5: {} @@ -4679,18 +3468,13 @@ snapshots: universalify@0.1.2: {} - validate-npm-package-license@3.0.4: - dependencies: - spdx-correct: 3.2.0 - spdx-expression-parse: 3.0.1 - - vite-node@1.6.0(@types/node@20.12.12): + vite-node@2.0.2(@types/node@20.14.10): dependencies: cac: 6.7.14 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.5 pathe: 1.1.2 - picocolors: 1.0.1 - vite: 5.2.10(@types/node@20.12.12) + tinyrainbow: 1.2.0 + vite: 5.2.10(@types/node@20.14.10) transitivePeerDependencies: - '@types/node' - less @@ -4701,39 +3485,38 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@20.12.12): + vite@5.2.10(@types/node@20.14.10): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.16.1 optionalDependencies: - '@types/node': 20.12.12 + '@types/node': 20.14.10 fsevents: 2.3.3 - vitest@1.6.0(@types/node@20.12.12): - dependencies: - '@vitest/expect': 1.6.0 - '@vitest/runner': 1.6.0 - '@vitest/snapshot': 1.6.0 - '@vitest/spy': 1.6.0 - '@vitest/utils': 1.6.0 - acorn-walk: 8.3.2 - chai: 4.4.1 - debug: 4.3.4(supports-color@5.5.0) + vitest@2.0.2(@types/node@20.14.10): + dependencies: + '@ampproject/remapping': 2.3.0 + '@vitest/expect': 2.0.2 + '@vitest/pretty-format': 2.0.2 + '@vitest/runner': 2.0.2 + '@vitest/snapshot': 2.0.2 + '@vitest/spy': 2.0.2 + '@vitest/utils': 2.0.2 + chai: 5.1.1 + debug: 4.3.5 execa: 8.0.1 - local-pkg: 0.5.0 magic-string: 0.30.10 pathe: 1.1.2 - picocolors: 1.0.0 std-env: 3.7.0 - strip-literal: 2.1.0 tinybench: 2.8.0 - tinypool: 0.8.4 - vite: 5.2.10(@types/node@20.12.12) - vite-node: 1.6.0(@types/node@20.12.12) + tinypool: 1.0.0 + tinyrainbow: 1.2.0 + vite: 5.2.10(@types/node@20.14.10) + vite-node: 2.0.2(@types/node@20.14.10) why-is-node-running: 2.2.2 optionalDependencies: - '@types/node': 20.12.12 + '@types/node': 20.14.10 transitivePeerDependencies: - less - lightningcss @@ -4743,10 +3526,6 @@ snapshots: - supports-color - terser - wcwidth@1.0.1: - dependencies: - defaults: 1.0.4 - webidl-conversions@4.0.2: {} whatwg-url@7.1.0: @@ -4757,29 +3536,11 @@ snapshots: when-exit@2.1.1: {} - which-boxed-primitive@1.0.2: - dependencies: - is-bigint: 1.0.4 - is-boolean-object: 1.1.2 - is-number-object: 1.0.7 - is-string: 1.0.7 - is-symbol: 1.0.4 - - which-module@2.0.1: {} - which-pm@2.0.0: dependencies: load-yaml-file: 0.2.0 path-exists: 4.0.0 - which-typed-array@1.1.15: - dependencies: - available-typed-arrays: 1.0.7 - call-bind: 1.0.7 - for-each: 0.3.3 - gopd: 1.0.1 - has-tostringtag: 1.0.2 - which@1.3.1: dependencies: isexe: 2.0.0 @@ -4793,12 +3554,6 @@ snapshots: siginfo: 2.0.0 stackback: 0.0.2 - wrap-ansi@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi@7.0.0: dependencies: ansi-styles: 4.3.0 @@ -4811,10 +3566,6 @@ snapshots: string-width: 5.1.2 strip-ansi: 7.1.0 - y18n@4.0.3: {} - - y18n@5.0.8: {} - yallist@2.1.2: {} yallist@4.0.0: {} @@ -4823,37 +3574,6 @@ snapshots: yaml@2.3.2: {} - yargs-parser@18.1.3: - dependencies: - camelcase: 5.3.1 - decamelize: 1.2.0 - - yargs-parser@21.1.1: {} - - yargs@15.4.1: - dependencies: - cliui: 6.0.0 - decamelize: 1.2.0 - find-up: 4.1.0 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - require-main-filename: 2.0.0 - set-blocking: 2.0.0 - string-width: 4.2.3 - which-module: 2.0.1 - y18n: 4.0.3 - yargs-parser: 18.1.3 - - yargs@17.7.2: - dependencies: - cliui: 8.0.1 - escalade: 3.1.2 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 21.1.1 - yocto-queue@0.1.0: {} - yocto-queue@1.0.0: {} + yoctocolors@2.1.1: {} From fb979288c26ef947e2063d9ca7e1b201016b5edf Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 19 Jul 2024 10:54:28 +0100 Subject: [PATCH 119/290] Bump deps Relase `create-solid` --- package.json | 4 +- packages/commands/package.json | 6 +- packages/core/package.json | 6 +- packages/create-solid/package.json | 6 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 4 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 702 ++++++++++++++++++----------- 8 files changed, 456 insertions(+), 282 deletions(-) diff --git a/package.json b/package.json index e8194fc..3e8a2a2 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@changesets/cli": "2.27.7", "nodemon": "^3.1.4", "prettier": "^3.3.3", - "turbo": "^2.0.6", - "vitest": "^2.0.2" + "turbo": "^2.0.7", + "vitest": "^2.0.3" }, "packageManager": "pnpm@9.4.0" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 20fae66..2162daf 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,16 +33,16 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.14.10", + "@types/node": "^20.14.11", "prettier": "^3.3.3", - "tsup": "^8.1.0", + "tsup": "^8.2.0", "typescript": "^5.5.3" }, "publishConfig": { "access": "public" }, "dependencies": { - "@begit/core": "^0.0.18", + "@begit/core": "^0.0.19", "@clack/prompts": "0.7.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index 6e2299a..0d18c4f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -31,7 +31,7 @@ "cmd-ts": "^0.13.0", "execa": "^9.3.0", "picocolors": "^1.0.1", - "smol-toml": "^1.2.2", + "smol-toml": "^1.3.0", "tiny-updater": "^3.5.2" }, "scripts": { @@ -40,9 +40,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.14.10", + "@types/node": "^20.14.11", "jiti": "^1.21.6", - "tsup": "^8.1.0", + "tsup": "^8.2.0", "typescript": "^5.5.3" }, "publishConfig": { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 988c7a9..81628e5 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.11", + "version": "0.5.12", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ @@ -31,11 +31,11 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.14.10", + "@types/node": "^20.14.11", "cmd-ts": "^0.13.0", "jiti": "^1.21.6", "picocolors": "^1.0.1", - "tsup": "^8.1.0", + "tsup": "^8.2.0", "typescript": "^5.5.3" }, "publishConfig": { diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index d1601d6..974a9da 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,7 +28,7 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.1.0", + "tsup": "^8.2.0", "typescript": "^5.5.3" }, "publishConfig": { diff --git a/packages/ui/package.json b/packages/ui/package.json index d6144c1..2ba9783 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.1.0", + "tsup": "^8.2.0", "typescript": "^5.5.3", - "@types/node": "20.14.10" + "@types/node": "20.14.11" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 38454ff..6d98e16 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,12 +63,12 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.14.10", + "@types/node": "20.14.11", "jiti": "^1.21.6", "magicast": "^0.3.4", - "tsup": "^8.1.0", + "tsup": "^8.2.0", "typescript": "^5.5.3", - "vitest": "^2.0.2" + "vitest": "^2.0.3" }, "publishConfig": { "access": "public" @@ -80,6 +80,6 @@ "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.0.1", - "smol-toml": "^1.2.2" + "smol-toml": "^1.3.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80db6ef..36d0e5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,17 +18,17 @@ importers: specifier: ^3.3.3 version: 3.3.3 turbo: - specifier: ^2.0.6 - version: 2.0.6 + specifier: ^2.0.7 + version: 2.0.7 vitest: - specifier: ^2.0.2 - version: 2.0.2(@types/node@20.14.10) + specifier: ^2.0.3 + version: 2.0.3(@types/node@20.14.11) packages/commands: dependencies: '@begit/core': - specifier: ^0.0.18 - version: 0.0.18 + specifier: ^0.0.19 + version: 0.0.19 '@clack/prompts': specifier: 0.7.0 version: 0.7.0 @@ -55,14 +55,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.14.10 - version: 20.14.10 + specifier: ^20.14.11 + version: 20.14.11 prettier: specifier: ^3.3.3 version: 3.3.3 tsup: - specifier: ^8.1.0 - version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.0 + version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) typescript: specifier: ^5.5.3 version: 5.5.3 @@ -97,8 +97,8 @@ importers: specifier: ^1.0.1 version: 1.0.1 smol-toml: - specifier: ^1.2.2 - version: 1.2.2 + specifier: ^1.3.0 + version: 1.3.0 tiny-updater: specifier: ^3.5.2 version: 3.5.2 @@ -107,14 +107,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.14.10 - version: 20.14.10 + specifier: ^20.14.11 + version: 20.14.11 jiti: specifier: ^1.21.6 version: 1.21.6 tsup: - specifier: ^8.1.0 - version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.0 + version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) typescript: specifier: ^5.5.3 version: 5.5.3 @@ -128,8 +128,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.14.10 - version: 20.14.10 + specifier: ^20.14.11 + version: 20.14.11 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -140,8 +140,8 @@ importers: specifier: ^1.0.1 version: 1.0.1 tsup: - specifier: ^8.1.0 - version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.0 + version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) typescript: specifier: ^5.5.3 version: 5.5.3 @@ -149,8 +149,8 @@ importers: packages/reactivity: devDependencies: tsup: - specifier: ^8.1.0 - version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.0 + version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) typescript: specifier: ^5.5.3 version: 5.5.3 @@ -174,11 +174,11 @@ importers: version: 1.0.1 devDependencies: '@types/node': - specifier: 20.14.10 - version: 20.14.10 + specifier: 20.14.11 + version: 20.14.11 tsup: - specifier: ^8.1.0 - version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.0 + version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) typescript: specifier: ^5.5.3 version: 5.5.3 @@ -204,15 +204,15 @@ importers: specifier: ^1.0.1 version: 1.0.1 smol-toml: - specifier: ^1.2.2 - version: 1.2.2 + specifier: ^1.3.0 + version: 1.3.0 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.14.10 - version: 20.14.10 + specifier: 20.14.11 + version: 20.14.11 jiti: specifier: ^1.21.6 version: 1.21.6 @@ -220,14 +220,14 @@ importers: specifier: ^0.3.4 version: 0.3.4 tsup: - specifier: ^8.1.0 - version: 8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.0 + version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) typescript: specifier: ^5.5.3 version: 5.5.3 vitest: - specifier: ^2.0.2 - version: 2.0.2(@types/node@20.14.10) + specifier: ^2.0.3 + version: 2.0.3(@types/node@20.14.11) packages: @@ -256,8 +256,8 @@ packages: resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} engines: {node: '>=6.9.0'} - '@begit/core@0.0.18': - resolution: {integrity: sha512-5CIC3Gr4+bS0lXviSpJusCNGTJwnt8ihx+NLA5eJP6ZnVqXu9LYT65ivs3vlEWrexwhYWF+7jx1H0hRt5g69Xw==} + '@begit/core@0.0.19': + resolution: {integrity: sha512-3ypq3vJQ+PzYVi53HRkAtwdtVXTjyXjo1UzTkD75Qr9YIoacYsSy9gAdbwktfNKgTLyc1nU83W1D3SEw9kgBBA==} '@changesets/apply-release-plan@7.0.4': resolution: {integrity: sha512-HLFwhKWayKinWAul0Vj+76jVx1Pc2v55MGPVjZ924Y/ROeSsBMFutv9heHmCUj48lJyRfOTJG5+ar+29FUky/A==} @@ -347,9 +347,9 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.21.5': - resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} - engines: {node: '>=12'} + '@esbuild/aix-ppc64@0.23.0': + resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==} + engines: {node: '>=18'} cpu: [ppc64] os: [aix] @@ -359,9 +359,9 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.21.5': - resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} - engines: {node: '>=12'} + '@esbuild/android-arm64@0.23.0': + resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==} + engines: {node: '>=18'} cpu: [arm64] os: [android] @@ -371,9 +371,9 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.21.5': - resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} - engines: {node: '>=12'} + '@esbuild/android-arm@0.23.0': + resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==} + engines: {node: '>=18'} cpu: [arm] os: [android] @@ -383,9 +383,9 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.21.5': - resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} - engines: {node: '>=12'} + '@esbuild/android-x64@0.23.0': + resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==} + engines: {node: '>=18'} cpu: [x64] os: [android] @@ -395,9 +395,9 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.21.5': - resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} - engines: {node: '>=12'} + '@esbuild/darwin-arm64@0.23.0': + resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==} + engines: {node: '>=18'} cpu: [arm64] os: [darwin] @@ -407,9 +407,9 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.21.5': - resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} - engines: {node: '>=12'} + '@esbuild/darwin-x64@0.23.0': + resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==} + engines: {node: '>=18'} cpu: [x64] os: [darwin] @@ -419,9 +419,9 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.21.5': - resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} - engines: {node: '>=12'} + '@esbuild/freebsd-arm64@0.23.0': + resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==} + engines: {node: '>=18'} cpu: [arm64] os: [freebsd] @@ -431,9 +431,9 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.21.5': - resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} - engines: {node: '>=12'} + '@esbuild/freebsd-x64@0.23.0': + resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==} + engines: {node: '>=18'} cpu: [x64] os: [freebsd] @@ -443,9 +443,9 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.21.5': - resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} - engines: {node: '>=12'} + '@esbuild/linux-arm64@0.23.0': + resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==} + engines: {node: '>=18'} cpu: [arm64] os: [linux] @@ -455,9 +455,9 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.21.5': - resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} - engines: {node: '>=12'} + '@esbuild/linux-arm@0.23.0': + resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==} + engines: {node: '>=18'} cpu: [arm] os: [linux] @@ -467,9 +467,9 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.21.5': - resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} - engines: {node: '>=12'} + '@esbuild/linux-ia32@0.23.0': + resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==} + engines: {node: '>=18'} cpu: [ia32] os: [linux] @@ -479,9 +479,9 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.21.5': - resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} - engines: {node: '>=12'} + '@esbuild/linux-loong64@0.23.0': + resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==} + engines: {node: '>=18'} cpu: [loong64] os: [linux] @@ -491,9 +491,9 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.21.5': - resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} - engines: {node: '>=12'} + '@esbuild/linux-mips64el@0.23.0': + resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==} + engines: {node: '>=18'} cpu: [mips64el] os: [linux] @@ -503,9 +503,9 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.21.5': - resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} - engines: {node: '>=12'} + '@esbuild/linux-ppc64@0.23.0': + resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==} + engines: {node: '>=18'} cpu: [ppc64] os: [linux] @@ -515,9 +515,9 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.21.5': - resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} - engines: {node: '>=12'} + '@esbuild/linux-riscv64@0.23.0': + resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==} + engines: {node: '>=18'} cpu: [riscv64] os: [linux] @@ -527,9 +527,9 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.21.5': - resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} - engines: {node: '>=12'} + '@esbuild/linux-s390x@0.23.0': + resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==} + engines: {node: '>=18'} cpu: [s390x] os: [linux] @@ -539,9 +539,9 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.21.5': - resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} - engines: {node: '>=12'} + '@esbuild/linux-x64@0.23.0': + resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==} + engines: {node: '>=18'} cpu: [x64] os: [linux] @@ -551,21 +551,27 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.21.5': - resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} - engines: {node: '>=12'} + '@esbuild/netbsd-x64@0.23.0': + resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==} + engines: {node: '>=18'} cpu: [x64] os: [netbsd] + '@esbuild/openbsd-arm64@0.23.0': + resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + '@esbuild/openbsd-x64@0.20.2': resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.21.5': - resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} - engines: {node: '>=12'} + '@esbuild/openbsd-x64@0.23.0': + resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==} + engines: {node: '>=18'} cpu: [x64] os: [openbsd] @@ -575,9 +581,9 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.21.5': - resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} - engines: {node: '>=12'} + '@esbuild/sunos-x64@0.23.0': + resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==} + engines: {node: '>=18'} cpu: [x64] os: [sunos] @@ -587,9 +593,9 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.21.5': - resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} - engines: {node: '>=12'} + '@esbuild/win32-arm64@0.23.0': + resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==} + engines: {node: '>=18'} cpu: [arm64] os: [win32] @@ -599,9 +605,9 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.21.5': - resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} - engines: {node: '>=12'} + '@esbuild/win32-ia32@0.23.0': + resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==} + engines: {node: '>=18'} cpu: [ia32] os: [win32] @@ -611,9 +617,9 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.21.5': - resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} - engines: {node: '>=12'} + '@esbuild/win32-x64@0.23.0': + resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==} + engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -685,81 +691,161 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.18.1': + resolution: {integrity: sha512-lncuC4aHicncmbORnx+dUaAgzee9cm/PbIqgWz1PpXuwc+sa1Ct83tnqUDy/GFKleLiN7ZIeytM6KJ4cAn1SxA==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.16.1': resolution: {integrity: sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.18.1': + resolution: {integrity: sha512-F/tkdw0WSs4ojqz5Ovrw5r9odqzFjb5LIgHdHZG65dFI1lWTWRVy32KDJLKRISHgJvqUeUhdIvy43fX41znyDg==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.16.1': resolution: {integrity: sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.18.1': + resolution: {integrity: sha512-vk+ma8iC1ebje/ahpxpnrfVQJibTMyHdWpOGZ3JpQ7Mgn/3QNHmPq7YwjZbIE7km73dH5M1e6MRRsnEBW7v5CQ==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.16.1': resolution: {integrity: sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.18.1': + resolution: {integrity: sha512-IgpzXKauRe1Tafcej9STjSSuG0Ghu/xGYH+qG6JwsAUxXrnkvNHcq/NL6nz1+jzvWAnQkuAJ4uIwGB48K9OCGA==} + cpu: [x64] + os: [darwin] + '@rollup/rollup-linux-arm-gnueabihf@4.16.1': resolution: {integrity: sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.18.1': + resolution: {integrity: sha512-P9bSiAUnSSM7EmyRK+e5wgpqai86QOSv8BwvkGjLwYuOpaeomiZWifEos517CwbG+aZl1T4clSE1YqqH2JRs+g==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.16.1': resolution: {integrity: sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.18.1': + resolution: {integrity: sha512-5RnjpACoxtS+aWOI1dURKno11d7krfpGDEn19jI8BuWmSBbUC4ytIADfROM1FZrFhQPSoP+KEa3NlEScznBTyQ==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.16.1': resolution: {integrity: sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.18.1': + resolution: {integrity: sha512-8mwmGD668m8WaGbthrEYZ9CBmPug2QPGWxhJxh/vCgBjro5o96gL04WLlg5BA233OCWLqERy4YUzX3bJGXaJgQ==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.16.1': resolution: {integrity: sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.18.1': + resolution: {integrity: sha512-dJX9u4r4bqInMGOAQoGYdwDP8lQiisWb9et+T84l2WXk41yEej8v2iGKodmdKimT8cTAYt0jFb+UEBxnPkbXEQ==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': resolution: {integrity: sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==} cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.18.1': + resolution: {integrity: sha512-V72cXdTl4EI0x6FNmho4D502sy7ed+LuVW6Ym8aI6DRQ9hQZdp5sj0a2usYOlqvFBNKQnLQGwmYnujo2HvjCxQ==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.16.1': resolution: {integrity: sha512-uU8zuGkQfGqfD9w6VRJZI4IuG4JIfNxxJgEmLMAmPVHREKGsxFVfgHy5c6CexQF2vOfgjB33OsET3Vdn2lln9A==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.18.1': + resolution: {integrity: sha512-f+pJih7sxoKmbjghrM2RkWo2WHUW8UbfxIQiWo5yeCaCM0TveMEuAzKJte4QskBp1TIinpnRcxkquY+4WuY/tg==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.16.1': resolution: {integrity: sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.18.1': + resolution: {integrity: sha512-qb1hMMT3Fr/Qz1OKovCuUM11MUNLUuHeBC2DPPAWUYYUAOFWaxInaTwTQmc7Fl5La7DShTEpmYwgdt2hG+4TEg==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.16.1': resolution: {integrity: sha512-N2ZizKhUryqqrMfdCnjhJhZRgv61C6gK+hwVtCIKC8ts8J+go+vqENnGexwg21nHIOvLN5mBM8a7DI2vlyIOPg==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.18.1': + resolution: {integrity: sha512-7O5u/p6oKUFYjRbZkL2FLbwsyoJAjyeXHCU3O4ndvzg2OFO2GinFPSJFGbiwFDaCFc+k7gs9CF243PwdPQFh5g==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.16.1': resolution: {integrity: sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.18.1': + resolution: {integrity: sha512-pDLkYITdYrH/9Cv/Vlj8HppDuLMDUBmgsM0+N+xLtFd18aXgM9Nyqupb/Uw+HeidhfYg2lD6CXvz6CjoVOaKjQ==} + cpu: [x64] + os: [linux] + '@rollup/rollup-win32-arm64-msvc@4.16.1': resolution: {integrity: sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.18.1': + resolution: {integrity: sha512-W2ZNI323O/8pJdBGil1oCauuCzmVd9lDmWBBqxYZcOqWD6aWqJtVBQ1dFrF4dYpZPks6F+xCZHfzG5hYlSHZ6g==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.16.1': resolution: {integrity: sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.18.1': + resolution: {integrity: sha512-ELfEX1/+eGZYMaCIbK4jqLxO1gyTSOIlZr6pbC4SRYFaSIDVKOnZNMdoZ+ON0mrFDp4+H5MhwNC1H/AhE3zQLg==} + cpu: [ia32] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.16.1': resolution: {integrity: sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.18.1': + resolution: {integrity: sha512-yjk2MAkQmoaPYCSu35RLJ62+dz358nE83VfTePJRp8CG7aMg25mEJYpXFiD+NcevhX8LxD5OP5tktPXnXN7GDw==} + cpu: [x64] + os: [win32] + '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -848,29 +934,29 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@20.14.10': - resolution: {integrity: sha512-MdiXf+nDuMvY0gJKxyfZ7/6UFsETO7mGKF54MVD/ekJS6HdFtpZFBgrh6Pseu64XTb2MLyFPlbW6hj8HYRQNOQ==} + '@types/node@20.14.11': + resolution: {integrity: sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@vitest/expect@2.0.2': - resolution: {integrity: sha512-nKAvxBYqcDugYZ4nJvnm5OR8eDJdgWjk4XM9owQKUjzW70q0icGV2HVnQOyYsp906xJaBDUXw0+9EHw2T8e0mQ==} + '@vitest/expect@2.0.3': + resolution: {integrity: sha512-X6AepoOYePM0lDNUPsGXTxgXZAl3EXd0GYe/MZyVE4HzkUqyUVC6S3PrY5mClDJ6/7/7vALLMV3+xD/Ko60Hqg==} - '@vitest/pretty-format@2.0.2': - resolution: {integrity: sha512-SBCyOXfGVvddRd9r2PwoVR0fonQjh9BMIcBMlSzbcNwFfGr6ZhOhvBzurjvi2F4ryut2HcqiFhNeDVGwru8tLg==} + '@vitest/pretty-format@2.0.3': + resolution: {integrity: sha512-URM4GLsB2xD37nnTyvf6kfObFafxmycCL8un3OC9gaCs5cti2u+5rJdIflZ2fUJUen4NbvF6jCufwViAFLvz1g==} - '@vitest/runner@2.0.2': - resolution: {integrity: sha512-OCh437Vi8Wdbif1e0OvQcbfM3sW4s2lpmOjAE7qfLrpzJX2M7J1IQlNvEcb/fu6kaIB9n9n35wS0G2Q3en5kHg==} + '@vitest/runner@2.0.3': + resolution: {integrity: sha512-EmSP4mcjYhAcuBWwqgpjR3FYVeiA4ROzRunqKltWjBfLNs1tnMLtF+qtgd5ClTwkDP6/DGlKJTNa6WxNK0bNYQ==} - '@vitest/snapshot@2.0.2': - resolution: {integrity: sha512-Yc2ewhhZhx+0f9cSUdfzPRcsM6PhIb+S43wxE7OG0kTxqgqzo8tHkXFuFlndXeDMp09G3sY/X5OAo/RfYydf1g==} + '@vitest/snapshot@2.0.3': + resolution: {integrity: sha512-6OyA6v65Oe3tTzoSuRPcU6kh9m+mPL1vQ2jDlPdn9IQoUxl8rXhBnfICNOC+vwxWY684Vt5UPgtcA2aPFBb6wg==} - '@vitest/spy@2.0.2': - resolution: {integrity: sha512-MgwJ4AZtCgqyp2d7WcQVE8aNG5vQ9zu9qMPYQHjsld/QVsrvg78beNrXdO4HYkP0lDahCO3P4F27aagIag+SGQ==} + '@vitest/spy@2.0.3': + resolution: {integrity: sha512-sfqyAw/ypOXlaj4S+w8689qKM1OyPOqnonqOc9T91DsoHbfN5mU7FdifWWv3MtQFf0lEUstEwR9L/q/M390C+A==} - '@vitest/utils@2.0.2': - resolution: {integrity: sha512-pxCY1v7kmOCWYWjzc0zfjGTA3Wmn8PKnlPvSrsA643P1NHl1fOyXj2Q9SaNlrlFE+ivCsxM80Ov3AR82RmHCWQ==} + '@vitest/utils@2.0.3': + resolution: {integrity: sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -938,11 +1024,11 @@ packages: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} - bundle-require@4.0.1: - resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} + bundle-require@5.0.0: + resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} peerDependencies: - esbuild: '>=0.17' + esbuild: '>=0.18' cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} @@ -1002,6 +1088,10 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + consola@3.2.3: + resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} + engines: {node: ^14.18.0 || >=16.10.0} + cross-spawn@5.1.0: resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} @@ -1065,9 +1155,9 @@ packages: engines: {node: '>=12'} hasBin: true - esbuild@0.21.5: - resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} - engines: {node: '>=12'} + esbuild@0.23.0: + resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==} + engines: {node: '>=18'} hasBin: true escape-string-regexp@1.0.5: @@ -1282,9 +1372,9 @@ packages: jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} - lilconfig@2.1.0: - resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} - engines: {node: '>=10'} + lilconfig@3.1.2: + resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==} + engines: {node: '>=14'} lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} @@ -1515,16 +1605,22 @@ packages: resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} engines: {node: '>=8'} - postcss-load-config@4.0.1: - resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} - engines: {node: '>= 14'} + postcss-load-config@6.0.1: + resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} + engines: {node: '>= 18'} peerDependencies: + jiti: '>=1.21.0' postcss: '>=8.0.9' - ts-node: '>=9.0.0' + tsx: ^4.8.1 + yaml: ^2.4.2 peerDependenciesMeta: + jiti: + optional: true postcss: optional: true - ts-node: + tsx: + optional: true + yaml: optional: true postcss@8.4.38: @@ -1591,6 +1687,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.18.1: + resolution: {integrity: sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -1639,8 +1740,8 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - smol-toml@1.2.2: - resolution: {integrity: sha512-fVEjX2ybKdJKzFL46VshQbj9PuA4IUKivalgp48/3zwS9vXzyykzQ6AX92UxHSvWJagziMRLeHMgEzoGO7A8hQ==} + smol-toml@1.3.0: + resolution: {integrity: sha512-tWpi2TsODPScmi48b/OQZGi2lgUmBCHy6SZrhi/FdnnHiU1GwebbCfuQuxsC3nHaLwtYeJGPrDZDIeodDOc4pA==} engines: {node: '>= 18'} source-map-js@1.2.0: @@ -1770,8 +1871,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.1.0: - resolution: {integrity: sha512-UFdfCAXukax+U6KzeTNO2kAARHcWxmKsnvSPXUcfA1D+kU05XDccCrkffCQpFaWDsZfV0jMyTsxU39VfCp6EOg==} + tsup@8.2.0: + resolution: {integrity: sha512-XoarnVlfXxbv8ODHtxUq8D2XPc9luX+pamnp1kHSKLknKCDcX0Rkc21NHdbpugH6hKoNiETXypKKVgVu46vVRg==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1789,38 +1890,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.0.6: - resolution: {integrity: sha512-XpgBwWj3Ggmz/gQVqXdMKXHC1iFPMDiuwugLwSzE7Ih0O13JuNtYZKhQnopvbDQnFQCeRq2Vsm5OTWabg/oB/g==} + turbo-darwin-64@2.0.7: + resolution: {integrity: sha512-J1RBvQGqKeUwLJrZbfrm4tHshagdMeGAwd7rpLpfUrw0PNmGfcBazJf6dIGXG59/GHzJmS0/eAZ8qDchfVbIFA==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.0.6: - resolution: {integrity: sha512-RfeZYXIAkiA21E8lsvfptGTqz/256YD+eI1x37fedfvnHFWuIMFZGAOwJxtZc6QasQunDZ9TRRREbJNI68tkIw==} + turbo-darwin-arm64@2.0.7: + resolution: {integrity: sha512-h1JK8uuEjoHx1SvvTZiottj+4kDmiv+hivnLUzNwO75qKblMsd38IsFB0J2sMRz7JacFlf+3ry8SItznBW67Xw==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.0.6: - resolution: {integrity: sha512-92UDa0xNQQbx0HdSp9ag3YSS3xPdavhc7q9q9mxIAcqyjjD6VElA4Y85m4F/DDGE5SolCrvBz2sQhVmkOd6Caw==} + turbo-linux-64@2.0.7: + resolution: {integrity: sha512-dsr7GFeHAYVMnXWDDjhpsAQetejU4OlkNBRA5hfmnIcl2sSyOYa3EvoeJ6j5z5vTNIJ9VO4I1h0jK3lTjEoonA==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.0.6: - resolution: {integrity: sha512-eQKu6utCVUkIH2kqOzD8OS6E0ba6COjWm6PRDTNCHQRljZW503ycaTUIdMOiJrVg1MkEjDyOReUg8s8D18aJ4Q==} + turbo-linux-arm64@2.0.7: + resolution: {integrity: sha512-bJbwXvyX1XPzY1jHgkqggls/L4yFyHVK8GGACF3kcg6x7lYV2SXkUYRyOC3WqzW7euqa9Zw/32jrIPP4Qy31Vw==} cpu: [arm64] os: [linux] - turbo-windows-64@2.0.6: - resolution: {integrity: sha512-+9u4EPrpoeHYCQ46dRcou9kbkSoelhOelHNcbs2d86D6ruYD/oIAHK9qgYK8LeARRz0jxhZIA/dWYdYsxJJWkw==} + turbo-windows-64@2.0.7: + resolution: {integrity: sha512-aBH+5A7IN957MqXMrw8xN0CWtH/fPFL+xTlloO6074Eaa8WfnctSAnaSujm6f4xF2T8lFx+ZprBvnO9oKvLQQQ==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.0.6: - resolution: {integrity: sha512-rdrKL+p+EjtdDVg0wQ/7yTbzkIYrnb0Pw4IKcjsy3M0RqUM9UcEi67b94XOAyTa5a0GqJL1+tUj2ebsFGPgZbg==} + turbo-windows-arm64@2.0.7: + resolution: {integrity: sha512-ButUCpO5nTi+jyTSIY2mQ9dVz+mCGxJ6sHyn0xGlNoJWdisKXb0BtWCLAjM26gg/yp9Kt1MBowMQyYVruPV0Qw==} cpu: [arm64] os: [win32] - turbo@2.0.6: - resolution: {integrity: sha512-/Ftmxd5Mq//a9yMonvmwENNUN65jOVTwhhBPQjEtNZutYT9YKyzydFGLyVM1nzhpLWahQSMamRc/RDBv5EapzA==} + turbo@2.0.7: + resolution: {integrity: sha512-76iNWZpmKAKjj+yL0Wtcu2LpDIM5Nz7JS3fHOZPYS0AKuC2boJ24276VAiK4PKwbpBB//TYKDpSLuQ6cfR49pg==} hasBin: true typescript@5.5.3: @@ -1838,8 +1939,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@2.0.2: - resolution: {integrity: sha512-w4vkSz1Wo+NIQg8pjlEn0jQbcM/0D+xVaYjhw3cvarTanLLBh54oNiRbsT8PNK5GfuST0IlVXjsNRoNlqvY/fw==} + vite-node@2.0.3: + resolution: {integrity: sha512-14jzwMx7XTcMB+9BhGQyoEAmSl0eOr3nrnn+Z12WNERtOvLN+d2scbRUvyni05rT3997Bg+rZb47NyP4IQPKXg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -1871,15 +1972,15 @@ packages: terser: optional: true - vitest@2.0.2: - resolution: {integrity: sha512-WlpZ9neRIjNBIOQwBYfBSr0+of5ZCbxT2TVGKW4Lv0c8+srCFIiRdsP7U009t8mMn821HQ4XKgkx5dVWpyoyLw==} + vitest@2.0.3: + resolution: {integrity: sha512-o3HRvU93q6qZK4rI2JrhKyZMMuxg/JRt30E6qeQs6ueaiz5hr1cPj+Sk2kATgQzMMqsa2DiNI0TIK++1ULx8Jw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.0.2 - '@vitest/ui': 2.0.2 + '@vitest/browser': 2.0.3 + '@vitest/ui': 2.0.3 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1941,10 +2042,6 @@ packages: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} - yaml@2.3.2: - resolution: {integrity: sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==} - engines: {node: '>= 14'} - yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} @@ -1978,7 +2075,7 @@ snapshots: '@babel/helper-validator-identifier': 7.24.5 to-fast-properties: 2.0.0 - '@begit/core@0.0.18': + '@begit/core@0.0.19': dependencies: tar: 7.4.0 @@ -2174,139 +2271,142 @@ snapshots: '@esbuild/aix-ppc64@0.20.2': optional: true - '@esbuild/aix-ppc64@0.21.5': + '@esbuild/aix-ppc64@0.23.0': optional: true '@esbuild/android-arm64@0.20.2': optional: true - '@esbuild/android-arm64@0.21.5': + '@esbuild/android-arm64@0.23.0': optional: true '@esbuild/android-arm@0.20.2': optional: true - '@esbuild/android-arm@0.21.5': + '@esbuild/android-arm@0.23.0': optional: true '@esbuild/android-x64@0.20.2': optional: true - '@esbuild/android-x64@0.21.5': + '@esbuild/android-x64@0.23.0': optional: true '@esbuild/darwin-arm64@0.20.2': optional: true - '@esbuild/darwin-arm64@0.21.5': + '@esbuild/darwin-arm64@0.23.0': optional: true '@esbuild/darwin-x64@0.20.2': optional: true - '@esbuild/darwin-x64@0.21.5': + '@esbuild/darwin-x64@0.23.0': optional: true '@esbuild/freebsd-arm64@0.20.2': optional: true - '@esbuild/freebsd-arm64@0.21.5': + '@esbuild/freebsd-arm64@0.23.0': optional: true '@esbuild/freebsd-x64@0.20.2': optional: true - '@esbuild/freebsd-x64@0.21.5': + '@esbuild/freebsd-x64@0.23.0': optional: true '@esbuild/linux-arm64@0.20.2': optional: true - '@esbuild/linux-arm64@0.21.5': + '@esbuild/linux-arm64@0.23.0': optional: true '@esbuild/linux-arm@0.20.2': optional: true - '@esbuild/linux-arm@0.21.5': + '@esbuild/linux-arm@0.23.0': optional: true '@esbuild/linux-ia32@0.20.2': optional: true - '@esbuild/linux-ia32@0.21.5': + '@esbuild/linux-ia32@0.23.0': optional: true '@esbuild/linux-loong64@0.20.2': optional: true - '@esbuild/linux-loong64@0.21.5': + '@esbuild/linux-loong64@0.23.0': optional: true '@esbuild/linux-mips64el@0.20.2': optional: true - '@esbuild/linux-mips64el@0.21.5': + '@esbuild/linux-mips64el@0.23.0': optional: true '@esbuild/linux-ppc64@0.20.2': optional: true - '@esbuild/linux-ppc64@0.21.5': + '@esbuild/linux-ppc64@0.23.0': optional: true '@esbuild/linux-riscv64@0.20.2': optional: true - '@esbuild/linux-riscv64@0.21.5': + '@esbuild/linux-riscv64@0.23.0': optional: true '@esbuild/linux-s390x@0.20.2': optional: true - '@esbuild/linux-s390x@0.21.5': + '@esbuild/linux-s390x@0.23.0': optional: true '@esbuild/linux-x64@0.20.2': optional: true - '@esbuild/linux-x64@0.21.5': + '@esbuild/linux-x64@0.23.0': optional: true '@esbuild/netbsd-x64@0.20.2': optional: true - '@esbuild/netbsd-x64@0.21.5': + '@esbuild/netbsd-x64@0.23.0': + optional: true + + '@esbuild/openbsd-arm64@0.23.0': optional: true '@esbuild/openbsd-x64@0.20.2': optional: true - '@esbuild/openbsd-x64@0.21.5': + '@esbuild/openbsd-x64@0.23.0': optional: true '@esbuild/sunos-x64@0.20.2': optional: true - '@esbuild/sunos-x64@0.21.5': + '@esbuild/sunos-x64@0.23.0': optional: true '@esbuild/win32-arm64@0.20.2': optional: true - '@esbuild/win32-arm64@0.21.5': + '@esbuild/win32-arm64@0.23.0': optional: true '@esbuild/win32-ia32@0.20.2': optional: true - '@esbuild/win32-ia32@0.21.5': + '@esbuild/win32-ia32@0.23.0': optional: true '@esbuild/win32-x64@0.20.2': optional: true - '@esbuild/win32-x64@0.21.5': + '@esbuild/win32-x64@0.23.0': optional: true '@isaacs/cliui@8.0.2': @@ -2390,51 +2490,99 @@ snapshots: '@rollup/rollup-android-arm-eabi@4.16.1': optional: true + '@rollup/rollup-android-arm-eabi@4.18.1': + optional: true + '@rollup/rollup-android-arm64@4.16.1': optional: true + '@rollup/rollup-android-arm64@4.18.1': + optional: true + '@rollup/rollup-darwin-arm64@4.16.1': optional: true + '@rollup/rollup-darwin-arm64@4.18.1': + optional: true + '@rollup/rollup-darwin-x64@4.16.1': optional: true + '@rollup/rollup-darwin-x64@4.18.1': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.16.1': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.18.1': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.16.1': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.18.1': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.16.1': optional: true + '@rollup/rollup-linux-arm64-gnu@4.18.1': + optional: true + '@rollup/rollup-linux-arm64-musl@4.16.1': optional: true + '@rollup/rollup-linux-arm64-musl@4.18.1': + optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.18.1': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.16.1': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.18.1': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.16.1': optional: true + '@rollup/rollup-linux-s390x-gnu@4.18.1': + optional: true + '@rollup/rollup-linux-x64-gnu@4.16.1': optional: true + '@rollup/rollup-linux-x64-gnu@4.18.1': + optional: true + '@rollup/rollup-linux-x64-musl@4.16.1': optional: true + '@rollup/rollup-linux-x64-musl@4.18.1': + optional: true + '@rollup/rollup-win32-arm64-msvc@4.16.1': optional: true + '@rollup/rollup-win32-arm64-msvc@4.18.1': + optional: true + '@rollup/rollup-win32-ia32-msvc@4.16.1': optional: true + '@rollup/rollup-win32-ia32-msvc@4.18.1': + optional: true + '@rollup/rollup-win32-x64-msvc@4.16.1': optional: true + '@rollup/rollup-win32-x64-msvc@4.18.1': + optional: true + '@sec-ant/readable-stream@0.4.1': {} '@sindresorhus/merge-streams@4.0.0': {} @@ -2498,41 +2646,41 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@20.14.10': + '@types/node@20.14.11': dependencies: undici-types: 5.26.5 '@types/semver@7.5.8': {} - '@vitest/expect@2.0.2': + '@vitest/expect@2.0.3': dependencies: - '@vitest/spy': 2.0.2 - '@vitest/utils': 2.0.2 + '@vitest/spy': 2.0.3 + '@vitest/utils': 2.0.3 chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/pretty-format@2.0.2': + '@vitest/pretty-format@2.0.3': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.0.2': + '@vitest/runner@2.0.3': dependencies: - '@vitest/utils': 2.0.2 + '@vitest/utils': 2.0.3 pathe: 1.1.2 - '@vitest/snapshot@2.0.2': + '@vitest/snapshot@2.0.3': dependencies: - '@vitest/pretty-format': 2.0.2 + '@vitest/pretty-format': 2.0.3 magic-string: 0.30.10 pathe: 1.1.2 - '@vitest/spy@2.0.2': + '@vitest/spy@2.0.3': dependencies: tinyspy: 3.0.0 - '@vitest/utils@2.0.2': + '@vitest/utils@2.0.3': dependencies: - '@vitest/pretty-format': 2.0.2 + '@vitest/pretty-format': 2.0.3 estree-walker: 3.0.3 loupe: 3.1.1 tinyrainbow: 1.2.0 @@ -2591,9 +2739,9 @@ snapshots: dependencies: fill-range: 7.0.1 - bundle-require@4.0.1(esbuild@0.21.5): + bundle-require@5.0.0(esbuild@0.23.0): dependencies: - esbuild: 0.21.5 + esbuild: 0.23.0 load-tsconfig: 0.2.5 cac@6.7.14: {} @@ -2662,6 +2810,8 @@ snapshots: concat-map@0.0.1: {} + consola@3.2.3: {} + cross-spawn@5.1.0: dependencies: lru-cache: 4.1.5 @@ -2733,31 +2883,32 @@ snapshots: '@esbuild/win32-ia32': 0.20.2 '@esbuild/win32-x64': 0.20.2 - esbuild@0.21.5: + esbuild@0.23.0: optionalDependencies: - '@esbuild/aix-ppc64': 0.21.5 - '@esbuild/android-arm': 0.21.5 - '@esbuild/android-arm64': 0.21.5 - '@esbuild/android-x64': 0.21.5 - '@esbuild/darwin-arm64': 0.21.5 - '@esbuild/darwin-x64': 0.21.5 - '@esbuild/freebsd-arm64': 0.21.5 - '@esbuild/freebsd-x64': 0.21.5 - '@esbuild/linux-arm': 0.21.5 - '@esbuild/linux-arm64': 0.21.5 - '@esbuild/linux-ia32': 0.21.5 - '@esbuild/linux-loong64': 0.21.5 - '@esbuild/linux-mips64el': 0.21.5 - '@esbuild/linux-ppc64': 0.21.5 - '@esbuild/linux-riscv64': 0.21.5 - '@esbuild/linux-s390x': 0.21.5 - '@esbuild/linux-x64': 0.21.5 - '@esbuild/netbsd-x64': 0.21.5 - '@esbuild/openbsd-x64': 0.21.5 - '@esbuild/sunos-x64': 0.21.5 - '@esbuild/win32-arm64': 0.21.5 - '@esbuild/win32-ia32': 0.21.5 - '@esbuild/win32-x64': 0.21.5 + '@esbuild/aix-ppc64': 0.23.0 + '@esbuild/android-arm': 0.23.0 + '@esbuild/android-arm64': 0.23.0 + '@esbuild/android-x64': 0.23.0 + '@esbuild/darwin-arm64': 0.23.0 + '@esbuild/darwin-x64': 0.23.0 + '@esbuild/freebsd-arm64': 0.23.0 + '@esbuild/freebsd-x64': 0.23.0 + '@esbuild/linux-arm': 0.23.0 + '@esbuild/linux-arm64': 0.23.0 + '@esbuild/linux-ia32': 0.23.0 + '@esbuild/linux-loong64': 0.23.0 + '@esbuild/linux-mips64el': 0.23.0 + '@esbuild/linux-ppc64': 0.23.0 + '@esbuild/linux-riscv64': 0.23.0 + '@esbuild/linux-s390x': 0.23.0 + '@esbuild/linux-x64': 0.23.0 + '@esbuild/netbsd-x64': 0.23.0 + '@esbuild/openbsd-arm64': 0.23.0 + '@esbuild/openbsd-x64': 0.23.0 + '@esbuild/sunos-x64': 0.23.0 + '@esbuild/win32-arm64': 0.23.0 + '@esbuild/win32-ia32': 0.23.0 + '@esbuild/win32-x64': 0.23.0 escape-string-regexp@1.0.5: {} @@ -2976,7 +3127,7 @@ snapshots: optionalDependencies: graceful-fs: 4.2.11 - lilconfig@2.1.0: {} + lilconfig@3.1.2: {} lines-and-columns@1.2.4: {} @@ -3172,11 +3323,11 @@ snapshots: dependencies: find-up: 4.1.0 - postcss-load-config@4.0.1(postcss@8.4.38): + postcss-load-config@6.0.1(jiti@1.21.6)(postcss@8.4.38): dependencies: - lilconfig: 2.1.0 - yaml: 2.3.2 + lilconfig: 3.1.2 optionalDependencies: + jiti: 1.21.6 postcss: 8.4.38 postcss@8.4.38: @@ -3251,6 +3402,28 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.16.1 fsevents: 2.3.3 + rollup@4.18.1: + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.18.1 + '@rollup/rollup-android-arm64': 4.18.1 + '@rollup/rollup-darwin-arm64': 4.18.1 + '@rollup/rollup-darwin-x64': 4.18.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.18.1 + '@rollup/rollup-linux-arm-musleabihf': 4.18.1 + '@rollup/rollup-linux-arm64-gnu': 4.18.1 + '@rollup/rollup-linux-arm64-musl': 4.18.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.18.1 + '@rollup/rollup-linux-riscv64-gnu': 4.18.1 + '@rollup/rollup-linux-s390x-gnu': 4.18.1 + '@rollup/rollup-linux-x64-gnu': 4.18.1 + '@rollup/rollup-linux-x64-musl': 4.18.1 + '@rollup/rollup-win32-arm64-msvc': 4.18.1 + '@rollup/rollup-win32-ia32-msvc': 4.18.1 + '@rollup/rollup-win32-x64-msvc': 4.18.1 + fsevents: 2.3.3 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -3287,7 +3460,7 @@ snapshots: slash@3.0.0: {} - smol-toml@1.2.2: {} + smol-toml@1.3.0: {} source-map-js@1.2.0: {} @@ -3409,19 +3582,20 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.1.0(@swc/core@1.5.5)(postcss@8.4.38)(typescript@5.5.3): + tsup@8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3): dependencies: - bundle-require: 4.0.1(esbuild@0.21.5) + bundle-require: 5.0.0(esbuild@0.23.0) cac: 6.7.14 chokidar: 3.6.0 - debug: 4.3.4(supports-color@5.5.0) - esbuild: 0.21.5 + consola: 3.2.3 + debug: 4.3.5 + esbuild: 0.23.0 execa: 5.1.1 globby: 11.1.0 joycon: 3.1.1 - postcss-load-config: 4.0.1(postcss@8.4.38) + postcss-load-config: 6.0.1(jiti@1.21.6)(postcss@8.4.38) resolve-from: 5.0.0 - rollup: 4.16.1 + rollup: 4.18.1 source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 @@ -3430,35 +3604,37 @@ snapshots: postcss: 8.4.38 typescript: 5.5.3 transitivePeerDependencies: + - jiti - supports-color - - ts-node + - tsx + - yaml - turbo-darwin-64@2.0.6: + turbo-darwin-64@2.0.7: optional: true - turbo-darwin-arm64@2.0.6: + turbo-darwin-arm64@2.0.7: optional: true - turbo-linux-64@2.0.6: + turbo-linux-64@2.0.7: optional: true - turbo-linux-arm64@2.0.6: + turbo-linux-arm64@2.0.7: optional: true - turbo-windows-64@2.0.6: + turbo-windows-64@2.0.7: optional: true - turbo-windows-arm64@2.0.6: + turbo-windows-arm64@2.0.7: optional: true - turbo@2.0.6: + turbo@2.0.7: optionalDependencies: - turbo-darwin-64: 2.0.6 - turbo-darwin-arm64: 2.0.6 - turbo-linux-64: 2.0.6 - turbo-linux-arm64: 2.0.6 - turbo-windows-64: 2.0.6 - turbo-windows-arm64: 2.0.6 + turbo-darwin-64: 2.0.7 + turbo-darwin-arm64: 2.0.7 + turbo-linux-64: 2.0.7 + turbo-linux-arm64: 2.0.7 + turbo-windows-64: 2.0.7 + turbo-windows-arm64: 2.0.7 typescript@5.5.3: {} @@ -3468,13 +3644,13 @@ snapshots: universalify@0.1.2: {} - vite-node@2.0.2(@types/node@20.14.10): + vite-node@2.0.3(@types/node@20.14.11): dependencies: cac: 6.7.14 debug: 4.3.5 pathe: 1.1.2 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@20.14.10) + vite: 5.2.10(@types/node@20.14.11) transitivePeerDependencies: - '@types/node' - less @@ -3485,24 +3661,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@20.14.10): + vite@5.2.10(@types/node@20.14.11): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.16.1 optionalDependencies: - '@types/node': 20.14.10 + '@types/node': 20.14.11 fsevents: 2.3.3 - vitest@2.0.2(@types/node@20.14.10): + vitest@2.0.3(@types/node@20.14.11): dependencies: '@ampproject/remapping': 2.3.0 - '@vitest/expect': 2.0.2 - '@vitest/pretty-format': 2.0.2 - '@vitest/runner': 2.0.2 - '@vitest/snapshot': 2.0.2 - '@vitest/spy': 2.0.2 - '@vitest/utils': 2.0.2 + '@vitest/expect': 2.0.3 + '@vitest/pretty-format': 2.0.3 + '@vitest/runner': 2.0.3 + '@vitest/snapshot': 2.0.3 + '@vitest/spy': 2.0.3 + '@vitest/utils': 2.0.3 chai: 5.1.1 debug: 4.3.5 execa: 8.0.1 @@ -3512,11 +3688,11 @@ snapshots: tinybench: 2.8.0 tinypool: 1.0.0 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@20.14.10) - vite-node: 2.0.2(@types/node@20.14.10) + vite: 5.2.10(@types/node@20.14.11) + vite-node: 2.0.3(@types/node@20.14.11) why-is-node-running: 2.2.2 optionalDependencies: - '@types/node': 20.14.10 + '@types/node': 20.14.11 transitivePeerDependencies: - less - lightningcss @@ -3572,8 +3748,6 @@ snapshots: yallist@5.0.0: {} - yaml@2.3.2: {} - yocto-queue@0.1.0: {} yoctocolors@2.1.1: {} From c19fdb62c072a2abd378a3ff2ea0d50f2073b41b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 26 Jul 2024 00:31:22 +0100 Subject: [PATCH 120/290] Updated `packageManager` --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e8a2a2..e600b59 100644 --- a/package.json +++ b/package.json @@ -40,5 +40,5 @@ "turbo": "^2.0.7", "vitest": "^2.0.3" }, - "packageManager": "pnpm@9.4.0" + "packageManager": "pnpm@9.6.0" } From be2eb7bb3c7a0187fe78765236fdece483cb5ecc Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:10:52 +0100 Subject: [PATCH 121/290] Updated deps --- package.json | 4 +- packages/commands/package.json | 6 +- packages/core/package.json | 8 +- packages/create-solid/package.json | 6 +- packages/reactivity/package.json | 4 +- packages/ui/package.json | 6 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 536 ++++++++++++----------------- 8 files changed, 241 insertions(+), 337 deletions(-) diff --git a/package.json b/package.json index e600b59..a0d083f 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@changesets/cli": "2.27.7", "nodemon": "^3.1.4", "prettier": "^3.3.3", - "turbo": "^2.0.7", - "vitest": "^2.0.3" + "turbo": "^2.0.9", + "vitest": "^2.0.4" }, "packageManager": "pnpm@9.6.0" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 2162daf..8bdefd1 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,10 +33,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "prettier": "^3.3.3", - "tsup": "^8.2.0", - "typescript": "^5.5.3" + "tsup": "^8.2.3", + "typescript": "^5.5.4" }, "publishConfig": { "access": "public" diff --git a/packages/core/package.json b/packages/core/package.json index 0d18c4f..18fe9b3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -29,7 +29,7 @@ "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "cmd-ts": "^0.13.0", - "execa": "^9.3.0", + "execa": "^8.0.1", "picocolors": "^1.0.1", "smol-toml": "^1.3.0", "tiny-updater": "^3.5.2" @@ -40,10 +40,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "jiti": "^1.21.6", - "tsup": "^8.2.0", - "typescript": "^5.5.3" + "tsup": "^8.2.3", + "typescript": "^5.5.4" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 81628e5..fba8591 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.14.11", + "@types/node": "^20.14.12", "cmd-ts": "^0.13.0", "jiti": "^1.21.6", "picocolors": "^1.0.1", - "tsup": "^8.2.0", - "typescript": "^5.5.3" + "tsup": "^8.2.3", + "typescript": "^5.5.4" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 974a9da..0d6e380 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,8 +28,8 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.2.0", - "typescript": "^5.5.3" + "tsup": "^8.2.3", + "typescript": "^5.5.4" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 2ba9783..cbded51 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.2.0", - "typescript": "^5.5.3", - "@types/node": "20.14.11" + "tsup": "^8.2.3", + "typescript": "^5.5.4", + "@types/node": "20.14.12" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 6d98e16..8a4de53 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,12 +63,12 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.14.11", + "@types/node": "20.14.12", "jiti": "^1.21.6", "magicast": "^0.3.4", - "tsup": "^8.2.0", - "typescript": "^5.5.3", - "vitest": "^2.0.3" + "tsup": "^8.2.3", + "typescript": "^5.5.4", + "vitest": "^2.0.4" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 36d0e5e..8da1056 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: specifier: ^3.3.3 version: 3.3.3 turbo: - specifier: ^2.0.7 - version: 2.0.7 + specifier: ^2.0.9 + version: 2.0.9 vitest: - specifier: ^2.0.3 - version: 2.0.3(@types/node@20.14.11) + specifier: ^2.0.4 + version: 2.0.4(@types/node@20.14.12) packages/commands: dependencies: @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 prettier: specifier: ^3.3.3 version: 3.3.3 tsup: - specifier: ^8.2.0 - version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.3 + version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 packages/core: dependencies: @@ -91,8 +91,8 @@ importers: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^9.3.0 - version: 9.3.0 + specifier: ^8.0.1 + version: 8.0.1 picocolors: specifier: ^1.0.1 version: 1.0.1 @@ -107,17 +107,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 jiti: specifier: ^1.21.6 version: 1.21.6 tsup: - specifier: ^8.2.0 - version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.3 + version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 packages/create-solid: devDependencies: @@ -128,8 +128,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.14.11 - version: 20.14.11 + specifier: ^20.14.12 + version: 20.14.12 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -140,20 +140,20 @@ importers: specifier: ^1.0.1 version: 1.0.1 tsup: - specifier: ^8.2.0 - version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.3 + version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 packages/reactivity: devDependencies: tsup: - specifier: ^8.2.0 - version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.3 + version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 packages/ui: dependencies: @@ -174,14 +174,14 @@ importers: version: 1.0.1 devDependencies: '@types/node': - specifier: 20.14.11 - version: 20.14.11 + specifier: 20.14.12 + version: 20.14.12 tsup: - specifier: ^8.2.0 - version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.3 + version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 packages/utils: dependencies: @@ -211,8 +211,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.14.11 - version: 20.14.11 + specifier: 20.14.12 + version: 20.14.12 jiti: specifier: ^1.21.6 version: 1.21.6 @@ -220,14 +220,14 @@ importers: specifier: ^0.3.4 version: 0.3.4 tsup: - specifier: ^8.2.0 - version: 8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3) + specifier: ^8.2.3 + version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: - specifier: ^5.5.3 - version: 5.5.3 + specifier: ^5.5.4 + version: 5.5.4 vitest: - specifier: ^2.0.3 - version: 2.0.3(@types/node@20.14.11) + specifier: ^2.0.4 + version: 2.0.4(@types/node@20.14.12) packages: @@ -686,19 +686,14 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@rollup/rollup-android-arm-eabi@4.16.1': - resolution: {integrity: sha512-92/y0TqNLRYOTXpm6Z7mnpvKAG9P7qmK7yJeRJSdzElNCUnsgbpAsGqerUboYRIQKzgfq4pWu9xVkgpWLfmNsw==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.18.1': resolution: {integrity: sha512-lncuC4aHicncmbORnx+dUaAgzee9cm/PbIqgWz1PpXuwc+sa1Ct83tnqUDy/GFKleLiN7ZIeytM6KJ4cAn1SxA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.16.1': - resolution: {integrity: sha512-ttWB6ZCfRLuDIUiE0yiu5gcqOsYjA5F7kEV1ggHMj20FwLZ8A1FMeahZJFl/pnOmcnD2QL0z4AcDuo27utGU8A==} - cpu: [arm64] + '@rollup/rollup-android-arm-eabi@4.19.0': + resolution: {integrity: sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==} + cpu: [arm] os: [android] '@rollup/rollup-android-arm64@4.18.1': @@ -706,19 +701,19 @@ packages: cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.16.1': - resolution: {integrity: sha512-QLDvPLetbqjHojTGFw9+nuSP3YY/iz2k1cep6crYlr97sS+ZJ0W43b8Z0zC00+lnFZj6JSNxiA4DjboNQMuh1A==} + '@rollup/rollup-android-arm64@4.19.0': + resolution: {integrity: sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==} cpu: [arm64] - os: [darwin] + os: [android] '@rollup/rollup-darwin-arm64@4.18.1': resolution: {integrity: sha512-vk+ma8iC1ebje/ahpxpnrfVQJibTMyHdWpOGZ3JpQ7Mgn/3QNHmPq7YwjZbIE7km73dH5M1e6MRRsnEBW7v5CQ==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.16.1': - resolution: {integrity: sha512-TAUK/D8khRrRIa1KwRzo8JNKk3tcqaeXWdtsiLgA8zmACWwlWLjPCJ4DULGHQrMkeBjp1Cd3Yuwx04lZgFx5Vg==} - cpu: [x64] + '@rollup/rollup-darwin-arm64@4.19.0': + resolution: {integrity: sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==} + cpu: [arm64] os: [darwin] '@rollup/rollup-darwin-x64@4.18.1': @@ -726,18 +721,18 @@ packages: cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.16.1': - resolution: {integrity: sha512-KO+WGZjrh6zyFTD1alIFkfdtxf8B4BC+hqd3kBZHscPLvE5FR/6QKsyuCT0JlERxxYBSUKNUQ/UHyX5uwO1x2A==} - cpu: [arm] - os: [linux] + '@rollup/rollup-darwin-x64@4.19.0': + resolution: {integrity: sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==} + cpu: [x64] + os: [darwin] '@rollup/rollup-linux-arm-gnueabihf@4.18.1': resolution: {integrity: sha512-P9bSiAUnSSM7EmyRK+e5wgpqai86QOSv8BwvkGjLwYuOpaeomiZWifEos517CwbG+aZl1T4clSE1YqqH2JRs+g==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.16.1': - resolution: {integrity: sha512-NqxbllzIB1WoAo4ThUXVtd21iiM5IHMTTXmXySKBLVcZvkU0HIZmatlP7hLzb5yQubcmdIeWmncd2NdsjocEiw==} + '@rollup/rollup-linux-arm-gnueabihf@4.19.0': + resolution: {integrity: sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==} cpu: [arm] os: [linux] @@ -746,9 +741,9 @@ packages: cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.16.1': - resolution: {integrity: sha512-snma5NvV8y7IECQ5rq0sr0f3UUu+92NVmG/913JXJMcXo84h9ak9TA5UI9Cl2XRM9j3m37QwDBtEYnJzRkSmxA==} - cpu: [arm64] + '@rollup/rollup-linux-arm-musleabihf@4.19.0': + resolution: {integrity: sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==} + cpu: [arm] os: [linux] '@rollup/rollup-linux-arm64-gnu@4.18.1': @@ -756,8 +751,8 @@ packages: cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.16.1': - resolution: {integrity: sha512-KOvqGprlD84ueivhCi2flvcUwDRD20mAsE3vxQNVEI2Di9tnPGAfEu6UcrSPZbM+jG2w1oSr43hrPo0RNg6GGg==} + '@rollup/rollup-linux-arm64-gnu@4.19.0': + resolution: {integrity: sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==} cpu: [arm64] os: [linux] @@ -766,9 +761,9 @@ packages: cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': - resolution: {integrity: sha512-/gsNwtiGLqYwN4vP+EIdUC6Q6LTlpupWqokqIndvZcjn9ig/5P01WyaYCU2wvfL/2Z82jp5kX8c1mDBOvCP3zg==} - cpu: [ppc64] + '@rollup/rollup-linux-arm64-musl@4.19.0': + resolution: {integrity: sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==} + cpu: [arm64] os: [linux] '@rollup/rollup-linux-powerpc64le-gnu@4.18.1': @@ -776,9 +771,9 @@ packages: cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.16.1': - resolution: {integrity: sha512-uU8zuGkQfGqfD9w6VRJZI4IuG4JIfNxxJgEmLMAmPVHREKGsxFVfgHy5c6CexQF2vOfgjB33OsET3Vdn2lln9A==} - cpu: [riscv64] + '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': + resolution: {integrity: sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==} + cpu: [ppc64] os: [linux] '@rollup/rollup-linux-riscv64-gnu@4.18.1': @@ -786,9 +781,9 @@ packages: cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.16.1': - resolution: {integrity: sha512-lsjLtDgtcGFEuBP6yrXwkRN5/wKlvUZtfbKZZu0yaoNpiBL4epgnO21osAALIspVRnl4qZgyLFd8xjCYYWgwfw==} - cpu: [s390x] + '@rollup/rollup-linux-riscv64-gnu@4.19.0': + resolution: {integrity: sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==} + cpu: [riscv64] os: [linux] '@rollup/rollup-linux-s390x-gnu@4.18.1': @@ -796,9 +791,9 @@ packages: cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.16.1': - resolution: {integrity: sha512-N2ZizKhUryqqrMfdCnjhJhZRgv61C6gK+hwVtCIKC8ts8J+go+vqENnGexwg21nHIOvLN5mBM8a7DI2vlyIOPg==} - cpu: [x64] + '@rollup/rollup-linux-s390x-gnu@4.19.0': + resolution: {integrity: sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==} + cpu: [s390x] os: [linux] '@rollup/rollup-linux-x64-gnu@4.18.1': @@ -806,8 +801,8 @@ packages: cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.16.1': - resolution: {integrity: sha512-5ICeMxqg66FrOA2AbnBQ2TJVxfvZsKLxmof0ibvPLaYtbsJqnTUtJOofgWb46Gjd4uZcA4rdsp4JCxegzQPqCg==} + '@rollup/rollup-linux-x64-gnu@4.19.0': + resolution: {integrity: sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==} cpu: [x64] os: [linux] @@ -816,19 +811,19 @@ packages: cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.16.1': - resolution: {integrity: sha512-1vIP6Ce02L+qWD7uZYRiFiuAJo3m9kARatWmFSnss0gZnVj2Id7OPUU9gm49JPGasgcR3xMqiH3fqBJ8t00yVg==} - cpu: [arm64] - os: [win32] + '@rollup/rollup-linux-x64-musl@4.19.0': + resolution: {integrity: sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==} + cpu: [x64] + os: [linux] '@rollup/rollup-win32-arm64-msvc@4.18.1': resolution: {integrity: sha512-W2ZNI323O/8pJdBGil1oCauuCzmVd9lDmWBBqxYZcOqWD6aWqJtVBQ1dFrF4dYpZPks6F+xCZHfzG5hYlSHZ6g==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.16.1': - resolution: {integrity: sha512-Y3M92DcVsT6LoP+wrKpoUWPaazaP1fzbNkp0a0ZSj5Y//+pQVfVe/tQdsYQQy7dwXR30ZfALUIc9PCh9Izir6w==} - cpu: [ia32] + '@rollup/rollup-win32-arm64-msvc@4.19.0': + resolution: {integrity: sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==} + cpu: [arm64] os: [win32] '@rollup/rollup-win32-ia32-msvc@4.18.1': @@ -836,9 +831,9 @@ packages: cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.16.1': - resolution: {integrity: sha512-x0fvpHMuF7fK5r8oZxSi8VYXkrVmRgubXpO/wcf15Lk3xZ4Jvvh5oG+u7Su1776A7XzVKZhD2eRc4t7H50gL3w==} - cpu: [x64] + '@rollup/rollup-win32-ia32-msvc@4.19.0': + resolution: {integrity: sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==} + cpu: [ia32] os: [win32] '@rollup/rollup-win32-x64-msvc@4.18.1': @@ -846,12 +841,10 @@ packages: cpu: [x64] os: [win32] - '@sec-ant/readable-stream@0.4.1': - resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} - - '@sindresorhus/merge-streams@4.0.0': - resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} - engines: {node: '>=18'} + '@rollup/rollup-win32-x64-msvc@4.19.0': + resolution: {integrity: sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==} + cpu: [x64] + os: [win32] '@swc/core-darwin-arm64@1.5.5': resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} @@ -934,29 +927,29 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@20.14.11': - resolution: {integrity: sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==} + '@types/node@20.14.12': + resolution: {integrity: sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@vitest/expect@2.0.3': - resolution: {integrity: sha512-X6AepoOYePM0lDNUPsGXTxgXZAl3EXd0GYe/MZyVE4HzkUqyUVC6S3PrY5mClDJ6/7/7vALLMV3+xD/Ko60Hqg==} + '@vitest/expect@2.0.4': + resolution: {integrity: sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==} - '@vitest/pretty-format@2.0.3': - resolution: {integrity: sha512-URM4GLsB2xD37nnTyvf6kfObFafxmycCL8un3OC9gaCs5cti2u+5rJdIflZ2fUJUen4NbvF6jCufwViAFLvz1g==} + '@vitest/pretty-format@2.0.4': + resolution: {integrity: sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==} - '@vitest/runner@2.0.3': - resolution: {integrity: sha512-EmSP4mcjYhAcuBWwqgpjR3FYVeiA4ROzRunqKltWjBfLNs1tnMLtF+qtgd5ClTwkDP6/DGlKJTNa6WxNK0bNYQ==} + '@vitest/runner@2.0.4': + resolution: {integrity: sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==} - '@vitest/snapshot@2.0.3': - resolution: {integrity: sha512-6OyA6v65Oe3tTzoSuRPcU6kh9m+mPL1vQ2jDlPdn9IQoUxl8rXhBnfICNOC+vwxWY684Vt5UPgtcA2aPFBb6wg==} + '@vitest/snapshot@2.0.4': + resolution: {integrity: sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==} - '@vitest/spy@2.0.3': - resolution: {integrity: sha512-sfqyAw/ypOXlaj4S+w8689qKM1OyPOqnonqOc9T91DsoHbfN5mU7FdifWWv3MtQFf0lEUstEwR9L/q/M390C+A==} + '@vitest/spy@2.0.4': + resolution: {integrity: sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==} - '@vitest/utils@2.0.3': - resolution: {integrity: sha512-c/UdELMuHitQbbc/EVctlBaxoYAwQPQdSNwv7z/vHyBKy2edYZaFgptE27BRueZB7eW8po+cllotMNTDpL3HWg==} + '@vitest/utils@2.0.4': + resolution: {integrity: sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -1180,10 +1173,6 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - execa@9.3.0: - resolution: {integrity: sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==} - engines: {node: ^18.19.0 || >=20.5.0} - extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} @@ -1198,10 +1187,6 @@ packages: fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} - figures@6.1.0: - resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} - engines: {node: '>=18'} - fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -1245,10 +1230,6 @@ packages: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} - get-stream@9.0.1: - resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} - engines: {node: '>=18'} - glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -1284,10 +1265,6 @@ packages: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} - human-signals@7.0.0: - resolution: {integrity: sha512-74kytxOUSvNbjrT9KisAbaTZ/eJwD/LrbM/kh5j0IhPuJzwuA19dWvniFGwBzN9rVjg+O/e+F310PjObDXS+9Q==} - engines: {node: '>=18.18.0'} - iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -1322,10 +1299,6 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-plain-obj@4.1.0: - resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} - engines: {node: '>=12'} - is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} @@ -1334,18 +1307,10 @@ packages: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - is-stream@4.0.1: - resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} - engines: {node: '>=18'} - is-subdir@1.2.0: resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==} engines: {node: '>=4'} - is-unicode-supported@2.0.0: - resolution: {integrity: sha512-FRdAyx5lusK1iHG0TWpVtk9+1i+GjrzRffhDg4ovQ7mcidMQ6mj+MhKPmvh7Xwyv5gIS06ns49CA7Sqg7lC22Q==} - engines: {node: '>=18'} - is-windows@1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} engines: {node: '>=0.10.0'} @@ -1555,10 +1520,6 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - parse-ms@4.0.0: - resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} - engines: {node: '>=18'} - path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -1641,10 +1602,6 @@ packages: engines: {node: '>=14'} hasBin: true - pretty-ms@9.0.0: - resolution: {integrity: sha512-E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==} - engines: {node: '>=18'} - pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -1682,13 +1639,13 @@ packages: engines: {node: '>=14'} hasBin: true - rollup@4.16.1: - resolution: {integrity: sha512-5CaD3MPDlPKfhqzRvWXK96G6ELJfPZNb3LHiZxTHgDdC6jvwfGz2E8nY+9g1ONk4ttHsK1WaFP19Js4PSr1E3g==} + rollup@4.18.1: + resolution: {integrity: sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rollup@4.18.1: - resolution: {integrity: sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A==} + rollup@4.19.0: + resolution: {integrity: sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1792,10 +1749,6 @@ packages: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} - strip-final-newline@4.0.0: - resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} - engines: {node: '>=18'} - sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} engines: {node: '>=16 || 14 >=14.17'} @@ -1871,8 +1824,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.2.0: - resolution: {integrity: sha512-XoarnVlfXxbv8ODHtxUq8D2XPc9luX+pamnp1kHSKLknKCDcX0Rkc21NHdbpugH6hKoNiETXypKKVgVu46vVRg==} + tsup@8.2.3: + resolution: {integrity: sha512-6YNT44oUfXRbZuSMNmN36GzwPPIlD2wBccY7looM2fkTcxkf2NEmwr3OZuDZoySklnrIG4hoEtzy8yUXYOqNcg==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1890,42 +1843,42 @@ packages: typescript: optional: true - turbo-darwin-64@2.0.7: - resolution: {integrity: sha512-J1RBvQGqKeUwLJrZbfrm4tHshagdMeGAwd7rpLpfUrw0PNmGfcBazJf6dIGXG59/GHzJmS0/eAZ8qDchfVbIFA==} + turbo-darwin-64@2.0.9: + resolution: {integrity: sha512-owlGsOaExuVGBUfrnJwjkL1BWlvefjSKczEAcpLx4BI7Oh6ttakOi+JyomkPkFlYElRpjbvlR2gP8WIn6M/+xQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.0.7: - resolution: {integrity: sha512-h1JK8uuEjoHx1SvvTZiottj+4kDmiv+hivnLUzNwO75qKblMsd38IsFB0J2sMRz7JacFlf+3ry8SItznBW67Xw==} + turbo-darwin-arm64@2.0.9: + resolution: {integrity: sha512-XAXkKkePth5ZPPE/9G9tTnPQx0C8UTkGWmNGYkpmGgRr8NedW+HrPsi9N0HcjzzIH9A4TpNYvtiV+WcwdaEjKA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.0.7: - resolution: {integrity: sha512-dsr7GFeHAYVMnXWDDjhpsAQetejU4OlkNBRA5hfmnIcl2sSyOYa3EvoeJ6j5z5vTNIJ9VO4I1h0jK3lTjEoonA==} + turbo-linux-64@2.0.9: + resolution: {integrity: sha512-l9wSgEjrCFM1aG16zItBsZ206ZlhSSx1owB8Cgskfv0XyIXRGHRkluihiaxkp+UeU5WoEfz4EN5toc+ICA0q0w==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.0.7: - resolution: {integrity: sha512-bJbwXvyX1XPzY1jHgkqggls/L4yFyHVK8GGACF3kcg6x7lYV2SXkUYRyOC3WqzW7euqa9Zw/32jrIPP4Qy31Vw==} + turbo-linux-arm64@2.0.9: + resolution: {integrity: sha512-gRnjxXRne18B27SwxXMqL3fJu7jw/8kBrOBTBNRSmZZiG1Uu3nbnP7b4lgrA/bCku6C0Wligwqurvtpq6+nFHA==} cpu: [arm64] os: [linux] - turbo-windows-64@2.0.7: - resolution: {integrity: sha512-aBH+5A7IN957MqXMrw8xN0CWtH/fPFL+xTlloO6074Eaa8WfnctSAnaSujm6f4xF2T8lFx+ZprBvnO9oKvLQQQ==} + turbo-windows-64@2.0.9: + resolution: {integrity: sha512-ZVo0apxUvaRq4Vm1qhsfqKKhtRgReYlBVf9MQvVU1O9AoyydEQvLDO1ryqpXDZWpcHoFxHAQc9msjAMtE5K2lA==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.0.7: - resolution: {integrity: sha512-ButUCpO5nTi+jyTSIY2mQ9dVz+mCGxJ6sHyn0xGlNoJWdisKXb0BtWCLAjM26gg/yp9Kt1MBowMQyYVruPV0Qw==} + turbo-windows-arm64@2.0.9: + resolution: {integrity: sha512-sGRz7c5Pey6y7y9OKi8ypbWNuIRPF9y8xcMqL56OZifSUSo+X2EOsOleR9MKxQXVaqHPGOUKWsE6y8hxBi9pag==} cpu: [arm64] os: [win32] - turbo@2.0.7: - resolution: {integrity: sha512-76iNWZpmKAKjj+yL0Wtcu2LpDIM5Nz7JS3fHOZPYS0AKuC2boJ24276VAiK4PKwbpBB//TYKDpSLuQ6cfR49pg==} + turbo@2.0.9: + resolution: {integrity: sha512-QaLaUL1CqblSKKPgLrFW3lZWkWG4pGBQNW+q1ScJB5v1D/nFWtsrD/yZljW/bdawg90ihi4/ftQJ3h6fz1FamA==} hasBin: true - typescript@5.5.3: - resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} + typescript@5.5.4: + resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} engines: {node: '>=14.17'} hasBin: true @@ -1939,8 +1892,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@2.0.3: - resolution: {integrity: sha512-14jzwMx7XTcMB+9BhGQyoEAmSl0eOr3nrnn+Z12WNERtOvLN+d2scbRUvyni05rT3997Bg+rZb47NyP4IQPKXg==} + vite-node@2.0.4: + resolution: {integrity: sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -1972,15 +1925,15 @@ packages: terser: optional: true - vitest@2.0.3: - resolution: {integrity: sha512-o3HRvU93q6qZK4rI2JrhKyZMMuxg/JRt30E6qeQs6ueaiz5hr1cPj+Sk2kATgQzMMqsa2DiNI0TIK++1ULx8Jw==} + vitest@2.0.4: + resolution: {integrity: sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.0.3 - '@vitest/ui': 2.0.3 + '@vitest/browser': 2.0.4 + '@vitest/ui': 2.0.4 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2019,8 +1972,8 @@ packages: engines: {node: '>= 8'} hasBin: true - why-is-node-running@2.2.2: - resolution: {integrity: sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==} + why-is-node-running@2.3.0: + resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==} engines: {node: '>=8'} hasBin: true @@ -2046,10 +1999,6 @@ packages: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'} - yoctocolors@2.1.1: - resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==} - engines: {node: '>=18'} - snapshots: '@ampproject/remapping@2.3.0': @@ -2487,105 +2436,101 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@rollup/rollup-android-arm-eabi@4.16.1': - optional: true - '@rollup/rollup-android-arm-eabi@4.18.1': optional: true - '@rollup/rollup-android-arm64@4.16.1': + '@rollup/rollup-android-arm-eabi@4.19.0': optional: true '@rollup/rollup-android-arm64@4.18.1': optional: true - '@rollup/rollup-darwin-arm64@4.16.1': + '@rollup/rollup-android-arm64@4.19.0': optional: true '@rollup/rollup-darwin-arm64@4.18.1': optional: true - '@rollup/rollup-darwin-x64@4.16.1': + '@rollup/rollup-darwin-arm64@4.19.0': optional: true '@rollup/rollup-darwin-x64@4.18.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.16.1': + '@rollup/rollup-darwin-x64@4.19.0': optional: true '@rollup/rollup-linux-arm-gnueabihf@4.18.1': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.16.1': + '@rollup/rollup-linux-arm-gnueabihf@4.19.0': optional: true '@rollup/rollup-linux-arm-musleabihf@4.18.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.16.1': + '@rollup/rollup-linux-arm-musleabihf@4.19.0': optional: true '@rollup/rollup-linux-arm64-gnu@4.18.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.16.1': + '@rollup/rollup-linux-arm64-gnu@4.19.0': optional: true '@rollup/rollup-linux-arm64-musl@4.18.1': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.16.1': + '@rollup/rollup-linux-arm64-musl@4.19.0': optional: true '@rollup/rollup-linux-powerpc64le-gnu@4.18.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.16.1': + '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': optional: true '@rollup/rollup-linux-riscv64-gnu@4.18.1': optional: true - '@rollup/rollup-linux-s390x-gnu@4.16.1': + '@rollup/rollup-linux-riscv64-gnu@4.19.0': optional: true '@rollup/rollup-linux-s390x-gnu@4.18.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.16.1': + '@rollup/rollup-linux-s390x-gnu@4.19.0': optional: true '@rollup/rollup-linux-x64-gnu@4.18.1': optional: true - '@rollup/rollup-linux-x64-musl@4.16.1': + '@rollup/rollup-linux-x64-gnu@4.19.0': optional: true '@rollup/rollup-linux-x64-musl@4.18.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.16.1': + '@rollup/rollup-linux-x64-musl@4.19.0': optional: true '@rollup/rollup-win32-arm64-msvc@4.18.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.16.1': + '@rollup/rollup-win32-arm64-msvc@4.19.0': optional: true '@rollup/rollup-win32-ia32-msvc@4.18.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.16.1': + '@rollup/rollup-win32-ia32-msvc@4.19.0': optional: true '@rollup/rollup-win32-x64-msvc@4.18.1': optional: true - '@sec-ant/readable-stream@0.4.1': {} - - '@sindresorhus/merge-streams@4.0.0': {} + '@rollup/rollup-win32-x64-msvc@4.19.0': + optional: true '@swc/core-darwin-arm64@1.5.5': optional: true @@ -2646,41 +2591,41 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@20.14.11': + '@types/node@20.14.12': dependencies: undici-types: 5.26.5 '@types/semver@7.5.8': {} - '@vitest/expect@2.0.3': + '@vitest/expect@2.0.4': dependencies: - '@vitest/spy': 2.0.3 - '@vitest/utils': 2.0.3 + '@vitest/spy': 2.0.4 + '@vitest/utils': 2.0.4 chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/pretty-format@2.0.3': + '@vitest/pretty-format@2.0.4': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.0.3': + '@vitest/runner@2.0.4': dependencies: - '@vitest/utils': 2.0.3 + '@vitest/utils': 2.0.4 pathe: 1.1.2 - '@vitest/snapshot@2.0.3': + '@vitest/snapshot@2.0.4': dependencies: - '@vitest/pretty-format': 2.0.3 + '@vitest/pretty-format': 2.0.4 magic-string: 0.30.10 pathe: 1.1.2 - '@vitest/spy@2.0.3': + '@vitest/spy@2.0.4': dependencies: tinyspy: 3.0.0 - '@vitest/utils@2.0.3': + '@vitest/utils@2.0.4': dependencies: - '@vitest/pretty-format': 2.0.3 + '@vitest/pretty-format': 2.0.4 estree-walker: 3.0.3 loupe: 3.1.1 tinyrainbow: 1.2.0 @@ -2942,21 +2887,6 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - execa@9.3.0: - dependencies: - '@sindresorhus/merge-streams': 4.0.0 - cross-spawn: 7.0.3 - figures: 6.1.0 - get-stream: 9.0.1 - human-signals: 7.0.0 - is-plain-obj: 4.1.0 - is-stream: 4.0.1 - npm-run-path: 5.3.0 - pretty-ms: 9.0.0 - signal-exit: 4.1.0 - strip-final-newline: 4.0.0 - yoctocolors: 2.1.1 - extendable-error@0.1.7: {} external-editor@3.1.0: @@ -2977,10 +2907,6 @@ snapshots: dependencies: reusify: 1.0.4 - figures@6.1.0: - dependencies: - is-unicode-supported: 2.0.0 - fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 @@ -3026,11 +2952,6 @@ snapshots: get-stream@8.0.1: {} - get-stream@9.0.1: - dependencies: - '@sec-ant/readable-stream': 0.4.1 - is-stream: 4.0.1 - glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -3064,8 +2985,6 @@ snapshots: human-signals@5.0.0: {} - human-signals@7.0.0: {} - iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2 @@ -3090,20 +3009,14 @@ snapshots: is-number@7.0.0: {} - is-plain-obj@4.1.0: {} - is-stream@2.0.1: {} is-stream@3.0.0: {} - is-stream@4.0.1: {} - is-subdir@1.2.0: dependencies: better-path-resolve: 1.0.0 - is-unicode-supported@2.0.0: {} - is-windows@1.0.2: {} isexe@2.0.0: {} @@ -3292,8 +3205,6 @@ snapshots: p-try@2.2.0: {} - parse-ms@4.0.0: {} - path-exists@4.0.0: {} path-key@3.1.1: {} @@ -3347,10 +3258,6 @@ snapshots: prettier@3.3.3: {} - pretty-ms@9.0.0: - dependencies: - parse-ms: 4.0.0 - pseudomap@1.0.2: {} pstree.remy@1.1.8: {} @@ -3380,28 +3287,6 @@ snapshots: dependencies: glob: 10.3.10 - rollup@4.16.1: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.16.1 - '@rollup/rollup-android-arm64': 4.16.1 - '@rollup/rollup-darwin-arm64': 4.16.1 - '@rollup/rollup-darwin-x64': 4.16.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.16.1 - '@rollup/rollup-linux-arm-musleabihf': 4.16.1 - '@rollup/rollup-linux-arm64-gnu': 4.16.1 - '@rollup/rollup-linux-arm64-musl': 4.16.1 - '@rollup/rollup-linux-powerpc64le-gnu': 4.16.1 - '@rollup/rollup-linux-riscv64-gnu': 4.16.1 - '@rollup/rollup-linux-s390x-gnu': 4.16.1 - '@rollup/rollup-linux-x64-gnu': 4.16.1 - '@rollup/rollup-linux-x64-musl': 4.16.1 - '@rollup/rollup-win32-arm64-msvc': 4.16.1 - '@rollup/rollup-win32-ia32-msvc': 4.16.1 - '@rollup/rollup-win32-x64-msvc': 4.16.1 - fsevents: 2.3.3 - rollup@4.18.1: dependencies: '@types/estree': 1.0.5 @@ -3424,6 +3309,28 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.18.1 fsevents: 2.3.3 + rollup@4.19.0: + dependencies: + '@types/estree': 1.0.5 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.19.0 + '@rollup/rollup-android-arm64': 4.19.0 + '@rollup/rollup-darwin-arm64': 4.19.0 + '@rollup/rollup-darwin-x64': 4.19.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.19.0 + '@rollup/rollup-linux-arm-musleabihf': 4.19.0 + '@rollup/rollup-linux-arm64-gnu': 4.19.0 + '@rollup/rollup-linux-arm64-musl': 4.19.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.19.0 + '@rollup/rollup-linux-riscv64-gnu': 4.19.0 + '@rollup/rollup-linux-s390x-gnu': 4.19.0 + '@rollup/rollup-linux-x64-gnu': 4.19.0 + '@rollup/rollup-linux-x64-musl': 4.19.0 + '@rollup/rollup-win32-arm64-msvc': 4.19.0 + '@rollup/rollup-win32-ia32-msvc': 4.19.0 + '@rollup/rollup-win32-x64-msvc': 4.19.0 + fsevents: 2.3.3 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -3505,8 +3412,6 @@ snapshots: strip-final-newline@3.0.0: {} - strip-final-newline@4.0.0: {} - sucrase@3.35.0: dependencies: '@jridgewell/gen-mapping': 0.3.3 @@ -3582,7 +3487,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.2.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.3): + tsup@8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4): dependencies: bundle-require: 5.0.0(esbuild@0.23.0) cac: 6.7.14 @@ -3593,50 +3498,51 @@ snapshots: execa: 5.1.1 globby: 11.1.0 joycon: 3.1.1 + picocolors: 1.0.1 postcss-load-config: 6.0.1(jiti@1.21.6)(postcss@8.4.38) resolve-from: 5.0.0 - rollup: 4.18.1 + rollup: 4.19.0 source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.5.3 + typescript: 5.5.4 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.0.7: + turbo-darwin-64@2.0.9: optional: true - turbo-darwin-arm64@2.0.7: + turbo-darwin-arm64@2.0.9: optional: true - turbo-linux-64@2.0.7: + turbo-linux-64@2.0.9: optional: true - turbo-linux-arm64@2.0.7: + turbo-linux-arm64@2.0.9: optional: true - turbo-windows-64@2.0.7: + turbo-windows-64@2.0.9: optional: true - turbo-windows-arm64@2.0.7: + turbo-windows-arm64@2.0.9: optional: true - turbo@2.0.7: + turbo@2.0.9: optionalDependencies: - turbo-darwin-64: 2.0.7 - turbo-darwin-arm64: 2.0.7 - turbo-linux-64: 2.0.7 - turbo-linux-arm64: 2.0.7 - turbo-windows-64: 2.0.7 - turbo-windows-arm64: 2.0.7 + turbo-darwin-64: 2.0.9 + turbo-darwin-arm64: 2.0.9 + turbo-linux-64: 2.0.9 + turbo-linux-arm64: 2.0.9 + turbo-windows-64: 2.0.9 + turbo-windows-arm64: 2.0.9 - typescript@5.5.3: {} + typescript@5.5.4: {} undefsafe@2.0.5: {} @@ -3644,13 +3550,13 @@ snapshots: universalify@0.1.2: {} - vite-node@2.0.3(@types/node@20.14.11): + vite-node@2.0.4(@types/node@20.14.12): dependencies: cac: 6.7.14 debug: 4.3.5 pathe: 1.1.2 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@20.14.11) + vite: 5.2.10(@types/node@20.14.12) transitivePeerDependencies: - '@types/node' - less @@ -3661,24 +3567,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@20.14.11): + vite@5.2.10(@types/node@20.14.12): dependencies: esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.16.1 + rollup: 4.18.1 optionalDependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 fsevents: 2.3.3 - vitest@2.0.3(@types/node@20.14.11): + vitest@2.0.4(@types/node@20.14.12): dependencies: '@ampproject/remapping': 2.3.0 - '@vitest/expect': 2.0.3 - '@vitest/pretty-format': 2.0.3 - '@vitest/runner': 2.0.3 - '@vitest/snapshot': 2.0.3 - '@vitest/spy': 2.0.3 - '@vitest/utils': 2.0.3 + '@vitest/expect': 2.0.4 + '@vitest/pretty-format': 2.0.4 + '@vitest/runner': 2.0.4 + '@vitest/snapshot': 2.0.4 + '@vitest/spy': 2.0.4 + '@vitest/utils': 2.0.4 chai: 5.1.1 debug: 4.3.5 execa: 8.0.1 @@ -3688,11 +3594,11 @@ snapshots: tinybench: 2.8.0 tinypool: 1.0.0 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@20.14.11) - vite-node: 2.0.3(@types/node@20.14.11) - why-is-node-running: 2.2.2 + vite: 5.2.10(@types/node@20.14.12) + vite-node: 2.0.4(@types/node@20.14.12) + why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 20.14.11 + '@types/node': 20.14.12 transitivePeerDependencies: - less - lightningcss @@ -3725,7 +3631,7 @@ snapshots: dependencies: isexe: 2.0.0 - why-is-node-running@2.2.2: + why-is-node-running@2.3.0: dependencies: siginfo: 2.0.0 stackback: 0.0.2 @@ -3749,5 +3655,3 @@ snapshots: yallist@5.0.0: {} yocto-queue@0.1.0: {} - - yoctocolors@2.1.1: {} From d064cb31a99063b8fdd36bf8e0357f05fffd34fe Mon Sep 17 00:00:00 2001 From: Daniel Afonso Date: Wed, 21 Aug 2024 15:46:06 +0100 Subject: [PATCH 122/290] refactor: change Solid-Start to SolidStart --- docs/vitepress_docs/.vitepress/config.ts | 2 +- docs/vitepress_docs/start-commands.md | 4 ++-- packages/utils/src/translations/translations.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/vitepress_docs/.vitepress/config.ts b/docs/vitepress_docs/.vitepress/config.ts index d82218a..754f6c0 100644 --- a/docs/vitepress_docs/.vitepress/config.ts +++ b/docs/vitepress_docs/.vitepress/config.ts @@ -18,7 +18,7 @@ export default defineConfig({ { text: "About", link: "/about" }, { text: "Installation", link: "/installation" }, { text: "Basic Commands", link: "/basic-commands" }, - { text: "Solid-Start Commands", link: "/start-commands" }, + { text: "SolidStart Commands", link: "/start-commands" }, ], }, { text: "Supported Integrations", link: "/supported-integrations" }, diff --git a/docs/vitepress_docs/start-commands.md b/docs/vitepress_docs/start-commands.md index 2ffa10d..28bfffd 100644 --- a/docs/vitepress_docs/start-commands.md +++ b/docs/vitepress_docs/start-commands.md @@ -1,4 +1,4 @@ -# Solid-Start Commands +# SolidStart Commands ### `Mode` @@ -39,7 +39,7 @@ Creates a new route file in the file routes directory. solid start adapter ``` -Used to setup a Solid-Start specific adapter. +Used to setup a SolidStart specific adapter. **Options** diff --git a/packages/utils/src/translations/translations.ts b/packages/utils/src/translations/translations.ts index 59a643e..7ca1614 100644 --- a/packages/utils/src/translations/translations.ts +++ b/packages/utils/src/translations/translations.ts @@ -78,9 +78,9 @@ const TRANSLATIONS = { ja: "作成するフォルダーの名前", }, IS_START_PROJECT: { - en: "Is this a Solid-Start project?", - es: "¿Es este un proyecto de Solid-Start?", - fr: "Est-ce un projet Solid-Start ?", + en: "Is this a SolidStart project?", + es: "¿Es este un proyecto de SolidStart?", + fr: "Est-ce un projet SolidStart?", ja: "これはソリッドスタートプロジェクトですか?", }, START_MODE: { From e9d48ca8c39f92b4ccd59442d2b970d7f1774f5e Mon Sep 17 00:00:00 2001 From: Joe Pea Date: Sat, 24 Aug 2024 13:35:15 -0700 Subject: [PATCH 123/290] add app.config.timestamp_*.js to gitignore --- packages/commands/src/handlers/new.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index dc01211..5afc5fc 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -17,6 +17,7 @@ dist .vercel .netlify .vinxi +app.config.timestamp_*.js # Environment .env From a308b99118ce94d97cae829f87af087db7572c2f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 Aug 2024 23:02:25 +0100 Subject: [PATCH 124/290] bump deps --- package.json | 4 +- packages/commands/package.json | 4 +- packages/core/package.json | 4 +- packages/create-solid/package.json | 4 +- packages/reactivity/package.json | 2 +- packages/ui/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 373 +++++++++-------------------- 8 files changed, 123 insertions(+), 278 deletions(-) diff --git a/package.json b/package.json index a0d083f..c6ec280 100644 --- a/package.json +++ b/package.json @@ -37,8 +37,8 @@ "@changesets/cli": "2.27.7", "nodemon": "^3.1.4", "prettier": "^3.3.3", - "turbo": "^2.0.9", - "vitest": "^2.0.4" + "turbo": "^2.0.14", + "vitest": "^2.0.5" }, "packageManager": "pnpm@9.6.0" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 8bdefd1..9fbff3e 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,9 +33,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.14.12", + "@types/node": "^22.5.0", "prettier": "^3.3.3", - "tsup": "^8.2.3", + "tsup": "^8.2.4", "typescript": "^5.5.4" }, "publishConfig": { diff --git a/packages/core/package.json b/packages/core/package.json index 18fe9b3..ff8b744 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,9 +40,9 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^20.14.12", + "@types/node": "^22.5.0", "jiti": "^1.21.6", - "tsup": "^8.2.3", + "tsup": "^8.2.4", "typescript": "^5.5.4" }, "publishConfig": { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index fba8591..384614c 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,11 +31,11 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^20.14.12", + "@types/node": "^22.5.0", "cmd-ts": "^0.13.0", "jiti": "^1.21.6", "picocolors": "^1.0.1", - "tsup": "^8.2.3", + "tsup": "^8.2.4", "typescript": "^5.5.4" }, "publishConfig": { diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 0d6e380..d3d3ef1 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,7 +28,7 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.2.3", + "tsup": "^8.2.4", "typescript": "^5.5.4" }, "publishConfig": { diff --git a/packages/ui/package.json b/packages/ui/package.json index cbded51..4d88f22 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.2.3", + "tsup": "^8.2.4", "typescript": "^5.5.4", - "@types/node": "20.14.12" + "@types/node": "22.5.0" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 8a4de53..9398915 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,12 +63,12 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "20.14.12", + "@types/node": "22.5.0", "jiti": "^1.21.6", "magicast": "^0.3.4", - "tsup": "^8.2.3", + "tsup": "^8.2.4", "typescript": "^5.5.4", - "vitest": "^2.0.4" + "vitest": "^2.0.5" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8da1056..883f630 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -18,11 +18,11 @@ importers: specifier: ^3.3.3 version: 3.3.3 turbo: - specifier: ^2.0.9 - version: 2.0.9 + specifier: ^2.0.14 + version: 2.0.14 vitest: - specifier: ^2.0.4 - version: 2.0.4(@types/node@20.14.12) + specifier: ^2.0.5 + version: 2.0.5(@types/node@22.5.0) packages/commands: dependencies: @@ -55,14 +55,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.14.12 - version: 20.14.12 + specifier: ^22.5.0 + version: 22.5.0 prettier: specifier: ^3.3.3 version: 3.3.3 tsup: - specifier: ^8.2.3 - version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.2.4 + version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -107,14 +107,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^20.14.12 - version: 20.14.12 + specifier: ^22.5.0 + version: 22.5.0 jiti: specifier: ^1.21.6 version: 1.21.6 tsup: - specifier: ^8.2.3 - version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.2.4 + version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -128,8 +128,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^20.14.12 - version: 20.14.12 + specifier: ^22.5.0 + version: 22.5.0 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -140,8 +140,8 @@ importers: specifier: ^1.0.1 version: 1.0.1 tsup: - specifier: ^8.2.3 - version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.2.4 + version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -149,8 +149,8 @@ importers: packages/reactivity: devDependencies: tsup: - specifier: ^8.2.3 - version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.2.4 + version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -174,11 +174,11 @@ importers: version: 1.0.1 devDependencies: '@types/node': - specifier: 20.14.12 - version: 20.14.12 + specifier: 22.5.0 + version: 22.5.0 tsup: - specifier: ^8.2.3 - version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.2.4 + version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 @@ -211,8 +211,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 20.14.12 - version: 20.14.12 + specifier: 22.5.0 + version: 22.5.0 jiti: specifier: ^1.21.6 version: 1.21.6 @@ -220,14 +220,14 @@ importers: specifier: ^0.3.4 version: 0.3.4 tsup: - specifier: ^8.2.3 - version: 8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.2.4 + version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) typescript: specifier: ^5.5.4 version: 5.5.4 vitest: - specifier: ^2.0.4 - version: 2.0.4(@types/node@20.14.12) + specifier: ^2.0.5 + version: 2.0.5(@types/node@22.5.0) packages: @@ -686,161 +686,81 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@rollup/rollup-android-arm-eabi@4.18.1': - resolution: {integrity: sha512-lncuC4aHicncmbORnx+dUaAgzee9cm/PbIqgWz1PpXuwc+sa1Ct83tnqUDy/GFKleLiN7ZIeytM6KJ4cAn1SxA==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.19.0': resolution: {integrity: sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.18.1': - resolution: {integrity: sha512-F/tkdw0WSs4ojqz5Ovrw5r9odqzFjb5LIgHdHZG65dFI1lWTWRVy32KDJLKRISHgJvqUeUhdIvy43fX41znyDg==} - cpu: [arm64] - os: [android] - '@rollup/rollup-android-arm64@4.19.0': resolution: {integrity: sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.18.1': - resolution: {integrity: sha512-vk+ma8iC1ebje/ahpxpnrfVQJibTMyHdWpOGZ3JpQ7Mgn/3QNHmPq7YwjZbIE7km73dH5M1e6MRRsnEBW7v5CQ==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-arm64@4.19.0': resolution: {integrity: sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.18.1': - resolution: {integrity: sha512-IgpzXKauRe1Tafcej9STjSSuG0Ghu/xGYH+qG6JwsAUxXrnkvNHcq/NL6nz1+jzvWAnQkuAJ4uIwGB48K9OCGA==} - cpu: [x64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.19.0': resolution: {integrity: sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.18.1': - resolution: {integrity: sha512-P9bSiAUnSSM7EmyRK+e5wgpqai86QOSv8BwvkGjLwYuOpaeomiZWifEos517CwbG+aZl1T4clSE1YqqH2JRs+g==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.19.0': resolution: {integrity: sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.18.1': - resolution: {integrity: sha512-5RnjpACoxtS+aWOI1dURKno11d7krfpGDEn19jI8BuWmSBbUC4ytIADfROM1FZrFhQPSoP+KEa3NlEScznBTyQ==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.19.0': resolution: {integrity: sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.18.1': - resolution: {integrity: sha512-8mwmGD668m8WaGbthrEYZ9CBmPug2QPGWxhJxh/vCgBjro5o96gL04WLlg5BA233OCWLqERy4YUzX3bJGXaJgQ==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.19.0': resolution: {integrity: sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.18.1': - resolution: {integrity: sha512-dJX9u4r4bqInMGOAQoGYdwDP8lQiisWb9et+T84l2WXk41yEej8v2iGKodmdKimT8cTAYt0jFb+UEBxnPkbXEQ==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-musl@4.19.0': resolution: {integrity: sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.18.1': - resolution: {integrity: sha512-V72cXdTl4EI0x6FNmho4D502sy7ed+LuVW6Ym8aI6DRQ9hQZdp5sj0a2usYOlqvFBNKQnLQGwmYnujo2HvjCxQ==} - cpu: [ppc64] - os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': resolution: {integrity: sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.18.1': - resolution: {integrity: sha512-f+pJih7sxoKmbjghrM2RkWo2WHUW8UbfxIQiWo5yeCaCM0TveMEuAzKJte4QskBp1TIinpnRcxkquY+4WuY/tg==} - cpu: [riscv64] - os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.19.0': resolution: {integrity: sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.18.1': - resolution: {integrity: sha512-qb1hMMT3Fr/Qz1OKovCuUM11MUNLUuHeBC2DPPAWUYYUAOFWaxInaTwTQmc7Fl5La7DShTEpmYwgdt2hG+4TEg==} - cpu: [s390x] - os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.19.0': resolution: {integrity: sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.18.1': - resolution: {integrity: sha512-7O5u/p6oKUFYjRbZkL2FLbwsyoJAjyeXHCU3O4ndvzg2OFO2GinFPSJFGbiwFDaCFc+k7gs9CF243PwdPQFh5g==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-gnu@4.19.0': resolution: {integrity: sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.18.1': - resolution: {integrity: sha512-pDLkYITdYrH/9Cv/Vlj8HppDuLMDUBmgsM0+N+xLtFd18aXgM9Nyqupb/Uw+HeidhfYg2lD6CXvz6CjoVOaKjQ==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-musl@4.19.0': resolution: {integrity: sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.18.1': - resolution: {integrity: sha512-W2ZNI323O/8pJdBGil1oCauuCzmVd9lDmWBBqxYZcOqWD6aWqJtVBQ1dFrF4dYpZPks6F+xCZHfzG5hYlSHZ6g==} - cpu: [arm64] - os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.19.0': resolution: {integrity: sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.18.1': - resolution: {integrity: sha512-ELfEX1/+eGZYMaCIbK4jqLxO1gyTSOIlZr6pbC4SRYFaSIDVKOnZNMdoZ+ON0mrFDp4+H5MhwNC1H/AhE3zQLg==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.19.0': resolution: {integrity: sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.18.1': - resolution: {integrity: sha512-yjk2MAkQmoaPYCSu35RLJ62+dz358nE83VfTePJRp8CG7aMg25mEJYpXFiD+NcevhX8LxD5OP5tktPXnXN7GDw==} - cpu: [x64] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.19.0': resolution: {integrity: sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==} cpu: [x64] @@ -927,29 +847,29 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@20.14.12': - resolution: {integrity: sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==} + '@types/node@22.5.0': + resolution: {integrity: sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@vitest/expect@2.0.4': - resolution: {integrity: sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==} + '@vitest/expect@2.0.5': + resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==} - '@vitest/pretty-format@2.0.4': - resolution: {integrity: sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==} + '@vitest/pretty-format@2.0.5': + resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==} - '@vitest/runner@2.0.4': - resolution: {integrity: sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==} + '@vitest/runner@2.0.5': + resolution: {integrity: sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==} - '@vitest/snapshot@2.0.4': - resolution: {integrity: sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==} + '@vitest/snapshot@2.0.5': + resolution: {integrity: sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==} - '@vitest/spy@2.0.4': - resolution: {integrity: sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==} + '@vitest/spy@2.0.5': + resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==} - '@vitest/utils@2.0.4': - resolution: {integrity: sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==} + '@vitest/utils@2.0.5': + resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -1639,11 +1559,6 @@ packages: engines: {node: '>=14'} hasBin: true - rollup@4.18.1: - resolution: {integrity: sha512-Elx2UT8lzxxOXMpy5HWQGZqkrQOtrVDDa/bm9l10+U4rQnVzbL/LgZ4NOM1MPIDyHk69W4InuYDF5dzRh4Kw1A==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - rollup@4.19.0: resolution: {integrity: sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -1824,8 +1739,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.2.3: - resolution: {integrity: sha512-6YNT44oUfXRbZuSMNmN36GzwPPIlD2wBccY7looM2fkTcxkf2NEmwr3OZuDZoySklnrIG4hoEtzy8yUXYOqNcg==} + tsup@8.2.4: + resolution: {integrity: sha512-akpCPePnBnC/CXgRrcy72ZSntgIEUa1jN0oJbbvpALWKNOz1B7aM+UVDWGRGIO/T/PZugAESWDJUAb5FD48o8Q==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1843,38 +1758,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.0.9: - resolution: {integrity: sha512-owlGsOaExuVGBUfrnJwjkL1BWlvefjSKczEAcpLx4BI7Oh6ttakOi+JyomkPkFlYElRpjbvlR2gP8WIn6M/+xQ==} + turbo-darwin-64@2.0.14: + resolution: {integrity: sha512-kwfDmjNwlNfvtrvT29+ZBg5n1Wvxl891bFHchMJyzMoR0HOE9N1NSNdSZb9wG3e7sYNIu4uDkNk+VBEqJW0HzQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.0.9: - resolution: {integrity: sha512-XAXkKkePth5ZPPE/9G9tTnPQx0C8UTkGWmNGYkpmGgRr8NedW+HrPsi9N0HcjzzIH9A4TpNYvtiV+WcwdaEjKA==} + turbo-darwin-arm64@2.0.14: + resolution: {integrity: sha512-m3LXYEshCx3wc4ZClM6gb01KYpFmtjQ9IBF3A7ofjb6ahux3xlYZJZ3uFCLAGHuvGLuJ3htfiPbwlDPTdknqqw==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.0.9: - resolution: {integrity: sha512-l9wSgEjrCFM1aG16zItBsZ206ZlhSSx1owB8Cgskfv0XyIXRGHRkluihiaxkp+UeU5WoEfz4EN5toc+ICA0q0w==} + turbo-linux-64@2.0.14: + resolution: {integrity: sha512-7vBzCPdoTtR92SNn2JMgj1FlMmyonGmpMaQdgAB1OVYtuQ6NVGoh7/lODfaILqXjpvmFSVbpBIDrKOT6EvcprQ==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.0.9: - resolution: {integrity: sha512-gRnjxXRne18B27SwxXMqL3fJu7jw/8kBrOBTBNRSmZZiG1Uu3nbnP7b4lgrA/bCku6C0Wligwqurvtpq6+nFHA==} + turbo-linux-arm64@2.0.14: + resolution: {integrity: sha512-jwH+c0bfjpBf26K/tdEFatmnYyXwGROjbr6bZmNcL8R+IkGAc/cglL+OToqJnQZTgZvH7uDGbeSyUo7IsHyjuA==} cpu: [arm64] os: [linux] - turbo-windows-64@2.0.9: - resolution: {integrity: sha512-ZVo0apxUvaRq4Vm1qhsfqKKhtRgReYlBVf9MQvVU1O9AoyydEQvLDO1ryqpXDZWpcHoFxHAQc9msjAMtE5K2lA==} + turbo-windows-64@2.0.14: + resolution: {integrity: sha512-w9/XwkHSzvLjmioo6cl3S1yRfI6swxsV1j1eJwtl66JM4/pn0H2rBa855R0n7hZnmI6H5ywLt/nLt6Ae8RTDmw==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.0.9: - resolution: {integrity: sha512-sGRz7c5Pey6y7y9OKi8ypbWNuIRPF9y8xcMqL56OZifSUSo+X2EOsOleR9MKxQXVaqHPGOUKWsE6y8hxBi9pag==} + turbo-windows-arm64@2.0.14: + resolution: {integrity: sha512-XaQlyYk+Rf4xS5XWCo8XCMIpssgGGy8blzLfolN6YBp4baElIWMlkLZHDbGyiFmCbNf9I9gJI64XGRG+LVyyjA==} cpu: [arm64] os: [win32] - turbo@2.0.9: - resolution: {integrity: sha512-QaLaUL1CqblSKKPgLrFW3lZWkWG4pGBQNW+q1ScJB5v1D/nFWtsrD/yZljW/bdawg90ihi4/ftQJ3h6fz1FamA==} + turbo@2.0.14: + resolution: {integrity: sha512-00JjdCMD/cpsjP0Izkjcm8Oaor5yUCfDwODtaLb+WyblyadkaDEisGhy3Dbd5az9n+5iLSPiUgf+WjPbns6MRg==} hasBin: true typescript@5.5.4: @@ -1885,15 +1800,15 @@ packages: undefsafe@2.0.5: resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} - undici-types@5.26.5: - resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@2.0.4: - resolution: {integrity: sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==} + vite-node@2.0.5: + resolution: {integrity: sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -1925,15 +1840,15 @@ packages: terser: optional: true - vitest@2.0.4: - resolution: {integrity: sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==} + vitest@2.0.5: + resolution: {integrity: sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.0.4 - '@vitest/ui': 2.0.4 + '@vitest/browser': 2.0.5 + '@vitest/ui': 2.0.5 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2436,99 +2351,51 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@rollup/rollup-android-arm-eabi@4.18.1': - optional: true - '@rollup/rollup-android-arm-eabi@4.19.0': optional: true - '@rollup/rollup-android-arm64@4.18.1': - optional: true - '@rollup/rollup-android-arm64@4.19.0': optional: true - '@rollup/rollup-darwin-arm64@4.18.1': - optional: true - '@rollup/rollup-darwin-arm64@4.19.0': optional: true - '@rollup/rollup-darwin-x64@4.18.1': - optional: true - '@rollup/rollup-darwin-x64@4.19.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.18.1': - optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.19.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.18.1': - optional: true - '@rollup/rollup-linux-arm-musleabihf@4.19.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.18.1': - optional: true - '@rollup/rollup-linux-arm64-gnu@4.19.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.18.1': - optional: true - '@rollup/rollup-linux-arm64-musl@4.19.0': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.18.1': - optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.18.1': - optional: true - '@rollup/rollup-linux-riscv64-gnu@4.19.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.18.1': - optional: true - '@rollup/rollup-linux-s390x-gnu@4.19.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.18.1': - optional: true - '@rollup/rollup-linux-x64-gnu@4.19.0': optional: true - '@rollup/rollup-linux-x64-musl@4.18.1': - optional: true - '@rollup/rollup-linux-x64-musl@4.19.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.18.1': - optional: true - '@rollup/rollup-win32-arm64-msvc@4.19.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.18.1': - optional: true - '@rollup/rollup-win32-ia32-msvc@4.19.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.18.1': - optional: true - '@rollup/rollup-win32-x64-msvc@4.19.0': optional: true @@ -2591,41 +2458,41 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@20.14.12': + '@types/node@22.5.0': dependencies: - undici-types: 5.26.5 + undici-types: 6.19.8 '@types/semver@7.5.8': {} - '@vitest/expect@2.0.4': + '@vitest/expect@2.0.5': dependencies: - '@vitest/spy': 2.0.4 - '@vitest/utils': 2.0.4 + '@vitest/spy': 2.0.5 + '@vitest/utils': 2.0.5 chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/pretty-format@2.0.4': + '@vitest/pretty-format@2.0.5': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.0.4': + '@vitest/runner@2.0.5': dependencies: - '@vitest/utils': 2.0.4 + '@vitest/utils': 2.0.5 pathe: 1.1.2 - '@vitest/snapshot@2.0.4': + '@vitest/snapshot@2.0.5': dependencies: - '@vitest/pretty-format': 2.0.4 + '@vitest/pretty-format': 2.0.5 magic-string: 0.30.10 pathe: 1.1.2 - '@vitest/spy@2.0.4': + '@vitest/spy@2.0.5': dependencies: tinyspy: 3.0.0 - '@vitest/utils@2.0.4': + '@vitest/utils@2.0.5': dependencies: - '@vitest/pretty-format': 2.0.4 + '@vitest/pretty-format': 2.0.5 estree-walker: 3.0.3 loupe: 3.1.1 tinyrainbow: 1.2.0 @@ -3287,28 +3154,6 @@ snapshots: dependencies: glob: 10.3.10 - rollup@4.18.1: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.18.1 - '@rollup/rollup-android-arm64': 4.18.1 - '@rollup/rollup-darwin-arm64': 4.18.1 - '@rollup/rollup-darwin-x64': 4.18.1 - '@rollup/rollup-linux-arm-gnueabihf': 4.18.1 - '@rollup/rollup-linux-arm-musleabihf': 4.18.1 - '@rollup/rollup-linux-arm64-gnu': 4.18.1 - '@rollup/rollup-linux-arm64-musl': 4.18.1 - '@rollup/rollup-linux-powerpc64le-gnu': 4.18.1 - '@rollup/rollup-linux-riscv64-gnu': 4.18.1 - '@rollup/rollup-linux-s390x-gnu': 4.18.1 - '@rollup/rollup-linux-x64-gnu': 4.18.1 - '@rollup/rollup-linux-x64-musl': 4.18.1 - '@rollup/rollup-win32-arm64-msvc': 4.18.1 - '@rollup/rollup-win32-ia32-msvc': 4.18.1 - '@rollup/rollup-win32-x64-msvc': 4.18.1 - fsevents: 2.3.3 - rollup@4.19.0: dependencies: '@types/estree': 1.0.5 @@ -3487,7 +3332,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.2.3(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4): + tsup@8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4): dependencies: bundle-require: 5.0.0(esbuild@0.23.0) cac: 6.7.14 @@ -3515,48 +3360,48 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.0.9: + turbo-darwin-64@2.0.14: optional: true - turbo-darwin-arm64@2.0.9: + turbo-darwin-arm64@2.0.14: optional: true - turbo-linux-64@2.0.9: + turbo-linux-64@2.0.14: optional: true - turbo-linux-arm64@2.0.9: + turbo-linux-arm64@2.0.14: optional: true - turbo-windows-64@2.0.9: + turbo-windows-64@2.0.14: optional: true - turbo-windows-arm64@2.0.9: + turbo-windows-arm64@2.0.14: optional: true - turbo@2.0.9: + turbo@2.0.14: optionalDependencies: - turbo-darwin-64: 2.0.9 - turbo-darwin-arm64: 2.0.9 - turbo-linux-64: 2.0.9 - turbo-linux-arm64: 2.0.9 - turbo-windows-64: 2.0.9 - turbo-windows-arm64: 2.0.9 + turbo-darwin-64: 2.0.14 + turbo-darwin-arm64: 2.0.14 + turbo-linux-64: 2.0.14 + turbo-linux-arm64: 2.0.14 + turbo-windows-64: 2.0.14 + turbo-windows-arm64: 2.0.14 typescript@5.5.4: {} undefsafe@2.0.5: {} - undici-types@5.26.5: {} + undici-types@6.19.8: {} universalify@0.1.2: {} - vite-node@2.0.4(@types/node@20.14.12): + vite-node@2.0.5(@types/node@22.5.0): dependencies: cac: 6.7.14 debug: 4.3.5 pathe: 1.1.2 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@20.14.12) + vite: 5.2.10(@types/node@22.5.0) transitivePeerDependencies: - '@types/node' - less @@ -3567,24 +3412,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@20.14.12): + vite@5.2.10(@types/node@22.5.0): dependencies: esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.18.1 + rollup: 4.19.0 optionalDependencies: - '@types/node': 20.14.12 + '@types/node': 22.5.0 fsevents: 2.3.3 - vitest@2.0.4(@types/node@20.14.12): + vitest@2.0.5(@types/node@22.5.0): dependencies: '@ampproject/remapping': 2.3.0 - '@vitest/expect': 2.0.4 - '@vitest/pretty-format': 2.0.4 - '@vitest/runner': 2.0.4 - '@vitest/snapshot': 2.0.4 - '@vitest/spy': 2.0.4 - '@vitest/utils': 2.0.4 + '@vitest/expect': 2.0.5 + '@vitest/pretty-format': 2.0.5 + '@vitest/runner': 2.0.5 + '@vitest/snapshot': 2.0.5 + '@vitest/spy': 2.0.5 + '@vitest/utils': 2.0.5 chai: 5.1.1 debug: 4.3.5 execa: 8.0.1 @@ -3594,11 +3439,11 @@ snapshots: tinybench: 2.8.0 tinypool: 1.0.0 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@20.14.12) - vite-node: 2.0.4(@types/node@20.14.12) + vite: 5.2.10(@types/node@22.5.0) + vite-node: 2.0.5(@types/node@22.5.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 20.14.12 + '@types/node': 22.5.0 transitivePeerDependencies: - less - lightningcss From 831d4acda42548815959becba83b8c2e694aa22b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 22 Sep 2024 10:09:49 +0100 Subject: [PATCH 125/290] update deps --- package.json | 8 +- packages/commands/package.json | 8 +- packages/core/package.json | 8 +- packages/create-solid/package.json | 8 +- packages/reactivity/package.json | 4 +- packages/ui/package.json | 8 +- packages/utils/package.json | 12 +- pnpm-lock.yaml | 756 +++++++++++++---------------- 8 files changed, 362 insertions(+), 450 deletions(-) diff --git a/package.json b/package.json index c6ec280..c469ed0 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.7", - "nodemon": "^3.1.4", + "@changesets/cli": "2.27.8", + "nodemon": "^3.1.7", "prettier": "^3.3.3", - "turbo": "^2.0.14", - "vitest": "^2.0.5" + "turbo": "^2.1.2", + "vitest": "^2.1.1" }, "packageManager": "pnpm@9.6.0" } diff --git a/packages/commands/package.json b/packages/commands/package.json index 9fbff3e..f85bcb4 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,10 +33,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^22.5.0", + "@types/node": "^22.5.5", "prettier": "^3.3.3", - "tsup": "^8.2.4", - "typescript": "^5.5.4" + "tsup": "^8.3.0", + "typescript": "^5.6.2" }, "publishConfig": { "access": "public" @@ -48,7 +48,7 @@ "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "execa": "^8.0.1", - "picocolors": "^1.0.1", + "picocolors": "^1.1.0", "sucrase": "^3.35.0" } } diff --git a/packages/core/package.json b/packages/core/package.json index ff8b744..3f0a5b2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -30,7 +30,7 @@ "@solid-cli/utils": "workspace:*", "cmd-ts": "^0.13.0", "execa": "^8.0.1", - "picocolors": "^1.0.1", + "picocolors": "^1.1.0", "smol-toml": "^1.3.0", "tiny-updater": "^3.5.2" }, @@ -40,10 +40,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^22.5.0", + "@types/node": "^22.5.5", "jiti": "^1.21.6", - "tsup": "^8.2.4", - "typescript": "^5.5.4" + "tsup": "^8.3.0", + "typescript": "^5.6.2" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 384614c..26b85e9 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^22.5.0", + "@types/node": "^22.5.5", "cmd-ts": "^0.13.0", "jiti": "^1.21.6", - "picocolors": "^1.0.1", - "tsup": "^8.2.4", - "typescript": "^5.5.4" + "picocolors": "^1.1.0", + "tsup": "^8.3.0", + "typescript": "^5.6.2" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index d3d3ef1..9a826f1 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,8 +28,8 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.2.4", - "typescript": "^5.5.4" + "tsup": "^8.3.0", + "typescript": "^5.6.2" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 4d88f22..3315f64 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.2.4", - "typescript": "^5.5.4", - "@types/node": "22.5.0" + "tsup": "^8.3.0", + "typescript": "^5.6.2", + "@types/node": "22.5.5" }, "publishConfig": { "access": "public" @@ -37,7 +37,7 @@ "dependencies": { "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", - "picocolors": "^1.0.1", + "picocolors": "^1.1.0", "@solid-cli/reactivity": "workspace:*", "@solid-cli/utils": "workspace:*" } diff --git a/packages/utils/package.json b/packages/utils/package.json index 9398915..7b2fd68 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,12 +63,12 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.5.0", + "@types/node": "22.5.5", "jiti": "^1.21.6", - "magicast": "^0.3.4", - "tsup": "^8.2.4", - "typescript": "^5.5.4", - "vitest": "^2.0.5" + "magicast": "^0.3.5", + "tsup": "^8.3.0", + "typescript": "^5.6.2", + "vitest": "^2.1.1" }, "publishConfig": { "access": "public" @@ -79,7 +79,7 @@ "@solid-cli/reactivity": "workspace:*", "cmd-ts": "^0.13.0", "execa": "^8.0.1", - "picocolors": "^1.0.1", + "picocolors": "^1.1.0", "smol-toml": "^1.3.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 883f630..3239d2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,20 +9,20 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.27.7 - version: 2.27.7 + specifier: 2.27.8 + version: 2.27.8 nodemon: - specifier: ^3.1.4 - version: 3.1.4 + specifier: ^3.1.7 + version: 3.1.7 prettier: specifier: ^3.3.3 version: 3.3.3 turbo: - specifier: ^2.0.14 - version: 2.0.14 + specifier: ^2.1.2 + version: 2.1.2 vitest: - specifier: ^2.0.5 - version: 2.0.5(@types/node@22.5.0) + specifier: ^2.1.1 + version: 2.1.1(@types/node@22.5.5) packages/commands: dependencies: @@ -45,8 +45,8 @@ importers: specifier: ^8.0.1 version: 8.0.1 picocolors: - specifier: ^1.0.1 - version: 1.0.1 + specifier: ^1.1.0 + version: 1.1.0 sucrase: specifier: ^3.35.0 version: 3.35.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^22.5.0 - version: 22.5.0 + specifier: ^22.5.5 + version: 22.5.5 prettier: specifier: ^3.3.3 version: 3.3.3 tsup: - specifier: ^8.2.4 - version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.3.0 + version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) typescript: - specifier: ^5.5.4 - version: 5.5.4 + specifier: ^5.6.2 + version: 5.6.2 packages/core: dependencies: @@ -94,8 +94,8 @@ importers: specifier: ^8.0.1 version: 8.0.1 picocolors: - specifier: ^1.0.1 - version: 1.0.1 + specifier: ^1.1.0 + version: 1.1.0 smol-toml: specifier: ^1.3.0 version: 1.3.0 @@ -107,17 +107,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^22.5.0 - version: 22.5.0 + specifier: ^22.5.5 + version: 22.5.5 jiti: specifier: ^1.21.6 version: 1.21.6 tsup: - specifier: ^8.2.4 - version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.3.0 + version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) typescript: - specifier: ^5.5.4 - version: 5.5.4 + specifier: ^5.6.2 + version: 5.6.2 packages/create-solid: devDependencies: @@ -128,8 +128,8 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^22.5.0 - version: 22.5.0 + specifier: ^22.5.5 + version: 22.5.5 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -137,23 +137,23 @@ importers: specifier: ^1.21.6 version: 1.21.6 picocolors: - specifier: ^1.0.1 - version: 1.0.1 + specifier: ^1.1.0 + version: 1.1.0 tsup: - specifier: ^8.2.4 - version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.3.0 + version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) typescript: - specifier: ^5.5.4 - version: 5.5.4 + specifier: ^5.6.2 + version: 5.6.2 packages/reactivity: devDependencies: tsup: - specifier: ^8.2.4 - version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.3.0 + version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) typescript: - specifier: ^5.5.4 - version: 5.5.4 + specifier: ^5.6.2 + version: 5.6.2 packages/ui: dependencies: @@ -170,18 +170,18 @@ importers: specifier: workspace:* version: link:../utils picocolors: - specifier: ^1.0.1 - version: 1.0.1 + specifier: ^1.1.0 + version: 1.1.0 devDependencies: '@types/node': - specifier: 22.5.0 - version: 22.5.0 + specifier: 22.5.5 + version: 22.5.5 tsup: - specifier: ^8.2.4 - version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.3.0 + version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) typescript: - specifier: ^5.5.4 - version: 5.5.4 + specifier: ^5.6.2 + version: 5.6.2 packages/utils: dependencies: @@ -201,8 +201,8 @@ importers: specifier: ^8.0.1 version: 8.0.1 picocolors: - specifier: ^1.0.1 - version: 1.0.1 + specifier: ^1.1.0 + version: 1.1.0 smol-toml: specifier: ^1.3.0 version: 1.3.0 @@ -211,40 +211,36 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.5.0 - version: 22.5.0 + specifier: 22.5.5 + version: 22.5.5 jiti: specifier: ^1.21.6 version: 1.21.6 magicast: - specifier: ^0.3.4 - version: 0.3.4 + specifier: ^0.3.5 + version: 0.3.5 tsup: - specifier: ^8.2.4 - version: 8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4) + specifier: ^8.3.0 + version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) typescript: - specifier: ^5.5.4 - version: 5.5.4 + specifier: ^5.6.2 + version: 5.6.2 vitest: - specifier: ^2.0.5 - version: 2.0.5(@types/node@22.5.0) + specifier: ^2.1.1 + version: 2.1.1(@types/node@22.5.5) packages: - '@ampproject/remapping@2.3.0': - resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} - engines: {node: '>=6.0.0'} - - '@babel/helper-string-parser@7.24.1': - resolution: {integrity: sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==} + '@babel/helper-string-parser@7.24.8': + resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.24.5': - resolution: {integrity: sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==} + '@babel/helper-validator-identifier@7.24.7': + resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} engines: {node: '>=6.9.0'} - '@babel/parser@7.24.5': - resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==} + '@babel/parser@7.25.6': + resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} engines: {node: '>=6.0.0'} hasBin: true @@ -252,58 +248,58 @@ packages: resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} engines: {node: '>=6.9.0'} - '@babel/types@7.24.5': - resolution: {integrity: sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==} + '@babel/types@7.25.6': + resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} '@begit/core@0.0.19': resolution: {integrity: sha512-3ypq3vJQ+PzYVi53HRkAtwdtVXTjyXjo1UzTkD75Qr9YIoacYsSy9gAdbwktfNKgTLyc1nU83W1D3SEw9kgBBA==} - '@changesets/apply-release-plan@7.0.4': - resolution: {integrity: sha512-HLFwhKWayKinWAul0Vj+76jVx1Pc2v55MGPVjZ924Y/ROeSsBMFutv9heHmCUj48lJyRfOTJG5+ar+29FUky/A==} + '@changesets/apply-release-plan@7.0.5': + resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==} - '@changesets/assemble-release-plan@6.0.3': - resolution: {integrity: sha512-bLNh9/Lgl1VwkjWZTq8JmRqH+hj7/Yzfz0jsQ/zJJ+FTmVqmqPj3szeKOri8O/hEM8JmHW019vh2gTO9iq5Cuw==} + '@changesets/assemble-release-plan@6.0.4': + resolution: {integrity: sha512-nqICnvmrwWj4w2x0fOhVj2QEGdlUuwVAwESrUo5HLzWMI1rE5SWfsr9ln+rDqWB6RQ2ZyaMZHUcU7/IRaUJS+Q==} '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.7': - resolution: {integrity: sha512-6lr8JltiiXPIjDeYg4iM2MeePP6VN/JkmqBsVA5XRiy01hGS3y629LtSDvKcycj/w/5Eur1rEwby/MjcYS+e2A==} + '@changesets/cli@2.27.8': + resolution: {integrity: sha512-gZNyh+LdSsI82wBSHLQ3QN5J30P4uHKJ4fXgoGwQxfXwYFTJzDdvIJasZn8rYQtmKhyQuiBj4SSnLuKlxKWq4w==} hasBin: true - '@changesets/config@3.0.2': - resolution: {integrity: sha512-cdEhS4t8woKCX2M8AotcV2BOWnBp09sqICxKapgLHf9m5KdENpWjyrFNMjkLqGJtUys9U+w93OxWT0czorVDfw==} + '@changesets/config@3.0.3': + resolution: {integrity: sha512-vqgQZMyIcuIpw9nqFIpTSNyc/wgm/Lu1zKN5vECy74u95Qx/Wa9g27HdgO4NkVAaq+BGA8wUc/qvbvVNs93n6A==} '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} - '@changesets/get-dependents-graph@2.1.1': - resolution: {integrity: sha512-LRFjjvigBSzfnPU2n/AhFsuWR5DK++1x47aq6qZ8dzYsPtS/I5mNhIGAS68IAxh1xjO9BTtz55FwefhANZ+FCA==} + '@changesets/get-dependents-graph@2.1.2': + resolution: {integrity: sha512-sgcHRkiBY9i4zWYBwlVyAjEM9sAzs4wYVwJUdnbDLnVG3QwAaia1Mk5P8M7kraTOZN+vBET7n8KyB0YXCbFRLQ==} - '@changesets/get-release-plan@4.0.3': - resolution: {integrity: sha512-6PLgvOIwTSdJPTtpdcr3sLtGatT+Jr22+cQwEBJBy6wP0rjB4yJ9lv583J9fVpn1bfQlBkDa8JxbS2g/n9lIyA==} + '@changesets/get-release-plan@4.0.4': + resolution: {integrity: sha512-SicG/S67JmPTrdcc9Vpu0wSQt7IiuN0dc8iR5VScnnTVPfIaLvKmEGRvIaF0kcn8u5ZqLbormZNTO77bCEvyWw==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} - '@changesets/git@3.0.0': - resolution: {integrity: sha512-vvhnZDHe2eiBNRFHEgMiGd2CT+164dfYyrJDhwwxTVD/OW0FUD6G7+4DIx1dNwkwjHyzisxGAU96q0sVNBns0w==} + '@changesets/git@3.0.1': + resolution: {integrity: sha512-pdgHcYBLCPcLd82aRcuO0kxCDbw/yISlOtkmwmE8Odo1L6hSiZrBOsRl84eYG7DRCab/iHnOkWqExqc4wxk2LQ==} - '@changesets/logger@0.1.0': - resolution: {integrity: sha512-pBrJm4CQm9VqFVwWnSqKEfsS2ESnwqwH+xR7jETxIErZcfd1u2zBSqrHbRHR7xjhSgep9x2PSKFKY//FAshA3g==} + '@changesets/logger@0.1.1': + resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} '@changesets/parse@0.4.0': resolution: {integrity: sha512-TS/9KG2CdGXS27S+QxbZXgr8uPsP4yNJYb4BC2/NeFUj80Rni3TeD2qwWmabymxmrLo7JEsytXH1FbpKTbvivw==} - '@changesets/pre@2.0.0': - resolution: {integrity: sha512-HLTNYX/A4jZxc+Sq8D1AMBsv+1qD6rmmJtjsCJa/9MSRybdxh0mjbTvE6JYZQ/ZiQ0mMlDOlGPXTm9KLTU3jyw==} + '@changesets/pre@2.0.1': + resolution: {integrity: sha512-vvBJ/If4jKM4tPz9JdY2kGOgWmCowUYOi5Ycv8dyLnEE8FgpYYUo1mgJZxcdtGGP3aG8rAQulGLyyXGSLkIMTQ==} - '@changesets/read@0.6.0': - resolution: {integrity: sha512-ZypqX8+/im1Fm98K4YcZtmLKgjs1kDQ5zHpc2U1qdtNBmZZfo/IBiG162RoP0CUF05tvp2y4IspH11PLnPxuuw==} + '@changesets/read@0.6.1': + resolution: {integrity: sha512-jYMbyXQk3nwP25nRzQQGa1nKLY0KfoOV7VLgwucI0bUO8t8ZLCr6LZmgjXsiKuRDc+5A6doKPr9w2d+FEJ55zQ==} - '@changesets/should-skip-package@0.1.0': - resolution: {integrity: sha512-FxG6Mhjw7yFStlSM7Z0Gmg3RiyQ98d/9VpQAZ3Fzr59dCOM9G6ZdYbjiSAt0XtFr9JR5U2tBaJWPjrkGGc618g==} + '@changesets/should-skip-package@0.1.1': + resolution: {integrity: sha512-H9LjLbF6mMHLtJIc/eHR9Na+MifJ3VxtgP/Y+XLn4BF7tDTEN1HNYtH6QMcjP1uxp9sjaFYmW8xqloaCi/ckTg==} '@changesets/types@4.1.0': resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} @@ -311,8 +307,8 @@ packages: '@changesets/types@6.0.0': resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} - '@changesets/write@0.3.1': - resolution: {integrity: sha512-SyGtMXzH3qFqlHKcvFY2eX+6b0NGiFcNav8AFsYwy5l8hejOeoeTDemu5Yjmke2V5jpzY+pBvM0vCCQ3gdZpfw==} + '@changesets/write@0.3.2': + resolution: {integrity: sha512-kDxDrPNpUgsjDbWBvUo27PzKX4gqeKOlhibaOXDJA6kuBisGqNHv/HwGJrAu8U/dSf8ZEFIeHIPtvSlZI1kULw==} '@chialab/esbuild-plugin-meta-url@0.18.2': resolution: {integrity: sha512-uIRIdLvYnw5mLrTRXY0BTgeZx6ANL2/OHkWFl8FaiTYNb7cyXmwEDRE1mh6kBXPRPtGuqv6XSpNX+koEkElu4g==} @@ -635,10 +631,6 @@ packages: resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} engines: {node: '>=6.0.0'} - '@jridgewell/gen-mapping@0.3.5': - resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} - engines: {node: '>=6.0.0'} - '@jridgewell/resolve-uri@3.1.1': resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} @@ -647,19 +639,15 @@ packages: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} - '@jridgewell/set-array@1.2.1': - resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} - engines: {node: '>=6.0.0'} - '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + '@jridgewell/sourcemap-codec@1.5.0': + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/trace-mapping@0.3.19': resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} - '@jridgewell/trace-mapping@0.3.25': - resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} - '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -847,29 +835,41 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.5.0': - resolution: {integrity: sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==} + '@types/node@22.5.5': + resolution: {integrity: sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} - '@vitest/expect@2.0.5': - resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==} + '@vitest/expect@2.1.1': + resolution: {integrity: sha512-YeueunS0HiHiQxk+KEOnq/QMzlUuOzbU1Go+PgAsHvvv3tUkJPm9xWt+6ITNTlzsMXUjmgm5T+U7KBPK2qQV6w==} - '@vitest/pretty-format@2.0.5': - resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==} + '@vitest/mocker@2.1.1': + resolution: {integrity: sha512-LNN5VwOEdJqCmJ/2XJBywB11DLlkbY0ooDJW3uRX5cZyYCrc4PI/ePX0iQhE3BiEGiQmK4GE7Q/PqCkkaiPnrA==} + peerDependencies: + '@vitest/spy': 2.1.1 + msw: ^2.3.5 + vite: ^5.0.0 + peerDependenciesMeta: + msw: + optional: true + vite: + optional: true + + '@vitest/pretty-format@2.1.1': + resolution: {integrity: sha512-SjxPFOtuINDUW8/UkElJYQSFtnWX7tMksSGW0vfjxMneFqxVr8YJ979QpMbDW7g+BIiq88RAGDjf7en6rvLPPQ==} - '@vitest/runner@2.0.5': - resolution: {integrity: sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==} + '@vitest/runner@2.1.1': + resolution: {integrity: sha512-uTPuY6PWOYitIkLPidaY5L3t0JJITdGTSwBtwMjKzo5O6RCOEncz9PUN+0pDidX8kTHYjO0EwUIvhlGpnGpxmA==} - '@vitest/snapshot@2.0.5': - resolution: {integrity: sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==} + '@vitest/snapshot@2.1.1': + resolution: {integrity: sha512-BnSku1WFy7r4mm96ha2FzN99AZJgpZOWrAhtQfoxjUU5YMRpq1zmHRq7a5K9/NjqonebO7iVDla+VvZS8BOWMw==} - '@vitest/spy@2.0.5': - resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==} + '@vitest/spy@2.1.1': + resolution: {integrity: sha512-ZM39BnZ9t/xZ/nF4UwRH5il0Sw93QnZXd9NAZGRpIgj0yvVwPpLd702s/Cx955rGaMlyBQkZJ2Ir7qyY48VZ+g==} - '@vitest/utils@2.0.5': - resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==} + '@vitest/utils@2.1.1': + resolution: {integrity: sha512-Y6Q9TsI+qJ2CC0ZKj6VBb+T8UPz593N113nnUykqwANqhgf3QkZeHFlusgKLTqrnVHbj/XDKZcDHol+dxVT+rQ==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -886,10 +886,6 @@ packages: resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==} engines: {node: '>=12'} - ansi-styles@3.2.1: - resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} - engines: {node: '>=4'} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} @@ -951,10 +947,6 @@ packages: resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==} engines: {node: '>=12'} - chalk@2.4.2: - resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} - engines: {node: '>=4'} - chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} @@ -981,16 +973,10 @@ packages: cmd-ts@0.13.0: resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} - color-convert@1.9.3: - resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} - color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} - color-name@1.1.3: - resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} - color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} @@ -1030,6 +1016,15 @@ packages: supports-color: optional: true + debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + deep-eql@5.0.2: resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} @@ -1073,10 +1068,6 @@ packages: engines: {node: '>=18'} hasBin: true - escape-string-regexp@1.0.5: - resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} - engines: {node: '>=0.8.0'} - esprima@4.0.1: resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==} engines: {node: '>=4'} @@ -1107,6 +1098,14 @@ packages: fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + fdir@6.3.0: + resolution: {integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -1115,13 +1114,6 @@ packages: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} - find-up@5.0.0: - resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} - engines: {node: '>=10'} - - find-yarn-workspace-root2@1.2.16: - resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==} - foreground-child@3.1.1: resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} engines: {node: '>=14'} @@ -1268,18 +1260,10 @@ packages: resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - load-yaml-file@0.2.0: - resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==} - engines: {node: '>=6'} - locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} - locate-path@6.0.0: - resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==} - engines: {node: '>=10'} - lodash.sortby@4.7.0: resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} @@ -1300,11 +1284,11 @@ packages: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} - magic-string@0.30.10: - resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} + magic-string@0.30.11: + resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} - magicast@0.3.4: - resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==} + magicast@0.3.5: + resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} merge-stream@2.0.0: resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} @@ -1364,6 +1348,9 @@ packages: ms@2.1.2: resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} + ms@2.1.3: + resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} @@ -1372,8 +1359,8 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nodemon@3.1.4: - resolution: {integrity: sha512-wjPBbFhtpJwmIeY2yP7QF+UKzPfltVGtfce1g/bB15/8vCGZj8uxD62b/b9M9/WVgme0NZudpownKN+c0plXlQ==} + nodemon@3.1.7: + resolution: {integrity: sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==} engines: {node: '>=10'} hasBin: true @@ -1420,18 +1407,10 @@ packages: resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==} engines: {node: '>=6'} - p-limit@3.1.0: - resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==} - engines: {node: '>=10'} - p-locate@4.1.0: resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==} engines: {node: '>=8'} - p-locate@5.0.0: - resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==} - engines: {node: '>=10'} - p-map@2.1.0: resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==} engines: {node: '>=6'} @@ -1440,6 +1419,9 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} + package-manager-detector@0.2.0: + resolution: {integrity: sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==} + path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -1467,13 +1449,17 @@ packages: resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} engines: {node: '>= 14.16'} - picocolors@1.0.1: - resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==} + picocolors@1.1.0: + resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} + picomatch@4.0.2: + resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + engines: {node: '>=12'} + pify@4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} @@ -1482,10 +1468,6 @@ packages: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} - pkg-dir@4.2.0: - resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==} - engines: {node: '>=8'} - postcss-load-config@6.0.1: resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} engines: {node: '>= 18'} @@ -1508,10 +1490,6 @@ packages: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} - preferred-pm@3.1.3: - resolution: {integrity: sha512-MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==} - engines: {node: '>=10'} - prettier@2.8.8: resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} engines: {node: '>=10.13.0'} @@ -1698,8 +1676,15 @@ packages: tiny-updater@3.5.2: resolution: {integrity: sha512-5EjK01h0rvgv+Eb0XaiTZJZR+ujdjCDHZ1ZCVCu+1h4+MyOYZ+za8UKuKdNOOOSKhkkC9B08o6ZhF4JnQg7ZLg==} - tinybench@2.8.0: - resolution: {integrity: sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==} + tinybench@2.9.0: + resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} + + tinyexec@0.3.0: + resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==} + + tinyglobby@0.2.6: + resolution: {integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==} + engines: {node: '>=12.0.0'} tinypool@1.0.0: resolution: {integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==} @@ -1739,8 +1724,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.2.4: - resolution: {integrity: sha512-akpCPePnBnC/CXgRrcy72ZSntgIEUa1jN0oJbbvpALWKNOz1B7aM+UVDWGRGIO/T/PZugAESWDJUAb5FD48o8Q==} + tsup@8.3.0: + resolution: {integrity: sha512-ALscEeyS03IomcuNdFdc0YWGVIkwH1Ws7nfTbAPuoILvEV2hpGQAY72LIOjglGo4ShWpZfpBqP/jpQVCzqYQag==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1758,42 +1743,42 @@ packages: typescript: optional: true - turbo-darwin-64@2.0.14: - resolution: {integrity: sha512-kwfDmjNwlNfvtrvT29+ZBg5n1Wvxl891bFHchMJyzMoR0HOE9N1NSNdSZb9wG3e7sYNIu4uDkNk+VBEqJW0HzQ==} + turbo-darwin-64@2.1.2: + resolution: {integrity: sha512-3TEBxHWh99h2yIzkuIigMEOXt/ItYQp0aPiJjPd1xN4oDcsKK5AxiFKPH9pdtfIBzYsY59kQhZiFj0ELnSP7Bw==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.0.14: - resolution: {integrity: sha512-m3LXYEshCx3wc4ZClM6gb01KYpFmtjQ9IBF3A7ofjb6ahux3xlYZJZ3uFCLAGHuvGLuJ3htfiPbwlDPTdknqqw==} + turbo-darwin-arm64@2.1.2: + resolution: {integrity: sha512-he0miWNq2WxJzsH82jS2Z4MXpnkzn9SH8a79iPXiJkq25QREImucscM4RPasXm8wARp91pyysJMq6aasD45CeA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.0.14: - resolution: {integrity: sha512-7vBzCPdoTtR92SNn2JMgj1FlMmyonGmpMaQdgAB1OVYtuQ6NVGoh7/lODfaILqXjpvmFSVbpBIDrKOT6EvcprQ==} + turbo-linux-64@2.1.2: + resolution: {integrity: sha512-fKUBcc0rK8Vdqv5a/E3CSpMBLG1bzwv+Q0Q83F8fG2ZfNCNKGbcEYABdonNZkkx141Rj03cZQFCgxu3MVEGU+A==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.0.14: - resolution: {integrity: sha512-jwH+c0bfjpBf26K/tdEFatmnYyXwGROjbr6bZmNcL8R+IkGAc/cglL+OToqJnQZTgZvH7uDGbeSyUo7IsHyjuA==} + turbo-linux-arm64@2.1.2: + resolution: {integrity: sha512-sV8Bpmm0WiuxgbhxymcC7wSsuxfBBieI98GegSwbr/bs1ANAgzCg93urIrdKdQ3/b31zZxQwcaP4FBF1wx1Qdg==} cpu: [arm64] os: [linux] - turbo-windows-64@2.0.14: - resolution: {integrity: sha512-w9/XwkHSzvLjmioo6cl3S1yRfI6swxsV1j1eJwtl66JM4/pn0H2rBa855R0n7hZnmI6H5ywLt/nLt6Ae8RTDmw==} + turbo-windows-64@2.1.2: + resolution: {integrity: sha512-wcmIJZI9ORT9ykHGliFE6kWRQrlH930QGSjSgWC8uFChFFuOyUlvC7ttcxuSvU9VqC7NF4C+GVAcFJQ8lTjN7g==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.0.14: - resolution: {integrity: sha512-XaQlyYk+Rf4xS5XWCo8XCMIpssgGGy8blzLfolN6YBp4baElIWMlkLZHDbGyiFmCbNf9I9gJI64XGRG+LVyyjA==} + turbo-windows-arm64@2.1.2: + resolution: {integrity: sha512-zdnXjrhk7YO6CP+Q5wPueEvOCLH4lDa6C4rrwiakcWcPgcQGbVozJlo4uaQ6awo8HLWQEvOwu84RkWTdLAc/Hw==} cpu: [arm64] os: [win32] - turbo@2.0.14: - resolution: {integrity: sha512-00JjdCMD/cpsjP0Izkjcm8Oaor5yUCfDwODtaLb+WyblyadkaDEisGhy3Dbd5az9n+5iLSPiUgf+WjPbns6MRg==} + turbo@2.1.2: + resolution: {integrity: sha512-Jb0rbU4iHEVQ18An/YfakdIv9rKnd3zUfSE117EngrfWXFHo3RndVH96US3GsT8VHpwTncPePDBT2t06PaFLrw==} hasBin: true - typescript@5.5.4: - resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==} + typescript@5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} engines: {node: '>=14.17'} hasBin: true @@ -1807,8 +1792,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@2.0.5: - resolution: {integrity: sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==} + vite-node@2.1.1: + resolution: {integrity: sha512-N/mGckI1suG/5wQI35XeR9rsMsPqKXzq1CdUndzVstBj/HvyxxGctwnK6WX43NGt5L3Z5tcRf83g4TITKJhPrA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -1840,15 +1825,15 @@ packages: terser: optional: true - vitest@2.0.5: - resolution: {integrity: sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==} + vitest@2.1.1: + resolution: {integrity: sha512-97We7/VC0e9X5zBVkvt7SGQMGrRtn3KtySFQG5fpaMlS+l62eeXRQO633AYhSTC3z7IMebnPPNjGXVGNRFlxBA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.0.5 - '@vitest/ui': 2.0.5 + '@vitest/browser': 2.1.1 + '@vitest/ui': 2.1.1 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1874,10 +1859,6 @@ packages: when-exit@2.1.1: resolution: {integrity: sha512-XLipGldz/UcleuGaoQjbYuWwD+ICRnzIjlldtwTaTWr7aZz8yQW49rXk6MHQnh+KxOiWiJpM1vIyaxprOnlW4g==} - which-pm@2.0.0: - resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==} - engines: {node: '>=8.15'} - which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} hasBin: true @@ -1910,46 +1891,36 @@ packages: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} - yocto-queue@0.1.0: - resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} - engines: {node: '>=10'} - snapshots: - '@ampproject/remapping@2.3.0': - dependencies: - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 + '@babel/helper-string-parser@7.24.8': {} - '@babel/helper-string-parser@7.24.1': {} + '@babel/helper-validator-identifier@7.24.7': {} - '@babel/helper-validator-identifier@7.24.5': {} - - '@babel/parser@7.24.5': + '@babel/parser@7.25.6': dependencies: - '@babel/types': 7.24.5 + '@babel/types': 7.25.6 '@babel/runtime@7.24.4': dependencies: regenerator-runtime: 0.14.1 - '@babel/types@7.24.5': + '@babel/types@7.25.6': dependencies: - '@babel/helper-string-parser': 7.24.1 - '@babel/helper-validator-identifier': 7.24.5 + '@babel/helper-string-parser': 7.24.8 + '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 '@begit/core@0.0.19': dependencies: tar: 7.4.0 - '@changesets/apply-release-plan@7.0.4': + '@changesets/apply-release-plan@7.0.5': dependencies: - '@babel/runtime': 7.24.4 - '@changesets/config': 3.0.2 + '@changesets/config': 3.0.3 '@changesets/get-version-range-type': 0.4.0 - '@changesets/git': 3.0.0 - '@changesets/should-skip-package': 0.1.0 + '@changesets/git': 3.0.1 + '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 detect-indent: 6.1.0 @@ -1960,12 +1931,11 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.0 - '@changesets/assemble-release-plan@6.0.3': + '@changesets/assemble-release-plan@6.0.4': dependencies: - '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.1 - '@changesets/should-skip-package': 0.1.0 + '@changesets/get-dependents-graph': 2.1.2 + '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 semver: 7.6.0 @@ -1974,46 +1944,44 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.7': + '@changesets/cli@2.27.8': dependencies: - '@babel/runtime': 7.24.4 - '@changesets/apply-release-plan': 7.0.4 - '@changesets/assemble-release-plan': 6.0.3 + '@changesets/apply-release-plan': 7.0.5 + '@changesets/assemble-release-plan': 6.0.4 '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.2 + '@changesets/config': 3.0.3 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.1 - '@changesets/get-release-plan': 4.0.3 - '@changesets/git': 3.0.0 - '@changesets/logger': 0.1.0 - '@changesets/pre': 2.0.0 - '@changesets/read': 0.6.0 - '@changesets/should-skip-package': 0.1.0 + '@changesets/get-dependents-graph': 2.1.2 + '@changesets/get-release-plan': 4.0.4 + '@changesets/git': 3.0.1 + '@changesets/logger': 0.1.1 + '@changesets/pre': 2.0.1 + '@changesets/read': 0.6.1 + '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 - '@changesets/write': 0.3.1 + '@changesets/write': 0.3.2 '@manypkg/get-packages': 1.1.3 '@types/semver': 7.5.8 ansi-colors: 4.1.3 - chalk: 2.4.2 ci-info: 3.9.0 enquirer: 2.4.1 external-editor: 3.1.0 fs-extra: 7.0.1 - human-id: 1.0.2 mri: 1.2.0 outdent: 0.5.0 p-limit: 2.3.0 - preferred-pm: 3.1.3 + package-manager-detector: 0.2.0 + picocolors: 1.1.0 resolve-from: 5.0.0 semver: 7.6.0 spawndamnit: 2.0.0 term-size: 2.2.1 - '@changesets/config@3.0.2': + '@changesets/config@3.0.3': dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.1 - '@changesets/logger': 0.1.0 + '@changesets/get-dependents-graph': 2.1.2 + '@changesets/logger': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 @@ -2023,67 +1991,60 @@ snapshots: dependencies: extendable-error: 0.1.7 - '@changesets/get-dependents-graph@2.1.1': + '@changesets/get-dependents-graph@2.1.2': dependencies: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 - chalk: 2.4.2 - fs-extra: 7.0.1 + picocolors: 1.1.0 semver: 7.6.0 - '@changesets/get-release-plan@4.0.3': + '@changesets/get-release-plan@4.0.4': dependencies: - '@babel/runtime': 7.24.4 - '@changesets/assemble-release-plan': 6.0.3 - '@changesets/config': 3.0.2 - '@changesets/pre': 2.0.0 - '@changesets/read': 0.6.0 + '@changesets/assemble-release-plan': 6.0.4 + '@changesets/config': 3.0.3 + '@changesets/pre': 2.0.1 + '@changesets/read': 0.6.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 '@changesets/get-version-range-type@0.4.0': {} - '@changesets/git@3.0.0': + '@changesets/git@3.0.1': dependencies: - '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 - '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 is-subdir: 1.2.0 micromatch: 4.0.5 spawndamnit: 2.0.0 - '@changesets/logger@0.1.0': + '@changesets/logger@0.1.1': dependencies: - chalk: 2.4.2 + picocolors: 1.1.0 '@changesets/parse@0.4.0': dependencies: '@changesets/types': 6.0.0 js-yaml: 3.14.1 - '@changesets/pre@2.0.0': + '@changesets/pre@2.0.1': dependencies: - '@babel/runtime': 7.24.4 '@changesets/errors': 0.2.0 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - '@changesets/read@0.6.0': + '@changesets/read@0.6.1': dependencies: - '@babel/runtime': 7.24.4 - '@changesets/git': 3.0.0 - '@changesets/logger': 0.1.0 + '@changesets/git': 3.0.1 + '@changesets/logger': 0.1.1 '@changesets/parse': 0.4.0 '@changesets/types': 6.0.0 - chalk: 2.4.2 fs-extra: 7.0.1 p-filter: 2.1.0 + picocolors: 1.1.0 - '@changesets/should-skip-package@0.1.0': + '@changesets/should-skip-package@0.1.1': dependencies: - '@babel/runtime': 7.24.4 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -2091,9 +2052,8 @@ snapshots: '@changesets/types@6.0.0': {} - '@changesets/write@0.3.1': + '@changesets/write@0.3.2': dependencies: - '@babel/runtime': 7.24.4 '@changesets/types': 6.0.0 fs-extra: 7.0.1 human-id: 1.0.2 @@ -2118,18 +2078,18 @@ snapshots: '@clack/core@0.3.3': dependencies: - picocolors: 1.0.1 + picocolors: 1.1.0 sisteransi: 1.0.5 '@clack/core@0.3.4': dependencies: - picocolors: 1.0.1 + picocolors: 1.1.0 sisteransi: 1.0.5 '@clack/prompts@0.7.0': dependencies: '@clack/core': 0.3.3 - picocolors: 1.0.1 + picocolors: 1.1.0 sisteransi: 1.0.5 '@esbuild/aix-ppc64@0.20.2': @@ -2292,26 +2252,15 @@ snapshots: '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.19 - '@jridgewell/gen-mapping@0.3.5': - dependencies: - '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.25 - '@jridgewell/resolve-uri@3.1.1': {} '@jridgewell/set-array@1.1.2': {} - '@jridgewell/set-array@1.2.1': {} - '@jridgewell/sourcemap-codec@1.4.15': {} - '@jridgewell/trace-mapping@0.3.19': - dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec@1.5.0': {} - '@jridgewell/trace-mapping@0.3.25': + '@jridgewell/trace-mapping@0.3.19': dependencies: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 @@ -2458,42 +2407,49 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.5.0': + '@types/node@22.5.5': dependencies: undici-types: 6.19.8 '@types/semver@7.5.8': {} - '@vitest/expect@2.0.5': + '@vitest/expect@2.1.1': dependencies: - '@vitest/spy': 2.0.5 - '@vitest/utils': 2.0.5 + '@vitest/spy': 2.1.1 + '@vitest/utils': 2.1.1 chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/pretty-format@2.0.5': + '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.2.10(@types/node@22.5.5))': + dependencies: + '@vitest/spy': 2.1.1 + estree-walker: 3.0.3 + magic-string: 0.30.11 + optionalDependencies: + vite: 5.2.10(@types/node@22.5.5) + + '@vitest/pretty-format@2.1.1': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.0.5': + '@vitest/runner@2.1.1': dependencies: - '@vitest/utils': 2.0.5 + '@vitest/utils': 2.1.1 pathe: 1.1.2 - '@vitest/snapshot@2.0.5': + '@vitest/snapshot@2.1.1': dependencies: - '@vitest/pretty-format': 2.0.5 - magic-string: 0.30.10 + '@vitest/pretty-format': 2.1.1 + magic-string: 0.30.11 pathe: 1.1.2 - '@vitest/spy@2.0.5': + '@vitest/spy@2.1.1': dependencies: tinyspy: 3.0.0 - '@vitest/utils@2.0.5': + '@vitest/utils@2.1.1': dependencies: - '@vitest/pretty-format': 2.0.5 - estree-walker: 3.0.3 + '@vitest/pretty-format': 2.1.1 loupe: 3.1.1 tinyrainbow: 1.2.0 @@ -2505,10 +2461,6 @@ snapshots: ansi-regex@6.0.1: {} - ansi-styles@3.2.1: - dependencies: - color-convert: 1.9.3 - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 @@ -2566,12 +2518,6 @@ snapshots: loupe: 3.1.1 pathval: 2.0.0 - chalk@2.4.2: - dependencies: - ansi-styles: 3.2.1 - escape-string-regexp: 1.0.5 - supports-color: 5.5.0 - chalk@4.1.2: dependencies: ansi-styles: 4.3.0 @@ -2600,22 +2546,16 @@ snapshots: cmd-ts@0.13.0: dependencies: chalk: 4.1.2 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.4 didyoumean: 1.2.2 strip-ansi: 6.0.1 transitivePeerDependencies: - supports-color - color-convert@1.9.3: - dependencies: - color-name: 1.1.3 - color-convert@2.0.1: dependencies: color-name: 1.1.4 - color-name@1.1.3: {} - color-name@1.1.4: {} commander@4.1.1: {} @@ -2636,15 +2576,19 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - debug@4.3.4(supports-color@5.5.0): + debug@4.3.4: + dependencies: + ms: 2.1.2 + + debug@4.3.5(supports-color@5.5.0): dependencies: ms: 2.1.2 optionalDependencies: supports-color: 5.5.0 - debug@4.3.5: + debug@4.3.7: dependencies: - ms: 2.1.2 + ms: 2.1.3 deep-eql@5.0.2: {} @@ -2722,8 +2666,6 @@ snapshots: '@esbuild/win32-ia32': 0.23.0 '@esbuild/win32-x64': 0.23.0 - escape-string-regexp@1.0.5: {} - esprima@4.0.1: {} estree-walker@3.0.3: @@ -2774,6 +2716,10 @@ snapshots: dependencies: reusify: 1.0.4 + fdir@6.3.0(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 + fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 @@ -2783,16 +2729,6 @@ snapshots: locate-path: 5.0.0 path-exists: 4.0.0 - find-up@5.0.0: - dependencies: - locate-path: 6.0.0 - path-exists: 4.0.0 - - find-yarn-workspace-root2@1.2.16: - dependencies: - micromatch: 4.0.5 - pkg-dir: 4.2.0 - foreground-child@3.1.1: dependencies: cross-spawn: 7.0.3 @@ -2913,21 +2849,10 @@ snapshots: load-tsconfig@0.2.5: {} - load-yaml-file@0.2.0: - dependencies: - graceful-fs: 4.2.11 - js-yaml: 3.14.1 - pify: 4.0.1 - strip-bom: 3.0.0 - locate-path@5.0.0: dependencies: p-locate: 4.1.0 - locate-path@6.0.0: - dependencies: - p-locate: 5.0.0 - lodash.sortby@4.7.0: {} lodash.startcase@4.4.0: {} @@ -2947,14 +2872,14 @@ snapshots: dependencies: yallist: 4.0.0 - magic-string@0.30.10: + magic-string@0.30.11: dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 - magicast@0.3.4: + magicast@0.3.5: dependencies: - '@babel/parser': 7.24.5 - '@babel/types': 7.24.5 + '@babel/parser': 7.25.6 + '@babel/types': 7.25.6 source-map-js: 1.2.0 merge-stream@2.0.0: {} @@ -2999,6 +2924,8 @@ snapshots: ms@2.1.2: {} + ms@2.1.3: {} + mz@2.7.0: dependencies: any-promise: 1.3.0 @@ -3007,10 +2934,10 @@ snapshots: nanoid@3.3.7: {} - nodemon@3.1.4: + nodemon@3.1.7: dependencies: chokidar: 3.6.0 - debug: 4.3.4(supports-color@5.5.0) + debug: 4.3.5(supports-color@5.5.0) ignore-by-default: 1.0.1 minimatch: 3.1.2 pstree.remy: 1.1.8 @@ -3056,22 +2983,16 @@ snapshots: dependencies: p-try: 2.2.0 - p-limit@3.1.0: - dependencies: - yocto-queue: 0.1.0 - p-locate@4.1.0: dependencies: p-limit: 2.3.0 - p-locate@5.0.0: - dependencies: - p-limit: 3.1.0 - p-map@2.1.0: {} p-try@2.2.0: {} + package-manager-detector@0.2.0: {} + path-exists@4.0.0: {} path-key@3.1.1: {} @@ -3089,18 +3010,16 @@ snapshots: pathval@2.0.0: {} - picocolors@1.0.1: {} + picocolors@1.1.0: {} picomatch@2.3.1: {} + picomatch@4.0.2: {} + pify@4.0.1: {} pirates@4.0.6: {} - pkg-dir@4.2.0: - dependencies: - find-up: 4.1.0 - postcss-load-config@6.0.1(jiti@1.21.6)(postcss@8.4.38): dependencies: lilconfig: 3.1.2 @@ -3111,16 +3030,9 @@ snapshots: postcss@8.4.38: dependencies: nanoid: 3.3.7 - picocolors: 1.0.1 + picocolors: 1.1.0 source-map-js: 1.2.0 - preferred-pm@3.1.3: - dependencies: - find-up: 5.0.0 - find-yarn-workspace-root2: 1.2.16 - path-exists: 4.0.0 - which-pm: 2.0.0 - prettier@2.8.8: {} prettier@3.3.3: {} @@ -3302,7 +3214,14 @@ snapshots: tiny-colors: 2.0.2 when-exit: 2.1.1 - tinybench@2.8.0: {} + tinybench@2.9.0: {} + + tinyexec@0.3.0: {} + + tinyglobby@0.2.6: + dependencies: + fdir: 6.3.0(picomatch@4.0.2) + picomatch: 4.0.2 tinypool@1.0.0: {} @@ -3332,62 +3251,62 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.2.4(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.5.4): + tsup@8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2): dependencies: bundle-require: 5.0.0(esbuild@0.23.0) cac: 6.7.14 chokidar: 3.6.0 consola: 3.2.3 - debug: 4.3.5 + debug: 4.3.5(supports-color@5.5.0) esbuild: 0.23.0 execa: 5.1.1 - globby: 11.1.0 joycon: 3.1.1 - picocolors: 1.0.1 + picocolors: 1.1.0 postcss-load-config: 6.0.1(jiti@1.21.6)(postcss@8.4.38) resolve-from: 5.0.0 rollup: 4.19.0 source-map: 0.8.0-beta.0 sucrase: 3.35.0 + tinyglobby: 0.2.6 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.5.4 + typescript: 5.6.2 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.0.14: + turbo-darwin-64@2.1.2: optional: true - turbo-darwin-arm64@2.0.14: + turbo-darwin-arm64@2.1.2: optional: true - turbo-linux-64@2.0.14: + turbo-linux-64@2.1.2: optional: true - turbo-linux-arm64@2.0.14: + turbo-linux-arm64@2.1.2: optional: true - turbo-windows-64@2.0.14: + turbo-windows-64@2.1.2: optional: true - turbo-windows-arm64@2.0.14: + turbo-windows-arm64@2.1.2: optional: true - turbo@2.0.14: + turbo@2.1.2: optionalDependencies: - turbo-darwin-64: 2.0.14 - turbo-darwin-arm64: 2.0.14 - turbo-linux-64: 2.0.14 - turbo-linux-arm64: 2.0.14 - turbo-windows-64: 2.0.14 - turbo-windows-arm64: 2.0.14 + turbo-darwin-64: 2.1.2 + turbo-darwin-arm64: 2.1.2 + turbo-linux-64: 2.1.2 + turbo-linux-arm64: 2.1.2 + turbo-windows-64: 2.1.2 + turbo-windows-arm64: 2.1.2 - typescript@5.5.4: {} + typescript@5.6.2: {} undefsafe@2.0.5: {} @@ -3395,13 +3314,12 @@ snapshots: universalify@0.1.2: {} - vite-node@2.0.5(@types/node@22.5.0): + vite-node@2.1.1(@types/node@22.5.5): dependencies: cac: 6.7.14 - debug: 4.3.5 + debug: 4.3.7 pathe: 1.1.2 - tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@22.5.0) + vite: 5.2.10(@types/node@22.5.5) transitivePeerDependencies: - '@types/node' - less @@ -3412,41 +3330,42 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.5.0): + vite@5.2.10(@types/node@22.5.5): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.19.0 optionalDependencies: - '@types/node': 22.5.0 + '@types/node': 22.5.5 fsevents: 2.3.3 - vitest@2.0.5(@types/node@22.5.0): + vitest@2.1.1(@types/node@22.5.5): dependencies: - '@ampproject/remapping': 2.3.0 - '@vitest/expect': 2.0.5 - '@vitest/pretty-format': 2.0.5 - '@vitest/runner': 2.0.5 - '@vitest/snapshot': 2.0.5 - '@vitest/spy': 2.0.5 - '@vitest/utils': 2.0.5 + '@vitest/expect': 2.1.1 + '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.2.10(@types/node@22.5.5)) + '@vitest/pretty-format': 2.1.1 + '@vitest/runner': 2.1.1 + '@vitest/snapshot': 2.1.1 + '@vitest/spy': 2.1.1 + '@vitest/utils': 2.1.1 chai: 5.1.1 - debug: 4.3.5 - execa: 8.0.1 - magic-string: 0.30.10 + debug: 4.3.7 + magic-string: 0.30.11 pathe: 1.1.2 std-env: 3.7.0 - tinybench: 2.8.0 + tinybench: 2.9.0 + tinyexec: 0.3.0 tinypool: 1.0.0 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@22.5.0) - vite-node: 2.0.5(@types/node@22.5.0) + vite: 5.2.10(@types/node@22.5.5) + vite-node: 2.1.1(@types/node@22.5.5) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.5.0 + '@types/node': 22.5.5 transitivePeerDependencies: - less - lightningcss + - msw - sass - stylus - sugarss @@ -3463,11 +3382,6 @@ snapshots: when-exit@2.1.1: {} - which-pm@2.0.0: - dependencies: - load-yaml-file: 0.2.0 - path-exists: 4.0.0 - which@1.3.1: dependencies: isexe: 2.0.0 @@ -3498,5 +3412,3 @@ snapshots: yallist@4.0.0: {} yallist@5.0.0: {} - - yocto-queue@0.1.0: {} From b165654fd3603b5db3688cecf7dc5c51052643d6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 22 Sep 2024 14:21:02 +0100 Subject: [PATCH 126/290] update deps --- packages/commands/package.json | 2 +- packages/core/package.json | 2 +- packages/create-solid/package.json | 2 +- packages/ui/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index f85bcb4..e7a1937 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/commands", - "version": "0.0.23", + "version": "0.0.24", "description": "The main command handlers for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", diff --git a/packages/core/package.json b/packages/core/package.json index 3f0a5b2..e3ec7a9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/core", - "version": "0.0.25", + "version": "0.0.26", "description": "A CLI for Solid", "author": "Thomas Beer & Rahul Batra", "license": "MIT", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 26b85e9..0f18091 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.12", + "version": "0.5.13", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/ui/package.json b/packages/ui/package.json index 3315f64..3bf7f8e 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/ui", - "version": "0.0.12", + "version": "0.0.13", "license": "MIT", "homepage": "https://solid-cli.netlify.app", "repository": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 7b2fd68..04027f6 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.14", + "version": "0.0.15", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From bee4bb86a7b72e6526deebcd8405bd084cdcd8c2 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 30 Oct 2024 09:02:48 +0000 Subject: [PATCH 127/290] fix: don't try to transpile js templates --- packages/commands/src/handlers/new.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts index 5afc5fc..ae03fe5 100644 --- a/packages/commands/src/handlers/new.ts +++ b/packages/commands/src/handlers/new.ts @@ -216,10 +216,11 @@ export const handleNew = async ( return; } - const withTs = variation ? variation === "ts" : await cancelable(p.confirm({ message: "Use Typescript?" })); + const withTs = variation.startsWith("ts") ? await cancelable(p.confirm({ message: "Use Typescript?" })) : false; // If the user does not want ts, we create the project in a temp directory inside the project directory - const tempDir = withTs ? name : join(name, ".solid-start"); + // If project is already JS don't bother transpiling + const tempDir = withTs || variation.startsWith("js") ? name : join(name, ".solid-start"); const readmeAlreadyExists = existsSync(join(name, "README.md")); await spinnerify({ @@ -229,8 +230,8 @@ export const handleNew = async ( await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: variation }, dest: tempDir }); }, }); - - if (!withTs) await handleTSConversion(tempDir, name); + // Don't try to convert to ts if the template used is JS + if (!withTs && !variation.startsWith("js")) await handleTSConversion(tempDir, name); // Add .gitignore writeFileSync(join(name, ".gitignore"), gitIgnore); From 0bdb67382f5c9641675732bd2cbf6e33c068994d Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Wed, 30 Oct 2024 17:01:09 +0100 Subject: [PATCH 128/290] Add with { type: "json" } to package.json import --- packages/create-solid/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index e331de8..c094406 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -2,10 +2,10 @@ import { AllSupported, handleNew, isSupported } from "@solid-cli/commands/new"; import color from "picocolors"; import { intro } from "@clack/prompts"; -import { version } from "../package.json"; +import packageJson from "../package.json" with { type: "json" }; import { command, run, option, string, boolean, flag, optional, positional } from "cmd-ts"; -intro(`\n${color.bgCyan(color.black(` Create-Solid v${version}`))}`); +intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); const app = command({ name: "create-solid", From 5800f952ddf46acb8ff58f825480d3f40e05b030 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Thu, 31 Oct 2024 22:50:09 +0100 Subject: [PATCH 129/290] Add deno support for solid cli --- packages/utils/src/package-manager/index.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/utils/src/package-manager/index.ts b/packages/utils/src/package-manager/index.ts index 7b3d934..88ecdd3 100644 --- a/packages/utils/src/package-manager/index.ts +++ b/packages/utils/src/package-manager/index.ts @@ -31,6 +31,15 @@ export const detectPackageManager = (): PackageManager => { return s; }, }; + case userAgent.startsWith("deno"): + return { + name: "deno", + runner: "deno run", + installCommand: "add", + runScriptCommand(s) { + return s; + }, + }; default: return { name: "npm", From f50292b3a4660e386e358fbdc2d7f96306b15812 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 1 Nov 2024 19:47:18 +0100 Subject: [PATCH 130/290] add task --- packages/utils/src/package-manager/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/utils/src/package-manager/index.ts b/packages/utils/src/package-manager/index.ts index 88ecdd3..a1720e5 100644 --- a/packages/utils/src/package-manager/index.ts +++ b/packages/utils/src/package-manager/index.ts @@ -37,7 +37,7 @@ export const detectPackageManager = (): PackageManager => { runner: "deno run", installCommand: "add", runScriptCommand(s) { - return s; + return `task ${s}`; }, }; default: From ffd59e711a0aa7ce8d9aa0f00dac895a535586ac Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:56:30 +0000 Subject: [PATCH 131/290] chore: update deps --- package.json | 6 +- packages/commands/package.json | 8 +- packages/core/package.json | 10 +- packages/create-solid/package.json | 10 +- packages/reactivity/package.json | 4 +- packages/ui/package.json | 8 +- packages/utils/package.json | 12 +- pnpm-lock.yaml | 898 +++++++++++++++++------------ 8 files changed, 548 insertions(+), 408 deletions(-) diff --git a/package.json b/package.json index c469ed0..04c27b1 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.8", + "@changesets/cli": "2.27.9", "nodemon": "^3.1.7", "prettier": "^3.3.3", - "turbo": "^2.1.2", - "vitest": "^2.1.1" + "turbo": "^2.2.3", + "vitest": "^2.1.5" }, "packageManager": "pnpm@9.6.0" } diff --git a/packages/commands/package.json b/packages/commands/package.json index e7a1937..916076c 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -33,10 +33,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^22.5.5", + "@types/node": "^22.9.0", "prettier": "^3.3.3", - "tsup": "^8.3.0", - "typescript": "^5.6.2" + "tsup": "^8.3.5", + "typescript": "^5.6.3" }, "publishConfig": { "access": "public" @@ -48,7 +48,7 @@ "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "execa": "^8.0.1", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "sucrase": "^3.35.0" } } diff --git a/packages/core/package.json b/packages/core/package.json index e3ec7a9..e961d0c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -30,7 +30,7 @@ "@solid-cli/utils": "workspace:*", "cmd-ts": "^0.13.0", "execa": "^8.0.1", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "smol-toml": "^1.3.0", "tiny-updater": "^3.5.2" }, @@ -40,10 +40,10 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^22.5.5", - "jiti": "^1.21.6", - "tsup": "^8.3.0", - "typescript": "^5.6.2" + "@types/node": "^22.9.0", + "jiti": "^2.4.0", + "tsup": "^8.3.5", + "typescript": "^5.6.3" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 0f18091..ba9ac57 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,12 +31,12 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@types/node": "^22.5.5", + "@types/node": "^22.9.0", "cmd-ts": "^0.13.0", - "jiti": "^1.21.6", - "picocolors": "^1.1.0", - "tsup": "^8.3.0", - "typescript": "^5.6.2" + "jiti": "^2.4.0", + "picocolors": "^1.1.1", + "tsup": "^8.3.5", + "typescript": "^5.6.3" }, "publishConfig": { "access": "public" diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json index 9a826f1..948af8f 100644 --- a/packages/reactivity/package.json +++ b/packages/reactivity/package.json @@ -28,8 +28,8 @@ }, "author": "Thomas Beer", "devDependencies": { - "tsup": "^8.3.0", - "typescript": "^5.6.2" + "tsup": "^8.3.5", + "typescript": "^5.6.3" }, "publishConfig": { "access": "public" diff --git a/packages/ui/package.json b/packages/ui/package.json index 3bf7f8e..39b8a9a 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -27,9 +27,9 @@ "build": "tsc && tsup" }, "devDependencies": { - "tsup": "^8.3.0", - "typescript": "^5.6.2", - "@types/node": "22.5.5" + "tsup": "^8.3.5", + "typescript": "^5.6.3", + "@types/node": "22.9.0" }, "publishConfig": { "access": "public" @@ -37,7 +37,7 @@ "dependencies": { "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "@solid-cli/reactivity": "workspace:*", "@solid-cli/utils": "workspace:*" } diff --git a/packages/utils/package.json b/packages/utils/package.json index 04027f6..95e521f 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,12 +63,12 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.5.5", - "jiti": "^1.21.6", + "@types/node": "22.9.0", + "jiti": "^2.4.0", "magicast": "^0.3.5", - "tsup": "^8.3.0", - "typescript": "^5.6.2", - "vitest": "^2.1.1" + "tsup": "^8.3.5", + "typescript": "^5.6.3", + "vitest": "^2.1.5" }, "publishConfig": { "access": "public" @@ -79,7 +79,7 @@ "@solid-cli/reactivity": "workspace:*", "cmd-ts": "^0.13.0", "execa": "^8.0.1", - "picocolors": "^1.1.0", + "picocolors": "^1.1.1", "smol-toml": "^1.3.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3239d2b..71d2f67 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.27.8 - version: 2.27.8 + specifier: 2.27.9 + version: 2.27.9 nodemon: specifier: ^3.1.7 version: 3.1.7 @@ -18,11 +18,11 @@ importers: specifier: ^3.3.3 version: 3.3.3 turbo: - specifier: ^2.1.2 - version: 2.1.2 + specifier: ^2.2.3 + version: 2.2.3 vitest: - specifier: ^2.1.1 - version: 2.1.1(@types/node@22.5.5) + specifier: ^2.1.5 + version: 2.1.5(@types/node@22.9.0) packages/commands: dependencies: @@ -45,8 +45,8 @@ importers: specifier: ^8.0.1 version: 8.0.1 picocolors: - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.1 + version: 1.1.1 sucrase: specifier: ^3.35.0 version: 3.35.0 @@ -55,17 +55,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^22.5.5 - version: 22.5.5 + specifier: ^22.9.0 + version: 22.9.0 prettier: specifier: ^3.3.3 version: 3.3.3 tsup: - specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) typescript: - specifier: ^5.6.2 - version: 5.6.2 + specifier: ^5.6.3 + version: 5.6.3 packages/core: dependencies: @@ -94,8 +94,8 @@ importers: specifier: ^8.0.1 version: 8.0.1 picocolors: - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.1 + version: 1.1.1 smol-toml: specifier: ^1.3.0 version: 1.3.0 @@ -107,17 +107,17 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: ^22.5.5 - version: 22.5.5 + specifier: ^22.9.0 + version: 22.9.0 jiti: - specifier: ^1.21.6 - version: 1.21.6 + specifier: ^2.4.0 + version: 2.4.0 tsup: - specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) typescript: - specifier: ^5.6.2 - version: 5.6.2 + specifier: ^5.6.3 + version: 5.6.3 packages/create-solid: devDependencies: @@ -128,32 +128,32 @@ importers: specifier: workspace:* version: link:../commands '@types/node': - specifier: ^22.5.5 - version: 22.5.5 + specifier: ^22.9.0 + version: 22.9.0 cmd-ts: specifier: ^0.13.0 version: 0.13.0 jiti: - specifier: ^1.21.6 - version: 1.21.6 + specifier: ^2.4.0 + version: 2.4.0 picocolors: - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.1 + version: 1.1.1 tsup: - specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) typescript: - specifier: ^5.6.2 - version: 5.6.2 + specifier: ^5.6.3 + version: 5.6.3 packages/reactivity: devDependencies: tsup: - specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) typescript: - specifier: ^5.6.2 - version: 5.6.2 + specifier: ^5.6.3 + version: 5.6.3 packages/ui: dependencies: @@ -170,18 +170,18 @@ importers: specifier: workspace:* version: link:../utils picocolors: - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.1 + version: 1.1.1 devDependencies: '@types/node': - specifier: 22.5.5 - version: 22.5.5 + specifier: 22.9.0 + version: 22.9.0 tsup: - specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) typescript: - specifier: ^5.6.2 - version: 5.6.2 + specifier: ^5.6.3 + version: 5.6.3 packages/utils: dependencies: @@ -201,8 +201,8 @@ importers: specifier: ^8.0.1 version: 8.0.1 picocolors: - specifier: ^1.1.0 - version: 1.1.0 + specifier: ^1.1.1 + version: 1.1.1 smol-toml: specifier: ^1.3.0 version: 1.3.0 @@ -211,23 +211,23 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.5.5 - version: 22.5.5 + specifier: 22.9.0 + version: 22.9.0 jiti: - specifier: ^1.21.6 - version: 1.21.6 + specifier: ^2.4.0 + version: 2.4.0 magicast: specifier: ^0.3.5 version: 0.3.5 tsup: - specifier: ^8.3.0 - version: 8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2) + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) typescript: - specifier: ^5.6.2 - version: 5.6.2 + specifier: ^5.6.3 + version: 5.6.3 vitest: - specifier: ^2.1.1 - version: 2.1.1(@types/node@22.5.5) + specifier: ^2.1.5 + version: 2.1.5(@types/node@22.9.0) packages: @@ -264,8 +264,8 @@ packages: '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.8': - resolution: {integrity: sha512-gZNyh+LdSsI82wBSHLQ3QN5J30P4uHKJ4fXgoGwQxfXwYFTJzDdvIJasZn8rYQtmKhyQuiBj4SSnLuKlxKWq4w==} + '@changesets/cli@2.27.9': + resolution: {integrity: sha512-q42a/ZbDnxPpCb5Wkm6tMVIxgeI9C/bexntzTeCFBrQEdpisQqk8kCHllYZMDjYtEc1ZzumbMJAG8H0Z4rdvjg==} hasBin: true '@changesets/config@3.0.3': @@ -343,8 +343,8 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.23.0': - resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==} + '@esbuild/aix-ppc64@0.24.0': + resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] @@ -355,8 +355,8 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.23.0': - resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==} + '@esbuild/android-arm64@0.24.0': + resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==} engines: {node: '>=18'} cpu: [arm64] os: [android] @@ -367,8 +367,8 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.23.0': - resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==} + '@esbuild/android-arm@0.24.0': + resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==} engines: {node: '>=18'} cpu: [arm] os: [android] @@ -379,8 +379,8 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.23.0': - resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==} + '@esbuild/android-x64@0.24.0': + resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==} engines: {node: '>=18'} cpu: [x64] os: [android] @@ -391,8 +391,8 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.23.0': - resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==} + '@esbuild/darwin-arm64@0.24.0': + resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] @@ -403,8 +403,8 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.23.0': - resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==} + '@esbuild/darwin-x64@0.24.0': + resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==} engines: {node: '>=18'} cpu: [x64] os: [darwin] @@ -415,8 +415,8 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.23.0': - resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==} + '@esbuild/freebsd-arm64@0.24.0': + resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] @@ -427,8 +427,8 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.23.0': - resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==} + '@esbuild/freebsd-x64@0.24.0': + resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] @@ -439,8 +439,8 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.23.0': - resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==} + '@esbuild/linux-arm64@0.24.0': + resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==} engines: {node: '>=18'} cpu: [arm64] os: [linux] @@ -451,8 +451,8 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.23.0': - resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==} + '@esbuild/linux-arm@0.24.0': + resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==} engines: {node: '>=18'} cpu: [arm] os: [linux] @@ -463,8 +463,8 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.23.0': - resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==} + '@esbuild/linux-ia32@0.24.0': + resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==} engines: {node: '>=18'} cpu: [ia32] os: [linux] @@ -475,8 +475,8 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.23.0': - resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==} + '@esbuild/linux-loong64@0.24.0': + resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==} engines: {node: '>=18'} cpu: [loong64] os: [linux] @@ -487,8 +487,8 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.23.0': - resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==} + '@esbuild/linux-mips64el@0.24.0': + resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] @@ -499,8 +499,8 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.23.0': - resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==} + '@esbuild/linux-ppc64@0.24.0': + resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] @@ -511,8 +511,8 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.23.0': - resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==} + '@esbuild/linux-riscv64@0.24.0': + resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] @@ -523,8 +523,8 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.23.0': - resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==} + '@esbuild/linux-s390x@0.24.0': + resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==} engines: {node: '>=18'} cpu: [s390x] os: [linux] @@ -535,8 +535,8 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.23.0': - resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==} + '@esbuild/linux-x64@0.24.0': + resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==} engines: {node: '>=18'} cpu: [x64] os: [linux] @@ -547,14 +547,14 @@ packages: cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.23.0': - resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==} + '@esbuild/netbsd-x64@0.24.0': + resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.23.0': - resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==} + '@esbuild/openbsd-arm64@0.24.0': + resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] @@ -565,8 +565,8 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.23.0': - resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==} + '@esbuild/openbsd-x64@0.24.0': + resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] @@ -577,8 +577,8 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.23.0': - resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==} + '@esbuild/sunos-x64@0.24.0': + resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==} engines: {node: '>=18'} cpu: [x64] os: [sunos] @@ -589,8 +589,8 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.23.0': - resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==} + '@esbuild/win32-arm64@0.24.0': + resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==} engines: {node: '>=18'} cpu: [arm64] os: [win32] @@ -601,8 +601,8 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.23.0': - resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==} + '@esbuild/win32-ia32@0.24.0': + resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==} engines: {node: '>=18'} cpu: [ia32] os: [win32] @@ -613,8 +613,8 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.23.0': - resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==} + '@esbuild/win32-x64@0.24.0': + resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -679,81 +679,171 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.26.0': + resolution: {integrity: sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.19.0': resolution: {integrity: sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.26.0': + resolution: {integrity: sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.19.0': resolution: {integrity: sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.26.0': + resolution: {integrity: sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.19.0': resolution: {integrity: sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.26.0': + resolution: {integrity: sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==} + cpu: [x64] + os: [darwin] + + '@rollup/rollup-freebsd-arm64@4.26.0': + resolution: {integrity: sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==} + cpu: [arm64] + os: [freebsd] + + '@rollup/rollup-freebsd-x64@4.26.0': + resolution: {integrity: sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==} + cpu: [x64] + os: [freebsd] + '@rollup/rollup-linux-arm-gnueabihf@4.19.0': resolution: {integrity: sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.26.0': + resolution: {integrity: sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.19.0': resolution: {integrity: sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.26.0': + resolution: {integrity: sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.19.0': resolution: {integrity: sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.26.0': + resolution: {integrity: sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.19.0': resolution: {integrity: sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.26.0': + resolution: {integrity: sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': resolution: {integrity: sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==} cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': + resolution: {integrity: sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.19.0': resolution: {integrity: sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.26.0': + resolution: {integrity: sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.19.0': resolution: {integrity: sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.26.0': + resolution: {integrity: sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.19.0': resolution: {integrity: sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.26.0': + resolution: {integrity: sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.19.0': resolution: {integrity: sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.26.0': + resolution: {integrity: sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==} + cpu: [x64] + os: [linux] + '@rollup/rollup-win32-arm64-msvc@4.19.0': resolution: {integrity: sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.26.0': + resolution: {integrity: sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.19.0': resolution: {integrity: sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.26.0': + resolution: {integrity: sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==} + cpu: [ia32] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.19.0': resolution: {integrity: sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.26.0': + resolution: {integrity: sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==} + cpu: [x64] + os: [win32] + '@swc/core-darwin-arm64@1.5.5': resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} engines: {node: '>=10'} @@ -832,23 +922,22 @@ packages: '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} + '@types/estree@1.0.6': + resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.5.5': - resolution: {integrity: sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA==} + '@types/node@22.9.0': + resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} - '@types/semver@7.5.8': - resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} + '@vitest/expect@2.1.5': + resolution: {integrity: sha512-nZSBTW1XIdpZvEJyoP/Sy8fUg0b8od7ZpGDkTUcfJ7wz/VoZAFzFfLyxVxGFhUjJzhYqSbIpfMtl/+k/dpWa3Q==} - '@vitest/expect@2.1.1': - resolution: {integrity: sha512-YeueunS0HiHiQxk+KEOnq/QMzlUuOzbU1Go+PgAsHvvv3tUkJPm9xWt+6ITNTlzsMXUjmgm5T+U7KBPK2qQV6w==} - - '@vitest/mocker@2.1.1': - resolution: {integrity: sha512-LNN5VwOEdJqCmJ/2XJBywB11DLlkbY0ooDJW3uRX5cZyYCrc4PI/ePX0iQhE3BiEGiQmK4GE7Q/PqCkkaiPnrA==} + '@vitest/mocker@2.1.5': + resolution: {integrity: sha512-XYW6l3UuBmitWqSUXTNXcVBUCRytDogBsWuNXQijc00dtnU/9OqpXWp4OJroVrad/gLIomAq9aW8yWDBtMthhQ==} peerDependencies: - '@vitest/spy': 2.1.1 - msw: ^2.3.5 + msw: ^2.4.9 vite: ^5.0.0 peerDependenciesMeta: msw: @@ -856,20 +945,20 @@ packages: vite: optional: true - '@vitest/pretty-format@2.1.1': - resolution: {integrity: sha512-SjxPFOtuINDUW8/UkElJYQSFtnWX7tMksSGW0vfjxMneFqxVr8YJ979QpMbDW7g+BIiq88RAGDjf7en6rvLPPQ==} + '@vitest/pretty-format@2.1.5': + resolution: {integrity: sha512-4ZOwtk2bqG5Y6xRGHcveZVr+6txkH7M2e+nPFd6guSoN638v/1XQ0K06eOpi0ptVU/2tW/pIU4IoPotY/GZ9fw==} - '@vitest/runner@2.1.1': - resolution: {integrity: sha512-uTPuY6PWOYitIkLPidaY5L3t0JJITdGTSwBtwMjKzo5O6RCOEncz9PUN+0pDidX8kTHYjO0EwUIvhlGpnGpxmA==} + '@vitest/runner@2.1.5': + resolution: {integrity: sha512-pKHKy3uaUdh7X6p1pxOkgkVAFW7r2I818vHDthYLvUyjRfkKOU6P45PztOch4DZarWQne+VOaIMwA/erSSpB9g==} - '@vitest/snapshot@2.1.1': - resolution: {integrity: sha512-BnSku1WFy7r4mm96ha2FzN99AZJgpZOWrAhtQfoxjUU5YMRpq1zmHRq7a5K9/NjqonebO7iVDla+VvZS8BOWMw==} + '@vitest/snapshot@2.1.5': + resolution: {integrity: sha512-zmYw47mhfdfnYbuhkQvkkzYroXUumrwWDGlMjpdUr4jBd3HZiV2w7CQHj+z7AAS4VOtWxI4Zt4bWt4/sKcoIjg==} - '@vitest/spy@2.1.1': - resolution: {integrity: sha512-ZM39BnZ9t/xZ/nF4UwRH5il0Sw93QnZXd9NAZGRpIgj0yvVwPpLd702s/Cx955rGaMlyBQkZJ2Ir7qyY48VZ+g==} + '@vitest/spy@2.1.5': + resolution: {integrity: sha512-aWZF3P0r3w6DiYTVskOYuhBc7EMc3jvn1TkBg8ttylFFRqNN2XGD7V5a4aQdk6QiUzZQ4klNBSpCLJgWNdIiNw==} - '@vitest/utils@2.1.1': - resolution: {integrity: sha512-Y6Q9TsI+qJ2CC0ZKj6VBb+T8UPz593N113nnUykqwANqhgf3QkZeHFlusgKLTqrnVHbj/XDKZcDHol+dxVT+rQ==} + '@vitest/utils@2.1.5': + resolution: {integrity: sha512-yfj6Yrp0Vesw2cwJbP+cl04OC+IHFsuQsrsJBL9pyGeQXE56v1UAOQco+SR55Vf1nQzfV0QJg1Qum7AaWUwwYg==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -943,8 +1032,8 @@ packages: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} - chai@5.1.1: - resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==} + chai@5.1.2: + resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==} engines: {node: '>=12'} chalk@4.1.2: @@ -962,6 +1051,10 @@ packages: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} + chokidar@4.0.1: + resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + engines: {node: '>= 14.16.0'} + chownr@3.0.0: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} @@ -1058,13 +1151,16 @@ packages: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} + es-module-lexer@1.5.4: + resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} + esbuild@0.20.2: resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} engines: {node: '>=12'} hasBin: true - esbuild@0.23.0: - resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==} + esbuild@0.24.0: + resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==} engines: {node: '>=18'} hasBin: true @@ -1076,14 +1172,14 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - execa@8.0.1: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} + expect-type@1.1.0: + resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==} + engines: {node: '>=12.0.0'} + extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} @@ -1098,8 +1194,8 @@ packages: fastq@1.15.0: resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} - fdir@6.3.0: - resolution: {integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==} + fdir@6.4.2: + resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -1134,10 +1230,6 @@ packages: get-func-name@2.0.2: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} - get-stream@6.0.1: - resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} - engines: {node: '>=10'} - get-stream@8.0.1: resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} engines: {node: '>=16'} @@ -1169,10 +1261,6 @@ packages: human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} - human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - human-signals@5.0.0: resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} engines: {node: '>=16.17.0'} @@ -1211,10 +1299,6 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1234,8 +1318,8 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - jiti@1.21.6: - resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + jiti@2.4.0: + resolution: {integrity: sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==} hasBin: true joycon@3.1.1: @@ -1273,6 +1357,9 @@ packages: loupe@3.1.1: resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==} + loupe@3.1.2: + resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==} + lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} @@ -1284,8 +1371,8 @@ packages: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} - magic-string@0.30.11: - resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} + magic-string@0.30.12: + resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==} magicast@0.3.5: resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} @@ -1309,10 +1396,6 @@ packages: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} - mimic-fn@2.1.0: - resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} - engines: {node: '>=6'} - mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} @@ -1372,10 +1455,6 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - npm-run-path@5.3.0: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1384,10 +1463,6 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - onetime@5.1.2: - resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} - engines: {node: '>=6'} - onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} @@ -1449,8 +1524,8 @@ packages: resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} engines: {node: '>= 14.16'} - picocolors@1.1.0: - resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} @@ -1521,6 +1596,10 @@ packages: resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} engines: {node: '>=8.10.0'} + readdirp@4.0.2: + resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==} + engines: {node: '>= 14.16.0'} + regenerator-runtime@0.14.1: resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} @@ -1542,6 +1621,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.26.0: + resolution: {integrity: sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -1611,8 +1695,8 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - std-env@3.7.0: - resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==} + std-env@3.8.0: + resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==} string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} @@ -1634,10 +1718,6 @@ packages: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} - strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} @@ -1679,23 +1759,23 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} - tinyexec@0.3.0: - resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==} + tinyexec@0.3.1: + resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==} - tinyglobby@0.2.6: - resolution: {integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==} + tinyglobby@0.2.10: + resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} engines: {node: '>=12.0.0'} - tinypool@1.0.0: - resolution: {integrity: sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==} + tinypool@1.0.1: + resolution: {integrity: sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==} engines: {node: ^18.0.0 || >=20.0.0} tinyrainbow@1.2.0: resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} engines: {node: '>=14.0.0'} - tinyspy@3.0.0: - resolution: {integrity: sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==} + tinyspy@3.0.2: + resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} engines: {node: '>=14.0.0'} tmp@0.0.33: @@ -1724,8 +1804,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.3.0: - resolution: {integrity: sha512-ALscEeyS03IomcuNdFdc0YWGVIkwH1Ws7nfTbAPuoILvEV2hpGQAY72LIOjglGo4ShWpZfpBqP/jpQVCzqYQag==} + tsup@8.3.5: + resolution: {integrity: sha512-Tunf6r6m6tnZsG9GYWndg0z8dEV7fD733VBFzFJ5Vcm1FtlXB8xBD/rtrBi2a3YKEV7hHtxiZtW5EAVADoe1pA==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1743,42 +1823,42 @@ packages: typescript: optional: true - turbo-darwin-64@2.1.2: - resolution: {integrity: sha512-3TEBxHWh99h2yIzkuIigMEOXt/ItYQp0aPiJjPd1xN4oDcsKK5AxiFKPH9pdtfIBzYsY59kQhZiFj0ELnSP7Bw==} + turbo-darwin-64@2.2.3: + resolution: {integrity: sha512-Rcm10CuMKQGcdIBS3R/9PMeuYnv6beYIHqfZFeKWVYEWH69sauj4INs83zKMTUiZJ3/hWGZ4jet9AOwhsssLyg==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.1.2: - resolution: {integrity: sha512-he0miWNq2WxJzsH82jS2Z4MXpnkzn9SH8a79iPXiJkq25QREImucscM4RPasXm8wARp91pyysJMq6aasD45CeA==} + turbo-darwin-arm64@2.2.3: + resolution: {integrity: sha512-+EIMHkuLFqUdJYsA3roj66t9+9IciCajgj+DVek+QezEdOJKcRxlvDOS2BUaeN8kEzVSsNiAGnoysFWYw4K0HA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.1.2: - resolution: {integrity: sha512-fKUBcc0rK8Vdqv5a/E3CSpMBLG1bzwv+Q0Q83F8fG2ZfNCNKGbcEYABdonNZkkx141Rj03cZQFCgxu3MVEGU+A==} + turbo-linux-64@2.2.3: + resolution: {integrity: sha512-UBhJCYnqtaeOBQLmLo8BAisWbc9v9daL9G8upLR+XGj6vuN/Nz6qUAhverN4Pyej1g4Nt1BhROnj6GLOPYyqxQ==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.1.2: - resolution: {integrity: sha512-sV8Bpmm0WiuxgbhxymcC7wSsuxfBBieI98GegSwbr/bs1ANAgzCg93urIrdKdQ3/b31zZxQwcaP4FBF1wx1Qdg==} + turbo-linux-arm64@2.2.3: + resolution: {integrity: sha512-hJYT9dN06XCQ3jBka/EWvvAETnHRs3xuO/rb5bESmDfG+d9yQjeTMlhRXKrr4eyIMt6cLDt1LBfyi+6CQ+VAwQ==} cpu: [arm64] os: [linux] - turbo-windows-64@2.1.2: - resolution: {integrity: sha512-wcmIJZI9ORT9ykHGliFE6kWRQrlH930QGSjSgWC8uFChFFuOyUlvC7ttcxuSvU9VqC7NF4C+GVAcFJQ8lTjN7g==} + turbo-windows-64@2.2.3: + resolution: {integrity: sha512-NPrjacrZypMBF31b4HE4ROg4P3nhMBPHKS5WTpMwf7wydZ8uvdEHpESVNMOtqhlp857zbnKYgP+yJF30H3N2dQ==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.1.2: - resolution: {integrity: sha512-zdnXjrhk7YO6CP+Q5wPueEvOCLH4lDa6C4rrwiakcWcPgcQGbVozJlo4uaQ6awo8HLWQEvOwu84RkWTdLAc/Hw==} + turbo-windows-arm64@2.2.3: + resolution: {integrity: sha512-fnNrYBCqn6zgKPKLHu4sOkihBI/+0oYFr075duRxqUZ+1aLWTAGfHZLgjVeLh3zR37CVzuerGIPWAEkNhkWEIw==} cpu: [arm64] os: [win32] - turbo@2.1.2: - resolution: {integrity: sha512-Jb0rbU4iHEVQ18An/YfakdIv9rKnd3zUfSE117EngrfWXFHo3RndVH96US3GsT8VHpwTncPePDBT2t06PaFLrw==} + turbo@2.2.3: + resolution: {integrity: sha512-5lDvSqIxCYJ/BAd6rQGK/AzFRhBkbu4JHVMLmGh/hCb7U3CqSnr5Tjwfy9vc+/5wG2DJ6wttgAaA7MoCgvBKZQ==} hasBin: true - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.6.3: + resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} engines: {node: '>=14.17'} hasBin: true @@ -1792,8 +1872,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@2.1.1: - resolution: {integrity: sha512-N/mGckI1suG/5wQI35XeR9rsMsPqKXzq1CdUndzVstBj/HvyxxGctwnK6WX43NGt5L3Z5tcRf83g4TITKJhPrA==} + vite-node@2.1.5: + resolution: {integrity: sha512-rd0QIgx74q4S1Rd56XIiL2cYEdyWn13cunYBIuqh9mpmQr7gGS0IxXoP8R6OaZtNQQLyXSWbd4rXKYUbhFpK5w==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -1825,15 +1905,15 @@ packages: terser: optional: true - vitest@2.1.1: - resolution: {integrity: sha512-97We7/VC0e9X5zBVkvt7SGQMGrRtn3KtySFQG5fpaMlS+l62eeXRQO633AYhSTC3z7IMebnPPNjGXVGNRFlxBA==} + vitest@2.1.5: + resolution: {integrity: sha512-P4ljsdpuzRTPI/kbND2sDZ4VmieerR2c9szEZpjc+98Z9ebvnXmM5+0tHEKqYZumXqlvnmfWsjeFOjXVriDG7A==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.1.1 - '@vitest/ui': 2.1.1 + '@vitest/browser': 2.1.5 + '@vitest/ui': 2.1.5 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1944,7 +2024,7 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.8': + '@changesets/cli@2.27.9': dependencies: '@changesets/apply-release-plan': 7.0.5 '@changesets/assemble-release-plan': 6.0.4 @@ -1961,17 +2041,15 @@ snapshots: '@changesets/types': 6.0.0 '@changesets/write': 0.3.2 '@manypkg/get-packages': 1.1.3 - '@types/semver': 7.5.8 ansi-colors: 4.1.3 ci-info: 3.9.0 enquirer: 2.4.1 external-editor: 3.1.0 fs-extra: 7.0.1 mri: 1.2.0 - outdent: 0.5.0 p-limit: 2.3.0 package-manager-detector: 0.2.0 - picocolors: 1.1.0 + picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.6.0 spawndamnit: 2.0.0 @@ -1995,7 +2073,7 @@ snapshots: dependencies: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 - picocolors: 1.1.0 + picocolors: 1.1.1 semver: 7.6.0 '@changesets/get-release-plan@4.0.4': @@ -2019,7 +2097,7 @@ snapshots: '@changesets/logger@0.1.1': dependencies: - picocolors: 1.1.0 + picocolors: 1.1.1 '@changesets/parse@0.4.0': dependencies: @@ -2041,7 +2119,7 @@ snapshots: '@changesets/types': 6.0.0 fs-extra: 7.0.1 p-filter: 2.1.0 - picocolors: 1.1.0 + picocolors: 1.1.1 '@changesets/should-skip-package@0.1.1': dependencies: @@ -2078,159 +2156,159 @@ snapshots: '@clack/core@0.3.3': dependencies: - picocolors: 1.1.0 + picocolors: 1.1.1 sisteransi: 1.0.5 '@clack/core@0.3.4': dependencies: - picocolors: 1.1.0 + picocolors: 1.1.1 sisteransi: 1.0.5 '@clack/prompts@0.7.0': dependencies: '@clack/core': 0.3.3 - picocolors: 1.1.0 + picocolors: 1.1.1 sisteransi: 1.0.5 '@esbuild/aix-ppc64@0.20.2': optional: true - '@esbuild/aix-ppc64@0.23.0': + '@esbuild/aix-ppc64@0.24.0': optional: true '@esbuild/android-arm64@0.20.2': optional: true - '@esbuild/android-arm64@0.23.0': + '@esbuild/android-arm64@0.24.0': optional: true '@esbuild/android-arm@0.20.2': optional: true - '@esbuild/android-arm@0.23.0': + '@esbuild/android-arm@0.24.0': optional: true '@esbuild/android-x64@0.20.2': optional: true - '@esbuild/android-x64@0.23.0': + '@esbuild/android-x64@0.24.0': optional: true '@esbuild/darwin-arm64@0.20.2': optional: true - '@esbuild/darwin-arm64@0.23.0': + '@esbuild/darwin-arm64@0.24.0': optional: true '@esbuild/darwin-x64@0.20.2': optional: true - '@esbuild/darwin-x64@0.23.0': + '@esbuild/darwin-x64@0.24.0': optional: true '@esbuild/freebsd-arm64@0.20.2': optional: true - '@esbuild/freebsd-arm64@0.23.0': + '@esbuild/freebsd-arm64@0.24.0': optional: true '@esbuild/freebsd-x64@0.20.2': optional: true - '@esbuild/freebsd-x64@0.23.0': + '@esbuild/freebsd-x64@0.24.0': optional: true '@esbuild/linux-arm64@0.20.2': optional: true - '@esbuild/linux-arm64@0.23.0': + '@esbuild/linux-arm64@0.24.0': optional: true '@esbuild/linux-arm@0.20.2': optional: true - '@esbuild/linux-arm@0.23.0': + '@esbuild/linux-arm@0.24.0': optional: true '@esbuild/linux-ia32@0.20.2': optional: true - '@esbuild/linux-ia32@0.23.0': + '@esbuild/linux-ia32@0.24.0': optional: true '@esbuild/linux-loong64@0.20.2': optional: true - '@esbuild/linux-loong64@0.23.0': + '@esbuild/linux-loong64@0.24.0': optional: true '@esbuild/linux-mips64el@0.20.2': optional: true - '@esbuild/linux-mips64el@0.23.0': + '@esbuild/linux-mips64el@0.24.0': optional: true '@esbuild/linux-ppc64@0.20.2': optional: true - '@esbuild/linux-ppc64@0.23.0': + '@esbuild/linux-ppc64@0.24.0': optional: true '@esbuild/linux-riscv64@0.20.2': optional: true - '@esbuild/linux-riscv64@0.23.0': + '@esbuild/linux-riscv64@0.24.0': optional: true '@esbuild/linux-s390x@0.20.2': optional: true - '@esbuild/linux-s390x@0.23.0': + '@esbuild/linux-s390x@0.24.0': optional: true '@esbuild/linux-x64@0.20.2': optional: true - '@esbuild/linux-x64@0.23.0': + '@esbuild/linux-x64@0.24.0': optional: true '@esbuild/netbsd-x64@0.20.2': optional: true - '@esbuild/netbsd-x64@0.23.0': + '@esbuild/netbsd-x64@0.24.0': optional: true - '@esbuild/openbsd-arm64@0.23.0': + '@esbuild/openbsd-arm64@0.24.0': optional: true '@esbuild/openbsd-x64@0.20.2': optional: true - '@esbuild/openbsd-x64@0.23.0': + '@esbuild/openbsd-x64@0.24.0': optional: true '@esbuild/sunos-x64@0.20.2': optional: true - '@esbuild/sunos-x64@0.23.0': + '@esbuild/sunos-x64@0.24.0': optional: true '@esbuild/win32-arm64@0.20.2': optional: true - '@esbuild/win32-arm64@0.23.0': + '@esbuild/win32-arm64@0.24.0': optional: true '@esbuild/win32-ia32@0.20.2': optional: true - '@esbuild/win32-ia32@0.23.0': + '@esbuild/win32-ia32@0.24.0': optional: true '@esbuild/win32-x64@0.20.2': optional: true - '@esbuild/win32-x64@0.23.0': + '@esbuild/win32-x64@0.24.0': optional: true '@isaacs/cliui@8.0.2': @@ -2303,51 +2381,105 @@ snapshots: '@rollup/rollup-android-arm-eabi@4.19.0': optional: true + '@rollup/rollup-android-arm-eabi@4.26.0': + optional: true + '@rollup/rollup-android-arm64@4.19.0': optional: true + '@rollup/rollup-android-arm64@4.26.0': + optional: true + '@rollup/rollup-darwin-arm64@4.19.0': optional: true + '@rollup/rollup-darwin-arm64@4.26.0': + optional: true + '@rollup/rollup-darwin-x64@4.19.0': optional: true + '@rollup/rollup-darwin-x64@4.26.0': + optional: true + + '@rollup/rollup-freebsd-arm64@4.26.0': + optional: true + + '@rollup/rollup-freebsd-x64@4.26.0': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.19.0': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.26.0': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.19.0': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.26.0': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.19.0': optional: true + '@rollup/rollup-linux-arm64-gnu@4.26.0': + optional: true + '@rollup/rollup-linux-arm64-musl@4.19.0': optional: true + '@rollup/rollup-linux-arm64-musl@4.26.0': + optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.19.0': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.26.0': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.19.0': optional: true + '@rollup/rollup-linux-s390x-gnu@4.26.0': + optional: true + '@rollup/rollup-linux-x64-gnu@4.19.0': optional: true + '@rollup/rollup-linux-x64-gnu@4.26.0': + optional: true + '@rollup/rollup-linux-x64-musl@4.19.0': optional: true + '@rollup/rollup-linux-x64-musl@4.26.0': + optional: true + '@rollup/rollup-win32-arm64-msvc@4.19.0': optional: true + '@rollup/rollup-win32-arm64-msvc@4.26.0': + optional: true + '@rollup/rollup-win32-ia32-msvc@4.19.0': optional: true + '@rollup/rollup-win32-ia32-msvc@4.26.0': + optional: true + '@rollup/rollup-win32-x64-msvc@4.19.0': optional: true + '@rollup/rollup-win32-x64-msvc@4.26.0': + optional: true + '@swc/core-darwin-arm64@1.5.5': optional: true @@ -2405,52 +2537,52 @@ snapshots: '@types/estree@1.0.5': {} + '@types/estree@1.0.6': {} + '@types/node@12.20.55': {} - '@types/node@22.5.5': + '@types/node@22.9.0': dependencies: undici-types: 6.19.8 - '@types/semver@7.5.8': {} - - '@vitest/expect@2.1.1': + '@vitest/expect@2.1.5': dependencies: - '@vitest/spy': 2.1.1 - '@vitest/utils': 2.1.1 - chai: 5.1.1 + '@vitest/spy': 2.1.5 + '@vitest/utils': 2.1.5 + chai: 5.1.2 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.1(@vitest/spy@2.1.1)(vite@5.2.10(@types/node@22.5.5))': + '@vitest/mocker@2.1.5(vite@5.2.10(@types/node@22.9.0))': dependencies: - '@vitest/spy': 2.1.1 + '@vitest/spy': 2.1.5 estree-walker: 3.0.3 - magic-string: 0.30.11 + magic-string: 0.30.12 optionalDependencies: - vite: 5.2.10(@types/node@22.5.5) + vite: 5.2.10(@types/node@22.9.0) - '@vitest/pretty-format@2.1.1': + '@vitest/pretty-format@2.1.5': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.1.1': + '@vitest/runner@2.1.5': dependencies: - '@vitest/utils': 2.1.1 + '@vitest/utils': 2.1.5 pathe: 1.1.2 - '@vitest/snapshot@2.1.1': + '@vitest/snapshot@2.1.5': dependencies: - '@vitest/pretty-format': 2.1.1 - magic-string: 0.30.11 + '@vitest/pretty-format': 2.1.5 + magic-string: 0.30.12 pathe: 1.1.2 - '@vitest/spy@2.1.1': + '@vitest/spy@2.1.5': dependencies: - tinyspy: 3.0.0 + tinyspy: 3.0.2 - '@vitest/utils@2.1.1': + '@vitest/utils@2.1.5': dependencies: - '@vitest/pretty-format': 2.1.1 - loupe: 3.1.1 + '@vitest/pretty-format': 2.1.5 + loupe: 3.1.2 tinyrainbow: 1.2.0 abbrev@1.1.1: {} @@ -2503,14 +2635,14 @@ snapshots: dependencies: fill-range: 7.0.1 - bundle-require@5.0.0(esbuild@0.23.0): + bundle-require@5.0.0(esbuild@0.24.0): dependencies: - esbuild: 0.23.0 + esbuild: 0.24.0 load-tsconfig: 0.2.5 cac@6.7.14: {} - chai@5.1.1: + chai@5.1.2: dependencies: assertion-error: 2.0.1 check-error: 2.1.1 @@ -2539,6 +2671,10 @@ snapshots: optionalDependencies: fsevents: 2.3.3 + chokidar@4.0.1: + dependencies: + readdirp: 4.0.2 + chownr@3.0.0: {} ci-info@3.9.0: {} @@ -2613,6 +2749,8 @@ snapshots: ansi-colors: 4.1.3 strip-ansi: 6.0.1 + es-module-lexer@1.5.4: {} + esbuild@0.20.2: optionalDependencies: '@esbuild/aix-ppc64': 0.20.2 @@ -2639,32 +2777,32 @@ snapshots: '@esbuild/win32-ia32': 0.20.2 '@esbuild/win32-x64': 0.20.2 - esbuild@0.23.0: + esbuild@0.24.0: optionalDependencies: - '@esbuild/aix-ppc64': 0.23.0 - '@esbuild/android-arm': 0.23.0 - '@esbuild/android-arm64': 0.23.0 - '@esbuild/android-x64': 0.23.0 - '@esbuild/darwin-arm64': 0.23.0 - '@esbuild/darwin-x64': 0.23.0 - '@esbuild/freebsd-arm64': 0.23.0 - '@esbuild/freebsd-x64': 0.23.0 - '@esbuild/linux-arm': 0.23.0 - '@esbuild/linux-arm64': 0.23.0 - '@esbuild/linux-ia32': 0.23.0 - '@esbuild/linux-loong64': 0.23.0 - '@esbuild/linux-mips64el': 0.23.0 - '@esbuild/linux-ppc64': 0.23.0 - '@esbuild/linux-riscv64': 0.23.0 - '@esbuild/linux-s390x': 0.23.0 - '@esbuild/linux-x64': 0.23.0 - '@esbuild/netbsd-x64': 0.23.0 - '@esbuild/openbsd-arm64': 0.23.0 - '@esbuild/openbsd-x64': 0.23.0 - '@esbuild/sunos-x64': 0.23.0 - '@esbuild/win32-arm64': 0.23.0 - '@esbuild/win32-ia32': 0.23.0 - '@esbuild/win32-x64': 0.23.0 + '@esbuild/aix-ppc64': 0.24.0 + '@esbuild/android-arm': 0.24.0 + '@esbuild/android-arm64': 0.24.0 + '@esbuild/android-x64': 0.24.0 + '@esbuild/darwin-arm64': 0.24.0 + '@esbuild/darwin-x64': 0.24.0 + '@esbuild/freebsd-arm64': 0.24.0 + '@esbuild/freebsd-x64': 0.24.0 + '@esbuild/linux-arm': 0.24.0 + '@esbuild/linux-arm64': 0.24.0 + '@esbuild/linux-ia32': 0.24.0 + '@esbuild/linux-loong64': 0.24.0 + '@esbuild/linux-mips64el': 0.24.0 + '@esbuild/linux-ppc64': 0.24.0 + '@esbuild/linux-riscv64': 0.24.0 + '@esbuild/linux-s390x': 0.24.0 + '@esbuild/linux-x64': 0.24.0 + '@esbuild/netbsd-x64': 0.24.0 + '@esbuild/openbsd-arm64': 0.24.0 + '@esbuild/openbsd-x64': 0.24.0 + '@esbuild/sunos-x64': 0.24.0 + '@esbuild/win32-arm64': 0.24.0 + '@esbuild/win32-ia32': 0.24.0 + '@esbuild/win32-x64': 0.24.0 esprima@4.0.1: {} @@ -2672,18 +2810,6 @@ snapshots: dependencies: '@types/estree': 1.0.5 - execa@5.1.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - execa@8.0.1: dependencies: cross-spawn: 7.0.3 @@ -2696,6 +2822,8 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 + expect-type@1.1.0: {} + extendable-error@0.1.7: {} external-editor@3.1.0: @@ -2716,7 +2844,7 @@ snapshots: dependencies: reusify: 1.0.4 - fdir@6.3.0(picomatch@4.0.2): + fdir@6.4.2(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 @@ -2751,8 +2879,6 @@ snapshots: get-func-name@2.0.2: {} - get-stream@6.0.1: {} - get-stream@8.0.1: {} glob-parent@5.1.2: @@ -2784,8 +2910,6 @@ snapshots: human-id@1.0.2: {} - human-signals@2.1.0: {} - human-signals@5.0.0: {} iconv-lite@0.4.24: @@ -2812,8 +2936,6 @@ snapshots: is-number@7.0.0: {} - is-stream@2.0.1: {} - is-stream@3.0.0: {} is-subdir@1.2.0: @@ -2830,7 +2952,7 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@1.21.6: {} + jiti@2.4.0: {} joycon@3.1.1: {} @@ -2861,6 +2983,8 @@ snapshots: dependencies: get-func-name: 2.0.2 + loupe@3.1.2: {} + lru-cache@10.1.0: {} lru-cache@4.1.5: @@ -2872,7 +2996,7 @@ snapshots: dependencies: yallist: 4.0.0 - magic-string@0.30.11: + magic-string@0.30.12: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 @@ -2897,8 +3021,6 @@ snapshots: dependencies: mime-db: 1.52.0 - mimic-fn@2.1.0: {} - mimic-fn@4.0.0: {} minimatch@3.1.2: @@ -2953,20 +3075,12 @@ snapshots: normalize-path@3.0.0: {} - npm-run-path@4.0.1: - dependencies: - path-key: 3.1.1 - npm-run-path@5.3.0: dependencies: path-key: 4.0.0 object-assign@4.1.1: {} - onetime@5.1.2: - dependencies: - mimic-fn: 2.1.0 - onetime@6.0.0: dependencies: mimic-fn: 4.0.0 @@ -3010,7 +3124,7 @@ snapshots: pathval@2.0.0: {} - picocolors@1.1.0: {} + picocolors@1.1.1: {} picomatch@2.3.1: {} @@ -3020,17 +3134,17 @@ snapshots: pirates@4.0.6: {} - postcss-load-config@6.0.1(jiti@1.21.6)(postcss@8.4.38): + postcss-load-config@6.0.1(jiti@2.4.0)(postcss@8.4.38): dependencies: lilconfig: 3.1.2 optionalDependencies: - jiti: 1.21.6 + jiti: 2.4.0 postcss: 8.4.38 postcss@8.4.38: dependencies: nanoid: 3.3.7 - picocolors: 1.1.0 + picocolors: 1.1.1 source-map-js: 1.2.0 prettier@2.8.8: {} @@ -3056,6 +3170,8 @@ snapshots: dependencies: picomatch: 2.3.1 + readdirp@4.0.2: {} + regenerator-runtime@0.14.1: {} resolve-from@5.0.0: {} @@ -3088,6 +3204,30 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.19.0 fsevents: 2.3.3 + rollup@4.26.0: + dependencies: + '@types/estree': 1.0.6 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.26.0 + '@rollup/rollup-android-arm64': 4.26.0 + '@rollup/rollup-darwin-arm64': 4.26.0 + '@rollup/rollup-darwin-x64': 4.26.0 + '@rollup/rollup-freebsd-arm64': 4.26.0 + '@rollup/rollup-freebsd-x64': 4.26.0 + '@rollup/rollup-linux-arm-gnueabihf': 4.26.0 + '@rollup/rollup-linux-arm-musleabihf': 4.26.0 + '@rollup/rollup-linux-arm64-gnu': 4.26.0 + '@rollup/rollup-linux-arm64-musl': 4.26.0 + '@rollup/rollup-linux-powerpc64le-gnu': 4.26.0 + '@rollup/rollup-linux-riscv64-gnu': 4.26.0 + '@rollup/rollup-linux-s390x-gnu': 4.26.0 + '@rollup/rollup-linux-x64-gnu': 4.26.0 + '@rollup/rollup-linux-x64-musl': 4.26.0 + '@rollup/rollup-win32-arm64-msvc': 4.26.0 + '@rollup/rollup-win32-ia32-msvc': 4.26.0 + '@rollup/rollup-win32-x64-msvc': 4.26.0 + fsevents: 2.3.3 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -3141,7 +3281,7 @@ snapshots: stackback@0.0.2: {} - std-env@3.7.0: {} + std-env@3.8.0: {} string-width@4.2.3: dependencies: @@ -3165,8 +3305,6 @@ snapshots: strip-bom@3.0.0: {} - strip-final-newline@2.0.0: {} - strip-final-newline@3.0.0: {} sucrase@3.35.0: @@ -3216,18 +3354,18 @@ snapshots: tinybench@2.9.0: {} - tinyexec@0.3.0: {} + tinyexec@0.3.1: {} - tinyglobby@0.2.6: + tinyglobby@0.2.10: dependencies: - fdir: 6.3.0(picomatch@4.0.2) + fdir: 6.4.2(picomatch@4.0.2) picomatch: 4.0.2 - tinypool@1.0.0: {} + tinypool@1.0.1: {} tinyrainbow@1.2.0: {} - tinyspy@3.0.0: {} + tinyspy@3.0.2: {} tmp@0.0.33: dependencies: @@ -3251,62 +3389,62 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.3.0(@swc/core@1.5.5)(jiti@1.21.6)(postcss@8.4.38)(typescript@5.6.2): + tsup@8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3): dependencies: - bundle-require: 5.0.0(esbuild@0.23.0) + bundle-require: 5.0.0(esbuild@0.24.0) cac: 6.7.14 - chokidar: 3.6.0 + chokidar: 4.0.1 consola: 3.2.3 - debug: 4.3.5(supports-color@5.5.0) - esbuild: 0.23.0 - execa: 5.1.1 + debug: 4.3.7 + esbuild: 0.24.0 joycon: 3.1.1 - picocolors: 1.1.0 - postcss-load-config: 6.0.1(jiti@1.21.6)(postcss@8.4.38) + picocolors: 1.1.1 + postcss-load-config: 6.0.1(jiti@2.4.0)(postcss@8.4.38) resolve-from: 5.0.0 - rollup: 4.19.0 + rollup: 4.26.0 source-map: 0.8.0-beta.0 sucrase: 3.35.0 - tinyglobby: 0.2.6 + tinyexec: 0.3.1 + tinyglobby: 0.2.10 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.6.2 + typescript: 5.6.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.1.2: + turbo-darwin-64@2.2.3: optional: true - turbo-darwin-arm64@2.1.2: + turbo-darwin-arm64@2.2.3: optional: true - turbo-linux-64@2.1.2: + turbo-linux-64@2.2.3: optional: true - turbo-linux-arm64@2.1.2: + turbo-linux-arm64@2.2.3: optional: true - turbo-windows-64@2.1.2: + turbo-windows-64@2.2.3: optional: true - turbo-windows-arm64@2.1.2: + turbo-windows-arm64@2.2.3: optional: true - turbo@2.1.2: + turbo@2.2.3: optionalDependencies: - turbo-darwin-64: 2.1.2 - turbo-darwin-arm64: 2.1.2 - turbo-linux-64: 2.1.2 - turbo-linux-arm64: 2.1.2 - turbo-windows-64: 2.1.2 - turbo-windows-arm64: 2.1.2 + turbo-darwin-64: 2.2.3 + turbo-darwin-arm64: 2.2.3 + turbo-linux-64: 2.2.3 + turbo-linux-arm64: 2.2.3 + turbo-windows-64: 2.2.3 + turbo-windows-arm64: 2.2.3 - typescript@5.6.2: {} + typescript@5.6.3: {} undefsafe@2.0.5: {} @@ -3314,12 +3452,13 @@ snapshots: universalify@0.1.2: {} - vite-node@2.1.1(@types/node@22.5.5): + vite-node@2.1.5(@types/node@22.9.0): dependencies: cac: 6.7.14 debug: 4.3.7 + es-module-lexer: 1.5.4 pathe: 1.1.2 - vite: 5.2.10(@types/node@22.5.5) + vite: 5.2.10(@types/node@22.9.0) transitivePeerDependencies: - '@types/node' - less @@ -3330,38 +3469,39 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.5.5): + vite@5.2.10(@types/node@22.9.0): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.19.0 optionalDependencies: - '@types/node': 22.5.5 + '@types/node': 22.9.0 fsevents: 2.3.3 - vitest@2.1.1(@types/node@22.5.5): + vitest@2.1.5(@types/node@22.9.0): dependencies: - '@vitest/expect': 2.1.1 - '@vitest/mocker': 2.1.1(@vitest/spy@2.1.1)(vite@5.2.10(@types/node@22.5.5)) - '@vitest/pretty-format': 2.1.1 - '@vitest/runner': 2.1.1 - '@vitest/snapshot': 2.1.1 - '@vitest/spy': 2.1.1 - '@vitest/utils': 2.1.1 - chai: 5.1.1 + '@vitest/expect': 2.1.5 + '@vitest/mocker': 2.1.5(vite@5.2.10(@types/node@22.9.0)) + '@vitest/pretty-format': 2.1.5 + '@vitest/runner': 2.1.5 + '@vitest/snapshot': 2.1.5 + '@vitest/spy': 2.1.5 + '@vitest/utils': 2.1.5 + chai: 5.1.2 debug: 4.3.7 - magic-string: 0.30.11 + expect-type: 1.1.0 + magic-string: 0.30.12 pathe: 1.1.2 - std-env: 3.7.0 + std-env: 3.8.0 tinybench: 2.9.0 - tinyexec: 0.3.0 - tinypool: 1.0.0 + tinyexec: 0.3.1 + tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@22.5.5) - vite-node: 2.1.1(@types/node@22.5.5) + vite: 5.2.10(@types/node@22.9.0) + vite-node: 2.1.5(@types/node@22.9.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.5.5 + '@types/node': 22.9.0 transitivePeerDependencies: - less - lightningcss From e4c9158f0ebe8e4048fb4c8713034543309a5861 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 18 Jan 2025 22:51:26 +0000 Subject: [PATCH 132/290] feat: begin refactor of `create-solid` package --- packages/create-solid/package.json | 6 +- packages/create-solid/src/create-start.ts | 0 packages/create-solid/src/create-vanilla.ts | 25 ++++++ packages/create-solid/src/helpers.ts | 97 +++++++++++++++++++++ packages/create-solid/src/index.ts | 78 +++++++---------- pnpm-lock.yaml | 17 ++++ 6 files changed, 177 insertions(+), 46 deletions(-) create mode 100644 packages/create-solid/src/create-start.ts create mode 100644 packages/create-solid/src/create-vanilla.ts create mode 100644 packages/create-solid/src/helpers.ts diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ba9ac57..ee06004 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -41,5 +41,9 @@ "publishConfig": { "access": "public" }, - "dependencies": {} + "dependencies": { + "@begit/core": "^0.0.19", + "citty": "^0.1.6", + "sucrase": "^3.35.0" + } } diff --git a/packages/create-solid/src/create-start.ts b/packages/create-solid/src/create-start.ts new file mode 100644 index 0000000..e69de29 diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create-solid/src/create-vanilla.ts new file mode 100644 index 0000000..728da6e --- /dev/null +++ b/packages/create-solid/src/create-vanilla.ts @@ -0,0 +1,25 @@ +import { downloadRepo } from "@begit/core"; +import { join } from "node:path"; +import { GIT_IGNORE, handleTSConversion } from "./helpers"; +import { writeFileSync } from "node:fs"; + +const VANILLA_TEMPLATES = ["ts"] as const; +type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; + +type CreateVanillaArgs = { + template: VanillaTemplate, + destination: string, +} +export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { + return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); +} + +export const createVanillaJS = async ({ template, destination }: CreateVanillaArgs) => { + // Create typescript project in `/.project` + // then transpile this to javascript and clean up + const tempDir = join(destination, ".project"); + await createVanillaTS({ template, destination: tempDir }) + await handleTSConversion(tempDir, destination); + // Add .gitignore + writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); +} \ No newline at end of file diff --git a/packages/create-solid/src/helpers.ts b/packages/create-solid/src/helpers.ts new file mode 100644 index 0000000..67203a5 --- /dev/null +++ b/packages/create-solid/src/helpers.ts @@ -0,0 +1,97 @@ +import { copyFileSync, Dirent, mkdirSync, readdirSync, writeFileSync } from "node:fs"; +import { readFile, rm } from "node:fs/promises"; +import { join, resolve } from "node:path"; +import { transform } from "sucrase"; + +const recurseFiles = (startPath: string, cb: (file: Dirent, startPath: string) => void) => { + startPath = resolve(startPath); + + const files = readdirSync(startPath, { withFileTypes: true }); + + for (const file of files) { + cb(file, startPath); + } +}; + +export const readFileToString = async (path: string) => { + return (await readFile(path)).toString(); +}; +const convertToJS = async (file: Dirent, startPath: string) => { + const src = join(startPath, file.name); + const dest = resolve(startPath.replace(".solid-start", ""), file.name); + if (file.isDirectory()) { + mkdirSync(dest, { recursive: true }); + recurseFiles(resolve(startPath, file.name), convertToJS); + } else if (file.isFile()) { + if (src.endsWith(".ts") || src.endsWith(".tsx")) { + let { code } = transform(await readFileToString(src), { + transforms: ["typescript", "jsx"], + jsxRuntime: "preserve", + }); + + writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); + } else { + copyFileSync(src, dest); + } + } +}; +export const handleTSConversion = async (tempDir: string, projectName: string) => { + await rm(resolve(tempDir, "tsconfig.json")); + writeFileSync( + resolve(projectName, "jsconfig.json"), + JSON.stringify( + { + compilerOptions: { + jsx: "preserve", + jsxImportSource: "solid-js", + paths: { + "~/*": ["./src/*"], + }, + }, + }, + null, + 2, + ), + { flag: "wx" }, + ); + + // Convert all ts files in temp directory into js + recurseFiles(tempDir, convertToJS); + + // Remove temp directory + await rm(join(process.cwd(), tempDir), { + recursive: true, + force: true, + }); +}; + +export const GIT_IGNORE = ` +dist +.solid +.output +.vercel +.netlify +.vinxi +app.config.timestamp_*.js + +# Environment +.env +.env*.local + +# dependencies +/node_modules + +# IDEs and editors +/.idea +.project +.classpath +*.launch +.settings/ + +# Temp +gitignore + +# System Files +.DS_Store +Thumbs.db +`; \ No newline at end of file diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index c094406..7d63a21 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -1,55 +1,43 @@ #! /usr/bin/env node -import { AllSupported, handleNew, isSupported } from "@solid-cli/commands/new"; import color from "picocolors"; import { intro } from "@clack/prompts"; import packageJson from "../package.json" with { type: "json" }; -import { command, run, option, string, boolean, flag, optional, positional } from "cmd-ts"; +import { defineCommand, runMain } from "citty"; +import { createVanillaJS } from "./create-vanilla"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); -const app = command({ - name: "create-solid", - description: "Create a new Solid project", +const main = defineCommand({ + meta: { + name: "create-solid", + version: packageJson.version, + }, args: { - projectNamePositional: positional({ - type: optional(string), - displayName: "Project Name", - description: "The name of the project to be generated", - }), - templatePositional: positional({ - type: optional(string), - displayName: "Template name", - description: "Name of template to be initialised", - }), - projectNameOption: option({ - type: optional(string), - long: "project-name", - short: "p", - description: "Name of your project", - }), - solidStart: flag({ - type: optional(boolean), - long: "solid-start", - short: "s", + projectNamePositional: { + type: "positional", + required: false, + description: "Project name" + }, + templatePositional: { + type: "positional", + required: false, + description: "Template name", + }, + "project-name": { + type: "string", + required: false, + alias: "p", + description: "Project name", + }, + solidstart: { + type: "boolean", + required: false, + alias: "s", description: "Create a SolidStart project", - }), - }, - handler: async ({ projectNameOption, solidStart, projectNamePositional, templatePositional }) => { - if (templatePositional && !isSupported(templatePositional)) { - console.error(`Template "${templatePositional}" is not supported`); - process.exit(0); - } - try { - await handleNew( - templatePositional as AllSupported, - projectNamePositional ?? projectNameOption, - false, - solidStart, - ); - } catch (e) { - console.error(e); - process.exit(1); - } + }, }, -}); -run(app, process.argv.slice(2)); + run({ args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart } }) { + createVanillaJS({ template: "ts", destination: "./ts" }) + } +}) +runMain(main); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71d2f67..7f6594c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -120,6 +120,16 @@ importers: version: 5.6.3 packages/create-solid: + dependencies: + '@begit/core': + specifier: ^0.0.19 + version: 0.0.19 + citty: + specifier: ^0.1.6 + version: 0.1.6 + sucrase: + specifier: ^3.35.0 + version: 3.35.0 devDependencies: '@clack/prompts': specifier: 0.7.0 @@ -1063,6 +1073,9 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} + citty@0.1.6: + resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} + cmd-ts@0.13.0: resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} @@ -2679,6 +2692,10 @@ snapshots: ci-info@3.9.0: {} + citty@0.1.6: + dependencies: + consola: 3.2.3 + cmd-ts@0.13.0: dependencies: chalk: 4.1.2 From 5a380aa41457f612f6cfc2502a3b404d4ce2639b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:02:58 +0000 Subject: [PATCH 133/290] refactor: remove custom reactivity implementation --- packages/reactivity/.gitignore | 1 - packages/reactivity/README.md | 3 - packages/reactivity/package.json | 37 -------- packages/reactivity/src/api/index.ts | 59 ------------- packages/reactivity/src/core/index.ts | 104 ----------------------- packages/reactivity/src/index.ts | 1 - packages/reactivity/test/async.test.ts | 24 ------ packages/reactivity/test/batch.test.ts | 80 ----------------- packages/reactivity/test/effects.test.ts | 54 ------------ packages/reactivity/test/memos.test.ts | 55 ------------ packages/reactivity/test/signals.test.ts | 10 --- packages/reactivity/tsconfig.json | 24 ------ packages/reactivity/tsup.config.ts | 11 --- 13 files changed, 463 deletions(-) delete mode 100644 packages/reactivity/.gitignore delete mode 100644 packages/reactivity/README.md delete mode 100644 packages/reactivity/package.json delete mode 100644 packages/reactivity/src/api/index.ts delete mode 100644 packages/reactivity/src/core/index.ts delete mode 100644 packages/reactivity/src/index.ts delete mode 100644 packages/reactivity/test/async.test.ts delete mode 100644 packages/reactivity/test/batch.test.ts delete mode 100644 packages/reactivity/test/effects.test.ts delete mode 100644 packages/reactivity/test/memos.test.ts delete mode 100644 packages/reactivity/test/signals.test.ts delete mode 100644 packages/reactivity/tsconfig.json delete mode 100644 packages/reactivity/tsup.config.ts diff --git a/packages/reactivity/.gitignore b/packages/reactivity/.gitignore deleted file mode 100644 index fbf0622..0000000 --- a/packages/reactivity/.gitignore +++ /dev/null @@ -1 +0,0 @@ -types \ No newline at end of file diff --git a/packages/reactivity/README.md b/packages/reactivity/README.md deleted file mode 100644 index d46f097..0000000 --- a/packages/reactivity/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# @solid-cli/reactivity - -A lightweight reactivity system which powers some of the CLI. It is an eager system (derived state is updated immediately when the sources change) diff --git a/packages/reactivity/package.json b/packages/reactivity/package.json deleted file mode 100644 index 948af8f..0000000 --- a/packages/reactivity/package.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "@solid-cli/reactivity", - "version": "0.0.11", - "description": "The minimal, eager reactive system that powers the Solid CLI", - "license": "MIT", - "homepage": "https://solid-cli.netlify.app", - "repository": { - "type": "git", - "url": "https://github.com/solidjs-community/solid-cli" - }, - "files": [ - "dist", - "types" - ], - "main": "./dist/index.mjs", - "module": "./dist/index.mjs", - "types": "./types/index.d.ts", - "exports": { - ".": { - "import": "./dist/index.mjs", - "require": "./dist/index.mjs", - "types": "./types/index.d.ts" - } - }, - "scripts": { - "test": "vitest run", - "build": "tsc && tsup" - }, - "author": "Thomas Beer", - "devDependencies": { - "tsup": "^8.3.5", - "typescript": "^5.6.3" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/packages/reactivity/src/api/index.ts b/packages/reactivity/src/api/index.ts deleted file mode 100644 index ffedb90..0000000 --- a/packages/reactivity/src/api/index.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { Computation, Getter, Signal, batch, runWithListener } from "../core"; -export { batch, getListener, type Getter, type Setter, type Signal } from "../core"; -type OnOptions = { defer: boolean }; -export function on(deps: Getter, fn: (val: G) => T, options?: OnOptions): () => T | undefined; -export function on(deps: Getter[] | Getter, fn: (val: any) => T, options?: OnOptions) { - let shouldDefer = options?.defer ?? false; - return () => { - // Track all getters on call - let args: any[] = []; - Array.isArray(deps) ? deps.forEach((d) => args.push(d())) : args.push(deps()); - if (shouldDefer) { - shouldDefer = false; - return; - } - // Ensure that the function isn't tracked - return untrack(() => fn(args.length === 1 ? args[0] : args)); - }; -} -export function createSignal(val: T) { - const comp = new Computation(() => val); - const set = (fnOrVal: T | ((val: T | null) => T) | null) => { - if (typeof fnOrVal === "function") { - let fn = fnOrVal as (val: T | null) => T; - const newVal = fn(untrack(comp.get)); - comp.set(newVal); - } else { - comp.set(fnOrVal as T); - } - }; - return [comp.get, set] as Signal; -} -export function createEffect(fn: () => T) { - new Computation(fn); -} -export function createMemo(fn: () => T) { - const comp = new Computation(fn); - return comp.get; -} -export function createAsync(fn: () => Promise) { - const [get, set] = createSignal(null); - const [loading, setLoading] = createSignal(true); - fn().then((val) => { - batch(() => { - set(val); - setLoading(false); - }); - }); - Object.defineProperties(get, { - loading: { - get() { - return loading(); - }, - }, - }); - return get as Getter & { loading: boolean }; -} -export function untrack(fn: () => T) { - return runWithListener(null, fn); -} diff --git a/packages/reactivity/src/core/index.ts b/packages/reactivity/src/core/index.ts deleted file mode 100644 index 63e923a..0000000 --- a/packages/reactivity/src/core/index.ts +++ /dev/null @@ -1,104 +0,0 @@ -export type Getter = () => T; -export type Setter = (val: T | ((val: T | null) => T)) => void; -export type Signal = [Getter, Setter]; -let OBSERVER: Computation | null = null; -let BATCHING = false; -const UPDATEQUEUE: Computation[] = []; -export class Computation { - fn: () => T; - value: T | null = null; - state: number = 0; - queueSlot: number = -1; - sources: Set> = new Set(); - observers: Set> = new Set(); - constructor(fn: () => T) { - this.fn = fn; - this.update(); - } - track() { - if (!OBSERVER) return; - this.observers.add(OBSERVER); - OBSERVER.sources.add(this); - } - get = () => { - // We need to make sure memos update if they're accessed during a `batch` - if (this.queueSlot != -1) { - UPDATEQUEUE.splice(this.queueSlot, 1); - const prev = BATCHING; - BATCHING = false; - this.update(); - BATCHING = prev; - this.queueSlot = -1; - } - this.track(); - return this.value; - }; - set = (newVal: T) => { - if (newVal === this.value) return; - this.value = newVal; - this.notifyObservers(); - }; - removeParentObservers() { - if (!this.sources) return; - this.sources.forEach((s) => s.observers.delete(this)); - this.sources.clear(); - } - pullSourceUpdates() { - if (!this.sources) return; - this.sources.forEach((s) => s.update()); - } - update() { - if (BATCHING) { - if (this.queueSlot != -1) return; - this.queueSlot = UPDATEQUEUE.length; - UPDATEQUEUE.push(this); - return; - } - // this.removeParentObservers(); - const prev = OBSERVER; - OBSERVER = this; - const newVal = this.fn(); - OBSERVER = prev; - if (newVal === this.value) return; - this.value = newVal; - } - increment() { - this.state++; - // Only increment children if the state has increased to 1, as we don't want to repeatedly re-increment if this node has multiple parents that need updating - if (this.state === 1) { - this.observers.forEach((o) => o.increment()); - } - } - decrement() { - this.state--; - if (this.state === 0) { - this.update(); - this.observers.forEach((o) => o.decrement()); - } - } - notifyObservers() { - this.observers.forEach((o) => o.increment()); - this.observers.forEach((o) => o.decrement()); - } -} -function stabilize() { - UPDATEQUEUE.forEach((u) => u.update()); - UPDATEQUEUE.length = 0; -} -export function batch(fn: () => T) { - BATCHING = true; - const res = fn(); - BATCHING = false; - stabilize(); - return res; -} -export function getListener() { - return OBSERVER; -} -export function runWithListener(listener: Computation | null, fn: () => T) { - const prev = OBSERVER; - OBSERVER = listener; - const res = fn(); - OBSERVER = prev; - return res; -} diff --git a/packages/reactivity/src/index.ts b/packages/reactivity/src/index.ts deleted file mode 100644 index d158c57..0000000 --- a/packages/reactivity/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./api"; diff --git a/packages/reactivity/test/async.test.ts b/packages/reactivity/test/async.test.ts deleted file mode 100644 index 481fd75..0000000 --- a/packages/reactivity/test/async.test.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { describe, expect, test } from "vitest"; -import { createAsync, createEffect } from "../src"; - -describe("createAsync", () => { - test("An async function resolves to a value", async () => { - const asyncFn = createAsync(async () => { - return 123; - }); - const res = await new Promise((res) => { - createEffect(() => { - const result = asyncFn(); - if (result) res(result); - }); - }); - expect(res).toBe(123); - }); - test("An async function has a loading state", async () => { - const asyncFn = createAsync(async () => { - return 123; - }); - expect(asyncFn.loading).toBe(true); - queueMicrotask(() => expect(asyncFn.loading).toBe(false)); - }); -}); diff --git a/packages/reactivity/test/batch.test.ts b/packages/reactivity/test/batch.test.ts deleted file mode 100644 index 4a9f647..0000000 --- a/packages/reactivity/test/batch.test.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { test, expect } from "vitest"; -import { describe } from "vitest"; -import { batch, createAsync, createEffect, createMemo, createSignal } from "../src"; - -describe("batch", () => { - test("Multiple updates should only trigger an effect once", () => { - const [get, set] = createSignal(0); - let updates = 0; - createEffect(() => { - get(); - updates++; - }); - batch(() => { - set(1); - set(2); - }); - expect(updates).toBe(2); - expect(get()).toBe(2); - }); - test("A memo called within a batch should get its value updated", () => { - const [get, set] = createSignal(0); - const memo = createMemo(() => get() * 2); - batch(() => { - set(1); - expect(memo()).toBe(2); - }); - }); - test("An effect depending on both loading and data should only run once when the async resolves", async () => { - const data = createAsync(async () => { - return 123; - }); - let updates = 0; - await new Promise((res) => - createEffect(() => { - // We track both the data itself and the loading signal - const d = data(); - const loading = data.loading; - updates++; - if (d === 123 && loading === false) res(d); - }), - ); - expect(updates).toBe(2); - }); - test("A derived memo accessed within a batch should resolve to the correct value", () => { - const [get, set] = createSignal(0); - const memo = createMemo(() => get() * 2); - let updates = 0; - // First update on initial run - const derived = createMemo(() => { - updates++; - return memo()! * 2; - }); - batch(() => { - set(1); - set(2); - // 2nd Update on access - expect(derived()).toBe(8); - set(3); - // 3rd update on access - expect(derived()).toBe(12); - }); - expect(updates).toBe(3); - }); - test.skip("Diamond problem with memos accessed in a batch", () => { - const [get, set] = createSignal(0); - let updates = 0; - const A = createMemo(() => { - updates++; - get(); - }); - const B = createMemo(() => A()! * 2); - const C = createMemo(() => A()! * 3); - const D = createMemo(() => B()! + C()!); - batch(() => { - set(2); - }); - // Actually currently get 3 here - expect(updates).toBe(2); - }); -}); diff --git a/packages/reactivity/test/effects.test.ts b/packages/reactivity/test/effects.test.ts deleted file mode 100644 index 735f405..0000000 --- a/packages/reactivity/test/effects.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { describe, test, expect } from "vitest"; -import { createEffect, createSignal } from "../src"; -describe("createEffect", () => { - test("An effect executes once when created", () => { - let updates = 0; - createEffect(() => { - updates++; - }); - expect(updates).toBe(1); - }); - test("An effect re-executes when a dependency changes", () => { - let updates = 0; - const [value, setValue] = createSignal(0); - createEffect(() => { - value(); - updates++; - }); - expect(updates).toBe(1); - setValue(1); - expect(updates).toBe(2); - }); - test("Changes propagate correctly", () => { - const [get, set] = createSignal(0); - let updates = 0; - createEffect(() => { - get(); - updates++; - }); - expect(updates).toBe(1); - set(1); - expect(updates).toBe(2); - set(2); - expect(updates).toBe(3); - }); - test("Nested effects", () => { - const [A, setA] = createSignal(0); - let updates = 0; - createEffect(() => { - A(); - updates++; - let nestedUpdates = 0; - const [get, set] = createSignal(0); - createEffect(() => { - get(); - nestedUpdates++; - }); - expect(nestedUpdates).toBe(1); - set(1); - expect(nestedUpdates).toBe(2); - }); - setA(1); - expect(updates).toBe(2); - }); -}); diff --git a/packages/reactivity/test/memos.test.ts b/packages/reactivity/test/memos.test.ts deleted file mode 100644 index e18c764..0000000 --- a/packages/reactivity/test/memos.test.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { describe, test, expect } from "vitest"; -import { createMemo, createSignal } from "../src"; -describe("createMemo", () => { - test("A memo is executed once on creation", () => { - let updates = 0; - createMemo(() => { - updates++; - }); - expect(updates).toBe(1); - }); - test("A memo updates when its dependencies change", () => { - const [value, setValue] = createSignal(0); - let updates = 0; - createMemo(() => { - value(); - updates++; - }); - expect(updates).toBe(1); - setValue(1); - expect(updates).toBe(2); - }); - test("Memos don't overexecute if a dependency doesn't change", () => { - const [value, setValue] = createSignal(0); - const memo1 = createMemo(() => { - value(); - return 1; - }); - let updates = 0; - const memo2 = createMemo(() => { - updates++; - return memo1(); - }); - expect(memo2()).toBe(1); - setValue(0); - expect(updates).toBe(1); - }); - test("Memos don't overexecute in a diamond (The diamond problem)", () => { - const [A, setA] = createSignal(0); - const B = createMemo(() => { - return A() * 2; - }); - const C = createMemo(() => { - return A() + 2; - }); - let updates = 0; - const D = createMemo(() => { - updates++; - return B()! + C()!; - }); - expect(D()).toBe(2); - setA(1); - expect(D()).toBe(5); - expect(updates).toBe(2); - }); -}); diff --git a/packages/reactivity/test/signals.test.ts b/packages/reactivity/test/signals.test.ts deleted file mode 100644 index c227cfe..0000000 --- a/packages/reactivity/test/signals.test.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { describe, test, expect } from "vitest"; -import { createSignal } from "../src"; -describe("createSignal", () => { - test("A signal should hold a value that can be updated", () => { - const [value, setValue] = createSignal(0); - expect(value()).toBe(0); - setValue(1); - expect(value()).toBe(1); - }); -}); diff --git a/packages/reactivity/tsconfig.json b/packages/reactivity/tsconfig.json deleted file mode 100644 index 1bd37fb..0000000 --- a/packages/reactivity/tsconfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "useDefineForClassFields": true, - "module": "ESNext", - "skipLibCheck": true, - "declaration": true, - "emitDeclarationOnly": true, - /* Bundler mode */ - "moduleResolution": "bundler", - // "allowImportingTsExtensions": true, - "resolveJsonModule": true, - "isolatedModules": true, - // "noEmit": true, - - /* Linting */ - "strict": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "noFallthroughCasesInSwitch": true, - "outDir": "types" - }, - "include": ["src/*"] -} diff --git a/packages/reactivity/tsup.config.ts b/packages/reactivity/tsup.config.ts deleted file mode 100644 index aaf7a65..0000000 --- a/packages/reactivity/tsup.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { defineConfig } from "tsup"; - -export default defineConfig({ - entry: ["src/index.ts"], - target: "esnext", - format: ["esm", "cjs"], - splitting: false, - sourcemap: true, - minify: true, - clean: true, -}); From 971535c134cbb8ac8073178dbf68650adea73021 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:31:29 +0000 Subject: [PATCH 134/290] feat: add basic autocomplete flow --- packages/commands/package.json | 1 - packages/core/package.json | 1 - packages/create-solid/package.json | 1 + packages/create-solid/src/create-vanilla.ts | 8 +++- packages/create-solid/src/helpers.ts | 44 ++++++++++++++++++++- packages/create-solid/src/index.ts | 24 +++++++++-- packages/ui/package.json | 1 - packages/utils/package.json | 1 - pnpm-lock.yaml | 24 ++--------- 9 files changed, 74 insertions(+), 31 deletions(-) diff --git a/packages/commands/package.json b/packages/commands/package.json index 916076c..16b5e2a 100644 --- a/packages/commands/package.json +++ b/packages/commands/package.json @@ -44,7 +44,6 @@ "dependencies": { "@begit/core": "^0.0.19", "@clack/prompts": "0.7.0", - "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "execa": "^8.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index e961d0c..6bc3f13 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -25,7 +25,6 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", - "@solid-cli/reactivity": "workspace:*", "@solid-cli/ui": "workspace:*", "@solid-cli/utils": "workspace:*", "cmd-ts": "^0.13.0", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ee06004..0642c24 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,6 +31,7 @@ "devDependencies": { "@clack/prompts": "0.7.0", "@solid-cli/commands": "workspace:*", + "@solid-cli/ui": "workspace:*", "@types/node": "^22.9.0", "cmd-ts": "^0.13.0", "jiti": "^2.4.0", diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create-solid/src/create-vanilla.ts index 728da6e..9dcf82d 100644 --- a/packages/create-solid/src/create-vanilla.ts +++ b/packages/create-solid/src/create-vanilla.ts @@ -3,13 +3,17 @@ import { join } from "node:path"; import { GIT_IGNORE, handleTSConversion } from "./helpers"; import { writeFileSync } from "node:fs"; -const VANILLA_TEMPLATES = ["ts"] as const; -type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; type CreateVanillaArgs = { template: VanillaTemplate, destination: string, } +export const createVanilla = (args: CreateVanillaArgs, js?: boolean) => { + if (js) { + return createVanillaJS(args); + } + return createVanillaTS(args); +} export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); } diff --git a/packages/create-solid/src/helpers.ts b/packages/create-solid/src/helpers.ts index 67203a5..4b48011 100644 --- a/packages/create-solid/src/helpers.ts +++ b/packages/create-solid/src/helpers.ts @@ -94,4 +94,46 @@ gitignore # System Files .DS_Store Thumbs.db -`; \ No newline at end of file +`; + +import { log, spinner } from "@clack/prompts"; +type SpinnerItem = { + startText: string; + finishText: string; + fn: () => Promise; +}; +export async function spinnerify(spinners: SpinnerItem): Promise; +export async function spinnerify(spinners: SpinnerItem[]): Promise; +export async function spinnerify(spinners: SpinnerItem[] | SpinnerItem) { + if (!Array.isArray(spinners)) spinners = [spinners]; + let results: any[] = []; + const s = spinner(); + for (const { startText, finishText, fn } of spinners) { + s.start(startText); + results.push(await fn()); + s.stop(finishText); + } + return results.length === 1 ? results[0] : results; +} + +export const cancelable = async (prompt: Promise, cancelMessage: string = "Canceled"): Promise => { + const value = await prompt; + + if (typeof value === "symbol") { + log.warn(cancelMessage); + process.exit(0); + } + + return value; +}; +const VANILLA_TEMPLATES = ["ts"] as const; +type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; + +const START_TEMPLATES = ["basic"] as const; +type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; +export const getTemplatesList = async (isStart: boolean) => { + if (isStart) { + return START_TEMPLATES; + } + return VANILLA_TEMPLATES; +} \ No newline at end of file diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 7d63a21..8bb76bb 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -4,7 +4,8 @@ import { intro } from "@clack/prompts"; import packageJson from "../package.json" with { type: "json" }; import { defineCommand, runMain } from "citty"; import { createVanillaJS } from "./create-vanilla"; - +import * as p from "@clack/prompts"; +import { cancelable, getTemplatesList } from "./helpers"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); const main = defineCommand({ @@ -36,8 +37,25 @@ const main = defineCommand({ description: "Create a SolidStart project", }, }, - run({ args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart } }) { - createVanillaJS({ template: "ts", destination: "./ts" }) + async run({ args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart } }) { + let projectName: string = projectNamePositional ?? projectNameOptional; + let template: string = templatePositional; + let isStart: boolean = solidstart; + let isJS = false; + projectName ??= await cancelable( + p.text({ message: "Project Name", placeholder: "solid-project", defaultValue: "solid-project" }), + ); + isStart ??= await cancelable(p.confirm({ message: "Is this a SolidStart project?" })); + const template_opts = await getTemplatesList(isStart); + template ??= (await cancelable( + p.select({ + message: "Which template would you like to use?", + initialValue: "ts", + options: template_opts.map((s: string) => ({ label: s, value: s })), + }), + )); + isJS = !(await cancelable(p.confirm({ message: "Use Typescript?" }))) + // createVanillaJS({ template: "ts", destination: "./ts" }) } }) runMain(main); diff --git a/packages/ui/package.json b/packages/ui/package.json index 39b8a9a..68d933d 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -38,7 +38,6 @@ "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", "picocolors": "^1.1.1", - "@solid-cli/reactivity": "workspace:*", "@solid-cli/utils": "workspace:*" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 95e521f..eefd3f6 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -76,7 +76,6 @@ "dependencies": { "@clack/core": "0.3.4", "@clack/prompts": "0.7.0", - "@solid-cli/reactivity": "workspace:*", "cmd-ts": "^0.13.0", "execa": "^8.0.1", "picocolors": "^1.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f6594c..635f91b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,9 +32,6 @@ importers: '@clack/prompts': specifier: 0.7.0 version: 0.7.0 - '@solid-cli/reactivity': - specifier: workspace:* - version: link:../reactivity '@solid-cli/ui': specifier: workspace:* version: link:../ui @@ -78,9 +75,6 @@ importers: '@solid-cli/commands': specifier: workspace:* version: link:../commands - '@solid-cli/reactivity': - specifier: workspace:* - version: link:../reactivity '@solid-cli/ui': specifier: workspace:* version: link:../ui @@ -137,6 +131,9 @@ importers: '@solid-cli/commands': specifier: workspace:* version: link:../commands + '@solid-cli/ui': + specifier: workspace:* + version: link:../ui '@types/node': specifier: ^22.9.0 version: 22.9.0 @@ -156,15 +153,6 @@ importers: specifier: ^5.6.3 version: 5.6.3 - packages/reactivity: - devDependencies: - tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) - typescript: - specifier: ^5.6.3 - version: 5.6.3 - packages/ui: dependencies: '@clack/core': @@ -173,9 +161,6 @@ importers: '@clack/prompts': specifier: 0.7.0 version: 0.7.0 - '@solid-cli/reactivity': - specifier: workspace:* - version: link:../reactivity '@solid-cli/utils': specifier: workspace:* version: link:../utils @@ -201,9 +186,6 @@ importers: '@clack/prompts': specifier: 0.7.0 version: 0.7.0 - '@solid-cli/reactivity': - specifier: workspace:* - version: link:../reactivity cmd-ts: specifier: ^0.13.0 version: 0.13.0 From c3ffbbd345c90b2846e3001ae840529546404bf6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:36:37 +0000 Subject: [PATCH 135/290] feat: pass input from interactive prompts to vanilla creation functions --- packages/create-solid/src/create-start.ts | 11 +++++++++++ packages/create-solid/src/create-vanilla.ts | 2 +- packages/create-solid/src/helpers.ts | 4 ++-- packages/create-solid/src/index.ts | 11 ++++++++--- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/create-solid/src/create-start.ts b/packages/create-solid/src/create-start.ts index e69de29..ac51e25 100644 --- a/packages/create-solid/src/create-start.ts +++ b/packages/create-solid/src/create-start.ts @@ -0,0 +1,11 @@ +export const createStartTS = () => { + +} + +export const createStartJS = () => { + +} + +export const createStart = () => { + +} \ No newline at end of file diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create-solid/src/create-vanilla.ts index 9dcf82d..4f08980 100644 --- a/packages/create-solid/src/create-vanilla.ts +++ b/packages/create-solid/src/create-vanilla.ts @@ -1,6 +1,6 @@ import { downloadRepo } from "@begit/core"; import { join } from "node:path"; -import { GIT_IGNORE, handleTSConversion } from "./helpers"; +import { GIT_IGNORE, handleTSConversion, VanillaTemplate } from "./helpers"; import { writeFileSync } from "node:fs"; diff --git a/packages/create-solid/src/helpers.ts b/packages/create-solid/src/helpers.ts index 4b48011..59acde1 100644 --- a/packages/create-solid/src/helpers.ts +++ b/packages/create-solid/src/helpers.ts @@ -127,9 +127,9 @@ export const cancelable = async (prompt: Promise, cance return value; }; const VANILLA_TEMPLATES = ["ts"] as const; -type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; +export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; -const START_TEMPLATES = ["basic"] as const; +export const START_TEMPLATES = ["basic"] as const; type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; export const getTemplatesList = async (isStart: boolean) => { if (isStart) { diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 8bb76bb..02834f2 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -3,9 +3,9 @@ import color from "picocolors"; import { intro } from "@clack/prompts"; import packageJson from "../package.json" with { type: "json" }; import { defineCommand, runMain } from "citty"; -import { createVanillaJS } from "./create-vanilla"; +import { createVanilla, createVanillaJS } from "./create-vanilla"; import * as p from "@clack/prompts"; -import { cancelable, getTemplatesList } from "./helpers"; +import { cancelable, getTemplatesList, VanillaTemplate } from "./helpers"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); const main = defineCommand({ @@ -55,7 +55,12 @@ const main = defineCommand({ }), )); isJS = !(await cancelable(p.confirm({ message: "Use Typescript?" }))) - // createVanillaJS({ template: "ts", destination: "./ts" }) + + if (isStart) { + + } else { + createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS); + } } }) runMain(main); From c42e2a085a7df8098c06a268dce541944ba0010b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 18 Jan 2025 23:43:27 +0000 Subject: [PATCH 136/290] feat: allow creating SolidStart projects --- packages/create-solid/src/create-start.ts | 30 ++++++++++++++++++++--- packages/create-solid/src/helpers.ts | 4 +-- packages/create-solid/src/index.ts | 5 ++-- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/packages/create-solid/src/create-start.ts b/packages/create-solid/src/create-start.ts index ac51e25..78f655e 100644 --- a/packages/create-solid/src/create-start.ts +++ b/packages/create-solid/src/create-start.ts @@ -1,11 +1,33 @@ -export const createStartTS = () => { +import { downloadRepo } from "@begit/core"; +import { GIT_IGNORE, handleTSConversion, StartTemplate } from "./helpers" +import { join } from "path"; +import { writeFileSync } from "fs"; +type CreateStartArgs = { + template: StartTemplate, + destination: string, } -export const createStartJS = () => { - +export const createStartTS = ({ template, destination }: CreateStartArgs) => { + return downloadRepo({ + repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, + dest: destination, + }); } -export const createStart = () => { +export const createStartJS = async ({ template, destination }: CreateStartArgs) => { + // Create typescript project in `/.project` + // then transpile this to javascript and clean up + const tempDir = join(destination, ".project"); + await createStartTS({ template, destination: tempDir }) + await handleTSConversion(tempDir, destination); + // Add .gitignore + writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); +} +export const createStart = (args: CreateStartArgs, js?: boolean) => { + if (js) { + return createStartJS(args); + } + return createStartTS(args); } \ No newline at end of file diff --git a/packages/create-solid/src/helpers.ts b/packages/create-solid/src/helpers.ts index 59acde1..3da7840 100644 --- a/packages/create-solid/src/helpers.ts +++ b/packages/create-solid/src/helpers.ts @@ -129,8 +129,8 @@ export const cancelable = async (prompt: Promise, cance const VANILLA_TEMPLATES = ["ts"] as const; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; -export const START_TEMPLATES = ["basic"] as const; -type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; +const START_TEMPLATES = ["basic"] as const; +export type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; export const getTemplatesList = async (isStart: boolean) => { if (isStart) { return START_TEMPLATES; diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 02834f2..4ed2a5a 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -5,7 +5,8 @@ import packageJson from "../package.json" with { type: "json" }; import { defineCommand, runMain } from "citty"; import { createVanilla, createVanillaJS } from "./create-vanilla"; import * as p from "@clack/prompts"; -import { cancelable, getTemplatesList, VanillaTemplate } from "./helpers"; +import { cancelable, getTemplatesList, StartTemplate, VanillaTemplate } from "./helpers"; +import { createStart } from "./create-start"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); const main = defineCommand({ @@ -57,7 +58,7 @@ const main = defineCommand({ isJS = !(await cancelable(p.confirm({ message: "Use Typescript?" }))) if (isStart) { - + createVanilla({ template: template as StartTemplate, destination: projectName }, isJS); } else { createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS); } From 3533539b803871ee5f43598bca2abac493de6386 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 00:19:23 +0000 Subject: [PATCH 137/290] refactor: reorganise helper functions --- packages/create-solid/package.json | 10 +-- packages/create-solid/src/create-start.ts | 6 +- packages/create-solid/src/create-vanilla.ts | 5 +- packages/create-solid/src/create.ts | 13 ++++ packages/create-solid/src/helpers.ts | 67 ------------------- packages/create-solid/src/index.ts | 15 ++++- .../create-solid/src/utils/file-system.ts | 18 +++++ .../create-solid/src/utils/ts-conversion.ts | 53 +++++++++++++++ packages/create-solid/tsup.config.ts | 3 +- pnpm-lock.yaml | 60 +++++++++++++---- 10 files changed, 156 insertions(+), 94 deletions(-) create mode 100644 packages/create-solid/src/create.ts create mode 100644 packages/create-solid/src/utils/file-system.ts create mode 100644 packages/create-solid/src/utils/ts-conversion.ts diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 0642c24..f31fb09 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -29,7 +29,7 @@ "build": "tsc && tsup" }, "devDependencies": { - "@clack/prompts": "0.7.0", + "@clack/prompts": "0.9.1", "@solid-cli/commands": "workspace:*", "@solid-cli/ui": "workspace:*", "@types/node": "^22.9.0", @@ -37,14 +37,14 @@ "jiti": "^2.4.0", "picocolors": "^1.1.1", "tsup": "^8.3.5", - "typescript": "^5.6.3" + "typescript": "^5.6.3", + "@begit/core": "^0.1.1", + "citty": "^0.1.6", + "sucrase": "^3.35.0" }, "publishConfig": { "access": "public" }, "dependencies": { - "@begit/core": "^0.0.19", - "citty": "^0.1.6", - "sucrase": "^3.35.0" } } diff --git a/packages/create-solid/src/create-start.ts b/packages/create-solid/src/create-start.ts index 78f655e..e41c2a8 100644 --- a/packages/create-solid/src/create-start.ts +++ b/packages/create-solid/src/create-start.ts @@ -1,9 +1,9 @@ import { downloadRepo } from "@begit/core"; -import { GIT_IGNORE, handleTSConversion, StartTemplate } from "./helpers" +import { GIT_IGNORE, StartTemplate } from "./helpers" import { join } from "path"; import { writeFileSync } from "fs"; - -type CreateStartArgs = { +import { handleTSConversion } from "./utils/ts-conversion" +export type CreateStartArgs = { template: StartTemplate, destination: string, } diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create-solid/src/create-vanilla.ts index 4f08980..394ba41 100644 --- a/packages/create-solid/src/create-vanilla.ts +++ b/packages/create-solid/src/create-vanilla.ts @@ -1,10 +1,11 @@ import { downloadRepo } from "@begit/core"; import { join } from "node:path"; -import { GIT_IGNORE, handleTSConversion, VanillaTemplate } from "./helpers"; +import { GIT_IGNORE, VanillaTemplate } from "./helpers"; import { writeFileSync } from "node:fs"; +import { handleTSConversion } from "./utils/ts-conversion"; -type CreateVanillaArgs = { +export type CreateVanillaArgs = { template: VanillaTemplate, destination: string, } diff --git a/packages/create-solid/src/create.ts b/packages/create-solid/src/create.ts new file mode 100644 index 0000000..49bbd4b --- /dev/null +++ b/packages/create-solid/src/create.ts @@ -0,0 +1,13 @@ +import { createStart, CreateStartArgs } from "./create-start"; +import { createVanilla, CreateVanillaArgs } from "./create-vanilla"; + +export async function create(args: CreateVanillaArgs, js: boolean, isStart: false): Promise; +export async function create(args: CreateStartArgs, js: boolean, isStart: true): Promise; +export async function create(args: CreateVanillaArgs | CreateStartArgs, js: boolean, isStart: boolean) { + if (isStart) { + return createStart(args, js); + } + else { + return createVanilla(args, js); + } +} \ No newline at end of file diff --git a/packages/create-solid/src/helpers.ts b/packages/create-solid/src/helpers.ts index 3da7840..f53899a 100644 --- a/packages/create-solid/src/helpers.ts +++ b/packages/create-solid/src/helpers.ts @@ -1,70 +1,3 @@ -import { copyFileSync, Dirent, mkdirSync, readdirSync, writeFileSync } from "node:fs"; -import { readFile, rm } from "node:fs/promises"; -import { join, resolve } from "node:path"; -import { transform } from "sucrase"; - -const recurseFiles = (startPath: string, cb: (file: Dirent, startPath: string) => void) => { - startPath = resolve(startPath); - - const files = readdirSync(startPath, { withFileTypes: true }); - - for (const file of files) { - cb(file, startPath); - } -}; - -export const readFileToString = async (path: string) => { - return (await readFile(path)).toString(); -}; -const convertToJS = async (file: Dirent, startPath: string) => { - const src = join(startPath, file.name); - const dest = resolve(startPath.replace(".solid-start", ""), file.name); - if (file.isDirectory()) { - mkdirSync(dest, { recursive: true }); - recurseFiles(resolve(startPath, file.name), convertToJS); - } else if (file.isFile()) { - if (src.endsWith(".ts") || src.endsWith(".tsx")) { - let { code } = transform(await readFileToString(src), { - transforms: ["typescript", "jsx"], - jsxRuntime: "preserve", - }); - - writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); - } else { - copyFileSync(src, dest); - } - } -}; -export const handleTSConversion = async (tempDir: string, projectName: string) => { - await rm(resolve(tempDir, "tsconfig.json")); - writeFileSync( - resolve(projectName, "jsconfig.json"), - JSON.stringify( - { - compilerOptions: { - jsx: "preserve", - jsxImportSource: "solid-js", - paths: { - "~/*": ["./src/*"], - }, - }, - }, - null, - 2, - ), - { flag: "wx" }, - ); - - // Convert all ts files in temp directory into js - recurseFiles(tempDir, convertToJS); - - // Remove temp directory - await rm(join(process.cwd(), tempDir), { - recursive: true, - force: true, - }); -}; - export const GIT_IGNORE = ` dist .solid diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 4ed2a5a..c340ee7 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -5,8 +5,9 @@ import packageJson from "../package.json" with { type: "json" }; import { defineCommand, runMain } from "citty"; import { createVanilla, createVanillaJS } from "./create-vanilla"; import * as p from "@clack/prompts"; -import { cancelable, getTemplatesList, StartTemplate, VanillaTemplate } from "./helpers"; +import { cancelable, getTemplatesList, spinnerify, StartTemplate, VanillaTemplate } from "./helpers"; import { createStart } from "./create-start"; +import { create } from "./create"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); const main = defineCommand({ @@ -58,9 +59,17 @@ const main = defineCommand({ isJS = !(await cancelable(p.confirm({ message: "Use Typescript?" }))) if (isStart) { - createVanilla({ template: template as StartTemplate, destination: projectName }, isJS); + await spinnerify({ + startText: "Creating project", + finishText: "Project created 🎉", + fn: () => createStart({ template: template as StartTemplate, destination: projectName }, isJS), + }) } else { - createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS); + await spinnerify({ + startText: "Creating project", + finishText: "Project created 🎉", + fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS), + }) } } }) diff --git a/packages/create-solid/src/utils/file-system.ts b/packages/create-solid/src/utils/file-system.ts new file mode 100644 index 0000000..0dd4c68 --- /dev/null +++ b/packages/create-solid/src/utils/file-system.ts @@ -0,0 +1,18 @@ +import { copyFileSync, Dirent, mkdirSync, readdirSync, writeFileSync } from "node:fs"; +import { readFile, rm } from "node:fs/promises"; +import { join, resolve } from "node:path"; +import { transform } from "sucrase"; + +export const recurseFiles = (startPath: string, cb: (file: Dirent, startPath: string) => void) => { + startPath = resolve(startPath); + + const files = readdirSync(startPath, { withFileTypes: true }); + + for (const file of files) { + cb(file, startPath); + } +}; + +export const readFileToString = async (path: string) => { + return (await readFile(path)).toString(); +}; \ No newline at end of file diff --git a/packages/create-solid/src/utils/ts-conversion.ts b/packages/create-solid/src/utils/ts-conversion.ts new file mode 100644 index 0000000..dc5a711 --- /dev/null +++ b/packages/create-solid/src/utils/ts-conversion.ts @@ -0,0 +1,53 @@ +import { copyFileSync, Dirent, mkdirSync, writeFileSync } from "node:fs"; +import { readFileToString, recurseFiles } from "./file-system" +import { join, resolve } from "node:path"; +import { transform } from "sucrase"; +import { rm } from "node:fs/promises"; +const convertToJS = async (file: Dirent, startPath: string) => { + const src = join(startPath, file.name); + const dest = resolve(startPath.replace(".solid-start", ""), file.name); + if (file.isDirectory()) { + mkdirSync(dest, { recursive: true }); + recurseFiles(resolve(startPath, file.name), convertToJS); + } else if (file.isFile()) { + if (src.endsWith(".ts") || src.endsWith(".tsx")) { + let { code } = transform(await readFileToString(src), { + transforms: ["typescript", "jsx"], + jsxRuntime: "preserve", + }); + + writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); + } else { + copyFileSync(src, dest); + } + } +}; +export const handleTSConversion = async (tempDir: string, projectName: string) => { + await rm(resolve(tempDir, "tsconfig.json")); + writeFileSync( + resolve(projectName, "jsconfig.json"), + JSON.stringify( + { + compilerOptions: { + jsx: "preserve", + jsxImportSource: "solid-js", + paths: { + "~/*": ["./src/*"], + }, + }, + }, + null, + 2, + ), + { flag: "wx" }, + ); + + // Convert all ts files in temp directory into js + recurseFiles(tempDir, convertToJS); + + // Remove temp directory + await rm(join(process.cwd(), tempDir), { + recursive: true, + force: true, + }); +}; \ No newline at end of file diff --git a/packages/create-solid/tsup.config.ts b/packages/create-solid/tsup.config.ts index e0ff30c..831d65f 100644 --- a/packages/create-solid/tsup.config.ts +++ b/packages/create-solid/tsup.config.ts @@ -4,11 +4,10 @@ export default defineConfig({ entry: ["src/index.ts"], target: "esnext", format: "esm", - splitting: false, + splitting: true, bundle: true, sourcemap: false, clean: true, - noExternal: ["@solid-cli/commands"], treeshake: true, minify: true, banner: { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 635f91b..faaaaf3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -114,20 +114,13 @@ importers: version: 5.6.3 packages/create-solid: - dependencies: - '@begit/core': - specifier: ^0.0.19 - version: 0.0.19 - citty: - specifier: ^0.1.6 - version: 0.1.6 - sucrase: - specifier: ^3.35.0 - version: 3.35.0 devDependencies: + '@begit/core': + specifier: ^0.1.1 + version: 0.1.1 '@clack/prompts': - specifier: 0.7.0 - version: 0.7.0 + specifier: 0.9.1 + version: 0.9.1 '@solid-cli/commands': specifier: workspace:* version: link:../commands @@ -137,6 +130,9 @@ importers: '@types/node': specifier: ^22.9.0 version: 22.9.0 + citty: + specifier: ^0.1.6 + version: 0.1.6 cmd-ts: specifier: ^0.13.0 version: 0.13.0 @@ -146,6 +142,9 @@ importers: picocolors: specifier: ^1.1.1 version: 1.1.1 + sucrase: + specifier: ^3.35.0 + version: 3.35.0 tsup: specifier: ^8.3.5 version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) @@ -247,6 +246,9 @@ packages: '@begit/core@0.0.19': resolution: {integrity: sha512-3ypq3vJQ+PzYVi53HRkAtwdtVXTjyXjo1UzTkD75Qr9YIoacYsSy9gAdbwktfNKgTLyc1nU83W1D3SEw9kgBBA==} + '@begit/core@0.1.1': + resolution: {integrity: sha512-uxooRorqP8Xv20jf/X+nhkbDIiEodl/oXwep5gNat7ccQnlu6oG/PxepcsOyvwonL9x0ZDEmP46fC5Uhu2fivA==} + '@changesets/apply-release-plan@7.0.5': resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==} @@ -324,11 +326,17 @@ packages: '@clack/core@0.3.4': resolution: {integrity: sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==} + '@clack/core@0.4.1': + resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==} + '@clack/prompts@0.7.0': resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==} bundledDependencies: - is-unicode-supported + '@clack/prompts@0.9.1': + resolution: {integrity: sha512-JIpyaboYZeWYlyP0H+OoPPxd6nqueG/CmN6ixBiNFsIDHREevjIf0n0Ohh5gr5C8pEDknzgvz+pIJ8dMhzWIeg==} + '@esbuild/aix-ppc64@0.20.2': resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} engines: {node: '>=12'} @@ -1734,6 +1742,10 @@ packages: resolution: {integrity: sha512-XQs0S8fuAkQWuqhDeCdMlJXDX80D7EOVLDPVFkna9yQfzS+PHKgfxcei0jf6/+QAWcjqrnC8uM3fSAnrQl+XYg==} engines: {node: '>=18'} + tar@7.4.3: + resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} + engines: {node: '>=18'} + term-size@2.2.1: resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==} engines: {node: '>=8'} @@ -1990,6 +2002,10 @@ snapshots: dependencies: tar: 7.4.0 + '@begit/core@0.1.1': + dependencies: + tar: 7.4.3 + '@changesets/apply-release-plan@7.0.5': dependencies: '@changesets/config': 3.0.3 @@ -2159,12 +2175,23 @@ snapshots: picocolors: 1.1.1 sisteransi: 1.0.5 + '@clack/core@0.4.1': + dependencies: + picocolors: 1.1.1 + sisteransi: 1.0.5 + '@clack/prompts@0.7.0': dependencies: '@clack/core': 0.3.3 picocolors: 1.1.1 sisteransi: 1.0.5 + '@clack/prompts@0.9.1': + dependencies: + '@clack/core': 0.4.1 + picocolors: 1.1.1 + sisteransi: 1.0.5 + '@esbuild/aix-ppc64@0.20.2': optional: true @@ -3333,6 +3360,15 @@ snapshots: mkdirp: 3.0.1 yallist: 5.0.0 + tar@7.4.3: + dependencies: + '@isaacs/fs-minipass': 4.0.0 + chownr: 3.0.0 + minipass: 7.1.2 + minizlib: 3.0.1 + mkdirp: 3.0.1 + yallist: 5.0.0 + term-size@2.2.1: {} thenify-all@1.6.0: From 11c7ff690cdec7ee07ad67787e4263e11e6a1fe0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 00:29:10 +0000 Subject: [PATCH 138/290] remove unused packages refactor create-solid code --- packages/commands/.gitignore | 1 - packages/commands/package.json | 53 ---- packages/commands/src/handlers/add.ts | 222 ---------------- packages/commands/src/handlers/new.ts | 246 ------------------ .../commands/src/handlers/start/adapter.ts | 43 --- packages/commands/src/handlers/start/api.ts | 41 --- packages/commands/src/handlers/start/data.ts | 39 --- packages/commands/src/handlers/start/index.ts | 5 - packages/commands/src/handlers/start/mode.ts | 39 --- packages/commands/src/handlers/start/route.ts | 40 --- packages/commands/src/index.ts | 3 - packages/commands/src/lib/integrations.ts | 221 ---------------- packages/commands/src/lib/utils/helpers.ts | 152 ----------- .../tests/assets/sample_app_config.txt | 7 - .../tests/assets/sample_unocss_app_result.txt | 11 - .../assets/sample_unocss_vite_result.txt | 9 - .../tests/assets/sample_vite_config.txt | 5 - .../tests/config_manipulation.test.ts | 93 ------- .../commands/tests/package_installs.test.ts | 7 - packages/commands/tsconfig.json | 20 -- packages/commands/tsup.config.ts | 13 - packages/core/.gitignore | 133 ---------- packages/core/README.md | 48 ---- packages/core/package.json | 50 ---- packages/core/src/commands/index.ts | 114 -------- packages/core/src/commands/start.ts | 97 ------- packages/core/src/index.ts | 117 --------- packages/core/src/plugins/plugins_entry.ts | 28 -- packages/core/tsconfig.json | 14 - packages/core/tsup.config.ts | 13 - packages/create-solid/src/create-start.ts | 2 +- packages/create-solid/src/create-vanilla.ts | 2 +- packages/create-solid/src/index.ts | 3 +- packages/create-solid/src/utils/constants.ts | 57 ++++ .../create-solid/src/utils/ts-conversion.ts | 11 +- .../src/{helpers.ts => utils/ui.ts} | 42 --- 36 files changed, 63 insertions(+), 1938 deletions(-) delete mode 100644 packages/commands/.gitignore delete mode 100644 packages/commands/package.json delete mode 100644 packages/commands/src/handlers/add.ts delete mode 100644 packages/commands/src/handlers/new.ts delete mode 100644 packages/commands/src/handlers/start/adapter.ts delete mode 100644 packages/commands/src/handlers/start/api.ts delete mode 100644 packages/commands/src/handlers/start/data.ts delete mode 100644 packages/commands/src/handlers/start/index.ts delete mode 100644 packages/commands/src/handlers/start/mode.ts delete mode 100644 packages/commands/src/handlers/start/route.ts delete mode 100644 packages/commands/src/index.ts delete mode 100644 packages/commands/src/lib/integrations.ts delete mode 100644 packages/commands/src/lib/utils/helpers.ts delete mode 100644 packages/commands/tests/assets/sample_app_config.txt delete mode 100644 packages/commands/tests/assets/sample_unocss_app_result.txt delete mode 100644 packages/commands/tests/assets/sample_unocss_vite_result.txt delete mode 100644 packages/commands/tests/assets/sample_vite_config.txt delete mode 100644 packages/commands/tests/config_manipulation.test.ts delete mode 100644 packages/commands/tests/package_installs.test.ts delete mode 100644 packages/commands/tsconfig.json delete mode 100644 packages/commands/tsup.config.ts delete mode 100644 packages/core/.gitignore delete mode 100644 packages/core/README.md delete mode 100644 packages/core/package.json delete mode 100644 packages/core/src/commands/index.ts delete mode 100644 packages/core/src/commands/start.ts delete mode 100644 packages/core/src/index.ts delete mode 100644 packages/core/src/plugins/plugins_entry.ts delete mode 100644 packages/core/tsconfig.json delete mode 100644 packages/core/tsup.config.ts create mode 100644 packages/create-solid/src/utils/constants.ts rename packages/create-solid/src/{helpers.ts => utils/ui.ts} (60%) diff --git a/packages/commands/.gitignore b/packages/commands/.gitignore deleted file mode 100644 index fbf0622..0000000 --- a/packages/commands/.gitignore +++ /dev/null @@ -1 +0,0 @@ -types \ No newline at end of file diff --git a/packages/commands/package.json b/packages/commands/package.json deleted file mode 100644 index 16b5e2a..0000000 --- a/packages/commands/package.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "@solid-cli/commands", - "version": "0.0.24", - "description": "The main command handlers for the Solid CLI", - "license": "MIT", - "homepage": "https://solid-cli.netlify.app", - "repository": { - "type": "git", - "url": "https://github.com/solidjs-community/solid-cli" - }, - "files": [ - "dist", - "types" - ], - "main": "./dist/index.mjs", - "module": "./dist/index.mjs", - "types": "./types/index.d.ts", - "exports": { - ".": { - "import": "./dist/index.mjs", - "require": "./dist/index.mjs", - "types": "./types/index.d.ts" - }, - "./new": { - "import": "./dist/handlers/new.mjs", - "require": "./dist/handlers/new.mjs", - "types": "./types/handlers/new.d.ts" - } - }, - "scripts": { - "test": "vitest run", - "build": "tsc && tsup" - }, - "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^22.9.0", - "prettier": "^3.3.3", - "tsup": "^8.3.5", - "typescript": "^5.6.3" - }, - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@begit/core": "^0.0.19", - "@clack/prompts": "0.7.0", - "@solid-cli/ui": "workspace:*", - "@solid-cli/utils": "workspace:*", - "execa": "^8.0.1", - "picocolors": "^1.1.1", - "sucrase": "^3.35.0" - } -} diff --git a/packages/commands/src/handlers/add.ts b/packages/commands/src/handlers/add.ts deleted file mode 100644 index 5c8a4e6..0000000 --- a/packages/commands/src/handlers/add.ts +++ /dev/null @@ -1,222 +0,0 @@ -import { autocomplete } from "@solid-cli/ui"; -import { S_BAR, cancelable, spinnerify } from "@solid-cli/ui"; -import { Integrations, Supported, integrations, setRootFile } from "../lib/integrations"; -import * as p from "@clack/prompts"; -import color from "picocolors"; -import { primitives, loadPrimitives } from "@solid-cli/utils/primitives"; -import { isSolidStart, t } from "@solid-cli/utils"; -import { fileExists, getRootFile, getConfigFile, validateFilePath } from "../lib/utils/helpers"; -import { writeFile, readFile } from "@solid-cli/utils/fs"; -import { transformPlugins, type PluginOptions } from "@solid-cli/utils/transform"; -import { - UPDATESQUEUE, - clearQueue, - flushCommandUpdates, - flushFileUpdates, - flushPackageUpdates, - queueUpdate, - summarizeUpdates, -} from "@solid-cli/utils/updates"; - -const handleAutocompleteAdd = async () => { - const supportedIntegrations = (Object.keys(integrations) as Supported[]).map((value) => ({ label: value, value })); - const opts = () => [...supportedIntegrations, ...primitives()]; - - loadPrimitives().catch((e) => p.log.error(e)); - - const a = await cancelable( - autocomplete({ - message: t.ADD_PACKAGES, - options: opts, - }), - ); - - if (a.length === 0) { - p.log.warn(t.NOTHING_SELECTED); - return; - } - - const shouldInstall = await cancelable( - p.select({ - options: [ - { label: t.YES, value: true }, - { label: t.NO, value: false }, - { label: t.YES_FORCE, value: [true, "force"] }, - ], - message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)} ${ - " " + color.yellow(a.map((opt) => opt.label).join(" ")) + " " - } \n${color.red(S_BAR)} `, - }), - ); - - if (!shouldInstall) return; - - let forceTransform = false; - if (Array.isArray(shouldInstall) && shouldInstall[1] === "force") { - forceTransform = true; - } - const packages = a.map((opt) => opt.value as Supported); - - return { packages, forceTransform }; -}; -const isIntegration = (str: string) => { - if (Object.keys(integrations).includes(str)) return true; - return false; -}; -/** - * Transforms a list containing primitives, either by name or full package name, and returns the corresponding primitive objects - */ -const transformPrimitives = async (ps: string[]) => { - if (!ps.length) return []; - - if (!primitives().length) { - await spinnerify({ - startText: t.LOADING_PRIMITIVES, - finishText: t.PRIMITIVES_LOADED, - fn: loadPrimitives, - }); - } - - const mappedInput = ps.map((p) => p.replace("@solid-primitives/", "")); - - return primitives().filter((p) => mappedInput.includes(p.value.replace("@solid-primitives/", ""))); -}; - -type Configs = Integrations[keyof Integrations][]; - -export const handleAdd = async (packages?: string[], forceTransform: boolean = false) => { - if (!packages?.length) { - const autocompleted = await handleAutocompleteAdd(); - - if (!autocompleted) return; - - packages = autocompleted.packages; - forceTransform = autocompleted.forceTransform; - } - const possiblePrimitives: string[] = []; - const configs: Configs = packages - .map((n) => { - if (!n) return; - if (!isIntegration(n)) { - possiblePrimitives.push(n); - return; - } - const res = integrations[n as Supported]; - if (!res) { - p.log.error(t.NO_SUPPORT(n)); - return; - } - return res; - }) - .filter((p) => p) as Configs; - - const configType = (await isSolidStart()) ? "app" : "vite"; - - const configFile = await getConfigFile(configType); - - for (let i = 0; i < configs.length; i++) { - const config = configs[i]; - config.installs.forEach((p) => queueUpdate({ type: "package", name: p, dev: false })); - config.installsDev?.forEach((p) => queueUpdate({ type: "package", name: p, dev: true })); - } - // Queue primitives - for (const primitive of await transformPrimitives(possiblePrimitives)) { - queueUpdate({ type: "package", name: primitive.value, dev: false }); - } - - if (!configs.length) return; - const pluginOptions = configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[]; - if (pluginOptions.length) { - await spinnerify({ - startText: "Processing config", - finishText: "Config processed", - fn: async () => { - const code = await transformPlugins( - configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[], - { type: configType, name: configFile, contents: (await readFile(configFile)).toString() }, - forceTransform, - undefined, - ); - await writeFile(configFile, code); - }, - }); - } - - p.log.info("Preparing post install steps for integrations"); - - let projectRoot = await getRootFile(); - setRootFile(projectRoot); - - if (!fileExists(projectRoot)) { - p.log.error(color.red(`Can't find root file \`${projectRoot.split("/")[1]}\`.`)); - await cancelable( - p.text({ - message: `Type path to root: `, - validate(value) { - if (!value.length) return `Path can not be empty`; - const path = validateFilePath(value, ["app.tsx", "index.tsx"]); - if (!path) return `File at \`${value}\` not found. Please try again`; - else setRootFile(path); - }, - }), - ); - } - // Run our additional configs - await spinnerify({ - startText: "Running additional config steps", - finishText: "Additional config steps complete", - fn: async () => { - for (const cfg of configs) { - await cfg.additionalConfig?.(); - } - }, - }); - if (UPDATESQUEUE.length === 0) return; - - const { fileUpdates, packageUpdates, commandUpdates } = summarizeUpdates(); - - // Inspired by Qwik's CLI - if (fileUpdates.length) p.log.message([`${color.cyan("Modify")}`, ...fileUpdates.map((f) => ` - ${f}`)].join("\n")); - - if (packageUpdates.length) - p.log.message([`${color.cyan("Install")}`, ...packageUpdates.map((p) => ` - ${p.name}` + (p.dev ? " (dev)" : ""))].join("\n")); - if (commandUpdates.length) - p.log.message([`${color.cyan("Run commands")}`, ...commandUpdates.map((p) => ` - ${p}`)].join("\n")); - - const confirmed = await p.confirm({ message: "Do you wish to continue?" }); - if (!confirmed || p.isCancel(confirmed)) return; - - await spinnerify({ startText: "Writing files...", finishText: "Updates written", fn: flushFileUpdates }); - await spinnerify({ startText: "Installing packages...", finishText: "Packages installed", fn: flushPackageUpdates }); - await spinnerify({ startText: "Running setup commands", finishText: "Setup commands ran", fn: flushCommandUpdates }); - - clearQueue(); - - const postInstalls = configs.filter((c) => c.postInstall); - if (postInstalls.length === 0) return; - - p.log.message( - `${postInstalls.length} ${postInstalls.length === 1 ? "package has" : "packages have" - } post install steps that need to run.`, - ); - - const pInstallConfirmed = await p.confirm({ message: "Do you wish to continue?" }); - if (!pInstallConfirmed || p.isCancel(pInstallConfirmed)) return; - - p.log.info("Running post installs"); - // Run postInstalls - for (const cfg of configs) { - await cfg.postInstall?.(); - } - - p.log.success("Post install steps complete!"); - // await spinnerify({ - // startText: t.POST_INSTALL, - // finishText: t.POST_INSTALL_COMPLETE, - // fn: async () => { - // for (const cfg of configs) { - // await cfg.postInstall?.(); - // } - // }, - // }); -}; diff --git a/packages/commands/src/handlers/new.ts b/packages/commands/src/handlers/new.ts deleted file mode 100644 index ae03fe5..0000000 --- a/packages/commands/src/handlers/new.ts +++ /dev/null @@ -1,246 +0,0 @@ -import * as p from "@clack/prompts"; -import { openInBrowser } from "@solid-cli/utils"; -import { cancelable, spinnerify } from "@solid-cli/ui"; -import { t } from "@solid-cli/utils"; -import { insertAtEnd, readFileToString } from "@solid-cli/utils/fs"; -import { flushQueue } from "@solid-cli/utils/updates"; -import { rm } from "fs/promises"; -import { join, resolve } from "path"; -import { Dirent, copyFileSync, existsSync, mkdirSync, readdirSync, writeFileSync } from "fs"; -import { downloadRepo } from "@begit/core"; -import { transform } from "sucrase"; -import { detectPackageManager } from "@solid-cli/utils/package-manager"; -const gitIgnore = ` -dist -.solid -.output -.vercel -.netlify -.vinxi -app.config.timestamp_*.js - -# Environment -.env -.env*.local - -# dependencies -/node_modules - -# IDEs and editors -/.idea -.project -.classpath -*.launch -.settings/ - -# Temp -gitignore - -# System Files -.DS_Store -Thumbs.db -`; - -const startSupported = [ - "basic", - "bare", - "hackernews", - "notes", - "todomvc", - "with-auth", - "with-authjs", - "with-drizzle", - "with-mdx", - "with-prisma", - "with-solid-styled", - "with-tailwindcss", - "with-trpc", - "with-unocss", - "with-vitest", - "experiments", -] as const; -const localSupported = ["ts", "js"] as const; -const stackblitzSupported = ["bare"] as const; - -export type AllSupported = (typeof localSupported)[number] | (typeof stackblitzSupported)[number]; -export const isSupported = (template: string): template is AllSupported => { - return localSupported.indexOf(template as any) !== -1; -}; -const modifyReadme = async (name: string) => { - await insertAtEnd( - `${name}/README.md`, - "\n## This project was created with the [Solid CLI](https://solid-cli.netlify.app)\n", - ); - await flushQueue(); -}; - -const recurseFiles = (startPath: string, cb: (file: Dirent, startPath: string) => void) => { - startPath = resolve(startPath); - - const files = readdirSync(startPath, { withFileTypes: true }); - - for (const file of files) { - cb(file, startPath); - } -}; - -const convertToJS = async (file: Dirent, startPath: string) => { - const src = join(startPath, file.name); - const dest = resolve(startPath.replace(".solid-start", ""), file.name); - if (file.isDirectory()) { - mkdirSync(dest, { recursive: true }); - recurseFiles(resolve(startPath, file.name), convertToJS); - } else if (file.isFile()) { - if (src.endsWith(".ts") || src.endsWith(".tsx")) { - let { code } = transform(await readFileToString(src), { - transforms: ["typescript", "jsx"], - jsxRuntime: "preserve", - }); - - writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); - } else { - copyFileSync(src, dest); - } - } -}; - -const handleTSConversion = async (tempDir: string, projectName: string) => { - await rm(resolve(tempDir, "tsconfig.json")); - writeFileSync( - resolve(projectName, "jsconfig.json"), - JSON.stringify( - { - compilerOptions: { - jsx: "preserve", - jsxImportSource: "solid-js", - paths: { - "~/*": ["./src/*"], - }, - }, - }, - null, - 2, - ), - { flag: "wx" }, - ); - - // Convert all ts files in temp directory into js - recurseFiles(tempDir, convertToJS); - - // Remove temp directory - await rm(join(process.cwd(), tempDir), { - recursive: true, - force: true, - }); -}; - -const handleNewStartProject = async (projectName: string, variation?: AllSupported) => { - const template = await cancelable( - p.select({ - message: t.NEW_START, - initialValue: "ts", - options: startSupported.map((s) => ({ label: s, value: s })), - maxItems: process.stdout.rows - 4, - }), - ); - - const withTs = variation ? variation !== "ts" : await cancelable(p.confirm({ message: "Use Typescript?" })); - - // If the user does not want ts, we create the project in a temp directory inside the project directory - const tempDir = withTs ? projectName : join(projectName, ".solid-start"); - const readmeAlreadyExists = existsSync(join(projectName, "README.md")); - await spinnerify({ - startText: t.CREATING_PROJECT, - finishText: t.PROJECT_CREATED, - fn: async () => { - await downloadRepo({ - repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, - dest: tempDir, - }); - }, - }); - - if (!withTs) await handleTSConversion(tempDir, projectName); - - // Add .gitignore - writeFileSync(join(projectName, ".gitignore"), gitIgnore); - if (!readmeAlreadyExists) await modifyReadme(projectName); - const pM = detectPackageManager(); - p.note( - `cd ${projectName} -${pM.name} install -${pM.name} ${pM.runScriptCommand("dev")}`, - t.GET_STARTED, - ); -}; - -const handleAutocompleteNew = async (name: string, isStart?: boolean) => { - isStart ??= await cancelable(p.confirm({ message: t.IS_START_PROJECT })); - - if (isStart) { - handleNewStartProject(name); - return; - } - - const template = (await cancelable( - p.select({ - message: t.TEMPLATE, - initialValue: "ts", - options: localSupported.map((s) => ({ label: s, value: s })), - }), - )) as unknown as AllSupported; - - await handleNew(template, name); -}; -export const handleNew = async ( - variation?: AllSupported, - name?: string, - stackblitz: boolean = false, - isStart?: boolean, -) => { - name ??= await cancelable( - p.text({ message: t.PROJECT_NAME, placeholder: "solid-project", defaultValue: "solid-project" }), - ); - - if (!variation) { - await handleAutocompleteNew(name, isStart); - return; - } - - if (stackblitz) { - await spinnerify({ - startText: t.OPENING_IN_BROWSER(variation), - finishText: t.OPENED_IN_BROWSER, - fn: () => openInBrowser(`https://solid.new/${variation}`), - }); - return; - } - - const withTs = variation.startsWith("ts") ? await cancelable(p.confirm({ message: "Use Typescript?" })) : false; - - // If the user does not want ts, we create the project in a temp directory inside the project directory - // If project is already JS don't bother transpiling - const tempDir = withTs || variation.startsWith("js") ? name : join(name, ".solid-start"); - const readmeAlreadyExists = existsSync(join(name, "README.md")); - - await spinnerify({ - startText: t.CREATING_PROJECT, - finishText: t.PROJECT_CREATED, - fn: async () => { - await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: variation }, dest: tempDir }); - }, - }); - // Don't try to convert to ts if the template used is JS - if (!withTs && !variation.startsWith("js")) await handleTSConversion(tempDir, name); - - // Add .gitignore - writeFileSync(join(name, ".gitignore"), gitIgnore); - if (!readmeAlreadyExists) await modifyReadme(name ?? variation); - const pM = detectPackageManager(); - p.note( - `cd ${name} -${pM.name} install -${pM.name} ${pM.runScriptCommand("dev")}`, - t.GET_STARTED, - ); -}; diff --git a/packages/commands/src/handlers/start/adapter.ts b/packages/commands/src/handlers/start/adapter.ts deleted file mode 100644 index f2b6ef3..0000000 --- a/packages/commands/src/handlers/start/adapter.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { readFile, writeFile } from "@solid-cli/utils/fs"; -import { transformPlugins } from "@solid-cli/utils/transform"; -import * as p from "@clack/prompts"; -import { cancelable } from "@solid-cli/ui"; - -export const supportedAdapters = [ - "aws", - "cloudflare-pages", - "cloudflare-workers", - "deno", - "netlify", - "node", - "static", - "vercel", -] as const; - -type SupportedAdapters = (typeof supportedAdapters)[number]; - -const handleAutocompleteAdapter = async () => { - const name = (await cancelable( - p.select({ - message: "Select an adapter", - options: supportedAdapters.map((a) => ({ value: a, label: a })), - }), - )) as SupportedAdapters; - await handleAdapter(name, true); -}; - -export const handleAdapter = async (name?: string, forceTransform = false) => { - if (!name) { - await handleAutocompleteAdapter(); - return; - } - const sym = Symbol(name).toString(); - let code = await transformPlugins( - [], - { type: "app", name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, - forceTransform, - ); - code = `import ${name} from "solid-start-${name}";\n` + code; - code = code.replace(`"${sym}"`, `${name}({})`); - await writeFile("app.config.ts", code); -}; diff --git a/packages/commands/src/handlers/start/api.ts b/packages/commands/src/handlers/start/api.ts deleted file mode 100644 index 79dd2bb..0000000 --- a/packages/commands/src/handlers/start/api.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { isSolidStart, createApi } from "@solid-cli/utils"; -import * as p from "@clack/prompts"; -import { cancelable, spinnerify } from "@solid-cli/ui"; - -const handleAutocompleteApi = async () => { - const path = await cancelable( - p.text({ - message: "Enter the path in which the api file will be created", - placeholder: "/user", - validate(value) { - if (!value.length) return "Path is required"; - }, - }), - ); - - const name = await cancelable( - p.text({ - message: "Enter the name for the api file (required)", - validate(value) { - if (!value.length) return "Name is required"; - }, - }), - ); - - await handleApi(path, name); -}; -export const handleApi = async (path?: string, name?: string) => { - if (!(await isSolidStart())) { - p.log.error("Cannot run command. Your project doesn't include solid-start"); - return; - } - if (!path) { - await handleAutocompleteApi(); - return; - } - await spinnerify({ - startText: "Creating new api file", - finishText: "Api file created", - fn: () => createApi(path, name), - }); -}; diff --git a/packages/commands/src/handlers/start/data.ts b/packages/commands/src/handlers/start/data.ts deleted file mode 100644 index 380bb1b..0000000 --- a/packages/commands/src/handlers/start/data.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { isSolidStart, createData } from "@solid-cli/utils"; -import * as p from "@clack/prompts"; -import { cancelable, spinnerify } from "@solid-cli/ui"; - -const handleAutocompleteData = async () => { - const path = await cancelable( - p.text({ - message: "Enter the path in which the data file will be created", - placeholder: "/user/login", - validate(value) { - if (!value.length) return "Path is required"; - }, - }), - ); - - const name = await cancelable( - p.text({ - message: "Enter the name for the data file (leave this blank for the default)", - }), - ); - - await handleData(path, name); -}; - -export const handleData = async (path?: string, name?: string) => { - if (!(await isSolidStart())) { - p.log.error("Cannot run command. Your project doesn't include solid-start"); - return; - } - if (!path) { - await handleAutocompleteData(); - return; - } - await spinnerify({ - startText: "Creating new data file", - finishText: "Data file created", - fn: () => createData(path, name), - }); -}; diff --git a/packages/commands/src/handlers/start/index.ts b/packages/commands/src/handlers/start/index.ts deleted file mode 100644 index 2145bbb..0000000 --- a/packages/commands/src/handlers/start/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from "./adapter"; -export * from "./api"; -export * from "./data"; -export * from "./mode"; -export * from "./route"; diff --git a/packages/commands/src/handlers/start/mode.ts b/packages/commands/src/handlers/start/mode.ts deleted file mode 100644 index c3e5a2b..0000000 --- a/packages/commands/src/handlers/start/mode.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { writeFile, readFile } from "@solid-cli/utils/fs"; -import { transformPlugins } from "@solid-cli/utils/transform"; -import { isSolidStart } from "@solid-cli/utils"; -import * as p from "@clack/prompts"; -import { cancelable } from "@solid-cli/ui"; - -export const supportedModes = ["csr", "ssr", "ssg"] as const; -type SupportedModes = (typeof supportedModes)[number]; - -const handleAutocompleteMode = async () => { - const mode = (await cancelable( - p.select({ - message: "Select a mode", - options: supportedModes.map((a) => ({ value: a, label: a.toUpperCase() })), - }), - )) as SupportedModes; - await handleMode(mode); -}; - -export const handleMode = async (mode?: SupportedModes) => { - if (!(await isSolidStart())) { - p.log.error("Cannot run command. Your project doesn't include solid-start"); - return; - } - if (!mode) { - handleAutocompleteMode(); - return; - } - p.log.info("Updating config"); - if (mode != "ssg") { - const newConfig = await transformPlugins( - [], - { type: "app", name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() }, - true, - true, - ); - await writeFile("app.config.ts", newConfig); - } -}; diff --git a/packages/commands/src/handlers/start/route.ts b/packages/commands/src/handlers/start/route.ts deleted file mode 100644 index 6e1ea45..0000000 --- a/packages/commands/src/handlers/start/route.ts +++ /dev/null @@ -1,40 +0,0 @@ -import * as p from "@clack/prompts"; -import { isSolidStart, createRoute } from "@solid-cli/utils"; -import { cancelable, spinnerify } from "@solid-cli/ui"; -const handleAutocompleteRoute = async () => { - const path = await cancelable( - p.text({ - message: "Please provide a path for the route", - placeholder: "/user/login", - validate(value) { - if (!value.length) return "Path is required"; - }, - }), - ); - const name = await cancelable( - p.text({ - message: "Please provide a name for the route", - - validate(value) { - if (!value.length) return "Name for route is required"; - }, - }), - ); - - await handleRoute(path, name); -}; -export const handleRoute = async (path?: string, name?: string) => { - if (!(await isSolidStart())) { - p.log.error("Cannot run command. Your project doesn't include solid-start"); - return; - } - if (!path) { - await handleAutocompleteRoute(); - return; - } - await spinnerify({ - startText: "Creating new route", - finishText: "Route created", - fn: () => createRoute(path, name), - }); -}; diff --git a/packages/commands/src/index.ts b/packages/commands/src/index.ts deleted file mode 100644 index 32fff0a..0000000 --- a/packages/commands/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from "./handlers/add"; -export * from "./handlers/new"; -export * from "./handlers/start"; diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts deleted file mode 100644 index 04b2049..0000000 --- a/packages/commands/src/lib/integrations.ts +++ /dev/null @@ -1,221 +0,0 @@ -import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs"; -import { writeFile } from "fs/promises"; -import { fileExists, manipulateJsonFile, validateFilePath } from "./utils/helpers"; -import { $ } from "execa"; -import { getRunnerCommand, detectPackageManager } from "@solid-cli/utils/package-manager"; -import { createSignal } from "@solid-cli/reactivity"; -import * as p from "@clack/prompts"; -import color from "picocolors"; -import { cancelable } from "@solid-cli/ui"; -import { flushQueue } from "@solid-cli/utils/updates"; -import { PluginOptions } from "@solid-cli/utils/transform"; - -// All the integrations/packages that we support -export type Supported = keyof typeof integrations; - -export type IntegrationsValue = { - pluginOptions?: PluginOptions; - installs: string[]; - installsDev?: string[]; - additionalConfig?: () => Promise; - postInstall?: () => Promise; -}; - -export type Integrations = Record; - -export const [rootFile, setRootFile] = createSignal(undefined); - -export const integrations: Record = { - "tailwind": { - installs: ["tailwindcss", "postcss", "autoprefixer"], - postInstall: async () => { - const pM = detectPackageManager(); - await $`${getRunnerCommand(pM)} tailwindcss init -p`; - let tailwindConfig = "tailwind.config.js"; - if (!fileExists(tailwindConfig)) { - p.log.error(color.red(`Can't find tailwind config file`)); - await cancelable( - p.text({ - message: `Type path to tailwind config: `, - validate(value) { - if (!value.length) return `Path can not be empty`; - const path = validateFilePath(value, "tailwind.config"); - if (!path) return `Tailwind config at \`${value}\` not found. Please try again`; - else { - tailwindConfig = path; - } - }, - }), - ); - } - - let indexCss = "./src/index.css"; - if (!fileExists(indexCss)) { - p.log.error(color.red(`Can't find index.css`)); - await cancelable( - p.text({ - message: `Type path to index.css: `, - validate(value) { - if (!value.length) return `Path can not be empty`; - const path = validateFilePath(value, "index.css"); - if (!path) return `index.css at \`${value}\` not found. Please try again`; - else { - indexCss = path; - } - }, - }), - ); - } - p.log.info("Updating tailwind config"); - await insertAfter(tailwindConfig, "content: [", '"./index.html", "./src/**/*.{js,ts,jsx,tsx}"'); - await insertAtBeginning(indexCss, "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n"); - // Instantly flush queue - await flushQueue(); - }, - }, - "unocss": { - pluginOptions: { - importName: "UnoCss", - importSource: "unocss/vite", - isDefault: true, - options: {}, - }, - installs: [""], - installsDev: ["unocss"], - additionalConfig: async () => { - const path = rootFile(); - if (!path) return; - await insertAtBeginning(path, `import "virtual:uno.css";\n`); - }, - }, - "vitepwa": { - pluginOptions: { - importName: "VitePWA", - importSource: "vite-plugin-pwa", - isDefault: false, - options: {}, - }, - installs: ["vite-plugin-pwa"], - }, - "solid-devtools": { - pluginOptions: { - importName: "devtools", - importSource: "solid-devtools/vite", - isDefault: true, - options: {}, - }, - installs: ["solid-devtools"], - additionalConfig: async () => { - const path = rootFile(); - if (!path) return; - await insertAtBeginning(path, `import "solid-devtools";\n`); - }, - }, - "vitest": { - installs: [], - installsDev: [ - "vitest", - "jsdom", - "@solidjs/testing-library", - "@testing-library/user-event", - "@testing-library/jest-dom", - ], - additionalConfig: async () => { - try { - p.log.info("Adding test script to package.json"); - let hasStart = false; - manipulateJsonFile("package.json", (packageJson) => { - if (!packageJson.scripts) { packageJson.scripts = {}; } - if (!/\bvitest\b/.test(packageJson.scripts.test || "")) { - packageJson.scripts.test = "vitest"; - } - hasStart = packageJson.dependencies["@solidjs/start"] - return packageJson; - }); - const hasTs = fileExists("tsconfig.json"); - if (hasTs) { - p.log.info("Adding testing types to tsconfig.json"); - manipulateJsonFile("tsconfig.json", (tsConfig) => { - if (!tsConfig.compilerOptions) { - tsConfig.compilerOptions = {}; - } - tsConfig.compilerOptions.types = [ - ...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]), - ]; - return tsConfig; - }); - } - if ( - hasStart && - ["ts", "mjs", "cjs", "js"].every( - (suffix) => !fileExists(`vite.config.${suffix}`) && !fileExists(`vitest.config.${suffix}`), - ) - ) { - const suffix = hasTs ? "ts" : "mjs"; - p.log.info(`Adding vitest.config.${suffix}`); - await writeFile( - `vitest.config.${suffix}`, - `import solid from "vite-plugin-solid"; -import { defineConfig } from "vitest/config"; - -export default defineConfig({ - plugins: [solid()], - resolve: { - conditions: ["development", "browser"], - }, -}); -`, - "utf-8", - ); - } - } catch (err) { - console.error(err); - } - }, - }, - "tauri-v1.x": { - installs: ["@tauri-apps/cli"], - postInstall: async () => { - try { - let name = ""; - manipulateJsonFile("package.json", (packageJson) => { - if (!packageJson.scripts) { packageJson.scripts = {}; } - packageJson.scripts.tauri = "tauri"; - name = packageJson.name; - return packageJson; - }); - await flushQueue(); - const pM = detectPackageManager(); - await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`; - p.note(`Make sure you have installed all prerequisites: https://tauri.app/v1/guides/getting-started/prerequisites - - Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`); - } catch (err) { - console.error(err); - } - }, - }, - "tauri-v2.x": { - installs: ["@tauri-apps/cli@next"], - postInstall: async () => { - try { - let name = ""; - manipulateJsonFile("package.json", (packageJson) => { - if (!packageJson.scripts) { packageJson.scripts = {}; } - packageJson.scripts.tauri = "tauri"; - name = packageJson.name; - return packageJson; - }) - await flushQueue(); - const pM = detectPackageManager(); - await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`; - p.note(`Make sure you have installed all prerequisites: https://v2.tauri.app/start/prerequisites/ - - Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`); - } catch (err) { - console.error(err); - } - }, - }, -}; - diff --git a/packages/commands/src/lib/utils/helpers.ts b/packages/commands/src/lib/utils/helpers.ts deleted file mode 100644 index b910217..0000000 --- a/packages/commands/src/lib/utils/helpers.ts +++ /dev/null @@ -1,152 +0,0 @@ -import { existsSync, lstatSync, readdirSync } from "fs"; -import { readFile, writeFile } from "fs/promises"; -import { isSolidStart } from "@solid-cli/utils"; -import { join, resolve } from "path"; -import { $ } from "execa"; -import { cancelable } from "@solid-cli/ui"; -import * as p from "@clack/prompts"; -import color from "picocolors"; - -export const getProjectRoot = async () => { - const { stdout } = await $`npm root`; - - return stdout.slice(0, stdout.lastIndexOf("/")); -}; - -export const getRootFile = async () => { - if (await isSolidStart()) { - return "src/app.tsx"; - } - return "src/index.tsx"; -}; - -export const fileExists = (path: string) => { - return existsSync(path); -}; - -export function validateFilePath(path: string, lookingFor: string): string | undefined; -export function validateFilePath(path: string, lookingFor: string[]): string | undefined; -export function validateFilePath(path: string, lookingFor: string | string[]): string | undefined { - path = resolve(path); - let isDir: boolean; - try { - console.log(path); - isDir = lstatSync(path).isDirectory(); - } catch (e) { - return undefined; - } - if (isDir) { - const files = readdirSync(path, { withFileTypes: true }); - - const config = files.find((file) => { - if (Array.isArray(lookingFor)) { - return lookingFor.some((s) => file.name.startsWith(s)); - } - - return file.name.startsWith(lookingFor); - }); - return config ? join(path, config.name) : undefined; - } - - const pathIsValid = Array.isArray(lookingFor) - ? lookingFor.some((s) => path.startsWith(s)) - : path.startsWith(lookingFor); - - const exists = fileExists(path) && pathIsValid; - - return exists ? path : undefined; -} - -export async function findFiles( - startPath: string, - lookingFor: string | string[], - opts: { depth?: number; ignoreDirs?: string[]; startsWith?: boolean }, -): Promise { - let { depth = Infinity, ignoreDirs = ["node_modules", "."], startsWith = true } = opts; - - startPath = resolve(startPath); - let isDir: boolean; - try { - isDir = lstatSync(startPath).isDirectory(); - } catch (e) { - return []; - } - if (!isDir) { - startPath = resolve(startPath.slice(0, startPath.lastIndexOf("/"))); - } - - let filePaths: string[] = []; - - const files = readdirSync(startPath, { withFileTypes: true }); - - for (const file of files) { - if (file.isDirectory() && !ignoreDirs.some((s) => file.name.includes(s))) { - if (Number.isFinite(depth) && depth-- <= 0) continue; - filePaths = filePaths.concat(await findFiles(resolve(startPath, file.name), lookingFor, opts)); - continue; - } - - if (file.isFile()) { - const fileMatch = Array.isArray(lookingFor) - ? lookingFor.some((s) => (startsWith ? file.name.startsWith(s) : file.name.endsWith(s))) - : startsWith - ? file.name.startsWith(lookingFor) - : file.name.endsWith(lookingFor); - - if (fileMatch) { - filePaths.push(resolve(startPath, file.name)); - } - } - } - - return filePaths; -} - -export const getConfigFile = async (file: "app" | "vite" = "app") => { - let configFile = `${file}.config.ts`; - - const existsHere = fileExists(configFile); - - if (!existsHere) { - const root = await getProjectRoot(); - const existsInRoot = validateFilePath(root, `${file}.config`); - if (existsInRoot) { - const correctConfig = await cancelable( - p.confirm({ - message: `Could not find ${file} config in current directory, but found ${file} config in \`${root}\`. Is this the correct ${file} config?`, - }), - ); - if (correctConfig) return existsInRoot; - } - - p.log.error(color.red(`Can't find ${file}.config file`)); - await cancelable( - p.text({ - message: `Type path to ${file} config: `, - validate(value) { - const path = validateFilePath(value, `${file}.config`); - if (!path) return `${file} config not found. Please try again`; - else { - configFile = path; - } - }, - }), - ); - } - - return configFile; -}; - -export async function manipulateJsonFile(name: string, manipulate: (obj: Record) => Record) { - try { - const jsonString = await readFile(name, "utf8"); - const jsonObj = JSON.parse(jsonString); - await writeFile( - name, - JSON.stringify(manipulate(jsonObj), null, /^(\t|\s+)/m.exec(jsonString)?.[0] || 2) + "\n", - "utf8", - ); - } catch (error) { - p.log.error(color.red(error ? error.toString() : `unknown error when manipulating ${name}`)); - } -} diff --git a/packages/commands/tests/assets/sample_app_config.txt b/packages/commands/tests/assets/sample_app_config.txt deleted file mode 100644 index 50315ba..0000000 --- a/packages/commands/tests/assets/sample_app_config.txt +++ /dev/null @@ -1,7 +0,0 @@ -import { defineConfig } from "@solidjs/start/config"; -// Simulates an app config -export default defineConfig({ - vite: { - plugins: [solid()] - } -}); diff --git a/packages/commands/tests/assets/sample_unocss_app_result.txt b/packages/commands/tests/assets/sample_unocss_app_result.txt deleted file mode 100644 index 90217f1..0000000 --- a/packages/commands/tests/assets/sample_unocss_app_result.txt +++ /dev/null @@ -1,11 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "@solidjs/start/config"; -// Simulates an app config -export default defineConfig({ - vite: { - plugins: [ - solid(), - UnoCss({}) - ] - } -}); diff --git a/packages/commands/tests/assets/sample_unocss_vite_result.txt b/packages/commands/tests/assets/sample_unocss_vite_result.txt deleted file mode 100644 index c5d2c91..0000000 --- a/packages/commands/tests/assets/sample_unocss_vite_result.txt +++ /dev/null @@ -1,9 +0,0 @@ -import UnoCss from "unocss/vite"; -import { defineConfig } from "vite"; -// Simulates an app config -export default defineConfig({ - plugins: [ - solid(), - UnoCss({}) - ] -}); diff --git a/packages/commands/tests/assets/sample_vite_config.txt b/packages/commands/tests/assets/sample_vite_config.txt deleted file mode 100644 index 0faac72..0000000 --- a/packages/commands/tests/assets/sample_vite_config.txt +++ /dev/null @@ -1,5 +0,0 @@ -import { defineConfig } from "vite"; -// Simulates an app config -export default defineConfig({ - plugins: [solid()] -}); diff --git a/packages/commands/tests/config_manipulation.test.ts b/packages/commands/tests/config_manipulation.test.ts deleted file mode 100644 index aec0f98..0000000 --- a/packages/commands/tests/config_manipulation.test.ts +++ /dev/null @@ -1,93 +0,0 @@ -import { describe, expect, it, vi } from "vitest"; -import { handleAdd } from "../src/handlers/add"; -import { readFile as readFile1 } from "fs"; -import { UPDATESQUEUE } from "../../utils/src/updates"; - -const readFile = async (path: string): Promise => { - return await new Promise((res) => - // Can't use readFile from fs/promises because we've mocked it - readFile1(path, (_, data) => res(data.toString())), - ); -}; - -const removeWhitespace = (str: string) => str.replace(/\s/g, ""); - -vi.mock("fs/promises", () => { - return { - readFile: async (name: string) => { - if (name === "app.config.ts") { - const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_app_config.txt"); - return sampleConfig; - } - if (name === "vite.config.ts") { - const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_vite_config.txt"); - return sampleConfig; - } - - return "{}"; - }, - writeFile: async (_, contents: string) => { - return contents; - }, - }; -}); -vi.mock("execa", () => { - return { $: async () => ({ stdout: "" }) }; -}); - -vi.mock("@clack/prompts", async () => { - const actual: object = await vi.importActual("@clack/prompts"); - return { - ...actual, - confirm: async ({ message }: { message: string }) => true, - }; -}); - -vi.mock("@solid-cli/utils/updates", async () => { - const actual: object = await vi.importActual("@solid-cli/utils/updates"); - return { - ...actual, - clearQueue: async () => {}, - }; -}); - -vi.mock("../src/lib/utils/helpers.ts", async () => { - return { - getConfigFile: async (file: string): Promise => new Promise((r) => r(`${file}.config.ts`)), - fileExists: (path: string) => - path.includes("vite_config") || - path.includes("app_config") || - path.includes("app.tsx") || - path.includes("index.tsx"), - getRootFile: async (): Promise => new Promise((r) => r("./src/app.tsx")), - }; -}); - -let testingSolidStart = false; - -vi.mock("@solid-cli/utils", async () => { - return { - isSolidStart: async () => new Promise((r) => r(testingSolidStart)), - }; -}); - -describe("Update config", () => { - it("Adds a plugin properly to the app config", { timeout: 50000 }, async () => { - testingSolidStart = true; - await handleAdd(["unocss"]); - - const expected = await readFile("./packages/commands/tests/assets/sample_unocss_app_result.txt"); - // @ts-ignore - const newConfig = UPDATESQUEUE.find((u) => u.name === "app.config.ts")?.contents; - expect(removeWhitespace(newConfig)).toBe(removeWhitespace(expected)); - }); - it("Adds a plugin properly to the vite config", { timeout: 50000 }, async () => { - testingSolidStart = false; - await handleAdd(["unocss"]); - - const expected = await readFile("./packages/commands/tests/assets/sample_unocss_vite_result.txt"); - // @ts-ignore - const newConfig = UPDATESQUEUE.find((u) => u.name === "vite.config.ts")?.contents; - expect(removeWhitespace(newConfig)).toBe(removeWhitespace(expected)); - }); -}); diff --git a/packages/commands/tests/package_installs.test.ts b/packages/commands/tests/package_installs.test.ts deleted file mode 100644 index c0eff16..0000000 --- a/packages/commands/tests/package_installs.test.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { expect, describe, it } from "vitest"; - -describe("Package Installs", () => { - it("should install packages correctly", () => { - expect(true).toBe(true); - }); -}); diff --git a/packages/commands/tsconfig.json b/packages/commands/tsconfig.json deleted file mode 100644 index ecaf1e3..0000000 --- a/packages/commands/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "useDefineForClassFields": true, - "module": "ESNext", - "skipLibCheck": true, - "declaration": true, - "emitDeclarationOnly": true, - "moduleResolution": "Bundler", - "resolveJsonModule": true, - "isolatedModules": true, - "allowSyntheticDefaultImports": true, - "strict": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - "noFallthroughCasesInSwitch": true, - "outDir": "types" - }, - "include": ["src/*"] -} diff --git a/packages/commands/tsup.config.ts b/packages/commands/tsup.config.ts deleted file mode 100644 index 0e6978c..0000000 --- a/packages/commands/tsup.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { defineConfig } from "tsup"; -import metaUrlPlugin from "@chialab/esbuild-plugin-meta-url"; - -export default defineConfig({ - entry: ["src/index.ts", "src/handlers/new.ts"], - target: "esnext", - format: "esm", - splitting: false, - sourcemap: true, - clean: true, - minify: true, - esbuildPlugins: [metaUrlPlugin()], -}); diff --git a/packages/core/.gitignore b/packages/core/.gitignore deleted file mode 100644 index bf96551..0000000 --- a/packages/core/.gitignore +++ /dev/null @@ -1,133 +0,0 @@ -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -.pnpm-debug.log* - -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# Snowpack dependency directory (https://snowpack.dev/) -web_modules/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional swc cache -.swc - -# Optional eslint cache -.eslintcache - -# Optional stylelint cache -.stylelintcache - -# Microbundle cache -.rpt2_cache/ -.rts2_cache_cjs/ -.rts2_cache_es/ -.rts2_cache_umd/ - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variable files -.env -.env.development.local -.env.test.local -.env.production.local -.env.local - -# parcel-bundler cache (https://parceljs.org/) -.cache -.parcel-cache - -# Next.js build output -.next -out - -# Nuxt.js build / generate output -.nuxt -dist - -# Gatsby files -.cache/ -# Comment in the public line in if your project uses Gatsby and not Next.js -# https://nextjs.org/blog/next-9-1#public-directory-support -# public - -# vuepress build output -.vuepress/dist - -# vuepress v2.x temp and cache directory -.temp -.cache - -# Docusaurus cache and generated files -.docusaurus - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# TernJS port file -.tern-port - -# Stores VSCode versions used for testing VSCode extensions -.vscode-test - -# yarn v2 -.yarn/cache -.yarn/unplugged -.yarn/build-state.yml -.yarn/install-state.gz -.pnp.* diff --git a/packages/core/README.md b/packages/core/README.md deleted file mode 100644 index c922b0e..0000000 --- a/packages/core/README.md +++ /dev/null @@ -1,48 +0,0 @@ -# @solid-cli/core - -The main package for the SolidJS CLI tool. - -## Installation - -Run the following command to install the CLI tool globally: - -```bash -npm i -g @solid-cli/core -``` - -## Usage - -For a full list of commands and how to use them, you can invoke the help command like so: - -```bash -solid --help -``` - -Which should print this: - -```bash -solid - -where can be one of: - -- add - Can add and install integrations: `solid add unocss`. -- docs -- new - Creates a new solid project -- set -- start - Commands specific to solid start -- playground - -For more help, try running `solid --help` -``` - -## Documentation - -Visit our [official documentation](https://solid-cli.netlify.app/) - -## Support - -Reach out to us on the official [SolidJS discord](https://discord.gg/solidjs) - -## Contributing - -If you would like to contribute or keep up to date with the package, come join the effort over on [our GitHub](https://github.com/solidjs-community/solid-cli) diff --git a/packages/core/package.json b/packages/core/package.json deleted file mode 100644 index 6bc3f13..0000000 --- a/packages/core/package.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "@solid-cli/core", - "version": "0.0.26", - "description": "A CLI for Solid", - "author": "Thomas Beer & Rahul Batra", - "license": "MIT", - "homepage": "https://solid-cli.netlify.app", - "repository": { - "type": "git", - "url": "https://github.com/solidjs-community/solid-cli" - }, - "keywords": [ - "solidjs", - "solid", - "cli" - ], - "main": "dist/index.mjs", - "bin": { - "solid": "./dist/index.mjs" - }, - "files": [ - "dist" - ], - "dependencies": { - "@clack/core": "0.3.4", - "@clack/prompts": "0.7.0", - "@solid-cli/commands": "workspace:*", - "@solid-cli/ui": "workspace:*", - "@solid-cli/utils": "workspace:*", - "cmd-ts": "^0.13.0", - "execa": "^8.0.1", - "picocolors": "^1.1.1", - "smol-toml": "^1.3.0", - "tiny-updater": "^3.5.2" - }, - "scripts": { - "start": "jiti ./src/index.ts", - "build": "tsc && tsup" - }, - "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "^22.9.0", - "jiti": "^2.4.0", - "tsup": "^8.3.5", - "typescript": "^5.6.3" - }, - "publishConfig": { - "access": "public" - } -} diff --git a/packages/core/src/commands/index.ts b/packages/core/src/commands/index.ts deleted file mode 100644 index 8d4bcaf..0000000 --- a/packages/core/src/commands/index.ts +++ /dev/null @@ -1,114 +0,0 @@ -import { openInBrowser } from "@solid-cli/utils"; -import { startCommands } from "./start"; -import * as p from "@clack/prompts"; -import { boolean, command, flag, optional, positional, restPositionals, string } from "cmd-ts"; -import { oneOf } from "@solid-cli/utils"; -import { cancelable } from "@solid-cli/ui"; -import { PossibleFields, setField, t } from "@solid-cli/utils"; -import { spinnerify } from "@solid-cli/ui"; -import { handleNew, handleAdd } from "@solid-cli/commands"; - -const add = command({ - name: "add", - description: t.ADD_DESC, - args: { - packages: restPositionals({ - type: string, - displayName: "Package Name", - }), - forceTransform: flag({ type: boolean, long: "force", short: "f" }), - }, - handler: async ({ packages, forceTransform }) => { - await handleAdd(packages, forceTransform); - }, -}); - -const new_ = command({ - name: "new", - description: t.NEW_DESC, - args: { - variation: positional({ - type: optional(oneOf(["bare", "ts", "js"] as const)), - displayName: t.NEW_VARIATION_DESC, - description: "", - }), - name: positional({ - type: optional(string), - displayName: t.PROJECT_NAME, - description: t.NEW_NAME_DESC, - }), - stackblitz: flag({ type: boolean, long: "stackblitz", short: "s" }), - }, - async handler({ variation, name, stackblitz }) { - if (!name && variation) { - const _name = await cancelable( - p.text({ - message: t.PROJECT_NAME, - placeholder: `solid-${variation}`, - defaultValue: `solid-${variation}`, - }), - ); - name = _name; - } - await handleNew(variation, name, stackblitz); - }, -}); - -const docs = command({ - name: "docs", - args: { - keyword: positional({ type: optional(string), displayName: "Keyword" }), - open: flag({ type: boolean, long: "open", short: "o" }), - }, - async handler({ keyword, open }) { - if (!keyword) { - if (open) { - await spinnerify({ - startText: "Opening", - finishText: "Opened", - fn: () => openInBrowser("https://docs.solidjs.com"), - }); - return; - } - p.log.message("The solid documentation is available at https://docs.solidjs.com"); - return; - } - await spinnerify({ - startText: "Opening", - finishText: "Opened", - fn: () => - openInBrowser( - `https://www.google.com/search?q=${keyword}+site:docs.solidjs.com+OR+site:start.solidjs.com+OR+site:solidjs.com`, - ), - }); - }, -}); - -const set = command({ - name: "set", - args: { field: positional({ type: oneOf(PossibleFields) }), value: positional({ type: string }) }, - async handler({ field, value }) { - await setField(field, value); - }, -}); - -const playground = command({ - name: "playground", - args: {}, - async handler() { - await spinnerify({ - startText: "Opening", - finishText: "Opened", - fn: () => openInBrowser("https://playground.solidjs.com"), - }); - }, -}); - -export default { - add, - docs, - new: new_, - set, - start: startCommands, - playground, -}; diff --git a/packages/core/src/commands/start.ts b/packages/core/src/commands/start.ts deleted file mode 100644 index 8f2640c..0000000 --- a/packages/core/src/commands/start.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { command, flag, optional, positional, string, subcommands } from "cmd-ts"; -import { oneOf } from "@solid-cli/utils"; -import { t } from "@solid-cli/utils"; -import { - handleAdapter, - handleApi, - handleData, - handleMode, - handleRoute, - supportedAdapters, - supportedModes, -} from "@solid-cli/commands"; - -const mode = command({ - name: "mode", - args: { - mode: positional({ - type: optional(oneOf(supportedModes)), - displayName: "Mode", - description: t.START_MODE_DESC, - }), - }, - async handler({ mode }) { - await handleMode(mode); - }, -}); - -const route = command({ - name: "route", - args: { - path: positional({ type: optional(string), displayName: "Route Path" }), - name: positional({ - type: optional(string), - displayName: "Route name", - description: t.START_ROUTE_DESC, - }), - }, - async handler({ path, name }) { - await handleRoute(path, name); - }, -}); - -const data = command({ - name: "data", - args: { - path: positional({ type: optional(string), displayName: "Data Path" }), - name: positional({ - type: optional(string), - displayName: "Data name", - description: t.START_DATA_DESC, - }), - }, - async handler({ path, name }) { - await handleData(path, name); - }, -}); - -const adapter = command({ - name: "adapter", - args: { - name: positional({ - type: optional(oneOf(supportedAdapters)), - displayName: t.START_ADAPTER_DISPLAYNAME, - }), - forceTransform: flag({ short: "f", long: "force" }), - }, - async handler({ name, forceTransform }) { - await handleAdapter(name, forceTransform); - }, -}); - -const api = command({ - name: "api", - args: { - path: positional({ type: optional(string), displayName: "Api Path" }), - name: positional({ - type: optional(string), - displayName: t.START_API_DISPLAYNAME, - description: t.START_API_HINT, - }), - }, - async handler({ path, name }) { - await handleApi(path, name); - }, -}); - -export const startCommands = subcommands({ - name: "start", - description: "Commands specific to solid start", - cmds: { - mode, - route, - data, - adapter, - api, - }, -}); diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts deleted file mode 100644 index c358bb3..0000000 --- a/packages/core/src/index.ts +++ /dev/null @@ -1,117 +0,0 @@ -#! /usr/bin/env node -import { run, subcommands } from "cmd-ts"; -import * as p from "@clack/prompts"; -import color from "picocolors"; -import { t, setLocale, getField } from "@solid-cli/utils"; -import { name, version } from "../package.json"; -import { readConfig } from "@solid-cli/utils"; -import loadCommands from "./plugins/plugins_entry"; -import updater from "tiny-updater"; -import { createAsync } from "@solid-cli/reactivity"; -import { - handleAdapter, - handleAdd, - handleApi, - handleData, - handleMode, - handleNew, - handleRoute, -} from "@solid-cli/commands"; - -const possibleActions = () => - [ - { value: "add", label: t.ACTION_ADD, hint: "solid add ..." }, - { value: "new", label: t.ACTION_NEW, hint: "solid new ..." }, - { value: "start", label: t.ACTION_START, hint: "solid start ..." }, - ] as const; - -export const provideStartSuggestions = async () => { - let startAction = await p.select({ - message: t.SELECT_START_ACTION, - options: [ - { value: "mode", label: t.START_MODE, hint: t.START_MODE_HINT }, - { value: "route", label: t.START_ROUTE, hint: t.START_ROUTE_HINT }, - { value: "data", label: t.START_DATA, hint: t.START_DATA_HINT }, - { - value: "adapter", - label: t.START_ADAPTER, - hint: t.START_ADAPTER_HINT, - }, - { - value: "api", - label: t.START_API, - hint: t.START_API_HINT, - }, - ], - }); - switch (startAction) { - case "mode": - await handleMode(); - break; - case "route": - await handleRoute(); - break; - case "data": - await handleData(); - break; - case "adapter": - await handleAdapter(); - break; - case "api": - await handleApi(); - break; - } -}; - -const provideSuggestions = async () => { - type ActionType = ReturnType[number]["value"]; - let action = (await p.select({ - message: t.SELECT_ACTION, - // This thing really doesn't like `as const` things - options: possibleActions() as any, - })) as ActionType; - if (!action) return; - switch (action) { - case "add": - await handleAdd(); - break; - case "new": - await handleNew(); - break; - case "start": - await provideStartSuggestions(); - break; - } -}; - -const main = async () => { - p.intro(`\n${color.bgCyan(color.black(" Solid-CLI "))}`); - await readConfig(); - const needsUpdate = createAsync(async () => await updater({ name, version, ttl: 86_400_000 })); - setLocale(getField("lang")); - const cli = subcommands({ - name: "solid", - cmds: await loadCommands(), - version, - }); - const args = process.argv.slice(2); - try { - - if (args.length === 0) { - await provideSuggestions(); - return; - } - - if (args.length === 1 && args[0] === "start") { - await provideStartSuggestions(); - return; - } - - await run(cli, args); - } - catch (e) { - console.error(e); - process.exit(1); - } -}; -main(); diff --git a/packages/core/src/plugins/plugins_entry.ts b/packages/core/src/plugins/plugins_entry.ts deleted file mode 100644 index f1aec75..0000000 --- a/packages/core/src/plugins/plugins_entry.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { join } from "path"; -import { config } from "@solid-cli/utils"; -import defaultCommands from "../commands"; - -const resolveImport = async (packagePath: string) => { - const packageJson = await import(join(packagePath, "package.json")); - return await import(join(packagePath, packageJson.module)); -}; -const loadUserCommands = async () => { - const pluginPaths = config()["plugins"] as string[]; - if (!pluginPaths) return null; - const imports = await Promise.all(pluginPaths.map((p) => resolveImport(p))); - const importedCommands = imports.map((i) => i.default); - let commands = {} as any; - importedCommands.forEach((c) => { - const name = c.name; - commands[name] = c; - }); - return commands; -}; -const loadCommands = async () => { - const cmds = { - ...defaultCommands, - ...(await loadUserCommands()), - }; - return cmds; -}; -export default loadCommands; diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json deleted file mode 100644 index b6d4e3a..0000000 --- a/packages/core/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "compilerOptions": { - "baseUrl": ".", - "noEmit": true, - "module": "ESNext", - "target": "ESNext", - "moduleResolution": "Bundler", - "strict": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "skipLibCheck": true, - "resolveJsonModule": true - } -} diff --git a/packages/core/tsup.config.ts b/packages/core/tsup.config.ts deleted file mode 100644 index 75f3240..0000000 --- a/packages/core/tsup.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { defineConfig } from "tsup"; -import metaUrlPlugin from "@chialab/esbuild-plugin-meta-url"; - -export default defineConfig({ - entry: ["src/index.ts"], - target: "esnext", - format: "esm", - splitting: false, - sourcemap: true, - clean: true, - minify: true, - esbuildPlugins: [metaUrlPlugin()], -}); diff --git a/packages/create-solid/src/create-start.ts b/packages/create-solid/src/create-start.ts index e41c2a8..68041ab 100644 --- a/packages/create-solid/src/create-start.ts +++ b/packages/create-solid/src/create-start.ts @@ -1,8 +1,8 @@ import { downloadRepo } from "@begit/core"; -import { GIT_IGNORE, StartTemplate } from "./helpers" import { join } from "path"; import { writeFileSync } from "fs"; import { handleTSConversion } from "./utils/ts-conversion" +import { GIT_IGNORE, StartTemplate } from "./utils/constants"; export type CreateStartArgs = { template: StartTemplate, destination: string, diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create-solid/src/create-vanilla.ts index 394ba41..904b010 100644 --- a/packages/create-solid/src/create-vanilla.ts +++ b/packages/create-solid/src/create-vanilla.ts @@ -1,8 +1,8 @@ import { downloadRepo } from "@begit/core"; import { join } from "node:path"; -import { GIT_IGNORE, VanillaTemplate } from "./helpers"; import { writeFileSync } from "node:fs"; import { handleTSConversion } from "./utils/ts-conversion"; +import { GIT_IGNORE, VanillaTemplate } from "./utils/constants"; export type CreateVanillaArgs = { diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index c340ee7..bdcf9b5 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -5,9 +5,10 @@ import packageJson from "../package.json" with { type: "json" }; import { defineCommand, runMain } from "citty"; import { createVanilla, createVanillaJS } from "./create-vanilla"; import * as p from "@clack/prompts"; -import { cancelable, getTemplatesList, spinnerify, StartTemplate, VanillaTemplate } from "./helpers"; +import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { create } from "./create"; +import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); const main = defineCommand({ diff --git a/packages/create-solid/src/utils/constants.ts b/packages/create-solid/src/utils/constants.ts new file mode 100644 index 0000000..403e595 --- /dev/null +++ b/packages/create-solid/src/utils/constants.ts @@ -0,0 +1,57 @@ +export const GIT_IGNORE = ` +dist +.solid +.output +.vercel +.netlify +.vinxi +app.config.timestamp_*.js + +# Environment +.env +.env*.local + +# dependencies +/node_modules + +# IDEs and editors +/.idea +.project +.classpath +*.launch +.settings/ + +# Temp +gitignore + +# System Files +.DS_Store +Thumbs.db +`; + +export const JS_CONFIG = { + compilerOptions: { + jsx: "preserve", + jsxImportSource: "solid-js", + paths: { + "~/*": ["./src/*"], + }, + }, +} + +// Supported templates + +const VANILLA_TEMPLATES = ["ts"] as const; +export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; + +const START_TEMPLATES = ["basic"] as const; +export type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; + +export const getTemplatesList = async (isStart: boolean) => { + if (isStart) { + return START_TEMPLATES; + } + return VANILLA_TEMPLATES; +} + +// \ No newline at end of file diff --git a/packages/create-solid/src/utils/ts-conversion.ts b/packages/create-solid/src/utils/ts-conversion.ts index dc5a711..6683534 100644 --- a/packages/create-solid/src/utils/ts-conversion.ts +++ b/packages/create-solid/src/utils/ts-conversion.ts @@ -3,6 +3,7 @@ import { readFileToString, recurseFiles } from "./file-system" import { join, resolve } from "node:path"; import { transform } from "sucrase"; import { rm } from "node:fs/promises"; +import { JS_CONFIG } from "./constants" const convertToJS = async (file: Dirent, startPath: string) => { const src = join(startPath, file.name); const dest = resolve(startPath.replace(".solid-start", ""), file.name); @@ -27,15 +28,7 @@ export const handleTSConversion = async (tempDir: string, projectName: string) = writeFileSync( resolve(projectName, "jsconfig.json"), JSON.stringify( - { - compilerOptions: { - jsx: "preserve", - jsxImportSource: "solid-js", - paths: { - "~/*": ["./src/*"], - }, - }, - }, + JS_CONFIG, null, 2, ), diff --git a/packages/create-solid/src/helpers.ts b/packages/create-solid/src/utils/ui.ts similarity index 60% rename from packages/create-solid/src/helpers.ts rename to packages/create-solid/src/utils/ui.ts index f53899a..fcaa5eb 100644 --- a/packages/create-solid/src/helpers.ts +++ b/packages/create-solid/src/utils/ui.ts @@ -1,34 +1,3 @@ -export const GIT_IGNORE = ` -dist -.solid -.output -.vercel -.netlify -.vinxi -app.config.timestamp_*.js - -# Environment -.env -.env*.local - -# dependencies -/node_modules - -# IDEs and editors -/.idea -.project -.classpath -*.launch -.settings/ - -# Temp -gitignore - -# System Files -.DS_Store -Thumbs.db -`; - import { log, spinner } from "@clack/prompts"; type SpinnerItem = { startText: string; @@ -59,14 +28,3 @@ export const cancelable = async (prompt: Promise, cance return value; }; -const VANILLA_TEMPLATES = ["ts"] as const; -export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; - -const START_TEMPLATES = ["basic"] as const; -export type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; -export const getTemplatesList = async (isStart: boolean) => { - if (isStart) { - return START_TEMPLATES; - } - return VANILLA_TEMPLATES; -} \ No newline at end of file From ae7e8c510de10d59dc6609e946a4a4b38ff31538 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 00:46:08 +0000 Subject: [PATCH 139/290] remove unnecessary example --- examples/README.md | 1 - examples/plugin_template/package.json | 19 - examples/plugin_template/pnpm-lock.yaml | 930 ------------------------ examples/plugin_template/src/index.ts | 10 - examples/plugin_template/tsconfig.json | 14 - examples/plugin_template/tsup.config.ts | 10 - 6 files changed, 984 deletions(-) delete mode 100644 examples/README.md delete mode 100644 examples/plugin_template/package.json delete mode 100644 examples/plugin_template/pnpm-lock.yaml delete mode 100644 examples/plugin_template/src/index.ts delete mode 100644 examples/plugin_template/tsconfig.json delete mode 100644 examples/plugin_template/tsup.config.ts diff --git a/examples/README.md b/examples/README.md deleted file mode 100644 index bde8a57..0000000 --- a/examples/README.md +++ /dev/null @@ -1 +0,0 @@ -# Example plugins for the CLI diff --git a/examples/plugin_template/package.json b/examples/plugin_template/package.json deleted file mode 100644 index 4f9cffc..0000000 --- a/examples/plugin_template/package.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "test_plugin", - "version": "1.0.0", - "description": "", - "module": "./dist/index.mjs", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build": "tsup" - }, - "keywords": [], - "author": "", - "license": "ISC", - "dependencies": { - "cmd-ts": "^0.13.0" - }, - "devDependencies": { - "tsup": "^7.2.0" - } -} diff --git a/examples/plugin_template/pnpm-lock.yaml b/examples/plugin_template/pnpm-lock.yaml deleted file mode 100644 index b437238..0000000 --- a/examples/plugin_template/pnpm-lock.yaml +++ /dev/null @@ -1,930 +0,0 @@ -lockfileVersion: '6.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -dependencies: - cmd-ts: - specifier: ^0.13.0 - version: 0.13.0 - -devDependencies: - tsup: - specifier: ^7.2.0 - version: 7.2.0 - -packages: - - /@esbuild/android-arm64@0.18.19: - resolution: {integrity: sha512-4+jkUFQxZkQfQOOxfGVZB38YUWHMJX2ihZwF+2nh8m7bHdWXpixiurgGRN3c/KMSwlltbYI0/i929jwBRMFzbA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@esbuild/android-arm@0.18.19: - resolution: {integrity: sha512-1uOoDurJYh5MNqPqpj3l/TQCI1V25BXgChEldCB7D6iryBYqYKrbZIhYO5AI9fulf66sM8UJpc3UcCly2Tv28w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@esbuild/android-x64@0.18.19: - resolution: {integrity: sha512-ae5sHYiP/Ogj2YNrLZbWkBmyHIDOhPgpkGvFnke7XFGQldBDWvc/AyYwSLpNuKw9UNkgnLlB/jPpnBmlF3G9Bg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@esbuild/darwin-arm64@0.18.19: - resolution: {integrity: sha512-HIpQvNQWFYROmWDANMRL+jZvvTQGOiTuwWBIuAsMaQrnStedM+nEKJBzKQ6bfT9RFKH2wZ+ej+DY7+9xHBTFPg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@esbuild/darwin-x64@0.18.19: - resolution: {integrity: sha512-m6JdvXJQt0thNLIcWOeG079h2ivhYH4B5sVCgqb/B29zTcFd7EE8/J1nIUHhdtwGeItdUeqKaqqb4towwxvglQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@esbuild/freebsd-arm64@0.18.19: - resolution: {integrity: sha512-G0p4EFMPZhGn/xVNspUyMQbORH3nlKTV0bFNHPIwLraBuAkTeMyxNviTe0ZXUbIXQrR1lrwniFjNFU4s+x7veQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/freebsd-x64@0.18.19: - resolution: {integrity: sha512-hBxgRlG42+W+j/1/cvlnSa+3+OBKeDCyO7OG2ICya1YJaSCYfSpuG30KfOnQHI7Ytgu4bRqCgrYXxQEzy0zM5Q==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-arm64@0.18.19: - resolution: {integrity: sha512-X8g33tczY0GsJq3lhyBrjnFtaKjWVpp1gMq5IlF9BQJ3TUfSK74nQnz9mRIEejmcV+OIYn6bkOJeUaU1Knrljg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-arm@0.18.19: - resolution: {integrity: sha512-qtWyoQskfJlb9MD45mvzCEKeO4uCnDZ7lPFeNqbfaaJHqBiH9qA5Vu2EuckqYZuFMJWy1l4dxTf9NOulCVfUjg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-ia32@0.18.19: - resolution: {integrity: sha512-SAkRWJgb+KN+gOhmbiE6/wu23D6HRcGQi15cB13IVtBZZgXxygTV5GJlUAKLQ5Gcx0gtlmt+XIxEmSqA6sZTOw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-loong64@0.18.19: - resolution: {integrity: sha512-YLAslaO8NsB9UOxBchos82AOMRDbIAWChwDKfjlGrHSzS3v1kxce7dGlSTsrb0PJwo1KYccypN3VNjQVLtz7LA==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-mips64el@0.18.19: - resolution: {integrity: sha512-vSYFtlYds/oTI8aflEP65xo3MXChMwBOG1eWPGGKs/ev9zkTeXVvciU+nifq8J1JYMz+eQ4J9JDN0O2RKF8+1Q==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-ppc64@0.18.19: - resolution: {integrity: sha512-tgG41lRVwlzqO9tv9l7aXYVw35BxKXLtPam1qALScwSqPivI8hjkZLNH0deaaSCYCFT9cBIdB+hUjWFlFFLL9A==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-riscv64@0.18.19: - resolution: {integrity: sha512-EgBZFLoN1S5RuB4cCJI31pBPsjE1nZ+3+fHRjguq9Ibrzo29bOLSBcH1KZJvRNh5qtd+fcYIGiIUia8Jw5r1lQ==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-s390x@0.18.19: - resolution: {integrity: sha512-q1V1rtHRojAzjSigZEqrcLkpfh5K09ShCoIsdTakozVBnM5rgV58PLFticqDp5UJ9uE0HScov9QNbbl8HBo6QQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-x64@0.18.19: - resolution: {integrity: sha512-D0IiYjpZRXxGZLQfsydeAD7ZWqdGyFLBj5f2UshJpy09WPs3qizDCsEr8zyzcym6Woj/UI9ZzMIXwvoXVtyt0A==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/netbsd-x64@0.18.19: - resolution: {integrity: sha512-3tt3SOS8L3D54R8oER41UdDshlBIAjYhdWRPiZCTZ1E41+shIZBpTjaW5UaN/jD1ENE/Ok5lkeqhoNMbxstyxw==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/openbsd-x64@0.18.19: - resolution: {integrity: sha512-MxbhcuAYQPlfln1EMc4T26OUoeg/YQc6wNoEV8xvktDKZhLtBxjkoeESSo9BbPaGKhAPzusXYj5n8n5A8iZSrA==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/sunos-x64@0.18.19: - resolution: {integrity: sha512-m0/UOq1wj25JpWqOJxoWBRM9VWc3c32xiNzd+ERlYstUZ6uwx5SZsQUtkiFHaYmcaoj+f6+Tfcl7atuAz3idwQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - - /@esbuild/win32-arm64@0.18.19: - resolution: {integrity: sha512-L4vb6pcoB1cEcXUHU6EPnUhUc4+/tcz4OqlXTWPcSQWxegfmcOprhmIleKKwmMNQVc4wrx/+jB7tGkjjDmiupg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@esbuild/win32-ia32@0.18.19: - resolution: {integrity: sha512-rQng7LXSKdrDlNDb7/v0fujob6X0GAazoK/IPd9C3oShr642ri8uIBkgM37/l8B3Rd5sBQcqUXoDdEy75XC/jg==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@esbuild/win32-x64@0.18.19: - resolution: {integrity: sha512-z69jhyG20Gq4QL5JKPLqUT+eREuqnDAFItLbza4JCmpvUnIlY73YNjd5djlO7kBiiZnvTnJuAbOjIoZIOa1GjA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@jridgewell/gen-mapping@0.3.3: - resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==} - engines: {node: '>=6.0.0'} - dependencies: - '@jridgewell/set-array': 1.1.2 - '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.18 - dev: true - - /@jridgewell/resolve-uri@3.1.0: - resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} - engines: {node: '>=6.0.0'} - dev: true - - /@jridgewell/set-array@1.1.2: - resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} - engines: {node: '>=6.0.0'} - dev: true - - /@jridgewell/sourcemap-codec@1.4.14: - resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==} - dev: true - - /@jridgewell/sourcemap-codec@1.4.15: - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - dev: true - - /@jridgewell/trace-mapping@0.3.18: - resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==} - dependencies: - '@jridgewell/resolve-uri': 3.1.0 - '@jridgewell/sourcemap-codec': 1.4.14 - dev: true - - /@nodelib/fs.scandir@2.1.5: - resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} - engines: {node: '>= 8'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - run-parallel: 1.2.0 - dev: true - - /@nodelib/fs.stat@2.0.5: - resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==} - engines: {node: '>= 8'} - dev: true - - /@nodelib/fs.walk@1.2.8: - resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} - engines: {node: '>= 8'} - dependencies: - '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 - dev: true - - /ansi-regex@5.0.1: - resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} - engines: {node: '>=8'} - dev: false - - /ansi-styles@4.3.0: - resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} - engines: {node: '>=8'} - dependencies: - color-convert: 2.0.1 - dev: false - - /any-promise@1.3.0: - resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - dev: true - - /anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - dev: true - - /array-union@2.1.0: - resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} - engines: {node: '>=8'} - dev: true - - /balanced-match@1.0.2: - resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - dev: true - - /binary-extensions@2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - dev: true - - /brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - dev: true - - /braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} - engines: {node: '>=8'} - dependencies: - fill-range: 7.0.1 - dev: true - - /bundle-require@4.0.1(esbuild@0.18.19): - resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - peerDependencies: - esbuild: '>=0.17' - dependencies: - esbuild: 0.18.19 - load-tsconfig: 0.2.5 - dev: true - - /cac@6.7.14: - resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} - engines: {node: '>=8'} - dev: true - - /chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - dev: false - - /chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.2 - dev: true - - /cmd-ts@0.13.0: - resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} - dependencies: - chalk: 4.1.2 - debug: 4.3.4 - didyoumean: 1.2.2 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - dev: false - - /color-convert@2.0.1: - resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} - engines: {node: '>=7.0.0'} - dependencies: - color-name: 1.1.4 - dev: false - - /color-name@1.1.4: - resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - dev: false - - /commander@4.1.1: - resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} - engines: {node: '>= 6'} - dev: true - - /concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - dev: true - - /cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} - engines: {node: '>= 8'} - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 - dev: true - - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - - /didyoumean@1.2.2: - resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - dev: false - - /dir-glob@3.0.1: - resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} - engines: {node: '>=8'} - dependencies: - path-type: 4.0.0 - dev: true - - /esbuild@0.18.19: - resolution: {integrity: sha512-ra3CaIKCzJp5bU5BDfrCc0FRqKj71fQi+gbld0aj6lN0ifuX2fWJYPgLVLGwPfA+ruKna+OWwOvf/yHj6n+i0g==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.18.19 - '@esbuild/android-arm64': 0.18.19 - '@esbuild/android-x64': 0.18.19 - '@esbuild/darwin-arm64': 0.18.19 - '@esbuild/darwin-x64': 0.18.19 - '@esbuild/freebsd-arm64': 0.18.19 - '@esbuild/freebsd-x64': 0.18.19 - '@esbuild/linux-arm': 0.18.19 - '@esbuild/linux-arm64': 0.18.19 - '@esbuild/linux-ia32': 0.18.19 - '@esbuild/linux-loong64': 0.18.19 - '@esbuild/linux-mips64el': 0.18.19 - '@esbuild/linux-ppc64': 0.18.19 - '@esbuild/linux-riscv64': 0.18.19 - '@esbuild/linux-s390x': 0.18.19 - '@esbuild/linux-x64': 0.18.19 - '@esbuild/netbsd-x64': 0.18.19 - '@esbuild/openbsd-x64': 0.18.19 - '@esbuild/sunos-x64': 0.18.19 - '@esbuild/win32-arm64': 0.18.19 - '@esbuild/win32-ia32': 0.18.19 - '@esbuild/win32-x64': 0.18.19 - dev: true - - /execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - dev: true - - /fast-glob@3.3.1: - resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} - engines: {node: '>=8.6.0'} - dependencies: - '@nodelib/fs.stat': 2.0.5 - '@nodelib/fs.walk': 1.2.8 - glob-parent: 5.1.2 - merge2: 1.4.1 - micromatch: 4.0.5 - dev: true - - /fastq@1.15.0: - resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} - dependencies: - reusify: 1.0.4 - dev: true - - /fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} - dependencies: - to-regex-range: 5.0.1 - dev: true - - /fs.realpath@1.0.0: - resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} - dev: true - - /fsevents@2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /get-stream@6.0.1: - resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} - engines: {node: '>=10'} - dev: true - - /glob-parent@5.1.2: - resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} - engines: {node: '>= 6'} - dependencies: - is-glob: 4.0.3 - dev: true - - /glob@7.1.6: - resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 3.1.2 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true - - /globby@11.1.0: - resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} - engines: {node: '>=10'} - dependencies: - array-union: 2.1.0 - dir-glob: 3.0.1 - fast-glob: 3.3.1 - ignore: 5.2.4 - merge2: 1.4.1 - slash: 3.0.0 - dev: true - - /has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - dev: false - - /human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - dev: true - - /ignore@5.2.4: - resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} - engines: {node: '>= 4'} - dev: true - - /inflight@1.0.6: - resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==} - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - dev: true - - /inherits@2.0.4: - resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} - dev: true - - /is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - dependencies: - binary-extensions: 2.2.0 - dev: true - - /is-extglob@2.1.1: - resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} - engines: {node: '>=0.10.0'} - dev: true - - /is-glob@4.0.3: - resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} - engines: {node: '>=0.10.0'} - dependencies: - is-extglob: 2.1.1 - dev: true - - /is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - dev: true - - /is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - dev: true - - /isexe@2.0.0: - resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - dev: true - - /joycon@3.1.1: - resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} - engines: {node: '>=10'} - dev: true - - /lilconfig@2.1.0: - resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==} - engines: {node: '>=10'} - dev: true - - /lines-and-columns@1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - dev: true - - /load-tsconfig@0.2.5: - resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: true - - /lodash.sortby@4.7.0: - resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} - dev: true - - /merge-stream@2.0.0: - resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - dev: true - - /merge2@1.4.1: - resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} - engines: {node: '>= 8'} - dev: true - - /micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} - engines: {node: '>=8.6'} - dependencies: - braces: 3.0.2 - picomatch: 2.3.1 - dev: true - - /mimic-fn@2.1.0: - resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} - engines: {node: '>=6'} - dev: true - - /minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - dependencies: - brace-expansion: 1.1.11 - dev: true - - /ms@2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - - /mz@2.7.0: - resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - dependencies: - any-promise: 1.3.0 - object-assign: 4.1.1 - thenify-all: 1.6.0 - dev: true - - /normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - dev: true - - /npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - dependencies: - path-key: 3.1.1 - dev: true - - /object-assign@4.1.1: - resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} - engines: {node: '>=0.10.0'} - dev: true - - /once@1.4.0: - resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - dependencies: - wrappy: 1.0.2 - dev: true - - /onetime@5.1.2: - resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} - engines: {node: '>=6'} - dependencies: - mimic-fn: 2.1.0 - dev: true - - /path-is-absolute@1.0.1: - resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} - engines: {node: '>=0.10.0'} - dev: true - - /path-key@3.1.1: - resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} - engines: {node: '>=8'} - dev: true - - /path-type@4.0.0: - resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} - engines: {node: '>=8'} - dev: true - - /picomatch@2.3.1: - resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} - engines: {node: '>=8.6'} - dev: true - - /pirates@4.0.6: - resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} - engines: {node: '>= 6'} - dev: true - - /postcss-load-config@4.0.1: - resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} - engines: {node: '>= 14'} - peerDependencies: - postcss: '>=8.0.9' - ts-node: '>=9.0.0' - peerDependenciesMeta: - postcss: - optional: true - ts-node: - optional: true - dependencies: - lilconfig: 2.1.0 - yaml: 2.3.1 - dev: true - - /punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} - engines: {node: '>=6'} - dev: true - - /queue-microtask@1.2.3: - resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} - dev: true - - /readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - dependencies: - picomatch: 2.3.1 - dev: true - - /resolve-from@5.0.0: - resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} - engines: {node: '>=8'} - dev: true - - /reusify@1.0.4: - resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} - engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - dev: true - - /rollup@3.27.2: - resolution: {integrity: sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==} - engines: {node: '>=14.18.0', npm: '>=8.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: true - - /run-parallel@1.2.0: - resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} - dependencies: - queue-microtask: 1.2.3 - dev: true - - /shebang-command@2.0.0: - resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} - engines: {node: '>=8'} - dependencies: - shebang-regex: 3.0.0 - dev: true - - /shebang-regex@3.0.0: - resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} - engines: {node: '>=8'} - dev: true - - /signal-exit@3.0.7: - resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - dev: true - - /slash@3.0.0: - resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} - engines: {node: '>=8'} - dev: true - - /source-map@0.8.0-beta.0: - resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} - engines: {node: '>= 8'} - dependencies: - whatwg-url: 7.1.0 - dev: true - - /strip-ansi@6.0.1: - resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==} - engines: {node: '>=8'} - dependencies: - ansi-regex: 5.0.1 - dev: false - - /strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - dev: true - - /sucrase@3.34.0: - resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==} - engines: {node: '>=8'} - hasBin: true - dependencies: - '@jridgewell/gen-mapping': 0.3.3 - commander: 4.1.1 - glob: 7.1.6 - lines-and-columns: 1.2.4 - mz: 2.7.0 - pirates: 4.0.6 - ts-interface-checker: 0.1.13 - dev: true - - /supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - dependencies: - has-flag: 4.0.0 - dev: false - - /thenify-all@1.6.0: - resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==} - engines: {node: '>=0.8'} - dependencies: - thenify: 3.3.1 - dev: true - - /thenify@3.3.1: - resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - dependencies: - any-promise: 1.3.0 - dev: true - - /to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - dependencies: - is-number: 7.0.0 - dev: true - - /tr46@1.0.1: - resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} - dependencies: - punycode: 2.3.0 - dev: true - - /tree-kill@1.2.2: - resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} - hasBin: true - dev: true - - /ts-interface-checker@0.1.13: - resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - dev: true - - /tsup@7.2.0: - resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} - engines: {node: '>=16.14'} - hasBin: true - peerDependencies: - '@swc/core': ^1 - postcss: ^8.4.12 - typescript: '>=4.1.0' - peerDependenciesMeta: - '@swc/core': - optional: true - postcss: - optional: true - typescript: - optional: true - dependencies: - bundle-require: 4.0.1(esbuild@0.18.19) - cac: 6.7.14 - chokidar: 3.5.3 - debug: 4.3.4 - esbuild: 0.18.19 - execa: 5.1.1 - globby: 11.1.0 - joycon: 3.1.1 - postcss-load-config: 4.0.1 - resolve-from: 5.0.0 - rollup: 3.27.2 - source-map: 0.8.0-beta.0 - sucrase: 3.34.0 - tree-kill: 1.2.2 - transitivePeerDependencies: - - supports-color - - ts-node - dev: true - - /webidl-conversions@4.0.2: - resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} - dev: true - - /whatwg-url@7.1.0: - resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} - dependencies: - lodash.sortby: 4.7.0 - tr46: 1.0.1 - webidl-conversions: 4.0.2 - dev: true - - /which@2.0.2: - resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} - engines: {node: '>= 8'} - hasBin: true - dependencies: - isexe: 2.0.0 - dev: true - - /wrappy@1.0.2: - resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} - dev: true - - /yaml@2.3.1: - resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==} - engines: {node: '>= 14'} - dev: true diff --git a/examples/plugin_template/src/index.ts b/examples/plugin_template/src/index.ts deleted file mode 100644 index dd44b62..0000000 --- a/examples/plugin_template/src/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { command } from "cmd-ts"; - -export default command({ - name: "custom", - description: "A completely custom command dynamically imported at runtime!", - args: {}, - handler() { - console.log("CUSTOM COMMAND WORKS!!"); - }, -}); diff --git a/examples/plugin_template/tsconfig.json b/examples/plugin_template/tsconfig.json deleted file mode 100644 index 71dfb43..0000000 --- a/examples/plugin_template/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "compilerOptions": { - "jsx": "preserve", - "noEmit": true, - "module": "ESNext", - "target": "ESNext", - "moduleResolution": "node", - "strict": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "skipLibCheck": true, - "resolveJsonModule": true - } -} diff --git a/examples/plugin_template/tsup.config.ts b/examples/plugin_template/tsup.config.ts deleted file mode 100644 index d80d441..0000000 --- a/examples/plugin_template/tsup.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { defineConfig } from "tsup"; - -export default defineConfig({ - entry: ["src/index.ts"], - target: "esnext", - format: "esm", - splitting: false, - sourcemap: true, - clean: true, -}); From 6477e9909a46f56e02994dd99d2d66482cf71c45 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 00:48:46 +0000 Subject: [PATCH 140/290] remove unnecessary utils remove unused `ui` package --- packages/ui/.gitignore | 1 - packages/ui/package.json | 43 --- .../ui/src/components/autocomplete/index.ts | 304 --------------- .../ui/src/components/autocomplete/utils.ts | 95 ----- packages/ui/src/components/form/index.ts | 26 -- .../ui/src/components/spinnerify/index.ts | 19 - packages/ui/src/index.ts | 4 - packages/ui/tsconfig.json | 20 - packages/ui/tsup.config.ts | 11 - packages/utils/src/cmd-ts/index.ts | 1 - packages/utils/src/cmd-ts/oneOf.ts | 16 - packages/utils/src/config/index.ts | 43 --- packages/utils/src/index.ts | 3 - packages/utils/src/primitives/index.ts | 62 --- packages/utils/src/translations/index.ts | 1 - .../utils/src/translations/translations.ts | 354 ------------------ packages/utils/src/translations/types.ts | 6 - packages/utils/src/util-types/index.ts | 6 - 18 files changed, 1015 deletions(-) delete mode 100644 packages/ui/.gitignore delete mode 100644 packages/ui/package.json delete mode 100644 packages/ui/src/components/autocomplete/index.ts delete mode 100644 packages/ui/src/components/autocomplete/utils.ts delete mode 100644 packages/ui/src/components/form/index.ts delete mode 100644 packages/ui/src/components/spinnerify/index.ts delete mode 100644 packages/ui/src/index.ts delete mode 100644 packages/ui/tsconfig.json delete mode 100644 packages/ui/tsup.config.ts delete mode 100644 packages/utils/src/cmd-ts/index.ts delete mode 100644 packages/utils/src/cmd-ts/oneOf.ts delete mode 100644 packages/utils/src/config/index.ts delete mode 100644 packages/utils/src/primitives/index.ts delete mode 100644 packages/utils/src/translations/index.ts delete mode 100644 packages/utils/src/translations/translations.ts delete mode 100644 packages/utils/src/translations/types.ts delete mode 100644 packages/utils/src/util-types/index.ts diff --git a/packages/ui/.gitignore b/packages/ui/.gitignore deleted file mode 100644 index fbf0622..0000000 --- a/packages/ui/.gitignore +++ /dev/null @@ -1 +0,0 @@ -types \ No newline at end of file diff --git a/packages/ui/package.json b/packages/ui/package.json deleted file mode 100644 index 68d933d..0000000 --- a/packages/ui/package.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "@solid-cli/ui", - "version": "0.0.13", - "license": "MIT", - "homepage": "https://solid-cli.netlify.app", - "repository": { - "type": "git", - "url": "https://github.com/solidjs-community/solid-cli" - }, - "files": [ - "dist", - "types" - ], - "description": "A collection of UI utilities for the Solid CLI", - "main": "./dist/index.mjs", - "module": "./dist/index.mjs", - "types": "./types/index.d.ts", - "exports": { - ".": { - "import": "./dist/index.mjs", - "require": "./dist/index.mjs", - "types": "./types/index.d.ts" - } - }, - "scripts": { - "test": "vitest run", - "build": "tsc && tsup" - }, - "devDependencies": { - "tsup": "^8.3.5", - "typescript": "^5.6.3", - "@types/node": "22.9.0" - }, - "publishConfig": { - "access": "public" - }, - "dependencies": { - "@clack/core": "0.3.4", - "@clack/prompts": "0.7.0", - "picocolors": "^1.1.1", - "@solid-cli/utils": "workspace:*" - } -} diff --git a/packages/ui/src/components/autocomplete/index.ts b/packages/ui/src/components/autocomplete/index.ts deleted file mode 100644 index 739ab93..0000000 --- a/packages/ui/src/components/autocomplete/index.ts +++ /dev/null @@ -1,304 +0,0 @@ -import { Key } from "node:readline"; -import { Prompt } from "@clack/core"; -import { TextOptions } from "@clack/prompts"; -import { S_CHECKBOX_ACTIVE, S_CHECKBOX_SELECTED, S_CHECKBOX_INACTIVE, S_BAR, S_BAR_END, box, S_INFO } from "./utils"; -import color from "picocolors"; -import { createEffect } from "@solid-cli/reactivity"; -import { t } from "@solid-cli/utils"; -import { Option } from "@solid-cli/utils/util-types"; - -const buildRegex = (str: string) => { - let s = ""; - - for (let i = 0; i < str.length; i++) { - s += str[i] + ".*"; - } - - s = ".*" + s; - - return RegExp(s); -}; - -const search = (values: T[], lookFor: string) => { - const group = lookFor.match(/(\w+)\/(\w+)?/); - - if (group) { - const groupData = values.filter((option) => option.group && option.group.includes(group[1])); - - const sp = group[2]; - - if (!sp) return groupData; - - const r = buildRegex(sp); - return groupData.filter((v) => r.test((v.label ?? v.value).toLowerCase())); - } - - const r = buildRegex(lookFor); - - return !lookFor.length ? values : values.filter((v) => r.test((v.label ?? v.value).toLowerCase())); -}; - -const sortByGroup = (options: T[]) => { - return [...options].sort((a, b) => { - if (a.group && b.group) return 0; - - if (a.group && !b.group) return 1; - - return -1; - }); -}; - -const opt = ( - option: any, - state: "inactive" | "active" | "selected" | "active-selected" | "submitted" | "cancelled", -) => { - const label = option.label ?? String(option.value); - if (state === "active") { - return `${color.cyan(S_CHECKBOX_ACTIVE)} ${label} ${option.hint ? color.dim(`(${option.hint})`) : ""}`; - } else if (state === "selected") { - return `${color.green(S_CHECKBOX_SELECTED)} ${color.dim(label)}`; - } else if (state === "cancelled") { - return `${color.strikethrough(color.dim(label))}`; - } else if (state === "active-selected") { - return `${color.green(S_CHECKBOX_SELECTED)} ${label} ${option.hint ? color.dim(`(${option.hint})`) : ""}`; - } else if (state === "submitted") { - return `${color.dim(label)}`; - } - return `${color.dim(S_CHECKBOX_INACTIVE)} ${color.dim(label)}`; -}; - -const aliases = new Map([ - ["k", "up"], - ["j", "down"], - ["h", "left"], - ["l", "right"], -]); - -interface AutocompleteTextOptions extends TextOptions { - options: () => T[]; - render: (this: Omit, "prompt">) => string | void; -} - -class AutocompleteText extends Prompt { - valueWithCursor = ""; - options: T[]; - - get __cursor() { - return this._cursor; - } - cursor: number = 0; - - filteredOptions: T[]; - selected: T[]; - - mode: "search" | "explore" = "explore"; - - private toggleValue() { - const cursorOption = this.filteredOptions[this.cursor]; - const selected = this.selected.find((v) => v.value === cursorOption.value) !== undefined; - - this.selected = selected - ? this.selected.filter((v) => v.value !== cursorOption.value) - : [...this.selected, cursorOption]; - } - - constructor(opts: AutocompleteTextOptions) { - super(opts); - - // // @ts-ignore - // this.rl?.clearLine(); - this.options = opts.options(); - this.filteredOptions = opts.options(); - this.selected = []; - - if (this.mode === "explore") this.value = this.options; - - createEffect(() => { - this.options = opts.options(); - this.filteredOptions = sortByGroup(search(opts.options(), "")); - this.value = this.options; - // @ts-ignore - this.render(); - }); - - this.customKeyPress = this.customKeyPress.bind(this); - - this.on("finalize", () => { - if (!this.value) { - this.value = opts.defaultValue; - } - this.valueWithCursor = this.value; - this.value = this.selected; - }); - - this.on("value", () => { - if (this.value[this.value.length - 1] === "/" && this.mode === "explore") { - // @ts-ignore - this.rl.clearLine(); - this.value = ""; - this.mode = "search"; - return; - } - if (this.mode === "explore") return; - const value = this.value as string; - if (this._cursor >= value.length) { - this.valueWithCursor = `${value}${color.inverse(color.hidden("_"))}`; - } else { - const s1 = value.slice(0, this._cursor); - const s2 = value.slice(this._cursor); - this.valueWithCursor = `${s1}${color.inverse(s2)}${s2.slice(1)}`; - } - - const indexSelector = value.match(/:(\d+)/); - // if (!indexSelector) this.cursor = 0; - - const last = value[value.length - 1]; - if (last === ":") { - const tillSelector = value.slice(0, value.length - 1); - - if (tillSelector.length > 0) { - this.filteredOptions = sortByGroup(search(this.options, tillSelector)); - } else { - this.filteredOptions = sortByGroup(this.options); - } - - return; - } - - if (indexSelector && indexSelector[1]) { - const index = Number(indexSelector[1]); - - if (this.filteredOptions.length > 1 && index > this.filteredOptions.length - 1) { - this.state = "error"; - return; - } - this.cursor = index; - return; - } - - const before = this.filteredOptions.length; - this.filteredOptions = sortByGroup(search(this.options, value.toLowerCase())); - const after = this.filteredOptions.length; - - if (before !== after) { - this.cursor = 0; - } - }); - this.on("cursor", (key) => { - if (this.mode === "explore" && key === "/") return; - switch (key) { - case "left": - case "up": - this.cursor = this.cursor === 0 ? this.filteredOptions.length - 1 : this.cursor - 1; - break; - case "down": - case "right": - this.cursor = this.cursor === this.filteredOptions.length - 1 ? 0 : this.cursor + 1; - break; - case "tab": - this.toggleValue(); - break; - } - }); - this.input.on("keypress", this.customKeyPress); - } - - private customKeyPress(char: string, key?: Key) { - if (this.mode === "explore" && key?.name && aliases.has(key.name)) { - this.emit("cursor", aliases.get(key.name)); - } - if (key?.name === "tab") { - const focusedOption = this.filteredOptions[this.cursor]; - const selected = this.selected.find((v) => v?.value === focusedOption?.value) !== undefined; - if (selected) { - this.selected = this.selected.filter((v) => v !== focusedOption); - } else { - this.selected = this.filteredOptions?.length === 0 ? this.selected : [...this.selected, focusedOption]; - } - // @ts-ignore - this.rl.clearLine(); - } else if (key?.name === "escape") { - if (this.mode === "search") { - this.mode = "explore"; - return; - } - } - } -} - -const BULLET = "•"; - -const instructions = color.gray( - `↓/j down ${BULLET} ↑/k up ${BULLET} tab select ${BULLET} Ctrl-C cancel ${BULLET} / filter`, -); - -const searchInstructions = color.gray( - `tab select ${BULLET} ESC cancel filter ${BULLET} : to highlight by index`, -); - -export const autocomplete = (opts: Omit, "render">) => { - return new AutocompleteText({ - options: opts.options, - message: opts.message, - validate: opts.validate, - placeholder: opts.placeholder, - defaultValue: opts.defaultValue, - initialValue: opts.initialValue, - render() { - const selected = - this.selected.length === 0 - ? color.gray(t.NOTHING_SELECTED) - : this.selected.map((option, i) => `${color.yellow(option.label)}`).join(" "); - const placeholder = opts.placeholder - ? color.inverse(opts.placeholder[0]) + color.dim(opts.placeholder.slice(1)) - : color.inverse(color.hidden("_")); - - const value = typeof this.value === "string" ? (!this.value ? placeholder : this.valueWithCursor) : ""; - - const textView = `${color.cyan("?")} Filter: ` + value + "\n"; - - const noResults = color.red(t.AUTOCOMPLETE_NO_RESULTS); - - let uniqueGroups = new Set(); - let start = Math.max(0, this.cursor - 11); - const filteredOptions = this.filteredOptions - .map((option, i) => { - if (i < start || i > start + 11) return; - - const selected = this.selected.find((v) => v.value === option.value) !== undefined; - const has = option.group && uniqueGroups.has(option.group); - if (!has && option.group) { - uniqueGroups.add(option.group); - } - - const isFocused = this.cursor === i; - - const active = (i === 0 && this.mode === "search") || (this.mode === "explore" && isFocused); - const state = selected ? "selected" : active ? "active" : "inactive"; - - const spacing = i > 9 ? " " : " "; - - const groupView = `${ - has || !option.group ? "" : `\n${color.cyan(S_BAR)}${color.bgBlue(color.black(option.group))}` - } ${!has && option.group ? `\n${color.cyan(S_BAR)} ` : ""}`; - - return groupView + `${i}:${spacing}` + (isFocused ? color.bgBlack(opt(option, state)) : opt(option, state)); - }) - .filter(Boolean) - .join(`\n${color.cyan(S_BAR)} `); - - // prettier-ignore - const options = `${color.cyan(S_BAR)} ${this.filteredOptions.length ? filteredOptions : noResults}\n${color.cyan(S_BAR_END,)}\n`; - - return ( - `${color.cyan(S_BAR)} \n ${color.cyan(S_BAR)} ${color.yellow(S_CHECKBOX_SELECTED)} ${ - t.AUTOCOMPLETE_SELECTED - }: ${selected}\n${color.cyan(S_BAR)} \n` + - (this.mode === "search" ? `${color.cyan(S_BAR)} ` + textView : "") + - options + - "\n" + - (this.mode === "search" ? searchInstructions : instructions) - ); - }, - }).prompt() as Promise; -}; diff --git a/packages/ui/src/components/autocomplete/utils.ts b/packages/ui/src/components/autocomplete/utils.ts deleted file mode 100644 index 78c579f..0000000 --- a/packages/ui/src/components/autocomplete/utils.ts +++ /dev/null @@ -1,95 +0,0 @@ -import { log } from "@clack/prompts"; -import color from "picocolors"; -// Taken from https://github.com/natemoo-re/clack/blob/main/packages/prompts/src/index.ts#L642 -const S_STEP_ACTIVE = "◆"; -const S_STEP_CANCEL = "■"; -const S_STEP_ERROR = "▲"; -const S_STEP_SUBMIT = "◇"; - -const S_BAR_START = "┌"; -const S_BAR = "│"; -const S_BAR_END = "└"; - -const S_RADIO_ACTIVE = "●"; -const S_RADIO_INACTIVE = "○"; -const S_CHECKBOX_ACTIVE = "◻"; -const S_CHECKBOX_SELECTED = "◼"; -const S_CHECKBOX_INACTIVE = "◻"; -const S_PASSWORD_MASK = "▪"; - -const S_BAR_H = "─"; -const S_CORNER_TOP_RIGHT = "╮"; -const S_CONNECT_LEFT = "├"; -const S_CORNER_BOTTOM_RIGHT = "╯"; - -const S_INFO = "●"; -const S_SUCCESS = "◆"; -const S_WARN = "▲"; -const S_ERROR = "■"; - -// Adapted from https://github.com/chalk/ansi-regex -// @see LICENSE -function ansiRegex() { - const pattern = [ - "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", - "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))", - ].join("|"); - - return new RegExp(pattern, "g"); -} - -const strip = (str: string) => str.replace(ansiRegex(), ""); -const box = (message = "", title = "") => { - const lines = `\n${message}\n`.split("\n"); - const len = - Math.max( - lines.reduce((sum, ln) => { - ln = strip(ln); - return ln.length > sum ? ln.length : sum; - }, 0), - strip(title).length, - ) + 2; - const msg = lines - .map((ln) => `${color.gray(S_BAR)} ${color.dim(ln)}${" ".repeat(len - strip(ln).length)}${color.gray(S_BAR)}`) - .join("\n"); - return `${color.gray(S_BAR)}\n${color.green(S_STEP_SUBMIT)} ${color.reset(title)} ${color.gray( - S_BAR_H.repeat(Math.max(len - title.length - 1, 1)) + S_CORNER_TOP_RIGHT, - )}\n${msg}\n${color.gray(S_CONNECT_LEFT + S_BAR_H.repeat(len + 2) + S_CORNER_BOTTOM_RIGHT)}\n`; -}; - -export { - S_CONNECT_LEFT, - S_CORNER_BOTTOM_RIGHT, - S_CORNER_TOP_RIGHT, - S_BAR, - S_BAR_START, - S_BAR_END, - S_BAR_H, - S_INFO, - S_ERROR, - S_WARN, - S_SUCCESS, - S_RADIO_ACTIVE, - S_RADIO_INACTIVE, - S_PASSWORD_MASK, - S_CHECKBOX_ACTIVE, - S_CHECKBOX_INACTIVE, - S_CHECKBOX_SELECTED, - S_STEP_ACTIVE, - S_STEP_ERROR, - S_STEP_CANCEL, - S_STEP_SUBMIT, -}; - -const cancelable = async (prompt: Promise, cancelMessage: string = "Canceled"): Promise => { - const value = await prompt; - - if (typeof value === "symbol") { - log.warn(cancelMessage); - process.exit(0); - } - - return value; -}; - -export { strip, box, cancelable }; diff --git a/packages/ui/src/components/form/index.ts b/packages/ui/src/components/form/index.ts deleted file mode 100644 index fc11479..0000000 --- a/packages/ui/src/components/form/index.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { TextOptions, text } from "@clack/prompts"; - -interface Field extends TextOptions { - name: string; - render?: (this: Field) => Promise; -} - -export const form = async (fields: Field[]) => { - let returns: { name: string; value: any }[] = []; - - for (const field of fields) { - if (field.render) { - const r = await field.render.bind(field)(); - if (r) { - returns.push({ name: field.name, value: r }); - } - continue; - } - - const r = await text({ ...field }); - - returns.push({ name: field.name, value: r }); - } - - return returns; -}; diff --git a/packages/ui/src/components/spinnerify/index.ts b/packages/ui/src/components/spinnerify/index.ts deleted file mode 100644 index 7205636..0000000 --- a/packages/ui/src/components/spinnerify/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { spinner } from "@clack/prompts"; -type SpinnerItem = { - startText: string; - finishText: string; - fn: () => Promise; -}; -export async function spinnerify(spinners: SpinnerItem): Promise; -export async function spinnerify(spinners: SpinnerItem[]): Promise; -export async function spinnerify(spinners: SpinnerItem[] | SpinnerItem) { - if (!Array.isArray(spinners)) spinners = [spinners]; - let results: any[] = []; - const s = spinner(); - for (const { startText, finishText, fn } of spinners) { - s.start(startText); - results.push(await fn()); - s.stop(finishText); - } - return results.length === 1 ? results[0] : results; -} diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts deleted file mode 100644 index 083c425..0000000 --- a/packages/ui/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from "./components/autocomplete"; -export * from "./components/form"; -export * from "./components/autocomplete/utils"; -export * from "./components/spinnerify"; diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json deleted file mode 100644 index ecaf1e3..0000000 --- a/packages/ui/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "useDefineForClassFields": true, - "module": "ESNext", - "skipLibCheck": true, - "declaration": true, - "emitDeclarationOnly": true, - "moduleResolution": "Bundler", - "resolveJsonModule": true, - "isolatedModules": true, - "allowSyntheticDefaultImports": true, - "strict": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - "noFallthroughCasesInSwitch": true, - "outDir": "types" - }, - "include": ["src/*"] -} diff --git a/packages/ui/tsup.config.ts b/packages/ui/tsup.config.ts deleted file mode 100644 index aaf7a65..0000000 --- a/packages/ui/tsup.config.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { defineConfig } from "tsup"; - -export default defineConfig({ - entry: ["src/index.ts"], - target: "esnext", - format: ["esm", "cjs"], - splitting: false, - sourcemap: true, - minify: true, - clean: true, -}); diff --git a/packages/utils/src/cmd-ts/index.ts b/packages/utils/src/cmd-ts/index.ts deleted file mode 100644 index 1896305..0000000 --- a/packages/utils/src/cmd-ts/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./oneOf"; diff --git a/packages/utils/src/cmd-ts/oneOf.ts b/packages/utils/src/cmd-ts/oneOf.ts deleted file mode 100644 index 79fabcb..0000000 --- a/packages/utils/src/cmd-ts/oneOf.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Type } from "cmd-ts"; -import { inspect } from "util"; - -export function oneOf(literals: readonly T[], case_sensitive: boolean = false): Type { - const examples = literals.map((x) => inspect(x)).join(", "); - return { - async from(str) { - const value = literals.find((x) => (case_sensitive ? x === str : x.toLowerCase() === str.toLowerCase())); - if (!value) { - throw new Error(`Invalid value '${str}'. Expected one of: ${examples}`); - } - return value; - }, - description: `One of ${examples}`, - }; -} diff --git a/packages/utils/src/config/index.ts b/packages/utils/src/config/index.ts deleted file mode 100644 index 9f095d2..0000000 --- a/packages/utils/src/config/index.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { readFile, writeFile } from "fs/promises"; -import { homedir } from "../paths"; -import { join } from "path"; -import { parse, stringify } from "smol-toml"; -import { createSignal } from "@solid-cli/reactivity"; - -export const PossibleFields = ["lang"] as const; - -const defaultConfig = { - lang: Intl.DateTimeFormat().resolvedOptions().locale.split("-")[0], -} as Record; - -type Field = (typeof PossibleFields)[number]; - -const configPath: string = join(homedir(), "/solid-cli.config.toml"); - -export const [config, setConfig] = createSignal(defaultConfig); - -export const readConfig = async () => { - try { - const file = await readFile(configPath, "utf-8"); - setConfig(parse(file)); - } catch { - await writeConfig(); - } -}; - -export const writeConfig = async () => { - await writeFile(configPath, stringify(config())); -}; - -export const setField = async (field: Field, value: any) => { - if (!(field in defaultConfig)) { - throw new Error(`Field ${field} does not exist`); - } - setConfig((prev) => ({ ...prev, [field]: value })); - await writeConfig(); -}; - -export const getField = (field: Field) => { - if (!config()[field] && defaultConfig[field]) setField(field, defaultConfig[field]); - return config()[field]; -}; diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 1310c11..b8f0dc1 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,5 +1,2 @@ -export * from "./translations"; -export * from "./config"; export * from "./start"; export * from "./open"; -export * from "./cmd-ts"; diff --git a/packages/utils/src/primitives/index.ts b/packages/utils/src/primitives/index.ts deleted file mode 100644 index 571269a..0000000 --- a/packages/utils/src/primitives/index.ts +++ /dev/null @@ -1,62 +0,0 @@ -import { tmpdir } from "../paths"; -import type { Option } from "../util-types"; -import { createSignal } from "@solid-cli/reactivity"; -import { readFile, writeFile } from "fs/promises"; -export const [primitives, setPrimitives] = createSignal([]); -const fetchPrimitives = async () => { - const result = await ( - await fetch("https://registry.npmjs.com/-/v1/search?text=scope:solid-primitives&size=250.json") - ).json(); - - const primitives: Option[] = result.objects.map((v: any) => { - const opt: Option = { - label: v.package.name.split("/")[1], - value: v.package.name, - group: "primitives", - }; - - return opt; - }); - - return primitives; -}; -type Cache = { - timeCached: string; - primitives: Option[]; -}; -const cache = async (primitives: Option[]) => { - const tmp = tmpdir(); - const t = new Date(); - const cache: Cache = { - timeCached: t.toUTCString(), - primitives, - }; - await writeFile(`${tmp}/primitives.json`, JSON.stringify(cache)); -}; -const daysSinceEpoch = (seconds: number) => { - return seconds / (60 * 60 * 24); -}; -const getCached = async () => { - const tmp = tmpdir(); - const cached = JSON.parse((await readFile(`${tmp}/primitives.json`)).toString()) as Cache; - const timeCached = new Date(Date.parse(cached.timeCached)); - const currentTime = new Date(); - if (daysSinceEpoch(currentTime.getTime() - timeCached.getTime()) > 1) { - throw new Error("Stale cache"); - } - return cached.primitives as Option[]; -}; -export const refetchPrimitives = async () => { - const p = await fetchPrimitives(); - setPrimitives(p); - await cache(p); -}; -export const loadPrimitives = async () => { - try { - const cached = await getCached(); - setPrimitives(cached); - } catch (e) { - // Cannot fetch from cache, must fetch - await refetchPrimitives(); - } -}; diff --git a/packages/utils/src/translations/index.ts b/packages/utils/src/translations/index.ts deleted file mode 100644 index 77ffa7b..0000000 --- a/packages/utils/src/translations/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./translations"; diff --git a/packages/utils/src/translations/translations.ts b/packages/utils/src/translations/translations.ts deleted file mode 100644 index 7ca1614..0000000 --- a/packages/utils/src/translations/translations.ts +++ /dev/null @@ -1,354 +0,0 @@ -import { createEffect, createMemo, createSignal } from "@solid-cli/reactivity"; -import { SL, SupportedLanguages, TemplateFunction, Translations } from "./types"; -import { on } from "@solid-cli/reactivity"; -import { log } from "@clack/prompts"; -import { config, setConfig } from "../config"; -export const [locale, setLocale] = createSignal(null); -export const validatedLocale = createMemo(() => { - const l = locale(); - if (!l) return "en"; - const supported = !!SupportedLanguages.find((lang) => lang.toLowerCase() === l.toLowerCase()); - if (!supported) { - log.warn(`Unsupported language: ${l}. Defaulting to English.`); - } - return supported ? l : "en"; -}); -createEffect( - on( - validatedLocale, - (l) => { - setConfig({ ...config(), lang: l }); - }, - { defer: true }, - ), -); -const TRANSLATIONS = { - AUTOCOMPLETE_SELECTED: { - en: "Selected Packages", - es: "Paquetes seleccionados", - fr: "Forfaits sélectionnés", - ja: "選択されたパッケージ", - }, - AUTOCOMPLETE_NO_RESULTS: { - en: "No results", - es: "No hay resultados", - fr: "Aucun résultat", - ja: "結果がありません", - }, - SELECT_START_ACTION: { - en: "Select a SolidStart specific action", - es: "Seleccione una acción específica de SolidStart", - fr: "Sélectionnez une action spécifique à SolidStart", - ja: "SolidStart 固有のアクションを選択します", - }, - SELECT_ACTION: { - en: "Select an action", - es: "Seleccione una acción", - fr: "Sélectionnez une action", - ja: "アクションを選択してください", - }, - ACTION_ADD: { - en: "Add an integration", - es: "Añadir una integración", - fr: "Ajouter une intégration", - ja: "統合を追加する", - }, - ACTION_NEW: { - en: "Create new project", - es: "Crear nuevo proyecto", - fr: "Créer un nouveau projet", - ja: "新しいプロジェクトを作成する", - }, - ACTION_START: { - en: "A start specific action", - es: "Una acción específica de inicio", - fr: "Une action spécifique de démarrage", - ja: "特定のアクションを開始する", - }, - NEW_VARIATION_DESC: { - en: "The variation to create, for example `bare`", - es: "La variación a crear, por ejemplo `bare`", - fr: "La variante à créer, par exemple `bare`", - ja: "作成するバリエーション、たとえば「bare」", - }, - NEW_NAME_DESC: { - en: "The name of the folder to create", - es: "El nombre de la carpeta a crear.", - fr: "Le nom du dossier à créer", - ja: "作成するフォルダーの名前", - }, - IS_START_PROJECT: { - en: "Is this a SolidStart project?", - es: "¿Es este un proyecto de SolidStart?", - fr: "Est-ce un projet SolidStart?", - ja: "これはソリッドスタートプロジェクトですか?", - }, - START_MODE: { - en: "Mode", - es: "Modo", - fr: "Mode", - ja: "モード", - }, - START_MODE_HINT: { - en: "Changes the mode of the solid app (SSR, CSR, SSG)", - es: "Cambia el modo de la aplicación sólida (SSR, CSR, SSG)", - fr: "Modifie le mode de l'application solide (SSR, CSR, SSG)", - ja: "ソリッドアプリのモードを変更します（SSR、CSR、SSG）", - }, - START_MODE_DESC: { - en: "The rendering mode for solid to build for, and use.", - es: "El modo de renderizado de solid para construir y usar.", - fr: "Le mode de rendu du solid pour lequel construire et utiliser.", - ja: "solid がビルドして使用するレンダリング モード。", - }, - START_ROUTE: { - en: "Route", - es: "Ruta", - fr: "Itinéraire", - ja: "ルート", - }, - START_ROUTE_HINT: { - en: "Allows you to create a new file system route", - es: "Le permite crear una nueva ruta de sistema de archivos", - fr: "Vous permet de créer une nouvelle route de système de fichiers", - ja: "新しいファイル システム ルートを作成できます。", - }, - START_ROUTE_DESC: { - en: "The name of `.tsx` file to be generated", - es: "El nombre del archivo `.tsx` que se generará", - fr: "Le nom du fichier `.tsx` à générer", - ja: "生成される `.tsx` ファイルの名前", - }, - START_DATA: { - en: "Data File", - es: "Archivo de datos", - fr: "Fichier de données", - ja: "データファイル", - }, - START_DATA_HINT: { - en: "Allows you to create a new data file within a route", - es: "Le permite crear un nuevo archivo de datos dentro de una ruta", - fr: "Permet de créer un nouveau fichier de données au sein d'un itinéraire", - ja: "ルート内に新しいデータ ファイルを作成できます。", - }, - START_DATA_DESC: { - en: "The name of the `.data.ts` file to be generated.", - es: "El nombre del archivo `.data.ts` que se generará.", - fr: "Le nom du fichier `.data.ts` à générer.", - ja: "生成される `.data.ts` ファイルの名前。", - }, - START_ADAPTER: { - en: "Adapter", - es: "Adaptador", - fr: "Adaptateur", - ja: "アダプタ", - }, - START_ADAPTER_HINT: { - en: "Allows for setting and updating the adapter used to build a start app", - es: "Permite configurar y actualizar el adaptador utilizado para crear una aplicación de inicio", - fr: "Permet de définir et de mettre à jour l'adaptateur utilisé pour créer une application de démarrage", - ja: "スタートアプリの構築に使用されるアダプターの設定と更新が可能", - }, - START_ADAPTER_DISPLAYNAME: { - en: "Adapter name", - es: "Nombre del adaptador", - fr: "Nom de l'adaptateur", - ja: "アダプター名", - }, - START_API: { - en: "API", - es: "API", - fr: "API", - ja: "API", - }, - START_API_HINT: { - en: "Create an API route", - es: "Crear una ruta API", - fr: "Créer une route d'API", - ja: "APIルートを作成する", - }, - START_API_DISPLAYNAME: { - en: "API file name", - es: "Nombre de archivo API", - fr: "Nom du fichier API", - ja: "APIファイル名", - }, - CANCELED: { - en: "Canceled", - es: "Cancelado", - fr: "Annulé", - ja: "キャンセル", - }, - CONFIRM_INSTALL: (n: number) => ({ - en: `Install the following (${n}) packages?`, - es: `Instale lo siguiente (${n}) paquetes?`, - fr: `Installez les éléments suivants (${n}) paquets?`, - ja: `以下をインストールします (${n}) パッケージ？`, - }), - NEW_START: { - en: "Which template would you like to use?", - es: "¿Qué plantilla te gustaría usar?", - fr: "Quel modèle souhaitez-vous utiliser ?", - ja: "どのテンプレートを使いたいですか?", - }, - ADD_DESC: { - en: "Can add and install integrations: `solid add unocss`.", - es: "Puede agregar e instalar integraciones: `solid add unocss`.", - fr: "Peut ajouter et installer des intégrations : `solid add unocss`.", - ja: "統合を追加およびインストールできます: `solid add unocss`。", - }, - NEW_DESC: { - en: "Creates a new solid project", - es: "Crea un nuevo proyecto sólido.", - fr: "Crée un nouveau projet solide", - ja: "新しいソリッドプロジェクトを作成します", - }, - ADD_PACKAGES: { - en: "Add packages", - es: "Agregar paquetes", - fr: "Ajouter des forfaits", - ja: "パッケージの追加", - }, - NOTHING_SELECTED: { - en: "Nothing selected", - es: "Nada seleccionado", - fr: "Rien de sélectionné", - ja: "何も選択されていません", - }, - YES: { - en: "Yes", - es: "Sí", - fr: "Oui", - ja: "はい", - }, - NO: { - en: "No", - es: "No", - fr: "Non", - ja: "いいえ", - }, - YES_FORCE: { - en: "Yes (force)", - es: "Sí (fuerza)", - fr: "Oui (forcer)", - ja: "はい（強制）", - }, - PROJECT_CREATED: { - en: "Project successfully created! 🎉", - es: "¡Proyecto creado con éxito! 🎉", - fr: "Projet créé avec succès! 🎉", - ja: "プロジェクトが正常に作成されました。 🎉", - }, - CREATING_PROJECT: { - en: "Creating project", - es: "Creando proyecto", - fr: "Création de projet", - ja: "プロジェクトの作成", - }, - TEMPLATE: { - en: "Template", - es: "Plantilla", - fr: "Modèle", - ja: "レンプレート", - }, - GET_STARTED: { - en: "To get started, run:", - es: "Para empezar, ejecuta:", - fr: "Pour commencer, exécutez :", - ja: "開始するには、次を実行します。", - }, - PROJECT_NAME: { - en: "Project Name", - es: "Nombre del proyecto", - fr: "nom du projet", - ja: "プロジェクト名", - }, - LOADING_PRIMITIVES: { - en: "Loading primitives", - es: "Cargando primitivas", - fr: "Chargement des primitives", - ja: "プリミティブのロード", - }, - PRIMITIVES_LOADED: { - en: "Primitives loaded", - es: "Primitivos cargados", - fr: "Primitives chargées", - ja: "プリミティブがロードされました", - }, - INSTALLING_VIA: (pm: string) => ({ - en: `Installing packages via ${pm}`, - es: `Instalación de paquetes a través de ${pm}`, - fr: `Installation de packages via ${pm}`, - ja: `経由でパッケージをインストールする ${pm}`, - }), - CONFIG_UPDATED: { - en: "Config updated", - es: "Configuración actualizada", - fr: "Configuration mise à jour", - ja: "構成が更新されました", - }, - PACKAGES_INSTALLED: { - en: "Packages installed", - es: "Paquetes instalados", - fr: "Paquets installés", - ja: "インストールされたパッケージ", - }, - POST_INSTALL: { - en: "Running post install steps", - es: "Ejecución de pasos posteriores a la instalación", - fr: "Exécution des étapes de post-installation", - ja: "インストール後の手順の実行", - }, - POST_INSTALL_COMPLETE: { - en: "Post install complete", - es: "Post instalación completa", - fr: "Post-installation terminée", - ja: "インストール後の完了", - }, - NO_SUPPORT: (n: string) => ({ - en: `Can't automatically configure ${n}: we don't support it.`, - es: `No se puede configurar automáticamente ${n}: no lo admitimos`, - fr: `Impossible de configurer automatiquement ${n}: nous ne le prenons pas en charge`, - ja: `${n} を自動的に構成できません: サポートされていません`, - }), - OPENING_IN_BROWSER: (s: string) => ({ - en: `Opening ${s} in browser`, - es: `Abriendo ${s} en el navegador`, - fr: `Ouverture de ${s} dans le navigateur`, - ja: `ブラウザで ${s} を開く`, - }), - OPENED_IN_BROWSER: { - en: "Successfully Opened in Browser", - es: "Abierto con éxito en el navegador", - fr: "Ouvert avec succès dans le navigateur", - ja: "ブラウザで正常に開きました", - }, -} as const satisfies Translations; - -export const t = new Proxy(TRANSLATIONS, { - get(target, p, _receiver) { - const l = validatedLocale() as SL; - let text = target[p as keyof typeof target]; - - if (typeof text === "function") { - return new Proxy(text, { - apply(target, thisArg, argArray) { - const newT = Reflect.apply(target, thisArg, argArray); - if (l in newT) { - return newT[l]; - } - return newT["en"]; - }, - }); - } - - if (l in text) { - return text[l as keyof typeof text]; - } - return text["en"]; - }, -}) as unknown as { - [k in keyof typeof TRANSLATIONS]: (typeof TRANSLATIONS)[k] extends TemplateFunction - ? (...args: Parameters<(typeof TRANSLATIONS)[k]>) => string - : string; -}; diff --git a/packages/utils/src/translations/types.ts b/packages/utils/src/translations/types.ts deleted file mode 100644 index 26eba3b..0000000 --- a/packages/utils/src/translations/types.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const SupportedLanguages = ["en", "fr", "es", "de", "ru", "zh", "ja", "ko"] as const; -export type SL = (typeof SupportedLanguages)[number]; - -export type LanguageTranslations = Partial>; -export type TemplateFunction = (...args: any[]) => LanguageTranslations; -export type Translations = Record; diff --git a/packages/utils/src/util-types/index.ts b/packages/utils/src/util-types/index.ts deleted file mode 100644 index 45e9400..0000000 --- a/packages/utils/src/util-types/index.ts +++ /dev/null @@ -1,6 +0,0 @@ -export type Option = { - value: any; - label?: string; - hint?: string; - group?: string; -}; From da5349bed50a7b3d014c843c169efaf7042691e6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 00:55:30 +0000 Subject: [PATCH 141/290] chore: update deps --- package.json | 10 +- packages/create-solid/package.json | 8 +- packages/utils/package.json | 16 +- pnpm-lock.yaml | 874 ++++++++++++----------------- 4 files changed, 373 insertions(+), 535 deletions(-) diff --git a/package.json b/package.json index 04c27b1..55a3ba3 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.9", - "nodemon": "^3.1.7", - "prettier": "^3.3.3", - "turbo": "^2.2.3", - "vitest": "^2.1.5" + "@changesets/cli": "2.27.11", + "nodemon": "^3.1.9", + "prettier": "^3.4.2", + "turbo": "^2.3.3", + "vitest": "^3.0.2" }, "packageManager": "pnpm@9.6.0" } diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index f31fb09..3d07c1d 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -30,14 +30,12 @@ }, "devDependencies": { "@clack/prompts": "0.9.1", - "@solid-cli/commands": "workspace:*", - "@solid-cli/ui": "workspace:*", - "@types/node": "^22.9.0", + "@types/node": "^22.10.7", "cmd-ts": "^0.13.0", - "jiti": "^2.4.0", + "jiti": "^2.4.2", "picocolors": "^1.1.1", "tsup": "^8.3.5", - "typescript": "^5.6.3", + "typescript": "^5.7.3", "@begit/core": "^0.1.1", "citty": "^0.1.6", "sucrase": "^3.35.0" diff --git a/packages/utils/package.json b/packages/utils/package.json index eefd3f6..6c0ceb5 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -63,22 +63,22 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.9.0", - "jiti": "^2.4.0", + "@types/node": "22.10.7", + "jiti": "^2.4.2", "magicast": "^0.3.5", "tsup": "^8.3.5", - "typescript": "^5.6.3", - "vitest": "^2.1.5" + "typescript": "^5.7.3", + "vitest": "^3.0.2" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.3.4", - "@clack/prompts": "0.7.0", + "@clack/core": "0.4.1", + "@clack/prompts": "0.9.1", "cmd-ts": "^0.13.0", - "execa": "^8.0.1", + "execa": "^9.5.2", "picocolors": "^1.1.1", - "smol-toml": "^1.3.0" + "smol-toml": "^1.3.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index faaaaf3..eec75b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,109 +9,20 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.27.9 - version: 2.27.9 + specifier: 2.27.11 + version: 2.27.11 nodemon: - specifier: ^3.1.7 - version: 3.1.7 + specifier: ^3.1.9 + version: 3.1.9 prettier: - specifier: ^3.3.3 - version: 3.3.3 + specifier: ^3.4.2 + version: 3.4.2 turbo: - specifier: ^2.2.3 - version: 2.2.3 + specifier: ^2.3.3 + version: 2.3.3 vitest: - specifier: ^2.1.5 - version: 2.1.5(@types/node@22.9.0) - - packages/commands: - dependencies: - '@begit/core': - specifier: ^0.0.19 - version: 0.0.19 - '@clack/prompts': - specifier: 0.7.0 - version: 0.7.0 - '@solid-cli/ui': - specifier: workspace:* - version: link:../ui - '@solid-cli/utils': - specifier: workspace:* - version: link:../utils - execa: - specifier: ^8.0.1 - version: 8.0.1 - picocolors: - specifier: ^1.1.1 - version: 1.1.1 - sucrase: - specifier: ^3.35.0 - version: 3.35.0 - devDependencies: - '@chialab/esbuild-plugin-meta-url': - specifier: ^0.18.2 - version: 0.18.2 - '@types/node': - specifier: ^22.9.0 - version: 22.9.0 - prettier: - specifier: ^3.3.3 - version: 3.3.3 - tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) - typescript: - specifier: ^5.6.3 - version: 5.6.3 - - packages/core: - dependencies: - '@clack/core': - specifier: 0.3.4 - version: 0.3.4 - '@clack/prompts': - specifier: 0.7.0 - version: 0.7.0 - '@solid-cli/commands': - specifier: workspace:* - version: link:../commands - '@solid-cli/ui': - specifier: workspace:* - version: link:../ui - '@solid-cli/utils': - specifier: workspace:* - version: link:../utils - cmd-ts: - specifier: ^0.13.0 - version: 0.13.0 - execa: - specifier: ^8.0.1 - version: 8.0.1 - picocolors: - specifier: ^1.1.1 - version: 1.1.1 - smol-toml: - specifier: ^1.3.0 - version: 1.3.0 - tiny-updater: - specifier: ^3.5.2 - version: 3.5.2 - devDependencies: - '@chialab/esbuild-plugin-meta-url': - specifier: ^0.18.2 - version: 0.18.2 - '@types/node': - specifier: ^22.9.0 - version: 22.9.0 - jiti: - specifier: ^2.4.0 - version: 2.4.0 - tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) - typescript: - specifier: ^5.6.3 - version: 5.6.3 + specifier: ^3.0.2 + version: 3.0.2(@types/node@22.10.7) packages/create-solid: devDependencies: @@ -121,15 +32,9 @@ importers: '@clack/prompts': specifier: 0.9.1 version: 0.9.1 - '@solid-cli/commands': - specifier: workspace:* - version: link:../commands - '@solid-cli/ui': - specifier: workspace:* - version: link:../ui '@types/node': - specifier: ^22.9.0 - version: 22.9.0 + specifier: ^22.10.7 + version: 22.10.7 citty: specifier: ^0.1.6 version: 0.1.6 @@ -137,8 +42,8 @@ importers: specifier: ^0.13.0 version: 0.13.0 jiti: - specifier: ^2.4.0 - version: 2.4.0 + specifier: ^2.4.2 + version: 2.4.2 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -147,78 +52,53 @@ importers: version: 3.35.0 tsup: specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) typescript: - specifier: ^5.6.3 - version: 5.6.3 - - packages/ui: - dependencies: - '@clack/core': - specifier: 0.3.4 - version: 0.3.4 - '@clack/prompts': - specifier: 0.7.0 - version: 0.7.0 - '@solid-cli/utils': - specifier: workspace:* - version: link:../utils - picocolors: - specifier: ^1.1.1 - version: 1.1.1 - devDependencies: - '@types/node': - specifier: 22.9.0 - version: 22.9.0 - tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) - typescript: - specifier: ^5.6.3 - version: 5.6.3 + specifier: ^5.7.3 + version: 5.7.3 packages/utils: dependencies: '@clack/core': - specifier: 0.3.4 - version: 0.3.4 + specifier: 0.4.1 + version: 0.4.1 '@clack/prompts': - specifier: 0.7.0 - version: 0.7.0 + specifier: 0.9.1 + version: 0.9.1 cmd-ts: specifier: ^0.13.0 version: 0.13.0 execa: - specifier: ^8.0.1 - version: 8.0.1 + specifier: ^9.5.2 + version: 9.5.2 picocolors: specifier: ^1.1.1 version: 1.1.1 smol-toml: - specifier: ^1.3.0 - version: 1.3.0 + specifier: ^1.3.1 + version: 1.3.1 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.9.0 - version: 22.9.0 + specifier: 22.10.7 + version: 22.10.7 jiti: - specifier: ^2.4.0 - version: 2.4.0 + specifier: ^2.4.2 + version: 2.4.2 magicast: specifier: ^0.3.5 version: 0.3.5 tsup: specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3) + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) typescript: - specifier: ^5.6.3 - version: 5.6.3 + specifier: ^5.7.3 + version: 5.7.3 vitest: - specifier: ^2.1.5 - version: 2.1.5(@types/node@22.9.0) + specifier: ^3.0.2 + version: 3.0.2(@types/node@22.10.7) packages: @@ -243,27 +123,24 @@ packages: resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} - '@begit/core@0.0.19': - resolution: {integrity: sha512-3ypq3vJQ+PzYVi53HRkAtwdtVXTjyXjo1UzTkD75Qr9YIoacYsSy9gAdbwktfNKgTLyc1nU83W1D3SEw9kgBBA==} - '@begit/core@0.1.1': resolution: {integrity: sha512-uxooRorqP8Xv20jf/X+nhkbDIiEodl/oXwep5gNat7ccQnlu6oG/PxepcsOyvwonL9x0ZDEmP46fC5Uhu2fivA==} - '@changesets/apply-release-plan@7.0.5': - resolution: {integrity: sha512-1cWCk+ZshEkSVEZrm2fSj1Gz8sYvxgUL4Q78+1ZZqeqfuevPTPk033/yUZ3df8BKMohkqqHfzj0HOOrG0KtXTw==} + '@changesets/apply-release-plan@7.0.7': + resolution: {integrity: sha512-qnPOcmmmnD0MfMg9DjU1/onORFyRpDXkMMl2IJg9mECY6RnxL3wN0TCCc92b2sXt1jt8DgjAUUsZYGUGTdYIXA==} - '@changesets/assemble-release-plan@6.0.4': - resolution: {integrity: sha512-nqICnvmrwWj4w2x0fOhVj2QEGdlUuwVAwESrUo5HLzWMI1rE5SWfsr9ln+rDqWB6RQ2ZyaMZHUcU7/IRaUJS+Q==} + '@changesets/assemble-release-plan@6.0.5': + resolution: {integrity: sha512-IgvBWLNKZd6k4t72MBTBK3nkygi0j3t3zdC1zrfusYo0KpdsvnDjrMM9vPnTCLCMlfNs55jRL4gIMybxa64FCQ==} '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.9': - resolution: {integrity: sha512-q42a/ZbDnxPpCb5Wkm6tMVIxgeI9C/bexntzTeCFBrQEdpisQqk8kCHllYZMDjYtEc1ZzumbMJAG8H0Z4rdvjg==} + '@changesets/cli@2.27.11': + resolution: {integrity: sha512-1QislpE+nvJgSZZo9+Lj3Lno5pKBgN46dAV8IVxKJy9wX8AOrs9nn5pYVZuDpoxWJJCALmbfOsHkyxujgetQSg==} hasBin: true - '@changesets/config@3.0.3': - resolution: {integrity: sha512-vqgQZMyIcuIpw9nqFIpTSNyc/wgm/Lu1zKN5vECy74u95Qx/Wa9g27HdgO4NkVAaq+BGA8wUc/qvbvVNs93n6A==} + '@changesets/config@3.0.5': + resolution: {integrity: sha512-QyXLSSd10GquX7hY0Mt4yQFMEeqnO5z/XLpbIr4PAkNNoQNKwDyiSrx4yd749WddusH1v3OSiA0NRAYmH/APpQ==} '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} @@ -271,14 +148,14 @@ packages: '@changesets/get-dependents-graph@2.1.2': resolution: {integrity: sha512-sgcHRkiBY9i4zWYBwlVyAjEM9sAzs4wYVwJUdnbDLnVG3QwAaia1Mk5P8M7kraTOZN+vBET7n8KyB0YXCbFRLQ==} - '@changesets/get-release-plan@4.0.4': - resolution: {integrity: sha512-SicG/S67JmPTrdcc9Vpu0wSQt7IiuN0dc8iR5VScnnTVPfIaLvKmEGRvIaF0kcn8u5ZqLbormZNTO77bCEvyWw==} + '@changesets/get-release-plan@4.0.6': + resolution: {integrity: sha512-FHRwBkY7Eili04Y5YMOZb0ezQzKikTka4wL753vfUA5COSebt7KThqiuCN9BewE4/qFGgF/5t3AuzXx1/UAY4w==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} - '@changesets/git@3.0.1': - resolution: {integrity: sha512-pdgHcYBLCPcLd82aRcuO0kxCDbw/yISlOtkmwmE8Odo1L6hSiZrBOsRl84eYG7DRCab/iHnOkWqExqc4wxk2LQ==} + '@changesets/git@3.0.2': + resolution: {integrity: sha512-r1/Kju9Y8OxRRdvna+nxpQIsMsRQn9dhhAZt94FLDeu0Hij2hnOozW8iqnHBgvu+KdnJppCveQwK4odwfw/aWQ==} '@changesets/logger@0.1.1': resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} @@ -289,8 +166,8 @@ packages: '@changesets/pre@2.0.1': resolution: {integrity: sha512-vvBJ/If4jKM4tPz9JdY2kGOgWmCowUYOi5Ycv8dyLnEE8FgpYYUo1mgJZxcdtGGP3aG8rAQulGLyyXGSLkIMTQ==} - '@changesets/read@0.6.1': - resolution: {integrity: sha512-jYMbyXQk3nwP25nRzQQGa1nKLY0KfoOV7VLgwucI0bUO8t8ZLCr6LZmgjXsiKuRDc+5A6doKPr9w2d+FEJ55zQ==} + '@changesets/read@0.6.2': + resolution: {integrity: sha512-wjfQpJvryY3zD61p8jR87mJdyx2FIhEcdXhKUqkja87toMrP/3jtg/Yg29upN+N4Ckf525/uvV7a4tzBlpk6gg==} '@changesets/should-skip-package@0.1.1': resolution: {integrity: sha512-H9LjLbF6mMHLtJIc/eHR9Na+MifJ3VxtgP/Y+XLn4BF7tDTEN1HNYtH6QMcjP1uxp9sjaFYmW8xqloaCi/ckTg==} @@ -320,20 +197,9 @@ packages: resolution: {integrity: sha512-eV1m70Qn9pLY9xwFmZ2FlcOzwiaUywsJ7NB/ud8VB7DouvCQtIHkQ3Om7uPX0ojXGEG1LCyO96kZkvbNTxNu0Q==} engines: {node: '>=18'} - '@clack/core@0.3.3': - resolution: {integrity: sha512-5ZGyb75BUBjlll6eOa1m/IZBxwk91dooBWhPSL67sWcLS0zt9SnswRL0l26TVdBhb0wnWORRxUn//uH6n4z7+A==} - - '@clack/core@0.3.4': - resolution: {integrity: sha512-H4hxZDXgHtWTwV3RAVenqcC4VbJZNegbBjlPvzOzCouXtS2y3sDvlO3IsbrPNWuLWPPlYVYPghQdSF64683Ldw==} - '@clack/core@0.4.1': resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==} - '@clack/prompts@0.7.0': - resolution: {integrity: sha512-0MhX9/B4iL6Re04jPrttDm+BsP8y6mS7byuv0BvXgdXhbV5PdlsHt55dvNsuBCPZ7xq1oTAOOuotR9NFbQyMSA==} - bundledDependencies: - - is-unicode-supported - '@clack/prompts@0.9.1': resolution: {integrity: sha512-JIpyaboYZeWYlyP0H+OoPPxd6nqueG/CmN6ixBiNFsIDHREevjIf0n0Ohh5gr5C8pEDknzgvz+pIJ8dMhzWIeg==} @@ -844,6 +710,13 @@ packages: cpu: [x64] os: [win32] + '@sec-ant/readable-stream@0.4.1': + resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} + + '@sindresorhus/merge-streams@4.0.0': + resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} + engines: {node: '>=18'} + '@swc/core-darwin-arm64@1.5.5': resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} engines: {node: '>=10'} @@ -928,37 +801,37 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.9.0': - resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==} + '@types/node@22.10.7': + resolution: {integrity: sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==} - '@vitest/expect@2.1.5': - resolution: {integrity: sha512-nZSBTW1XIdpZvEJyoP/Sy8fUg0b8od7ZpGDkTUcfJ7wz/VoZAFzFfLyxVxGFhUjJzhYqSbIpfMtl/+k/dpWa3Q==} + '@vitest/expect@3.0.2': + resolution: {integrity: sha512-dKSHLBcoZI+3pmP5hiZ7I5grNru2HRtEW8Z5Zp4IXog8QYcxhlox7JUPyIIFWfN53+3HW3KPLIl6nSzUGgKSuQ==} - '@vitest/mocker@2.1.5': - resolution: {integrity: sha512-XYW6l3UuBmitWqSUXTNXcVBUCRytDogBsWuNXQijc00dtnU/9OqpXWp4OJroVrad/gLIomAq9aW8yWDBtMthhQ==} + '@vitest/mocker@3.0.2': + resolution: {integrity: sha512-Hr09FoBf0jlwwSyzIF4Xw31OntpO3XtZjkccpcBf8FeVW3tpiyKlkeUzxS/txzHqpUCNIX157NaTySxedyZLvA==} peerDependencies: msw: ^2.4.9 - vite: ^5.0.0 + vite: ^5.0.0 || ^6.0.0 peerDependenciesMeta: msw: optional: true vite: optional: true - '@vitest/pretty-format@2.1.5': - resolution: {integrity: sha512-4ZOwtk2bqG5Y6xRGHcveZVr+6txkH7M2e+nPFd6guSoN638v/1XQ0K06eOpi0ptVU/2tW/pIU4IoPotY/GZ9fw==} + '@vitest/pretty-format@3.0.2': + resolution: {integrity: sha512-yBohcBw/T/p0/JRgYD+IYcjCmuHzjC3WLAKsVE4/LwiubzZkE8N49/xIQ/KGQwDRA8PaviF8IRO8JMWMngdVVQ==} - '@vitest/runner@2.1.5': - resolution: {integrity: sha512-pKHKy3uaUdh7X6p1pxOkgkVAFW7r2I818vHDthYLvUyjRfkKOU6P45PztOch4DZarWQne+VOaIMwA/erSSpB9g==} + '@vitest/runner@3.0.2': + resolution: {integrity: sha512-GHEsWoncrGxWuW8s405fVoDfSLk6RF2LCXp6XhevbtDjdDme1WV/eNmUueDfpY1IX3MJaCRelVCEXsT9cArfEg==} - '@vitest/snapshot@2.1.5': - resolution: {integrity: sha512-zmYw47mhfdfnYbuhkQvkkzYroXUumrwWDGlMjpdUr4jBd3HZiV2w7CQHj+z7AAS4VOtWxI4Zt4bWt4/sKcoIjg==} + '@vitest/snapshot@3.0.2': + resolution: {integrity: sha512-h9s67yD4+g+JoYG0zPCo/cLTabpDqzqNdzMawmNPzDStTiwxwkyYM1v5lWE8gmGv3SVJ2DcxA2NpQJZJv9ym3g==} - '@vitest/spy@2.1.5': - resolution: {integrity: sha512-aWZF3P0r3w6DiYTVskOYuhBc7EMc3jvn1TkBg8ttylFFRqNN2XGD7V5a4aQdk6QiUzZQ4klNBSpCLJgWNdIiNw==} + '@vitest/spy@3.0.2': + resolution: {integrity: sha512-8mI2iUn+PJFMT44e3ISA1R+K6ALVs47W6eriDTfXe6lFqlflID05MB4+rIFhmDSLBj8iBsZkzBYlgSkinxLzSQ==} - '@vitest/utils@2.1.5': - resolution: {integrity: sha512-yfj6Yrp0Vesw2cwJbP+cl04OC+IHFsuQsrsJBL9pyGeQXE56v1UAOQco+SR55Vf1nQzfV0QJg1Qum7AaWUwwYg==} + '@vitest/utils@3.0.2': + resolution: {integrity: sha512-Qu01ZYZlgHvDP02JnMBRpX43nRaZtNpIzw3C1clDXmn8eakgX6iQVGzTQ/NjkIr64WD8ioqOjkaYRVvHQI5qiw==} abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} @@ -1022,6 +895,10 @@ packages: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} + braces@3.0.3: + resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} + engines: {node: '>=8'} + bundle-require@5.0.0: resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1087,13 +964,14 @@ packages: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} - cross-spawn@5.1.0: - resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==} - cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} + cross-spawn@7.0.6: + resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} + engines: {node: '>= 8'} + debug@4.3.4: resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -1103,8 +981,8 @@ packages: supports-color: optional: true - debug@4.3.5: - resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} + debug@4.3.7: + resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -1112,8 +990,8 @@ packages: supports-color: optional: true - debug@4.3.7: - resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + debug@4.4.0: + resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -1154,8 +1032,8 @@ packages: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} - es-module-lexer@1.5.4: - resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} + es-module-lexer@1.6.0: + resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==} esbuild@0.20.2: resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} @@ -1175,9 +1053,9 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - execa@8.0.1: - resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} - engines: {node: '>=16.17'} + execa@9.5.2: + resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==} + engines: {node: ^18.19.0 || >=20.5.0} expect-type@1.1.0: resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==} @@ -1205,10 +1083,18 @@ packages: picomatch: optional: true + figures@6.1.0: + resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} + engines: {node: '>=18'} + fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} + fill-range@7.1.1: + resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} + engines: {node: '>=8'} + find-up@4.1.0: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} @@ -1233,9 +1119,9 @@ packages: get-func-name@2.0.2: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} - get-stream@8.0.1: - resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} - engines: {node: '>=16'} + get-stream@9.0.1: + resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} + engines: {node: '>=18'} glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} @@ -1264,9 +1150,9 @@ packages: human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} - human-signals@5.0.0: - resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} - engines: {node: '>=16.17.0'} + human-signals@8.0.0: + resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==} + engines: {node: '>=18.18.0'} iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} @@ -1279,9 +1165,6 @@ packages: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} - ionstore@1.0.0: - resolution: {integrity: sha512-ikEvmeZFh9u5SkjKbFqJlmmhaQTulB3P7QoSoZ/xL8EDP5uj5QWbPeKcQ8ZJtszBLHRRnhIJJE8P1dhFx/oCMw==} - is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} @@ -1302,14 +1185,22 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-stream@3.0.0: - resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + is-plain-obj@4.1.0: + resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} + engines: {node: '>=12'} + + is-stream@4.0.1: + resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} + engines: {node: '>=18'} is-subdir@1.2.0: resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==} engines: {node: '>=4'} + is-unicode-supported@2.1.0: + resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==} + engines: {node: '>=18'} + is-windows@1.0.2: resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==} engines: {node: '>=0.10.0'} @@ -1321,8 +1212,8 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - jiti@2.4.0: - resolution: {integrity: sha512-H5UpaUI+aHOqZXlYOaFP/8AzKsg+guWu+Pr3Y8i7+Y3zr1aXAvCvTAQ1RxSc6oVD8R8c7brgNtTVP91E7upH/g==} + jiti@2.4.2: + resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} hasBin: true joycon@3.1.1: @@ -1367,22 +1258,16 @@ packages: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} - lru-cache@4.1.5: - resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==} - lru-cache@6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} - magic-string@0.30.12: - resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==} + magic-string@0.30.17: + resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} magicast@0.3.5: resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} - merge-stream@2.0.0: - resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -1391,6 +1276,10 @@ packages: resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} engines: {node: '>=8.6'} + micromatch@4.0.8: + resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} + engines: {node: '>=8.6'} + mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} @@ -1399,10 +1288,6 @@ packages: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} - mimic-fn@4.0.0: - resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} - engines: {node: '>=12'} - minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -1445,8 +1330,8 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nodemon@3.1.7: - resolution: {integrity: sha512-hLj7fuMow6f0lbB0cD14Lz2xNjwsyruH251Pk4t/yIitCFJbmY1myuLlHm/q06aST4jg6EgAh74PIBBrRqpVAQ==} + nodemon@3.1.9: + resolution: {integrity: sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==} engines: {node: '>=10'} hasBin: true @@ -1458,18 +1343,14 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - npm-run-path@5.3.0: - resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + npm-run-path@6.0.0: + resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==} + engines: {node: '>=18'} object-assign@4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - onetime@6.0.0: - resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} - engines: {node: '>=12'} - os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -1500,6 +1381,10 @@ packages: package-manager-detector@0.2.0: resolution: {integrity: sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==} + parse-ms@4.0.0: + resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} + engines: {node: '>=18'} + path-exists@4.0.0: resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==} engines: {node: '>=8'} @@ -1520,8 +1405,8 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - pathe@1.1.2: - resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==} + pathe@2.0.2: + resolution: {integrity: sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==} pathval@2.0.0: resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} @@ -1573,13 +1458,14 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.4.2: + resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} engines: {node: '>=14'} hasBin: true - pseudomap@1.0.2: - resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} + pretty-ms@9.2.0: + resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==} + engines: {node: '>=18'} pstree.remy@1.1.8: resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==} @@ -1640,18 +1526,10 @@ packages: engines: {node: '>=10'} hasBin: true - shebang-command@1.2.0: - resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==} - engines: {node: '>=0.10.0'} - shebang-command@2.0.0: resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==} engines: {node: '>=8'} - shebang-regex@1.0.0: - resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==} - engines: {node: '>=0.10.0'} - shebang-regex@3.0.0: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} @@ -1659,9 +1537,6 @@ packages: siginfo@2.0.0: resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==} - signal-exit@3.0.7: - resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} - signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} @@ -1677,8 +1552,8 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - smol-toml@1.3.0: - resolution: {integrity: sha512-tWpi2TsODPScmi48b/OQZGi2lgUmBCHy6SZrhi/FdnnHiU1GwebbCfuQuxsC3nHaLwtYeJGPrDZDIeodDOc4pA==} + smol-toml@1.3.1: + resolution: {integrity: sha512-tEYNll18pPKHroYSmLLrksq233j021G0giwW7P3D24jC54pQ5W5BXMsQ/Mvw1OJCmEYDgY+lrzT+3nNUtoNfXQ==} engines: {node: '>= 18'} source-map-js@1.2.0: @@ -1689,8 +1564,8 @@ packages: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} - spawndamnit@2.0.0: - resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==} + spawndamnit@3.0.1: + resolution: {integrity: sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==} sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} @@ -1721,9 +1596,9 @@ packages: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} - strip-final-newline@3.0.0: - resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} - engines: {node: '>=12'} + strip-final-newline@4.0.0: + resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} + engines: {node: '>=18'} sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} @@ -1738,10 +1613,6 @@ packages: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} - tar@7.4.0: - resolution: {integrity: sha512-XQs0S8fuAkQWuqhDeCdMlJXDX80D7EOVLDPVFkna9yQfzS+PHKgfxcei0jf6/+QAWcjqrnC8uM3fSAnrQl+XYg==} - engines: {node: '>=18'} - tar@7.4.3: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} @@ -1757,28 +1628,25 @@ packages: thenify@3.3.1: resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - tiny-colors@2.0.2: - resolution: {integrity: sha512-FYzA5Q5myp26PIZ4mx/03SreNgB1dGqcHJnj1Z8UVQ8/CBw0c6qRoPgRdk8rKpviY5diZyOmRGYMYKLYbjnmWQ==} - - tiny-updater@3.5.2: - resolution: {integrity: sha512-5EjK01h0rvgv+Eb0XaiTZJZR+ujdjCDHZ1ZCVCu+1h4+MyOYZ+za8UKuKdNOOOSKhkkC9B08o6ZhF4JnQg7ZLg==} - tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} tinyexec@0.3.1: resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==} + tinyexec@0.3.2: + resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} + tinyglobby@0.2.10: resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} engines: {node: '>=12.0.0'} - tinypool@1.0.1: - resolution: {integrity: sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==} + tinypool@1.0.2: + resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==} engines: {node: ^18.0.0 || >=20.0.0} - tinyrainbow@1.2.0: - resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==} + tinyrainbow@2.0.0: + resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} engines: {node: '>=14.0.0'} tinyspy@3.0.2: @@ -1830,58 +1698,62 @@ packages: typescript: optional: true - turbo-darwin-64@2.2.3: - resolution: {integrity: sha512-Rcm10CuMKQGcdIBS3R/9PMeuYnv6beYIHqfZFeKWVYEWH69sauj4INs83zKMTUiZJ3/hWGZ4jet9AOwhsssLyg==} + turbo-darwin-64@2.3.3: + resolution: {integrity: sha512-bxX82xe6du/3rPmm4aCC5RdEilIN99VUld4HkFQuw+mvFg6darNBuQxyWSHZTtc25XgYjQrjsV05888w1grpaA==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.2.3: - resolution: {integrity: sha512-+EIMHkuLFqUdJYsA3roj66t9+9IciCajgj+DVek+QezEdOJKcRxlvDOS2BUaeN8kEzVSsNiAGnoysFWYw4K0HA==} + turbo-darwin-arm64@2.3.3: + resolution: {integrity: sha512-DYbQwa3NsAuWkCUYVzfOUBbSUBVQzH5HWUFy2Kgi3fGjIWVZOFk86ss+xsWu//rlEAfYwEmopigsPYSmW4X15A==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.2.3: - resolution: {integrity: sha512-UBhJCYnqtaeOBQLmLo8BAisWbc9v9daL9G8upLR+XGj6vuN/Nz6qUAhverN4Pyej1g4Nt1BhROnj6GLOPYyqxQ==} + turbo-linux-64@2.3.3: + resolution: {integrity: sha512-eHj9OIB0dFaP6BxB88jSuaCLsOQSYWBgmhy2ErCu6D2GG6xW3b6e2UWHl/1Ho9FsTg4uVgo4DB9wGsKa5erjUA==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.2.3: - resolution: {integrity: sha512-hJYT9dN06XCQ3jBka/EWvvAETnHRs3xuO/rb5bESmDfG+d9yQjeTMlhRXKrr4eyIMt6cLDt1LBfyi+6CQ+VAwQ==} + turbo-linux-arm64@2.3.3: + resolution: {integrity: sha512-NmDE/NjZoDj1UWBhMtOPmqFLEBKhzGS61KObfrDEbXvU3lekwHeoPvAMfcovzswzch+kN2DrtbNIlz+/rp8OCg==} cpu: [arm64] os: [linux] - turbo-windows-64@2.2.3: - resolution: {integrity: sha512-NPrjacrZypMBF31b4HE4ROg4P3nhMBPHKS5WTpMwf7wydZ8uvdEHpESVNMOtqhlp857zbnKYgP+yJF30H3N2dQ==} + turbo-windows-64@2.3.3: + resolution: {integrity: sha512-O2+BS4QqjK3dOERscXqv7N2GXNcqHr9hXumkMxDj/oGx9oCatIwnnwx34UmzodloSnJpgSqjl8iRWiY65SmYoQ==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.2.3: - resolution: {integrity: sha512-fnNrYBCqn6zgKPKLHu4sOkihBI/+0oYFr075duRxqUZ+1aLWTAGfHZLgjVeLh3zR37CVzuerGIPWAEkNhkWEIw==} + turbo-windows-arm64@2.3.3: + resolution: {integrity: sha512-dW4ZK1r6XLPNYLIKjC4o87HxYidtRRcBeo/hZ9Wng2XM/MqqYkAyzJXJGgRMsc0MMEN9z4+ZIfnSNBrA0b08ag==} cpu: [arm64] os: [win32] - turbo@2.2.3: - resolution: {integrity: sha512-5lDvSqIxCYJ/BAd6rQGK/AzFRhBkbu4JHVMLmGh/hCb7U3CqSnr5Tjwfy9vc+/5wG2DJ6wttgAaA7MoCgvBKZQ==} + turbo@2.3.3: + resolution: {integrity: sha512-DUHWQAcC8BTiUZDRzAYGvpSpGLiaOQPfYXlCieQbwUvmml/LRGIe3raKdrOPOoiX0DYlzxs2nH6BoWJoZrj8hA==} hasBin: true - typescript@5.6.3: - resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} + typescript@5.7.3: + resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} engines: {node: '>=14.17'} hasBin: true undefsafe@2.0.5: resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + undici-types@6.20.0: + resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} + + unicorn-magic@0.3.0: + resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} + engines: {node: '>=18'} universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@2.1.5: - resolution: {integrity: sha512-rd0QIgx74q4S1Rd56XIiL2cYEdyWn13cunYBIuqh9mpmQr7gGS0IxXoP8R6OaZtNQQLyXSWbd4rXKYUbhFpK5w==} - engines: {node: ^18.0.0 || >=20.0.0} + vite-node@3.0.2: + resolution: {integrity: sha512-hsEQerBAHvVAbv40m3TFQe/lTEbOp7yDpyqMJqr2Tnd+W58+DEYOt+fluQgekOePcsNBmR77lpVAnIU2Xu4SvQ==} + engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true vite@5.2.10: @@ -1912,15 +1784,15 @@ packages: terser: optional: true - vitest@2.1.5: - resolution: {integrity: sha512-P4ljsdpuzRTPI/kbND2sDZ4VmieerR2c9szEZpjc+98Z9ebvnXmM5+0tHEKqYZumXqlvnmfWsjeFOjXVriDG7A==} - engines: {node: ^18.0.0 || >=20.0.0} + vitest@3.0.2: + resolution: {integrity: sha512-5bzaHakQ0hmVVKLhfh/jXf6oETDBtgPo8tQCHYB+wftNgFJ+Hah67IsWc8ivx4vFL025Ow8UiuTf4W57z4izvQ==} + engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || >=20.0.0 - '@vitest/browser': 2.1.5 - '@vitest/ui': 2.1.5 + '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 + '@vitest/browser': 3.0.2 + '@vitest/ui': 3.0.2 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1943,13 +1815,6 @@ packages: whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} - when-exit@2.1.1: - resolution: {integrity: sha512-XLipGldz/UcleuGaoQjbYuWwD+ICRnzIjlldtwTaTWr7aZz8yQW49rXk6MHQnh+KxOiWiJpM1vIyaxprOnlW4g==} - - which@1.3.1: - resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} - hasBin: true - which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -1968,9 +1833,6 @@ packages: resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} engines: {node: '>=12'} - yallist@2.1.2: - resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==} - yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} @@ -1978,6 +1840,10 @@ packages: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} + yoctocolors@2.1.1: + resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==} + engines: {node: '>=18'} + snapshots: '@babel/helper-string-parser@7.24.8': {} @@ -1998,19 +1864,15 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@begit/core@0.0.19': - dependencies: - tar: 7.4.0 - '@begit/core@0.1.1': dependencies: tar: 7.4.3 - '@changesets/apply-release-plan@7.0.5': + '@changesets/apply-release-plan@7.0.7': dependencies: - '@changesets/config': 3.0.3 + '@changesets/config': 3.0.5 '@changesets/get-version-range-type': 0.4.0 - '@changesets/git': 3.0.1 + '@changesets/git': 3.0.2 '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 @@ -2022,7 +1884,7 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.0 - '@changesets/assemble-release-plan@6.0.4': + '@changesets/assemble-release-plan@6.0.5': dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 @@ -2035,19 +1897,19 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.9': + '@changesets/cli@2.27.11': dependencies: - '@changesets/apply-release-plan': 7.0.5 - '@changesets/assemble-release-plan': 6.0.4 + '@changesets/apply-release-plan': 7.0.7 + '@changesets/assemble-release-plan': 6.0.5 '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.3 + '@changesets/config': 3.0.5 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 - '@changesets/get-release-plan': 4.0.4 - '@changesets/git': 3.0.1 + '@changesets/get-release-plan': 4.0.6 + '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.1 - '@changesets/read': 0.6.1 + '@changesets/read': 0.6.2 '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@changesets/write': 0.3.2 @@ -2063,10 +1925,10 @@ snapshots: picocolors: 1.1.1 resolve-from: 5.0.0 semver: 7.6.0 - spawndamnit: 2.0.0 + spawndamnit: 3.0.1 term-size: 2.2.1 - '@changesets/config@3.0.3': + '@changesets/config@3.0.5': dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.2 @@ -2074,7 +1936,7 @@ snapshots: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - micromatch: 4.0.5 + micromatch: 4.0.8 '@changesets/errors@0.2.0': dependencies: @@ -2087,24 +1949,24 @@ snapshots: picocolors: 1.1.1 semver: 7.6.0 - '@changesets/get-release-plan@4.0.4': + '@changesets/get-release-plan@4.0.6': dependencies: - '@changesets/assemble-release-plan': 6.0.4 - '@changesets/config': 3.0.3 + '@changesets/assemble-release-plan': 6.0.5 + '@changesets/config': 3.0.5 '@changesets/pre': 2.0.1 - '@changesets/read': 0.6.1 + '@changesets/read': 0.6.2 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 '@changesets/get-version-range-type@0.4.0': {} - '@changesets/git@3.0.1': + '@changesets/git@3.0.2': dependencies: '@changesets/errors': 0.2.0 '@manypkg/get-packages': 1.1.3 is-subdir: 1.2.0 - micromatch: 4.0.5 - spawndamnit: 2.0.0 + micromatch: 4.0.8 + spawndamnit: 3.0.1 '@changesets/logger@0.1.1': dependencies: @@ -2122,9 +1984,9 @@ snapshots: '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - '@changesets/read@0.6.1': + '@changesets/read@0.6.2': dependencies: - '@changesets/git': 3.0.1 + '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 '@changesets/parse': 0.4.0 '@changesets/types': 6.0.0 @@ -2165,27 +2027,11 @@ snapshots: '@chialab/node-resolve@0.18.0': {} - '@clack/core@0.3.3': - dependencies: - picocolors: 1.1.1 - sisteransi: 1.0.5 - - '@clack/core@0.3.4': - dependencies: - picocolors: 1.1.1 - sisteransi: 1.0.5 - '@clack/core@0.4.1': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.7.0': - dependencies: - '@clack/core': 0.3.3 - picocolors: 1.1.1 - sisteransi: 1.0.5 - '@clack/prompts@0.9.1': dependencies: '@clack/core': 0.4.1 @@ -2502,6 +2348,10 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.26.0': optional: true + '@sec-ant/readable-stream@0.4.1': {} + + '@sindresorhus/merge-streams@4.0.0': {} + '@swc/core-darwin-arm64@1.5.5': optional: true @@ -2563,49 +2413,49 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.9.0': + '@types/node@22.10.7': dependencies: - undici-types: 6.19.8 + undici-types: 6.20.0 - '@vitest/expect@2.1.5': + '@vitest/expect@3.0.2': dependencies: - '@vitest/spy': 2.1.5 - '@vitest/utils': 2.1.5 + '@vitest/spy': 3.0.2 + '@vitest/utils': 3.0.2 chai: 5.1.2 - tinyrainbow: 1.2.0 + tinyrainbow: 2.0.0 - '@vitest/mocker@2.1.5(vite@5.2.10(@types/node@22.9.0))': + '@vitest/mocker@3.0.2(vite@5.2.10(@types/node@22.10.7))': dependencies: - '@vitest/spy': 2.1.5 + '@vitest/spy': 3.0.2 estree-walker: 3.0.3 - magic-string: 0.30.12 + magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.9.0) + vite: 5.2.10(@types/node@22.10.7) - '@vitest/pretty-format@2.1.5': + '@vitest/pretty-format@3.0.2': dependencies: - tinyrainbow: 1.2.0 + tinyrainbow: 2.0.0 - '@vitest/runner@2.1.5': + '@vitest/runner@3.0.2': dependencies: - '@vitest/utils': 2.1.5 - pathe: 1.1.2 + '@vitest/utils': 3.0.2 + pathe: 2.0.2 - '@vitest/snapshot@2.1.5': + '@vitest/snapshot@3.0.2': dependencies: - '@vitest/pretty-format': 2.1.5 - magic-string: 0.30.12 - pathe: 1.1.2 + '@vitest/pretty-format': 3.0.2 + magic-string: 0.30.17 + pathe: 2.0.2 - '@vitest/spy@2.1.5': + '@vitest/spy@3.0.2': dependencies: tinyspy: 3.0.2 - '@vitest/utils@2.1.5': + '@vitest/utils@3.0.2': dependencies: - '@vitest/pretty-format': 2.1.5 + '@vitest/pretty-format': 3.0.2 loupe: 3.1.2 - tinyrainbow: 1.2.0 + tinyrainbow: 2.0.0 abbrev@1.1.1: {} @@ -2657,6 +2507,10 @@ snapshots: dependencies: fill-range: 7.0.1 + braces@3.0.3: + dependencies: + fill-range: 7.1.1 + bundle-require@5.0.0(esbuild@0.24.0): dependencies: esbuild: 0.24.0 @@ -2726,13 +2580,13 @@ snapshots: consola@3.2.3: {} - cross-spawn@5.1.0: + cross-spawn@7.0.3: dependencies: - lru-cache: 4.1.5 - shebang-command: 1.2.0 - which: 1.3.1 + path-key: 3.1.1 + shebang-command: 2.0.0 + which: 2.0.2 - cross-spawn@7.0.3: + cross-spawn@7.0.6: dependencies: path-key: 3.1.1 shebang-command: 2.0.0 @@ -2742,13 +2596,13 @@ snapshots: dependencies: ms: 2.1.2 - debug@4.3.5(supports-color@5.5.0): + debug@4.3.7(supports-color@5.5.0): dependencies: - ms: 2.1.2 + ms: 2.1.3 optionalDependencies: supports-color: 5.5.0 - debug@4.3.7: + debug@4.4.0: dependencies: ms: 2.1.3 @@ -2775,7 +2629,7 @@ snapshots: ansi-colors: 4.1.3 strip-ansi: 6.0.1 - es-module-lexer@1.5.4: {} + es-module-lexer@1.6.0: {} esbuild@0.20.2: optionalDependencies: @@ -2836,17 +2690,20 @@ snapshots: dependencies: '@types/estree': 1.0.5 - execa@8.0.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 8.0.1 - human-signals: 5.0.0 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.3.0 - onetime: 6.0.0 + execa@9.5.2: + dependencies: + '@sindresorhus/merge-streams': 4.0.0 + cross-spawn: 7.0.6 + figures: 6.1.0 + get-stream: 9.0.1 + human-signals: 8.0.0 + is-plain-obj: 4.1.0 + is-stream: 4.0.1 + npm-run-path: 6.0.0 + pretty-ms: 9.2.0 signal-exit: 4.1.0 - strip-final-newline: 3.0.0 + strip-final-newline: 4.0.0 + yoctocolors: 2.1.1 expect-type@1.1.0: {} @@ -2874,10 +2731,18 @@ snapshots: optionalDependencies: picomatch: 4.0.2 + figures@6.1.0: + dependencies: + is-unicode-supported: 2.1.0 + fill-range@7.0.1: dependencies: to-regex-range: 5.0.1 + fill-range@7.1.1: + dependencies: + to-regex-range: 5.0.1 + find-up@4.1.0: dependencies: locate-path: 5.0.0 @@ -2905,7 +2770,10 @@ snapshots: get-func-name@2.0.2: {} - get-stream@8.0.1: {} + get-stream@9.0.1: + dependencies: + '@sec-ant/readable-stream': 0.4.1 + is-stream: 4.0.1 glob-parent@5.1.2: dependencies: @@ -2936,7 +2804,7 @@ snapshots: human-id@1.0.2: {} - human-signals@5.0.0: {} + human-signals@8.0.0: {} iconv-lite@0.4.24: dependencies: @@ -2946,8 +2814,6 @@ snapshots: ignore@5.2.4: {} - ionstore@1.0.0: {} - is-binary-path@2.1.0: dependencies: binary-extensions: 2.2.0 @@ -2962,12 +2828,16 @@ snapshots: is-number@7.0.0: {} - is-stream@3.0.0: {} + is-plain-obj@4.1.0: {} + + is-stream@4.0.1: {} is-subdir@1.2.0: dependencies: better-path-resolve: 1.0.0 + is-unicode-supported@2.1.0: {} + is-windows@1.0.2: {} isexe@2.0.0: {} @@ -2978,7 +2848,7 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@2.4.0: {} + jiti@2.4.2: {} joycon@3.1.1: {} @@ -3013,16 +2883,11 @@ snapshots: lru-cache@10.1.0: {} - lru-cache@4.1.5: - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - lru-cache@6.0.0: dependencies: yallist: 4.0.0 - magic-string@0.30.12: + magic-string@0.30.17: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 @@ -3032,8 +2897,6 @@ snapshots: '@babel/types': 7.25.6 source-map-js: 1.2.0 - merge-stream@2.0.0: {} - merge2@1.4.1: {} micromatch@4.0.5: @@ -3041,14 +2904,17 @@ snapshots: braces: 3.0.2 picomatch: 2.3.1 + micromatch@4.0.8: + dependencies: + braces: 3.0.3 + picomatch: 2.3.1 + mime-db@1.52.0: {} mime-types@2.1.35: dependencies: mime-db: 1.52.0 - mimic-fn@4.0.0: {} - minimatch@3.1.2: dependencies: brace-expansion: 1.1.11 @@ -3082,10 +2948,10 @@ snapshots: nanoid@3.3.7: {} - nodemon@3.1.7: + nodemon@3.1.9: dependencies: chokidar: 3.6.0 - debug: 4.3.5(supports-color@5.5.0) + debug: 4.3.7(supports-color@5.5.0) ignore-by-default: 1.0.1 minimatch: 3.1.2 pstree.remy: 1.1.8 @@ -3101,16 +2967,13 @@ snapshots: normalize-path@3.0.0: {} - npm-run-path@5.3.0: + npm-run-path@6.0.0: dependencies: path-key: 4.0.0 + unicorn-magic: 0.3.0 object-assign@4.1.1: {} - onetime@6.0.0: - dependencies: - mimic-fn: 4.0.0 - os-tmpdir@1.0.2: {} outdent@0.5.0: {} @@ -3133,6 +2996,8 @@ snapshots: package-manager-detector@0.2.0: {} + parse-ms@4.0.0: {} + path-exists@4.0.0: {} path-key@3.1.1: {} @@ -3146,7 +3011,7 @@ snapshots: path-type@4.0.0: {} - pathe@1.1.2: {} + pathe@2.0.2: {} pathval@2.0.0: {} @@ -3160,11 +3025,11 @@ snapshots: pirates@4.0.6: {} - postcss-load-config@6.0.1(jiti@2.4.0)(postcss@8.4.38): + postcss-load-config@6.0.1(jiti@2.4.2)(postcss@8.4.38): dependencies: lilconfig: 3.1.2 optionalDependencies: - jiti: 2.4.0 + jiti: 2.4.2 postcss: 8.4.38 postcss@8.4.38: @@ -3175,9 +3040,11 @@ snapshots: prettier@2.8.8: {} - prettier@3.3.3: {} + prettier@3.4.2: {} - pseudomap@1.0.2: {} + pretty-ms@9.2.0: + dependencies: + parse-ms: 4.0.0 pstree.remy@1.1.8: {} @@ -3264,22 +3131,14 @@ snapshots: dependencies: lru-cache: 6.0.0 - shebang-command@1.2.0: - dependencies: - shebang-regex: 1.0.0 - shebang-command@2.0.0: dependencies: shebang-regex: 3.0.0 - shebang-regex@1.0.0: {} - shebang-regex@3.0.0: {} siginfo@2.0.0: {} - signal-exit@3.0.7: {} - signal-exit@4.1.0: {} simple-update-notifier@2.0.0: @@ -3290,7 +3149,7 @@ snapshots: slash@3.0.0: {} - smol-toml@1.3.0: {} + smol-toml@1.3.1: {} source-map-js@1.2.0: {} @@ -3298,10 +3157,10 @@ snapshots: dependencies: whatwg-url: 7.1.0 - spawndamnit@2.0.0: + spawndamnit@3.0.1: dependencies: - cross-spawn: 5.1.0 - signal-exit: 3.0.7 + cross-spawn: 7.0.6 + signal-exit: 4.1.0 sprintf-js@1.0.3: {} @@ -3331,7 +3190,7 @@ snapshots: strip-bom@3.0.0: {} - strip-final-newline@3.0.0: {} + strip-final-newline@4.0.0: {} sucrase@3.35.0: dependencies: @@ -3351,15 +3210,6 @@ snapshots: dependencies: has-flag: 4.0.0 - tar@7.4.0: - dependencies: - '@isaacs/fs-minipass': 4.0.0 - chownr: 3.0.0 - minipass: 7.1.2 - minizlib: 3.0.1 - mkdirp: 3.0.1 - yallist: 5.0.0 - tar@7.4.3: dependencies: '@isaacs/fs-minipass': 4.0.0 @@ -3379,26 +3229,20 @@ snapshots: dependencies: any-promise: 1.3.0 - tiny-colors@2.0.2: {} - - tiny-updater@3.5.2: - dependencies: - ionstore: 1.0.0 - tiny-colors: 2.0.2 - when-exit: 2.1.1 - tinybench@2.9.0: {} tinyexec@0.3.1: {} + tinyexec@0.3.2: {} + tinyglobby@0.2.10: dependencies: fdir: 6.4.2(picomatch@4.0.2) picomatch: 4.0.2 - tinypool@1.0.1: {} + tinypool@1.0.2: {} - tinyrainbow@1.2.0: {} + tinyrainbow@2.0.0: {} tinyspy@3.0.2: {} @@ -3424,17 +3268,17 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.3.5(@swc/core@1.5.5)(jiti@2.4.0)(postcss@8.4.38)(typescript@5.6.3): + tsup@8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): dependencies: bundle-require: 5.0.0(esbuild@0.24.0) cac: 6.7.14 chokidar: 4.0.1 consola: 3.2.3 - debug: 4.3.7 + debug: 4.3.7(supports-color@5.5.0) esbuild: 0.24.0 joycon: 3.1.1 picocolors: 1.1.1 - postcss-load-config: 6.0.1(jiti@2.4.0)(postcss@8.4.38) + postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.4.38) resolve-from: 5.0.0 rollup: 4.26.0 source-map: 0.8.0-beta.0 @@ -3445,55 +3289,57 @@ snapshots: optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.6.3 + typescript: 5.7.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.2.3: + turbo-darwin-64@2.3.3: optional: true - turbo-darwin-arm64@2.2.3: + turbo-darwin-arm64@2.3.3: optional: true - turbo-linux-64@2.2.3: + turbo-linux-64@2.3.3: optional: true - turbo-linux-arm64@2.2.3: + turbo-linux-arm64@2.3.3: optional: true - turbo-windows-64@2.2.3: + turbo-windows-64@2.3.3: optional: true - turbo-windows-arm64@2.2.3: + turbo-windows-arm64@2.3.3: optional: true - turbo@2.2.3: + turbo@2.3.3: optionalDependencies: - turbo-darwin-64: 2.2.3 - turbo-darwin-arm64: 2.2.3 - turbo-linux-64: 2.2.3 - turbo-linux-arm64: 2.2.3 - turbo-windows-64: 2.2.3 - turbo-windows-arm64: 2.2.3 + turbo-darwin-64: 2.3.3 + turbo-darwin-arm64: 2.3.3 + turbo-linux-64: 2.3.3 + turbo-linux-arm64: 2.3.3 + turbo-windows-64: 2.3.3 + turbo-windows-arm64: 2.3.3 - typescript@5.6.3: {} + typescript@5.7.3: {} undefsafe@2.0.5: {} - undici-types@6.19.8: {} + undici-types@6.20.0: {} + + unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite-node@2.1.5(@types/node@22.9.0): + vite-node@3.0.2(@types/node@22.10.7): dependencies: cac: 6.7.14 - debug: 4.3.7 - es-module-lexer: 1.5.4 - pathe: 1.1.2 - vite: 5.2.10(@types/node@22.9.0) + debug: 4.4.0 + es-module-lexer: 1.6.0 + pathe: 2.0.2 + vite: 5.2.10(@types/node@22.10.7) transitivePeerDependencies: - '@types/node' - less @@ -3504,39 +3350,39 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.9.0): + vite@5.2.10(@types/node@22.10.7): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.19.0 optionalDependencies: - '@types/node': 22.9.0 + '@types/node': 22.10.7 fsevents: 2.3.3 - vitest@2.1.5(@types/node@22.9.0): + vitest@3.0.2(@types/node@22.10.7): dependencies: - '@vitest/expect': 2.1.5 - '@vitest/mocker': 2.1.5(vite@5.2.10(@types/node@22.9.0)) - '@vitest/pretty-format': 2.1.5 - '@vitest/runner': 2.1.5 - '@vitest/snapshot': 2.1.5 - '@vitest/spy': 2.1.5 - '@vitest/utils': 2.1.5 + '@vitest/expect': 3.0.2 + '@vitest/mocker': 3.0.2(vite@5.2.10(@types/node@22.10.7)) + '@vitest/pretty-format': 3.0.2 + '@vitest/runner': 3.0.2 + '@vitest/snapshot': 3.0.2 + '@vitest/spy': 3.0.2 + '@vitest/utils': 3.0.2 chai: 5.1.2 - debug: 4.3.7 + debug: 4.4.0 expect-type: 1.1.0 - magic-string: 0.30.12 - pathe: 1.1.2 + magic-string: 0.30.17 + pathe: 2.0.2 std-env: 3.8.0 tinybench: 2.9.0 - tinyexec: 0.3.1 - tinypool: 1.0.1 - tinyrainbow: 1.2.0 - vite: 5.2.10(@types/node@22.9.0) - vite-node: 2.1.5(@types/node@22.9.0) + tinyexec: 0.3.2 + tinypool: 1.0.2 + tinyrainbow: 2.0.0 + vite: 5.2.10(@types/node@22.10.7) + vite-node: 3.0.2(@types/node@22.10.7) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.9.0 + '@types/node': 22.10.7 transitivePeerDependencies: - less - lightningcss @@ -3555,12 +3401,6 @@ snapshots: tr46: 1.0.1 webidl-conversions: 4.0.2 - when-exit@2.1.1: {} - - which@1.3.1: - dependencies: - isexe: 2.0.0 - which@2.0.2: dependencies: isexe: 2.0.0 @@ -3582,8 +3422,8 @@ snapshots: string-width: 5.1.2 strip-ansi: 7.1.0 - yallist@2.1.2: {} - yallist@4.0.0: {} yallist@5.0.0: {} + + yoctocolors@2.1.1: {} From 27f9e99b13904c9425352f953ae1a8e6072af10a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 01:03:22 +0000 Subject: [PATCH 142/290] feat: export command in separate file to binary This allows for `create-solid` to be imported by another package and used there --- packages/create-solid/package.json | 4 ++-- packages/create-solid/src/bin.ts | 11 +++++++++++ packages/create-solid/src/index.ts | 15 +++++---------- packages/create-solid/tsup.config.ts | 2 +- packages/utils/src/open/index.ts | 3 +-- 5 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 packages/create-solid/src/bin.ts diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 3d07c1d..98cd91f 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -19,13 +19,13 @@ ], "main": "dist/index.mjs", "bin": { - "create-solid": "./dist/index.mjs" + "create-solid": "./dist/bin.mjs" }, "files": [ "dist" ], "scripts": { - "start": "jiti ./src/index.ts", + "start": "jiti ./src/bin.ts", "build": "tsc && tsup" }, "devDependencies": { diff --git a/packages/create-solid/src/bin.ts b/packages/create-solid/src/bin.ts new file mode 100644 index 0000000..acd39b8 --- /dev/null +++ b/packages/create-solid/src/bin.ts @@ -0,0 +1,11 @@ +#! /usr/bin/env node + +import { runMain } from "citty"; +import { main } from "."; +import { intro } from "@clack/prompts"; +import color from "picocolors"; +import packageJson from "../package.json" with { type: "json" }; + +intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); + +runMain(main(packageJson.version)); \ No newline at end of file diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index bdcf9b5..74239c5 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -1,20 +1,16 @@ #! /usr/bin/env node -import color from "picocolors"; -import { intro } from "@clack/prompts"; -import packageJson from "../package.json" with { type: "json" }; -import { defineCommand, runMain } from "citty"; -import { createVanilla, createVanillaJS } from "./create-vanilla"; + +import { defineCommand } from "citty"; +import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; -import { create } from "./create"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; -intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); -const main = defineCommand({ +export const main = (version: string) => defineCommand({ meta: { name: "create-solid", - version: packageJson.version, + version: version, }, args: { projectNamePositional: { @@ -74,4 +70,3 @@ const main = defineCommand({ } } }) -runMain(main); diff --git a/packages/create-solid/tsup.config.ts b/packages/create-solid/tsup.config.ts index 831d65f..abd8918 100644 --- a/packages/create-solid/tsup.config.ts +++ b/packages/create-solid/tsup.config.ts @@ -1,7 +1,7 @@ import { defineConfig } from "tsup"; export default defineConfig({ - entry: ["src/index.ts"], + entry: ["src/index.ts", "src/bin.ts"], target: "esnext", format: "esm", splitting: true, diff --git a/packages/utils/src/open/index.ts b/packages/utils/src/open/index.ts index 68ce0da..b946650 100644 --- a/packages/utils/src/open/index.ts +++ b/packages/utils/src/open/index.ts @@ -1,5 +1,4 @@ // Taken verbatim from https://github.com/withastro/astro/blob/main/packages/astro/src/cli/docs/open.ts -import type { ExecaChildProcess } from "execa"; import { execa } from "execa"; /** @@ -27,7 +26,7 @@ const getPlatformSpecificCommand = (): [string] | [string, string[]] => { } }; -export async function openInBrowser(url: string): Promise { +export async function openInBrowser(url: string) { const [command, args = []] = getPlatformSpecificCommand(); return execa(command, [...args, encodeURI(url)]); } From ece3bf679fb98fa0bb41df791334ffa97fa8dbef Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 01:09:56 +0000 Subject: [PATCH 143/290] refactor: rename `main` to `createSolid` --- packages/create-solid/src/bin.ts | 4 ++-- packages/create-solid/src/index.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create-solid/src/bin.ts b/packages/create-solid/src/bin.ts index acd39b8..673067d 100644 --- a/packages/create-solid/src/bin.ts +++ b/packages/create-solid/src/bin.ts @@ -1,11 +1,11 @@ #! /usr/bin/env node import { runMain } from "citty"; -import { main } from "."; +import { createSolid } from "."; import { intro } from "@clack/prompts"; import color from "picocolors"; import packageJson from "../package.json" with { type: "json" }; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); -runMain(main(packageJson.version)); \ No newline at end of file +runMain(createSolid(packageJson.version)); \ No newline at end of file diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 74239c5..7a7d284 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -7,7 +7,7 @@ import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; -export const main = (version: string) => defineCommand({ +export const createSolid = (version: string) => defineCommand({ meta: { name: "create-solid", version: version, From 2a9a9da799b070b6389c25ad4a9d75bf5bd0a22d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 01:14:37 +0000 Subject: [PATCH 144/290] feat: add description to `create-solid` --- packages/create-solid/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 7a7d284..143c7ff 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -10,6 +10,7 @@ import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/consta export const createSolid = (version: string) => defineCommand({ meta: { name: "create-solid", + description: "A CLI for scaffolding new Solid projects", version: version, }, args: { From 3ce2ac0d0e270ed89717b1fe8d879b0ea730d865 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:22:31 +0000 Subject: [PATCH 145/290] feat: add all templates from start and vanilla format --- packages/create-solid/package.json | 3 +- packages/create-solid/src/bin.ts | 2 +- packages/create-solid/src/create-start.ts | 44 +++--- packages/create-solid/src/create-vanilla.ts | 37 +++--- packages/create-solid/src/create.ts | 13 +- packages/create-solid/src/index.ts | 125 +++++++++--------- packages/create-solid/src/utils/constants.ts | 42 +++++- .../create-solid/src/utils/file-system.ts | 14 +- .../create-solid/src/utils/ts-conversion.ts | 64 ++++----- packages/create-solid/src/utils/ui.ts | 41 +++--- packages/utils/src/updates/index.ts | 3 +- turbo.json | 34 ++--- 12 files changed, 221 insertions(+), 201 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 98cd91f..9f9c724 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -43,6 +43,5 @@ "publishConfig": { "access": "public" }, - "dependencies": { - } + "dependencies": {} } diff --git a/packages/create-solid/src/bin.ts b/packages/create-solid/src/bin.ts index 673067d..f9a3f43 100644 --- a/packages/create-solid/src/bin.ts +++ b/packages/create-solid/src/bin.ts @@ -8,4 +8,4 @@ import packageJson from "../package.json" with { type: "json" }; intro(`\n${color.bgCyan(color.black(` Create-Solid v${packageJson.version}`))}`); -runMain(createSolid(packageJson.version)); \ No newline at end of file +runMain(createSolid(packageJson.version)); diff --git a/packages/create-solid/src/create-start.ts b/packages/create-solid/src/create-start.ts index 68041ab..7088cc7 100644 --- a/packages/create-solid/src/create-start.ts +++ b/packages/create-solid/src/create-start.ts @@ -1,33 +1,33 @@ import { downloadRepo } from "@begit/core"; import { join } from "path"; import { writeFileSync } from "fs"; -import { handleTSConversion } from "./utils/ts-conversion" +import { handleTSConversion } from "./utils/ts-conversion"; import { GIT_IGNORE, StartTemplate } from "./utils/constants"; export type CreateStartArgs = { - template: StartTemplate, - destination: string, -} + template: StartTemplate; + destination: string; +}; export const createStartTS = ({ template, destination }: CreateStartArgs) => { - return downloadRepo({ - repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, - dest: destination, - }); -} + return downloadRepo({ + repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, + dest: destination, + }); +}; export const createStartJS = async ({ template, destination }: CreateStartArgs) => { - // Create typescript project in `/.project` - // then transpile this to javascript and clean up - const tempDir = join(destination, ".project"); - await createStartTS({ template, destination: tempDir }) - await handleTSConversion(tempDir, destination); - // Add .gitignore - writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); -} + // Create typescript project in `/.project` + // then transpile this to javascript and clean up + const tempDir = join(destination, ".project"); + await createStartTS({ template, destination: tempDir }); + await handleTSConversion(tempDir, destination); + // Add .gitignore + writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); +}; export const createStart = (args: CreateStartArgs, js?: boolean) => { - if (js) { - return createStartJS(args); - } - return createStartTS(args); -} \ No newline at end of file + if (js) { + return createStartJS(args); + } + return createStartTS(args); +}; diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create-solid/src/create-vanilla.ts index 904b010..dc2dc2d 100644 --- a/packages/create-solid/src/create-vanilla.ts +++ b/packages/create-solid/src/create-vanilla.ts @@ -4,27 +4,26 @@ import { writeFileSync } from "node:fs"; import { handleTSConversion } from "./utils/ts-conversion"; import { GIT_IGNORE, VanillaTemplate } from "./utils/constants"; - export type CreateVanillaArgs = { - template: VanillaTemplate, - destination: string, -} + template: VanillaTemplate; + destination: string; +}; export const createVanilla = (args: CreateVanillaArgs, js?: boolean) => { - if (js) { - return createVanillaJS(args); - } - return createVanillaTS(args); -} + if (js) { + return createVanillaJS(args); + } + return createVanillaTS(args); +}; export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { - return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); -} + return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); +}; export const createVanillaJS = async ({ template, destination }: CreateVanillaArgs) => { - // Create typescript project in `/.project` - // then transpile this to javascript and clean up - const tempDir = join(destination, ".project"); - await createVanillaTS({ template, destination: tempDir }) - await handleTSConversion(tempDir, destination); - // Add .gitignore - writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); -} \ No newline at end of file + // Create typescript project in `/.project` + // then transpile this to javascript and clean up + const tempDir = join(destination, ".project"); + await createVanillaTS({ template, destination: tempDir }); + await handleTSConversion(tempDir, destination); + // Add .gitignore + writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); +}; diff --git a/packages/create-solid/src/create.ts b/packages/create-solid/src/create.ts index 49bbd4b..6629041 100644 --- a/packages/create-solid/src/create.ts +++ b/packages/create-solid/src/create.ts @@ -4,10 +4,9 @@ import { createVanilla, CreateVanillaArgs } from "./create-vanilla"; export async function create(args: CreateVanillaArgs, js: boolean, isStart: false): Promise; export async function create(args: CreateStartArgs, js: boolean, isStart: true): Promise; export async function create(args: CreateVanillaArgs | CreateStartArgs, js: boolean, isStart: boolean) { - if (isStart) { - return createStart(args, js); - } - else { - return createVanilla(args, js); - } -} \ No newline at end of file + if (isStart) { + return createStart(args, js); + } else { + return createVanilla(args, js); + } +} diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 143c7ff..dd0e5aa 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -7,67 +7,70 @@ import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; -export const createSolid = (version: string) => defineCommand({ - meta: { - name: "create-solid", - description: "A CLI for scaffolding new Solid projects", - version: version, - }, - args: { - projectNamePositional: { - type: "positional", - required: false, - description: "Project name" +export const createSolid = (version: string) => + defineCommand({ + meta: { + name: "create-solid", + description: "A CLI for scaffolding new Solid projects", + version: version, }, - templatePositional: { - type: "positional", - required: false, - description: "Template name", + args: { + "projectNamePositional": { + type: "positional", + required: false, + description: "Project name", + }, + "templatePositional": { + type: "positional", + required: false, + description: "Template name", + }, + "project-name": { + type: "string", + required: false, + alias: "p", + description: "Project name", + }, + "solidstart": { + type: "boolean", + required: false, + alias: "s", + description: "Create a SolidStart project", + }, }, - "project-name": { - type: "string", - required: false, - alias: "p", - description: "Project name", - }, - solidstart: { - type: "boolean", - required: false, - alias: "s", - description: "Create a SolidStart project", - }, - }, - async run({ args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart } }) { - let projectName: string = projectNamePositional ?? projectNameOptional; - let template: string = templatePositional; - let isStart: boolean = solidstart; - let isJS = false; - projectName ??= await cancelable( - p.text({ message: "Project Name", placeholder: "solid-project", defaultValue: "solid-project" }), - ); - isStart ??= await cancelable(p.confirm({ message: "Is this a SolidStart project?" })); - const template_opts = await getTemplatesList(isStart); - template ??= (await cancelable( - p.select({ - message: "Which template would you like to use?", - initialValue: "ts", - options: template_opts.map((s: string) => ({ label: s, value: s })), - }), - )); - isJS = !(await cancelable(p.confirm({ message: "Use Typescript?" }))) + async run({ + args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart }, + }) { + let projectName: string = projectNamePositional ?? projectNameOptional; + let template: string = templatePositional; + let isStart: boolean = solidstart; + projectName ??= await cancelable( + p.text({ message: "Project Name", placeholder: "solid-project", defaultValue: "solid-project" }), + ); + isStart ??= await cancelable(p.confirm({ message: "Is this a SolidStart project?" })); + const template_opts = await getTemplatesList(isStart); + template ??= await cancelable( + p.select({ + message: "Which template would you like to use?", + initialValue: "ts", + options: template_opts.map((s: string) => ({ label: s, value: s })), + }), + ); + // Project must be javascript if the template name begins with `js-` + const isJS = template.startsWith("js") ? true : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); - if (isStart) { - await spinnerify({ - startText: "Creating project", - finishText: "Project created 🎉", - fn: () => createStart({ template: template as StartTemplate, destination: projectName }, isJS), - }) - } else { - await spinnerify({ - startText: "Creating project", - finishText: "Project created 🎉", - fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS), - }) - } - } -}) + if (isStart) { + await spinnerify({ + startText: "Creating project", + finishText: "Project created 🎉", + fn: () => createStart({ template: template as StartTemplate, destination: projectName }, isJS), + }); + } else { + await spinnerify({ + startText: "Creating project", + finishText: "Project created 🎉", + fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS), + }); + } + }, + }); diff --git a/packages/create-solid/src/utils/constants.ts b/packages/create-solid/src/utils/constants.ts index 403e595..dbf98de 100644 --- a/packages/create-solid/src/utils/constants.ts +++ b/packages/create-solid/src/utils/constants.ts @@ -37,14 +37,46 @@ export const JS_CONFIG = { "~/*": ["./src/*"], }, }, -} +}; // Supported templates -const VANILLA_TEMPLATES = ["ts"] as const; +const VANILLA_TEMPLATES = [ + "ts", + "ts-vitest", + "ts-uvu", + "ts-unocss", + "ts-tailwindcss", + "ts-sass", + "ts-router", + "ts-router-file-based", + "ts-minimal", + "ts-jest", + "ts-bootstrap", + "js", + "js-vitest", + "js-tailwindcss", +] as const; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; -const START_TEMPLATES = ["basic"] as const; +const START_TEMPLATES = [ + "basic", + "bare", + "hackernews", + "notes", + "todomvc", + "with-auth", + "with-authjs", + "with-drizzle", + "with-mdx", + "with-prisma", + "with-solid-styled", + "with-tailwindcss", + "with-trpc", + "with-unocss", + "with-vitest", + "experiments", +] as const; export type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; export const getTemplatesList = async (isStart: boolean) => { @@ -52,6 +84,6 @@ export const getTemplatesList = async (isStart: boolean) => { return START_TEMPLATES; } return VANILLA_TEMPLATES; -} +}; -// \ No newline at end of file +// diff --git a/packages/create-solid/src/utils/file-system.ts b/packages/create-solid/src/utils/file-system.ts index 0dd4c68..33aa860 100644 --- a/packages/create-solid/src/utils/file-system.ts +++ b/packages/create-solid/src/utils/file-system.ts @@ -4,15 +4,15 @@ import { join, resolve } from "node:path"; import { transform } from "sucrase"; export const recurseFiles = (startPath: string, cb: (file: Dirent, startPath: string) => void) => { - startPath = resolve(startPath); + startPath = resolve(startPath); - const files = readdirSync(startPath, { withFileTypes: true }); + const files = readdirSync(startPath, { withFileTypes: true }); - for (const file of files) { - cb(file, startPath); - } + for (const file of files) { + cb(file, startPath); + } }; export const readFileToString = async (path: string) => { - return (await readFile(path)).toString(); -}; \ No newline at end of file + return (await readFile(path)).toString(); +}; diff --git a/packages/create-solid/src/utils/ts-conversion.ts b/packages/create-solid/src/utils/ts-conversion.ts index 6683534..001923a 100644 --- a/packages/create-solid/src/utils/ts-conversion.ts +++ b/packages/create-solid/src/utils/ts-conversion.ts @@ -1,46 +1,38 @@ import { copyFileSync, Dirent, mkdirSync, writeFileSync } from "node:fs"; -import { readFileToString, recurseFiles } from "./file-system" +import { readFileToString, recurseFiles } from "./file-system"; import { join, resolve } from "node:path"; import { transform } from "sucrase"; import { rm } from "node:fs/promises"; -import { JS_CONFIG } from "./constants" +import { JS_CONFIG } from "./constants"; const convertToJS = async (file: Dirent, startPath: string) => { - const src = join(startPath, file.name); - const dest = resolve(startPath.replace(".solid-start", ""), file.name); - if (file.isDirectory()) { - mkdirSync(dest, { recursive: true }); - recurseFiles(resolve(startPath, file.name), convertToJS); - } else if (file.isFile()) { - if (src.endsWith(".ts") || src.endsWith(".tsx")) { - let { code } = transform(await readFileToString(src), { - transforms: ["typescript", "jsx"], - jsxRuntime: "preserve", - }); + const src = join(startPath, file.name); + const dest = resolve(startPath.replace(".solid-start", ""), file.name); + if (file.isDirectory()) { + mkdirSync(dest, { recursive: true }); + recurseFiles(resolve(startPath, file.name), convertToJS); + } else if (file.isFile()) { + if (src.endsWith(".ts") || src.endsWith(".tsx")) { + let { code } = transform(await readFileToString(src), { + transforms: ["typescript", "jsx"], + jsxRuntime: "preserve", + }); - writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); - } else { - copyFileSync(src, dest); - } - } + writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); + } else { + copyFileSync(src, dest); + } + } }; export const handleTSConversion = async (tempDir: string, projectName: string) => { - await rm(resolve(tempDir, "tsconfig.json")); - writeFileSync( - resolve(projectName, "jsconfig.json"), - JSON.stringify( - JS_CONFIG, - null, - 2, - ), - { flag: "wx" }, - ); + await rm(resolve(tempDir, "tsconfig.json")); + writeFileSync(resolve(projectName, "jsconfig.json"), JSON.stringify(JS_CONFIG, null, 2), { flag: "wx" }); - // Convert all ts files in temp directory into js - recurseFiles(tempDir, convertToJS); + // Convert all ts files in temp directory into js + recurseFiles(tempDir, convertToJS); - // Remove temp directory - await rm(join(process.cwd(), tempDir), { - recursive: true, - force: true, - }); -}; \ No newline at end of file + // Remove temp directory + await rm(join(process.cwd(), tempDir), { + recursive: true, + force: true, + }); +}; diff --git a/packages/create-solid/src/utils/ui.ts b/packages/create-solid/src/utils/ui.ts index fcaa5eb..baf8b4b 100644 --- a/packages/create-solid/src/utils/ui.ts +++ b/packages/create-solid/src/utils/ui.ts @@ -1,30 +1,33 @@ import { log, spinner } from "@clack/prompts"; type SpinnerItem = { - startText: string; - finishText: string; - fn: () => Promise; + startText: string; + finishText: string; + fn: () => Promise; }; export async function spinnerify(spinners: SpinnerItem): Promise; export async function spinnerify(spinners: SpinnerItem[]): Promise; export async function spinnerify(spinners: SpinnerItem[] | SpinnerItem) { - if (!Array.isArray(spinners)) spinners = [spinners]; - let results: any[] = []; - const s = spinner(); - for (const { startText, finishText, fn } of spinners) { - s.start(startText); - results.push(await fn()); - s.stop(finishText); - } - return results.length === 1 ? results[0] : results; + if (!Array.isArray(spinners)) spinners = [spinners]; + let results: any[] = []; + const s = spinner(); + for (const { startText, finishText, fn } of spinners) { + s.start(startText); + results.push(await fn()); + s.stop(finishText); + } + return results.length === 1 ? results[0] : results; } -export const cancelable = async (prompt: Promise, cancelMessage: string = "Canceled"): Promise => { - const value = await prompt; +export const cancelable = async ( + prompt: Promise, + cancelMessage: string = "Canceled", +): Promise => { + const value = await prompt; - if (typeof value === "symbol") { - log.warn(cancelMessage); - process.exit(0); - } + if (typeof value === "symbol") { + log.warn(cancelMessage); + process.exit(0); + } - return value; + return value; }; diff --git a/packages/utils/src/updates/index.ts b/packages/utils/src/updates/index.ts index e996680..65e3854 100644 --- a/packages/utils/src/updates/index.ts +++ b/packages/utils/src/updates/index.ts @@ -66,8 +66,7 @@ export const flushPackageUpdates = async () => { for (const update of packageUpdates) { if (update.dev) { await $`${pM.name} ${instlCmd} -D ${update.name}`; - } - else { + } else { await $`${pM.name} ${instlCmd} ${update.name}`; } } diff --git a/turbo.json b/turbo.json index dc2279d..d13c31c 100644 --- a/turbo.json +++ b/turbo.json @@ -1,22 +1,16 @@ { - "$schema": "https://turbo.build/schema.json", - "tasks": { - "build": { - "dependsOn": [ - "^build" - ], - "outputs": [ - "dist/**" - ] - }, - "test": { - "dependsOn": [ - "^test" - ] - }, - "dev": { - "cache": false, - "persistent": true - } - } + "$schema": "https://turbo.build/schema.json", + "tasks": { + "build": { + "dependsOn": ["^build"], + "outputs": ["dist/**"] + }, + "test": { + "dependsOn": ["^test"] + }, + "dev": { + "cache": false, + "persistent": true + } + } } From a0780bf2fbc5cd9daae1a005b5486eb4dd936d47 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:25:01 +0000 Subject: [PATCH 146/290] refactor: remove unused imports --- packages/create-solid/src/utils/file-system.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/src/utils/file-system.ts b/packages/create-solid/src/utils/file-system.ts index 33aa860..c17c0f9 100644 --- a/packages/create-solid/src/utils/file-system.ts +++ b/packages/create-solid/src/utils/file-system.ts @@ -1,7 +1,6 @@ -import { copyFileSync, Dirent, mkdirSync, readdirSync, writeFileSync } from "node:fs"; -import { readFile, rm } from "node:fs/promises"; -import { join, resolve } from "node:path"; -import { transform } from "sucrase"; +import { Dirent, readdirSync } from "node:fs"; +import { readFile } from "node:fs/promises"; +import { resolve } from "node:path"; export const recurseFiles = (startPath: string, cb: (file: Dirent, startPath: string) => void) => { startPath = resolve(startPath); From cb5287b7fd7ccf1584830633e2dada639d172550 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:28:41 +0000 Subject: [PATCH 147/290] fix: don't transpile if the project template is already js --- packages/create-solid/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index dd0e5aa..2f286c1 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -56,8 +56,8 @@ export const createSolid = (version: string) => options: template_opts.map((s: string) => ({ label: s, value: s })), }), ); - // Project must be javascript if the template name begins with `js-` - const isJS = template.startsWith("js") ? true : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); + // Don't transpile project if it's already javascript! + const isJS = template.startsWith("js") ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); if (isStart) { await spinnerify({ From 38c349554e90e3e0451d632e0b529330c48045d4 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 13:21:16 +0000 Subject: [PATCH 148/290] attempts at mocking the file system --- __mocks__/fs.cjs | 2 + __mocks__/fs/promises.cjs | 2 + package.json | 1 + packages/create-solid/package.json | 3 +- packages/create-solid/src/index.ts | 2 +- packages/create-solid/tests/template.test.ts | 21 ++++++ pnpm-lock.yaml | 79 ++++++++++++++++++++ 7 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 __mocks__/fs.cjs create mode 100644 __mocks__/fs/promises.cjs create mode 100644 packages/create-solid/tests/template.test.ts diff --git a/__mocks__/fs.cjs b/__mocks__/fs.cjs new file mode 100644 index 0000000..d1b5789 --- /dev/null +++ b/__mocks__/fs.cjs @@ -0,0 +1,2 @@ +const { fs } = require('memfs') +module.exports = fs \ No newline at end of file diff --git a/__mocks__/fs/promises.cjs b/__mocks__/fs/promises.cjs new file mode 100644 index 0000000..0bb2b07 --- /dev/null +++ b/__mocks__/fs/promises.cjs @@ -0,0 +1,2 @@ +const { fs } = require('memfs') +module.exports = fs.promises \ No newline at end of file diff --git a/package.json b/package.json index 55a3ba3..923577d 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ ], "devDependencies": { "@changesets/cli": "2.27.11", + "memfs": "^4.17.0", "nodemon": "^3.1.9", "prettier": "^3.4.2", "turbo": "^2.3.3", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 9f9c724..84e87e7 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -26,7 +26,8 @@ ], "scripts": { "start": "jiti ./src/bin.ts", - "build": "tsc && tsup" + "build": "tsc && tsup", + "test": "vitest run" }, "devDependencies": { "@clack/prompts": "0.9.1", diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index 2f286c1..ce65542 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -6,7 +6,7 @@ import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; - +export { createVanilla, createStart } export const createSolid = (version: string) => defineCommand({ meta: { diff --git a/packages/create-solid/tests/template.test.ts b/packages/create-solid/tests/template.test.ts new file mode 100644 index 0000000..b7a6551 --- /dev/null +++ b/packages/create-solid/tests/template.test.ts @@ -0,0 +1,21 @@ +import { beforeEach, expect, it, vi } from "vitest"; +import { createVanilla } from "../src" +import { vol, fs } from 'memfs' +import { cwd } from "process"; +import { readdir, readdirSync, readFileSync } from "fs"; +import { toTreeSync } from "memfs/lib/print"; +vi.mock("node:fs"); +vi.mock("node:fs/promises") +vi.mock("fs"); +vi.mock("fs/promises") +beforeEach(() => { + // reset the state of in-memory fs + vol.reset() +}) +it("downloads and extracts the typescript template", async () => { + const res = await createVanilla({ template: "ts", destination: "test/ts" }, false) + + // const res = readdirSync(cwd()); + // console.log(res); + console.log(toTreeSync(fs)) +}) \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eec75b4..1b31e4b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: '@changesets/cli': specifier: 2.27.11 version: 2.27.11 + memfs: + specifier: ^4.17.0 + version: 4.17.0 nodemon: specifier: ^3.1.9 version: 3.1.9 @@ -514,6 +517,24 @@ packages: '@jridgewell/trace-mapping@0.3.19': resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} + '@jsonjoy.com/base64@1.1.2': + resolution: {integrity: sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + + '@jsonjoy.com/json-pack@1.1.1': + resolution: {integrity: sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + + '@jsonjoy.com/util@1.5.0': + resolution: {integrity: sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -1154,6 +1175,10 @@ packages: resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==} engines: {node: '>=18.18.0'} + hyperdyperid@1.2.0: + resolution: {integrity: sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==} + engines: {node: '>=10.18'} + iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -1268,6 +1293,10 @@ packages: magicast@0.3.5: resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} + memfs@4.17.0: + resolution: {integrity: sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==} + engines: {node: '>= 4.0.0'} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -1628,6 +1657,12 @@ packages: thenify@3.3.1: resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} + thingies@1.21.0: + resolution: {integrity: sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==} + engines: {node: '>=10.18'} + peerDependencies: + tslib: ^2 + tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} @@ -1672,6 +1707,12 @@ packages: tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} + tree-dump@1.0.2: + resolution: {integrity: sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==} + engines: {node: '>=10.0'} + peerDependencies: + tslib: '2' + tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -1679,6 +1720,9 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + tsup@8.3.5: resolution: {integrity: sha512-Tunf6r6m6tnZsG9GYWndg0z8dEV7fD733VBFzFJ5Vcm1FtlXB8xBD/rtrBi2a3YKEV7hHtxiZtW5EAVADoe1pA==} engines: {node: '>=18'} @@ -2211,6 +2255,22 @@ snapshots: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + '@jsonjoy.com/base64@1.1.2(tslib@2.8.1)': + dependencies: + tslib: 2.8.1 + + '@jsonjoy.com/json-pack@1.1.1(tslib@2.8.1)': + dependencies: + '@jsonjoy.com/base64': 1.1.2(tslib@2.8.1) + '@jsonjoy.com/util': 1.5.0(tslib@2.8.1) + hyperdyperid: 1.2.0 + thingies: 1.21.0(tslib@2.8.1) + tslib: 2.8.1 + + '@jsonjoy.com/util@1.5.0(tslib@2.8.1)': + dependencies: + tslib: 2.8.1 + '@manypkg/find-root@1.1.0': dependencies: '@babel/runtime': 7.24.4 @@ -2806,6 +2866,8 @@ snapshots: human-signals@8.0.0: {} + hyperdyperid@1.2.0: {} + iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2 @@ -2897,6 +2959,13 @@ snapshots: '@babel/types': 7.25.6 source-map-js: 1.2.0 + memfs@4.17.0: + dependencies: + '@jsonjoy.com/json-pack': 1.1.1(tslib@2.8.1) + '@jsonjoy.com/util': 1.5.0(tslib@2.8.1) + tree-dump: 1.0.2(tslib@2.8.1) + tslib: 2.8.1 + merge2@1.4.1: {} micromatch@4.0.5: @@ -3229,6 +3298,10 @@ snapshots: dependencies: any-promise: 1.3.0 + thingies@1.21.0(tslib@2.8.1): + dependencies: + tslib: 2.8.1 + tinybench@2.9.0: {} tinyexec@0.3.1: {} @@ -3264,10 +3337,16 @@ snapshots: dependencies: punycode: 2.3.0 + tree-dump@1.0.2(tslib@2.8.1): + dependencies: + tslib: 2.8.1 + tree-kill@1.2.2: {} ts-interface-checker@0.1.13: {} + tslib@2.8.1: {} + tsup@8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): dependencies: bundle-require: 5.0.0(esbuild@0.24.0) From 1ab5a80d09b82016aa16127598564685aa07b11f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:06:27 +0000 Subject: [PATCH 149/290] feat: replace attempts at in-memory fs testing with just using the actual filesystem --- .gitignore | 4 +- __mocks__/fs.cjs | 2 - __mocks__/fs/promises.cjs | 2 - package.json | 3 +- packages/create-solid/src/index.ts | 2 +- packages/create-solid/tests/template.test.ts | 24 ++---- pnpm-lock.yaml | 79 -------------------- setup.ts | 6 ++ vitest.config.ts | 4 + 9 files changed, 21 insertions(+), 105 deletions(-) delete mode 100644 __mocks__/fs.cjs delete mode 100644 __mocks__/fs/promises.cjs create mode 100644 setup.ts create mode 100644 vitest.config.ts diff --git a/.gitignore b/.gitignore index b1d8509..3359d16 100644 --- a/.gitignore +++ b/.gitignore @@ -135,5 +135,5 @@ dist .yarn/install-state.gz .pnp.* -# Testing directory -testing \ No newline at end of file +# Test directory +test \ No newline at end of file diff --git a/__mocks__/fs.cjs b/__mocks__/fs.cjs deleted file mode 100644 index d1b5789..0000000 --- a/__mocks__/fs.cjs +++ /dev/null @@ -1,2 +0,0 @@ -const { fs } = require('memfs') -module.exports = fs \ No newline at end of file diff --git a/__mocks__/fs/promises.cjs b/__mocks__/fs/promises.cjs deleted file mode 100644 index 0bb2b07..0000000 --- a/__mocks__/fs/promises.cjs +++ /dev/null @@ -1,2 +0,0 @@ -const { fs } = require('memfs') -module.exports = fs.promises \ No newline at end of file diff --git a/package.json b/package.json index 923577d..1e46299 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "url": "https://github.com/solidjs-community/solid-cli" }, "scripts": { - "test": "vitest", + "test": "vitest run", "test:all": "turbo run test", "build": "turbo run build", "release": "pnpm build && changeset publish", @@ -35,7 +35,6 @@ ], "devDependencies": { "@changesets/cli": "2.27.11", - "memfs": "^4.17.0", "nodemon": "^3.1.9", "prettier": "^3.4.2", "turbo": "^2.3.3", diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index ce65542..e38148c 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -6,7 +6,7 @@ import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; -export { createVanilla, createStart } +export { createVanilla, createStart }; export const createSolid = (version: string) => defineCommand({ meta: { diff --git a/packages/create-solid/tests/template.test.ts b/packages/create-solid/tests/template.test.ts index b7a6551..d2e01b5 100644 --- a/packages/create-solid/tests/template.test.ts +++ b/packages/create-solid/tests/template.test.ts @@ -1,21 +1,11 @@ -import { beforeEach, expect, it, vi } from "vitest"; +import { afterAll, beforeEach, expect, it, vi } from "vitest"; import { createVanilla } from "../src" -import { vol, fs } from 'memfs' import { cwd } from "process"; -import { readdir, readdirSync, readFileSync } from "fs"; -import { toTreeSync } from "memfs/lib/print"; -vi.mock("node:fs"); -vi.mock("node:fs/promises") -vi.mock("fs"); -vi.mock("fs/promises") -beforeEach(() => { - // reset the state of in-memory fs - vol.reset() -}) +import { existsSync, readdir, readdirSync, readFileSync } from "fs"; +import { rm } from "fs/promises"; it("downloads and extracts the typescript template", async () => { - const res = await createVanilla({ template: "ts", destination: "test/ts" }, false) - - // const res = readdirSync(cwd()); - // console.log(res); - console.log(toTreeSync(fs)) + await createVanilla({ template: "ts", destination: "./test/ts" }, false) + + const appTsx = existsSync("./test/ts/src/App.tsx"); + expect(appTsx).toBe(true); }) \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1b31e4b..eec75b4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,9 +11,6 @@ importers: '@changesets/cli': specifier: 2.27.11 version: 2.27.11 - memfs: - specifier: ^4.17.0 - version: 4.17.0 nodemon: specifier: ^3.1.9 version: 3.1.9 @@ -517,24 +514,6 @@ packages: '@jridgewell/trace-mapping@0.3.19': resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} - '@jsonjoy.com/base64@1.1.2': - resolution: {integrity: sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==} - engines: {node: '>=10.0'} - peerDependencies: - tslib: '2' - - '@jsonjoy.com/json-pack@1.1.1': - resolution: {integrity: sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==} - engines: {node: '>=10.0'} - peerDependencies: - tslib: '2' - - '@jsonjoy.com/util@1.5.0': - resolution: {integrity: sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==} - engines: {node: '>=10.0'} - peerDependencies: - tslib: '2' - '@manypkg/find-root@1.1.0': resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==} @@ -1175,10 +1154,6 @@ packages: resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==} engines: {node: '>=18.18.0'} - hyperdyperid@1.2.0: - resolution: {integrity: sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==} - engines: {node: '>=10.18'} - iconv-lite@0.4.24: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} @@ -1293,10 +1268,6 @@ packages: magicast@0.3.5: resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} - memfs@4.17.0: - resolution: {integrity: sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==} - engines: {node: '>= 4.0.0'} - merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -1657,12 +1628,6 @@ packages: thenify@3.3.1: resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==} - thingies@1.21.0: - resolution: {integrity: sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==} - engines: {node: '>=10.18'} - peerDependencies: - tslib: ^2 - tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} @@ -1707,12 +1672,6 @@ packages: tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} - tree-dump@1.0.2: - resolution: {integrity: sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==} - engines: {node: '>=10.0'} - peerDependencies: - tslib: '2' - tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -1720,9 +1679,6 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tslib@2.8.1: - resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - tsup@8.3.5: resolution: {integrity: sha512-Tunf6r6m6tnZsG9GYWndg0z8dEV7fD733VBFzFJ5Vcm1FtlXB8xBD/rtrBi2a3YKEV7hHtxiZtW5EAVADoe1pA==} engines: {node: '>=18'} @@ -2255,22 +2211,6 @@ snapshots: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 - '@jsonjoy.com/base64@1.1.2(tslib@2.8.1)': - dependencies: - tslib: 2.8.1 - - '@jsonjoy.com/json-pack@1.1.1(tslib@2.8.1)': - dependencies: - '@jsonjoy.com/base64': 1.1.2(tslib@2.8.1) - '@jsonjoy.com/util': 1.5.0(tslib@2.8.1) - hyperdyperid: 1.2.0 - thingies: 1.21.0(tslib@2.8.1) - tslib: 2.8.1 - - '@jsonjoy.com/util@1.5.0(tslib@2.8.1)': - dependencies: - tslib: 2.8.1 - '@manypkg/find-root@1.1.0': dependencies: '@babel/runtime': 7.24.4 @@ -2866,8 +2806,6 @@ snapshots: human-signals@8.0.0: {} - hyperdyperid@1.2.0: {} - iconv-lite@0.4.24: dependencies: safer-buffer: 2.1.2 @@ -2959,13 +2897,6 @@ snapshots: '@babel/types': 7.25.6 source-map-js: 1.2.0 - memfs@4.17.0: - dependencies: - '@jsonjoy.com/json-pack': 1.1.1(tslib@2.8.1) - '@jsonjoy.com/util': 1.5.0(tslib@2.8.1) - tree-dump: 1.0.2(tslib@2.8.1) - tslib: 2.8.1 - merge2@1.4.1: {} micromatch@4.0.5: @@ -3298,10 +3229,6 @@ snapshots: dependencies: any-promise: 1.3.0 - thingies@1.21.0(tslib@2.8.1): - dependencies: - tslib: 2.8.1 - tinybench@2.9.0: {} tinyexec@0.3.1: {} @@ -3337,16 +3264,10 @@ snapshots: dependencies: punycode: 2.3.0 - tree-dump@1.0.2(tslib@2.8.1): - dependencies: - tslib: 2.8.1 - tree-kill@1.2.2: {} ts-interface-checker@0.1.13: {} - tslib@2.8.1: {} - tsup@8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): dependencies: bundle-require: 5.0.0(esbuild@0.24.0) diff --git a/setup.ts b/setup.ts new file mode 100644 index 0000000..73583ec --- /dev/null +++ b/setup.ts @@ -0,0 +1,6 @@ +import type { TestProject } from 'vitest/node' +import { rmSync } from "fs"; +export default function setup(project: TestProject) { + // Clean up test directory before running tests + rmSync("./test", { recursive: true }) +} \ No newline at end of file diff --git a/vitest.config.ts b/vitest.config.ts new file mode 100644 index 0000000..e2f77f6 --- /dev/null +++ b/vitest.config.ts @@ -0,0 +1,4 @@ +import { defineConfig } from "vitest/config"; +export default defineConfig({ + test: { globalSetup: ["./setup.ts"] } +}) \ No newline at end of file From 3875bbc2e1884967a7add6c09cdccc12920981df Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:06:44 +0000 Subject: [PATCH 150/290] refactor: remove unused imports --- packages/create-solid/tests/template.test.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/tests/template.test.ts b/packages/create-solid/tests/template.test.ts index d2e01b5..c29d52b 100644 --- a/packages/create-solid/tests/template.test.ts +++ b/packages/create-solid/tests/template.test.ts @@ -1,8 +1,6 @@ -import { afterAll, beforeEach, expect, it, vi } from "vitest"; +import { expect, it } from "vitest"; import { createVanilla } from "../src" -import { cwd } from "process"; -import { existsSync, readdir, readdirSync, readFileSync } from "fs"; -import { rm } from "fs/promises"; +import { existsSync } from "fs"; it("downloads and extracts the typescript template", async () => { await createVanilla({ template: "ts", destination: "./test/ts" }, false) From d066fbe6a0d13914cc6e6ea79440d76f7fbcf4af Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:28:38 +0000 Subject: [PATCH 151/290] fix: only remove `test` directory if it exists --- setup.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.ts b/setup.ts index 73583ec..0da5513 100644 --- a/setup.ts +++ b/setup.ts @@ -1,6 +1,7 @@ import type { TestProject } from 'vitest/node' -import { rmSync } from "fs"; +import { existsSync, rmSync } from "fs"; export default function setup(project: TestProject) { // Clean up test directory before running tests - rmSync("./test", { recursive: true }) + if (existsSync("./test")) + rmSync("./test", { recursive: true }) } \ No newline at end of file From d4a2de5a774a6cc653d3cff5900f92c8e35826cb Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 14:45:37 +0000 Subject: [PATCH 152/290] feat: add next steps --- packages/create-solid/package.json | 3 ++- packages/create-solid/src/index.ts | 11 +++++++++++ pnpm-lock.yaml | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 84e87e7..e4c4b9d 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -39,7 +39,8 @@ "typescript": "^5.7.3", "@begit/core": "^0.1.1", "citty": "^0.1.6", - "sucrase": "^3.35.0" + "sucrase": "^3.35.0", + "@solid-cli/utils": "workspace:*" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/src/index.ts b/packages/create-solid/src/index.ts index e38148c..79848e8 100644 --- a/packages/create-solid/src/index.ts +++ b/packages/create-solid/src/index.ts @@ -6,6 +6,7 @@ import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; +import { detectPackageManager } from "@solid-cli/utils/package-manager"; export { createVanilla, createStart }; export const createSolid = (version: string) => defineCommand({ @@ -41,6 +42,7 @@ export const createSolid = (version: string) => async run({ args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart }, }) { + // Show prompts for any unknown arguments let projectName: string = projectNamePositional ?? projectNameOptional; let template: string = templatePositional; let isStart: boolean = solidstart; @@ -56,6 +58,7 @@ export const createSolid = (version: string) => options: template_opts.map((s: string) => ({ label: s, value: s })), }), ); + // Don't transpile project if it's already javascript! const isJS = template.startsWith("js") ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); @@ -72,5 +75,13 @@ export const createSolid = (version: string) => fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS), }); } + + // Next steps.. + const pM = detectPackageManager(); + p.note( + `cd ${projectName} +${pM.name} install +${pM.name} ${pM.runScriptCommand("dev")}`, + "To get started, run:"); }, }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eec75b4..d47b0ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,6 +32,9 @@ importers: '@clack/prompts': specifier: 0.9.1 version: 0.9.1 + '@solid-cli/utils': + specifier: workspace:* + version: link:../utils '@types/node': specifier: ^22.10.7 version: 22.10.7 From f07f7157325f2dc18a53d2baa44f65153ccb4f33 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:14:30 +0000 Subject: [PATCH 153/290] feat: add `full-solid` package which re-exports the `create` prompt under a subcommand --- .gitignore | 5 +++- packages/create-solid/package.json | 14 +++++++-- packages/create-solid/tsconfig.json | 8 +++-- packages/full-solid/README.md | 1 + packages/full-solid/package.json | 45 +++++++++++++++++++++++++++++ packages/full-solid/src/bin.ts | 14 +++++++++ packages/full-solid/tsconfig.json | 15 ++++++++++ packages/full-solid/tsup.config.ts | 17 +++++++++++ pnpm-lock.yaml | 27 +++++++++++++++++ turbo.json | 2 +- 10 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 packages/full-solid/README.md create mode 100644 packages/full-solid/package.json create mode 100644 packages/full-solid/src/bin.ts create mode 100644 packages/full-solid/tsconfig.json create mode 100644 packages/full-solid/tsup.config.ts diff --git a/.gitignore b/.gitignore index 3359d16..ba04bab 100644 --- a/.gitignore +++ b/.gitignore @@ -136,4 +136,7 @@ dist .pnp.* # Test directory -test \ No newline at end of file +test + +# Build output +types \ No newline at end of file diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index e4c4b9d..dc731d5 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -17,12 +17,22 @@ "solid", "cli" ], - "main": "dist/index.mjs", + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./types/src/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.mjs", + "types": "./types/src/index.d.ts" + } + }, "bin": { "create-solid": "./dist/bin.mjs" }, "files": [ - "dist" + "dist", + "types" ], "scripts": { "start": "jiti ./src/bin.ts", diff --git a/packages/create-solid/tsconfig.json b/packages/create-solid/tsconfig.json index 55a0135..51a5a37 100644 --- a/packages/create-solid/tsconfig.json +++ b/packages/create-solid/tsconfig.json @@ -1,7 +1,5 @@ { "compilerOptions": { - "baseUrl": ".", - "noEmit": true, "module": "ESNext", "target": "ESNext", "moduleResolution": "Bundler", @@ -9,7 +7,11 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "skipLibCheck": true, - "resolveJsonModule": true + "resolveJsonModule": true, + + "declaration": true, + "emitDeclarationOnly": true, + "outDir": "types" }, "include": ["src/*"] } diff --git a/packages/full-solid/README.md b/packages/full-solid/README.md new file mode 100644 index 0000000..0a9a706 --- /dev/null +++ b/packages/full-solid/README.md @@ -0,0 +1 @@ +# Full Solid diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json new file mode 100644 index 0000000..c684adf --- /dev/null +++ b/packages/full-solid/package.json @@ -0,0 +1,45 @@ +{ + "name": "@solid-cli/full", + "version": "0.5.13", + "description": "Create Solid apps with low configuration", + "author": "Thomas Beer", + "contributors": [ + "Rahul Batra" + ], + "license": "MIT", + "homepage": "https://solid-cli.netlify.app", + "repository": { + "type": "git", + "url": "https://github.com/solidjs-community/solid-cli" + }, + "keywords": [ + "solidjs", + "solid", + "cli" + ], + "main": "dist/index.mjs", + "bin": { + "sd": "./dist/bin.mjs" + }, + "files": [ + "dist" + ], + "scripts": { + "start": "jiti ./src/bin.ts", + "build": "tsc && tsup", + "test": "vitest run" + }, + "devDependencies": { + "@clack/prompts": "0.9.1", + "picocolors": "^1.1.1", + "@types/node": "^22.10.7", + "citty": "^0.1.6", + "create-solid": "workspace:*", + "jiti": "^2.4.2", + "tsup": "^8.3.5", + "typescript": "^5.7.3" + }, + "publishConfig": { + "access": "public" + } +} diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts new file mode 100644 index 0000000..79b8f47 --- /dev/null +++ b/packages/full-solid/src/bin.ts @@ -0,0 +1,14 @@ +#! /usr/bin/env node + +import { defineCommand, runMain } from "citty"; +import { createSolid } from "create-solid"; +import packageJson from "../package.json" with { type: "json" }; +import { intro } from "@clack/prompts"; +import * as color from "picocolors"; +intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); + +const main = defineCommand({ + subCommands: { create: createSolid(packageJson.version) }, +}) + +runMain(main); \ No newline at end of file diff --git a/packages/full-solid/tsconfig.json b/packages/full-solid/tsconfig.json new file mode 100644 index 0000000..55a0135 --- /dev/null +++ b/packages/full-solid/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "noEmit": true, + "module": "ESNext", + "target": "ESNext", + "moduleResolution": "Bundler", + "strict": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "skipLibCheck": true, + "resolveJsonModule": true + }, + "include": ["src/*"] +} diff --git a/packages/full-solid/tsup.config.ts b/packages/full-solid/tsup.config.ts new file mode 100644 index 0000000..ed15cdf --- /dev/null +++ b/packages/full-solid/tsup.config.ts @@ -0,0 +1,17 @@ +import { defineConfig } from "tsup"; + +export default defineConfig({ + entry: ["src/bin.ts"], + target: "esnext", + format: "esm", + splitting: true, + bundle: true, + sourcemap: false, + clean: true, + treeshake: true, + minify: true, + banner: { + js: `import { createRequire } from "module"; + const require = createRequire(import.meta.url);`, + }, +}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d47b0ad..fd3c1bd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -60,6 +60,33 @@ importers: specifier: ^5.7.3 version: 5.7.3 + packages/full-solid: + devDependencies: + '@clack/prompts': + specifier: 0.9.1 + version: 0.9.1 + '@types/node': + specifier: ^22.10.7 + version: 22.10.7 + citty: + specifier: ^0.1.6 + version: 0.1.6 + create-solid: + specifier: workspace:* + version: link:../create-solid + jiti: + specifier: ^2.4.2 + version: 2.4.2 + picocolors: + specifier: ^1.1.1 + version: 1.1.1 + tsup: + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + typescript: + specifier: ^5.7.3 + version: 5.7.3 + packages/utils: dependencies: '@clack/core': diff --git a/turbo.json b/turbo.json index d13c31c..2bd8cbe 100644 --- a/turbo.json +++ b/turbo.json @@ -3,7 +3,7 @@ "tasks": { "build": { "dependsOn": ["^build"], - "outputs": ["dist/**"] + "outputs": ["dist/**", "types/**"] }, "test": { "dependsOn": ["^test"] From 43cddeb4e9d6fd312827290e4d240930c48f858a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:25:12 +0000 Subject: [PATCH 154/290] feat: add `@solid-cli/create` package feat: export nothing from `create-solid` so it can be as small as possible --- packages/create-solid/package.json | 2 +- packages/create-solid/src/bin.ts | 2 +- packages/create-solid/tsup.config.ts | 2 +- packages/create/README.md | 29 ++++++++++ packages/create/package.json | 57 +++++++++++++++++++ .../src/create-start.ts | 0 .../src/create-vanilla.ts | 0 .../{create-solid => create}/src/create.ts | 0 .../{create-solid => create}/src/index.ts | 0 .../src/utils/constants.ts | 0 .../src/utils/file-system.ts | 0 .../src/utils/ts-conversion.ts | 0 .../{create-solid => create}/src/utils/ui.ts | 0 packages/create/tests/template.test.ts | 9 +++ packages/create/tsconfig.json | 17 ++++++ packages/create/tsup.config.ts | 15 +++++ packages/full-solid/package.json | 2 +- packages/full-solid/src/bin.ts | 2 +- pnpm-lock.yaml | 47 +++++++++++++-- 19 files changed, 174 insertions(+), 10 deletions(-) create mode 100644 packages/create/README.md create mode 100644 packages/create/package.json rename packages/{create-solid => create}/src/create-start.ts (100%) rename packages/{create-solid => create}/src/create-vanilla.ts (100%) rename packages/{create-solid => create}/src/create.ts (100%) rename packages/{create-solid => create}/src/index.ts (100%) rename packages/{create-solid => create}/src/utils/constants.ts (100%) rename packages/{create-solid => create}/src/utils/file-system.ts (100%) rename packages/{create-solid => create}/src/utils/ts-conversion.ts (100%) rename packages/{create-solid => create}/src/utils/ui.ts (100%) create mode 100644 packages/create/tests/template.test.ts create mode 100644 packages/create/tsconfig.json create mode 100644 packages/create/tsup.config.ts diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index dc731d5..89a7dda 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -50,7 +50,7 @@ "@begit/core": "^0.1.1", "citty": "^0.1.6", "sucrase": "^3.35.0", - "@solid-cli/utils": "workspace:*" + "@solid-cli/create": "workspace:*" }, "publishConfig": { "access": "public" diff --git a/packages/create-solid/src/bin.ts b/packages/create-solid/src/bin.ts index f9a3f43..5b848bd 100644 --- a/packages/create-solid/src/bin.ts +++ b/packages/create-solid/src/bin.ts @@ -1,7 +1,7 @@ #! /usr/bin/env node import { runMain } from "citty"; -import { createSolid } from "."; +import { createSolid } from "@solid-cli/create"; import { intro } from "@clack/prompts"; import color from "picocolors"; import packageJson from "../package.json" with { type: "json" }; diff --git a/packages/create-solid/tsup.config.ts b/packages/create-solid/tsup.config.ts index abd8918..ed15cdf 100644 --- a/packages/create-solid/tsup.config.ts +++ b/packages/create-solid/tsup.config.ts @@ -1,7 +1,7 @@ import { defineConfig } from "tsup"; export default defineConfig({ - entry: ["src/index.ts", "src/bin.ts"], + entry: ["src/bin.ts"], target: "esnext", format: "esm", splitting: true, diff --git a/packages/create/README.md b/packages/create/README.md new file mode 100644 index 0000000..ce864de --- /dev/null +++ b/packages/create/README.md @@ -0,0 +1,29 @@ +--- +description: Create Solid apps in one command with create-solid. +--- + +# Create Solid + +The easiest way to get started with Solid is by using `create-solid`. This CLI tool enables you to quickly start building a new Solid application, with everything set up for you. You can create a new app using the default SolidStart template or use one of the [Official SolidStart Examples](https://github.com/solidjs/solid-start/tree/main/examples). To get started, use the following command: + +```bash +#or +npm init solid@latest + +#or +pnpm create solid@latest + +# or +yarn create solid + +# or +bunx create-solid +``` + +## Why use Create Solid? + +`create-solid` allows you to create a new Solid app within seconds. It includes a number of benefits: + +- **Interactive Experience**: Running `npm init solid@latest` (with no arguments) launches an interactive experience that guides you through setting up a project. +- **Zero Dependencies**: Initializing a project is as quick as one second. Create Solid has zero runtime dependencies. +- **Support for Examples**: Create Solid App can bootstrap your application using an example from the SolidStart official examples collection. diff --git a/packages/create/package.json b/packages/create/package.json new file mode 100644 index 0000000..6d14e43 --- /dev/null +++ b/packages/create/package.json @@ -0,0 +1,57 @@ +{ + "name": "@solid-cli/create", + "version": "0.5.13", + "description": "Create Solid apps with low configuration", + "author": "Thomas Beer", + "contributors": [ + "Rahul Batra" + ], + "license": "MIT", + "homepage": "https://solid-cli.netlify.app", + "repository": { + "type": "git", + "url": "https://github.com/solidjs-community/solid-cli" + }, + "keywords": [ + "solidjs", + "solid", + "cli" + ], + "main": "./dist/index.mjs", + "module": "./dist/index.mjs", + "types": "./types/src/index.d.ts", + "exports": { + ".": { + "import": "./dist/index.mjs", + "require": "./dist/index.mjs", + "types": "./types/src/index.d.ts" + } + }, + "files": [ + "dist", + "types" + ], + "scripts": { + "start": "jiti ./src/bin.ts", + "build": "tsc && tsup", + "test": "vitest run" + }, + "devDependencies": { + "typescript": "^5.7.3", + "@types/node": "^22.10.7", + "tsup": "^8.3.5", + "jiti": "^2.4.2" + }, + "publishConfig": { + "access": "public" + }, + "dependencies": { + "@clack/prompts": "0.9.1", + "cmd-ts": "^0.13.0", + "picocolors": "^1.1.1", + "@begit/core": "^0.1.1", + "citty": "^0.1.6", + "sucrase": "^3.35.0", + "@solid-cli/utils": "workspace:*" + } +} diff --git a/packages/create-solid/src/create-start.ts b/packages/create/src/create-start.ts similarity index 100% rename from packages/create-solid/src/create-start.ts rename to packages/create/src/create-start.ts diff --git a/packages/create-solid/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts similarity index 100% rename from packages/create-solid/src/create-vanilla.ts rename to packages/create/src/create-vanilla.ts diff --git a/packages/create-solid/src/create.ts b/packages/create/src/create.ts similarity index 100% rename from packages/create-solid/src/create.ts rename to packages/create/src/create.ts diff --git a/packages/create-solid/src/index.ts b/packages/create/src/index.ts similarity index 100% rename from packages/create-solid/src/index.ts rename to packages/create/src/index.ts diff --git a/packages/create-solid/src/utils/constants.ts b/packages/create/src/utils/constants.ts similarity index 100% rename from packages/create-solid/src/utils/constants.ts rename to packages/create/src/utils/constants.ts diff --git a/packages/create-solid/src/utils/file-system.ts b/packages/create/src/utils/file-system.ts similarity index 100% rename from packages/create-solid/src/utils/file-system.ts rename to packages/create/src/utils/file-system.ts diff --git a/packages/create-solid/src/utils/ts-conversion.ts b/packages/create/src/utils/ts-conversion.ts similarity index 100% rename from packages/create-solid/src/utils/ts-conversion.ts rename to packages/create/src/utils/ts-conversion.ts diff --git a/packages/create-solid/src/utils/ui.ts b/packages/create/src/utils/ui.ts similarity index 100% rename from packages/create-solid/src/utils/ui.ts rename to packages/create/src/utils/ui.ts diff --git a/packages/create/tests/template.test.ts b/packages/create/tests/template.test.ts new file mode 100644 index 0000000..c29d52b --- /dev/null +++ b/packages/create/tests/template.test.ts @@ -0,0 +1,9 @@ +import { expect, it } from "vitest"; +import { createVanilla } from "../src" +import { existsSync } from "fs"; +it("downloads and extracts the typescript template", async () => { + await createVanilla({ template: "ts", destination: "./test/ts" }, false) + + const appTsx = existsSync("./test/ts/src/App.tsx"); + expect(appTsx).toBe(true); +}) \ No newline at end of file diff --git a/packages/create/tsconfig.json b/packages/create/tsconfig.json new file mode 100644 index 0000000..51a5a37 --- /dev/null +++ b/packages/create/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "module": "ESNext", + "target": "ESNext", + "moduleResolution": "Bundler", + "strict": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "skipLibCheck": true, + "resolveJsonModule": true, + + "declaration": true, + "emitDeclarationOnly": true, + "outDir": "types" + }, + "include": ["src/*"] +} diff --git a/packages/create/tsup.config.ts b/packages/create/tsup.config.ts new file mode 100644 index 0000000..4a06abf --- /dev/null +++ b/packages/create/tsup.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from "tsup"; + +export default defineConfig({ + entry: ["src/index.ts"], + target: "esnext", + format: "esm", + splitting: true, + sourcemap: false, + clean: true, + treeshake: true, + banner: { + js: `import { createRequire } from "module"; + const require = createRequire(import.meta.url);`, + }, +}); diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index c684adf..3d6bc37 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -34,7 +34,7 @@ "picocolors": "^1.1.1", "@types/node": "^22.10.7", "citty": "^0.1.6", - "create-solid": "workspace:*", + "@solid-cli/create": "workspace:*", "jiti": "^2.4.2", "tsup": "^8.3.5", "typescript": "^5.7.3" diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index 79b8f47..c509d5a 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -1,7 +1,7 @@ #! /usr/bin/env node import { defineCommand, runMain } from "citty"; -import { createSolid } from "create-solid"; +import { createSolid } from "@solid-cli/create"; import packageJson from "../package.json" with { type: "json" }; import { intro } from "@clack/prompts"; import * as color from "picocolors"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fd3c1bd..209b968 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -24,8 +24,8 @@ importers: specifier: ^3.0.2 version: 3.0.2(@types/node@22.10.7) - packages/create-solid: - devDependencies: + packages/create: + dependencies: '@begit/core': specifier: ^0.1.1 version: 0.1.1 @@ -35,6 +35,43 @@ importers: '@solid-cli/utils': specifier: workspace:* version: link:../utils + citty: + specifier: ^0.1.6 + version: 0.1.6 + cmd-ts: + specifier: ^0.13.0 + version: 0.13.0 + picocolors: + specifier: ^1.1.1 + version: 1.1.1 + sucrase: + specifier: ^3.35.0 + version: 3.35.0 + devDependencies: + '@types/node': + specifier: ^22.10.7 + version: 22.10.7 + jiti: + specifier: ^2.4.2 + version: 2.4.2 + tsup: + specifier: ^8.3.5 + version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + typescript: + specifier: ^5.7.3 + version: 5.7.3 + + packages/create-solid: + devDependencies: + '@begit/core': + specifier: ^0.1.1 + version: 0.1.1 + '@clack/prompts': + specifier: 0.9.1 + version: 0.9.1 + '@solid-cli/create': + specifier: workspace:* + version: link:../create '@types/node': specifier: ^22.10.7 version: 22.10.7 @@ -65,15 +102,15 @@ importers: '@clack/prompts': specifier: 0.9.1 version: 0.9.1 + '@solid-cli/create': + specifier: workspace:* + version: link:../create '@types/node': specifier: ^22.10.7 version: 22.10.7 citty: specifier: ^0.1.6 version: 0.1.6 - create-solid: - specifier: workspace:* - version: link:../create-solid jiti: specifier: ^2.4.2 version: 2.4.2 From 054c5bedf3045b8653cd5560a32697d68053e2e4 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:27:13 +0000 Subject: [PATCH 155/290] feat: don't emit or include types in `create-solid` --- packages/create-solid/package.json | 3 +-- packages/create-solid/tsconfig.json | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 89a7dda..775dd46 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,8 +31,7 @@ "create-solid": "./dist/bin.mjs" }, "files": [ - "dist", - "types" + "dist" ], "scripts": { "start": "jiti ./src/bin.ts", diff --git a/packages/create-solid/tsconfig.json b/packages/create-solid/tsconfig.json index 51a5a37..1115998 100644 --- a/packages/create-solid/tsconfig.json +++ b/packages/create-solid/tsconfig.json @@ -8,10 +8,7 @@ "forceConsistentCasingInFileNames": true, "skipLibCheck": true, "resolveJsonModule": true, - - "declaration": true, - "emitDeclarationOnly": true, - "outDir": "types" + "noEmit": true }, "include": ["src/*"] } From b26317ea6b16c641e9b4c91d9a909a66d47f03c8 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:28:38 +0000 Subject: [PATCH 156/290] fix: remove shebang from `@solid-cli/create` --- packages/create/src/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 79848e8..9047ba8 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -1,5 +1,3 @@ -#! /usr/bin/env node - import { defineCommand } from "citty"; import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; From d6a0e0c10e8e25796d8d094e410ed8cbfbdface6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:29:30 +0000 Subject: [PATCH 157/290] refactor: actually remove all exports from `create-solid` --- packages/create-solid/package.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 775dd46..3d69f12 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -20,13 +20,6 @@ "main": "./dist/index.mjs", "module": "./dist/index.mjs", "types": "./types/src/index.d.ts", - "exports": { - ".": { - "import": "./dist/index.mjs", - "require": "./dist/index.mjs", - "types": "./types/src/index.d.ts" - } - }, "bin": { "create-solid": "./dist/bin.mjs" }, From e7ceae32b24549a01bb1792d5560cbae7461f2ac Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:43:43 +0000 Subject: [PATCH 158/290] fix: change types export for `@solid-cli/create` --- packages/create/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create/package.json b/packages/create/package.json index 6d14e43..1dc1b05 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -19,12 +19,12 @@ ], "main": "./dist/index.mjs", "module": "./dist/index.mjs", - "types": "./types/src/index.d.ts", + "types": "./types/index.d.ts", "exports": { ".": { "import": "./dist/index.mjs", "require": "./dist/index.mjs", - "types": "./types/src/index.d.ts" + "types": "./types/index.d.ts" } }, "files": [ From 792a55408a849c4f30a5aa799c6bf638ab401059 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 15:44:50 +0000 Subject: [PATCH 159/290] fix: remove unnecessary test --- packages/create-solid/tests/template.test.ts | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 packages/create-solid/tests/template.test.ts diff --git a/packages/create-solid/tests/template.test.ts b/packages/create-solid/tests/template.test.ts deleted file mode 100644 index c29d52b..0000000 --- a/packages/create-solid/tests/template.test.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { expect, it } from "vitest"; -import { createVanilla } from "../src" -import { existsSync } from "fs"; -it("downloads and extracts the typescript template", async () => { - await createVanilla({ template: "ts", destination: "./test/ts" }, false) - - const appTsx = existsSync("./test/ts/src/App.tsx"); - expect(appTsx).toBe(true); -}) \ No newline at end of file From c3f4fca61349856672f49bcaa36fa47e5fcab76c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 16:09:30 +0000 Subject: [PATCH 160/290] feat: run tests on ubuntu, windows, and macos This should help catch platform-specific bugs --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 357d2cb..3f71550 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,10 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] steps: - uses: actions/checkout@v4 From 2de6bec3450bb2cb37c137939e11e01c2e451b9a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 16:48:14 +0000 Subject: [PATCH 161/290] refactor: remove unused dependencies refactor: make `jiti` a workspace dependency --- package.json | 11 +- packages/create-solid/package.json | 4 - packages/create/package.json | 4 +- packages/full-solid/package.json | 1 - packages/utils/package.json | 1 - pnpm-lock.yaml | 186 +---------------------------- 6 files changed, 11 insertions(+), 196 deletions(-) diff --git a/package.json b/package.json index 1e46299..fff9261 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,6 @@ "test:all": "turbo run test", "build": "turbo run build", "release": "pnpm build && changeset publish", - "watch:all": "nodemon --no-stdin -q --watch packages/core/src -e ts --exec 'turbo run build --scope=core' --watch packages/reactivity/src -e ts --exec 'turbo run build --scope=reactivity' --watch packages/ui/src -e ts --exec 'turbo run build --scope=ui' --watch packages/utils/src -e ts --exec 'turbo run build --scope=utils'", - "watch:core": "nodemon --watch packages/core/src -e ts --exec 'turbo run build --scope=core'", - "watch:reactivity": "nodemon --watch packages/reactivity/src -e ts --exec 'turbo run build --scope=reactivity'", - "watch:ui": "nodemon --watch packages/ui/src -e ts --exec 'turbo run build --scope=ui'", - "watch:utils": "nodemon --watch packages/utils/src -e ts --exec 'turbo run build --scope=utils'", "start": "cd packages/core && pnpm start", "format": "prettier --write ." }, @@ -35,10 +30,12 @@ ], "devDependencies": { "@changesets/cli": "2.27.11", - "nodemon": "^3.1.9", "prettier": "^3.4.2", "turbo": "^2.3.3", "vitest": "^3.0.2" }, - "packageManager": "pnpm@9.6.0" + "packageManager": "pnpm@9.6.0", + "dependencies": { + "jiti": "^2.4.2" + } } diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 3d69f12..67f2183 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -34,14 +34,10 @@ "devDependencies": { "@clack/prompts": "0.9.1", "@types/node": "^22.10.7", - "cmd-ts": "^0.13.0", - "jiti": "^2.4.2", "picocolors": "^1.1.1", "tsup": "^8.3.5", "typescript": "^5.7.3", - "@begit/core": "^0.1.1", "citty": "^0.1.6", - "sucrase": "^3.35.0", "@solid-cli/create": "workspace:*" }, "publishConfig": { diff --git a/packages/create/package.json b/packages/create/package.json index 1dc1b05..d432bce 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -39,15 +39,13 @@ "devDependencies": { "typescript": "^5.7.3", "@types/node": "^22.10.7", - "tsup": "^8.3.5", - "jiti": "^2.4.2" + "tsup": "^8.3.5" }, "publishConfig": { "access": "public" }, "dependencies": { "@clack/prompts": "0.9.1", - "cmd-ts": "^0.13.0", "picocolors": "^1.1.1", "@begit/core": "^0.1.1", "citty": "^0.1.6", diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 3d6bc37..6d8e038 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -35,7 +35,6 @@ "@types/node": "^22.10.7", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", - "jiti": "^2.4.2", "tsup": "^8.3.5", "typescript": "^5.7.3" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 6c0ceb5..d172aad 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -64,7 +64,6 @@ "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", "@types/node": "22.10.7", - "jiti": "^2.4.2", "magicast": "^0.3.5", "tsup": "^8.3.5", "typescript": "^5.7.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 209b968..8382e3f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,13 +7,14 @@ settings: importers: .: + dependencies: + jiti: + specifier: ^2.4.2 + version: 2.4.2 devDependencies: '@changesets/cli': specifier: 2.27.11 version: 2.27.11 - nodemon: - specifier: ^3.1.9 - version: 3.1.9 prettier: specifier: ^3.4.2 version: 3.4.2 @@ -38,9 +39,6 @@ importers: citty: specifier: ^0.1.6 version: 0.1.6 - cmd-ts: - specifier: ^0.13.0 - version: 0.13.0 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -51,9 +49,6 @@ importers: '@types/node': specifier: ^22.10.7 version: 22.10.7 - jiti: - specifier: ^2.4.2 - version: 2.4.2 tsup: specifier: ^8.3.5 version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) @@ -63,9 +58,6 @@ importers: packages/create-solid: devDependencies: - '@begit/core': - specifier: ^0.1.1 - version: 0.1.1 '@clack/prompts': specifier: 0.9.1 version: 0.9.1 @@ -78,18 +70,9 @@ importers: citty: specifier: ^0.1.6 version: 0.1.6 - cmd-ts: - specifier: ^0.13.0 - version: 0.13.0 - jiti: - specifier: ^2.4.2 - version: 2.4.2 picocolors: specifier: ^1.1.1 version: 1.1.1 - sucrase: - specifier: ^3.35.0 - version: 3.35.0 tsup: specifier: ^8.3.5 version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) @@ -111,9 +94,6 @@ importers: citty: specifier: ^0.1.6 version: 0.1.6 - jiti: - specifier: ^2.4.2 - version: 2.4.2 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -151,9 +131,6 @@ importers: '@types/node': specifier: 22.10.7 version: 22.10.7 - jiti: - specifier: ^2.4.2 - version: 2.4.2 magicast: specifier: ^0.3.5 version: 0.3.5 @@ -900,9 +877,6 @@ packages: '@vitest/utils@3.0.2': resolution: {integrity: sha512-Qu01ZYZlgHvDP02JnMBRpX43nRaZtNpIzw3C1clDXmn8eakgX6iQVGzTQ/NjkIr64WD8ioqOjkaYRVvHQI5qiw==} - abbrev@1.1.1: - resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} - ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} @@ -926,10 +900,6 @@ packages: any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -948,13 +918,6 @@ packages: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} engines: {node: '>=4'} - binary-extensions@2.2.0: - resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} - engines: {node: '>=8'} - - brace-expansion@1.1.11: - resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} - brace-expansion@2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} @@ -991,10 +954,6 @@ packages: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} - chokidar@4.0.1: resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} engines: {node: '>= 14.16.0'} @@ -1024,9 +983,6 @@ packages: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} - concat-map@0.0.1: - resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - consola@3.2.3: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} @@ -1206,10 +1162,6 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - has-flag@3.0.0: - resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} - engines: {node: '>=4'} - has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} @@ -1225,17 +1177,10 @@ packages: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} - ignore-by-default@1.0.1: - resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==} - ignore@5.2.4: resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} engines: {node: '>= 4'} - is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} @@ -1355,9 +1300,6 @@ packages: resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} engines: {node: '>= 0.6'} - minimatch@3.1.2: - resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} - minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -1397,19 +1339,6 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true - nodemon@3.1.9: - resolution: {integrity: sha512-hdr1oIb2p6ZSxu3PB2JWWYS7ZQ0qvaZsc3hK8DR8f02kRzc8rjYmxAIvdz+aYC+8F2IjNaB7HMcSDg8nQpJxyg==} - engines: {node: '>=10'} - hasBin: true - - nopt@1.0.10: - resolution: {integrity: sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==} - hasBin: true - - normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - npm-run-path@6.0.0: resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==} engines: {node: '>=18'} @@ -1534,9 +1463,6 @@ packages: resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==} engines: {node: '>=18'} - pstree.remy@1.1.8: - resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==} - punycode@2.3.0: resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} engines: {node: '>=6'} @@ -1548,10 +1474,6 @@ packages: resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==} engines: {node: '>=6'} - readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} - readdirp@4.0.2: resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==} engines: {node: '>= 14.16.0'} @@ -1608,10 +1530,6 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - simple-update-notifier@2.0.0: - resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==} - engines: {node: '>=10'} - sisteransi@1.0.5: resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} @@ -1672,10 +1590,6 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - supports-color@5.5.0: - resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} - engines: {node: '>=4'} - supports-color@7.2.0: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} @@ -1732,10 +1646,6 @@ packages: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} - touch@3.1.0: - resolution: {integrity: sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==} - hasBin: true - tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -1804,9 +1714,6 @@ packages: engines: {node: '>=14.17'} hasBin: true - undefsafe@2.0.5: - resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==} - undici-types@6.20.0: resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} @@ -2524,8 +2431,6 @@ snapshots: loupe: 3.1.2 tinyrainbow: 2.0.0 - abbrev@1.1.1: {} - ansi-colors@4.1.3: {} ansi-regex@5.0.1: {} @@ -2540,11 +2445,6 @@ snapshots: any-promise@1.3.0: {} - anymatch@3.1.3: - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - argparse@1.0.10: dependencies: sprintf-js: 1.0.3 @@ -2559,13 +2459,6 @@ snapshots: dependencies: is-windows: 1.0.2 - binary-extensions@2.2.0: {} - - brace-expansion@1.1.11: - dependencies: - balanced-match: 1.0.2 - concat-map: 0.0.1 - brace-expansion@2.0.1: dependencies: balanced-match: 1.0.2 @@ -2602,18 +2495,6 @@ snapshots: check-error@2.1.1: {} - chokidar@3.6.0: - dependencies: - anymatch: 3.1.3 - braces: 3.0.2 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - chokidar@4.0.1: dependencies: readdirp: 4.0.2 @@ -2643,8 +2524,6 @@ snapshots: commander@4.1.1: {} - concat-map@0.0.1: {} - consola@3.2.3: {} cross-spawn@7.0.3: @@ -2663,11 +2542,9 @@ snapshots: dependencies: ms: 2.1.2 - debug@4.3.7(supports-color@5.5.0): + debug@4.3.7: dependencies: ms: 2.1.3 - optionalDependencies: - supports-color: 5.5.0 debug@4.4.0: dependencies: @@ -2865,8 +2742,6 @@ snapshots: graceful-fs@4.2.11: {} - has-flag@3.0.0: {} - has-flag@4.0.0: {} human-id@1.0.2: {} @@ -2877,14 +2752,8 @@ snapshots: dependencies: safer-buffer: 2.1.2 - ignore-by-default@1.0.1: {} - ignore@5.2.4: {} - is-binary-path@2.1.0: - dependencies: - binary-extensions: 2.2.0 - is-extglob@2.1.1: {} is-fullwidth-code-point@3.0.0: {} @@ -2982,10 +2851,6 @@ snapshots: dependencies: mime-db: 1.52.0 - minimatch@3.1.2: - dependencies: - brace-expansion: 1.1.11 - minimatch@9.0.3: dependencies: brace-expansion: 2.0.1 @@ -3015,25 +2880,6 @@ snapshots: nanoid@3.3.7: {} - nodemon@3.1.9: - dependencies: - chokidar: 3.6.0 - debug: 4.3.7(supports-color@5.5.0) - ignore-by-default: 1.0.1 - minimatch: 3.1.2 - pstree.remy: 1.1.8 - semver: 7.6.0 - simple-update-notifier: 2.0.0 - supports-color: 5.5.0 - touch: 3.1.0 - undefsafe: 2.0.5 - - nopt@1.0.10: - dependencies: - abbrev: 1.1.1 - - normalize-path@3.0.0: {} - npm-run-path@6.0.0: dependencies: path-key: 4.0.0 @@ -3113,8 +2959,6 @@ snapshots: dependencies: parse-ms: 4.0.0 - pstree.remy@1.1.8: {} - punycode@2.3.0: {} queue-microtask@1.2.3: {} @@ -3126,10 +2970,6 @@ snapshots: pify: 4.0.1 strip-bom: 3.0.0 - readdirp@3.6.0: - dependencies: - picomatch: 2.3.1 - readdirp@4.0.2: {} regenerator-runtime@0.14.1: {} @@ -3208,10 +3048,6 @@ snapshots: signal-exit@4.1.0: {} - simple-update-notifier@2.0.0: - dependencies: - semver: 7.6.0 - sisteransi@1.0.5: {} slash@3.0.0: {} @@ -3269,10 +3105,6 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 - supports-color@5.5.0: - dependencies: - has-flag: 3.0.0 - supports-color@7.2.0: dependencies: has-flag: 4.0.0 @@ -3323,10 +3155,6 @@ snapshots: dependencies: is-number: 7.0.0 - touch@3.1.0: - dependencies: - nopt: 1.0.10 - tr46@1.0.1: dependencies: punycode: 2.3.0 @@ -3341,7 +3169,7 @@ snapshots: cac: 6.7.14 chokidar: 4.0.1 consola: 3.2.3 - debug: 4.3.7(supports-color@5.5.0) + debug: 4.3.7 esbuild: 0.24.0 joycon: 3.1.1 picocolors: 1.1.1 @@ -3392,8 +3220,6 @@ snapshots: typescript@5.7.3: {} - undefsafe@2.0.5: {} - undici-types@6.20.0: {} unicorn-magic@0.3.0: {} From 442e55dd16b4883eaa398347adbfe66f9f677210 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 16:58:03 +0000 Subject: [PATCH 162/290] fix: reorder `types` in `package.json`s to avoid build warning feat: use `turbo watch` for automatically rebuilding on change --- package.json | 3 ++- packages/create-solid/package.json | 1 - packages/create/package.json | 4 ++-- packages/full-solid/src/bin.ts | 2 +- packages/utils/package.json | 32 +++++++++++++++--------------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index fff9261..97e62cc 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "build": "turbo run build", "release": "pnpm build && changeset publish", "start": "cd packages/core && pnpm start", - "format": "prettier --write ." + "format": "prettier --write .", + "watch:build": "turbo watch build" }, "contributors": [ { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 67f2183..ea58685 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -19,7 +19,6 @@ ], "main": "./dist/index.mjs", "module": "./dist/index.mjs", - "types": "./types/src/index.d.ts", "bin": { "create-solid": "./dist/bin.mjs" }, diff --git a/packages/create/package.json b/packages/create/package.json index d432bce..2196c4e 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -22,9 +22,9 @@ "types": "./types/index.d.ts", "exports": { ".": { + "types": "./types/index.d.ts", "import": "./dist/index.mjs", - "require": "./dist/index.mjs", - "types": "./types/index.d.ts" + "require": "./dist/index.mjs" } }, "files": [ diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index c509d5a..4c1c95e 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -9,6 +9,6 @@ intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ subCommands: { create: createSolid(packageJson.version) }, -}) +}); runMain(main); \ No newline at end of file diff --git a/packages/utils/package.json b/packages/utils/package.json index d172aad..d0894fe 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -17,44 +17,44 @@ "types": "./types/index.d.ts", "exports": { ".": { + "types": "./types/index.d.ts", "import": "./dist/index.mjs", - "require": "./dist/index.mjs", - "types": "./types/index.d.ts" + "require": "./dist/index.mjs" }, "./paths": { + "types": "./types/paths/index.d.ts", "import": "./dist/paths/index.mjs", - "require": "./dist/paths/index.mjs", - "types": "./types/paths/index.d.ts" + "require": "./dist/paths/index.mjs" }, "./transform": { + "types": "./types/transform/index.d.ts", "import": "./dist/transform/index.mjs", - "require": "./dist/transform/index.mjs", - "types": "./types/transform/index.d.ts" + "require": "./dist/transform/index.mjs" }, "./updates": { + "types": "./types/updates/index.d.ts", "import": "./dist/updates/index.mjs", - "require": "./dist/updates/index.mjs", - "types": "./types/updates/index.d.ts" + "require": "./dist/updates/index.mjs" }, "./fs": { + "types": "./types/fs/index.d.ts", "import": "./dist/fs/index.mjs", - "require": "./dist/fs/index.mjs", - "types": "./types/fs/index.d.ts" + "require": "./dist/fs/index.mjs" }, "./util-types": { + "types": "./types/util-types/index.d.ts", "import": "./dist/util-types/index.mjs", - "require": "./dist/util-types/index.mjs", - "types": "./types/util-types/index.d.ts" + "require": "./dist/util-types/index.mjs" }, "./primitives": { + "types": "./types/primitives/index.d.ts", "import": "./dist/primitives/index.mjs", - "require": "./dist/primitives/index.mjs", - "types": "./types/primitives/index.d.ts" + "require": "./dist/primitives/index.mjs" }, "./package-manager": { + "types": "./types/package-manager/index.d.ts", "import": "./dist/package-manager/index.mjs", - "require": "./dist/package-manager/index.mjs", - "types": "./types/package-manager/index.d.ts" + "require": "./dist/package-manager/index.mjs" } }, "scripts": { From 1089fdc726c19391314adfb89e8038a0b8205fce Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:07:35 +0000 Subject: [PATCH 163/290] refactor(utils): remove in-memory cache from filesystem helpers --- packages/utils/src/fs/index.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/utils/src/fs/index.ts b/packages/utils/src/fs/index.ts index 8f992b3..a252d99 100644 --- a/packages/utils/src/fs/index.ts +++ b/packages/utils/src/fs/index.ts @@ -1,22 +1,22 @@ -import { readFile as readFile1 } from "fs/promises"; -import { queueUpdate, readQueuedFile, unqueueUpdate } from "../updates"; -export const writeFile = (path: string, data: string, checked: boolean = false) => { - // First, unqueue all previous updates to this file - unqueueUpdate(path, "file"); - queueUpdate({ type: "file", name: path, contents: data, checked }); -}; -export const readFile = async (path: string) => { - const queued = readQueuedFile(path); - if (queued) return queued.contents; - return await readFile1(path); -}; +import { readFile, writeFile } from "fs/promises"; +// import { queueUpdate, readQueuedFile, unqueueUpdate } from "../updates"; +// export const writeFile = (path: string, data: string, checked: boolean = false) => { +// // First, unqueue all previous updates to this file +// unqueueUpdate(path, "file"); +// queueUpdate({ type: "file", name: path, contents: data, checked }); +// }; +// export const readFile = async (path: string) => { +// const queued = readQueuedFile(path); +// if (queued) return queued.contents; +// return await readFile1(path); +// }; export const readFileToString = async (path: string) => { return (await readFile(path)).toString(); }; -export const writeChecked = async (path: string, contents: string) => { - unqueueUpdate(path, "file"); - queueUpdate({ type: "file", name: path, contents, checked: true }); -}; +// export const writeChecked = async (path: string, contents: string) => { +// unqueueUpdate(path, "file"); +// queueUpdate({ type: "file", name: path, contents, checked: true }); +// }; export const insertAtBeginning = async (path: string, text: string) => { const contents = await readFileToString(path); writeFile(path, text + contents); From b7bb42d3b07394e7fc4ecfbb57ca4f5208bfbd5f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:10:36 +0000 Subject: [PATCH 164/290] feat: add "Created with Solid CLI" text to README --- packages/create/src/index.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 9047ba8..22ed52a 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -5,6 +5,8 @@ import { cancelable, spinnerify } from "./utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; +import { insertAtEnd } from "@solid-cli/utils/fs"; +import { existsSync } from "node:fs"; export { createVanilla, createStart }; export const createSolid = (version: string) => defineCommand({ @@ -73,7 +75,12 @@ export const createSolid = (version: string) => fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS), }); } - + // Add "Created with Solid CLI" text to bottom of README + if (existsSync(`${projectName}/README.md`)) + await insertAtEnd( + `${projectName}/README.md`, + "\n## This project was created with the [Solid CLI](https://solid-cli.netlify.app)\n", + ); // Next steps.. const pM = detectPackageManager(); p.note( From 558b2bdd767843684f62287913ee09257b9175aa Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:13:07 +0000 Subject: [PATCH 165/290] fix: add blank `writeChecked` implementation to fix build --- packages/utils/src/fs/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/utils/src/fs/index.ts b/packages/utils/src/fs/index.ts index a252d99..1953f2c 100644 --- a/packages/utils/src/fs/index.ts +++ b/packages/utils/src/fs/index.ts @@ -17,6 +17,7 @@ export const readFileToString = async (path: string) => { // unqueueUpdate(path, "file"); // queueUpdate({ type: "file", name: path, contents, checked: true }); // }; +export const writeChecked = async (_path: string, _contents: string) => { throw new Error("Unimplemented") } export const insertAtBeginning = async (path: string, text: string) => { const contents = await readFileToString(path); writeFile(path, text + contents); From b66cee387a8c71f0c1c4213c6e690ae1c61a2480 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 17:32:55 +0000 Subject: [PATCH 166/290] release alpha package versions --- .changeset/pre.json | 11 +++++++++++ packages/create-solid/package.json | 2 +- packages/create/package.json | 2 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 .changeset/pre.json diff --git a/.changeset/pre.json b/.changeset/pre.json new file mode 100644 index 0000000..d94f0a0 --- /dev/null +++ b/.changeset/pre.json @@ -0,0 +1,11 @@ +{ + "mode": "pre", + "tag": "alpha", + "initialVersions": { + "@solid-cli/create": "0.6.0-alpha.0", + "create-solid": "0.6.0-alpha.1", + "@solid-cli/full": "0.6.0-alpha.0", + "@solid-cli/utils": "0.6.0-alpha.0" + }, + "changesets": [] +} diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ea58685..f79ad38 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.5.13", + "version": "0.6.0-alpha.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/package.json b/packages/create/package.json index 2196c4e..b3cd0d6 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.5.13", + "version": "0.6.0-alpha.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 6d8e038..b5314dc 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.5.13", + "version": "0.6.0-alpha.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index d0894fe..135c353 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.0.15", + "version": "0.6.0-alpha.0", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 5a572f9f55fa5fa97eb2de694e78e6ddf2b3e931 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 19 Jan 2025 18:02:55 +0000 Subject: [PATCH 167/290] refactor: remove `cmd-ts` from `@solid-cli/utils` --- packages/utils/package.json | 1 - pnpm-lock.yaml | 167 +++++++----------------------------- 2 files changed, 33 insertions(+), 135 deletions(-) diff --git a/packages/utils/package.json b/packages/utils/package.json index 135c353..cc62f8f 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -75,7 +75,6 @@ "dependencies": { "@clack/core": "0.4.1", "@clack/prompts": "0.9.1", - "cmd-ts": "^0.13.0", "execa": "^9.5.2", "picocolors": "^1.1.1", "smol-toml": "^1.3.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8382e3f..fe1f309 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -112,9 +112,6 @@ importers: '@clack/prompts': specifier: 0.9.1 version: 0.9.1 - cmd-ts: - specifier: ^0.13.0 - version: 0.13.0 execa: specifier: ^9.5.2 version: 9.5.2 @@ -159,8 +156,8 @@ packages: engines: {node: '>=6.0.0'} hasBin: true - '@babel/runtime@7.24.4': - resolution: {integrity: sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==} + '@babel/runtime@7.26.0': + resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==} engines: {node: '>=6.9.0'} '@babel/types@7.25.6': @@ -833,8 +830,8 @@ packages: '@swc/counter@0.1.3': resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==} - '@swc/types@0.1.6': - resolution: {integrity: sha512-/JLo/l2JsT/LRd80C3HfbmVpxOAJ11FO2RCEslFrgzLltoP9j8XIbsyDcfCt2WWyX+CM96rBoNM+IToAkFOugg==} + '@swc/types@0.1.17': + resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} @@ -921,10 +918,6 @@ packages: brace-expansion@2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} - braces@3.0.2: - resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} - engines: {node: '>=8'} - braces@3.0.3: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} @@ -943,10 +936,6 @@ packages: resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==} engines: {node: '>=12'} - chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - chardet@0.7.0: resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} @@ -969,9 +958,6 @@ packages: citty@0.1.6: resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} - cmd-ts@0.13.0: - resolution: {integrity: sha512-nsnxf6wNIM/JAS7T/x/1JmbEsjH0a8tezXqqpaL0O6+eV0/aDEnRxwjxpu0VzDdRcaC1ixGSbRlUuf/IU59I4g==} - color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} @@ -995,15 +981,6 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} - debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.3.7: resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} engines: {node: '>=6.0'} @@ -1035,9 +1012,6 @@ packages: engines: {node: '>=0.10'} hasBin: true - didyoumean@1.2.2: - resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} - dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} @@ -1091,12 +1065,12 @@ packages: resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} engines: {node: '>=4'} - fast-glob@3.3.1: - resolution: {integrity: sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==} + fast-glob@3.3.3: + resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} engines: {node: '>=8.6.0'} - fastq@1.15.0: - resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} + fastq@1.18.0: + resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} fdir@6.4.2: resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} @@ -1110,10 +1084,6 @@ packages: resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} engines: {node: '>=18'} - fill-range@7.0.1: - resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} - engines: {node: '>=8'} - fill-range@7.1.1: resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} engines: {node: '>=8'} @@ -1162,10 +1132,6 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - human-id@1.0.2: resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} @@ -1177,8 +1143,8 @@ packages: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} - ignore@5.2.4: - resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==} + ignore@5.3.2: + resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==} engines: {node: '>= 4'} is-extglob@2.1.1: @@ -1270,10 +1236,6 @@ packages: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} - lru-cache@6.0.0: - resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} - engines: {node: '>=10'} - magic-string@0.30.17: resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} @@ -1284,10 +1246,6 @@ packages: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} - micromatch@4.0.5: - resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==} - engines: {node: '>=8.6'} - micromatch@4.0.8: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} @@ -1325,9 +1283,6 @@ packages: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} - ms@2.1.2: - resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==} - ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -1374,8 +1329,8 @@ packages: resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==} engines: {node: '>=6'} - package-manager-detector@0.2.0: - resolution: {integrity: sha512-E385OSk9qDcXhcM9LNSe4sdhx8a9mAPrZ4sMLW+tmxl5ZuGtPUcdFu+MPP2jbgiWAZ6Pfe5soGFMd+0Db5Vrog==} + package-manager-detector@0.2.8: + resolution: {integrity: sha512-ts9KSdroZisdvKMWVAVCXiKqnqNfXz4+IbrBG8/BWx/TR5le+jfenvoBuIZ6UWM9nz47W7AbD9qYfAwfWMIwzA==} parse-ms@4.0.0: resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} @@ -1510,8 +1465,8 @@ packages: safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - semver@7.6.0: - resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==} + semver@7.6.3: + resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==} engines: {node: '>=10'} hasBin: true @@ -1590,10 +1545,6 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - tar@7.4.3: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} @@ -1807,9 +1758,6 @@ packages: resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==} engines: {node: '>=12'} - yallist@4.0.0: - resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yallist@5.0.0: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} @@ -1828,7 +1776,7 @@ snapshots: dependencies: '@babel/types': 7.25.6 - '@babel/runtime@7.24.4': + '@babel/runtime@7.26.0': dependencies: regenerator-runtime: 0.14.1 @@ -1856,7 +1804,7 @@ snapshots: outdent: 0.5.0 prettier: 2.8.8 resolve-from: 5.0.0 - semver: 7.6.0 + semver: 7.6.3 '@changesets/assemble-release-plan@6.0.5': dependencies: @@ -1865,7 +1813,7 @@ snapshots: '@changesets/should-skip-package': 0.1.1 '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 - semver: 7.6.0 + semver: 7.6.3 '@changesets/changelog-git@0.2.0': dependencies: @@ -1895,10 +1843,10 @@ snapshots: fs-extra: 7.0.1 mri: 1.2.0 p-limit: 2.3.0 - package-manager-detector: 0.2.0 + package-manager-detector: 0.2.8 picocolors: 1.1.1 resolve-from: 5.0.0 - semver: 7.6.0 + semver: 7.6.3 spawndamnit: 3.0.1 term-size: 2.2.1 @@ -1921,7 +1869,7 @@ snapshots: '@changesets/types': 6.0.0 '@manypkg/get-packages': 1.1.3 picocolors: 1.1.1 - semver: 7.6.0 + semver: 7.6.3 '@changesets/get-release-plan@4.0.6': dependencies: @@ -2187,14 +2135,14 @@ snapshots: '@manypkg/find-root@1.1.0': dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.26.0 '@types/node': 12.20.55 find-up: 4.1.0 fs-extra: 8.1.0 '@manypkg/get-packages@1.1.3': dependencies: - '@babel/runtime': 7.24.4 + '@babel/runtime': 7.26.0 '@changesets/types': 4.1.0 '@manypkg/find-root': 1.1.0 fs-extra: 8.1.0 @@ -2211,7 +2159,7 @@ snapshots: '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.15.0 + fastq: 1.18.0 '@parcel/source-map@2.1.1': dependencies: @@ -2359,7 +2307,7 @@ snapshots: '@swc/core@1.5.5': dependencies: '@swc/counter': 0.1.3 - '@swc/types': 0.1.6 + '@swc/types': 0.1.17 optionalDependencies: '@swc/core-darwin-arm64': 1.5.5 '@swc/core-darwin-x64': 1.5.5 @@ -2376,7 +2324,7 @@ snapshots: '@swc/counter@0.1.3': optional: true - '@swc/types@0.1.6': + '@swc/types@0.1.17': dependencies: '@swc/counter': 0.1.3 optional: true @@ -2463,10 +2411,6 @@ snapshots: dependencies: balanced-match: 1.0.2 - braces@3.0.2: - dependencies: - fill-range: 7.0.1 - braces@3.0.3: dependencies: fill-range: 7.1.1 @@ -2486,11 +2430,6 @@ snapshots: loupe: 3.1.1 pathval: 2.0.0 - chalk@4.1.2: - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - chardet@0.7.0: {} check-error@2.1.1: {} @@ -2507,15 +2446,6 @@ snapshots: dependencies: consola: 3.2.3 - cmd-ts@0.13.0: - dependencies: - chalk: 4.1.2 - debug: 4.3.4 - didyoumean: 1.2.2 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - supports-color - color-convert@2.0.1: dependencies: color-name: 1.1.4 @@ -2538,10 +2468,6 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - debug@4.3.4: - dependencies: - ms: 2.1.2 - debug@4.3.7: dependencies: ms: 2.1.3 @@ -2556,8 +2482,6 @@ snapshots: detect-libc@1.0.3: {} - didyoumean@1.2.2: {} - dir-glob@3.0.1: dependencies: path-type: 4.0.0 @@ -2659,15 +2583,15 @@ snapshots: iconv-lite: 0.4.24 tmp: 0.0.33 - fast-glob@3.3.1: + fast-glob@3.3.3: dependencies: '@nodelib/fs.stat': 2.0.5 '@nodelib/fs.walk': 1.2.8 glob-parent: 5.1.2 merge2: 1.4.1 - micromatch: 4.0.5 + micromatch: 4.0.8 - fastq@1.15.0: + fastq@1.18.0: dependencies: reusify: 1.0.4 @@ -2679,10 +2603,6 @@ snapshots: dependencies: is-unicode-supported: 2.1.0 - fill-range@7.0.1: - dependencies: - to-regex-range: 5.0.1 - fill-range@7.1.1: dependencies: to-regex-range: 5.0.1 @@ -2735,15 +2655,13 @@ snapshots: dependencies: array-union: 2.1.0 dir-glob: 3.0.1 - fast-glob: 3.3.1 - ignore: 5.2.4 + fast-glob: 3.3.3 + ignore: 5.3.2 merge2: 1.4.1 slash: 3.0.0 graceful-fs@4.2.11: {} - has-flag@4.0.0: {} - human-id@1.0.2: {} human-signals@8.0.0: {} @@ -2752,7 +2670,7 @@ snapshots: dependencies: safer-buffer: 2.1.2 - ignore@5.2.4: {} + ignore@5.3.2: {} is-extglob@2.1.1: {} @@ -2819,10 +2737,6 @@ snapshots: lru-cache@10.1.0: {} - lru-cache@6.0.0: - dependencies: - yallist: 4.0.0 - magic-string@0.30.17: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 @@ -2835,11 +2749,6 @@ snapshots: merge2@1.4.1: {} - micromatch@4.0.5: - dependencies: - braces: 3.0.2 - picomatch: 2.3.1 - micromatch@4.0.8: dependencies: braces: 3.0.3 @@ -2868,8 +2777,6 @@ snapshots: mri@1.2.0: {} - ms@2.1.2: {} - ms@2.1.3: {} mz@2.7.0: @@ -2907,7 +2814,7 @@ snapshots: p-try@2.2.0: {} - package-manager-detector@0.2.0: {} + package-manager-detector@0.2.8: {} parse-ms@4.0.0: {} @@ -3034,9 +2941,7 @@ snapshots: safer-buffer@2.1.2: {} - semver@7.6.0: - dependencies: - lru-cache: 6.0.0 + semver@7.6.3: {} shebang-command@2.0.0: dependencies: @@ -3105,10 +3010,6 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 - supports-color@7.2.0: - dependencies: - has-flag: 4.0.0 - tar@7.4.3: dependencies: '@isaacs/fs-minipass': 4.0.0 @@ -3315,8 +3216,6 @@ snapshots: string-width: 5.1.2 strip-ansi: 7.1.0 - yallist@4.0.0: {} - yallist@5.0.0: {} yoctocolors@2.1.1: {} From 4ce5f302d1a4a9f87953b9e08a462374e5a2db09 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:32:33 +0000 Subject: [PATCH 168/290] format --- .changeset/pre.json | 18 +++--- packages/create/src/index.ts | 3 +- packages/create/src/utils/constants.ts | 82 +++++++++++++------------- packages/create/tests/template.test.ts | 10 ++-- packages/full-solid/src/bin.ts | 4 +- packages/utils/src/fs/index.ts | 4 +- setup.ts | 9 ++- vitest.config.ts | 4 +- 8 files changed, 68 insertions(+), 66 deletions(-) diff --git a/.changeset/pre.json b/.changeset/pre.json index d94f0a0..6b257a5 100644 --- a/.changeset/pre.json +++ b/.changeset/pre.json @@ -1,11 +1,11 @@ { - "mode": "pre", - "tag": "alpha", - "initialVersions": { - "@solid-cli/create": "0.6.0-alpha.0", - "create-solid": "0.6.0-alpha.1", - "@solid-cli/full": "0.6.0-alpha.0", - "@solid-cli/utils": "0.6.0-alpha.0" - }, - "changesets": [] + "mode": "pre", + "tag": "alpha", + "initialVersions": { + "@solid-cli/create": "0.6.0-alpha.0", + "create-solid": "0.6.0-alpha.1", + "@solid-cli/full": "0.6.0-alpha.0", + "@solid-cli/utils": "0.6.0-alpha.0" + }, + "changesets": [] } diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 22ed52a..f426c88 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -87,6 +87,7 @@ export const createSolid = (version: string) => `cd ${projectName} ${pM.name} install ${pM.name} ${pM.runScriptCommand("dev")}`, - "To get started, run:"); + "To get started, run:", + ); }, }); diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index dbf98de..3b37567 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -30,60 +30,60 @@ Thumbs.db `; export const JS_CONFIG = { - compilerOptions: { - jsx: "preserve", - jsxImportSource: "solid-js", - paths: { - "~/*": ["./src/*"], - }, - }, + compilerOptions: { + jsx: "preserve", + jsxImportSource: "solid-js", + paths: { + "~/*": ["./src/*"], + }, + }, }; // Supported templates const VANILLA_TEMPLATES = [ - "ts", - "ts-vitest", - "ts-uvu", - "ts-unocss", - "ts-tailwindcss", - "ts-sass", - "ts-router", - "ts-router-file-based", - "ts-minimal", - "ts-jest", - "ts-bootstrap", - "js", - "js-vitest", - "js-tailwindcss", + "ts", + "ts-vitest", + "ts-uvu", + "ts-unocss", + "ts-tailwindcss", + "ts-sass", + "ts-router", + "ts-router-file-based", + "ts-minimal", + "ts-jest", + "ts-bootstrap", + "js", + "js-vitest", + "js-tailwindcss", ] as const; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; const START_TEMPLATES = [ - "basic", - "bare", - "hackernews", - "notes", - "todomvc", - "with-auth", - "with-authjs", - "with-drizzle", - "with-mdx", - "with-prisma", - "with-solid-styled", - "with-tailwindcss", - "with-trpc", - "with-unocss", - "with-vitest", - "experiments", + "basic", + "bare", + "hackernews", + "notes", + "todomvc", + "with-auth", + "with-authjs", + "with-drizzle", + "with-mdx", + "with-prisma", + "with-solid-styled", + "with-tailwindcss", + "with-trpc", + "with-unocss", + "with-vitest", + "experiments", ] as const; export type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; export const getTemplatesList = async (isStart: boolean) => { - if (isStart) { - return START_TEMPLATES; - } - return VANILLA_TEMPLATES; + if (isStart) { + return START_TEMPLATES; + } + return VANILLA_TEMPLATES; }; // diff --git a/packages/create/tests/template.test.ts b/packages/create/tests/template.test.ts index c29d52b..ac7027c 100644 --- a/packages/create/tests/template.test.ts +++ b/packages/create/tests/template.test.ts @@ -1,9 +1,9 @@ import { expect, it } from "vitest"; -import { createVanilla } from "../src" +import { createVanilla } from "../src"; import { existsSync } from "fs"; it("downloads and extracts the typescript template", async () => { - await createVanilla({ template: "ts", destination: "./test/ts" }, false) + await createVanilla({ template: "ts", destination: "./test/ts" }, false); - const appTsx = existsSync("./test/ts/src/App.tsx"); - expect(appTsx).toBe(true); -}) \ No newline at end of file + const appTsx = existsSync("./test/ts/src/App.tsx"); + expect(appTsx).toBe(true); +}); diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index 4c1c95e..3b02b1c 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -8,7 +8,7 @@ import * as color from "picocolors"; intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ - subCommands: { create: createSolid(packageJson.version) }, + subCommands: { create: createSolid(packageJson.version) }, }); -runMain(main); \ No newline at end of file +runMain(main); diff --git a/packages/utils/src/fs/index.ts b/packages/utils/src/fs/index.ts index 1953f2c..ae8b698 100644 --- a/packages/utils/src/fs/index.ts +++ b/packages/utils/src/fs/index.ts @@ -17,7 +17,9 @@ export const readFileToString = async (path: string) => { // unqueueUpdate(path, "file"); // queueUpdate({ type: "file", name: path, contents, checked: true }); // }; -export const writeChecked = async (_path: string, _contents: string) => { throw new Error("Unimplemented") } +export const writeChecked = async (_path: string, _contents: string) => { + throw new Error("Unimplemented"); +}; export const insertAtBeginning = async (path: string, text: string) => { const contents = await readFileToString(path); writeFile(path, text + contents); diff --git a/setup.ts b/setup.ts index 0da5513..0b2b690 100644 --- a/setup.ts +++ b/setup.ts @@ -1,7 +1,6 @@ -import type { TestProject } from 'vitest/node' +import type { TestProject } from "vitest/node"; import { existsSync, rmSync } from "fs"; export default function setup(project: TestProject) { - // Clean up test directory before running tests - if (existsSync("./test")) - rmSync("./test", { recursive: true }) -} \ No newline at end of file + // Clean up test directory before running tests + if (existsSync("./test")) rmSync("./test", { recursive: true }); +} diff --git a/vitest.config.ts b/vitest.config.ts index e2f77f6..bef45c6 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,4 +1,4 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ - test: { globalSetup: ["./setup.ts"] } -}) \ No newline at end of file + test: { globalSetup: ["./setup.ts"] }, +}); From 9294c1b905a0e7f7c8d7832318ee70cf141847b6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:55:34 +0000 Subject: [PATCH 169/290] feat: begin adding command for pretty printing useful debug info --- packages/full-solid/src/debug/index.ts | 45 +++++++++++++++++++++ packages/full-solid/src/start/index.ts | 0 packages/full-solid/tests/debuginfo.test.ts | 6 +++ 3 files changed, 51 insertions(+) create mode 100644 packages/full-solid/src/debug/index.ts create mode 100644 packages/full-solid/src/start/index.ts create mode 100644 packages/full-solid/tests/debuginfo.test.ts diff --git a/packages/full-solid/src/debug/index.ts b/packages/full-solid/src/debug/index.ts new file mode 100644 index 0000000..9eed6a6 --- /dev/null +++ b/packages/full-solid/src/debug/index.ts @@ -0,0 +1,45 @@ +/// This subcommand prints useful debug info to stdout +import { readFile } from "fs/promises"; +import os from "os"; +type DebugInfo = { + runtime: { name: string, version: string } + os: { platform: string, release: string } + packages: Record +} +const getPackageJSON = async () => { + const f = await readFile("package.json"); + const parsed = JSON.parse(f.toString()); + return parsed; +} +const prettyPrintRecord = (record: Record) => { + let str = ""; + for (const key in record) { + const value = record[key]; + str += ` ${key}: ${value}\n` + } + return str; +} + +export const prettyPrint = (info: DebugInfo) => { + return `System: + OS: ${info.os.platform} ${info.os.release} +Runtime: + ${info.runtime.name}: v${info.runtime.version} +${Object.keys(info.packages).length !== 0 ? `Dependencies: +${prettyPrintRecord(info.packages)}` : ""}` +} +export const fetchDebugInfo = async (): Promise => { + const parsed = await getPackageJSON(); + const packages: Record = parsed.dependencies ?? {}; + return { + runtime: { + name: "Node", + version: "22.10.4" + }, + os: { + platform: os.platform(), + release: os.release() + }, + packages + } +} \ No newline at end of file diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts new file mode 100644 index 0000000..e69de29 diff --git a/packages/full-solid/tests/debuginfo.test.ts b/packages/full-solid/tests/debuginfo.test.ts new file mode 100644 index 0000000..d492e8e --- /dev/null +++ b/packages/full-solid/tests/debuginfo.test.ts @@ -0,0 +1,6 @@ +import { it } from "vitest"; +import { fetchDebugInfo, prettyPrint } from "../src/debug"; + +it("Runs", async () => { + console.log(prettyPrint(await fetchDebugInfo())) +}) \ No newline at end of file From cd20d0154c54e9a722156ecbd2c70936842ff0ca Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:03:31 +0000 Subject: [PATCH 170/290] feat: add `debug` command to full CLI This command allows for printing system information useful for debugging purposes --- packages/full-solid/src/bin.ts | 3 ++- packages/full-solid/src/debug/index.ts | 20 +++++++++++++------ .../full-solid/src/debug/runtime-detector.ts | 20 +++++++++++++++++++ 3 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 packages/full-solid/src/debug/runtime-detector.ts diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index 3b02b1c..c06965d 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -5,10 +5,11 @@ import { createSolid } from "@solid-cli/create"; import packageJson from "../package.json" with { type: "json" }; import { intro } from "@clack/prompts"; import * as color from "picocolors"; +import { debuginfo } from "./debug" intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ - subCommands: { create: createSolid(packageJson.version) }, + subCommands: { create: createSolid(packageJson.version), debug: debuginfo }, }); runMain(main); diff --git a/packages/full-solid/src/debug/index.ts b/packages/full-solid/src/debug/index.ts index 9eed6a6..9d6fb65 100644 --- a/packages/full-solid/src/debug/index.ts +++ b/packages/full-solid/src/debug/index.ts @@ -1,6 +1,9 @@ /// This subcommand prints useful debug info to stdout import { readFile } from "fs/promises"; import os from "os"; +import { defineCommand } from "citty"; +import { detectRuntime } from "./runtime-detector" +import * as p from "@clack/prompts"; type DebugInfo = { runtime: { name: string, version: string } os: { platform: string, release: string } @@ -24,22 +27,27 @@ export const prettyPrint = (info: DebugInfo) => { return `System: OS: ${info.os.platform} ${info.os.release} Runtime: - ${info.runtime.name}: v${info.runtime.version} + ${info.runtime.name}: ${info.runtime.version} ${Object.keys(info.packages).length !== 0 ? `Dependencies: ${prettyPrintRecord(info.packages)}` : ""}` } export const fetchDebugInfo = async (): Promise => { const parsed = await getPackageJSON(); const packages: Record = parsed.dependencies ?? {}; + const runtime = detectRuntime(); return { - runtime: { - name: "Node", - version: "22.10.4" - }, + runtime, os: { platform: os.platform(), release: os.release() }, packages } -} \ No newline at end of file +} + +export const debuginfo = defineCommand({ + async run(ctx) { + const info = await fetchDebugInfo(); + p.log.info(prettyPrint(info)); + }, +}) \ No newline at end of file diff --git a/packages/full-solid/src/debug/runtime-detector.ts b/packages/full-solid/src/debug/runtime-detector.ts new file mode 100644 index 0000000..2a1da3a --- /dev/null +++ b/packages/full-solid/src/debug/runtime-detector.ts @@ -0,0 +1,20 @@ +type RuntimeName = "Bun" | "Node" | "Deno" +type Runtime = { name: RuntimeName, version: string } +declare global { + var Bun: { version: string } | undefined + var Deno: { version: { deno: string } } | undefined +} +export const detectRuntime = (): Runtime => { + if (globalThis.Bun) { + return { name: "Bun", version: globalThis.Bun?.version } + } + if (globalThis.Deno) { + return { name: "Deno", version: globalThis.Deno?.version?.deno } + } + // @ts-ignore + if (typeof process !== undefined && !!process.versions?.node) { + // @ts-ignore + return { name: "Node", version: process?.version } + } + throw new Error("Unable to detect") +} From eb21580efd302b37e007b2b2d28917d12e8c8c82 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:17:49 +0000 Subject: [PATCH 171/290] format feat: add `docs` command Allows for opening the Solid docs in the browser --- packages/full-solid/package.json | 1 + packages/full-solid/src/bin.ts | 13 ++++++- packages/full-solid/src/debug/index.ts | 38 ++++++++++--------- .../full-solid/src/debug/runtime-detector.ts | 34 ++++++++--------- packages/full-solid/src/start/index.ts | 3 ++ packages/full-solid/tests/debuginfo.test.ts | 4 +- pnpm-lock.yaml | 3 ++ 7 files changed, 58 insertions(+), 38 deletions(-) diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index b5314dc..feb18ac 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -35,6 +35,7 @@ "@types/node": "^22.10.7", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", + "@solid-cli/utils": "workspace:*", "tsup": "^8.3.5", "typescript": "^5.7.3" }, diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index c06965d..d44602e 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -5,11 +5,20 @@ import { createSolid } from "@solid-cli/create"; import packageJson from "../package.json" with { type: "json" }; import { intro } from "@clack/prompts"; import * as color from "picocolors"; -import { debuginfo } from "./debug" +import { debuginfo } from "./debug"; +import { startCommands } from "./start"; +import { openInBrowser } from "@solid-cli/utils"; intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ - subCommands: { create: createSolid(packageJson.version), debug: debuginfo }, + subCommands: { + create: createSolid(packageJson.version), debug: debuginfo, start: startCommands, docs: defineCommand({ + meta: { description: "Open the Solid Docs in your browser" }, + async run() { + openInBrowser("https://docs.solidjs.com") + } + }) + }, }); runMain(main); diff --git a/packages/full-solid/src/debug/index.ts b/packages/full-solid/src/debug/index.ts index 9d6fb65..e3fda26 100644 --- a/packages/full-solid/src/debug/index.ts +++ b/packages/full-solid/src/debug/index.ts @@ -2,35 +2,38 @@ import { readFile } from "fs/promises"; import os from "os"; import { defineCommand } from "citty"; -import { detectRuntime } from "./runtime-detector" +import { detectRuntime } from "./runtime-detector"; import * as p from "@clack/prompts"; type DebugInfo = { - runtime: { name: string, version: string } - os: { platform: string, release: string } - packages: Record -} + runtime: { name: string; version: string }; + os: { platform: string; release: string }; + packages: Record; +}; const getPackageJSON = async () => { const f = await readFile("package.json"); const parsed = JSON.parse(f.toString()); return parsed; -} +}; const prettyPrintRecord = (record: Record) => { let str = ""; for (const key in record) { const value = record[key]; - str += ` ${key}: ${value}\n` + str += ` ${key}: ${value}\n`; } return str; -} +}; export const prettyPrint = (info: DebugInfo) => { return `System: OS: ${info.os.platform} ${info.os.release} Runtime: ${info.runtime.name}: ${info.runtime.version} -${Object.keys(info.packages).length !== 0 ? `Dependencies: -${prettyPrintRecord(info.packages)}` : ""}` -} +${Object.keys(info.packages).length !== 0 + ? `Dependencies: +${prettyPrintRecord(info.packages)}` + : "" + }`; +}; export const fetchDebugInfo = async (): Promise => { const parsed = await getPackageJSON(); const packages: Record = parsed.dependencies ?? {}; @@ -39,15 +42,16 @@ export const fetchDebugInfo = async (): Promise => { runtime, os: { platform: os.platform(), - release: os.release() + release: os.release(), }, - packages - } -} + packages, + }; +}; export const debuginfo = defineCommand({ - async run(ctx) { + meta: { description: "Print important debug info" }, + async run(_ctx) { const info = await fetchDebugInfo(); p.log.info(prettyPrint(info)); }, -}) \ No newline at end of file +}); diff --git a/packages/full-solid/src/debug/runtime-detector.ts b/packages/full-solid/src/debug/runtime-detector.ts index 2a1da3a..014cc4b 100644 --- a/packages/full-solid/src/debug/runtime-detector.ts +++ b/packages/full-solid/src/debug/runtime-detector.ts @@ -1,20 +1,20 @@ -type RuntimeName = "Bun" | "Node" | "Deno" -type Runtime = { name: RuntimeName, version: string } +type RuntimeName = "Bun" | "Node" | "Deno"; +type Runtime = { name: RuntimeName; version: string }; declare global { - var Bun: { version: string } | undefined - var Deno: { version: { deno: string } } | undefined + var Bun: { version: string } | undefined; + var Deno: { version: { deno: string } } | undefined; } export const detectRuntime = (): Runtime => { - if (globalThis.Bun) { - return { name: "Bun", version: globalThis.Bun?.version } - } - if (globalThis.Deno) { - return { name: "Deno", version: globalThis.Deno?.version?.deno } - } - // @ts-ignore - if (typeof process !== undefined && !!process.versions?.node) { - // @ts-ignore - return { name: "Node", version: process?.version } - } - throw new Error("Unable to detect") -} + if (globalThis.Bun) { + return { name: "Bun", version: globalThis.Bun?.version }; + } + if (globalThis.Deno) { + return { name: "Deno", version: globalThis.Deno?.version?.deno }; + } + // @ts-ignore + if (typeof process !== undefined && !!process.versions?.node) { + // @ts-ignore + return { name: "Node", version: process?.version }; + } + throw new Error("Unable to detect"); +}; diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index e69de29..e69a1bd 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -0,0 +1,3 @@ +import { defineCommand } from "citty"; + +export const startCommands = defineCommand({}); diff --git a/packages/full-solid/tests/debuginfo.test.ts b/packages/full-solid/tests/debuginfo.test.ts index d492e8e..1a52062 100644 --- a/packages/full-solid/tests/debuginfo.test.ts +++ b/packages/full-solid/tests/debuginfo.test.ts @@ -2,5 +2,5 @@ import { it } from "vitest"; import { fetchDebugInfo, prettyPrint } from "../src/debug"; it("Runs", async () => { - console.log(prettyPrint(await fetchDebugInfo())) -}) \ No newline at end of file + console.log(prettyPrint(await fetchDebugInfo())); +}); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe1f309..ac2e8ca 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -88,6 +88,9 @@ importers: '@solid-cli/create': specifier: workspace:* version: link:../create + '@solid-cli/utils': + specifier: workspace:* + version: link:../utils '@types/node': specifier: ^22.10.7 version: 22.10.7 From de4770231ec8f56d802c282f8ccd4c9808f92340 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:23:10 +0000 Subject: [PATCH 172/290] readme: update readme --- README.md | 52 +++++----------------------------------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 3e4293c..db310f3 100644 --- a/README.md +++ b/README.md @@ -10,56 +10,14 @@ [![Build and Test](https://github.com/solidjs-community/solid-cli/actions/workflows/tests.yml/badge.svg)](https://github.com/solidjs-community/solid-cli/actions/workflows/tests.yml) [![Netlify Status](https://api.netlify.com/api/v1/badges/5233ac74-3f53-4c90-b95d-25b528b931a1/deploy-status)](https://app.netlify.com/sites/solid-cli/deploys) -A custom-built CLI for creating and managing SolidJS apps and projects. +A CLI for creating and managing SolidJS apps and projects. -## Roadmap/Features +## Commands -- [x] Templates - - [x] From Degit -- [x] Docs -- [ ] Primitives - - [ ] Add/remove/update primitives - - [x] Search list of primitives -- [ ] Integrations - - [ ] Auth.js - - [x] Tailwind - - [ ] PandaCSS - - [ ] Cypress - - [ ] PostCSS - - [x] UnoCSS - - [ ] Vanilla Extract - - [x] Vitest - - [x] Tauri - - [ ] Playwright -- [ ] Utilities - - [ ] eslint-plugin-solid - - [x] solid-devtools -- [ ] Misc - - [x] Launch new Stackblitz - - [ ] Launch new CodeSandBox -- [x] SolidStart - - [x] New route - - [x] New data file - - [x] Enable Adapters - - [x] Enable SSR/CSR/SSG mode - -## Structure - -The CLI is invoked with `solid`. The commands then cascade, where actions are grouped with other similar actions. The actions will be: - -- `version`: Displays a changelog of recent Solid versions - - `start`: Specific command for Start versions -- `docs`: List a `man`-like page for versioned docs or link out to the docs -- `primitives`: Potential integration with Solid Primitives -- `add`, `remove`: Used for adding and installing integrations/packages ie. `solid add tailwind` -- `config`: For enabling a certain features ie. `solid config vite _____` -- `start`: Special keyword for SolidStart commands - - `mode`: Changes the Start serving mode (ssr/csr/ssg) `solid mode ssr` +- `sd create`: See [create-solid](./packages/create-solid) +- `sd docs`: Opens the Solid docs in the browser +- `sd start`: Special keyword for SolidStart commands - `route`: Creates a new route ie. `solid start route login` -- `new`: Opens your browser to a new template via CSB/SB ie. `solid new bare --stackblitz` opens -- `ecosystem` - - `add`: Starts the process of submitting your current project to our ecosystem listing (Solidex) ie. `solid ecosystem publish` - - `search`: Initializes an ecosystem search result `solid ecosystem search auth` ## Contributing From b190a0ee797d4d152aac8b8fbc81b3f3760ff42e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:27:04 +0000 Subject: [PATCH 173/290] format --- packages/full-solid/src/bin.ts | 11 +++++++---- packages/full-solid/src/debug/index.ts | 9 +++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index d44602e..a7c0807 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -12,12 +12,15 @@ intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ subCommands: { - create: createSolid(packageJson.version), debug: debuginfo, start: startCommands, docs: defineCommand({ + create: createSolid(packageJson.version), + debug: debuginfo, + start: startCommands, + docs: defineCommand({ meta: { description: "Open the Solid Docs in your browser" }, async run() { - openInBrowser("https://docs.solidjs.com") - } - }) + openInBrowser("https://docs.solidjs.com"); + }, + }), }, }); diff --git a/packages/full-solid/src/debug/index.ts b/packages/full-solid/src/debug/index.ts index e3fda26..77e8c14 100644 --- a/packages/full-solid/src/debug/index.ts +++ b/packages/full-solid/src/debug/index.ts @@ -28,11 +28,12 @@ export const prettyPrint = (info: DebugInfo) => { OS: ${info.os.platform} ${info.os.release} Runtime: ${info.runtime.name}: ${info.runtime.version} -${Object.keys(info.packages).length !== 0 - ? `Dependencies: +${ + Object.keys(info.packages).length !== 0 + ? `Dependencies: ${prettyPrintRecord(info.packages)}` - : "" - }`; + : "" +}`; }; export const fetchDebugInfo = async (): Promise => { const parsed = await getPackageJSON(); From e50c87151c5c5f92bbaf1fbb5b136d0a70f92952 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:38:52 +0000 Subject: [PATCH 174/290] feat(utils): fix `writeChecked` implementation feat(full): add `sd start route` subcommand --- packages/full-solid/src/start/index.ts | 21 +++++++++++++++++++-- packages/utils/src/fs/index.ts | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index e69a1bd..f4cff53 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -1,3 +1,20 @@ +import { createRoute } from "@solid-cli/utils"; import { defineCommand } from "citty"; - -export const startCommands = defineCommand({}); +import * as p from "@clack/prompts"; +export const startCommands = defineCommand({ + meta: { description: "Start-specific commands" }, subCommands: { + route: defineCommand({ + args: { + path: { + type: "positional", + required: false, + description: "Route name", + }, + }, + async run({ args: { path } }) { + await createRoute(path as string); + p.log.success(`Route ${path} successfully created!`) + }, + }) + } +}); diff --git a/packages/utils/src/fs/index.ts b/packages/utils/src/fs/index.ts index ae8b698..2f064d0 100644 --- a/packages/utils/src/fs/index.ts +++ b/packages/utils/src/fs/index.ts @@ -17,8 +17,8 @@ export const readFileToString = async (path: string) => { // unqueueUpdate(path, "file"); // queueUpdate({ type: "file", name: path, contents, checked: true }); // }; -export const writeChecked = async (_path: string, _contents: string) => { - throw new Error("Unimplemented"); +export const writeChecked = async (path: string, contents: string) => { + await writeFile(path, contents); }; export const insertAtBeginning = async (path: string, text: string) => { const contents = await readFileToString(path); From e20fa779a82172b69ddd22861b292d72ae3b3937 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:42:45 +0000 Subject: [PATCH 175/290] readme: replace `solid` with `sd` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db310f3..d4479ba 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ A CLI for creating and managing SolidJS apps and projects. - `sd create`: See [create-solid](./packages/create-solid) - `sd docs`: Opens the Solid docs in the browser - `sd start`: Special keyword for SolidStart commands - - `route`: Creates a new route ie. `solid start route login` + - `route`: Creates a new route ie. `sd start route login` ## Contributing From 2cfc25b6a17289278cebc0b58df55d7a2a97a6c0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:47:13 +0000 Subject: [PATCH 176/290] feat: add colour to `route` subcommand output --- packages/full-solid/src/start/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index f4cff53..d3be639 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -1,6 +1,7 @@ import { createRoute } from "@solid-cli/utils"; import { defineCommand } from "citty"; import * as p from "@clack/prompts"; +import { green } from "picocolors"; export const startCommands = defineCommand({ meta: { description: "Start-specific commands" }, subCommands: { route: defineCommand({ @@ -13,7 +14,7 @@ export const startCommands = defineCommand({ }, async run({ args: { path } }) { await createRoute(path as string); - p.log.success(`Route ${path} successfully created!`) + p.log.success(`Route ${green(path as string)} successfully created!`) }, }) } From de5fa730bf2f45e72edc504d0ba9356dbffae74a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:00:31 +0000 Subject: [PATCH 177/290] refactor: move `cancelable` and `spinnerify` into `@solid-cli/utils` feat: add interactive prompt for `route` subcommand --- packages/create/src/index.ts | 2 +- packages/full-solid/src/start/index.ts | 6 ++++++ packages/utils/package.json | 5 +++++ packages/utils/src/ui/cancelable.ts | 14 ++++++++++++++ packages/utils/src/ui/index.ts | 3 +++ .../utils/ui.ts => utils/src/ui/spinnerify.ts} | 18 ++---------------- 6 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 packages/utils/src/ui/cancelable.ts create mode 100644 packages/utils/src/ui/index.ts rename packages/{create/src/utils/ui.ts => utils/src/ui/spinnerify.ts} (66%) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index f426c88..3b16d01 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -1,7 +1,7 @@ import { defineCommand } from "citty"; import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; -import { cancelable, spinnerify } from "./utils/ui"; +import { cancelable, spinnerify } from "@solid-cli/utils/ui"; import { createStart } from "./create-start"; import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index d3be639..b56c1d8 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -2,6 +2,7 @@ import { createRoute } from "@solid-cli/utils"; import { defineCommand } from "citty"; import * as p from "@clack/prompts"; import { green } from "picocolors"; +import { cancelable } from "@solid-cli/utils/ui" export const startCommands = defineCommand({ meta: { description: "Start-specific commands" }, subCommands: { route: defineCommand({ @@ -13,6 +14,11 @@ export const startCommands = defineCommand({ }, }, async run({ args: { path } }) { + path ||= await cancelable(p.text({ + message: "Route name", validate(value) { + if (value.length === 0) return "A route name is required" + }, + })) await createRoute(path as string); p.log.success(`Route ${green(path as string)} successfully created!`) }, diff --git a/packages/utils/package.json b/packages/utils/package.json index cc62f8f..4d1b4b0 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -55,6 +55,11 @@ "types": "./types/package-manager/index.d.ts", "import": "./dist/package-manager/index.mjs", "require": "./dist/package-manager/index.mjs" + }, + "./ui": { + "types": "./types/ui/index.d.ts", + "import": "./dist/ui/index.mjs", + "require": "./dist/ui/index.mjs" } }, "scripts": { diff --git a/packages/utils/src/ui/cancelable.ts b/packages/utils/src/ui/cancelable.ts new file mode 100644 index 0000000..35f0255 --- /dev/null +++ b/packages/utils/src/ui/cancelable.ts @@ -0,0 +1,14 @@ +import { log } from "@clack/prompts"; +export const cancelable = async ( + prompt: Promise, + cancelMessage: string = "Canceled", +): Promise => { + const value = await prompt; + + if (typeof value === "symbol") { + log.warn(cancelMessage); + process.exit(0); + } + + return value; +}; diff --git a/packages/utils/src/ui/index.ts b/packages/utils/src/ui/index.ts new file mode 100644 index 0000000..be0fed0 --- /dev/null +++ b/packages/utils/src/ui/index.ts @@ -0,0 +1,3 @@ +import { cancelable } from "./cancelable"; +import { spinnerify } from "./spinnerify"; +export { cancelable, spinnerify } \ No newline at end of file diff --git a/packages/create/src/utils/ui.ts b/packages/utils/src/ui/spinnerify.ts similarity index 66% rename from packages/create/src/utils/ui.ts rename to packages/utils/src/ui/spinnerify.ts index baf8b4b..baa53b4 100644 --- a/packages/create/src/utils/ui.ts +++ b/packages/utils/src/ui/spinnerify.ts @@ -1,4 +1,4 @@ -import { log, spinner } from "@clack/prompts"; +import { spinner } from "@clack/prompts"; type SpinnerItem = { startText: string; finishText: string; @@ -16,18 +16,4 @@ export async function spinnerify(spinners: SpinnerItem[] | SpinnerItem( - prompt: Promise, - cancelMessage: string = "Canceled", -): Promise => { - const value = await prompt; - - if (typeof value === "symbol") { - log.warn(cancelMessage); - process.exit(0); - } - - return value; -}; +} \ No newline at end of file From 773fbba4c68ed7bbb0afd7e25e85209f6eb6b5ef Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:01:35 +0000 Subject: [PATCH 178/290] feat: add description to full CLI --- packages/full-solid/src/bin.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index a7c0807..2158440 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -11,6 +11,9 @@ import { openInBrowser } from "@solid-cli/utils"; intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ + meta: { + description: "The full Solid CLI" + }, subCommands: { create: createSolid(packageJson.version), debug: debuginfo, From fec958fdaf6563f31fc78bb2236b8d4975126a17 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:05:56 +0000 Subject: [PATCH 179/290] release --- packages/create/package.json | 2 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create/package.json b/packages/create/package.json index b3cd0d6..f24c386 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.0-alpha.0", + "version": "0.6.0-alpha.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index feb18ac..3dc644e 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.0-alpha.0", + "version": "0.6.0-alpha.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index 4d1b4b0..a96ffc2 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.6.0-alpha.0", + "version": "0.6.0-alpha.1", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 0d7bdd53bb4f2e3a745c55714c1425fb486820bf Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:06:43 +0000 Subject: [PATCH 180/290] feat: add completion message to `docs` subcommand --- packages/full-solid/src/bin.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index 2158440..12100b6 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -5,6 +5,7 @@ import { createSolid } from "@solid-cli/create"; import packageJson from "../package.json" with { type: "json" }; import { intro } from "@clack/prompts"; import * as color from "picocolors"; +import * as p from "@clack/prompts"; import { debuginfo } from "./debug"; import { startCommands } from "./start"; import { openInBrowser } from "@solid-cli/utils"; @@ -22,6 +23,7 @@ const main = defineCommand({ meta: { description: "Open the Solid Docs in your browser" }, async run() { openInBrowser("https://docs.solidjs.com"); + p.log.success("Opened successfully") }, }), }, From ea71f173e7591ccf52fcc68df7dab8fcbea7b0a6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 23 Jan 2025 20:50:58 +0000 Subject: [PATCH 181/290] feat: add `declarationMap` setting This enables going directly to source definition --- packages/utils/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 085de6c..594e530 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -15,7 +15,8 @@ "noUnusedLocals": true, "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, - "outDir": "types" + "outDir": "types", + "declarationMap": true }, "include": ["src/*", "src/**/*"] } From efa526295490f6d724c935d890136d1359a20dc8 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:23:31 +0000 Subject: [PATCH 182/290] feat: `route` command can now also add API routes --- packages/full-solid/src/start/index.ts | 25 ++++++++++++++++++------- packages/utils/src/start/add_api.ts | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index b56c1d8..62812f7 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -1,4 +1,4 @@ -import { createRoute } from "@solid-cli/utils"; +import { createApi, createRoute } from "@solid-cli/utils"; import { defineCommand } from "citty"; import * as p from "@clack/prompts"; import { green } from "picocolors"; @@ -6,22 +6,33 @@ import { cancelable } from "@solid-cli/utils/ui" export const startCommands = defineCommand({ meta: { description: "Start-specific commands" }, subCommands: { route: defineCommand({ + meta: { description: "Creates a new route" }, args: { path: { type: "positional", required: false, - description: "Route name", + description: "Route path", }, + api: { + type: "boolean", + required: false, + default: false, + alias: "a" + } }, - async run({ args: { path } }) { + async run({ args: { path, api } }) { path ||= await cancelable(p.text({ - message: "Route name", validate(value) { - if (value.length === 0) return "A route name is required" + message: "Route path", validate(value) { + if (value.length === 0) return "A route path is required" }, })) - await createRoute(path as string); + if (api) { + await createApi(path as string); + } else { + await createRoute(path as string); + } p.log.success(`Route ${green(path as string)} successfully created!`) }, - }) + }), } }); diff --git a/packages/utils/src/start/add_api.ts b/packages/utils/src/start/add_api.ts index 41fbf35..98ec483 100644 --- a/packages/utils/src/start/add_api.ts +++ b/packages/utils/src/start/add_api.ts @@ -8,7 +8,7 @@ export const createApi = async (path: string, name?: string) => { await mkdir(path_parts.join("/"), { recursive: true }); - path_parts.push(name ? `${name}.ts` : "hello.ts"); + path_parts.push(name ? `${name}.ts` : "index.ts"); await writeChecked(path_parts.join("/"), ""); }; From 0fc01a7bd40392fa2a33b884786b7d5c8ebd0295 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:33:23 +0000 Subject: [PATCH 183/290] ci: set `BEGIT_GH_API_KEY` when running tests --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3f71550..febcfe8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,3 +31,5 @@ jobs: run: pnpm build - name: Test all packages run: pnpm test + env: + BEGIT_GH_API_KEY: ${{ secrets.GITHUB_TOKEN }} From ac289056e28e445cf67be4e615ce60bffbf85e52 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:36:28 +0000 Subject: [PATCH 184/290] chore: update pnpm to latest --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97e62cc..5887281 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "turbo": "^2.3.3", "vitest": "^3.0.2" }, - "packageManager": "pnpm@9.6.0", + "packageManager": "pnpm@9.15.4", "dependencies": { "jiti": "^2.4.2" } From bf23a8d856fe2f58d36945fd1b39acacfca173f1 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 24 Jan 2025 18:45:29 +0000 Subject: [PATCH 185/290] fix: `StartTemplate` type incorrectly referenced `VANILLA_TEMPLATES` array --- packages/create/src/create.ts | 4 ++-- packages/create/src/utils/constants.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/create/src/create.ts b/packages/create/src/create.ts index 6629041..1fe7984 100644 --- a/packages/create/src/create.ts +++ b/packages/create/src/create.ts @@ -5,8 +5,8 @@ export async function create(args: CreateVanillaArgs, js: boolean, isStart: fals export async function create(args: CreateStartArgs, js: boolean, isStart: true): Promise; export async function create(args: CreateVanillaArgs | CreateStartArgs, js: boolean, isStart: boolean) { if (isStart) { - return createStart(args, js); + return createStart(args as CreateStartArgs, js); } else { - return createVanilla(args, js); + return createVanilla(args as CreateVanillaArgs, js); } } diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 3b37567..7618b02 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -77,7 +77,7 @@ const START_TEMPLATES = [ "with-vitest", "experiments", ] as const; -export type StartTemplate = (typeof VANILLA_TEMPLATES)[number]; +export type StartTemplate = (typeof START_TEMPLATES)[number]; export const getTemplatesList = async (isStart: boolean) => { if (isStart) { From 55bff9b3b87a0ef8daa042d1bbbd2dc283393b99 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 24 Jan 2025 19:08:30 +0000 Subject: [PATCH 186/290] tests: check `fetchDebugInfo` output --- packages/full-solid/tests/debuginfo.test.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/full-solid/tests/debuginfo.test.ts b/packages/full-solid/tests/debuginfo.test.ts index 1a52062..6bbe6cf 100644 --- a/packages/full-solid/tests/debuginfo.test.ts +++ b/packages/full-solid/tests/debuginfo.test.ts @@ -1,6 +1,8 @@ -import { it } from "vitest"; +import { expect, it } from "vitest"; import { fetchDebugInfo, prettyPrint } from "../src/debug"; it("Runs", async () => { - console.log(prettyPrint(await fetchDebugInfo())); + const output = prettyPrint(await fetchDebugInfo()); + + expect(output).contains("Runtime", "System"); }); From d1540f8e4f000bb7d156dbb2479fe3f4c735833a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 24 Jan 2025 23:58:03 +0000 Subject: [PATCH 187/290] refactor: rename `isJS` to `transpile` This better reflects the fact that js-based templates shouldn't be transpiled. Previously `isJS` would be set to false, which is obviously misleading --- packages/create/src/create-start.ts | 4 ++-- packages/create/src/create-vanilla.ts | 4 ++-- packages/create/src/index.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index 7088cc7..fef8cfb 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -25,8 +25,8 @@ export const createStartJS = async ({ template, destination }: CreateStartArgs) writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); }; -export const createStart = (args: CreateStartArgs, js?: boolean) => { - if (js) { +export const createStart = (args: CreateStartArgs, transpile?: boolean) => { + if (transpile) { return createStartJS(args); } return createStartTS(args); diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index dc2dc2d..c6c4716 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -8,8 +8,8 @@ export type CreateVanillaArgs = { template: VanillaTemplate; destination: string; }; -export const createVanilla = (args: CreateVanillaArgs, js?: boolean) => { - if (js) { +export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { + if (transpile) { return createVanillaJS(args); } return createVanillaTS(args); diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 3b16d01..dd1035b 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -60,19 +60,19 @@ export const createSolid = (version: string) => ); // Don't transpile project if it's already javascript! - const isJS = template.startsWith("js") ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); + const transpileToJS = template.startsWith("js") ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); if (isStart) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createStart({ template: template as StartTemplate, destination: projectName }, isJS), + fn: () => createStart({ template: template as StartTemplate, destination: projectName }, transpileToJS), }); } else { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, isJS), + fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, transpileToJS), }); } // Add "Created with Solid CLI" text to bottom of README From 5616190bb9bdc99256ec582b489595c772e30241 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 2 Feb 2025 23:19:03 +0000 Subject: [PATCH 188/290] chore: update dependencies --- package.json | 6 +- packages/create/package.json | 6 +- packages/full-solid/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 451 ++++++++++++------------------- 5 files changed, 179 insertions(+), 294 deletions(-) diff --git a/package.json b/package.json index 5887281..523a577 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,10 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.11", + "@changesets/cli": "2.27.12", "prettier": "^3.4.2", - "turbo": "^2.3.3", - "vitest": "^3.0.2" + "turbo": "^2.4.0", + "vitest": "^3.0.4" }, "packageManager": "pnpm@9.15.4", "dependencies": { diff --git a/packages/create/package.json b/packages/create/package.json index f24c386..199c7ba 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,8 +38,8 @@ }, "devDependencies": { "typescript": "^5.7.3", - "@types/node": "^22.10.7", - "tsup": "^8.3.5" + "@types/node": "^22.13.0", + "tsup": "^8.3.6" }, "publishConfig": { "access": "public" @@ -47,7 +47,7 @@ "dependencies": { "@clack/prompts": "0.9.1", "picocolors": "^1.1.1", - "@begit/core": "^0.1.1", + "@begit/core": "^0.1.5", "citty": "^0.1.6", "sucrase": "^3.35.0", "@solid-cli/utils": "workspace:*" diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 3dc644e..8fb7dd5 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,11 +32,11 @@ "devDependencies": { "@clack/prompts": "0.9.1", "picocolors": "^1.1.1", - "@types/node": "^22.10.7", + "@types/node": "^22.13.0", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", - "tsup": "^8.3.5", + "tsup": "^8.3.6", "typescript": "^5.7.3" }, "publishConfig": { diff --git a/packages/utils/package.json b/packages/utils/package.json index a96ffc2..d302510 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,11 +68,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.10.7", + "@types/node": "22.13.0", "magicast": "^0.3.5", - "tsup": "^8.3.5", + "tsup": "^8.3.6", "typescript": "^5.7.3", - "vitest": "^3.0.2" + "vitest": "^3.0.4" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ac2e8ca..9060b1a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,23 +13,23 @@ importers: version: 2.4.2 devDependencies: '@changesets/cli': - specifier: 2.27.11 - version: 2.27.11 + specifier: 2.27.12 + version: 2.27.12 prettier: specifier: ^3.4.2 version: 3.4.2 turbo: - specifier: ^2.3.3 - version: 2.3.3 + specifier: ^2.4.0 + version: 2.4.0 vitest: - specifier: ^3.0.2 - version: 3.0.2(@types/node@22.10.7) + specifier: ^3.0.4 + version: 3.0.4(@types/node@22.13.0) packages/create: dependencies: '@begit/core': - specifier: ^0.1.1 - version: 0.1.1 + specifier: ^0.1.5 + version: 0.1.5 '@clack/prompts': specifier: 0.9.1 version: 0.9.1 @@ -47,11 +47,11 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.10.7 - version: 22.10.7 + specifier: ^22.13.0 + version: 22.13.0 tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.3.6 + version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) typescript: specifier: ^5.7.3 version: 5.7.3 @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.10.7 - version: 22.10.7 + specifier: ^22.13.0 + version: 22.13.0 citty: specifier: ^0.1.6 version: 0.1.6 @@ -101,8 +101,8 @@ importers: specifier: ^1.1.1 version: 1.1.1 tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.3.6 + version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) typescript: specifier: ^5.7.3 version: 5.7.3 @@ -129,20 +129,20 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.10.7 - version: 22.10.7 + specifier: 22.13.0 + version: 22.13.0 magicast: specifier: ^0.3.5 version: 0.3.5 tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.3.6 + version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) typescript: specifier: ^5.7.3 version: 5.7.3 vitest: - specifier: ^3.0.2 - version: 3.0.2(@types/node@22.10.7) + specifier: ^3.0.4 + version: 3.0.4(@types/node@22.13.0) packages: @@ -167,11 +167,11 @@ packages: resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} - '@begit/core@0.1.1': - resolution: {integrity: sha512-uxooRorqP8Xv20jf/X+nhkbDIiEodl/oXwep5gNat7ccQnlu6oG/PxepcsOyvwonL9x0ZDEmP46fC5Uhu2fivA==} + '@begit/core@0.1.5': + resolution: {integrity: sha512-3DoFnqKlFrnK6vOGT/Y2dCZvmBmYTgNUOmGdjxdNQvGDAnoUm4XPyRu8dKE30PlKM+7CB0IsZOTPdNSPLBUq1g==} - '@changesets/apply-release-plan@7.0.7': - resolution: {integrity: sha512-qnPOcmmmnD0MfMg9DjU1/onORFyRpDXkMMl2IJg9mECY6RnxL3wN0TCCc92b2sXt1jt8DgjAUUsZYGUGTdYIXA==} + '@changesets/apply-release-plan@7.0.8': + resolution: {integrity: sha512-qjMUj4DYQ1Z6qHawsn7S71SujrExJ+nceyKKyI9iB+M5p9lCL55afuEd6uLBPRpLGWQwkwvWegDHtwHJb1UjpA==} '@changesets/assemble-release-plan@6.0.5': resolution: {integrity: sha512-IgvBWLNKZd6k4t72MBTBK3nkygi0j3t3zdC1zrfusYo0KpdsvnDjrMM9vPnTCLCMlfNs55jRL4gIMybxa64FCQ==} @@ -179,8 +179,8 @@ packages: '@changesets/changelog-git@0.2.0': resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} - '@changesets/cli@2.27.11': - resolution: {integrity: sha512-1QislpE+nvJgSZZo9+Lj3Lno5pKBgN46dAV8IVxKJy9wX8AOrs9nn5pYVZuDpoxWJJCALmbfOsHkyxujgetQSg==} + '@changesets/cli@2.27.12': + resolution: {integrity: sha512-9o3fOfHYOvBnyEn0mcahB7wzaA3P4bGJf8PNqGit5PKaMEFdsRixik+txkrJWd2VX+O6wRFXpxQL8j/1ANKE9g==} hasBin: true '@changesets/config@3.0.5': @@ -584,41 +584,21 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@rollup/rollup-android-arm-eabi@4.19.0': - resolution: {integrity: sha512-JlPfZ/C7yn5S5p0yKk7uhHTTnFlvTgLetl2VxqE518QgyM7C9bSfFTYvB/Q/ftkq0RIPY4ySxTz+/wKJ/dXC0w==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.26.0': resolution: {integrity: sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.19.0': - resolution: {integrity: sha512-RDxUSY8D1tWYfn00DDi5myxKgOk6RvWPxhmWexcICt/MEC6yEMr4HNCu1sXXYLw8iAsg0D44NuU+qNq7zVWCrw==} - cpu: [arm64] - os: [android] - '@rollup/rollup-android-arm64@4.26.0': resolution: {integrity: sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.19.0': - resolution: {integrity: sha512-emvKHL4B15x6nlNTBMtIaC9tLPRpeA5jMvRLXVbl/W9Ie7HhkrE7KQjvgS9uxgatL1HmHWDXk5TTS4IaNJxbAA==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-arm64@4.26.0': resolution: {integrity: sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.19.0': - resolution: {integrity: sha512-fO28cWA1dC57qCd+D0rfLC4VPbh6EOJXrreBmFLWPGI9dpMlER2YwSPZzSGfq11XgcEpPukPTfEVFtw2q2nYJg==} - cpu: [x64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.26.0': resolution: {integrity: sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==} cpu: [x64] @@ -634,121 +614,61 @@ packages: cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.19.0': - resolution: {integrity: sha512-2Rn36Ubxdv32NUcfm0wB1tgKqkQuft00PtM23VqLuCUR4N5jcNWDoV5iBC9jeGdgS38WK66ElncprqgMUOyomw==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.26.0': resolution: {integrity: sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.19.0': - resolution: {integrity: sha512-gJuzIVdq/X1ZA2bHeCGCISe0VWqCoNT8BvkQ+BfsixXwTOndhtLUpOg0A1Fcx/+eA6ei6rMBzlOz4JzmiDw7JQ==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.26.0': resolution: {integrity: sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.19.0': - resolution: {integrity: sha512-0EkX2HYPkSADo9cfeGFoQ7R0/wTKb7q6DdwI4Yn/ULFE1wuRRCHybxpl2goQrx4c/yzK3I8OlgtBu4xvted0ug==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.26.0': resolution: {integrity: sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.19.0': - resolution: {integrity: sha512-GlIQRj9px52ISomIOEUq/IojLZqzkvRpdP3cLgIE1wUWaiU5Takwlzpz002q0Nxxr1y2ZgxC2obWxjr13lvxNQ==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-musl@4.26.0': resolution: {integrity: sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': - resolution: {integrity: sha512-N6cFJzssruDLUOKfEKeovCKiHcdwVYOT1Hs6dovDQ61+Y9n3Ek4zXvtghPPelt6U0AH4aDGnDLb83uiJMkWYzQ==} - cpu: [ppc64] - os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': resolution: {integrity: sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.19.0': - resolution: {integrity: sha512-2DnD3mkS2uuam/alF+I7M84koGwvn3ZVD7uG+LEWpyzo/bq8+kKnus2EVCkcvh6PlNB8QPNFOz6fWd5N8o1CYg==} - cpu: [riscv64] - os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.26.0': resolution: {integrity: sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.19.0': - resolution: {integrity: sha512-D6pkaF7OpE7lzlTOFCB2m3Ngzu2ykw40Nka9WmKGUOTS3xcIieHe82slQlNq69sVB04ch73thKYIWz/Ian8DUA==} - cpu: [s390x] - os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.26.0': resolution: {integrity: sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.19.0': - resolution: {integrity: sha512-HBndjQLP8OsdJNSxpNIN0einbDmRFg9+UQeZV1eiYupIRuZsDEoeGU43NQsS34Pp166DtwQOnpcbV/zQxM+rWA==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-gnu@4.26.0': resolution: {integrity: sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.19.0': - resolution: {integrity: sha512-HxfbvfCKJe/RMYJJn0a12eiOI9OOtAUF4G6ozrFUK95BNyoJaSiBjIOHjZskTUffUrB84IPKkFG9H9nEvJGW6A==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-musl@4.26.0': resolution: {integrity: sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.19.0': - resolution: {integrity: sha512-HxDMKIhmcguGTiP5TsLNolwBUK3nGGUEoV/BO9ldUBoMLBssvh4J0X8pf11i1fTV7WShWItB1bKAKjX4RQeYmg==} - cpu: [arm64] - os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.26.0': resolution: {integrity: sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.19.0': - resolution: {integrity: sha512-xItlIAZZaiG/u0wooGzRsx11rokP4qyc/79LkAOdznGRAbOFc+SfEdfUOszG1odsHNgwippUJavag/+W/Etc6Q==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.26.0': resolution: {integrity: sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.19.0': - resolution: {integrity: sha512-xNo5fV5ycvCCKqiZcpB65VMR11NJB+StnxHz20jdqRAktfdfzhgjTiJ2doTDQE/7dqGaV5I7ZGqKpgph6lCIag==} - cpu: [x64] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.26.0': resolution: {integrity: sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==} cpu: [x64] @@ -836,9 +756,6 @@ packages: '@swc/types@0.1.17': resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} - '@types/estree@1.0.5': - resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} @@ -848,11 +765,14 @@ packages: '@types/node@22.10.7': resolution: {integrity: sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==} - '@vitest/expect@3.0.2': - resolution: {integrity: sha512-dKSHLBcoZI+3pmP5hiZ7I5grNru2HRtEW8Z5Zp4IXog8QYcxhlox7JUPyIIFWfN53+3HW3KPLIl6nSzUGgKSuQ==} + '@types/node@22.13.0': + resolution: {integrity: sha512-ClIbNe36lawluuvq3+YYhnIN2CELi+6q8NpnM7PYp4hBn/TatfboPgVSm2rwKRfnV2M+Ty9GWDFI64KEe+kysA==} - '@vitest/mocker@3.0.2': - resolution: {integrity: sha512-Hr09FoBf0jlwwSyzIF4Xw31OntpO3XtZjkccpcBf8FeVW3tpiyKlkeUzxS/txzHqpUCNIX157NaTySxedyZLvA==} + '@vitest/expect@3.0.4': + resolution: {integrity: sha512-Nm5kJmYw6P2BxhJPkO3eKKhGYKRsnqJqf+r0yOGRKpEP+bSCBDsjXgiu1/5QFrnPMEgzfC38ZEjvCFgaNBC0Eg==} + + '@vitest/mocker@3.0.4': + resolution: {integrity: sha512-gEef35vKafJlfQbnyOXZ0Gcr9IBUsMTyTLXsEQwuyYAerpHqvXhzdBnDFuHLpFqth3F7b6BaFr4qV/Cs1ULx5A==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -862,20 +782,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.2': - resolution: {integrity: sha512-yBohcBw/T/p0/JRgYD+IYcjCmuHzjC3WLAKsVE4/LwiubzZkE8N49/xIQ/KGQwDRA8PaviF8IRO8JMWMngdVVQ==} + '@vitest/pretty-format@3.0.4': + resolution: {integrity: sha512-ts0fba+dEhK2aC9PFuZ9LTpULHpY/nd6jhAQ5IMU7Gaj7crPCTdCFfgvXxruRBLFS+MLraicCuFXxISEq8C93g==} - '@vitest/runner@3.0.2': - resolution: {integrity: sha512-GHEsWoncrGxWuW8s405fVoDfSLk6RF2LCXp6XhevbtDjdDme1WV/eNmUueDfpY1IX3MJaCRelVCEXsT9cArfEg==} + '@vitest/runner@3.0.4': + resolution: {integrity: sha512-dKHzTQ7n9sExAcWH/0sh1elVgwc7OJ2lMOBrAm73J7AH6Pf9T12Zh3lNE1TETZaqrWFXtLlx3NVrLRb5hCK+iw==} - '@vitest/snapshot@3.0.2': - resolution: {integrity: sha512-h9s67yD4+g+JoYG0zPCo/cLTabpDqzqNdzMawmNPzDStTiwxwkyYM1v5lWE8gmGv3SVJ2DcxA2NpQJZJv9ym3g==} + '@vitest/snapshot@3.0.4': + resolution: {integrity: sha512-+p5knMLwIk7lTQkM3NonZ9zBewzVp9EVkVpvNta0/PlFWpiqLaRcF4+33L1it3uRUCh0BGLOaXPPGEjNKfWb4w==} - '@vitest/spy@3.0.2': - resolution: {integrity: sha512-8mI2iUn+PJFMT44e3ISA1R+K6ALVs47W6eriDTfXe6lFqlflID05MB4+rIFhmDSLBj8iBsZkzBYlgSkinxLzSQ==} + '@vitest/spy@3.0.4': + resolution: {integrity: sha512-sXIMF0oauYyUy2hN49VFTYodzEAu744MmGcPR3ZBsPM20G+1/cSW/n1U+3Yu/zHxX2bIDe1oJASOkml+osTU6Q==} - '@vitest/utils@3.0.2': - resolution: {integrity: sha512-Qu01ZYZlgHvDP02JnMBRpX43nRaZtNpIzw3C1clDXmn8eakgX6iQVGzTQ/NjkIr64WD8ioqOjkaYRVvHQI5qiw==} + '@vitest/utils@3.0.4': + resolution: {integrity: sha512-8BqC1ksYsHtbWH+DfpOAKrFw3jl3Uf9J7yeFh85Pz52IWuh1hBBtyfEbRNNZNjl8H8A5yMLH9/t+k7HIKzQcZQ==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -1112,9 +1032,6 @@ packages: engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] - get-func-name@2.0.2: - resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} - get-stream@9.0.1: resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} engines: {node: '>=18'} @@ -1229,9 +1146,6 @@ packages: lodash.startcase@4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} - loupe@3.1.1: - resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==} - loupe@3.1.2: resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==} @@ -1452,11 +1366,6 @@ packages: engines: {node: '>=14'} hasBin: true - rollup@4.19.0: - resolution: {integrity: sha512-5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - rollup@4.26.0: resolution: {integrity: sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -1629,38 +1538,57 @@ packages: typescript: optional: true - turbo-darwin-64@2.3.3: - resolution: {integrity: sha512-bxX82xe6du/3rPmm4aCC5RdEilIN99VUld4HkFQuw+mvFg6darNBuQxyWSHZTtc25XgYjQrjsV05888w1grpaA==} + tsup@8.3.6: + resolution: {integrity: sha512-XkVtlDV/58S9Ye0JxUUTcrQk4S+EqlOHKzg6Roa62rdjL1nGWNUstG0xgI4vanHdfIpjP448J8vlN0oK6XOJ5g==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + '@microsoft/api-extractor': ^7.36.0 + '@swc/core': ^1 + postcss: ^8.4.12 + typescript: '>=4.5.0' + peerDependenciesMeta: + '@microsoft/api-extractor': + optional: true + '@swc/core': + optional: true + postcss: + optional: true + typescript: + optional: true + + turbo-darwin-64@2.4.0: + resolution: {integrity: sha512-kVMScnPUa3R4n7woNmkR15kOY0aUwCLJcUyH5UC59ggKqr5HIHwweKYK8N1pwBQso0LQF4I9i93hIzfJguCcwQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.3.3: - resolution: {integrity: sha512-DYbQwa3NsAuWkCUYVzfOUBbSUBVQzH5HWUFy2Kgi3fGjIWVZOFk86ss+xsWu//rlEAfYwEmopigsPYSmW4X15A==} + turbo-darwin-arm64@2.4.0: + resolution: {integrity: sha512-8JObIpfun1guA7UlFR5jC/SOVm49lRscxMxfg5jZ5ABft79rhFC+ygN9AwAhGKv6W2DUhIh2xENkSgu4EDmUyg==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.3.3: - resolution: {integrity: sha512-eHj9OIB0dFaP6BxB88jSuaCLsOQSYWBgmhy2ErCu6D2GG6xW3b6e2UWHl/1Ho9FsTg4uVgo4DB9wGsKa5erjUA==} + turbo-linux-64@2.4.0: + resolution: {integrity: sha512-xWDGGcRlBuGV7HXWAVuTY6vsQi4aZxGMAnuiuNDg8Ij1aHGohOM0RUsWMXjxz4vuJmjk9+/D6NQqHH3AJEXezg==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.3.3: - resolution: {integrity: sha512-NmDE/NjZoDj1UWBhMtOPmqFLEBKhzGS61KObfrDEbXvU3lekwHeoPvAMfcovzswzch+kN2DrtbNIlz+/rp8OCg==} + turbo-linux-arm64@2.4.0: + resolution: {integrity: sha512-c3En99xMguc/Pdtk/rZP53LnDdw0W6lgUc04he8r8F+UHYSNvgzHh0WGXXmCC6lGbBH72kPhhGx4bAwyvi7dug==} cpu: [arm64] os: [linux] - turbo-windows-64@2.3.3: - resolution: {integrity: sha512-O2+BS4QqjK3dOERscXqv7N2GXNcqHr9hXumkMxDj/oGx9oCatIwnnwx34UmzodloSnJpgSqjl8iRWiY65SmYoQ==} + turbo-windows-64@2.4.0: + resolution: {integrity: sha512-/gOORuOlyA8JDPzyA16CD3wvyRcuBFePa1URAnFUof9hXQmKxK0VvSDO79cYZFsJSchCKNJpckUS0gYxGsWwoA==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.3.3: - resolution: {integrity: sha512-dW4ZK1r6XLPNYLIKjC4o87HxYidtRRcBeo/hZ9Wng2XM/MqqYkAyzJXJGgRMsc0MMEN9z4+ZIfnSNBrA0b08ag==} + turbo-windows-arm64@2.4.0: + resolution: {integrity: sha512-/DJIdTFijEMM5LSiEpSfarDOMOlYqJV+EzmppqWtHqDsOLF4hbbIBH9sJR6OOp5dURAu5eURBYdmvBRz9Lo6TA==} cpu: [arm64] os: [win32] - turbo@2.3.3: - resolution: {integrity: sha512-DUHWQAcC8BTiUZDRzAYGvpSpGLiaOQPfYXlCieQbwUvmml/LRGIe3raKdrOPOoiX0DYlzxs2nH6BoWJoZrj8hA==} + turbo@2.4.0: + resolution: {integrity: sha512-ah/yQp2oMif1X0u7fBJ4MLMygnkbKnW5O8SG6pJvloPCpHfFoZctkSVQiJ3VnvNTq71V2JJIdwmOeu1i34OQyg==} hasBin: true typescript@5.7.3: @@ -1679,8 +1607,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.0.2: - resolution: {integrity: sha512-hsEQerBAHvVAbv40m3TFQe/lTEbOp7yDpyqMJqr2Tnd+W58+DEYOt+fluQgekOePcsNBmR77lpVAnIU2Xu4SvQ==} + vite-node@3.0.4: + resolution: {integrity: sha512-7JZKEzcYV2Nx3u6rlvN8qdo3QV7Fxyt6hx+CCKz9fbWxdX5IvUOmTWEAxMrWxaiSf7CKGLJQ5rFu8prb/jBjOA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1712,20 +1640,23 @@ packages: terser: optional: true - vitest@3.0.2: - resolution: {integrity: sha512-5bzaHakQ0hmVVKLhfh/jXf6oETDBtgPo8tQCHYB+wftNgFJ+Hah67IsWc8ivx4vFL025Ow8UiuTf4W57z4izvQ==} + vitest@3.0.4: + resolution: {integrity: sha512-6XG8oTKy2gnJIFTHP6LD7ExFeNLxiTkK3CfMvT7IfR8IN+BYICCf0lXUQmX7i7JoxUP8QmeP4mTnWXgflu4yjw==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' + '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.2 - '@vitest/ui': 3.0.2 + '@vitest/browser': 3.0.4 + '@vitest/ui': 3.0.4 happy-dom: '*' jsdom: '*' peerDependenciesMeta: '@edge-runtime/vm': optional: true + '@types/debug': + optional: true '@types/node': optional: true '@vitest/browser': @@ -1789,11 +1720,11 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@begit/core@0.1.1': + '@begit/core@0.1.5': dependencies: tar: 7.4.3 - '@changesets/apply-release-plan@7.0.7': + '@changesets/apply-release-plan@7.0.8': dependencies: '@changesets/config': 3.0.5 '@changesets/get-version-range-type': 0.4.0 @@ -1822,9 +1753,9 @@ snapshots: dependencies: '@changesets/types': 6.0.0 - '@changesets/cli@2.27.11': + '@changesets/cli@2.27.12': dependencies: - '@changesets/apply-release-plan': 7.0.7 + '@changesets/apply-release-plan': 7.0.8 '@changesets/assemble-release-plan': 6.0.5 '@changesets/changelog-git': 0.2.0 '@changesets/config': 3.0.5 @@ -2171,27 +2102,15 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@rollup/rollup-android-arm-eabi@4.19.0': - optional: true - '@rollup/rollup-android-arm-eabi@4.26.0': optional: true - '@rollup/rollup-android-arm64@4.19.0': - optional: true - '@rollup/rollup-android-arm64@4.26.0': optional: true - '@rollup/rollup-darwin-arm64@4.19.0': - optional: true - '@rollup/rollup-darwin-arm64@4.26.0': optional: true - '@rollup/rollup-darwin-x64@4.19.0': - optional: true - '@rollup/rollup-darwin-x64@4.26.0': optional: true @@ -2201,75 +2120,39 @@ snapshots: '@rollup/rollup-freebsd-x64@4.26.0': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.19.0': - optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.26.0': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.19.0': - optional: true - '@rollup/rollup-linux-arm-musleabihf@4.26.0': optional: true - '@rollup/rollup-linux-arm64-gnu@4.19.0': - optional: true - '@rollup/rollup-linux-arm64-gnu@4.26.0': optional: true - '@rollup/rollup-linux-arm64-musl@4.19.0': - optional: true - '@rollup/rollup-linux-arm64-musl@4.26.0': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.19.0': - optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.19.0': - optional: true - '@rollup/rollup-linux-riscv64-gnu@4.26.0': optional: true - '@rollup/rollup-linux-s390x-gnu@4.19.0': - optional: true - '@rollup/rollup-linux-s390x-gnu@4.26.0': optional: true - '@rollup/rollup-linux-x64-gnu@4.19.0': - optional: true - '@rollup/rollup-linux-x64-gnu@4.26.0': optional: true - '@rollup/rollup-linux-x64-musl@4.19.0': - optional: true - '@rollup/rollup-linux-x64-musl@4.26.0': optional: true - '@rollup/rollup-win32-arm64-msvc@4.19.0': - optional: true - '@rollup/rollup-win32-arm64-msvc@4.26.0': optional: true - '@rollup/rollup-win32-ia32-msvc@4.19.0': - optional: true - '@rollup/rollup-win32-ia32-msvc@4.26.0': optional: true - '@rollup/rollup-win32-x64-msvc@4.19.0': - optional: true - '@rollup/rollup-win32-x64-msvc@4.26.0': optional: true @@ -2332,8 +2215,6 @@ snapshots: '@swc/counter': 0.1.3 optional: true - '@types/estree@1.0.5': {} - '@types/estree@1.0.6': {} '@types/node@12.20.55': {} @@ -2342,43 +2223,47 @@ snapshots: dependencies: undici-types: 6.20.0 - '@vitest/expect@3.0.2': + '@types/node@22.13.0': + dependencies: + undici-types: 6.20.0 + + '@vitest/expect@3.0.4': dependencies: - '@vitest/spy': 3.0.2 - '@vitest/utils': 3.0.2 + '@vitest/spy': 3.0.4 + '@vitest/utils': 3.0.4 chai: 5.1.2 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.2(vite@5.2.10(@types/node@22.10.7))': + '@vitest/mocker@3.0.4(vite@5.2.10(@types/node@22.13.0))': dependencies: - '@vitest/spy': 3.0.2 + '@vitest/spy': 3.0.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.10.7) + vite: 5.2.10(@types/node@22.13.0) - '@vitest/pretty-format@3.0.2': + '@vitest/pretty-format@3.0.4': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.2': + '@vitest/runner@3.0.4': dependencies: - '@vitest/utils': 3.0.2 + '@vitest/utils': 3.0.4 pathe: 2.0.2 - '@vitest/snapshot@3.0.2': + '@vitest/snapshot@3.0.4': dependencies: - '@vitest/pretty-format': 3.0.2 + '@vitest/pretty-format': 3.0.4 magic-string: 0.30.17 pathe: 2.0.2 - '@vitest/spy@3.0.2': + '@vitest/spy@3.0.4': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.2': + '@vitest/utils@3.0.4': dependencies: - '@vitest/pretty-format': 3.0.2 + '@vitest/pretty-format': 3.0.4 loupe: 3.1.2 tinyrainbow: 2.0.0 @@ -2430,7 +2315,7 @@ snapshots: assertion-error: 2.0.1 check-error: 2.1.1 deep-eql: 5.0.2 - loupe: 3.1.1 + loupe: 3.1.2 pathval: 2.0.0 chardet@0.7.0: {} @@ -2559,7 +2444,7 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.5 + '@types/estree': 1.0.6 execa@9.5.2: dependencies: @@ -2635,8 +2520,6 @@ snapshots: fsevents@2.3.3: optional: true - get-func-name@2.0.2: {} - get-stream@9.0.1: dependencies: '@sec-ant/readable-stream': 0.4.1 @@ -2732,10 +2615,6 @@ snapshots: lodash.startcase@4.4.0: {} - loupe@3.1.1: - dependencies: - get-func-name: 2.0.2 - loupe@3.1.2: {} lru-cache@10.1.0: {} @@ -2892,28 +2771,6 @@ snapshots: dependencies: glob: 10.3.10 - rollup@4.19.0: - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.19.0 - '@rollup/rollup-android-arm64': 4.19.0 - '@rollup/rollup-darwin-arm64': 4.19.0 - '@rollup/rollup-darwin-x64': 4.19.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.19.0 - '@rollup/rollup-linux-arm-musleabihf': 4.19.0 - '@rollup/rollup-linux-arm64-gnu': 4.19.0 - '@rollup/rollup-linux-arm64-musl': 4.19.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.19.0 - '@rollup/rollup-linux-riscv64-gnu': 4.19.0 - '@rollup/rollup-linux-s390x-gnu': 4.19.0 - '@rollup/rollup-linux-x64-gnu': 4.19.0 - '@rollup/rollup-linux-x64-musl': 4.19.0 - '@rollup/rollup-win32-arm64-msvc': 4.19.0 - '@rollup/rollup-win32-ia32-msvc': 4.19.0 - '@rollup/rollup-win32-x64-msvc': 4.19.0 - fsevents: 2.3.3 - rollup@4.26.0: dependencies: '@types/estree': 1.0.6 @@ -3095,32 +2952,60 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.3.3: + tsup@8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): + dependencies: + bundle-require: 5.0.0(esbuild@0.24.0) + cac: 6.7.14 + chokidar: 4.0.1 + consola: 3.2.3 + debug: 4.4.0 + esbuild: 0.24.0 + joycon: 3.1.1 + picocolors: 1.1.1 + postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.4.38) + resolve-from: 5.0.0 + rollup: 4.26.0 + source-map: 0.8.0-beta.0 + sucrase: 3.35.0 + tinyexec: 0.3.2 + tinyglobby: 0.2.10 + tree-kill: 1.2.2 + optionalDependencies: + '@swc/core': 1.5.5 + postcss: 8.4.38 + typescript: 5.7.3 + transitivePeerDependencies: + - jiti + - supports-color + - tsx + - yaml + + turbo-darwin-64@2.4.0: optional: true - turbo-darwin-arm64@2.3.3: + turbo-darwin-arm64@2.4.0: optional: true - turbo-linux-64@2.3.3: + turbo-linux-64@2.4.0: optional: true - turbo-linux-arm64@2.3.3: + turbo-linux-arm64@2.4.0: optional: true - turbo-windows-64@2.3.3: + turbo-windows-64@2.4.0: optional: true - turbo-windows-arm64@2.3.3: + turbo-windows-arm64@2.4.0: optional: true - turbo@2.3.3: + turbo@2.4.0: optionalDependencies: - turbo-darwin-64: 2.3.3 - turbo-darwin-arm64: 2.3.3 - turbo-linux-64: 2.3.3 - turbo-linux-arm64: 2.3.3 - turbo-windows-64: 2.3.3 - turbo-windows-arm64: 2.3.3 + turbo-darwin-64: 2.4.0 + turbo-darwin-arm64: 2.4.0 + turbo-linux-64: 2.4.0 + turbo-linux-arm64: 2.4.0 + turbo-windows-64: 2.4.0 + turbo-windows-arm64: 2.4.0 typescript@5.7.3: {} @@ -3130,13 +3015,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.0.2(@types/node@22.10.7): + vite-node@3.0.4(@types/node@22.13.0): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.2 - vite: 5.2.10(@types/node@22.10.7) + vite: 5.2.10(@types/node@22.13.0) transitivePeerDependencies: - '@types/node' - less @@ -3147,24 +3032,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.10.7): + vite@5.2.10(@types/node@22.13.0): dependencies: esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.19.0 + rollup: 4.26.0 optionalDependencies: - '@types/node': 22.10.7 + '@types/node': 22.13.0 fsevents: 2.3.3 - vitest@3.0.2(@types/node@22.10.7): + vitest@3.0.4(@types/node@22.13.0): dependencies: - '@vitest/expect': 3.0.2 - '@vitest/mocker': 3.0.2(vite@5.2.10(@types/node@22.10.7)) - '@vitest/pretty-format': 3.0.2 - '@vitest/runner': 3.0.2 - '@vitest/snapshot': 3.0.2 - '@vitest/spy': 3.0.2 - '@vitest/utils': 3.0.2 + '@vitest/expect': 3.0.4 + '@vitest/mocker': 3.0.4(vite@5.2.10(@types/node@22.13.0)) + '@vitest/pretty-format': 3.0.4 + '@vitest/runner': 3.0.4 + '@vitest/snapshot': 3.0.4 + '@vitest/spy': 3.0.4 + '@vitest/utils': 3.0.4 chai: 5.1.2 debug: 4.4.0 expect-type: 1.1.0 @@ -3175,11 +3060,11 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.10.7) - vite-node: 3.0.2(@types/node@22.10.7) + vite: 5.2.10(@types/node@22.13.0) + vite-node: 3.0.4(@types/node@22.13.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.10.7 + '@types/node': 22.13.0 transitivePeerDependencies: - less - lightningcss From bb92e8827817dc68c529da25ae06a733dfa2d169 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 14 Feb 2025 16:40:14 +0000 Subject: [PATCH 189/290] chore: update deps --- package.json | 6 +- packages/create-solid/package.json | 6 +- packages/create/package.json | 4 +- packages/full-solid/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 294 +++++++++++------------------ 6 files changed, 124 insertions(+), 196 deletions(-) diff --git a/package.json b/package.json index 523a577..d17157c 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ ], "devDependencies": { "@changesets/cli": "2.27.12", - "prettier": "^3.4.2", - "turbo": "^2.4.0", - "vitest": "^3.0.4" + "prettier": "^3.5.1", + "turbo": "^2.4.2", + "vitest": "^3.0.5" }, "packageManager": "pnpm@9.15.4", "dependencies": { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index f79ad38..6234b65 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,10 +31,10 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.9.1", - "@types/node": "^22.10.7", + "@clack/prompts": "0.10.0", + "@types/node": "^22.13.4", "picocolors": "^1.1.1", - "tsup": "^8.3.5", + "tsup": "^8.3.6", "typescript": "^5.7.3", "citty": "^0.1.6", "@solid-cli/create": "workspace:*" diff --git a/packages/create/package.json b/packages/create/package.json index 199c7ba..a9e5ac5 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,14 +38,14 @@ }, "devDependencies": { "typescript": "^5.7.3", - "@types/node": "^22.13.0", + "@types/node": "^22.13.4", "tsup": "^8.3.6" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/prompts": "0.9.1", + "@clack/prompts": "0.10.0", "picocolors": "^1.1.1", "@begit/core": "^0.1.5", "citty": "^0.1.6", diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 8fb7dd5..03b1d51 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,9 +30,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.9.1", + "@clack/prompts": "0.10.0", "picocolors": "^1.1.1", - "@types/node": "^22.13.0", + "@types/node": "^22.13.4", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index d302510..8f72fcf 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,18 +68,18 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.13.0", + "@types/node": "22.13.4", "magicast": "^0.3.5", "tsup": "^8.3.6", "typescript": "^5.7.3", - "vitest": "^3.0.4" + "vitest": "^3.0.5" }, "publishConfig": { "access": "public" }, "dependencies": { "@clack/core": "0.4.1", - "@clack/prompts": "0.9.1", + "@clack/prompts": "0.10.0", "execa": "^9.5.2", "picocolors": "^1.1.1", "smol-toml": "^1.3.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9060b1a..ec341c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,14 +16,14 @@ importers: specifier: 2.27.12 version: 2.27.12 prettier: - specifier: ^3.4.2 - version: 3.4.2 + specifier: ^3.5.1 + version: 3.5.1 turbo: - specifier: ^2.4.0 - version: 2.4.0 + specifier: ^2.4.2 + version: 2.4.2 vitest: - specifier: ^3.0.4 - version: 3.0.4(@types/node@22.13.0) + specifier: ^3.0.5 + version: 3.0.5(@types/node@22.13.4) packages/create: dependencies: @@ -31,8 +31,8 @@ importers: specifier: ^0.1.5 version: 0.1.5 '@clack/prompts': - specifier: 0.9.1 - version: 0.9.1 + specifier: 0.10.0 + version: 0.10.0 '@solid-cli/utils': specifier: workspace:* version: link:../utils @@ -47,8 +47,8 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.13.0 - version: 22.13.0 + specifier: ^22.13.4 + version: 22.13.4 tsup: specifier: ^8.3.6 version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) @@ -59,14 +59,14 @@ importers: packages/create-solid: devDependencies: '@clack/prompts': - specifier: 0.9.1 - version: 0.9.1 + specifier: 0.10.0 + version: 0.10.0 '@solid-cli/create': specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.10.7 - version: 22.10.7 + specifier: ^22.13.4 + version: 22.13.4 citty: specifier: ^0.1.6 version: 0.1.6 @@ -74,8 +74,8 @@ importers: specifier: ^1.1.1 version: 1.1.1 tsup: - specifier: ^8.3.5 - version: 8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.3.6 + version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) typescript: specifier: ^5.7.3 version: 5.7.3 @@ -83,8 +83,8 @@ importers: packages/full-solid: devDependencies: '@clack/prompts': - specifier: 0.9.1 - version: 0.9.1 + specifier: 0.10.0 + version: 0.10.0 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.13.0 - version: 22.13.0 + specifier: ^22.13.4 + version: 22.13.4 citty: specifier: ^0.1.6 version: 0.1.6 @@ -113,8 +113,8 @@ importers: specifier: 0.4.1 version: 0.4.1 '@clack/prompts': - specifier: 0.9.1 - version: 0.9.1 + specifier: 0.10.0 + version: 0.10.0 execa: specifier: ^9.5.2 version: 9.5.2 @@ -129,8 +129,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.13.0 - version: 22.13.0 + specifier: 22.13.4 + version: 22.13.4 magicast: specifier: ^0.3.5 version: 0.3.5 @@ -141,8 +141,8 @@ importers: specifier: ^5.7.3 version: 5.7.3 vitest: - specifier: ^3.0.4 - version: 3.0.4(@types/node@22.13.0) + specifier: ^3.0.5 + version: 3.0.5(@types/node@22.13.4) packages: @@ -244,8 +244,8 @@ packages: '@clack/core@0.4.1': resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==} - '@clack/prompts@0.9.1': - resolution: {integrity: sha512-JIpyaboYZeWYlyP0H+OoPPxd6nqueG/CmN6ixBiNFsIDHREevjIf0n0Ohh5gr5C8pEDknzgvz+pIJ8dMhzWIeg==} + '@clack/prompts@0.10.0': + resolution: {integrity: sha512-H3rCl6CwW1NdQt9rE3n373t7o5cthPv7yUoxF2ytZvyvlJv89C5RYMJu83Hed8ODgys5vpBU0GKxIRG83jd8NQ==} '@esbuild/aix-ppc64@0.20.2': resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} @@ -762,17 +762,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.10.7': - resolution: {integrity: sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==} + '@types/node@22.13.4': + resolution: {integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==} - '@types/node@22.13.0': - resolution: {integrity: sha512-ClIbNe36lawluuvq3+YYhnIN2CELi+6q8NpnM7PYp4hBn/TatfboPgVSm2rwKRfnV2M+Ty9GWDFI64KEe+kysA==} + '@vitest/expect@3.0.5': + resolution: {integrity: sha512-nNIOqupgZ4v5jWuQx2DSlHLEs7Q4Oh/7AYwNyE+k0UQzG7tSmjPXShUikn1mpNGzYEN2jJbTvLejwShMitovBA==} - '@vitest/expect@3.0.4': - resolution: {integrity: sha512-Nm5kJmYw6P2BxhJPkO3eKKhGYKRsnqJqf+r0yOGRKpEP+bSCBDsjXgiu1/5QFrnPMEgzfC38ZEjvCFgaNBC0Eg==} - - '@vitest/mocker@3.0.4': - resolution: {integrity: sha512-gEef35vKafJlfQbnyOXZ0Gcr9IBUsMTyTLXsEQwuyYAerpHqvXhzdBnDFuHLpFqth3F7b6BaFr4qV/Cs1ULx5A==} + '@vitest/mocker@3.0.5': + resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -782,20 +779,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.4': - resolution: {integrity: sha512-ts0fba+dEhK2aC9PFuZ9LTpULHpY/nd6jhAQ5IMU7Gaj7crPCTdCFfgvXxruRBLFS+MLraicCuFXxISEq8C93g==} + '@vitest/pretty-format@3.0.5': + resolution: {integrity: sha512-CjUtdmpOcm4RVtB+up8r2vVDLR16Mgm/bYdkGFe3Yj/scRfCpbSi2W/BDSDcFK7ohw8UXvjMbOp9H4fByd/cOA==} - '@vitest/runner@3.0.4': - resolution: {integrity: sha512-dKHzTQ7n9sExAcWH/0sh1elVgwc7OJ2lMOBrAm73J7AH6Pf9T12Zh3lNE1TETZaqrWFXtLlx3NVrLRb5hCK+iw==} + '@vitest/runner@3.0.5': + resolution: {integrity: sha512-BAiZFityFexZQi2yN4OX3OkJC6scwRo8EhRB0Z5HIGGgd2q+Nq29LgHU/+ovCtd0fOfXj5ZI6pwdlUmC5bpi8A==} - '@vitest/snapshot@3.0.4': - resolution: {integrity: sha512-+p5knMLwIk7lTQkM3NonZ9zBewzVp9EVkVpvNta0/PlFWpiqLaRcF4+33L1it3uRUCh0BGLOaXPPGEjNKfWb4w==} + '@vitest/snapshot@3.0.5': + resolution: {integrity: sha512-GJPZYcd7v8QNUJ7vRvLDmRwl+a1fGg4T/54lZXe+UOGy47F9yUfE18hRCtXL5aHN/AONu29NGzIXSVFh9K0feA==} - '@vitest/spy@3.0.4': - resolution: {integrity: sha512-sXIMF0oauYyUy2hN49VFTYodzEAu744MmGcPR3ZBsPM20G+1/cSW/n1U+3Yu/zHxX2bIDe1oJASOkml+osTU6Q==} + '@vitest/spy@3.0.5': + resolution: {integrity: sha512-5fOzHj0WbUNqPK6blI/8VzZdkBlQLnT25knX0r4dbZI9qoZDf3qAdjoMmDcLG5A83W6oUUFJgUd0EYBc2P5xqg==} - '@vitest/utils@3.0.4': - resolution: {integrity: sha512-8BqC1ksYsHtbWH+DfpOAKrFw3jl3Uf9J7yeFh85Pz52IWuh1hBBtyfEbRNNZNjl8H8A5yMLH9/t+k7HIKzQcZQ==} + '@vitest/utils@3.0.5': + resolution: {integrity: sha512-N9AX0NUoUtVwKwy21JtwzaqR5L5R5A99GAbrHfCCXK1lp593i/3AZAXhSP43wRQuxYsflrdzEfXZFo1reR1Nkg==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -904,15 +901,6 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} - debug@4.3.7: - resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.4.0: resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} engines: {node: '>=6.0'} @@ -1326,8 +1314,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.4.2: - resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} + prettier@3.5.1: + resolution: {integrity: sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==} engines: {node: '>=14'} hasBin: true @@ -1475,9 +1463,6 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} - tinyexec@0.3.1: - resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==} - tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} @@ -1519,25 +1504,6 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.3.5: - resolution: {integrity: sha512-Tunf6r6m6tnZsG9GYWndg0z8dEV7fD733VBFzFJ5Vcm1FtlXB8xBD/rtrBi2a3YKEV7hHtxiZtW5EAVADoe1pA==} - engines: {node: '>=18'} - hasBin: true - peerDependencies: - '@microsoft/api-extractor': ^7.36.0 - '@swc/core': ^1 - postcss: ^8.4.12 - typescript: '>=4.5.0' - peerDependenciesMeta: - '@microsoft/api-extractor': - optional: true - '@swc/core': - optional: true - postcss: - optional: true - typescript: - optional: true - tsup@8.3.6: resolution: {integrity: sha512-XkVtlDV/58S9Ye0JxUUTcrQk4S+EqlOHKzg6Roa62rdjL1nGWNUstG0xgI4vanHdfIpjP448J8vlN0oK6XOJ5g==} engines: {node: '>=18'} @@ -1557,38 +1523,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.4.0: - resolution: {integrity: sha512-kVMScnPUa3R4n7woNmkR15kOY0aUwCLJcUyH5UC59ggKqr5HIHwweKYK8N1pwBQso0LQF4I9i93hIzfJguCcwQ==} + turbo-darwin-64@2.4.2: + resolution: {integrity: sha512-HFfemyWB60CJtEvVQj9yby5rkkWw9fLAdLtAPGtPQoU3tKh8t/uzCAZKso2aPVbib9vGUuGbPGoGpaRXdVhj5g==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.4.0: - resolution: {integrity: sha512-8JObIpfun1guA7UlFR5jC/SOVm49lRscxMxfg5jZ5ABft79rhFC+ygN9AwAhGKv6W2DUhIh2xENkSgu4EDmUyg==} + turbo-darwin-arm64@2.4.2: + resolution: {integrity: sha512-uwSx1dsBSSFeEC0nxyx2O219FEsS/haiESaWwE9JI8mHkQK61s6w6fN2G586krKxyNam4AIxRltleL+O2Em94g==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.4.0: - resolution: {integrity: sha512-xWDGGcRlBuGV7HXWAVuTY6vsQi4aZxGMAnuiuNDg8Ij1aHGohOM0RUsWMXjxz4vuJmjk9+/D6NQqHH3AJEXezg==} + turbo-linux-64@2.4.2: + resolution: {integrity: sha512-Fy/uL8z/LAYcPbm7a1LwFnTY9pIi5FAi12iuHsgB7zHjdh4eeIKS2NIg4nroAmTcUTUZ0/cVTo4bDOCUcS3aKw==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.4.0: - resolution: {integrity: sha512-c3En99xMguc/Pdtk/rZP53LnDdw0W6lgUc04he8r8F+UHYSNvgzHh0WGXXmCC6lGbBH72kPhhGx4bAwyvi7dug==} + turbo-linux-arm64@2.4.2: + resolution: {integrity: sha512-AEA0d8h5W/K6iiXfEgiNwWt0yqRL1NpBs8zQCLdc4/L7WeYeJW3sORWX8zt7xhutF/KW9gTm8ehKpiK6cCIsAA==} cpu: [arm64] os: [linux] - turbo-windows-64@2.4.0: - resolution: {integrity: sha512-/gOORuOlyA8JDPzyA16CD3wvyRcuBFePa1URAnFUof9hXQmKxK0VvSDO79cYZFsJSchCKNJpckUS0gYxGsWwoA==} + turbo-windows-64@2.4.2: + resolution: {integrity: sha512-CybtIZ9wRgnnNFVN9En9G+rxsO+mwU81fvW4RpE8BWyNEkhQ8J28qYf4PaimueMxGHHp/28i/G7Kcdn2GAWG0g==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.4.0: - resolution: {integrity: sha512-/DJIdTFijEMM5LSiEpSfarDOMOlYqJV+EzmppqWtHqDsOLF4hbbIBH9sJR6OOp5dURAu5eURBYdmvBRz9Lo6TA==} + turbo-windows-arm64@2.4.2: + resolution: {integrity: sha512-7V0yneVPL8Y3TgrkUIjw7Odmwu1tHnyIiPHFM7eFcA7U+H6hPXyCxge7nC3wOKfjhKCQqUm+Vf/k6kjmLz5G4g==} cpu: [arm64] os: [win32] - turbo@2.4.0: - resolution: {integrity: sha512-ah/yQp2oMif1X0u7fBJ4MLMygnkbKnW5O8SG6pJvloPCpHfFoZctkSVQiJ3VnvNTq71V2JJIdwmOeu1i34OQyg==} + turbo@2.4.2: + resolution: {integrity: sha512-Qxi0ioQCxMRUCcHKHZkTnYH8e7XCpNfg9QiJcyfWIc+ZXeaCjzV5rCGlbQlTXMAtI8qgfP8fZADv3CFtPwqdPQ==} hasBin: true typescript@5.7.3: @@ -1607,8 +1573,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.0.4: - resolution: {integrity: sha512-7JZKEzcYV2Nx3u6rlvN8qdo3QV7Fxyt6hx+CCKz9fbWxdX5IvUOmTWEAxMrWxaiSf7CKGLJQ5rFu8prb/jBjOA==} + vite-node@3.0.5: + resolution: {integrity: sha512-02JEJl7SbtwSDJdYS537nU6l+ktdvcREfLksk/NDAqtdKWGqHl+joXzEubHROmS3E6pip+Xgu2tFezMu75jH7A==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1640,16 +1606,16 @@ packages: terser: optional: true - vitest@3.0.4: - resolution: {integrity: sha512-6XG8oTKy2gnJIFTHP6LD7ExFeNLxiTkK3CfMvT7IfR8IN+BYICCf0lXUQmX7i7JoxUP8QmeP4mTnWXgflu4yjw==} + vitest@3.0.5: + resolution: {integrity: sha512-4dof+HvqONw9bvsYxtkfUp2uHsTN9bV2CZIi1pWgoFpL1Lld8LA1ka9q/ONSsoScAKG7NVGf2stJTI7XRkXb2Q==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.4 - '@vitest/ui': 3.0.4 + '@vitest/browser': 3.0.5 + '@vitest/ui': 3.0.5 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1888,7 +1854,7 @@ snapshots: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.9.1': + '@clack/prompts@0.10.0': dependencies: '@clack/core': 0.4.1 picocolors: 1.1.1 @@ -2219,51 +2185,47 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.10.7': - dependencies: - undici-types: 6.20.0 - - '@types/node@22.13.0': + '@types/node@22.13.4': dependencies: undici-types: 6.20.0 - '@vitest/expect@3.0.4': + '@vitest/expect@3.0.5': dependencies: - '@vitest/spy': 3.0.4 - '@vitest/utils': 3.0.4 + '@vitest/spy': 3.0.5 + '@vitest/utils': 3.0.5 chai: 5.1.2 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.4(vite@5.2.10(@types/node@22.13.0))': + '@vitest/mocker@3.0.5(vite@5.2.10(@types/node@22.13.4))': dependencies: - '@vitest/spy': 3.0.4 + '@vitest/spy': 3.0.5 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.13.0) + vite: 5.2.10(@types/node@22.13.4) - '@vitest/pretty-format@3.0.4': + '@vitest/pretty-format@3.0.5': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.4': + '@vitest/runner@3.0.5': dependencies: - '@vitest/utils': 3.0.4 + '@vitest/utils': 3.0.5 pathe: 2.0.2 - '@vitest/snapshot@3.0.4': + '@vitest/snapshot@3.0.5': dependencies: - '@vitest/pretty-format': 3.0.4 + '@vitest/pretty-format': 3.0.5 magic-string: 0.30.17 pathe: 2.0.2 - '@vitest/spy@3.0.4': + '@vitest/spy@3.0.5': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.4': + '@vitest/utils@3.0.5': dependencies: - '@vitest/pretty-format': 3.0.4 + '@vitest/pretty-format': 3.0.5 loupe: 3.1.2 tinyrainbow: 2.0.0 @@ -2356,10 +2318,6 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - debug@4.3.7: - dependencies: - ms: 2.1.3 - debug@4.4.0: dependencies: ms: 2.1.3 @@ -2742,7 +2700,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.4.2: {} + prettier@3.5.1: {} pretty-ms@9.2.0: dependencies: @@ -2891,8 +2849,6 @@ snapshots: tinybench@2.9.0: {} - tinyexec@0.3.1: {} - tinyexec@0.3.2: {} tinyglobby@0.2.10: @@ -2924,34 +2880,6 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.3.5(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): - dependencies: - bundle-require: 5.0.0(esbuild@0.24.0) - cac: 6.7.14 - chokidar: 4.0.1 - consola: 3.2.3 - debug: 4.3.7 - esbuild: 0.24.0 - joycon: 3.1.1 - picocolors: 1.1.1 - postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.4.38) - resolve-from: 5.0.0 - rollup: 4.26.0 - source-map: 0.8.0-beta.0 - sucrase: 3.35.0 - tinyexec: 0.3.1 - tinyglobby: 0.2.10 - tree-kill: 1.2.2 - optionalDependencies: - '@swc/core': 1.5.5 - postcss: 8.4.38 - typescript: 5.7.3 - transitivePeerDependencies: - - jiti - - supports-color - - tsx - - yaml - tsup@8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): dependencies: bundle-require: 5.0.0(esbuild@0.24.0) @@ -2980,32 +2908,32 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.4.0: + turbo-darwin-64@2.4.2: optional: true - turbo-darwin-arm64@2.4.0: + turbo-darwin-arm64@2.4.2: optional: true - turbo-linux-64@2.4.0: + turbo-linux-64@2.4.2: optional: true - turbo-linux-arm64@2.4.0: + turbo-linux-arm64@2.4.2: optional: true - turbo-windows-64@2.4.0: + turbo-windows-64@2.4.2: optional: true - turbo-windows-arm64@2.4.0: + turbo-windows-arm64@2.4.2: optional: true - turbo@2.4.0: + turbo@2.4.2: optionalDependencies: - turbo-darwin-64: 2.4.0 - turbo-darwin-arm64: 2.4.0 - turbo-linux-64: 2.4.0 - turbo-linux-arm64: 2.4.0 - turbo-windows-64: 2.4.0 - turbo-windows-arm64: 2.4.0 + turbo-darwin-64: 2.4.2 + turbo-darwin-arm64: 2.4.2 + turbo-linux-64: 2.4.2 + turbo-linux-arm64: 2.4.2 + turbo-windows-64: 2.4.2 + turbo-windows-arm64: 2.4.2 typescript@5.7.3: {} @@ -3015,13 +2943,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.0.4(@types/node@22.13.0): + vite-node@3.0.5(@types/node@22.13.4): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.2 - vite: 5.2.10(@types/node@22.13.0) + vite: 5.2.10(@types/node@22.13.4) transitivePeerDependencies: - '@types/node' - less @@ -3032,24 +2960,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.13.0): + vite@5.2.10(@types/node@22.13.4): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.26.0 optionalDependencies: - '@types/node': 22.13.0 + '@types/node': 22.13.4 fsevents: 2.3.3 - vitest@3.0.4(@types/node@22.13.0): + vitest@3.0.5(@types/node@22.13.4): dependencies: - '@vitest/expect': 3.0.4 - '@vitest/mocker': 3.0.4(vite@5.2.10(@types/node@22.13.0)) - '@vitest/pretty-format': 3.0.4 - '@vitest/runner': 3.0.4 - '@vitest/snapshot': 3.0.4 - '@vitest/spy': 3.0.4 - '@vitest/utils': 3.0.4 + '@vitest/expect': 3.0.5 + '@vitest/mocker': 3.0.5(vite@5.2.10(@types/node@22.13.4)) + '@vitest/pretty-format': 3.0.5 + '@vitest/runner': 3.0.5 + '@vitest/snapshot': 3.0.5 + '@vitest/spy': 3.0.5 + '@vitest/utils': 3.0.5 chai: 5.1.2 debug: 4.4.0 expect-type: 1.1.0 @@ -3060,11 +2988,11 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.13.0) - vite-node: 3.0.4(@types/node@22.13.0) + vite: 5.2.10(@types/node@22.13.4) + vite-node: 3.0.5(@types/node@22.13.4) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.0 + '@types/node': 22.13.4 transitivePeerDependencies: - less - lightningcss From d9bbe5c3b49336e924910bedf5191f694d25e8c1 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 21 Feb 2025 22:35:56 +0000 Subject: [PATCH 190/290] feat: add `with-tanstack-router` template --- packages/create/src/utils/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 7618b02..8ac3ba6 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -72,6 +72,7 @@ const START_TEMPLATES = [ "with-prisma", "with-solid-styled", "with-tailwindcss", + "with-tanstack-router", "with-trpc", "with-unocss", "with-vitest", From c1d6aefbab8c3e91a17b5423c1a93bf3e6f1b5f8 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 21 Feb 2025 22:43:28 +0000 Subject: [PATCH 191/290] chore: update deps --- package.json | 4 +- packages/create-solid/package.json | 2 +- packages/create/package.json | 2 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 314 +++++++++++++++-------------- 6 files changed, 167 insertions(+), 161 deletions(-) diff --git a/package.json b/package.json index d17157c..c313ebd 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,10 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.27.12", + "@changesets/cli": "2.28.1", "prettier": "^3.5.1", "turbo": "^2.4.2", - "vitest": "^3.0.5" + "vitest": "^3.0.6" }, "packageManager": "pnpm@9.15.4", "dependencies": { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 6234b65..efa2425 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@clack/prompts": "0.10.0", - "@types/node": "^22.13.4", + "@types/node": "^22.13.5", "picocolors": "^1.1.1", "tsup": "^8.3.6", "typescript": "^5.7.3", diff --git a/packages/create/package.json b/packages/create/package.json index a9e5ac5..f75f472 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "typescript": "^5.7.3", - "@types/node": "^22.13.4", + "@types/node": "^22.13.5", "tsup": "^8.3.6" }, "publishConfig": { diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 03b1d51..8bf8ea5 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@clack/prompts": "0.10.0", "picocolors": "^1.1.1", - "@types/node": "^22.13.4", + "@types/node": "^22.13.5", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index 8f72fcf..0fd0a60 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,11 +68,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.13.4", + "@types/node": "22.13.5", "magicast": "^0.3.5", "tsup": "^8.3.6", "typescript": "^5.7.3", - "vitest": "^3.0.5" + "vitest": "^3.0.6" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ec341c9..3903caa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,8 +13,8 @@ importers: version: 2.4.2 devDependencies: '@changesets/cli': - specifier: 2.27.12 - version: 2.27.12 + specifier: 2.28.1 + version: 2.28.1 prettier: specifier: ^3.5.1 version: 3.5.1 @@ -22,8 +22,8 @@ importers: specifier: ^2.4.2 version: 2.4.2 vitest: - specifier: ^3.0.5 - version: 3.0.5(@types/node@22.13.4) + specifier: ^3.0.6 + version: 3.0.6(@types/node@22.13.5) packages/create: dependencies: @@ -47,8 +47,8 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.13.4 - version: 22.13.4 + specifier: ^22.13.5 + version: 22.13.5 tsup: specifier: ^8.3.6 version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) @@ -65,8 +65,8 @@ importers: specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.13.4 - version: 22.13.4 + specifier: ^22.13.5 + version: 22.13.5 citty: specifier: ^0.1.6 version: 0.1.6 @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.13.4 - version: 22.13.4 + specifier: ^22.13.5 + version: 22.13.5 citty: specifier: ^0.1.6 version: 0.1.6 @@ -129,8 +129,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.13.4 - version: 22.13.4 + specifier: 22.13.5 + version: 22.13.5 magicast: specifier: ^0.3.5 version: 0.3.5 @@ -141,8 +141,8 @@ importers: specifier: ^5.7.3 version: 5.7.3 vitest: - specifier: ^3.0.5 - version: 3.0.5(@types/node@22.13.4) + specifier: ^3.0.6 + version: 3.0.6(@types/node@22.13.5) packages: @@ -170,30 +170,30 @@ packages: '@begit/core@0.1.5': resolution: {integrity: sha512-3DoFnqKlFrnK6vOGT/Y2dCZvmBmYTgNUOmGdjxdNQvGDAnoUm4XPyRu8dKE30PlKM+7CB0IsZOTPdNSPLBUq1g==} - '@changesets/apply-release-plan@7.0.8': - resolution: {integrity: sha512-qjMUj4DYQ1Z6qHawsn7S71SujrExJ+nceyKKyI9iB+M5p9lCL55afuEd6uLBPRpLGWQwkwvWegDHtwHJb1UjpA==} + '@changesets/apply-release-plan@7.0.10': + resolution: {integrity: sha512-wNyeIJ3yDsVspYvHnEz1xQDq18D9ifed3lI+wxRQRK4pArUcuHgCTrHv0QRnnwjhVCQACxZ+CBih3wgOct6UXw==} - '@changesets/assemble-release-plan@6.0.5': - resolution: {integrity: sha512-IgvBWLNKZd6k4t72MBTBK3nkygi0j3t3zdC1zrfusYo0KpdsvnDjrMM9vPnTCLCMlfNs55jRL4gIMybxa64FCQ==} + '@changesets/assemble-release-plan@6.0.6': + resolution: {integrity: sha512-Frkj8hWJ1FRZiY3kzVCKzS0N5mMwWKwmv9vpam7vt8rZjLL1JMthdh6pSDVSPumHPshTTkKZ0VtNbE0cJHZZUg==} - '@changesets/changelog-git@0.2.0': - resolution: {integrity: sha512-bHOx97iFI4OClIT35Lok3sJAwM31VbUM++gnMBV16fdbtBhgYu4dxsphBF/0AZZsyAHMrnM0yFcj5gZM1py6uQ==} + '@changesets/changelog-git@0.2.1': + resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.27.12': - resolution: {integrity: sha512-9o3fOfHYOvBnyEn0mcahB7wzaA3P4bGJf8PNqGit5PKaMEFdsRixik+txkrJWd2VX+O6wRFXpxQL8j/1ANKE9g==} + '@changesets/cli@2.28.1': + resolution: {integrity: sha512-PiIyGRmSc6JddQJe/W1hRPjiN4VrMvb2VfQ6Uydy2punBioQrsxppyG5WafinKcW1mT0jOe/wU4k9Zy5ff21AA==} hasBin: true - '@changesets/config@3.0.5': - resolution: {integrity: sha512-QyXLSSd10GquX7hY0Mt4yQFMEeqnO5z/XLpbIr4PAkNNoQNKwDyiSrx4yd749WddusH1v3OSiA0NRAYmH/APpQ==} + '@changesets/config@3.1.1': + resolution: {integrity: sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA==} '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} - '@changesets/get-dependents-graph@2.1.2': - resolution: {integrity: sha512-sgcHRkiBY9i4zWYBwlVyAjEM9sAzs4wYVwJUdnbDLnVG3QwAaia1Mk5P8M7kraTOZN+vBET7n8KyB0YXCbFRLQ==} + '@changesets/get-dependents-graph@2.1.3': + resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} - '@changesets/get-release-plan@4.0.6': - resolution: {integrity: sha512-FHRwBkY7Eili04Y5YMOZb0ezQzKikTka4wL753vfUA5COSebt7KThqiuCN9BewE4/qFGgF/5t3AuzXx1/UAY4w==} + '@changesets/get-release-plan@4.0.8': + resolution: {integrity: sha512-MM4mq2+DQU1ZT7nqxnpveDMTkMBLnwNX44cX7NSxlXmr7f8hO6/S2MXNiXG54uf/0nYnefv0cfy4Czf/ZL/EKQ==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -204,26 +204,26 @@ packages: '@changesets/logger@0.1.1': resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} - '@changesets/parse@0.4.0': - resolution: {integrity: sha512-TS/9KG2CdGXS27S+QxbZXgr8uPsP4yNJYb4BC2/NeFUj80Rni3TeD2qwWmabymxmrLo7JEsytXH1FbpKTbvivw==} + '@changesets/parse@0.4.1': + resolution: {integrity: sha512-iwksMs5Bf/wUItfcg+OXrEpravm5rEd9Bf4oyIPL4kVTmJQ7PNDSd6MDYkpSJR1pn7tz/k8Zf2DhTCqX08Ou+Q==} - '@changesets/pre@2.0.1': - resolution: {integrity: sha512-vvBJ/If4jKM4tPz9JdY2kGOgWmCowUYOi5Ycv8dyLnEE8FgpYYUo1mgJZxcdtGGP3aG8rAQulGLyyXGSLkIMTQ==} + '@changesets/pre@2.0.2': + resolution: {integrity: sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==} - '@changesets/read@0.6.2': - resolution: {integrity: sha512-wjfQpJvryY3zD61p8jR87mJdyx2FIhEcdXhKUqkja87toMrP/3jtg/Yg29upN+N4Ckf525/uvV7a4tzBlpk6gg==} + '@changesets/read@0.6.3': + resolution: {integrity: sha512-9H4p/OuJ3jXEUTjaVGdQEhBdqoT2cO5Ts95JTFsQyawmKzpL8FnIeJSyhTDPW1MBRDnwZlHFEM9SpPwJDY5wIg==} - '@changesets/should-skip-package@0.1.1': - resolution: {integrity: sha512-H9LjLbF6mMHLtJIc/eHR9Na+MifJ3VxtgP/Y+XLn4BF7tDTEN1HNYtH6QMcjP1uxp9sjaFYmW8xqloaCi/ckTg==} + '@changesets/should-skip-package@0.1.2': + resolution: {integrity: sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==} '@changesets/types@4.1.0': resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==} - '@changesets/types@6.0.0': - resolution: {integrity: sha512-b1UkfNulgKoWfqyHtzKS5fOZYSJO+77adgL7DLRDr+/7jhChN+QcHnbjiQVOz/U+Ts3PGNySq7diAItzDgugfQ==} + '@changesets/types@6.1.0': + resolution: {integrity: sha512-rKQcJ+o1nKNgeoYRHKOS07tAMNd3YSN0uHaJOZYjBAgxfV7TUE7JE+z4BzZdQwb5hKaYbayKN5KrYV7ODb2rAA==} - '@changesets/write@0.3.2': - resolution: {integrity: sha512-kDxDrPNpUgsjDbWBvUo27PzKX4gqeKOlhibaOXDJA6kuBisGqNHv/HwGJrAu8U/dSf8ZEFIeHIPtvSlZI1kULw==} + '@changesets/write@0.4.0': + resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==} '@chialab/esbuild-plugin-meta-url@0.18.2': resolution: {integrity: sha512-uIRIdLvYnw5mLrTRXY0BTgeZx6ANL2/OHkWFl8FaiTYNb7cyXmwEDRE1mh6kBXPRPtGuqv6XSpNX+koEkElu4g==} @@ -762,14 +762,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.13.4': - resolution: {integrity: sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==} + '@types/node@22.13.5': + resolution: {integrity: sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==} - '@vitest/expect@3.0.5': - resolution: {integrity: sha512-nNIOqupgZ4v5jWuQx2DSlHLEs7Q4Oh/7AYwNyE+k0UQzG7tSmjPXShUikn1mpNGzYEN2jJbTvLejwShMitovBA==} + '@vitest/expect@3.0.6': + resolution: {integrity: sha512-zBduHf/ja7/QRX4HdP1DSq5XrPgdN+jzLOwaTq/0qZjYfgETNFCKf9nOAp2j3hmom3oTbczuUzrzg9Hafh7hNg==} - '@vitest/mocker@3.0.5': - resolution: {integrity: sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==} + '@vitest/mocker@3.0.6': + resolution: {integrity: sha512-KPztr4/tn7qDGZfqlSPQoF2VgJcKxnDNhmfR3VgZ6Fy1bO8T9Fc1stUiTXtqz0yG24VpD00pZP5f8EOFknjNuQ==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -779,20 +779,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.5': - resolution: {integrity: sha512-CjUtdmpOcm4RVtB+up8r2vVDLR16Mgm/bYdkGFe3Yj/scRfCpbSi2W/BDSDcFK7ohw8UXvjMbOp9H4fByd/cOA==} + '@vitest/pretty-format@3.0.6': + resolution: {integrity: sha512-Zyctv3dbNL+67qtHfRnUE/k8qxduOamRfAL1BurEIQSyOEFffoMvx2pnDSSbKAAVxY0Ej2J/GH2dQKI0W2JyVg==} - '@vitest/runner@3.0.5': - resolution: {integrity: sha512-BAiZFityFexZQi2yN4OX3OkJC6scwRo8EhRB0Z5HIGGgd2q+Nq29LgHU/+ovCtd0fOfXj5ZI6pwdlUmC5bpi8A==} + '@vitest/runner@3.0.6': + resolution: {integrity: sha512-JopP4m/jGoaG1+CBqubV/5VMbi7L+NQCJTu1J1Pf6YaUbk7bZtaq5CX7p+8sY64Sjn1UQ1XJparHfcvTTdu9cA==} - '@vitest/snapshot@3.0.5': - resolution: {integrity: sha512-GJPZYcd7v8QNUJ7vRvLDmRwl+a1fGg4T/54lZXe+UOGy47F9yUfE18hRCtXL5aHN/AONu29NGzIXSVFh9K0feA==} + '@vitest/snapshot@3.0.6': + resolution: {integrity: sha512-qKSmxNQwT60kNwwJHMVwavvZsMGXWmngD023OHSgn873pV0lylK7dwBTfYP7e4URy5NiBCHHiQGA9DHkYkqRqg==} - '@vitest/spy@3.0.5': - resolution: {integrity: sha512-5fOzHj0WbUNqPK6blI/8VzZdkBlQLnT25knX0r4dbZI9qoZDf3qAdjoMmDcLG5A83W6oUUFJgUd0EYBc2P5xqg==} + '@vitest/spy@3.0.6': + resolution: {integrity: sha512-HfOGx/bXtjy24fDlTOpgiAEJbRfFxoX3zIGagCqACkFKKZ/TTOE6gYMKXlqecvxEndKFuNHcHqP081ggZ2yM0Q==} - '@vitest/utils@3.0.5': - resolution: {integrity: sha512-N9AX0NUoUtVwKwy21JtwzaqR5L5R5A99GAbrHfCCXK1lp593i/3AZAXhSP43wRQuxYsflrdzEfXZFo1reR1Nkg==} + '@vitest/utils@3.0.6': + resolution: {integrity: sha512-18ktZpf4GQFTbf9jK543uspU03Q2qya7ZGya5yiZ0Gx0nnnalBvd5ZBislbl2EhLjM8A8rt4OilqKG7QwcGkvQ==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -852,8 +852,8 @@ packages: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} - chai@5.1.2: - resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==} + chai@5.2.0: + resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==} engines: {node: '>=12'} chardet@0.7.0: @@ -1040,8 +1040,9 @@ packages: graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - human-id@1.0.2: - resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==} + human-id@4.1.1: + resolution: {integrity: sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==} + hasBin: true human-signals@8.0.0: resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==} @@ -1137,6 +1138,9 @@ packages: loupe@3.1.2: resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==} + loupe@3.1.3: + resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} + lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} @@ -1261,8 +1265,8 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - pathe@2.0.2: - resolution: {integrity: sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==} + pathe@2.0.3: + resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} pathval@2.0.0: resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} @@ -1573,8 +1577,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.0.5: - resolution: {integrity: sha512-02JEJl7SbtwSDJdYS537nU6l+ktdvcREfLksk/NDAqtdKWGqHl+joXzEubHROmS3E6pip+Xgu2tFezMu75jH7A==} + vite-node@3.0.6: + resolution: {integrity: sha512-s51RzrTkXKJrhNbUzQRsarjmAae7VmMPAsRT7lppVpIg6mK3zGthP9Hgz0YQQKuNcF+Ii7DfYk3Fxz40jRmePw==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1606,16 +1610,16 @@ packages: terser: optional: true - vitest@3.0.5: - resolution: {integrity: sha512-4dof+HvqONw9bvsYxtkfUp2uHsTN9bV2CZIi1pWgoFpL1Lld8LA1ka9q/ONSsoScAKG7NVGf2stJTI7XRkXb2Q==} + vitest@3.0.6: + resolution: {integrity: sha512-/iL1Sc5VeDZKPDe58oGK4HUFLhw6b5XdY1MYawjuSaDA4sEfYlY9HnS6aCEG26fX+MgUi7MwlduTBHHAI/OvMA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.5 - '@vitest/ui': 3.0.5 + '@vitest/browser': 3.0.6 + '@vitest/ui': 3.0.6 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1690,13 +1694,13 @@ snapshots: dependencies: tar: 7.4.3 - '@changesets/apply-release-plan@7.0.8': + '@changesets/apply-release-plan@7.0.10': dependencies: - '@changesets/config': 3.0.5 + '@changesets/config': 3.1.1 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.2 - '@changesets/should-skip-package': 0.1.1 - '@changesets/types': 6.0.0 + '@changesets/should-skip-package': 0.1.2 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 detect-indent: 6.1.0 fs-extra: 7.0.1 @@ -1706,35 +1710,35 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.3 - '@changesets/assemble-release-plan@6.0.5': + '@changesets/assemble-release-plan@6.0.6': dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.2 - '@changesets/should-skip-package': 0.1.1 - '@changesets/types': 6.0.0 + '@changesets/get-dependents-graph': 2.1.3 + '@changesets/should-skip-package': 0.1.2 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 semver: 7.6.3 - '@changesets/changelog-git@0.2.0': + '@changesets/changelog-git@0.2.1': dependencies: - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 - '@changesets/cli@2.27.12': + '@changesets/cli@2.28.1': dependencies: - '@changesets/apply-release-plan': 7.0.8 - '@changesets/assemble-release-plan': 6.0.5 - '@changesets/changelog-git': 0.2.0 - '@changesets/config': 3.0.5 + '@changesets/apply-release-plan': 7.0.10 + '@changesets/assemble-release-plan': 6.0.6 + '@changesets/changelog-git': 0.2.1 + '@changesets/config': 3.1.1 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.2 - '@changesets/get-release-plan': 4.0.6 + '@changesets/get-dependents-graph': 2.1.3 + '@changesets/get-release-plan': 4.0.8 '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 - '@changesets/pre': 2.0.1 - '@changesets/read': 0.6.2 - '@changesets/should-skip-package': 0.1.1 - '@changesets/types': 6.0.0 - '@changesets/write': 0.3.2 + '@changesets/pre': 2.0.2 + '@changesets/read': 0.6.3 + '@changesets/should-skip-package': 0.1.2 + '@changesets/types': 6.1.0 + '@changesets/write': 0.4.0 '@manypkg/get-packages': 1.1.3 ansi-colors: 4.1.3 ci-info: 3.9.0 @@ -1750,12 +1754,12 @@ snapshots: spawndamnit: 3.0.1 term-size: 2.2.1 - '@changesets/config@3.0.5': + '@changesets/config@3.1.1': dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.2 + '@changesets/get-dependents-graph': 2.1.3 '@changesets/logger': 0.1.1 - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 micromatch: 4.0.8 @@ -1764,20 +1768,20 @@ snapshots: dependencies: extendable-error: 0.1.7 - '@changesets/get-dependents-graph@2.1.2': + '@changesets/get-dependents-graph@2.1.3': dependencies: - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 picocolors: 1.1.1 semver: 7.6.3 - '@changesets/get-release-plan@4.0.6': + '@changesets/get-release-plan@4.0.8': dependencies: - '@changesets/assemble-release-plan': 6.0.5 - '@changesets/config': 3.0.5 - '@changesets/pre': 2.0.1 - '@changesets/read': 0.6.2 - '@changesets/types': 6.0.0 + '@changesets/assemble-release-plan': 6.0.6 + '@changesets/config': 3.1.1 + '@changesets/pre': 2.0.2 + '@changesets/read': 0.6.3 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 '@changesets/get-version-range-type@0.4.0': {} @@ -1794,42 +1798,42 @@ snapshots: dependencies: picocolors: 1.1.1 - '@changesets/parse@0.4.0': + '@changesets/parse@0.4.1': dependencies: - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 js-yaml: 3.14.1 - '@changesets/pre@2.0.1': + '@changesets/pre@2.0.2': dependencies: '@changesets/errors': 0.2.0 - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - '@changesets/read@0.6.2': + '@changesets/read@0.6.3': dependencies: '@changesets/git': 3.0.2 '@changesets/logger': 0.1.1 - '@changesets/parse': 0.4.0 - '@changesets/types': 6.0.0 + '@changesets/parse': 0.4.1 + '@changesets/types': 6.1.0 fs-extra: 7.0.1 p-filter: 2.1.0 picocolors: 1.1.1 - '@changesets/should-skip-package@0.1.1': + '@changesets/should-skip-package@0.1.2': dependencies: - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 '@changesets/types@4.1.0': {} - '@changesets/types@6.0.0': {} + '@changesets/types@6.1.0': {} - '@changesets/write@0.3.2': + '@changesets/write@0.4.0': dependencies: - '@changesets/types': 6.0.0 + '@changesets/types': 6.1.0 fs-extra: 7.0.1 - human-id: 1.0.2 + human-id: 4.1.1 prettier: 2.8.8 '@chialab/esbuild-plugin-meta-url@0.18.2': @@ -2185,48 +2189,48 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.13.4': + '@types/node@22.13.5': dependencies: undici-types: 6.20.0 - '@vitest/expect@3.0.5': + '@vitest/expect@3.0.6': dependencies: - '@vitest/spy': 3.0.5 - '@vitest/utils': 3.0.5 - chai: 5.1.2 + '@vitest/spy': 3.0.6 + '@vitest/utils': 3.0.6 + chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.5(vite@5.2.10(@types/node@22.13.4))': + '@vitest/mocker@3.0.6(vite@5.2.10(@types/node@22.13.5))': dependencies: - '@vitest/spy': 3.0.5 + '@vitest/spy': 3.0.6 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.13.4) + vite: 5.2.10(@types/node@22.13.5) - '@vitest/pretty-format@3.0.5': + '@vitest/pretty-format@3.0.6': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.5': + '@vitest/runner@3.0.6': dependencies: - '@vitest/utils': 3.0.5 - pathe: 2.0.2 + '@vitest/utils': 3.0.6 + pathe: 2.0.3 - '@vitest/snapshot@3.0.5': + '@vitest/snapshot@3.0.6': dependencies: - '@vitest/pretty-format': 3.0.5 + '@vitest/pretty-format': 3.0.6 magic-string: 0.30.17 - pathe: 2.0.2 + pathe: 2.0.3 - '@vitest/spy@3.0.5': + '@vitest/spy@3.0.6': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.5': + '@vitest/utils@3.0.6': dependencies: - '@vitest/pretty-format': 3.0.5 - loupe: 3.1.2 + '@vitest/pretty-format': 3.0.6 + loupe: 3.1.3 tinyrainbow: 2.0.0 ansi-colors@4.1.3: {} @@ -2272,7 +2276,7 @@ snapshots: cac@6.7.14: {} - chai@5.1.2: + chai@5.2.0: dependencies: assertion-error: 2.0.1 check-error: 2.1.1 @@ -2506,7 +2510,7 @@ snapshots: graceful-fs@4.2.11: {} - human-id@1.0.2: {} + human-id@4.1.1: {} human-signals@8.0.0: {} @@ -2575,6 +2579,8 @@ snapshots: loupe@3.1.2: {} + loupe@3.1.3: {} + lru-cache@10.1.0: {} magic-string@0.30.17: @@ -2671,7 +2677,7 @@ snapshots: path-type@4.0.0: {} - pathe@2.0.2: {} + pathe@2.0.3: {} pathval@2.0.0: {} @@ -2943,13 +2949,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.0.5(@types/node@22.13.4): + vite-node@3.0.6(@types/node@22.13.5): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 - pathe: 2.0.2 - vite: 5.2.10(@types/node@22.13.4) + pathe: 2.0.3 + vite: 5.2.10(@types/node@22.13.5) transitivePeerDependencies: - '@types/node' - less @@ -2960,39 +2966,39 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.13.4): + vite@5.2.10(@types/node@22.13.5): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.26.0 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 fsevents: 2.3.3 - vitest@3.0.5(@types/node@22.13.4): + vitest@3.0.6(@types/node@22.13.5): dependencies: - '@vitest/expect': 3.0.5 - '@vitest/mocker': 3.0.5(vite@5.2.10(@types/node@22.13.4)) - '@vitest/pretty-format': 3.0.5 - '@vitest/runner': 3.0.5 - '@vitest/snapshot': 3.0.5 - '@vitest/spy': 3.0.5 - '@vitest/utils': 3.0.5 - chai: 5.1.2 + '@vitest/expect': 3.0.6 + '@vitest/mocker': 3.0.6(vite@5.2.10(@types/node@22.13.5)) + '@vitest/pretty-format': 3.0.6 + '@vitest/runner': 3.0.6 + '@vitest/snapshot': 3.0.6 + '@vitest/spy': 3.0.6 + '@vitest/utils': 3.0.6 + chai: 5.2.0 debug: 4.4.0 expect-type: 1.1.0 magic-string: 0.30.17 - pathe: 2.0.2 + pathe: 2.0.3 std-env: 3.8.0 tinybench: 2.9.0 tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.13.4) - vite-node: 3.0.5(@types/node@22.13.4) + vite: 5.2.10(@types/node@22.13.5) + vite-node: 3.0.6(@types/node@22.13.5) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.4 + '@types/node': 22.13.5 transitivePeerDependencies: - less - lightningcss From 729454c98d950804744968c086e90407f1478686 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 23 Feb 2025 14:34:19 +0000 Subject: [PATCH 192/290] chore: upgrade pnpm --- package.json | 10 ++++++++-- pnpm-lock.yaml | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index c313ebd..2e7494f 100644 --- a/package.json +++ b/package.json @@ -31,12 +31,18 @@ ], "devDependencies": { "@changesets/cli": "2.28.1", - "prettier": "^3.5.1", + "prettier": "^3.5.2", "turbo": "^2.4.2", "vitest": "^3.0.6" }, - "packageManager": "pnpm@9.15.4", + "packageManager": "pnpm@10.4.1", "dependencies": { "jiti": "^2.4.2" + }, + "pnpm": { + "onlyBuiltDependencies": [ + "@swc/core", + "esbuild" + ] } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3903caa..80c4f4c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,8 +16,8 @@ importers: specifier: 2.28.1 version: 2.28.1 prettier: - specifier: ^3.5.1 - version: 3.5.1 + specifier: ^3.5.2 + version: 3.5.2 turbo: specifier: ^2.4.2 version: 2.4.2 @@ -1318,8 +1318,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.5.1: - resolution: {integrity: sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==} + prettier@3.5.2: + resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==} engines: {node: '>=14'} hasBin: true @@ -2706,7 +2706,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.5.1: {} + prettier@3.5.2: {} pretty-ms@9.2.0: dependencies: From 20493c7ace2a062ba0d7f3396c7ae18ffdf99c7e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 23 Feb 2025 14:42:45 +0000 Subject: [PATCH 193/290] release: version and release --- .changeset/pre.json | 11 ----------- packages/create-solid/CHANGELOG.md | 3 +++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 7 +++++++ packages/create/package.json | 2 +- packages/full-solid/CHANGELOG.md | 3 +++ packages/full-solid/package.json | 2 +- packages/utils/CHANGELOG.md | 3 +++ packages/utils/package.json | 2 +- 9 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 .changeset/pre.json create mode 100644 packages/create-solid/CHANGELOG.md create mode 100644 packages/create/CHANGELOG.md create mode 100644 packages/full-solid/CHANGELOG.md create mode 100644 packages/utils/CHANGELOG.md diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 6b257a5..0000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "mode": "pre", - "tag": "alpha", - "initialVersions": { - "@solid-cli/create": "0.6.0-alpha.0", - "create-solid": "0.6.0-alpha.1", - "@solid-cli/full": "0.6.0-alpha.0", - "@solid-cli/utils": "0.6.0-alpha.0" - }, - "changesets": [] -} diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md new file mode 100644 index 0000000..4c162bb --- /dev/null +++ b/packages/create-solid/CHANGELOG.md @@ -0,0 +1,3 @@ +# create-solid + +## 0.6.0 diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index efa2425..113cf94 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.0-alpha.1", + "version": "0.6.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md new file mode 100644 index 0000000..59b1f89 --- /dev/null +++ b/packages/create/CHANGELOG.md @@ -0,0 +1,7 @@ +# @solid-cli/create + +## 0.6.0 + +### Patch Changes + +- @solid-cli/utils@0.6.0 diff --git a/packages/create/package.json b/packages/create/package.json index f75f472..58f0b76 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.0-alpha.1", + "version": "0.6.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/CHANGELOG.md b/packages/full-solid/CHANGELOG.md new file mode 100644 index 0000000..5eef41c --- /dev/null +++ b/packages/full-solid/CHANGELOG.md @@ -0,0 +1,3 @@ +# @solid-cli/full + +## 0.6.0 diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 8bf8ea5..7463120 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.0-alpha.1", + "version": "0.6.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md new file mode 100644 index 0000000..329d0b3 --- /dev/null +++ b/packages/utils/CHANGELOG.md @@ -0,0 +1,3 @@ +# @solid-cli/utils + +## 0.6.0 diff --git a/packages/utils/package.json b/packages/utils/package.json index 0fd0a60..625b345 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.6.0-alpha.1", + "version": "0.6.0", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 408141d35bcd9ed1e260b359f7cd6548a57b8d72 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 4 Mar 2025 20:55:38 +0000 Subject: [PATCH 194/290] chore: update deps --- package.json | 8 +- packages/create-solid/package.json | 6 +- packages/create/package.json | 6 +- packages/full-solid/package.json | 6 +- packages/utils/package.json | 8 +- pnpm-lock.yaml | 685 ++++++++++++++++++----------- 6 files changed, 456 insertions(+), 263 deletions(-) diff --git a/package.json b/package.json index 2e7494f..402813a 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,11 @@ ], "devDependencies": { "@changesets/cli": "2.28.1", - "prettier": "^3.5.2", - "turbo": "^2.4.2", - "vitest": "^3.0.6" + "prettier": "^3.5.3", + "turbo": "^2.4.4", + "vitest": "^3.0.7" }, - "packageManager": "pnpm@10.4.1", + "packageManager": "pnpm@10.5.2", "dependencies": { "jiti": "^2.4.2" }, diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 113cf94..c564d48 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -32,10 +32,10 @@ }, "devDependencies": { "@clack/prompts": "0.10.0", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "picocolors": "^1.1.1", - "tsup": "^8.3.6", - "typescript": "^5.7.3", + "tsup": "^8.4.0", + "typescript": "^5.8.2", "citty": "^0.1.6", "@solid-cli/create": "workspace:*" }, diff --git a/packages/create/package.json b/packages/create/package.json index 58f0b76..f0e7a11 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -37,9 +37,9 @@ "test": "vitest run" }, "devDependencies": { - "typescript": "^5.7.3", - "@types/node": "^22.13.5", - "tsup": "^8.3.6" + "typescript": "^5.8.2", + "@types/node": "^22.13.9", + "tsup": "^8.4.0" }, "publishConfig": { "access": "public" diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 7463120..2d4367a 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,12 +32,12 @@ "devDependencies": { "@clack/prompts": "0.10.0", "picocolors": "^1.1.1", - "@types/node": "^22.13.5", + "@types/node": "^22.13.9", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", - "tsup": "^8.3.6", - "typescript": "^5.7.3" + "tsup": "^8.4.0", + "typescript": "^5.8.2" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 625b345..fc60caf 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,11 +68,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.13.5", + "@types/node": "22.13.9", "magicast": "^0.3.5", - "tsup": "^8.3.6", - "typescript": "^5.7.3", - "vitest": "^3.0.6" + "tsup": "^8.4.0", + "typescript": "^5.8.2", + "vitest": "^3.0.7" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 80c4f4c..437d123 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,14 +16,14 @@ importers: specifier: 2.28.1 version: 2.28.1 prettier: - specifier: ^3.5.2 - version: 3.5.2 + specifier: ^3.5.3 + version: 3.5.3 turbo: - specifier: ^2.4.2 - version: 2.4.2 + specifier: ^2.4.4 + version: 2.4.4 vitest: - specifier: ^3.0.6 - version: 3.0.6(@types/node@22.13.5) + specifier: ^3.0.7 + version: 3.0.7(@types/node@22.13.9) packages/create: dependencies: @@ -47,14 +47,14 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.13.5 - version: 22.13.5 + specifier: ^22.13.9 + version: 22.13.9 tsup: - specifier: ^8.3.6 - version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.4.0 + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) typescript: - specifier: ^5.7.3 - version: 5.7.3 + specifier: ^5.8.2 + version: 5.8.2 packages/create-solid: devDependencies: @@ -65,8 +65,8 @@ importers: specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.13.5 - version: 22.13.5 + specifier: ^22.13.9 + version: 22.13.9 citty: specifier: ^0.1.6 version: 0.1.6 @@ -74,11 +74,11 @@ importers: specifier: ^1.1.1 version: 1.1.1 tsup: - specifier: ^8.3.6 - version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.4.0 + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) typescript: - specifier: ^5.7.3 - version: 5.7.3 + specifier: ^5.8.2 + version: 5.8.2 packages/full-solid: devDependencies: @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.13.5 - version: 22.13.5 + specifier: ^22.13.9 + version: 22.13.9 citty: specifier: ^0.1.6 version: 0.1.6 @@ -101,11 +101,11 @@ importers: specifier: ^1.1.1 version: 1.1.1 tsup: - specifier: ^8.3.6 - version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.4.0 + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) typescript: - specifier: ^5.7.3 - version: 5.7.3 + specifier: ^5.8.2 + version: 5.8.2 packages/utils: dependencies: @@ -129,20 +129,20 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.13.5 - version: 22.13.5 + specifier: 22.13.9 + version: 22.13.9 magicast: specifier: ^0.3.5 version: 0.3.5 tsup: - specifier: ^8.3.6 - version: 8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3) + specifier: ^8.4.0 + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) typescript: - specifier: ^5.7.3 - version: 5.7.3 + specifier: ^5.8.2 + version: 5.8.2 vitest: - specifier: ^3.0.6 - version: 3.0.6(@types/node@22.13.5) + specifier: ^3.0.7 + version: 3.0.7(@types/node@22.13.9) packages: @@ -253,8 +253,8 @@ packages: cpu: [ppc64] os: [aix] - '@esbuild/aix-ppc64@0.24.0': - resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==} + '@esbuild/aix-ppc64@0.25.0': + resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] @@ -265,8 +265,8 @@ packages: cpu: [arm64] os: [android] - '@esbuild/android-arm64@0.24.0': - resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==} + '@esbuild/android-arm64@0.25.0': + resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==} engines: {node: '>=18'} cpu: [arm64] os: [android] @@ -277,8 +277,8 @@ packages: cpu: [arm] os: [android] - '@esbuild/android-arm@0.24.0': - resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==} + '@esbuild/android-arm@0.25.0': + resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==} engines: {node: '>=18'} cpu: [arm] os: [android] @@ -289,8 +289,8 @@ packages: cpu: [x64] os: [android] - '@esbuild/android-x64@0.24.0': - resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==} + '@esbuild/android-x64@0.25.0': + resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==} engines: {node: '>=18'} cpu: [x64] os: [android] @@ -301,8 +301,8 @@ packages: cpu: [arm64] os: [darwin] - '@esbuild/darwin-arm64@0.24.0': - resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==} + '@esbuild/darwin-arm64@0.25.0': + resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] @@ -313,8 +313,8 @@ packages: cpu: [x64] os: [darwin] - '@esbuild/darwin-x64@0.24.0': - resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==} + '@esbuild/darwin-x64@0.25.0': + resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==} engines: {node: '>=18'} cpu: [x64] os: [darwin] @@ -325,8 +325,8 @@ packages: cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-arm64@0.24.0': - resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==} + '@esbuild/freebsd-arm64@0.25.0': + resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] @@ -337,8 +337,8 @@ packages: cpu: [x64] os: [freebsd] - '@esbuild/freebsd-x64@0.24.0': - resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==} + '@esbuild/freebsd-x64@0.25.0': + resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] @@ -349,8 +349,8 @@ packages: cpu: [arm64] os: [linux] - '@esbuild/linux-arm64@0.24.0': - resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==} + '@esbuild/linux-arm64@0.25.0': + resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==} engines: {node: '>=18'} cpu: [arm64] os: [linux] @@ -361,8 +361,8 @@ packages: cpu: [arm] os: [linux] - '@esbuild/linux-arm@0.24.0': - resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==} + '@esbuild/linux-arm@0.25.0': + resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==} engines: {node: '>=18'} cpu: [arm] os: [linux] @@ -373,8 +373,8 @@ packages: cpu: [ia32] os: [linux] - '@esbuild/linux-ia32@0.24.0': - resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==} + '@esbuild/linux-ia32@0.25.0': + resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==} engines: {node: '>=18'} cpu: [ia32] os: [linux] @@ -385,8 +385,8 @@ packages: cpu: [loong64] os: [linux] - '@esbuild/linux-loong64@0.24.0': - resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==} + '@esbuild/linux-loong64@0.25.0': + resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==} engines: {node: '>=18'} cpu: [loong64] os: [linux] @@ -397,8 +397,8 @@ packages: cpu: [mips64el] os: [linux] - '@esbuild/linux-mips64el@0.24.0': - resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==} + '@esbuild/linux-mips64el@0.25.0': + resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] @@ -409,8 +409,8 @@ packages: cpu: [ppc64] os: [linux] - '@esbuild/linux-ppc64@0.24.0': - resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==} + '@esbuild/linux-ppc64@0.25.0': + resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] @@ -421,8 +421,8 @@ packages: cpu: [riscv64] os: [linux] - '@esbuild/linux-riscv64@0.24.0': - resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==} + '@esbuild/linux-riscv64@0.25.0': + resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] @@ -433,8 +433,8 @@ packages: cpu: [s390x] os: [linux] - '@esbuild/linux-s390x@0.24.0': - resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==} + '@esbuild/linux-s390x@0.25.0': + resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==} engines: {node: '>=18'} cpu: [s390x] os: [linux] @@ -445,26 +445,32 @@ packages: cpu: [x64] os: [linux] - '@esbuild/linux-x64@0.24.0': - resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==} + '@esbuild/linux-x64@0.25.0': + resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==} engines: {node: '>=18'} cpu: [x64] os: [linux] + '@esbuild/netbsd-arm64@0.25.0': + resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + '@esbuild/netbsd-x64@0.20.2': resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] - '@esbuild/netbsd-x64@0.24.0': - resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==} + '@esbuild/netbsd-x64@0.25.0': + resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.24.0': - resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==} + '@esbuild/openbsd-arm64@0.25.0': + resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] @@ -475,8 +481,8 @@ packages: cpu: [x64] os: [openbsd] - '@esbuild/openbsd-x64@0.24.0': - resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==} + '@esbuild/openbsd-x64@0.25.0': + resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] @@ -487,8 +493,8 @@ packages: cpu: [x64] os: [sunos] - '@esbuild/sunos-x64@0.24.0': - resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==} + '@esbuild/sunos-x64@0.25.0': + resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==} engines: {node: '>=18'} cpu: [x64] os: [sunos] @@ -499,8 +505,8 @@ packages: cpu: [arm64] os: [win32] - '@esbuild/win32-arm64@0.24.0': - resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==} + '@esbuild/win32-arm64@0.25.0': + resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==} engines: {node: '>=18'} cpu: [arm64] os: [win32] @@ -511,8 +517,8 @@ packages: cpu: [ia32] os: [win32] - '@esbuild/win32-ia32@0.24.0': - resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==} + '@esbuild/win32-ia32@0.25.0': + resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==} engines: {node: '>=18'} cpu: [ia32] os: [win32] @@ -523,8 +529,8 @@ packages: cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.24.0': - resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==} + '@esbuild/win32-x64@0.25.0': + resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -589,91 +595,186 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.34.9': + resolution: {integrity: sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.26.0': resolution: {integrity: sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.34.9': + resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.26.0': resolution: {integrity: sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.34.9': + resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.26.0': resolution: {integrity: sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.34.9': + resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==} + cpu: [x64] + os: [darwin] + '@rollup/rollup-freebsd-arm64@4.26.0': resolution: {integrity: sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==} cpu: [arm64] os: [freebsd] + '@rollup/rollup-freebsd-arm64@4.34.9': + resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==} + cpu: [arm64] + os: [freebsd] + '@rollup/rollup-freebsd-x64@4.26.0': resolution: {integrity: sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==} cpu: [x64] os: [freebsd] + '@rollup/rollup-freebsd-x64@4.34.9': + resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==} + cpu: [x64] + os: [freebsd] + '@rollup/rollup-linux-arm-gnueabihf@4.26.0': resolution: {integrity: sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.34.9': + resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.26.0': resolution: {integrity: sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.34.9': + resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.26.0': resolution: {integrity: sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.34.9': + resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.26.0': resolution: {integrity: sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.34.9': + resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} + cpu: [arm64] + os: [linux] + + '@rollup/rollup-linux-loongarch64-gnu@4.34.9': + resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==} + cpu: [loong64] + os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': resolution: {integrity: sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==} cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': + resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.26.0': resolution: {integrity: sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.34.9': + resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.26.0': resolution: {integrity: sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.34.9': + resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.26.0': resolution: {integrity: sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.34.9': + resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.26.0': resolution: {integrity: sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.34.9': + resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} + cpu: [x64] + os: [linux] + '@rollup/rollup-win32-arm64-msvc@4.26.0': resolution: {integrity: sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.34.9': + resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.26.0': resolution: {integrity: sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.34.9': + resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==} + cpu: [ia32] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.26.0': resolution: {integrity: sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.34.9': + resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==} + cpu: [x64] + os: [win32] + '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -762,14 +863,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.13.5': - resolution: {integrity: sha512-+lTU0PxZXn0Dr1NBtC7Y8cR21AJr87dLLU953CWA6pMxxv/UDc7jYAY90upcrie1nRcD6XNG5HOYEDtgW5TxAg==} + '@types/node@22.13.9': + resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==} - '@vitest/expect@3.0.6': - resolution: {integrity: sha512-zBduHf/ja7/QRX4HdP1DSq5XrPgdN+jzLOwaTq/0qZjYfgETNFCKf9nOAp2j3hmom3oTbczuUzrzg9Hafh7hNg==} + '@vitest/expect@3.0.7': + resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==} - '@vitest/mocker@3.0.6': - resolution: {integrity: sha512-KPztr4/tn7qDGZfqlSPQoF2VgJcKxnDNhmfR3VgZ6Fy1bO8T9Fc1stUiTXtqz0yG24VpD00pZP5f8EOFknjNuQ==} + '@vitest/mocker@3.0.7': + resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -779,20 +880,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.6': - resolution: {integrity: sha512-Zyctv3dbNL+67qtHfRnUE/k8qxduOamRfAL1BurEIQSyOEFffoMvx2pnDSSbKAAVxY0Ej2J/GH2dQKI0W2JyVg==} + '@vitest/pretty-format@3.0.7': + resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==} - '@vitest/runner@3.0.6': - resolution: {integrity: sha512-JopP4m/jGoaG1+CBqubV/5VMbi7L+NQCJTu1J1Pf6YaUbk7bZtaq5CX7p+8sY64Sjn1UQ1XJparHfcvTTdu9cA==} + '@vitest/runner@3.0.7': + resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==} - '@vitest/snapshot@3.0.6': - resolution: {integrity: sha512-qKSmxNQwT60kNwwJHMVwavvZsMGXWmngD023OHSgn873pV0lylK7dwBTfYP7e4URy5NiBCHHiQGA9DHkYkqRqg==} + '@vitest/snapshot@3.0.7': + resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==} - '@vitest/spy@3.0.6': - resolution: {integrity: sha512-HfOGx/bXtjy24fDlTOpgiAEJbRfFxoX3zIGagCqACkFKKZ/TTOE6gYMKXlqecvxEndKFuNHcHqP081ggZ2yM0Q==} + '@vitest/spy@3.0.7': + resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==} - '@vitest/utils@3.0.6': - resolution: {integrity: sha512-18ktZpf4GQFTbf9jK543uspU03Q2qya7ZGya5yiZ0Gx0nnnalBvd5ZBislbl2EhLjM8A8rt4OilqKG7QwcGkvQ==} + '@vitest/utils@3.0.7': + resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -842,8 +943,8 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - bundle-require@5.0.0: - resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==} + bundle-require@5.1.0: + resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} peerDependencies: esbuild: '>=0.18' @@ -863,8 +964,8 @@ packages: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} - chokidar@4.0.1: - resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==} + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} engines: {node: '>= 14.16.0'} chownr@3.0.0: @@ -893,6 +994,10 @@ packages: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} + consola@3.4.0: + resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} + engines: {node: ^14.18.0 || >=16.10.0} + cross-spawn@7.0.3: resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} engines: {node: '>= 8'} @@ -948,8 +1053,8 @@ packages: engines: {node: '>=12'} hasBin: true - esbuild@0.24.0: - resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==} + esbuild@0.25.0: + resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==} engines: {node: '>=18'} hasBin: true @@ -983,8 +1088,8 @@ packages: fastq@1.18.0: resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} - fdir@6.4.2: - resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==} + fdir@6.4.3: + resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==} peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -1135,9 +1240,6 @@ packages: lodash.startcase@4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} - loupe@3.1.2: - resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==} - loupe@3.1.3: resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} @@ -1318,8 +1420,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.5.2: - resolution: {integrity: sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==} + prettier@3.5.3: + resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==} engines: {node: '>=14'} hasBin: true @@ -1363,6 +1465,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.34.9: + resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -1470,8 +1577,8 @@ packages: tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyglobby@0.2.10: - resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==} + tinyglobby@0.2.12: + resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} tinypool@1.0.2: @@ -1508,8 +1615,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.3.6: - resolution: {integrity: sha512-XkVtlDV/58S9Ye0JxUUTcrQk4S+EqlOHKzg6Roa62rdjL1nGWNUstG0xgI4vanHdfIpjP448J8vlN0oK6XOJ5g==} + tsup@8.4.0: + resolution: {integrity: sha512-b+eZbPCjz10fRryaAA7C8xlIHnf8VnsaRqydheLIqwG/Mcpfk8Z5zp3HayX7GaTygkigHl5cBUs+IhcySiIexQ==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1527,42 +1634,42 @@ packages: typescript: optional: true - turbo-darwin-64@2.4.2: - resolution: {integrity: sha512-HFfemyWB60CJtEvVQj9yby5rkkWw9fLAdLtAPGtPQoU3tKh8t/uzCAZKso2aPVbib9vGUuGbPGoGpaRXdVhj5g==} + turbo-darwin-64@2.4.4: + resolution: {integrity: sha512-5kPvRkLAfmWI0MH96D+/THnDMGXlFNmjeqNRj5grLKiry+M9pKj3pRuScddAXPdlxjO5Ptz06UNaOQrrYGTx1g==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.4.2: - resolution: {integrity: sha512-uwSx1dsBSSFeEC0nxyx2O219FEsS/haiESaWwE9JI8mHkQK61s6w6fN2G586krKxyNam4AIxRltleL+O2Em94g==} + turbo-darwin-arm64@2.4.4: + resolution: {integrity: sha512-/gtHPqbGQXDFhrmy+Q/MFW2HUTUlThJ97WLLSe4bxkDrKHecDYhAjbZ4rN3MM93RV9STQb3Tqy4pZBtsd4DfCw==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.4.2: - resolution: {integrity: sha512-Fy/uL8z/LAYcPbm7a1LwFnTY9pIi5FAi12iuHsgB7zHjdh4eeIKS2NIg4nroAmTcUTUZ0/cVTo4bDOCUcS3aKw==} + turbo-linux-64@2.4.4: + resolution: {integrity: sha512-SR0gri4k0bda56hw5u9VgDXLKb1Q+jrw4lM7WAhnNdXvVoep4d6LmnzgMHQQR12Wxl3KyWPbkz9d1whL6NTm2Q==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.4.2: - resolution: {integrity: sha512-AEA0d8h5W/K6iiXfEgiNwWt0yqRL1NpBs8zQCLdc4/L7WeYeJW3sORWX8zt7xhutF/KW9gTm8ehKpiK6cCIsAA==} + turbo-linux-arm64@2.4.4: + resolution: {integrity: sha512-COXXwzRd3vslQIfJhXUklgEqlwq35uFUZ7hnN+AUyXx7hUOLIiD5NblL+ETrHnhY4TzWszrbwUMfe2BYWtaPQg==} cpu: [arm64] os: [linux] - turbo-windows-64@2.4.2: - resolution: {integrity: sha512-CybtIZ9wRgnnNFVN9En9G+rxsO+mwU81fvW4RpE8BWyNEkhQ8J28qYf4PaimueMxGHHp/28i/G7Kcdn2GAWG0g==} + turbo-windows-64@2.4.4: + resolution: {integrity: sha512-PV9rYNouGz4Ff3fd6sIfQy5L7HT9a4fcZoEv8PKRavU9O75G7PoDtm8scpHU10QnK0QQNLbE9qNxOAeRvF0fJg==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.4.2: - resolution: {integrity: sha512-7V0yneVPL8Y3TgrkUIjw7Odmwu1tHnyIiPHFM7eFcA7U+H6hPXyCxge7nC3wOKfjhKCQqUm+Vf/k6kjmLz5G4g==} + turbo-windows-arm64@2.4.4: + resolution: {integrity: sha512-403sqp9t5sx6YGEC32IfZTVWkRAixOQomGYB8kEc6ZD+//LirSxzeCHCnM8EmSXw7l57U1G+Fb0kxgTcKPU/Lg==} cpu: [arm64] os: [win32] - turbo@2.4.2: - resolution: {integrity: sha512-Qxi0ioQCxMRUCcHKHZkTnYH8e7XCpNfg9QiJcyfWIc+ZXeaCjzV5rCGlbQlTXMAtI8qgfP8fZADv3CFtPwqdPQ==} + turbo@2.4.4: + resolution: {integrity: sha512-N9FDOVaY3yz0YCOhYIgOGYad7+m2ptvinXygw27WPLQvcZDl3+0Sa77KGVlLSiuPDChOUEnTKE9VJwLSi9BPGQ==} hasBin: true - typescript@5.7.3: - resolution: {integrity: sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==} + typescript@5.8.2: + resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==} engines: {node: '>=14.17'} hasBin: true @@ -1577,8 +1684,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.0.6: - resolution: {integrity: sha512-s51RzrTkXKJrhNbUzQRsarjmAae7VmMPAsRT7lppVpIg6mK3zGthP9Hgz0YQQKuNcF+Ii7DfYk3Fxz40jRmePw==} + vite-node@3.0.7: + resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1610,16 +1717,16 @@ packages: terser: optional: true - vitest@3.0.6: - resolution: {integrity: sha512-/iL1Sc5VeDZKPDe58oGK4HUFLhw6b5XdY1MYawjuSaDA4sEfYlY9HnS6aCEG26fX+MgUi7MwlduTBHHAI/OvMA==} + vitest@3.0.7: + resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.6 - '@vitest/ui': 3.0.6 + '@vitest/browser': 3.0.7 + '@vitest/ui': 3.0.7 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1867,142 +1974,145 @@ snapshots: '@esbuild/aix-ppc64@0.20.2': optional: true - '@esbuild/aix-ppc64@0.24.0': + '@esbuild/aix-ppc64@0.25.0': optional: true '@esbuild/android-arm64@0.20.2': optional: true - '@esbuild/android-arm64@0.24.0': + '@esbuild/android-arm64@0.25.0': optional: true '@esbuild/android-arm@0.20.2': optional: true - '@esbuild/android-arm@0.24.0': + '@esbuild/android-arm@0.25.0': optional: true '@esbuild/android-x64@0.20.2': optional: true - '@esbuild/android-x64@0.24.0': + '@esbuild/android-x64@0.25.0': optional: true '@esbuild/darwin-arm64@0.20.2': optional: true - '@esbuild/darwin-arm64@0.24.0': + '@esbuild/darwin-arm64@0.25.0': optional: true '@esbuild/darwin-x64@0.20.2': optional: true - '@esbuild/darwin-x64@0.24.0': + '@esbuild/darwin-x64@0.25.0': optional: true '@esbuild/freebsd-arm64@0.20.2': optional: true - '@esbuild/freebsd-arm64@0.24.0': + '@esbuild/freebsd-arm64@0.25.0': optional: true '@esbuild/freebsd-x64@0.20.2': optional: true - '@esbuild/freebsd-x64@0.24.0': + '@esbuild/freebsd-x64@0.25.0': optional: true '@esbuild/linux-arm64@0.20.2': optional: true - '@esbuild/linux-arm64@0.24.0': + '@esbuild/linux-arm64@0.25.0': optional: true '@esbuild/linux-arm@0.20.2': optional: true - '@esbuild/linux-arm@0.24.0': + '@esbuild/linux-arm@0.25.0': optional: true '@esbuild/linux-ia32@0.20.2': optional: true - '@esbuild/linux-ia32@0.24.0': + '@esbuild/linux-ia32@0.25.0': optional: true '@esbuild/linux-loong64@0.20.2': optional: true - '@esbuild/linux-loong64@0.24.0': + '@esbuild/linux-loong64@0.25.0': optional: true '@esbuild/linux-mips64el@0.20.2': optional: true - '@esbuild/linux-mips64el@0.24.0': + '@esbuild/linux-mips64el@0.25.0': optional: true '@esbuild/linux-ppc64@0.20.2': optional: true - '@esbuild/linux-ppc64@0.24.0': + '@esbuild/linux-ppc64@0.25.0': optional: true '@esbuild/linux-riscv64@0.20.2': optional: true - '@esbuild/linux-riscv64@0.24.0': + '@esbuild/linux-riscv64@0.25.0': optional: true '@esbuild/linux-s390x@0.20.2': optional: true - '@esbuild/linux-s390x@0.24.0': + '@esbuild/linux-s390x@0.25.0': optional: true '@esbuild/linux-x64@0.20.2': optional: true - '@esbuild/linux-x64@0.24.0': + '@esbuild/linux-x64@0.25.0': + optional: true + + '@esbuild/netbsd-arm64@0.25.0': optional: true '@esbuild/netbsd-x64@0.20.2': optional: true - '@esbuild/netbsd-x64@0.24.0': + '@esbuild/netbsd-x64@0.25.0': optional: true - '@esbuild/openbsd-arm64@0.24.0': + '@esbuild/openbsd-arm64@0.25.0': optional: true '@esbuild/openbsd-x64@0.20.2': optional: true - '@esbuild/openbsd-x64@0.24.0': + '@esbuild/openbsd-x64@0.25.0': optional: true '@esbuild/sunos-x64@0.20.2': optional: true - '@esbuild/sunos-x64@0.24.0': + '@esbuild/sunos-x64@0.25.0': optional: true '@esbuild/win32-arm64@0.20.2': optional: true - '@esbuild/win32-arm64@0.24.0': + '@esbuild/win32-arm64@0.25.0': optional: true '@esbuild/win32-ia32@0.20.2': optional: true - '@esbuild/win32-ia32@0.24.0': + '@esbuild/win32-ia32@0.25.0': optional: true '@esbuild/win32-x64@0.20.2': optional: true - '@esbuild/win32-x64@0.24.0': + '@esbuild/win32-x64@0.25.0': optional: true '@isaacs/cliui@8.0.2': @@ -2075,57 +2185,114 @@ snapshots: '@rollup/rollup-android-arm-eabi@4.26.0': optional: true + '@rollup/rollup-android-arm-eabi@4.34.9': + optional: true + '@rollup/rollup-android-arm64@4.26.0': optional: true + '@rollup/rollup-android-arm64@4.34.9': + optional: true + '@rollup/rollup-darwin-arm64@4.26.0': optional: true + '@rollup/rollup-darwin-arm64@4.34.9': + optional: true + '@rollup/rollup-darwin-x64@4.26.0': optional: true + '@rollup/rollup-darwin-x64@4.34.9': + optional: true + '@rollup/rollup-freebsd-arm64@4.26.0': optional: true + '@rollup/rollup-freebsd-arm64@4.34.9': + optional: true + '@rollup/rollup-freebsd-x64@4.26.0': optional: true + '@rollup/rollup-freebsd-x64@4.34.9': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.26.0': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.34.9': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.26.0': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.34.9': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.26.0': optional: true + '@rollup/rollup-linux-arm64-gnu@4.34.9': + optional: true + '@rollup/rollup-linux-arm64-musl@4.26.0': optional: true + '@rollup/rollup-linux-arm64-musl@4.34.9': + optional: true + + '@rollup/rollup-linux-loongarch64-gnu@4.34.9': + optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': optional: true + '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.26.0': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.34.9': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.26.0': optional: true + '@rollup/rollup-linux-s390x-gnu@4.34.9': + optional: true + '@rollup/rollup-linux-x64-gnu@4.26.0': optional: true + '@rollup/rollup-linux-x64-gnu@4.34.9': + optional: true + '@rollup/rollup-linux-x64-musl@4.26.0': optional: true + '@rollup/rollup-linux-x64-musl@4.34.9': + optional: true + '@rollup/rollup-win32-arm64-msvc@4.26.0': optional: true + '@rollup/rollup-win32-arm64-msvc@4.34.9': + optional: true + '@rollup/rollup-win32-ia32-msvc@4.26.0': optional: true + '@rollup/rollup-win32-ia32-msvc@4.34.9': + optional: true + '@rollup/rollup-win32-x64-msvc@4.26.0': optional: true + '@rollup/rollup-win32-x64-msvc@4.34.9': + optional: true + '@sec-ant/readable-stream@0.4.1': {} '@sindresorhus/merge-streams@4.0.0': {} @@ -2189,47 +2356,47 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.13.5': + '@types/node@22.13.9': dependencies: undici-types: 6.20.0 - '@vitest/expect@3.0.6': + '@vitest/expect@3.0.7': dependencies: - '@vitest/spy': 3.0.6 - '@vitest/utils': 3.0.6 + '@vitest/spy': 3.0.7 + '@vitest/utils': 3.0.7 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.6(vite@5.2.10(@types/node@22.13.5))': + '@vitest/mocker@3.0.7(vite@5.2.10(@types/node@22.13.9))': dependencies: - '@vitest/spy': 3.0.6 + '@vitest/spy': 3.0.7 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.13.5) + vite: 5.2.10(@types/node@22.13.9) - '@vitest/pretty-format@3.0.6': + '@vitest/pretty-format@3.0.7': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.6': + '@vitest/runner@3.0.7': dependencies: - '@vitest/utils': 3.0.6 + '@vitest/utils': 3.0.7 pathe: 2.0.3 - '@vitest/snapshot@3.0.6': + '@vitest/snapshot@3.0.7': dependencies: - '@vitest/pretty-format': 3.0.6 + '@vitest/pretty-format': 3.0.7 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.0.6': + '@vitest/spy@3.0.7': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.6': + '@vitest/utils@3.0.7': dependencies: - '@vitest/pretty-format': 3.0.6 + '@vitest/pretty-format': 3.0.7 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2269,9 +2436,9 @@ snapshots: dependencies: fill-range: 7.1.1 - bundle-require@5.0.0(esbuild@0.24.0): + bundle-require@5.1.0(esbuild@0.25.0): dependencies: - esbuild: 0.24.0 + esbuild: 0.25.0 load-tsconfig: 0.2.5 cac@6.7.14: {} @@ -2281,14 +2448,14 @@ snapshots: assertion-error: 2.0.1 check-error: 2.1.1 deep-eql: 5.0.2 - loupe: 3.1.2 + loupe: 3.1.3 pathval: 2.0.0 chardet@0.7.0: {} check-error@2.1.1: {} - chokidar@4.0.1: + chokidar@4.0.3: dependencies: readdirp: 4.0.2 @@ -2310,6 +2477,8 @@ snapshots: consola@3.2.3: {} + consola@3.4.0: {} + cross-spawn@7.0.3: dependencies: path-key: 3.1.1 @@ -2375,32 +2544,33 @@ snapshots: '@esbuild/win32-ia32': 0.20.2 '@esbuild/win32-x64': 0.20.2 - esbuild@0.24.0: + esbuild@0.25.0: optionalDependencies: - '@esbuild/aix-ppc64': 0.24.0 - '@esbuild/android-arm': 0.24.0 - '@esbuild/android-arm64': 0.24.0 - '@esbuild/android-x64': 0.24.0 - '@esbuild/darwin-arm64': 0.24.0 - '@esbuild/darwin-x64': 0.24.0 - '@esbuild/freebsd-arm64': 0.24.0 - '@esbuild/freebsd-x64': 0.24.0 - '@esbuild/linux-arm': 0.24.0 - '@esbuild/linux-arm64': 0.24.0 - '@esbuild/linux-ia32': 0.24.0 - '@esbuild/linux-loong64': 0.24.0 - '@esbuild/linux-mips64el': 0.24.0 - '@esbuild/linux-ppc64': 0.24.0 - '@esbuild/linux-riscv64': 0.24.0 - '@esbuild/linux-s390x': 0.24.0 - '@esbuild/linux-x64': 0.24.0 - '@esbuild/netbsd-x64': 0.24.0 - '@esbuild/openbsd-arm64': 0.24.0 - '@esbuild/openbsd-x64': 0.24.0 - '@esbuild/sunos-x64': 0.24.0 - '@esbuild/win32-arm64': 0.24.0 - '@esbuild/win32-ia32': 0.24.0 - '@esbuild/win32-x64': 0.24.0 + '@esbuild/aix-ppc64': 0.25.0 + '@esbuild/android-arm': 0.25.0 + '@esbuild/android-arm64': 0.25.0 + '@esbuild/android-x64': 0.25.0 + '@esbuild/darwin-arm64': 0.25.0 + '@esbuild/darwin-x64': 0.25.0 + '@esbuild/freebsd-arm64': 0.25.0 + '@esbuild/freebsd-x64': 0.25.0 + '@esbuild/linux-arm': 0.25.0 + '@esbuild/linux-arm64': 0.25.0 + '@esbuild/linux-ia32': 0.25.0 + '@esbuild/linux-loong64': 0.25.0 + '@esbuild/linux-mips64el': 0.25.0 + '@esbuild/linux-ppc64': 0.25.0 + '@esbuild/linux-riscv64': 0.25.0 + '@esbuild/linux-s390x': 0.25.0 + '@esbuild/linux-x64': 0.25.0 + '@esbuild/netbsd-arm64': 0.25.0 + '@esbuild/netbsd-x64': 0.25.0 + '@esbuild/openbsd-arm64': 0.25.0 + '@esbuild/openbsd-x64': 0.25.0 + '@esbuild/sunos-x64': 0.25.0 + '@esbuild/win32-arm64': 0.25.0 + '@esbuild/win32-ia32': 0.25.0 + '@esbuild/win32-x64': 0.25.0 esprima@4.0.1: {} @@ -2445,7 +2615,7 @@ snapshots: dependencies: reusify: 1.0.4 - fdir@6.4.2(picomatch@4.0.2): + fdir@6.4.3(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 @@ -2577,8 +2747,6 @@ snapshots: lodash.startcase@4.4.0: {} - loupe@3.1.2: {} - loupe@3.1.3: {} lru-cache@10.1.0: {} @@ -2706,7 +2874,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.5.2: {} + prettier@3.5.3: {} pretty-ms@9.2.0: dependencies: @@ -2759,6 +2927,31 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.26.0 fsevents: 2.3.3 + rollup@4.34.9: + dependencies: + '@types/estree': 1.0.6 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.34.9 + '@rollup/rollup-android-arm64': 4.34.9 + '@rollup/rollup-darwin-arm64': 4.34.9 + '@rollup/rollup-darwin-x64': 4.34.9 + '@rollup/rollup-freebsd-arm64': 4.34.9 + '@rollup/rollup-freebsd-x64': 4.34.9 + '@rollup/rollup-linux-arm-gnueabihf': 4.34.9 + '@rollup/rollup-linux-arm-musleabihf': 4.34.9 + '@rollup/rollup-linux-arm64-gnu': 4.34.9 + '@rollup/rollup-linux-arm64-musl': 4.34.9 + '@rollup/rollup-linux-loongarch64-gnu': 4.34.9 + '@rollup/rollup-linux-powerpc64le-gnu': 4.34.9 + '@rollup/rollup-linux-riscv64-gnu': 4.34.9 + '@rollup/rollup-linux-s390x-gnu': 4.34.9 + '@rollup/rollup-linux-x64-gnu': 4.34.9 + '@rollup/rollup-linux-x64-musl': 4.34.9 + '@rollup/rollup-win32-arm64-msvc': 4.34.9 + '@rollup/rollup-win32-ia32-msvc': 4.34.9 + '@rollup/rollup-win32-x64-msvc': 4.34.9 + fsevents: 2.3.3 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -2857,9 +3050,9 @@ snapshots: tinyexec@0.3.2: {} - tinyglobby@0.2.10: + tinyglobby@0.2.12: dependencies: - fdir: 6.4.2(picomatch@4.0.2) + fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 tinypool@1.0.2: {} @@ -2886,62 +3079,62 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.3.6(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.7.3): + tsup@8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2): dependencies: - bundle-require: 5.0.0(esbuild@0.24.0) + bundle-require: 5.1.0(esbuild@0.25.0) cac: 6.7.14 - chokidar: 4.0.1 - consola: 3.2.3 + chokidar: 4.0.3 + consola: 3.4.0 debug: 4.4.0 - esbuild: 0.24.0 + esbuild: 0.25.0 joycon: 3.1.1 picocolors: 1.1.1 postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.4.38) resolve-from: 5.0.0 - rollup: 4.26.0 + rollup: 4.34.9 source-map: 0.8.0-beta.0 sucrase: 3.35.0 tinyexec: 0.3.2 - tinyglobby: 0.2.10 + tinyglobby: 0.2.12 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.7.3 + typescript: 5.8.2 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.4.2: + turbo-darwin-64@2.4.4: optional: true - turbo-darwin-arm64@2.4.2: + turbo-darwin-arm64@2.4.4: optional: true - turbo-linux-64@2.4.2: + turbo-linux-64@2.4.4: optional: true - turbo-linux-arm64@2.4.2: + turbo-linux-arm64@2.4.4: optional: true - turbo-windows-64@2.4.2: + turbo-windows-64@2.4.4: optional: true - turbo-windows-arm64@2.4.2: + turbo-windows-arm64@2.4.4: optional: true - turbo@2.4.2: + turbo@2.4.4: optionalDependencies: - turbo-darwin-64: 2.4.2 - turbo-darwin-arm64: 2.4.2 - turbo-linux-64: 2.4.2 - turbo-linux-arm64: 2.4.2 - turbo-windows-64: 2.4.2 - turbo-windows-arm64: 2.4.2 + turbo-darwin-64: 2.4.4 + turbo-darwin-arm64: 2.4.4 + turbo-linux-64: 2.4.4 + turbo-linux-arm64: 2.4.4 + turbo-windows-64: 2.4.4 + turbo-windows-arm64: 2.4.4 - typescript@5.7.3: {} + typescript@5.8.2: {} undici-types@6.20.0: {} @@ -2949,13 +3142,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.0.6(@types/node@22.13.5): + vite-node@3.0.7(@types/node@22.13.9): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.13.5) + vite: 5.2.10(@types/node@22.13.9) transitivePeerDependencies: - '@types/node' - less @@ -2966,24 +3159,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.13.5): + vite@5.2.10(@types/node@22.13.9): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.26.0 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 fsevents: 2.3.3 - vitest@3.0.6(@types/node@22.13.5): + vitest@3.0.7(@types/node@22.13.9): dependencies: - '@vitest/expect': 3.0.6 - '@vitest/mocker': 3.0.6(vite@5.2.10(@types/node@22.13.5)) - '@vitest/pretty-format': 3.0.6 - '@vitest/runner': 3.0.6 - '@vitest/snapshot': 3.0.6 - '@vitest/spy': 3.0.6 - '@vitest/utils': 3.0.6 + '@vitest/expect': 3.0.7 + '@vitest/mocker': 3.0.7(vite@5.2.10(@types/node@22.13.9)) + '@vitest/pretty-format': 3.0.7 + '@vitest/runner': 3.0.7 + '@vitest/snapshot': 3.0.7 + '@vitest/spy': 3.0.7 + '@vitest/utils': 3.0.7 chai: 5.2.0 debug: 4.4.0 expect-type: 1.1.0 @@ -2994,11 +3187,11 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.13.5) - vite-node: 3.0.6(@types/node@22.13.5) + vite: 5.2.10(@types/node@22.13.9) + vite-node: 3.0.7(@types/node@22.13.9) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.5 + '@types/node': 22.13.9 transitivePeerDependencies: - less - lightningcss From 7609a87b3c9cdd9efb8705caaf757d2f4b99ec4a Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 4 Mar 2025 20:59:06 +0000 Subject: [PATCH 195/290] fix: regression from 0.5.x: write `.gitignore` to new projects --- packages/create/src/index.ts | 7 +++++-- packages/create/src/utils/constants.ts | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index dd1035b..77efc43 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -3,10 +3,11 @@ import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "@solid-cli/utils/ui"; import { createStart } from "./create-start"; -import { getTemplatesList, StartTemplate, VanillaTemplate } from "./utils/constants"; +import { getTemplatesList, GIT_IGNORE, StartTemplate, VanillaTemplate } from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; import { insertAtEnd } from "@solid-cli/utils/fs"; -import { existsSync } from "node:fs"; +import { existsSync, writeFileSync } from "node:fs"; +import { join } from "node:path"; export { createVanilla, createStart }; export const createSolid = (version: string) => defineCommand({ @@ -75,6 +76,8 @@ export const createSolid = (version: string) => fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, transpileToJS), }); } + // Add .gitignore + writeFileSync(join(projectName, ".gitignore"), GIT_IGNORE); // Add "Created with Solid CLI" text to bottom of README if (existsSync(`${projectName}/README.md`)) await insertAtEnd( diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 8ac3ba6..fbccf1b 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -1,5 +1,4 @@ -export const GIT_IGNORE = ` -dist +export const GIT_IGNORE = `dist .solid .output .vercel From 86764930891b55f2024b049a0f5195314b9f584c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 4 Mar 2025 21:01:58 +0000 Subject: [PATCH 196/290] release: version and release fixes #60 --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- packages/full-solid/CHANGELOG.md | 6 ++++++ packages/full-solid/package.json | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 4c162bb..a7c73ca 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,3 +1,9 @@ # create-solid +## 0.6.1 + +### Patch Changes + +- Fix regression from 0.5.x (.gitignore wasn't being written to new projects) + ## 0.6.0 diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index c564d48..d7acf20 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.0", + "version": "0.6.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 59b1f89..7cd1fb5 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.1 + +### Patch Changes + +- Fix regression from 0.5.x (.gitignore wasn't being written to new projects) + ## 0.6.0 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index f0e7a11..2490c0f 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.0", + "version": "0.6.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/CHANGELOG.md b/packages/full-solid/CHANGELOG.md index 5eef41c..82d25df 100644 --- a/packages/full-solid/CHANGELOG.md +++ b/packages/full-solid/CHANGELOG.md @@ -1,3 +1,9 @@ # @solid-cli/full +## 0.6.1 + +### Patch Changes + +- Fix regression from 0.5.x (.gitignore wasn't being written to new projects) + ## 0.6.0 diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 2d4367a..b1dabcb 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.0", + "version": "0.6.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 7d20849f7fcc0d08d28ad9ac8d9e6ce48909a64d Mon Sep 17 00:00:00 2001 From: huseeiin <122984423+huseeiin@users.noreply.github.com> Date: Fri, 14 Mar 2025 05:24:58 -0400 Subject: [PATCH 197/290] Update constants.ts delete .solid and add .wrangler --- packages/create/src/utils/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index fbccf1b..2c894f8 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -1,5 +1,5 @@ export const GIT_IGNORE = `dist -.solid +.wrangler .output .vercel .netlify From 1ff35113d0781c2153b543721563df6026211b0e Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Fri, 14 Mar 2025 20:59:04 -0500 Subject: [PATCH 198/290] fix: non-typescript templates --- packages/create/src/utils/ts-conversion.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/utils/ts-conversion.ts b/packages/create/src/utils/ts-conversion.ts index 001923a..a13da71 100644 --- a/packages/create/src/utils/ts-conversion.ts +++ b/packages/create/src/utils/ts-conversion.ts @@ -6,7 +6,7 @@ import { rm } from "node:fs/promises"; import { JS_CONFIG } from "./constants"; const convertToJS = async (file: Dirent, startPath: string) => { const src = join(startPath, file.name); - const dest = resolve(startPath.replace(".solid-start", ""), file.name); + const dest = resolve(startPath.replace(".project", ""), file.name); if (file.isDirectory()) { mkdirSync(dest, { recursive: true }); recurseFiles(resolve(startPath, file.name), convertToJS); From cbe3d4d997bd7f95ef45737cadd55afde31cbf63 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 15 Mar 2025 17:37:00 +0000 Subject: [PATCH 199/290] release --- packages/create-solid/package.json | 2 +- packages/create/package.json | 2 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index d7acf20..8e26cb7 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.1", + "version": "0.6.2", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/package.json b/packages/create/package.json index 2490c0f..f9681c8 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.1", + "version": "0.6.2", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index b1dabcb..68a0fad 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.1", + "version": "0.6.2", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/package.json b/packages/utils/package.json index fc60caf..5e58ee1 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.6.0", + "version": "0.6.1", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From d608d2dc9b1a473948a6c52fca9ae73ca0388c6c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 29 Mar 2025 22:02:08 +0000 Subject: [PATCH 200/290] chore: update deps --- package.json | 4 +- packages/create-solid/package.json | 2 +- packages/create/package.json | 2 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 128 ++++++++++++++--------------- 6 files changed, 71 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 402813a..2974816 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,9 @@ "@changesets/cli": "2.28.1", "prettier": "^3.5.3", "turbo": "^2.4.4", - "vitest": "^3.0.7" + "vitest": "^3.0.9" }, - "packageManager": "pnpm@10.5.2", + "packageManager": "pnpm@10.7.0", "dependencies": { "jiti": "^2.4.2" }, diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 8e26cb7..d99a156 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@clack/prompts": "0.10.0", - "@types/node": "^22.13.9", + "@types/node": "^22.13.14", "picocolors": "^1.1.1", "tsup": "^8.4.0", "typescript": "^5.8.2", diff --git a/packages/create/package.json b/packages/create/package.json index f9681c8..b1e3bf7 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "typescript": "^5.8.2", - "@types/node": "^22.13.9", + "@types/node": "^22.13.14", "tsup": "^8.4.0" }, "publishConfig": { diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 68a0fad..47a258e 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@clack/prompts": "0.10.0", "picocolors": "^1.1.1", - "@types/node": "^22.13.9", + "@types/node": "^22.13.14", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index 5e58ee1..ef28cca 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,11 +68,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.13.9", + "@types/node": "22.13.14", "magicast": "^0.3.5", "tsup": "^8.4.0", "typescript": "^5.8.2", - "vitest": "^3.0.7" + "vitest": "^3.0.9" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 437d123..87452b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,8 +22,8 @@ importers: specifier: ^2.4.4 version: 2.4.4 vitest: - specifier: ^3.0.7 - version: 3.0.7(@types/node@22.13.9) + specifier: ^3.0.9 + version: 3.0.9(@types/node@22.13.14) packages/create: dependencies: @@ -47,8 +47,8 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.13.9 - version: 22.13.9 + specifier: ^22.13.14 + version: 22.13.14 tsup: specifier: ^8.4.0 version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) @@ -65,8 +65,8 @@ importers: specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.13.9 - version: 22.13.9 + specifier: ^22.13.14 + version: 22.13.14 citty: specifier: ^0.1.6 version: 0.1.6 @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.13.9 - version: 22.13.9 + specifier: ^22.13.14 + version: 22.13.14 citty: specifier: ^0.1.6 version: 0.1.6 @@ -129,8 +129,8 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.13.9 - version: 22.13.9 + specifier: 22.13.14 + version: 22.13.14 magicast: specifier: ^0.3.5 version: 0.3.5 @@ -141,8 +141,8 @@ importers: specifier: ^5.8.2 version: 5.8.2 vitest: - specifier: ^3.0.7 - version: 3.0.7(@types/node@22.13.9) + specifier: ^3.0.9 + version: 3.0.9(@types/node@22.13.14) packages: @@ -863,14 +863,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.13.9': - resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==} + '@types/node@22.13.14': + resolution: {integrity: sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==} - '@vitest/expect@3.0.7': - resolution: {integrity: sha512-QP25f+YJhzPfHrHfYHtvRn+uvkCFCqFtW9CktfBxmB+25QqWsx7VB2As6f4GmwllHLDhXNHvqedwhvMmSnNmjw==} + '@vitest/expect@3.0.9': + resolution: {integrity: sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==} - '@vitest/mocker@3.0.7': - resolution: {integrity: sha512-qui+3BLz9Eonx4EAuR/i+QlCX6AUZ35taDQgwGkK/Tw6/WgwodSrjN1X2xf69IA/643ZX5zNKIn2svvtZDrs4w==} + '@vitest/mocker@3.0.9': + resolution: {integrity: sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -880,20 +880,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.7': - resolution: {integrity: sha512-CiRY0BViD/V8uwuEzz9Yapyao+M9M008/9oMOSQydwbwb+CMokEq3XVaF3XK/VWaOK0Jm9z7ENhybg70Gtxsmg==} + '@vitest/pretty-format@3.0.9': + resolution: {integrity: sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==} - '@vitest/runner@3.0.7': - resolution: {integrity: sha512-WeEl38Z0S2ZcuRTeyYqaZtm4e26tq6ZFqh5y8YD9YxfWuu0OFiGFUbnxNynwLjNRHPsXyee2M9tV7YxOTPZl2g==} + '@vitest/runner@3.0.9': + resolution: {integrity: sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==} - '@vitest/snapshot@3.0.7': - resolution: {integrity: sha512-eqTUryJWQN0Rtf5yqCGTQWsCFOQe4eNz5Twsu21xYEcnFJtMU5XvmG0vgebhdLlrHQTSq5p8vWHJIeJQV8ovsA==} + '@vitest/snapshot@3.0.9': + resolution: {integrity: sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==} - '@vitest/spy@3.0.7': - resolution: {integrity: sha512-4T4WcsibB0B6hrKdAZTM37ekuyFZt2cGbEGd2+L0P8ov15J1/HUsUaqkXEQPNAWr4BtPPe1gI+FYfMHhEKfR8w==} + '@vitest/spy@3.0.9': + resolution: {integrity: sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==} - '@vitest/utils@3.0.7': - resolution: {integrity: sha512-xePVpCRfooFX3rANQjwoditoXgWb1MaFbzmGuPP59MK6i13mrnDw/yEIyJudLeW6/38mCNcwCiJIGmpDPibAIg==} + '@vitest/utils@3.0.9': + resolution: {integrity: sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -1684,8 +1684,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.0.7: - resolution: {integrity: sha512-2fX0QwX4GkkkpULXdT1Pf4q0tC1i1lFOyseKoonavXUNlQ77KpW2XqBGGNIm/J4Ows4KxgGJzDguYVPKwG/n5A==} + vite-node@3.0.9: + resolution: {integrity: sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1717,16 +1717,16 @@ packages: terser: optional: true - vitest@3.0.7: - resolution: {integrity: sha512-IP7gPK3LS3Fvn44x30X1dM9vtawm0aesAa2yBIZ9vQf+qB69NXC5776+Qmcr7ohUXIQuLhk7xQR0aSUIDPqavg==} + vitest@3.0.9: + resolution: {integrity: sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.7 - '@vitest/ui': 3.0.7 + '@vitest/browser': 3.0.9 + '@vitest/ui': 3.0.9 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2356,47 +2356,47 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.13.9': + '@types/node@22.13.14': dependencies: undici-types: 6.20.0 - '@vitest/expect@3.0.7': + '@vitest/expect@3.0.9': dependencies: - '@vitest/spy': 3.0.7 - '@vitest/utils': 3.0.7 + '@vitest/spy': 3.0.9 + '@vitest/utils': 3.0.9 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.7(vite@5.2.10(@types/node@22.13.9))': + '@vitest/mocker@3.0.9(vite@5.2.10(@types/node@22.13.14))': dependencies: - '@vitest/spy': 3.0.7 + '@vitest/spy': 3.0.9 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.13.9) + vite: 5.2.10(@types/node@22.13.14) - '@vitest/pretty-format@3.0.7': + '@vitest/pretty-format@3.0.9': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.7': + '@vitest/runner@3.0.9': dependencies: - '@vitest/utils': 3.0.7 + '@vitest/utils': 3.0.9 pathe: 2.0.3 - '@vitest/snapshot@3.0.7': + '@vitest/snapshot@3.0.9': dependencies: - '@vitest/pretty-format': 3.0.7 + '@vitest/pretty-format': 3.0.9 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.0.7': + '@vitest/spy@3.0.9': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.7': + '@vitest/utils@3.0.9': dependencies: - '@vitest/pretty-format': 3.0.7 + '@vitest/pretty-format': 3.0.9 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -3142,13 +3142,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.0.7(@types/node@22.13.9): + vite-node@3.0.9(@types/node@22.13.14): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.13.9) + vite: 5.2.10(@types/node@22.13.14) transitivePeerDependencies: - '@types/node' - less @@ -3159,24 +3159,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.13.9): + vite@5.2.10(@types/node@22.13.14): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.26.0 optionalDependencies: - '@types/node': 22.13.9 + '@types/node': 22.13.14 fsevents: 2.3.3 - vitest@3.0.7(@types/node@22.13.9): + vitest@3.0.9(@types/node@22.13.14): dependencies: - '@vitest/expect': 3.0.7 - '@vitest/mocker': 3.0.7(vite@5.2.10(@types/node@22.13.9)) - '@vitest/pretty-format': 3.0.7 - '@vitest/runner': 3.0.7 - '@vitest/snapshot': 3.0.7 - '@vitest/spy': 3.0.7 - '@vitest/utils': 3.0.7 + '@vitest/expect': 3.0.9 + '@vitest/mocker': 3.0.9(vite@5.2.10(@types/node@22.13.14)) + '@vitest/pretty-format': 3.0.9 + '@vitest/runner': 3.0.9 + '@vitest/snapshot': 3.0.9 + '@vitest/spy': 3.0.9 + '@vitest/utils': 3.0.9 chai: 5.2.0 debug: 4.4.0 expect-type: 1.1.0 @@ -3187,11 +3187,11 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.13.9) - vite-node: 3.0.7(@types/node@22.13.9) + vite: 5.2.10(@types/node@22.13.14) + vite-node: 3.0.9(@types/node@22.13.14) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.9 + '@types/node': 22.13.14 transitivePeerDependencies: - less - lightningcss From 491d179ecd65a0258524e427bcb4ddcb641b9327 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:22:11 +0100 Subject: [PATCH 201/290] chore: update dependencies --- package.json | 6 +- packages/create-solid/package.json | 6 +- packages/create/package.json | 8 +- packages/full-solid/package.json | 6 +- packages/utils/package.json | 10 +- pnpm-lock.yaml | 463 +++++++++-------------------- 6 files changed, 163 insertions(+), 336 deletions(-) diff --git a/package.json b/package.json index 2974816..9b4c296 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,10 @@ "devDependencies": { "@changesets/cli": "2.28.1", "prettier": "^3.5.3", - "turbo": "^2.4.4", - "vitest": "^3.0.9" + "turbo": "^2.5.0", + "vitest": "^3.1.1" }, - "packageManager": "pnpm@10.7.0", + "packageManager": "pnpm@10.8.0", "dependencies": { "jiti": "^2.4.2" }, diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index d99a156..3c9dab2 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,11 +31,11 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.10.0", - "@types/node": "^22.13.14", + "@clack/prompts": "0.10.1", + "@types/node": "^22.14.0", "picocolors": "^1.1.1", "tsup": "^8.4.0", - "typescript": "^5.8.2", + "typescript": "^5.8.3", "citty": "^0.1.6", "@solid-cli/create": "workspace:*" }, diff --git a/packages/create/package.json b/packages/create/package.json index b1e3bf7..0431547 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -37,17 +37,17 @@ "test": "vitest run" }, "devDependencies": { - "typescript": "^5.8.2", - "@types/node": "^22.13.14", + "typescript": "^5.8.3", + "@types/node": "^22.14.0", "tsup": "^8.4.0" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/prompts": "0.10.0", + "@clack/prompts": "0.10.1", "picocolors": "^1.1.1", - "@begit/core": "^0.1.5", + "@begit/core": "^0.2.0", "citty": "^0.1.6", "sucrase": "^3.35.0", "@solid-cli/utils": "workspace:*" diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 47a258e..1bfac41 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,14 +30,14 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.10.0", + "@clack/prompts": "0.10.1", "picocolors": "^1.1.1", - "@types/node": "^22.13.14", + "@types/node": "^22.14.0", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", "tsup": "^8.4.0", - "typescript": "^5.8.2" + "typescript": "^5.8.3" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index ef28cca..0a7720d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,18 +68,18 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.13.14", + "@types/node": "22.14.0", "magicast": "^0.3.5", "tsup": "^8.4.0", - "typescript": "^5.8.2", - "vitest": "^3.0.9" + "typescript": "^5.8.3", + "vitest": "^3.1.1" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.4.1", - "@clack/prompts": "0.10.0", + "@clack/core": "0.4.2", + "@clack/prompts": "0.10.1", "execa": "^9.5.2", "picocolors": "^1.1.1", "smol-toml": "^1.3.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 87452b9..e6d321a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,20 +19,20 @@ importers: specifier: ^3.5.3 version: 3.5.3 turbo: - specifier: ^2.4.4 - version: 2.4.4 + specifier: ^2.5.0 + version: 2.5.0 vitest: - specifier: ^3.0.9 - version: 3.0.9(@types/node@22.13.14) + specifier: ^3.1.1 + version: 3.1.1(@types/node@22.14.0) packages/create: dependencies: '@begit/core': - specifier: ^0.1.5 - version: 0.1.5 + specifier: ^0.2.0 + version: 0.2.0 '@clack/prompts': - specifier: 0.10.0 - version: 0.10.0 + specifier: 0.10.1 + version: 0.10.1 '@solid-cli/utils': specifier: workspace:* version: link:../utils @@ -47,26 +47,26 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.13.14 - version: 22.13.14 + specifier: ^22.14.0 + version: 22.14.0 tsup: specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: - specifier: ^5.8.2 - version: 5.8.2 + specifier: ^5.8.3 + version: 5.8.3 packages/create-solid: devDependencies: '@clack/prompts': - specifier: 0.10.0 - version: 0.10.0 + specifier: 0.10.1 + version: 0.10.1 '@solid-cli/create': specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.13.14 - version: 22.13.14 + specifier: ^22.14.0 + version: 22.14.0 citty: specifier: ^0.1.6 version: 0.1.6 @@ -75,16 +75,16 @@ importers: version: 1.1.1 tsup: specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: - specifier: ^5.8.2 - version: 5.8.2 + specifier: ^5.8.3 + version: 5.8.3 packages/full-solid: devDependencies: '@clack/prompts': - specifier: 0.10.0 - version: 0.10.0 + specifier: 0.10.1 + version: 0.10.1 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.13.14 - version: 22.13.14 + specifier: ^22.14.0 + version: 22.14.0 citty: specifier: ^0.1.6 version: 0.1.6 @@ -102,19 +102,19 @@ importers: version: 1.1.1 tsup: specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: - specifier: ^5.8.2 - version: 5.8.2 + specifier: ^5.8.3 + version: 5.8.3 packages/utils: dependencies: '@clack/core': - specifier: 0.4.1 - version: 0.4.1 + specifier: 0.4.2 + version: 0.4.2 '@clack/prompts': - specifier: 0.10.0 - version: 0.10.0 + specifier: 0.10.1 + version: 0.10.1 execa: specifier: ^9.5.2 version: 9.5.2 @@ -129,20 +129,20 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.13.14 - version: 22.13.14 + specifier: 22.14.0 + version: 22.14.0 magicast: specifier: ^0.3.5 version: 0.3.5 tsup: specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2) + version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: - specifier: ^5.8.2 - version: 5.8.2 + specifier: ^5.8.3 + version: 5.8.3 vitest: - specifier: ^3.0.9 - version: 3.0.9(@types/node@22.13.14) + specifier: ^3.1.1 + version: 3.1.1(@types/node@22.14.0) packages: @@ -167,8 +167,8 @@ packages: resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} - '@begit/core@0.1.5': - resolution: {integrity: sha512-3DoFnqKlFrnK6vOGT/Y2dCZvmBmYTgNUOmGdjxdNQvGDAnoUm4XPyRu8dKE30PlKM+7CB0IsZOTPdNSPLBUq1g==} + '@begit/core@0.2.0': + resolution: {integrity: sha512-mSmYK/dgfG49avwfg/V93TtcMfOXPfp11YQ22PZv8WLlqSJChXdFz2KWukhiteRS6+y4cbqkn9GZ9iAEb6uklw==} '@changesets/apply-release-plan@7.0.10': resolution: {integrity: sha512-wNyeIJ3yDsVspYvHnEz1xQDq18D9ifed3lI+wxRQRK4pArUcuHgCTrHv0QRnnwjhVCQACxZ+CBih3wgOct6UXw==} @@ -241,11 +241,11 @@ packages: resolution: {integrity: sha512-eV1m70Qn9pLY9xwFmZ2FlcOzwiaUywsJ7NB/ud8VB7DouvCQtIHkQ3Om7uPX0ojXGEG1LCyO96kZkvbNTxNu0Q==} engines: {node: '>=18'} - '@clack/core@0.4.1': - resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==} + '@clack/core@0.4.2': + resolution: {integrity: sha512-NYQfcEy8MWIxrT5Fj8nIVchfRFA26yYKJcvBS7WlUIlw2OmQOY9DhGGXMovyI5J5PpxrCPGkgUi207EBrjpBvg==} - '@clack/prompts@0.10.0': - resolution: {integrity: sha512-H3rCl6CwW1NdQt9rE3n373t7o5cthPv7yUoxF2ytZvyvlJv89C5RYMJu83Hed8ODgys5vpBU0GKxIRG83jd8NQ==} + '@clack/prompts@0.10.1': + resolution: {integrity: sha512-Q0T02vx8ZM9XSv9/Yde0jTmmBQufZhPJfYAg2XrrrxWWaZgq1rr8nU8Hv710BQ1dhoP8rtY7YUdpGej2Qza/cw==} '@esbuild/aix-ppc64@0.20.2': resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} @@ -590,101 +590,51 @@ packages: resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} - '@rollup/rollup-android-arm-eabi@4.26.0': - resolution: {integrity: sha512-gJNwtPDGEaOEgejbaseY6xMFu+CPltsc8/T+diUTTbOQLqD+bnrJq9ulH6WD69TqwqWmrfRAtUv30cCFZlbGTQ==} - cpu: [arm] - os: [android] - '@rollup/rollup-android-arm-eabi@4.34.9': resolution: {integrity: sha512-qZdlImWXur0CFakn2BJ2znJOdqYZKiedEPEVNTBrpfPjc/YuTGcaYZcdmNFTkUj3DU0ZM/AElcM8Ybww3xVLzA==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.26.0': - resolution: {integrity: sha512-YJa5Gy8mEZgz5JquFruhJODMq3lTHWLm1fOy+HIANquLzfIOzE9RA5ie3JjCdVb9r46qfAQY/l947V0zfGJ0OQ==} - cpu: [arm64] - os: [android] - '@rollup/rollup-android-arm64@4.34.9': resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.26.0': - resolution: {integrity: sha512-ErTASs8YKbqTBoPLp/kA1B1Um5YSom8QAc4rKhg7b9tyyVqDBlQxy7Bf2wW7yIlPGPg2UODDQcbkTlruPzDosw==} - cpu: [arm64] - os: [darwin] - '@rollup/rollup-darwin-arm64@4.34.9': resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.26.0': - resolution: {integrity: sha512-wbgkYDHcdWW+NqP2mnf2NOuEbOLzDblalrOWcPyY6+BRbVhliavon15UploG7PpBRQ2bZJnbmh8o3yLoBvDIHA==} - cpu: [x64] - os: [darwin] - '@rollup/rollup-darwin-x64@4.34.9': resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.26.0': - resolution: {integrity: sha512-Y9vpjfp9CDkAG4q/uwuhZk96LP11fBz/bYdyg9oaHYhtGZp7NrbkQrj/66DYMMP2Yo/QPAsVHkV891KyO52fhg==} - cpu: [arm64] - os: [freebsd] - '@rollup/rollup-freebsd-arm64@4.34.9': resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.26.0': - resolution: {integrity: sha512-A/jvfCZ55EYPsqeaAt/yDAG4q5tt1ZboWMHEvKAH9Zl92DWvMIbnZe/f/eOXze65aJaaKbL+YeM0Hz4kLQvdwg==} - cpu: [x64] - os: [freebsd] - '@rollup/rollup-freebsd-x64@4.34.9': resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.26.0': - resolution: {integrity: sha512-paHF1bMXKDuizaMODm2bBTjRiHxESWiIyIdMugKeLnjuS1TCS54MF5+Y5Dx8Ui/1RBPVRE09i5OUlaLnv8OGnA==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-gnueabihf@4.34.9': resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.26.0': - resolution: {integrity: sha512-cwxiHZU1GAs+TMxvgPfUDtVZjdBdTsQwVnNlzRXC5QzIJ6nhfB4I1ahKoe9yPmoaA/Vhf7m9dB1chGPpDRdGXg==} - cpu: [arm] - os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.34.9': resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.26.0': - resolution: {integrity: sha512-4daeEUQutGRCW/9zEo8JtdAgtJ1q2g5oHaoQaZbMSKaIWKDQwQ3Yx0/3jJNmpzrsScIPtx/V+1AfibLisb3AMQ==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.34.9': resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.26.0': - resolution: {integrity: sha512-eGkX7zzkNxvvS05ROzJ/cO/AKqNvR/7t1jA3VZDi2vRniLKwAWxUr85fH3NsvtxU5vnUUKFHKh8flIBdlo2b3Q==} - cpu: [arm64] - os: [linux] - '@rollup/rollup-linux-arm64-musl@4.34.9': resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} cpu: [arm64] @@ -695,81 +645,41 @@ packages: cpu: [loong64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': - resolution: {integrity: sha512-Odp/lgHbW/mAqw/pU21goo5ruWsytP7/HCC/liOt0zcGG0llYWKrd10k9Fj0pdj3prQ63N5yQLCLiE7HTX+MYw==} - cpu: [ppc64] - os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.26.0': - resolution: {integrity: sha512-MBR2ZhCTzUgVD0OJdTzNeF4+zsVogIR1U/FsyuFerwcqjZGvg2nYe24SAHp8O5sN8ZkRVbHwlYeHqcSQ8tcYew==} - cpu: [riscv64] - os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.34.9': resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.26.0': - resolution: {integrity: sha512-YYcg8MkbN17fMbRMZuxwmxWqsmQufh3ZJFxFGoHjrE7bv0X+T6l3glcdzd7IKLiwhT+PZOJCblpnNlz1/C3kGQ==} - cpu: [s390x] - os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.34.9': resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.26.0': - resolution: {integrity: sha512-ZuwpfjCwjPkAOxpjAEjabg6LRSfL7cAJb6gSQGZYjGhadlzKKywDkCUnJ+KEfrNY1jH5EEoSIKLCb572jSiglA==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-gnu@4.34.9': resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.26.0': - resolution: {integrity: sha512-+HJD2lFS86qkeF8kNu0kALtifMpPCZU80HvwztIKnYwym3KnA1os6nsX4BGSTLtS2QVAGG1P3guRgsYyMA0Yhg==} - cpu: [x64] - os: [linux] - '@rollup/rollup-linux-x64-musl@4.34.9': resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.26.0': - resolution: {integrity: sha512-WUQzVFWPSw2uJzX4j6YEbMAiLbs0BUysgysh8s817doAYhR5ybqTI1wtKARQKo6cGop3pHnrUJPFCsXdoFaimQ==} - cpu: [arm64] - os: [win32] - '@rollup/rollup-win32-arm64-msvc@4.34.9': resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.26.0': - resolution: {integrity: sha512-D4CxkazFKBfN1akAIY6ieyOqzoOoBV1OICxgUblWxff/pSjCA2khXlASUx7mK6W1oP4McqhgcCsu6QaLj3WMWg==} - cpu: [ia32] - os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.34.9': resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.26.0': - resolution: {integrity: sha512-2x8MO1rm4PGEP0xWbubJW5RtbNLk3puzAMaLQd3B3JHVw4KcHlmXcO+Wewx9zCoo7EUFiMlu/aZbCJ7VjMzAag==} - cpu: [x64] - os: [win32] - '@rollup/rollup-win32-x64-msvc@4.34.9': resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==} cpu: [x64] @@ -863,14 +773,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.13.14': - resolution: {integrity: sha512-Zs/Ollc1SJ8nKUAgc7ivOEdIBM8JAKgrqqUYi2J997JuKO7/tpQC+WCetQ1sypiKCQWHdvdg9wBNpUPEWZae7w==} + '@types/node@22.14.0': + resolution: {integrity: sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==} - '@vitest/expect@3.0.9': - resolution: {integrity: sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==} + '@vitest/expect@3.1.1': + resolution: {integrity: sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==} - '@vitest/mocker@3.0.9': - resolution: {integrity: sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==} + '@vitest/mocker@3.1.1': + resolution: {integrity: sha512-bmpJJm7Y7i9BBELlLuuM1J1Q6EQ6K5Ye4wcyOpOMXMcePYKSIYlpcrCm4l/O6ja4VJA5G2aMJiuZkZdnxlC3SA==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -880,20 +790,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.0.9': - resolution: {integrity: sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==} + '@vitest/pretty-format@3.1.1': + resolution: {integrity: sha512-dg0CIzNx+hMMYfNmSqJlLSXEmnNhMswcn3sXO7Tpldr0LiGmg3eXdLLhwkv2ZqgHb/d5xg5F7ezNFRA1fA13yA==} - '@vitest/runner@3.0.9': - resolution: {integrity: sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==} + '@vitest/runner@3.1.1': + resolution: {integrity: sha512-X/d46qzJuEDO8ueyjtKfxffiXraPRfmYasoC4i5+mlLEJ10UvPb0XH5M9C3gWuxd7BAQhpK42cJgJtq53YnWVA==} - '@vitest/snapshot@3.0.9': - resolution: {integrity: sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==} + '@vitest/snapshot@3.1.1': + resolution: {integrity: sha512-bByMwaVWe/+1WDf9exFxWWgAixelSdiwo2p33tpqIlM14vW7PRV5ppayVXtfycqze4Qhtwag5sVhX400MLBOOw==} - '@vitest/spy@3.0.9': - resolution: {integrity: sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==} + '@vitest/spy@3.1.1': + resolution: {integrity: sha512-+EmrUOOXbKzLkTDwlsc/xrwOlPDXyVk3Z6P6K4oiCndxz7YLpp/0R0UsWVOKT0IXWjjBJuSMk6D27qipaupcvQ==} - '@vitest/utils@3.0.9': - resolution: {integrity: sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==} + '@vitest/utils@3.1.1': + resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -1070,8 +980,8 @@ packages: resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==} engines: {node: ^18.19.0 || >=20.5.0} - expect-type@1.1.0: - resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==} + expect-type@1.2.1: + resolution: {integrity: sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==} engines: {node: '>=12.0.0'} extendable-error@0.1.7: @@ -1460,11 +1370,6 @@ packages: engines: {node: '>=14'} hasBin: true - rollup@4.26.0: - resolution: {integrity: sha512-ilcl12hnWonG8f+NxU6BlgysVA0gvY2l8N0R84S1HcINbW20bvwuCngJkkInV6LXhwRpucsW5k1ovDwEdBVrNg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - rollup@4.34.9: resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -1524,8 +1429,8 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - std-env@3.8.0: - resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==} + std-env@3.9.0: + resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==} string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} @@ -1634,47 +1539,47 @@ packages: typescript: optional: true - turbo-darwin-64@2.4.4: - resolution: {integrity: sha512-5kPvRkLAfmWI0MH96D+/THnDMGXlFNmjeqNRj5grLKiry+M9pKj3pRuScddAXPdlxjO5Ptz06UNaOQrrYGTx1g==} + turbo-darwin-64@2.5.0: + resolution: {integrity: sha512-fP1hhI9zY8hv0idym3hAaXdPi80TLovmGmgZFocVAykFtOxF+GlfIgM/l4iLAV9ObIO4SUXPVWHeBZQQ+Hpjag==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.4.4: - resolution: {integrity: sha512-/gtHPqbGQXDFhrmy+Q/MFW2HUTUlThJ97WLLSe4bxkDrKHecDYhAjbZ4rN3MM93RV9STQb3Tqy4pZBtsd4DfCw==} + turbo-darwin-arm64@2.5.0: + resolution: {integrity: sha512-p9sYq7kXH7qeJwIQE86cOWv/xNqvow846l6c/qWc26Ib1ci5W7V0sI5thsrP3eH+VA0d+SHalTKg5SQXgNQBWA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.4.4: - resolution: {integrity: sha512-SR0gri4k0bda56hw5u9VgDXLKb1Q+jrw4lM7WAhnNdXvVoep4d6LmnzgMHQQR12Wxl3KyWPbkz9d1whL6NTm2Q==} + turbo-linux-64@2.5.0: + resolution: {integrity: sha512-1iEln2GWiF3iPPPS1HQJT6ZCFXynJPd89gs9SkggH2EJsj3eRUSVMmMC8y6d7bBbhBFsiGGazwFIYrI12zs6uQ==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.4.4: - resolution: {integrity: sha512-COXXwzRd3vslQIfJhXUklgEqlwq35uFUZ7hnN+AUyXx7hUOLIiD5NblL+ETrHnhY4TzWszrbwUMfe2BYWtaPQg==} + turbo-linux-arm64@2.5.0: + resolution: {integrity: sha512-bKBcbvuQHmsX116KcxHJuAcppiiBOfivOObh2O5aXNER6mce7YDDQJy00xQQNp1DhEfcSV2uOsvb3O3nN2cbcA==} cpu: [arm64] os: [linux] - turbo-windows-64@2.4.4: - resolution: {integrity: sha512-PV9rYNouGz4Ff3fd6sIfQy5L7HT9a4fcZoEv8PKRavU9O75G7PoDtm8scpHU10QnK0QQNLbE9qNxOAeRvF0fJg==} + turbo-windows-64@2.5.0: + resolution: {integrity: sha512-9BCo8oQ7BO7J0K913Czbc3tw8QwLqn2nTe4E47k6aVYkM12ASTScweXPTuaPFP5iYXAT6z5Dsniw704Ixa5eGg==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.4.4: - resolution: {integrity: sha512-403sqp9t5sx6YGEC32IfZTVWkRAixOQomGYB8kEc6ZD+//LirSxzeCHCnM8EmSXw7l57U1G+Fb0kxgTcKPU/Lg==} + turbo-windows-arm64@2.5.0: + resolution: {integrity: sha512-OUHCV+ueXa3UzfZ4co/ueIHgeq9B2K48pZwIxKSm5VaLVuv8M13MhM7unukW09g++dpdrrE1w4IOVgxKZ0/exg==} cpu: [arm64] os: [win32] - turbo@2.4.4: - resolution: {integrity: sha512-N9FDOVaY3yz0YCOhYIgOGYad7+m2ptvinXygw27WPLQvcZDl3+0Sa77KGVlLSiuPDChOUEnTKE9VJwLSi9BPGQ==} + turbo@2.5.0: + resolution: {integrity: sha512-PvSRruOsitjy6qdqwIIyolv99+fEn57gP6gn4zhsHTEcCYgXPhv6BAxzAjleS8XKpo+Y582vTTA9nuqYDmbRuA==} hasBin: true - typescript@5.8.2: - resolution: {integrity: sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ==} + typescript@5.8.3: + resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==} engines: {node: '>=14.17'} hasBin: true - undici-types@6.20.0: - resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==} + undici-types@6.21.0: + resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} unicorn-magic@0.3.0: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} @@ -1684,8 +1589,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.0.9: - resolution: {integrity: sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==} + vite-node@3.1.1: + resolution: {integrity: sha512-V+IxPAE2FvXpTCHXyNem0M+gWm6J7eRyWPR6vYoG/Gl+IscNOjXzztUhimQgTxaAoUoj40Qqimaa0NLIOOAH4w==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1717,16 +1622,16 @@ packages: terser: optional: true - vitest@3.0.9: - resolution: {integrity: sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==} + vitest@3.1.1: + resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.0.9 - '@vitest/ui': 3.0.9 + '@vitest/browser': 3.1.1 + '@vitest/ui': 3.1.1 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1797,7 +1702,7 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@begit/core@0.1.5': + '@begit/core@0.2.0': dependencies: tar: 7.4.3 @@ -1960,14 +1865,14 @@ snapshots: '@chialab/node-resolve@0.18.0': {} - '@clack/core@0.4.1': + '@clack/core@0.4.2': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.10.0': + '@clack/prompts@0.10.1': dependencies: - '@clack/core': 0.4.1 + '@clack/core': 0.4.2 picocolors: 1.1.1 sisteransi: 1.0.5 @@ -2182,114 +2087,60 @@ snapshots: '@pkgjs/parseargs@0.11.0': optional: true - '@rollup/rollup-android-arm-eabi@4.26.0': - optional: true - '@rollup/rollup-android-arm-eabi@4.34.9': optional: true - '@rollup/rollup-android-arm64@4.26.0': - optional: true - '@rollup/rollup-android-arm64@4.34.9': optional: true - '@rollup/rollup-darwin-arm64@4.26.0': - optional: true - '@rollup/rollup-darwin-arm64@4.34.9': optional: true - '@rollup/rollup-darwin-x64@4.26.0': - optional: true - '@rollup/rollup-darwin-x64@4.34.9': optional: true - '@rollup/rollup-freebsd-arm64@4.26.0': - optional: true - '@rollup/rollup-freebsd-arm64@4.34.9': optional: true - '@rollup/rollup-freebsd-x64@4.26.0': - optional: true - '@rollup/rollup-freebsd-x64@4.34.9': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.26.0': - optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.34.9': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.26.0': - optional: true - '@rollup/rollup-linux-arm-musleabihf@4.34.9': optional: true - '@rollup/rollup-linux-arm64-gnu@4.26.0': - optional: true - '@rollup/rollup-linux-arm64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-arm64-musl@4.26.0': - optional: true - '@rollup/rollup-linux-arm64-musl@4.34.9': optional: true '@rollup/rollup-linux-loongarch64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.26.0': - optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.26.0': - optional: true - '@rollup/rollup-linux-riscv64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-s390x-gnu@4.26.0': - optional: true - '@rollup/rollup-linux-s390x-gnu@4.34.9': optional: true - '@rollup/rollup-linux-x64-gnu@4.26.0': - optional: true - '@rollup/rollup-linux-x64-gnu@4.34.9': optional: true - '@rollup/rollup-linux-x64-musl@4.26.0': - optional: true - '@rollup/rollup-linux-x64-musl@4.34.9': optional: true - '@rollup/rollup-win32-arm64-msvc@4.26.0': - optional: true - '@rollup/rollup-win32-arm64-msvc@4.34.9': optional: true - '@rollup/rollup-win32-ia32-msvc@4.26.0': - optional: true - '@rollup/rollup-win32-ia32-msvc@4.34.9': optional: true - '@rollup/rollup-win32-x64-msvc@4.26.0': - optional: true - '@rollup/rollup-win32-x64-msvc@4.34.9': optional: true @@ -2356,47 +2207,47 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.13.14': + '@types/node@22.14.0': dependencies: - undici-types: 6.20.0 + undici-types: 6.21.0 - '@vitest/expect@3.0.9': + '@vitest/expect@3.1.1': dependencies: - '@vitest/spy': 3.0.9 - '@vitest/utils': 3.0.9 + '@vitest/spy': 3.1.1 + '@vitest/utils': 3.1.1 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.0.9(vite@5.2.10(@types/node@22.13.14))': + '@vitest/mocker@3.1.1(vite@5.2.10(@types/node@22.14.0))': dependencies: - '@vitest/spy': 3.0.9 + '@vitest/spy': 3.1.1 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.13.14) + vite: 5.2.10(@types/node@22.14.0) - '@vitest/pretty-format@3.0.9': + '@vitest/pretty-format@3.1.1': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.0.9': + '@vitest/runner@3.1.1': dependencies: - '@vitest/utils': 3.0.9 + '@vitest/utils': 3.1.1 pathe: 2.0.3 - '@vitest/snapshot@3.0.9': + '@vitest/snapshot@3.1.1': dependencies: - '@vitest/pretty-format': 3.0.9 + '@vitest/pretty-format': 3.1.1 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.0.9': + '@vitest/spy@3.1.1': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.0.9': + '@vitest/utils@3.1.1': dependencies: - '@vitest/pretty-format': 3.0.9 + '@vitest/pretty-format': 3.1.1 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2593,7 +2444,7 @@ snapshots: strip-final-newline: 4.0.0 yoctocolors: 2.1.1 - expect-type@1.1.0: {} + expect-type@1.2.1: {} extendable-error@0.1.7: {} @@ -2903,30 +2754,6 @@ snapshots: dependencies: glob: 10.3.10 - rollup@4.26.0: - dependencies: - '@types/estree': 1.0.6 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.26.0 - '@rollup/rollup-android-arm64': 4.26.0 - '@rollup/rollup-darwin-arm64': 4.26.0 - '@rollup/rollup-darwin-x64': 4.26.0 - '@rollup/rollup-freebsd-arm64': 4.26.0 - '@rollup/rollup-freebsd-x64': 4.26.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.26.0 - '@rollup/rollup-linux-arm-musleabihf': 4.26.0 - '@rollup/rollup-linux-arm64-gnu': 4.26.0 - '@rollup/rollup-linux-arm64-musl': 4.26.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.26.0 - '@rollup/rollup-linux-riscv64-gnu': 4.26.0 - '@rollup/rollup-linux-s390x-gnu': 4.26.0 - '@rollup/rollup-linux-x64-gnu': 4.26.0 - '@rollup/rollup-linux-x64-musl': 4.26.0 - '@rollup/rollup-win32-arm64-msvc': 4.26.0 - '@rollup/rollup-win32-ia32-msvc': 4.26.0 - '@rollup/rollup-win32-x64-msvc': 4.26.0 - fsevents: 2.3.3 - rollup@4.34.9: dependencies: '@types/estree': 1.0.6 @@ -2991,7 +2818,7 @@ snapshots: stackback@0.0.2: {} - std-env@3.8.0: {} + std-env@3.9.0: {} string-width@4.2.3: dependencies: @@ -3079,7 +2906,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.2): + tsup@8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3): dependencies: bundle-require: 5.1.0(esbuild@0.25.0) cac: 6.7.14 @@ -3100,55 +2927,55 @@ snapshots: optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.8.2 + typescript: 5.8.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.4.4: + turbo-darwin-64@2.5.0: optional: true - turbo-darwin-arm64@2.4.4: + turbo-darwin-arm64@2.5.0: optional: true - turbo-linux-64@2.4.4: + turbo-linux-64@2.5.0: optional: true - turbo-linux-arm64@2.4.4: + turbo-linux-arm64@2.5.0: optional: true - turbo-windows-64@2.4.4: + turbo-windows-64@2.5.0: optional: true - turbo-windows-arm64@2.4.4: + turbo-windows-arm64@2.5.0: optional: true - turbo@2.4.4: + turbo@2.5.0: optionalDependencies: - turbo-darwin-64: 2.4.4 - turbo-darwin-arm64: 2.4.4 - turbo-linux-64: 2.4.4 - turbo-linux-arm64: 2.4.4 - turbo-windows-64: 2.4.4 - turbo-windows-arm64: 2.4.4 + turbo-darwin-64: 2.5.0 + turbo-darwin-arm64: 2.5.0 + turbo-linux-64: 2.5.0 + turbo-linux-arm64: 2.5.0 + turbo-windows-64: 2.5.0 + turbo-windows-arm64: 2.5.0 - typescript@5.8.2: {} + typescript@5.8.3: {} - undici-types@6.20.0: {} + undici-types@6.21.0: {} unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite-node@3.0.9(@types/node@22.13.14): + vite-node@3.1.1(@types/node@22.14.0): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.13.14) + vite: 5.2.10(@types/node@22.14.0) transitivePeerDependencies: - '@types/node' - less @@ -3159,39 +2986,39 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.13.14): + vite@5.2.10(@types/node@22.14.0): dependencies: esbuild: 0.20.2 postcss: 8.4.38 - rollup: 4.26.0 + rollup: 4.34.9 optionalDependencies: - '@types/node': 22.13.14 + '@types/node': 22.14.0 fsevents: 2.3.3 - vitest@3.0.9(@types/node@22.13.14): + vitest@3.1.1(@types/node@22.14.0): dependencies: - '@vitest/expect': 3.0.9 - '@vitest/mocker': 3.0.9(vite@5.2.10(@types/node@22.13.14)) - '@vitest/pretty-format': 3.0.9 - '@vitest/runner': 3.0.9 - '@vitest/snapshot': 3.0.9 - '@vitest/spy': 3.0.9 - '@vitest/utils': 3.0.9 + '@vitest/expect': 3.1.1 + '@vitest/mocker': 3.1.1(vite@5.2.10(@types/node@22.14.0)) + '@vitest/pretty-format': 3.1.1 + '@vitest/runner': 3.1.1 + '@vitest/snapshot': 3.1.1 + '@vitest/spy': 3.1.1 + '@vitest/utils': 3.1.1 chai: 5.2.0 debug: 4.4.0 - expect-type: 1.1.0 + expect-type: 1.2.1 magic-string: 0.30.17 pathe: 2.0.3 - std-env: 3.8.0 + std-env: 3.9.0 tinybench: 2.9.0 tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.13.14) - vite-node: 3.0.9(@types/node@22.13.14) + vite: 5.2.10(@types/node@22.14.0) + vite-node: 3.1.1(@types/node@22.14.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.13.14 + '@types/node': 22.14.0 transitivePeerDependencies: - less - lightningcss From 500759fc543c74ce87b66094b4d9b1cc6547584d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 19 Apr 2025 21:39:10 +0100 Subject: [PATCH 202/290] chore: update deps and migrate to new `begit` --- package.json | 4 +- packages/create-solid/package.json | 2 +- packages/create/package.json | 4 +- packages/create/src/create-start.ts | 4 +- packages/create/src/create-vanilla.ts | 4 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 116 +++++++++++++------------- 8 files changed, 70 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 9b4c296..8018ce3 100644 --- a/package.json +++ b/package.json @@ -30,12 +30,12 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.28.1", + "@changesets/cli": "2.29.2", "prettier": "^3.5.3", "turbo": "^2.5.0", "vitest": "^3.1.1" }, - "packageManager": "pnpm@10.8.0", + "packageManager": "pnpm@10.8.1", "dependencies": { "jiti": "^2.4.2" }, diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 3c9dab2..e4bbb11 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@clack/prompts": "0.10.1", - "@types/node": "^22.14.0", + "@types/node": "^22.14.1", "picocolors": "^1.1.1", "tsup": "^8.4.0", "typescript": "^5.8.3", diff --git a/packages/create/package.json b/packages/create/package.json index 0431547..87e6363 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "typescript": "^5.8.3", - "@types/node": "^22.14.0", + "@types/node": "^22.14.1", "tsup": "^8.4.0" }, "publishConfig": { @@ -47,7 +47,7 @@ "dependencies": { "@clack/prompts": "0.10.1", "picocolors": "^1.1.1", - "@begit/core": "^0.2.0", + "@begit/core": "^0.3.0", "citty": "^0.1.6", "sucrase": "^3.35.0", "@solid-cli/utils": "workspace:*" diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index fef8cfb..873ac36 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -1,4 +1,4 @@ -import { downloadRepo } from "@begit/core"; +import { downloadRepo, GithubFetcher } from "@begit/core"; import { join } from "path"; import { writeFileSync } from "fs"; import { handleTSConversion } from "./utils/ts-conversion"; @@ -9,7 +9,7 @@ export type CreateStartArgs = { }; export const createStartTS = ({ template, destination }: CreateStartArgs) => { - return downloadRepo({ + return downloadRepo(GithubFetcher, { repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, dest: destination, }); diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index c6c4716..750ce17 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -1,4 +1,4 @@ -import { downloadRepo } from "@begit/core"; +import { downloadRepo, GithubFetcher } from "@begit/core"; import { join } from "node:path"; import { writeFileSync } from "node:fs"; import { handleTSConversion } from "./utils/ts-conversion"; @@ -15,7 +15,7 @@ export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { return createVanillaTS(args); }; export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { - return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); + return await downloadRepo(GithubFetcher, { repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); }; export const createVanillaJS = async ({ template, destination }: CreateVanillaArgs) => { diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 1bfac41..4efdabe 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@clack/prompts": "0.10.1", "picocolors": "^1.1.1", - "@types/node": "^22.14.0", + "@types/node": "^22.14.1", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index 0a7720d..a0b9486 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,7 +68,7 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.14.0", + "@types/node": "22.14.1", "magicast": "^0.3.5", "tsup": "^8.4.0", "typescript": "^5.8.3", @@ -82,6 +82,6 @@ "@clack/prompts": "0.10.1", "execa": "^9.5.2", "picocolors": "^1.1.1", - "smol-toml": "^1.3.1" + "smol-toml": "^1.3.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6d321a..8d2510f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,8 +13,8 @@ importers: version: 2.4.2 devDependencies: '@changesets/cli': - specifier: 2.28.1 - version: 2.28.1 + specifier: 2.29.2 + version: 2.29.2 prettier: specifier: ^3.5.3 version: 3.5.3 @@ -23,13 +23,13 @@ importers: version: 2.5.0 vitest: specifier: ^3.1.1 - version: 3.1.1(@types/node@22.14.0) + version: 3.1.1(@types/node@22.14.1) packages/create: dependencies: '@begit/core': - specifier: ^0.2.0 - version: 0.2.0 + specifier: ^0.3.0 + version: 0.3.0 '@clack/prompts': specifier: 0.10.1 version: 0.10.1 @@ -47,8 +47,8 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.14.0 - version: 22.14.0 + specifier: ^22.14.1 + version: 22.14.1 tsup: specifier: ^8.4.0 version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) @@ -65,8 +65,8 @@ importers: specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.14.0 - version: 22.14.0 + specifier: ^22.14.1 + version: 22.14.1 citty: specifier: ^0.1.6 version: 0.1.6 @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.14.0 - version: 22.14.0 + specifier: ^22.14.1 + version: 22.14.1 citty: specifier: ^0.1.6 version: 0.1.6 @@ -122,15 +122,15 @@ importers: specifier: ^1.1.1 version: 1.1.1 smol-toml: - specifier: ^1.3.1 - version: 1.3.1 + specifier: ^1.3.3 + version: 1.3.3 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.14.0 - version: 22.14.0 + specifier: 22.14.1 + version: 22.14.1 magicast: specifier: ^0.3.5 version: 0.3.5 @@ -142,7 +142,7 @@ importers: version: 5.8.3 vitest: specifier: ^3.1.1 - version: 3.1.1(@types/node@22.14.0) + version: 3.1.1(@types/node@22.14.1) packages: @@ -167,11 +167,11 @@ packages: resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} - '@begit/core@0.2.0': - resolution: {integrity: sha512-mSmYK/dgfG49avwfg/V93TtcMfOXPfp11YQ22PZv8WLlqSJChXdFz2KWukhiteRS6+y4cbqkn9GZ9iAEb6uklw==} + '@begit/core@0.3.0': + resolution: {integrity: sha512-alkgprLk2fiWy14X89vGm43q7437Jp8D/YDHMbGeyWpwOxlT+BuxxGle9D91YV0OjKQW4iWok2I/bX3PE9IWPQ==} - '@changesets/apply-release-plan@7.0.10': - resolution: {integrity: sha512-wNyeIJ3yDsVspYvHnEz1xQDq18D9ifed3lI+wxRQRK4pArUcuHgCTrHv0QRnnwjhVCQACxZ+CBih3wgOct6UXw==} + '@changesets/apply-release-plan@7.0.12': + resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} '@changesets/assemble-release-plan@6.0.6': resolution: {integrity: sha512-Frkj8hWJ1FRZiY3kzVCKzS0N5mMwWKwmv9vpam7vt8rZjLL1JMthdh6pSDVSPumHPshTTkKZ0VtNbE0cJHZZUg==} @@ -179,8 +179,8 @@ packages: '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.28.1': - resolution: {integrity: sha512-PiIyGRmSc6JddQJe/W1hRPjiN4VrMvb2VfQ6Uydy2punBioQrsxppyG5WafinKcW1mT0jOe/wU4k9Zy5ff21AA==} + '@changesets/cli@2.29.2': + resolution: {integrity: sha512-vwDemKjGYMOc0l6WUUTGqyAWH3AmueeyoJa1KmFRtCYiCoY5K3B68ErYpDB6H48T4lLI4czum4IEjh6ildxUeg==} hasBin: true '@changesets/config@3.1.1': @@ -192,14 +192,14 @@ packages: '@changesets/get-dependents-graph@2.1.3': resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} - '@changesets/get-release-plan@4.0.8': - resolution: {integrity: sha512-MM4mq2+DQU1ZT7nqxnpveDMTkMBLnwNX44cX7NSxlXmr7f8hO6/S2MXNiXG54uf/0nYnefv0cfy4Czf/ZL/EKQ==} + '@changesets/get-release-plan@4.0.10': + resolution: {integrity: sha512-CCJ/f3edYaA3MqoEnWvGGuZm0uMEMzNJ97z9hdUR34AOvajSwySwsIzC/bBu3+kuGDsB+cny4FljG8UBWAa7jg==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} - '@changesets/git@3.0.2': - resolution: {integrity: sha512-r1/Kju9Y8OxRRdvna+nxpQIsMsRQn9dhhAZt94FLDeu0Hij2hnOozW8iqnHBgvu+KdnJppCveQwK4odwfw/aWQ==} + '@changesets/git@3.0.4': + resolution: {integrity: sha512-BXANzRFkX+XcC1q/d27NKvlJ1yf7PSAgi8JG6dt8EfbHFHi4neau7mufcSca5zRhwOL8j9s6EqsxmT+s+/E6Sw==} '@changesets/logger@0.1.1': resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} @@ -210,8 +210,8 @@ packages: '@changesets/pre@2.0.2': resolution: {integrity: sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==} - '@changesets/read@0.6.3': - resolution: {integrity: sha512-9H4p/OuJ3jXEUTjaVGdQEhBdqoT2cO5Ts95JTFsQyawmKzpL8FnIeJSyhTDPW1MBRDnwZlHFEM9SpPwJDY5wIg==} + '@changesets/read@0.6.5': + resolution: {integrity: sha512-UPzNGhsSjHD3Veb0xO/MwvasGe8eMyNrR/sT9gR8Q3DhOQZirgKhhXv/8hVsI0QpPjR004Z9iFxoJU6in3uGMg==} '@changesets/should-skip-package@0.1.2': resolution: {integrity: sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==} @@ -773,8 +773,8 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.14.0': - resolution: {integrity: sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==} + '@types/node@22.14.1': + resolution: {integrity: sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==} '@vitest/expect@3.1.1': resolution: {integrity: sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==} @@ -1408,8 +1408,8 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - smol-toml@1.3.1: - resolution: {integrity: sha512-tEYNll18pPKHroYSmLLrksq233j021G0giwW7P3D24jC54pQ5W5BXMsQ/Mvw1OJCmEYDgY+lrzT+3nNUtoNfXQ==} + smol-toml@1.3.3: + resolution: {integrity: sha512-KMVLNWu490KlNfD0lbfDBUktJIEaZRBj1eeK0SMfdpO/rfyARIzlnPVI1Ge4l0vtSJmQUAiGKxMyLGrCT38iyA==} engines: {node: '>= 18'} source-map-js@1.2.0: @@ -1702,15 +1702,15 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@begit/core@0.2.0': + '@begit/core@0.3.0': dependencies: tar: 7.4.3 - '@changesets/apply-release-plan@7.0.10': + '@changesets/apply-release-plan@7.0.12': dependencies: '@changesets/config': 3.1.1 '@changesets/get-version-range-type': 0.4.0 - '@changesets/git': 3.0.2 + '@changesets/git': 3.0.4 '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 @@ -1735,19 +1735,19 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.28.1': + '@changesets/cli@2.29.2': dependencies: - '@changesets/apply-release-plan': 7.0.10 + '@changesets/apply-release-plan': 7.0.12 '@changesets/assemble-release-plan': 6.0.6 '@changesets/changelog-git': 0.2.1 '@changesets/config': 3.1.1 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 - '@changesets/get-release-plan': 4.0.8 - '@changesets/git': 3.0.2 + '@changesets/get-release-plan': 4.0.10 + '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.2 - '@changesets/read': 0.6.3 + '@changesets/read': 0.6.5 '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@changesets/write': 0.4.0 @@ -1787,18 +1787,18 @@ snapshots: picocolors: 1.1.1 semver: 7.6.3 - '@changesets/get-release-plan@4.0.8': + '@changesets/get-release-plan@4.0.10': dependencies: '@changesets/assemble-release-plan': 6.0.6 '@changesets/config': 3.1.1 '@changesets/pre': 2.0.2 - '@changesets/read': 0.6.3 + '@changesets/read': 0.6.5 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 '@changesets/get-version-range-type@0.4.0': {} - '@changesets/git@3.0.2': + '@changesets/git@3.0.4': dependencies: '@changesets/errors': 0.2.0 '@manypkg/get-packages': 1.1.3 @@ -1822,9 +1822,9 @@ snapshots: '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - '@changesets/read@0.6.3': + '@changesets/read@0.6.5': dependencies: - '@changesets/git': 3.0.2 + '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/parse': 0.4.1 '@changesets/types': 6.1.0 @@ -2207,7 +2207,7 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.14.0': + '@types/node@22.14.1': dependencies: undici-types: 6.21.0 @@ -2218,13 +2218,13 @@ snapshots: chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.1.1(vite@5.2.10(@types/node@22.14.0))': + '@vitest/mocker@3.1.1(vite@5.2.10(@types/node@22.14.1))': dependencies: '@vitest/spy': 3.1.1 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.14.0) + vite: 5.2.10(@types/node@22.14.1) '@vitest/pretty-format@3.1.1': dependencies: @@ -2801,7 +2801,7 @@ snapshots: slash@3.0.0: {} - smol-toml@1.3.1: {} + smol-toml@1.3.3: {} source-map-js@1.2.0: {} @@ -2969,13 +2969,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.1.1(@types/node@22.14.0): + vite-node@3.1.1(@types/node@22.14.1): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.14.0) + vite: 5.2.10(@types/node@22.14.1) transitivePeerDependencies: - '@types/node' - less @@ -2986,19 +2986,19 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.14.0): + vite@5.2.10(@types/node@22.14.1): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.34.9 optionalDependencies: - '@types/node': 22.14.0 + '@types/node': 22.14.1 fsevents: 2.3.3 - vitest@3.1.1(@types/node@22.14.0): + vitest@3.1.1(@types/node@22.14.1): dependencies: '@vitest/expect': 3.1.1 - '@vitest/mocker': 3.1.1(vite@5.2.10(@types/node@22.14.0)) + '@vitest/mocker': 3.1.1(vite@5.2.10(@types/node@22.14.1)) '@vitest/pretty-format': 3.1.1 '@vitest/runner': 3.1.1 '@vitest/snapshot': 3.1.1 @@ -3014,11 +3014,11 @@ snapshots: tinyexec: 0.3.2 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.14.0) - vite-node: 3.1.1(@types/node@22.14.0) + vite: 5.2.10(@types/node@22.14.1) + vite-node: 3.1.1(@types/node@22.14.1) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.14.0 + '@types/node': 22.14.1 transitivePeerDependencies: - less - lightningcss From b53f45c3a75045756239261599315dacbfc733bf Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 19 Apr 2025 21:53:39 +0100 Subject: [PATCH 203/290] feat: add `with-solidbase` template --- packages/create/src/utils/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 2c894f8..f3a25d7 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -64,6 +64,7 @@ const START_TEMPLATES = [ "hackernews", "notes", "todomvc", + "with-solidbase", "with-auth", "with-authjs", "with-drizzle", From afe232f649a527459bde1c5f078f8b3c81a2ade1 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 20 Apr 2025 15:33:59 +0100 Subject: [PATCH 204/290] chore: update to latest `begit` --- packages/create/package.json | 2 +- packages/create/src/create-start.ts | 4 ++-- packages/create/src/create-vanilla.ts | 2 +- pnpm-lock.yaml | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/create/package.json b/packages/create/package.json index 87e6363..3f19764 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -47,7 +47,7 @@ "dependencies": { "@clack/prompts": "0.10.1", "picocolors": "^1.1.1", - "@begit/core": "^0.3.0", + "@begit/core": "^0.3.1", "citty": "^0.1.6", "sucrase": "^3.35.0", "@solid-cli/utils": "workspace:*" diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index 873ac36..9d5dd0b 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -9,10 +9,10 @@ export type CreateStartArgs = { }; export const createStartTS = ({ template, destination }: CreateStartArgs) => { - return downloadRepo(GithubFetcher, { + return downloadRepo({ repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, dest: destination, - }); + }, GithubFetcher); }; export const createStartJS = async ({ template, destination }: CreateStartArgs) => { diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index 750ce17..1c5ad61 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -15,7 +15,7 @@ export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { return createVanillaTS(args); }; export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { - return await downloadRepo(GithubFetcher, { repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }); + return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }, GithubFetcher); }; export const createVanillaJS = async ({ template, destination }: CreateVanillaArgs) => { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8d2510f..e908c8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,8 +28,8 @@ importers: packages/create: dependencies: '@begit/core': - specifier: ^0.3.0 - version: 0.3.0 + specifier: ^0.3.1 + version: 0.3.1 '@clack/prompts': specifier: 0.10.1 version: 0.10.1 @@ -167,8 +167,8 @@ packages: resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} - '@begit/core@0.3.0': - resolution: {integrity: sha512-alkgprLk2fiWy14X89vGm43q7437Jp8D/YDHMbGeyWpwOxlT+BuxxGle9D91YV0OjKQW4iWok2I/bX3PE9IWPQ==} + '@begit/core@0.3.1': + resolution: {integrity: sha512-tjpsZqeLkGgApDW0Ra1553a55lqNhFSE6ZYUzzruLbN5inst63Qoa5J2XRNixA8lFTR3o1i2HQJioPv+J8/h9A==} '@changesets/apply-release-plan@7.0.12': resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} @@ -1702,7 +1702,7 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@begit/core@0.3.0': + '@begit/core@0.3.1': dependencies: tar: 7.4.3 From 80c3c93ad2b62f19a278abeda7b63b717b0143df Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 29 Apr 2025 21:26:20 +0100 Subject: [PATCH 205/290] chore: update dependencies --- package.json | 6 +- packages/create-solid/package.json | 2 +- packages/create/package.json | 2 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 218 ++++++++++++++++------------- 6 files changed, 129 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index 8018ce3..14efcee 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,10 @@ "devDependencies": { "@changesets/cli": "2.29.2", "prettier": "^3.5.3", - "turbo": "^2.5.0", - "vitest": "^3.1.1" + "turbo": "^2.5.2", + "vitest": "^3.1.2" }, - "packageManager": "pnpm@10.8.1", + "packageManager": "pnpm@10.10.0", "dependencies": { "jiti": "^2.4.2" }, diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index e4bbb11..bf295cd 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@clack/prompts": "0.10.1", - "@types/node": "^22.14.1", + "@types/node": "^22.15.3", "picocolors": "^1.1.1", "tsup": "^8.4.0", "typescript": "^5.8.3", diff --git a/packages/create/package.json b/packages/create/package.json index 3f19764..1ff5044 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "typescript": "^5.8.3", - "@types/node": "^22.14.1", + "@types/node": "^22.15.3", "tsup": "^8.4.0" }, "publishConfig": { diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 4efdabe..1bae7a7 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@clack/prompts": "0.10.1", "picocolors": "^1.1.1", - "@types/node": "^22.14.1", + "@types/node": "^22.15.3", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index a0b9486..3c3ff39 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,11 +68,11 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.14.1", + "@types/node": "22.15.3", "magicast": "^0.3.5", "tsup": "^8.4.0", "typescript": "^5.8.3", - "vitest": "^3.1.1" + "vitest": "^3.1.2" }, "publishConfig": { "access": "public" @@ -82,6 +82,6 @@ "@clack/prompts": "0.10.1", "execa": "^9.5.2", "picocolors": "^1.1.1", - "smol-toml": "^1.3.3" + "smol-toml": "^1.3.4" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e908c8c..1c85018 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,11 +19,11 @@ importers: specifier: ^3.5.3 version: 3.5.3 turbo: - specifier: ^2.5.0 - version: 2.5.0 + specifier: ^2.5.2 + version: 2.5.2 vitest: - specifier: ^3.1.1 - version: 3.1.1(@types/node@22.14.1) + specifier: ^3.1.2 + version: 3.1.2(@types/node@22.15.3) packages/create: dependencies: @@ -47,8 +47,8 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.14.1 - version: 22.14.1 + specifier: ^22.15.3 + version: 22.15.3 tsup: specifier: ^8.4.0 version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) @@ -65,8 +65,8 @@ importers: specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.14.1 - version: 22.14.1 + specifier: ^22.15.3 + version: 22.15.3 citty: specifier: ^0.1.6 version: 0.1.6 @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.14.1 - version: 22.14.1 + specifier: ^22.15.3 + version: 22.15.3 citty: specifier: ^0.1.6 version: 0.1.6 @@ -122,15 +122,15 @@ importers: specifier: ^1.1.1 version: 1.1.1 smol-toml: - specifier: ^1.3.3 - version: 1.3.3 + specifier: ^1.3.4 + version: 1.3.4 devDependencies: '@chialab/esbuild-plugin-meta-url': specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.14.1 - version: 22.14.1 + specifier: 22.15.3 + version: 22.15.3 magicast: specifier: ^0.3.5 version: 0.3.5 @@ -141,8 +141,8 @@ importers: specifier: ^5.8.3 version: 5.8.3 vitest: - specifier: ^3.1.1 - version: 3.1.1(@types/node@22.14.1) + specifier: ^3.1.2 + version: 3.1.2(@types/node@22.15.3) packages: @@ -773,14 +773,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.14.1': - resolution: {integrity: sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==} + '@types/node@22.15.3': + resolution: {integrity: sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==} - '@vitest/expect@3.1.1': - resolution: {integrity: sha512-q/zjrW9lgynctNbwvFtQkGK9+vvHA5UzVi2V8APrp1C6fG6/MuYYkmlx4FubuqLycCeSdHD5aadWfua/Vr0EUA==} + '@vitest/expect@3.1.2': + resolution: {integrity: sha512-O8hJgr+zREopCAqWl3uCVaOdqJwZ9qaDwUP7vy3Xigad0phZe9APxKhPcDNqYYi0rX5oMvwJMSCAXY2afqeTSA==} - '@vitest/mocker@3.1.1': - resolution: {integrity: sha512-bmpJJm7Y7i9BBELlLuuM1J1Q6EQ6K5Ye4wcyOpOMXMcePYKSIYlpcrCm4l/O6ja4VJA5G2aMJiuZkZdnxlC3SA==} + '@vitest/mocker@3.1.2': + resolution: {integrity: sha512-kOtd6K2lc7SQ0mBqYv/wdGedlqPdM/B38paPY+OwJ1XiNi44w3Fpog82UfOibmHaV9Wod18A09I9SCKLyDMqgw==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -790,20 +790,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.1.1': - resolution: {integrity: sha512-dg0CIzNx+hMMYfNmSqJlLSXEmnNhMswcn3sXO7Tpldr0LiGmg3eXdLLhwkv2ZqgHb/d5xg5F7ezNFRA1fA13yA==} + '@vitest/pretty-format@3.1.2': + resolution: {integrity: sha512-R0xAiHuWeDjTSB3kQ3OQpT8Rx3yhdOAIm/JM4axXxnG7Q/fS8XUwggv/A4xzbQA+drYRjzkMnpYnOGAc4oeq8w==} - '@vitest/runner@3.1.1': - resolution: {integrity: sha512-X/d46qzJuEDO8ueyjtKfxffiXraPRfmYasoC4i5+mlLEJ10UvPb0XH5M9C3gWuxd7BAQhpK42cJgJtq53YnWVA==} + '@vitest/runner@3.1.2': + resolution: {integrity: sha512-bhLib9l4xb4sUMPXnThbnhX2Yi8OutBMA8Yahxa7yavQsFDtwY/jrUZwpKp2XH9DhRFJIeytlyGpXCqZ65nR+g==} - '@vitest/snapshot@3.1.1': - resolution: {integrity: sha512-bByMwaVWe/+1WDf9exFxWWgAixelSdiwo2p33tpqIlM14vW7PRV5ppayVXtfycqze4Qhtwag5sVhX400MLBOOw==} + '@vitest/snapshot@3.1.2': + resolution: {integrity: sha512-Q1qkpazSF/p4ApZg1vfZSQ5Yw6OCQxVMVrLjslbLFA1hMDrT2uxtqMaw8Tc/jy5DLka1sNs1Y7rBcftMiaSH/Q==} - '@vitest/spy@3.1.1': - resolution: {integrity: sha512-+EmrUOOXbKzLkTDwlsc/xrwOlPDXyVk3Z6P6K4oiCndxz7YLpp/0R0UsWVOKT0IXWjjBJuSMk6D27qipaupcvQ==} + '@vitest/spy@3.1.2': + resolution: {integrity: sha512-OEc5fSXMws6sHVe4kOFyDSj/+4MSwst0ib4un0DlcYgQvRuYQ0+M2HyqGaauUMnjq87tmUaMNDxKQx7wNfVqPA==} - '@vitest/utils@3.1.1': - resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==} + '@vitest/utils@3.1.2': + resolution: {integrity: sha512-5GGd0ytZ7BH3H6JTj9Kw7Prn1Nbg0wZVrIvou+UWxm54d+WoXXgAgjFJ8wn3LdagWLFSEfpPeyYrByZaGEZHLg==} ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -1006,6 +1006,14 @@ packages: picomatch: optional: true + fdir@6.4.4: + resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + figures@6.1.0: resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} engines: {node: '>=18'} @@ -1408,8 +1416,8 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - smol-toml@1.3.3: - resolution: {integrity: sha512-KMVLNWu490KlNfD0lbfDBUktJIEaZRBj1eeK0SMfdpO/rfyARIzlnPVI1Ge4l0vtSJmQUAiGKxMyLGrCT38iyA==} + smol-toml@1.3.4: + resolution: {integrity: sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==} engines: {node: '>= 18'} source-map-js@1.2.0: @@ -1486,6 +1494,10 @@ packages: resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} engines: {node: '>=12.0.0'} + tinyglobby@0.2.13: + resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} + engines: {node: '>=12.0.0'} + tinypool@1.0.2: resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==} engines: {node: ^18.0.0 || >=20.0.0} @@ -1539,38 +1551,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.5.0: - resolution: {integrity: sha512-fP1hhI9zY8hv0idym3hAaXdPi80TLovmGmgZFocVAykFtOxF+GlfIgM/l4iLAV9ObIO4SUXPVWHeBZQQ+Hpjag==} + turbo-darwin-64@2.5.2: + resolution: {integrity: sha512-2aIl0Sx230nLk+Cg2qSVxvPOBWCZpwKNuAMKoROTvWKif6VMpkWWiR9XEPoz7sHeLmCOed4GYGMjL1bqAiIS/g==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.5.0: - resolution: {integrity: sha512-p9sYq7kXH7qeJwIQE86cOWv/xNqvow846l6c/qWc26Ib1ci5W7V0sI5thsrP3eH+VA0d+SHalTKg5SQXgNQBWA==} + turbo-darwin-arm64@2.5.2: + resolution: {integrity: sha512-MrFYhK/jYu8N6QlqZtqSHi3e4QVxlzqU3ANHTKn3/tThuwTLbNHEvzBPWSj5W7nZcM58dCqi6gYrfRz6bJZyAA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.5.0: - resolution: {integrity: sha512-1iEln2GWiF3iPPPS1HQJT6ZCFXynJPd89gs9SkggH2EJsj3eRUSVMmMC8y6d7bBbhBFsiGGazwFIYrI12zs6uQ==} + turbo-linux-64@2.5.2: + resolution: {integrity: sha512-LxNqUE2HmAJQ/8deoLgMUDzKxd5bKxqH0UBogWa+DF+JcXhtze3UTMr6lEr0dEofdsEUYK1zg8FRjglmwlN5YA==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.5.0: - resolution: {integrity: sha512-bKBcbvuQHmsX116KcxHJuAcppiiBOfivOObh2O5aXNER6mce7YDDQJy00xQQNp1DhEfcSV2uOsvb3O3nN2cbcA==} + turbo-linux-arm64@2.5.2: + resolution: {integrity: sha512-0MI1Ao1q8zhd+UUbIEsrM+yLq1BsrcJQRGZkxIsHFlGp7WQQH1oR3laBgfnUCNdCotCMD6w4moc9pUbXdOR3bg==} cpu: [arm64] os: [linux] - turbo-windows-64@2.5.0: - resolution: {integrity: sha512-9BCo8oQ7BO7J0K913Czbc3tw8QwLqn2nTe4E47k6aVYkM12ASTScweXPTuaPFP5iYXAT6z5Dsniw704Ixa5eGg==} + turbo-windows-64@2.5.2: + resolution: {integrity: sha512-hOLcbgZzE5ttACHHyc1ajmWYq4zKT42IC3G6XqgiXxMbS+4eyVYTL+7UvCZBd3Kca1u4TLQdLQjeO76zyDJc2A==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.5.0: - resolution: {integrity: sha512-OUHCV+ueXa3UzfZ4co/ueIHgeq9B2K48pZwIxKSm5VaLVuv8M13MhM7unukW09g++dpdrrE1w4IOVgxKZ0/exg==} + turbo-windows-arm64@2.5.2: + resolution: {integrity: sha512-fMU41ABhSLa18H8V3Z7BMCGynQ8x+wj9WyBMvWm1jeyRKgkvUYJsO2vkIsy8m0vrwnIeVXKOIn6eSe1ddlBVqw==} cpu: [arm64] os: [win32] - turbo@2.5.0: - resolution: {integrity: sha512-PvSRruOsitjy6qdqwIIyolv99+fEn57gP6gn4zhsHTEcCYgXPhv6BAxzAjleS8XKpo+Y582vTTA9nuqYDmbRuA==} + turbo@2.5.2: + resolution: {integrity: sha512-Qo5lfuStr6LQh3sPQl7kIi243bGU4aHGDQJUf6ylAdGwks30jJFloc9NYHP7Y373+gGU9OS0faA4Mb5Sy8X9Xw==} hasBin: true typescript@5.8.3: @@ -1589,8 +1601,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.1.1: - resolution: {integrity: sha512-V+IxPAE2FvXpTCHXyNem0M+gWm6J7eRyWPR6vYoG/Gl+IscNOjXzztUhimQgTxaAoUoj40Qqimaa0NLIOOAH4w==} + vite-node@3.1.2: + resolution: {integrity: sha512-/8iMryv46J3aK13iUXsei5G/A3CUlW4665THCPS+K8xAaqrVWiGB4RfXMQXCLjpK9P2eK//BczrVkn5JLAk6DA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1622,16 +1634,16 @@ packages: terser: optional: true - vitest@3.1.1: - resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==} + vitest@3.1.2: + resolution: {integrity: sha512-WaxpJe092ID1C0mr+LH9MmNrhfzi8I65EX/NRU/Ld016KqQNRgxSOlGNP1hHN+a/F8L15Mh8klwaF77zR3GeDQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.1.1 - '@vitest/ui': 3.1.1 + '@vitest/browser': 3.1.2 + '@vitest/ui': 3.1.2 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2207,47 +2219,47 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.14.1': + '@types/node@22.15.3': dependencies: undici-types: 6.21.0 - '@vitest/expect@3.1.1': + '@vitest/expect@3.1.2': dependencies: - '@vitest/spy': 3.1.1 - '@vitest/utils': 3.1.1 + '@vitest/spy': 3.1.2 + '@vitest/utils': 3.1.2 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.1.1(vite@5.2.10(@types/node@22.14.1))': + '@vitest/mocker@3.1.2(vite@5.2.10(@types/node@22.15.3))': dependencies: - '@vitest/spy': 3.1.1 + '@vitest/spy': 3.1.2 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.14.1) + vite: 5.2.10(@types/node@22.15.3) - '@vitest/pretty-format@3.1.1': + '@vitest/pretty-format@3.1.2': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.1.1': + '@vitest/runner@3.1.2': dependencies: - '@vitest/utils': 3.1.1 + '@vitest/utils': 3.1.2 pathe: 2.0.3 - '@vitest/snapshot@3.1.1': + '@vitest/snapshot@3.1.2': dependencies: - '@vitest/pretty-format': 3.1.1 + '@vitest/pretty-format': 3.1.2 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.1.1': + '@vitest/spy@3.1.2': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.1.1': + '@vitest/utils@3.1.2': dependencies: - '@vitest/pretty-format': 3.1.1 + '@vitest/pretty-format': 3.1.2 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2470,6 +2482,10 @@ snapshots: optionalDependencies: picomatch: 4.0.2 + fdir@6.4.4(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 + figures@6.1.0: dependencies: is-unicode-supported: 2.1.0 @@ -2801,7 +2817,7 @@ snapshots: slash@3.0.0: {} - smol-toml@1.3.3: {} + smol-toml@1.3.4: {} source-map-js@1.2.0: {} @@ -2882,6 +2898,11 @@ snapshots: fdir: 6.4.3(picomatch@4.0.2) picomatch: 4.0.2 + tinyglobby@0.2.13: + dependencies: + fdir: 6.4.4(picomatch@4.0.2) + picomatch: 4.0.2 + tinypool@1.0.2: {} tinyrainbow@2.0.0: {} @@ -2934,32 +2955,32 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.5.0: + turbo-darwin-64@2.5.2: optional: true - turbo-darwin-arm64@2.5.0: + turbo-darwin-arm64@2.5.2: optional: true - turbo-linux-64@2.5.0: + turbo-linux-64@2.5.2: optional: true - turbo-linux-arm64@2.5.0: + turbo-linux-arm64@2.5.2: optional: true - turbo-windows-64@2.5.0: + turbo-windows-64@2.5.2: optional: true - turbo-windows-arm64@2.5.0: + turbo-windows-arm64@2.5.2: optional: true - turbo@2.5.0: + turbo@2.5.2: optionalDependencies: - turbo-darwin-64: 2.5.0 - turbo-darwin-arm64: 2.5.0 - turbo-linux-64: 2.5.0 - turbo-linux-arm64: 2.5.0 - turbo-windows-64: 2.5.0 - turbo-windows-arm64: 2.5.0 + turbo-darwin-64: 2.5.2 + turbo-darwin-arm64: 2.5.2 + turbo-linux-64: 2.5.2 + turbo-linux-arm64: 2.5.2 + turbo-windows-64: 2.5.2 + turbo-windows-arm64: 2.5.2 typescript@5.8.3: {} @@ -2969,13 +2990,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.1.1(@types/node@22.14.1): + vite-node@3.1.2(@types/node@22.15.3): dependencies: cac: 6.7.14 debug: 4.4.0 es-module-lexer: 1.6.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.14.1) + vite: 5.2.10(@types/node@22.15.3) transitivePeerDependencies: - '@types/node' - less @@ -2986,24 +3007,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.14.1): + vite@5.2.10(@types/node@22.15.3): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.34.9 optionalDependencies: - '@types/node': 22.14.1 + '@types/node': 22.15.3 fsevents: 2.3.3 - vitest@3.1.1(@types/node@22.14.1): + vitest@3.1.2(@types/node@22.15.3): dependencies: - '@vitest/expect': 3.1.1 - '@vitest/mocker': 3.1.1(vite@5.2.10(@types/node@22.14.1)) - '@vitest/pretty-format': 3.1.1 - '@vitest/runner': 3.1.1 - '@vitest/snapshot': 3.1.1 - '@vitest/spy': 3.1.1 - '@vitest/utils': 3.1.1 + '@vitest/expect': 3.1.2 + '@vitest/mocker': 3.1.2(vite@5.2.10(@types/node@22.15.3)) + '@vitest/pretty-format': 3.1.2 + '@vitest/runner': 3.1.2 + '@vitest/snapshot': 3.1.2 + '@vitest/spy': 3.1.2 + '@vitest/utils': 3.1.2 chai: 5.2.0 debug: 4.4.0 expect-type: 1.2.1 @@ -3012,13 +3033,14 @@ snapshots: std-env: 3.9.0 tinybench: 2.9.0 tinyexec: 0.3.2 + tinyglobby: 0.2.13 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.14.1) - vite-node: 3.1.1(@types/node@22.14.1) + vite: 5.2.10(@types/node@22.15.3) + vite-node: 3.1.2(@types/node@22.15.3) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.14.1 + '@types/node': 22.15.3 transitivePeerDependencies: - less - lightningcss From 8501dc68ad164ac1352d2e55ac1b9ae1a0876db3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 5 May 2025 18:14:25 +0100 Subject: [PATCH 206/290] build: update start command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14efcee..0bbcc58 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test:all": "turbo run test", "build": "turbo run build", "release": "pnpm build && changeset publish", - "start": "cd packages/core && pnpm start", + "start": "pnpm build && cd packages/create-solid && pnpm start", "format": "prettier --write .", "watch:build": "turbo watch build" }, From 37acf10fbd73e698d9a652a5f069f730fdbf94cd Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 5 May 2025 18:18:53 +0100 Subject: [PATCH 207/290] chore: update dependencies --- package.json | 3 ++- packages/utils/package.json | 3 +-- pnpm-lock.yaml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 0bbcc58..89ca5d1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,8 @@ "release": "pnpm build && changeset publish", "start": "pnpm build && cd packages/create-solid && pnpm start", "format": "prettier --write .", - "watch:build": "turbo watch build" + "watch:build": "turbo watch build", + "update-deps": "ncu -u --packageFile packages/**/package.json" }, "contributors": [ { diff --git a/packages/utils/package.json b/packages/utils/package.json index 3c3ff39..7cc7685 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -71,8 +71,7 @@ "@types/node": "22.15.3", "magicast": "^0.3.5", "tsup": "^8.4.0", - "typescript": "^5.8.3", - "vitest": "^3.1.2" + "typescript": "^5.8.3" }, "publishConfig": { "access": "public" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1c85018..02788c8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,9 +140,6 @@ importers: typescript: specifier: ^5.8.3 version: 5.8.3 - vitest: - specifier: ^3.1.2 - version: 3.1.2(@types/node@22.15.3) packages: From a425a59604eb0a9e85234decf584800ad92b76df Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 8 May 2025 21:21:59 +0100 Subject: [PATCH 208/290] feat: allow creating library projects --- packages/create/src/create-library.ts | 14 +++++++++ packages/create/src/create-start.ts | 11 ++++--- packages/create/src/create-vanilla.ts | 5 +++- packages/create/src/index.ts | 41 ++++++++++++++++++++++---- packages/create/src/utils/constants.ts | 26 +++++++++++----- packages/full-solid/src/bin.ts | 4 +-- packages/full-solid/src/start/index.ts | 26 +++++++++------- packages/utils/src/ui/index.ts | 2 +- packages/utils/src/ui/spinnerify.ts | 2 +- 9 files changed, 98 insertions(+), 33 deletions(-) create mode 100644 packages/create/src/create-library.ts diff --git a/packages/create/src/create-library.ts b/packages/create/src/create-library.ts new file mode 100644 index 0000000..0366d98 --- /dev/null +++ b/packages/create/src/create-library.ts @@ -0,0 +1,14 @@ +import { downloadRepo, GithubFetcher } from "@begit/core"; + +export type CreateLibraryArgs = { + destination: string; +}; +export const createLibrary = ({ destination }: CreateLibraryArgs) => { + return downloadRepo( + { + repo: { owner: "solidjs-community", name: "solid-lib-starter" }, + dest: destination, + }, + GithubFetcher, + ); +}; diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index 9d5dd0b..63e4da6 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -9,10 +9,13 @@ export type CreateStartArgs = { }; export const createStartTS = ({ template, destination }: CreateStartArgs) => { - return downloadRepo({ - repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, - dest: destination, - }, GithubFetcher); + return downloadRepo( + { + repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, + dest: destination, + }, + GithubFetcher, + ); }; export const createStartJS = async ({ template, destination }: CreateStartArgs) => { diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index 1c5ad61..47fea82 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -15,7 +15,10 @@ export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { return createVanillaTS(args); }; export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { - return await downloadRepo({ repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }, GithubFetcher); + return await downloadRepo( + { repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }, + GithubFetcher, + ); }; export const createVanillaJS = async ({ template, destination }: CreateVanillaArgs) => { diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 77efc43..926ea0d 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -3,12 +3,21 @@ import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "@solid-cli/utils/ui"; import { createStart } from "./create-start"; -import { getTemplatesList, GIT_IGNORE, StartTemplate, VanillaTemplate } from "./utils/constants"; +import { + getTemplatesList, + GIT_IGNORE, + PROJECT_TYPES, + ProjectType, + StartTemplate, + VanillaTemplate, +} from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; import { insertAtEnd } from "@solid-cli/utils/fs"; import { existsSync, writeFileSync } from "node:fs"; import { join } from "node:path"; +import { createLibrary } from "./create-library"; export { createVanilla, createStart }; + export const createSolid = (version: string) => defineCommand({ meta: { @@ -46,12 +55,21 @@ export const createSolid = (version: string) => // Show prompts for any unknown arguments let projectName: string = projectNamePositional ?? projectNameOptional; let template: string = templatePositional; - let isStart: boolean = solidstart; + let projectType: ProjectType | undefined = solidstart ? "start" : undefined; projectName ??= await cancelable( p.text({ message: "Project Name", placeholder: "solid-project", defaultValue: "solid-project" }), ); - isStart ??= await cancelable(p.confirm({ message: "Is this a SolidStart project?" })); - const template_opts = await getTemplatesList(isStart); + projectType ??= await cancelable( + p.select({ + message: "What type of project would you like to create?", + initialValue: "start", + options: PROJECT_TYPES.map((t) => ({ + value: t, + label: t === "start" ? "SolidStart" : t === "vanilla" ? "SolidJS + Vite" : "Library", + })), + }), + ); + const template_opts = getTemplatesList(projectType); template ??= await cancelable( p.select({ message: "Which template would you like to use?", @@ -61,14 +79,25 @@ export const createSolid = (version: string) => ); // Don't transpile project if it's already javascript! - const transpileToJS = template.startsWith("js") ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); + const transpileToJS = + projectType === "library" + ? false + : template.startsWith("js") + ? false + : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); - if (isStart) { + if (projectType === "start") { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", fn: () => createStart({ template: template as StartTemplate, destination: projectName }, transpileToJS), }); + } else if (projectType === "library") { + await spinnerify({ + startText: "Creating project", + finishText: "Project created 🎉", + fn: () => createLibrary({ destination: projectName }), + }); } else { await spinnerify({ startText: "Creating project", diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index f3a25d7..ce66b2d 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -55,7 +55,7 @@ const VANILLA_TEMPLATES = [ "js", "js-vitest", "js-tailwindcss", -] as const; +] as const satisfies string[]; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; const START_TEMPLATES = [ @@ -77,14 +77,26 @@ const START_TEMPLATES = [ "with-unocss", "with-vitest", "experiments", -] as const; +] as const satisfies string[]; export type StartTemplate = (typeof START_TEMPLATES)[number]; -export const getTemplatesList = async (isStart: boolean) => { - if (isStart) { - return START_TEMPLATES; +export const LIBRARY_TEMPLATES = ["solid-lib-starter"] as const satisfies string[]; +export type LibraryTemplate = (typeof LIBRARY_TEMPLATES)[number]; + +export const PROJECT_TYPES = ["start", "vanilla", "library"] as const satisfies string[]; +export type ProjectType = (typeof PROJECT_TYPES)[number]; + +export function getTemplatesList(projectType: "vanilla"): StartTemplate[]; +export function getTemplatesList(projectType: "start"): VanillaTemplate[]; +export function getTemplatesList(projectType: "library"): VanillaTemplate[]; +export function getTemplatesList(projectType: ProjectType): VanillaTemplate[] | StartTemplate[] | LibraryTemplate[]; +export function getTemplatesList(projectType: ProjectType) { + if (projectType === "start") { + return START_TEMPLATES as StartTemplate[]; + } else if (projectType === "library") { + return LIBRARY_TEMPLATES as LibraryTemplate[]; } - return VANILLA_TEMPLATES; -}; + return VANILLA_TEMPLATES as VanillaTemplate[]; +} // diff --git a/packages/full-solid/src/bin.ts b/packages/full-solid/src/bin.ts index 12100b6..5f2c97c 100644 --- a/packages/full-solid/src/bin.ts +++ b/packages/full-solid/src/bin.ts @@ -13,7 +13,7 @@ intro(`\n${color.bgCyan(color.black(` Solid CLI v${packageJson.version}`))}`); const main = defineCommand({ meta: { - description: "The full Solid CLI" + description: "The full Solid CLI", }, subCommands: { create: createSolid(packageJson.version), @@ -23,7 +23,7 @@ const main = defineCommand({ meta: { description: "Open the Solid Docs in your browser" }, async run() { openInBrowser("https://docs.solidjs.com"); - p.log.success("Opened successfully") + p.log.success("Opened successfully"); }, }), }, diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index 62812f7..0df4ad5 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -2,9 +2,10 @@ import { createApi, createRoute } from "@solid-cli/utils"; import { defineCommand } from "citty"; import * as p from "@clack/prompts"; import { green } from "picocolors"; -import { cancelable } from "@solid-cli/utils/ui" +import { cancelable } from "@solid-cli/utils/ui"; export const startCommands = defineCommand({ - meta: { description: "Start-specific commands" }, subCommands: { + meta: { description: "Start-specific commands" }, + subCommands: { route: defineCommand({ meta: { description: "Creates a new route" }, args: { @@ -17,22 +18,25 @@ export const startCommands = defineCommand({ type: "boolean", required: false, default: false, - alias: "a" - } + alias: "a", + }, }, async run({ args: { path, api } }) { - path ||= await cancelable(p.text({ - message: "Route path", validate(value) { - if (value.length === 0) return "A route path is required" - }, - })) + path ||= await cancelable( + p.text({ + message: "Route path", + validate(value) { + if (value.length === 0) return "A route path is required"; + }, + }), + ); if (api) { await createApi(path as string); } else { await createRoute(path as string); } - p.log.success(`Route ${green(path as string)} successfully created!`) + p.log.success(`Route ${green(path as string)} successfully created!`); }, }), - } + }, }); diff --git a/packages/utils/src/ui/index.ts b/packages/utils/src/ui/index.ts index be0fed0..a41de7c 100644 --- a/packages/utils/src/ui/index.ts +++ b/packages/utils/src/ui/index.ts @@ -1,3 +1,3 @@ import { cancelable } from "./cancelable"; import { spinnerify } from "./spinnerify"; -export { cancelable, spinnerify } \ No newline at end of file +export { cancelable, spinnerify }; diff --git a/packages/utils/src/ui/spinnerify.ts b/packages/utils/src/ui/spinnerify.ts index baa53b4..7205636 100644 --- a/packages/utils/src/ui/spinnerify.ts +++ b/packages/utils/src/ui/spinnerify.ts @@ -16,4 +16,4 @@ export async function spinnerify(spinners: SpinnerItem[] | SpinnerItem Date: Sat, 24 May 2025 13:32:25 +0100 Subject: [PATCH 209/290] chore: update dependencies --- package.json | 6 +- packages/create-solid/package.json | 6 +- packages/create/package.json | 6 +- packages/full-solid/package.json | 6 +- packages/utils/package.json | 10 +- pnpm-lock.yaml | 353 +++++++++++++++-------------- 6 files changed, 206 insertions(+), 181 deletions(-) diff --git a/package.json b/package.json index 89ca5d1..a5954a7 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.29.2", + "@changesets/cli": "2.29.4", "prettier": "^3.5.3", - "turbo": "^2.5.2", - "vitest": "^3.1.2" + "turbo": "^2.5.3", + "vitest": "^3.1.4" }, "packageManager": "pnpm@10.10.0", "dependencies": { diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index bf295cd..c0fcad1 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,10 +31,10 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.10.1", - "@types/node": "^22.15.3", + "@clack/prompts": "0.11.0", + "@types/node": "^22.15.21", "picocolors": "^1.1.1", - "tsup": "^8.4.0", + "tsup": "^8.5.0", "typescript": "^5.8.3", "citty": "^0.1.6", "@solid-cli/create": "workspace:*" diff --git a/packages/create/package.json b/packages/create/package.json index 1ff5044..abc1c85 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -38,14 +38,14 @@ }, "devDependencies": { "typescript": "^5.8.3", - "@types/node": "^22.15.3", - "tsup": "^8.4.0" + "@types/node": "^22.15.21", + "tsup": "^8.5.0" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/prompts": "0.10.1", + "@clack/prompts": "0.11.0", "picocolors": "^1.1.1", "@begit/core": "^0.3.1", "citty": "^0.1.6", diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 1bae7a7..db472c5 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,13 +30,13 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.10.1", + "@clack/prompts": "0.11.0", "picocolors": "^1.1.1", - "@types/node": "^22.15.3", + "@types/node": "^22.15.21", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*", - "tsup": "^8.4.0", + "tsup": "^8.5.0", "typescript": "^5.8.3" }, "publishConfig": { diff --git a/packages/utils/package.json b/packages/utils/package.json index 7cc7685..9325fc8 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -68,18 +68,18 @@ }, "devDependencies": { "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.15.3", + "@types/node": "22.15.21", "magicast": "^0.3.5", - "tsup": "^8.4.0", + "tsup": "^8.5.0", "typescript": "^5.8.3" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "0.4.2", - "@clack/prompts": "0.10.1", - "execa": "^9.5.2", + "@clack/core": "0.5.0", + "@clack/prompts": "0.11.0", + "execa": "^9.5.3", "picocolors": "^1.1.1", "smol-toml": "^1.3.4" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 02788c8..42597ac 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,17 +13,17 @@ importers: version: 2.4.2 devDependencies: '@changesets/cli': - specifier: 2.29.2 - version: 2.29.2 + specifier: 2.29.4 + version: 2.29.4 prettier: specifier: ^3.5.3 version: 3.5.3 turbo: - specifier: ^2.5.2 - version: 2.5.2 + specifier: ^2.5.3 + version: 2.5.3 vitest: - specifier: ^3.1.2 - version: 3.1.2(@types/node@22.15.3) + specifier: ^3.1.4 + version: 3.1.4(@types/node@22.15.21) packages/create: dependencies: @@ -31,8 +31,8 @@ importers: specifier: ^0.3.1 version: 0.3.1 '@clack/prompts': - specifier: 0.10.1 - version: 0.10.1 + specifier: 0.11.0 + version: 0.11.0 '@solid-cli/utils': specifier: workspace:* version: link:../utils @@ -47,11 +47,11 @@ importers: version: 3.35.0 devDependencies: '@types/node': - specifier: ^22.15.3 - version: 22.15.3 + specifier: ^22.15.21 + version: 22.15.21 tsup: - specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) + specifier: ^8.5.0 + version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: specifier: ^5.8.3 version: 5.8.3 @@ -59,14 +59,14 @@ importers: packages/create-solid: devDependencies: '@clack/prompts': - specifier: 0.10.1 - version: 0.10.1 + specifier: 0.11.0 + version: 0.11.0 '@solid-cli/create': specifier: workspace:* version: link:../create '@types/node': - specifier: ^22.15.3 - version: 22.15.3 + specifier: ^22.15.21 + version: 22.15.21 citty: specifier: ^0.1.6 version: 0.1.6 @@ -74,8 +74,8 @@ importers: specifier: ^1.1.1 version: 1.1.1 tsup: - specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) + specifier: ^8.5.0 + version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: specifier: ^5.8.3 version: 5.8.3 @@ -83,8 +83,8 @@ importers: packages/full-solid: devDependencies: '@clack/prompts': - specifier: 0.10.1 - version: 0.10.1 + specifier: 0.11.0 + version: 0.11.0 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -92,8 +92,8 @@ importers: specifier: workspace:* version: link:../utils '@types/node': - specifier: ^22.15.3 - version: 22.15.3 + specifier: ^22.15.21 + version: 22.15.21 citty: specifier: ^0.1.6 version: 0.1.6 @@ -101,8 +101,8 @@ importers: specifier: ^1.1.1 version: 1.1.1 tsup: - specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) + specifier: ^8.5.0 + version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: specifier: ^5.8.3 version: 5.8.3 @@ -110,14 +110,14 @@ importers: packages/utils: dependencies: '@clack/core': - specifier: 0.4.2 - version: 0.4.2 + specifier: 0.5.0 + version: 0.5.0 '@clack/prompts': - specifier: 0.10.1 - version: 0.10.1 + specifier: 0.11.0 + version: 0.11.0 execa: - specifier: ^9.5.2 - version: 9.5.2 + specifier: ^9.5.3 + version: 9.5.3 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -129,14 +129,14 @@ importers: specifier: ^0.18.2 version: 0.18.2 '@types/node': - specifier: 22.15.3 - version: 22.15.3 + specifier: 22.15.21 + version: 22.15.21 magicast: specifier: ^0.3.5 version: 0.3.5 tsup: - specifier: ^8.4.0 - version: 8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) + specifier: ^8.5.0 + version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) typescript: specifier: ^5.8.3 version: 5.8.3 @@ -170,14 +170,14 @@ packages: '@changesets/apply-release-plan@7.0.12': resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} - '@changesets/assemble-release-plan@6.0.6': - resolution: {integrity: sha512-Frkj8hWJ1FRZiY3kzVCKzS0N5mMwWKwmv9vpam7vt8rZjLL1JMthdh6pSDVSPumHPshTTkKZ0VtNbE0cJHZZUg==} + '@changesets/assemble-release-plan@6.0.8': + resolution: {integrity: sha512-y8+8LvZCkKJdbUlpXFuqcavpzJR80PN0OIfn8HZdwK7Sh6MgLXm4hKY5vu6/NDoKp8lAlM4ERZCqRMLxP4m+MQ==} '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.29.2': - resolution: {integrity: sha512-vwDemKjGYMOc0l6WUUTGqyAWH3AmueeyoJa1KmFRtCYiCoY5K3B68ErYpDB6H48T4lLI4czum4IEjh6ildxUeg==} + '@changesets/cli@2.29.4': + resolution: {integrity: sha512-VW30x9oiFp/un/80+5jLeWgEU6Btj8IqOgI+X/zAYu4usVOWXjPIK5jSSlt5jsCU7/6Z7AxEkarxBxGUqkAmNg==} hasBin: true '@changesets/config@3.1.1': @@ -189,8 +189,8 @@ packages: '@changesets/get-dependents-graph@2.1.3': resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} - '@changesets/get-release-plan@4.0.10': - resolution: {integrity: sha512-CCJ/f3edYaA3MqoEnWvGGuZm0uMEMzNJ97z9hdUR34AOvajSwySwsIzC/bBu3+kuGDsB+cny4FljG8UBWAa7jg==} + '@changesets/get-release-plan@4.0.12': + resolution: {integrity: sha512-KukdEgaafnyGryUwpHG2kZ7xJquOmWWWk5mmoeQaSvZTWH1DC5D/Sw6ClgGFYtQnOMSQhgoEbDxAbpIIayKH1g==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -238,11 +238,11 @@ packages: resolution: {integrity: sha512-eV1m70Qn9pLY9xwFmZ2FlcOzwiaUywsJ7NB/ud8VB7DouvCQtIHkQ3Om7uPX0ojXGEG1LCyO96kZkvbNTxNu0Q==} engines: {node: '>=18'} - '@clack/core@0.4.2': - resolution: {integrity: sha512-NYQfcEy8MWIxrT5Fj8nIVchfRFA26yYKJcvBS7WlUIlw2OmQOY9DhGGXMovyI5J5PpxrCPGkgUi207EBrjpBvg==} + '@clack/core@0.5.0': + resolution: {integrity: sha512-p3y0FIOwaYRUPRcMO7+dlmLh8PSRcrjuTndsiA0WAFbWES0mLZlrjVoBRZ9DzkPFJZG6KGkJmoEAY0ZcVWTkow==} - '@clack/prompts@0.10.1': - resolution: {integrity: sha512-Q0T02vx8ZM9XSv9/Yde0jTmmBQufZhPJfYAg2XrrrxWWaZgq1rr8nU8Hv710BQ1dhoP8rtY7YUdpGej2Qza/cw==} + '@clack/prompts@0.11.0': + resolution: {integrity: sha512-pMN5FcrEw9hUkZA4f+zLlzivQSeQf5dRGJjSUbvVYDLvpKCdQx5OaknvKzgbtXOizhP+SJJJjqEbOe55uKKfAw==} '@esbuild/aix-ppc64@0.20.2': resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} @@ -770,14 +770,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.15.3': - resolution: {integrity: sha512-lX7HFZeHf4QG/J7tBZqrCAXwz9J5RD56Y6MpP0eJkka8p+K0RY/yBTW7CYFJ4VGCclxqOLKmiGP5juQc6MKgcw==} + '@types/node@22.15.21': + resolution: {integrity: sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==} - '@vitest/expect@3.1.2': - resolution: {integrity: sha512-O8hJgr+zREopCAqWl3uCVaOdqJwZ9qaDwUP7vy3Xigad0phZe9APxKhPcDNqYYi0rX5oMvwJMSCAXY2afqeTSA==} + '@vitest/expect@3.1.4': + resolution: {integrity: sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==} - '@vitest/mocker@3.1.2': - resolution: {integrity: sha512-kOtd6K2lc7SQ0mBqYv/wdGedlqPdM/B38paPY+OwJ1XiNi44w3Fpog82UfOibmHaV9Wod18A09I9SCKLyDMqgw==} + '@vitest/mocker@3.1.4': + resolution: {integrity: sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 @@ -787,20 +787,25 @@ packages: vite: optional: true - '@vitest/pretty-format@3.1.2': - resolution: {integrity: sha512-R0xAiHuWeDjTSB3kQ3OQpT8Rx3yhdOAIm/JM4axXxnG7Q/fS8XUwggv/A4xzbQA+drYRjzkMnpYnOGAc4oeq8w==} + '@vitest/pretty-format@3.1.4': + resolution: {integrity: sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==} - '@vitest/runner@3.1.2': - resolution: {integrity: sha512-bhLib9l4xb4sUMPXnThbnhX2Yi8OutBMA8Yahxa7yavQsFDtwY/jrUZwpKp2XH9DhRFJIeytlyGpXCqZ65nR+g==} + '@vitest/runner@3.1.4': + resolution: {integrity: sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==} - '@vitest/snapshot@3.1.2': - resolution: {integrity: sha512-Q1qkpazSF/p4ApZg1vfZSQ5Yw6OCQxVMVrLjslbLFA1hMDrT2uxtqMaw8Tc/jy5DLka1sNs1Y7rBcftMiaSH/Q==} + '@vitest/snapshot@3.1.4': + resolution: {integrity: sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==} - '@vitest/spy@3.1.2': - resolution: {integrity: sha512-OEc5fSXMws6sHVe4kOFyDSj/+4MSwst0ib4un0DlcYgQvRuYQ0+M2HyqGaauUMnjq87tmUaMNDxKQx7wNfVqPA==} + '@vitest/spy@3.1.4': + resolution: {integrity: sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==} - '@vitest/utils@3.1.2': - resolution: {integrity: sha512-5GGd0ytZ7BH3H6JTj9Kw7Prn1Nbg0wZVrIvou+UWxm54d+WoXXgAgjFJ8wn3LdagWLFSEfpPeyYrByZaGEZHLg==} + '@vitest/utils@3.1.4': + resolution: {integrity: sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==} + + acorn@8.14.1: + resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} + engines: {node: '>=0.4.0'} + hasBin: true ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} @@ -897,6 +902,9 @@ packages: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} + confbox@0.1.8: + resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} + consola@3.2.3: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} @@ -952,8 +960,8 @@ packages: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} - es-module-lexer@1.6.0: - resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==} + es-module-lexer@1.7.0: + resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} esbuild@0.20.2: resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} @@ -973,8 +981,8 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - execa@9.5.2: - resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==} + execa@9.5.3: + resolution: {integrity: sha512-QFNnTvU3UjgWFy8Ef9iDHvIdcgZ344ebkwYx4/KLbR+CKQA4xBaHzv+iRpp86QfMHP8faFQLh8iOc57215y4Rg==} engines: {node: ^18.19.0 || >=20.5.0} expect-type@1.2.1: @@ -995,14 +1003,6 @@ packages: fastq@1.18.0: resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} - fdir@6.4.3: - resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==} - peerDependencies: - picomatch: ^3 || ^4 - peerDependenciesMeta: - picomatch: - optional: true - fdir@6.4.4: resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==} peerDependencies: @@ -1023,6 +1023,9 @@ packages: resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==} engines: {node: '>=8'} + fix-dts-default-cjs-exports@1.0.1: + resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==} + foreground-child@3.1.1: resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==} engines: {node: '>=14'} @@ -1205,6 +1208,9 @@ packages: engines: {node: '>=10'} hasBin: true + mlly@1.7.4: + resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} + mri@1.2.0: resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==} engines: {node: '>=4'} @@ -1308,6 +1314,9 @@ packages: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} + pkg-types@1.3.1: + resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} + postcss-load-config@6.0.1: resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==} engines: {node: '>= 18'} @@ -1487,10 +1496,6 @@ packages: tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyglobby@0.2.12: - resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.13: resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} engines: {node: '>=12.0.0'} @@ -1529,8 +1534,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.4.0: - resolution: {integrity: sha512-b+eZbPCjz10fRryaAA7C8xlIHnf8VnsaRqydheLIqwG/Mcpfk8Z5zp3HayX7GaTygkigHl5cBUs+IhcySiIexQ==} + tsup@8.5.0: + resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1548,38 +1553,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.5.2: - resolution: {integrity: sha512-2aIl0Sx230nLk+Cg2qSVxvPOBWCZpwKNuAMKoROTvWKif6VMpkWWiR9XEPoz7sHeLmCOed4GYGMjL1bqAiIS/g==} + turbo-darwin-64@2.5.3: + resolution: {integrity: sha512-YSItEVBUIvAGPUDpAB9etEmSqZI3T6BHrkBkeSErvICXn3dfqXUfeLx35LfptLDEbrzFUdwYFNmt8QXOwe9yaw==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.5.2: - resolution: {integrity: sha512-MrFYhK/jYu8N6QlqZtqSHi3e4QVxlzqU3ANHTKn3/tThuwTLbNHEvzBPWSj5W7nZcM58dCqi6gYrfRz6bJZyAA==} + turbo-darwin-arm64@2.5.3: + resolution: {integrity: sha512-5PefrwHd42UiZX7YA9m1LPW6x9YJBDErXmsegCkVp+GjmWrADfEOxpFrGQNonH3ZMj77WZB2PVE5Aw3gA+IOhg==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.5.2: - resolution: {integrity: sha512-LxNqUE2HmAJQ/8deoLgMUDzKxd5bKxqH0UBogWa+DF+JcXhtze3UTMr6lEr0dEofdsEUYK1zg8FRjglmwlN5YA==} + turbo-linux-64@2.5.3: + resolution: {integrity: sha512-M9xigFgawn5ofTmRzvjjLj3Lqc05O8VHKuOlWNUlnHPUltFquyEeSkpQNkE/vpPdOR14AzxqHbhhxtfS4qvb1w==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.5.2: - resolution: {integrity: sha512-0MI1Ao1q8zhd+UUbIEsrM+yLq1BsrcJQRGZkxIsHFlGp7WQQH1oR3laBgfnUCNdCotCMD6w4moc9pUbXdOR3bg==} + turbo-linux-arm64@2.5.3: + resolution: {integrity: sha512-auJRbYZ8SGJVqvzTikpg1bsRAsiI9Tk0/SDkA5Xgg0GdiHDH/BOzv1ZjDE2mjmlrO/obr19Dw+39OlMhwLffrw==} cpu: [arm64] os: [linux] - turbo-windows-64@2.5.2: - resolution: {integrity: sha512-hOLcbgZzE5ttACHHyc1ajmWYq4zKT42IC3G6XqgiXxMbS+4eyVYTL+7UvCZBd3Kca1u4TLQdLQjeO76zyDJc2A==} + turbo-windows-64@2.5.3: + resolution: {integrity: sha512-arLQYohuHtIEKkmQSCU9vtrKUg+/1TTstWB9VYRSsz+khvg81eX6LYHtXJfH/dK7Ho6ck+JaEh5G+QrE1jEmCQ==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.5.2: - resolution: {integrity: sha512-fMU41ABhSLa18H8V3Z7BMCGynQ8x+wj9WyBMvWm1jeyRKgkvUYJsO2vkIsy8m0vrwnIeVXKOIn6eSe1ddlBVqw==} + turbo-windows-arm64@2.5.3: + resolution: {integrity: sha512-3JPn66HAynJ0gtr6H+hjY4VHpu1RPKcEwGATvGUTmLmYSYBQieVlnGDRMMoYN066YfyPqnNGCfhYbXfH92Cm0g==} cpu: [arm64] os: [win32] - turbo@2.5.2: - resolution: {integrity: sha512-Qo5lfuStr6LQh3sPQl7kIi243bGU4aHGDQJUf6ylAdGwks30jJFloc9NYHP7Y373+gGU9OS0faA4Mb5Sy8X9Xw==} + turbo@2.5.3: + resolution: {integrity: sha512-iHuaNcq5GZZnr3XDZNuu2LSyCzAOPwDuo5Qt+q64DfsTP1i3T2bKfxJhni2ZQxsvAoxRbuUK5QetJki4qc5aYA==} hasBin: true typescript@5.8.3: @@ -1587,6 +1592,9 @@ packages: engines: {node: '>=14.17'} hasBin: true + ufo@1.6.1: + resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} + undici-types@6.21.0: resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} @@ -1598,8 +1606,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.1.2: - resolution: {integrity: sha512-/8iMryv46J3aK13iUXsei5G/A3CUlW4665THCPS+K8xAaqrVWiGB4RfXMQXCLjpK9P2eK//BczrVkn5JLAk6DA==} + vite-node@3.1.4: + resolution: {integrity: sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1631,16 +1639,16 @@ packages: terser: optional: true - vitest@3.1.2: - resolution: {integrity: sha512-WaxpJe092ID1C0mr+LH9MmNrhfzi8I65EX/NRU/Ld016KqQNRgxSOlGNP1hHN+a/F8L15Mh8klwaF77zR3GeDQ==} + vitest@3.1.4: + resolution: {integrity: sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.1.2 - '@vitest/ui': 3.1.2 + '@vitest/browser': 3.1.4 + '@vitest/ui': 3.1.4 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1731,7 +1739,7 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.3 - '@changesets/assemble-release-plan@6.0.6': + '@changesets/assemble-release-plan@6.0.8': dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 @@ -1744,15 +1752,15 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.2': + '@changesets/cli@2.29.4': dependencies: '@changesets/apply-release-plan': 7.0.12 - '@changesets/assemble-release-plan': 6.0.6 + '@changesets/assemble-release-plan': 6.0.8 '@changesets/changelog-git': 0.2.1 '@changesets/config': 3.1.1 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 - '@changesets/get-release-plan': 4.0.10 + '@changesets/get-release-plan': 4.0.12 '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.2 @@ -1796,9 +1804,9 @@ snapshots: picocolors: 1.1.1 semver: 7.6.3 - '@changesets/get-release-plan@4.0.10': + '@changesets/get-release-plan@4.0.12': dependencies: - '@changesets/assemble-release-plan': 6.0.6 + '@changesets/assemble-release-plan': 6.0.8 '@changesets/config': 3.1.1 '@changesets/pre': 2.0.2 '@changesets/read': 0.6.5 @@ -1874,14 +1882,14 @@ snapshots: '@chialab/node-resolve@0.18.0': {} - '@clack/core@0.4.2': + '@clack/core@0.5.0': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.10.1': + '@clack/prompts@0.11.0': dependencies: - '@clack/core': 0.4.2 + '@clack/core': 0.5.0 picocolors: 1.1.1 sisteransi: 1.0.5 @@ -2216,50 +2224,52 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.15.3': + '@types/node@22.15.21': dependencies: undici-types: 6.21.0 - '@vitest/expect@3.1.2': + '@vitest/expect@3.1.4': dependencies: - '@vitest/spy': 3.1.2 - '@vitest/utils': 3.1.2 + '@vitest/spy': 3.1.4 + '@vitest/utils': 3.1.4 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.1.2(vite@5.2.10(@types/node@22.15.3))': + '@vitest/mocker@3.1.4(vite@5.2.10(@types/node@22.15.21))': dependencies: - '@vitest/spy': 3.1.2 + '@vitest/spy': 3.1.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.15.3) + vite: 5.2.10(@types/node@22.15.21) - '@vitest/pretty-format@3.1.2': + '@vitest/pretty-format@3.1.4': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.1.2': + '@vitest/runner@3.1.4': dependencies: - '@vitest/utils': 3.1.2 + '@vitest/utils': 3.1.4 pathe: 2.0.3 - '@vitest/snapshot@3.1.2': + '@vitest/snapshot@3.1.4': dependencies: - '@vitest/pretty-format': 3.1.2 + '@vitest/pretty-format': 3.1.4 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.1.2': + '@vitest/spy@3.1.4': dependencies: tinyspy: 3.0.2 - '@vitest/utils@3.1.2': + '@vitest/utils@3.1.4': dependencies: - '@vitest/pretty-format': 3.1.2 + '@vitest/pretty-format': 3.1.4 loupe: 3.1.3 tinyrainbow: 2.0.0 + acorn@8.14.1: {} + ansi-colors@4.1.3: {} ansi-regex@5.0.1: {} @@ -2335,6 +2345,8 @@ snapshots: commander@4.1.1: {} + confbox@0.1.8: {} + consola@3.2.3: {} consola@3.4.0: {} @@ -2376,7 +2388,7 @@ snapshots: ansi-colors: 4.1.3 strip-ansi: 6.0.1 - es-module-lexer@1.6.0: {} + es-module-lexer@1.7.0: {} esbuild@0.20.2: optionalDependencies: @@ -2438,7 +2450,7 @@ snapshots: dependencies: '@types/estree': 1.0.6 - execa@9.5.2: + execa@9.5.3: dependencies: '@sindresorhus/merge-streams': 4.0.0 cross-spawn: 7.0.6 @@ -2475,10 +2487,6 @@ snapshots: dependencies: reusify: 1.0.4 - fdir@6.4.3(picomatch@4.0.2): - optionalDependencies: - picomatch: 4.0.2 - fdir@6.4.4(picomatch@4.0.2): optionalDependencies: picomatch: 4.0.2 @@ -2496,6 +2504,12 @@ snapshots: locate-path: 5.0.0 path-exists: 4.0.0 + fix-dts-default-cjs-exports@1.0.1: + dependencies: + magic-string: 0.30.17 + mlly: 1.7.4 + rollup: 4.34.9 + foreground-child@3.1.1: dependencies: cross-spawn: 7.0.3 @@ -2653,6 +2667,13 @@ snapshots: mkdirp@3.0.1: {} + mlly@1.7.4: + dependencies: + acorn: 8.14.1 + pathe: 2.0.3 + pkg-types: 1.3.1 + ufo: 1.6.1 + mri@1.2.0: {} ms@2.1.3: {} @@ -2723,6 +2744,12 @@ snapshots: pirates@4.0.6: {} + pkg-types@1.3.1: + dependencies: + confbox: 0.1.8 + mlly: 1.7.4 + pathe: 2.0.3 + postcss-load-config@6.0.1(jiti@2.4.2)(postcss@8.4.38): dependencies: lilconfig: 3.1.2 @@ -2890,11 +2917,6 @@ snapshots: tinyexec@0.3.2: {} - tinyglobby@0.2.12: - dependencies: - fdir: 6.4.3(picomatch@4.0.2) - picomatch: 4.0.2 - tinyglobby@0.2.13: dependencies: fdir: 6.4.4(picomatch@4.0.2) @@ -2924,7 +2946,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.4.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3): + tsup@8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3): dependencies: bundle-require: 5.1.0(esbuild@0.25.0) cac: 6.7.14 @@ -2932,6 +2954,7 @@ snapshots: consola: 3.4.0 debug: 4.4.0 esbuild: 0.25.0 + fix-dts-default-cjs-exports: 1.0.1 joycon: 3.1.1 picocolors: 1.1.1 postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.4.38) @@ -2940,7 +2963,7 @@ snapshots: source-map: 0.8.0-beta.0 sucrase: 3.35.0 tinyexec: 0.3.2 - tinyglobby: 0.2.12 + tinyglobby: 0.2.13 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 @@ -2952,48 +2975,50 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.5.2: + turbo-darwin-64@2.5.3: optional: true - turbo-darwin-arm64@2.5.2: + turbo-darwin-arm64@2.5.3: optional: true - turbo-linux-64@2.5.2: + turbo-linux-64@2.5.3: optional: true - turbo-linux-arm64@2.5.2: + turbo-linux-arm64@2.5.3: optional: true - turbo-windows-64@2.5.2: + turbo-windows-64@2.5.3: optional: true - turbo-windows-arm64@2.5.2: + turbo-windows-arm64@2.5.3: optional: true - turbo@2.5.2: + turbo@2.5.3: optionalDependencies: - turbo-darwin-64: 2.5.2 - turbo-darwin-arm64: 2.5.2 - turbo-linux-64: 2.5.2 - turbo-linux-arm64: 2.5.2 - turbo-windows-64: 2.5.2 - turbo-windows-arm64: 2.5.2 + turbo-darwin-64: 2.5.3 + turbo-darwin-arm64: 2.5.3 + turbo-linux-64: 2.5.3 + turbo-linux-arm64: 2.5.3 + turbo-windows-64: 2.5.3 + turbo-windows-arm64: 2.5.3 typescript@5.8.3: {} + ufo@1.6.1: {} + undici-types@6.21.0: {} unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite-node@3.1.2(@types/node@22.15.3): + vite-node@3.1.4(@types/node@22.15.21): dependencies: cac: 6.7.14 debug: 4.4.0 - es-module-lexer: 1.6.0 + es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.15.3) + vite: 5.2.10(@types/node@22.15.21) transitivePeerDependencies: - '@types/node' - less @@ -3004,24 +3029,24 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.15.3): + vite@5.2.10(@types/node@22.15.21): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.34.9 optionalDependencies: - '@types/node': 22.15.3 + '@types/node': 22.15.21 fsevents: 2.3.3 - vitest@3.1.2(@types/node@22.15.3): + vitest@3.1.4(@types/node@22.15.21): dependencies: - '@vitest/expect': 3.1.2 - '@vitest/mocker': 3.1.2(vite@5.2.10(@types/node@22.15.3)) - '@vitest/pretty-format': 3.1.2 - '@vitest/runner': 3.1.2 - '@vitest/snapshot': 3.1.2 - '@vitest/spy': 3.1.2 - '@vitest/utils': 3.1.2 + '@vitest/expect': 3.1.4 + '@vitest/mocker': 3.1.4(vite@5.2.10(@types/node@22.15.21)) + '@vitest/pretty-format': 3.1.4 + '@vitest/runner': 3.1.4 + '@vitest/snapshot': 3.1.4 + '@vitest/spy': 3.1.4 + '@vitest/utils': 3.1.4 chai: 5.2.0 debug: 4.4.0 expect-type: 1.2.1 @@ -3033,11 +3058,11 @@ snapshots: tinyglobby: 0.2.13 tinypool: 1.0.2 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.15.3) - vite-node: 3.1.2(@types/node@22.15.3) + vite: 5.2.10(@types/node@22.15.21) + vite-node: 3.1.4(@types/node@22.15.21) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.15.3 + '@types/node': 22.15.21 transitivePeerDependencies: - less - lightningcss From 626603d734457fa6898cbd5fd948051d54e89722 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 May 2025 13:36:05 +0100 Subject: [PATCH 210/290] chore: move common dependencies to workspace --- package.json | 3 + packages/create-solid/package.json | 3 - packages/create/package.json | 5 -- packages/full-solid/package.json | 5 +- packages/utils/package.json | 6 +- packages/utils/tsup.config.ts | 2 - pnpm-lock.yaml | 111 +++-------------------------- 7 files changed, 14 insertions(+), 121 deletions(-) diff --git a/package.json b/package.json index a5954a7..6053069 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,9 @@ "./packages/*" ], "devDependencies": { + "@types/node": "22.15.21", + "tsup": "^8.5.0", + "typescript": "^5.8.3", "@changesets/cli": "2.29.4", "prettier": "^3.5.3", "turbo": "^2.5.3", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index c0fcad1..a5e067c 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -32,10 +32,7 @@ }, "devDependencies": { "@clack/prompts": "0.11.0", - "@types/node": "^22.15.21", "picocolors": "^1.1.1", - "tsup": "^8.5.0", - "typescript": "^5.8.3", "citty": "^0.1.6", "@solid-cli/create": "workspace:*" }, diff --git a/packages/create/package.json b/packages/create/package.json index abc1c85..d863cc2 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -36,11 +36,6 @@ "build": "tsc && tsup", "test": "vitest run" }, - "devDependencies": { - "typescript": "^5.8.3", - "@types/node": "^22.15.21", - "tsup": "^8.5.0" - }, "publishConfig": { "access": "public" }, diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index db472c5..24a4396 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -32,12 +32,9 @@ "devDependencies": { "@clack/prompts": "0.11.0", "picocolors": "^1.1.1", - "@types/node": "^22.15.21", "citty": "^0.1.6", "@solid-cli/create": "workspace:*", - "@solid-cli/utils": "workspace:*", - "tsup": "^8.5.0", - "typescript": "^5.8.3" + "@solid-cli/utils": "workspace:*" }, "publishConfig": { "access": "public" diff --git a/packages/utils/package.json b/packages/utils/package.json index 9325fc8..f12239d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -67,11 +67,7 @@ "build": "tsc && tsup" }, "devDependencies": { - "@chialab/esbuild-plugin-meta-url": "^0.18.2", - "@types/node": "22.15.21", - "magicast": "^0.3.5", - "tsup": "^8.5.0", - "typescript": "^5.8.3" + "magicast": "^0.3.5" }, "publishConfig": { "access": "public" diff --git a/packages/utils/tsup.config.ts b/packages/utils/tsup.config.ts index 6902122..1b4f756 100644 --- a/packages/utils/tsup.config.ts +++ b/packages/utils/tsup.config.ts @@ -1,5 +1,4 @@ import { defineConfig } from "tsup"; -import metaUrlPlugin from "@chialab/esbuild-plugin-meta-url"; export default defineConfig({ entry: ["src"], @@ -9,5 +8,4 @@ export default defineConfig({ sourcemap: true, clean: true, minify: true, - esbuildPlugins: [metaUrlPlugin()], }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 42597ac..3335d1d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,12 +15,21 @@ importers: '@changesets/cli': specifier: 2.29.4 version: 2.29.4 + '@types/node': + specifier: 22.15.21 + version: 22.15.21 prettier: specifier: ^3.5.3 version: 3.5.3 + tsup: + specifier: ^8.5.0 + version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) turbo: specifier: ^2.5.3 version: 2.5.3 + typescript: + specifier: ^5.8.3 + version: 5.8.3 vitest: specifier: ^3.1.4 version: 3.1.4(@types/node@22.15.21) @@ -45,16 +54,6 @@ importers: sucrase: specifier: ^3.35.0 version: 3.35.0 - devDependencies: - '@types/node': - specifier: ^22.15.21 - version: 22.15.21 - tsup: - specifier: ^8.5.0 - version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) - typescript: - specifier: ^5.8.3 - version: 5.8.3 packages/create-solid: devDependencies: @@ -64,21 +63,12 @@ importers: '@solid-cli/create': specifier: workspace:* version: link:../create - '@types/node': - specifier: ^22.15.21 - version: 22.15.21 citty: specifier: ^0.1.6 version: 0.1.6 picocolors: specifier: ^1.1.1 version: 1.1.1 - tsup: - specifier: ^8.5.0 - version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) - typescript: - specifier: ^5.8.3 - version: 5.8.3 packages/full-solid: devDependencies: @@ -91,21 +81,12 @@ importers: '@solid-cli/utils': specifier: workspace:* version: link:../utils - '@types/node': - specifier: ^22.15.21 - version: 22.15.21 citty: specifier: ^0.1.6 version: 0.1.6 picocolors: specifier: ^1.1.1 version: 1.1.1 - tsup: - specifier: ^8.5.0 - version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) - typescript: - specifier: ^5.8.3 - version: 5.8.3 packages/utils: dependencies: @@ -125,21 +106,9 @@ importers: specifier: ^1.3.4 version: 1.3.4 devDependencies: - '@chialab/esbuild-plugin-meta-url': - specifier: ^0.18.2 - version: 0.18.2 - '@types/node': - specifier: 22.15.21 - version: 22.15.21 magicast: specifier: ^0.3.5 version: 0.3.5 - tsup: - specifier: ^8.5.0 - version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) - typescript: - specifier: ^5.8.3 - version: 5.8.3 packages: @@ -222,22 +191,6 @@ packages: '@changesets/write@0.4.0': resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==} - '@chialab/esbuild-plugin-meta-url@0.18.2': - resolution: {integrity: sha512-uIRIdLvYnw5mLrTRXY0BTgeZx6ANL2/OHkWFl8FaiTYNb7cyXmwEDRE1mh6kBXPRPtGuqv6XSpNX+koEkElu4g==} - engines: {node: '>=18'} - - '@chialab/esbuild-rna@0.18.2': - resolution: {integrity: sha512-ckzskez7bxstVQ4c5cxbx0DRP2teldzrcSGQl2KPh1VJGdO2ZmRrb6vNkBBD5K3dx9tgTyvskWp4dV+Fbg07Ag==} - engines: {node: '>=18'} - - '@chialab/estransform@0.18.1': - resolution: {integrity: sha512-W/WmjpQL2hndD0/XfR0FcPBAUj+aLNeoAVehOjV/Q9bSnioz0GVSAXXhzp59S33ZynxJBBfn8DNiMTVNJmk4Aw==} - engines: {node: '>=18'} - - '@chialab/node-resolve@0.18.0': - resolution: {integrity: sha512-eV1m70Qn9pLY9xwFmZ2FlcOzwiaUywsJ7NB/ud8VB7DouvCQtIHkQ3Om7uPX0ojXGEG1LCyO96kZkvbNTxNu0Q==} - engines: {node: '>=18'} - '@clack/core@0.5.0': resolution: {integrity: sha512-p3y0FIOwaYRUPRcMO7+dlmLh8PSRcrjuTndsiA0WAFbWES0mLZlrjVoBRZ9DzkPFJZG6KGkJmoEAY0ZcVWTkow==} @@ -579,10 +532,6 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@parcel/source-map@2.1.1': - resolution: {integrity: sha512-Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew==} - engines: {node: ^12.18.3 || >=14} - '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -938,11 +887,6 @@ packages: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} - detect-libc@1.0.3: - resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} - engines: {node: '>=0.10'} - hasBin: true - dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} @@ -1179,14 +1123,6 @@ packages: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} - mime-db@1.52.0: - resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} - engines: {node: '>= 0.6'} - - mime-types@2.1.35: - resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==} - engines: {node: '>= 0.6'} - minimatch@9.0.3: resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} engines: {node: '>=16 || 14 >=14.17'} @@ -1865,23 +1801,6 @@ snapshots: human-id: 4.1.1 prettier: 2.8.8 - '@chialab/esbuild-plugin-meta-url@0.18.2': - dependencies: - '@chialab/esbuild-rna': 0.18.2 - '@chialab/estransform': 0.18.1 - mime-types: 2.1.35 - - '@chialab/esbuild-rna@0.18.2': - dependencies: - '@chialab/estransform': 0.18.1 - '@chialab/node-resolve': 0.18.0 - - '@chialab/estransform@0.18.1': - dependencies: - '@parcel/source-map': 2.1.1 - - '@chialab/node-resolve@0.18.0': {} - '@clack/core@0.5.0': dependencies: picocolors: 1.1.1 @@ -2097,10 +2016,6 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.18.0 - '@parcel/source-map@2.1.1': - dependencies: - detect-libc: 1.0.3 - '@pkgjs/parseargs@0.11.0': optional: true @@ -2371,8 +2286,6 @@ snapshots: detect-indent@6.1.0: {} - detect-libc@1.0.3: {} - dir-glob@3.0.1: dependencies: path-type: 4.0.0 @@ -2646,12 +2559,6 @@ snapshots: braces: 3.0.3 picomatch: 2.3.1 - mime-db@1.52.0: {} - - mime-types@2.1.35: - dependencies: - mime-db: 1.52.0 - minimatch@9.0.3: dependencies: brace-expansion: 2.0.1 From 30db17904d09e9f14ed17e9e83f78ed460e2f61e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 May 2025 14:11:17 +0100 Subject: [PATCH 211/290] feat: re-order typescript prompt Ask the user if they want to use Typescript before asking which template they'd like to use --- packages/create/src/index.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 926ea0d..eeee8a2 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -69,23 +69,21 @@ export const createSolid = (version: string) => })), }), ); + // Don't offer javascript if `projectType` is library + const useJS = + projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); + const template_opts = getTemplatesList(projectType); template ??= await cancelable( p.select({ message: "Which template would you like to use?", initialValue: "ts", - options: template_opts.map((s: string) => ({ label: s, value: s })), + options: template_opts.filter(s => useJS ? s : !s.startsWith("js")).map((s: string) => ({ label: s, value: s })), }), ); - - // Don't transpile project if it's already javascript! - const transpileToJS = - projectType === "library" - ? false - : template.startsWith("js") - ? false - : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); - + + // Need to transpile if the user wants Jabascript, but their selected template isn't Javascript + const transpileToJS = useJS && !template.startsWith("js") if (projectType === "start") { await spinnerify({ startText: "Creating project", From c6bbf49afa2106a5609dcc0b1b9f998e1719ead0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 May 2025 14:15:38 +0100 Subject: [PATCH 212/290] fix: replace `index.tsx` with `index.jsx` in `index.html` --- packages/create/src/create-vanilla.ts | 4 ++++ packages/create/src/index.ts | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index 47fea82..ee2cc63 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -1,6 +1,7 @@ import { downloadRepo, GithubFetcher } from "@begit/core"; import { join } from "node:path"; import { writeFileSync } from "node:fs"; +import { readFile } from "node:fs/promises"; import { handleTSConversion } from "./utils/ts-conversion"; import { GIT_IGNORE, VanillaTemplate } from "./utils/constants"; @@ -27,6 +28,9 @@ export const createVanillaJS = async ({ template, destination }: CreateVanillaAr const tempDir = join(destination, ".project"); await createVanillaTS({ template, destination: tempDir }); await handleTSConversion(tempDir, destination); + // Replace `index.tsx` with `index.jsx` in `index.html` + const indexPath = join(destination, "index.html"); + writeFileSync(indexPath, (await readFile(indexPath)).toString().replace("index.tsx", "index.jsx")); // Add .gitignore writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); }; diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index eeee8a2..56025e9 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -70,20 +70,21 @@ export const createSolid = (version: string) => }), ); // Don't offer javascript if `projectType` is library - const useJS = - projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); + const useJS = projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); const template_opts = getTemplatesList(projectType); template ??= await cancelable( p.select({ message: "Which template would you like to use?", initialValue: "ts", - options: template_opts.filter(s => useJS ? s : !s.startsWith("js")).map((s: string) => ({ label: s, value: s })), + options: template_opts + .filter((s) => (useJS ? s : !s.startsWith("js"))) + .map((s: string) => ({ label: s, value: s })), }), ); - + // Need to transpile if the user wants Jabascript, but their selected template isn't Javascript - const transpileToJS = useJS && !template.startsWith("js") + const transpileToJS = useJS && !template.startsWith("js"); if (projectType === "start") { await spinnerify({ startText: "Creating project", From 233d8ce4535c7eddbd3469ad8af96f7e00d5c05b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sat, 24 May 2025 14:44:15 +0100 Subject: [PATCH 213/290] chore: remove `smol-toml` --- packages/utils/package.json | 3 +-- pnpm-lock.yaml | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/utils/package.json b/packages/utils/package.json index f12239d..1bc8d68 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -76,7 +76,6 @@ "@clack/core": "0.5.0", "@clack/prompts": "0.11.0", "execa": "^9.5.3", - "picocolors": "^1.1.1", - "smol-toml": "^1.3.4" + "picocolors": "^1.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3335d1d..7dae4c5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -102,9 +102,6 @@ importers: picocolors: specifier: ^1.1.1 version: 1.1.1 - smol-toml: - specifier: ^1.3.4 - version: 1.3.4 devDependencies: magicast: specifier: ^0.3.5 @@ -1358,10 +1355,6 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - smol-toml@1.3.4: - resolution: {integrity: sha512-UOPtVuYkzYGee0Bd2Szz8d2G3RfMfJ2t3qVdZUAozZyAk+a0Sxa+QKix0YCwjL/A1RR0ar44nCxaoN9FxdJGwA==} - engines: {node: '>= 18'} - source-map-js@1.2.0: resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} engines: {node: '>=0.10.0'} @@ -2748,8 +2741,6 @@ snapshots: slash@3.0.0: {} - smol-toml@1.3.4: {} - source-map-js@1.2.0: {} source-map@0.8.0-beta.0: From f2fcb1c8621070308e494171532c583dd536ca0f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:21:09 +0100 Subject: [PATCH 214/290] feat: add more command-line arguments Added template positional, and selectors for typescript and javascript --- packages/create/src/index.ts | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 56025e9..d028ae1 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -42,20 +42,38 @@ export const createSolid = (version: string) => alias: "p", description: "Project name", }, + template: { + type: "string", + required: false, + alias: "t", + description: "Template name", + }, "solidstart": { type: "boolean", required: false, alias: "s", description: "Create a SolidStart project", }, + "ts": { + type: "boolean", + required: false, + description: "Use typescript" + }, + "js": { + type: "boolean", + required: false, + description: "Use javascript" + } }, async run({ - args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, solidstart }, + args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, template: templateOptional, solidstart, ts, js }, }) { // Show prompts for any unknown arguments let projectName: string = projectNamePositional ?? projectNameOptional; - let template: string = templatePositional; + let template: string = templatePositional ?? templateOptional; let projectType: ProjectType | undefined = solidstart ? "start" : undefined; + // False if user has selected ts, true if they have selected js, and undefined if they've done neither + let useJS = ts ? !ts : js ? js : undefined; projectName ??= await cancelable( p.text({ message: "Project Name", placeholder: "solid-project", defaultValue: "solid-project" }), ); @@ -70,7 +88,7 @@ export const createSolid = (version: string) => }), ); // Don't offer javascript if `projectType` is library - const useJS = projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); + useJS ??= projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); const template_opts = getTemplatesList(projectType); template ??= await cancelable( From 9e22aad42231fe15e0e141d9ec73d1d3231833ef Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:23:38 +0100 Subject: [PATCH 215/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index a7c73ca..046e03b 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.3 + +### Patch Changes + +- Add more command line arguments + ## 0.6.1 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index a5e067c..92116ec 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.2", + "version": "0.6.3", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 7cd1fb5..0891a50 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.3 + +### Patch Changes + +- Add more command line arguments + ## 0.6.1 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index d863cc2..e1d3bef 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.2", + "version": "0.6.3", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 97f5e5a66773f67cb42ef95682c897289fedd0fe Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:52:19 +0100 Subject: [PATCH 216/290] feat: replace docs link with github link --- packages/create/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index d028ae1..f81f164 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -128,7 +128,7 @@ export const createSolid = (version: string) => if (existsSync(`${projectName}/README.md`)) await insertAtEnd( `${projectName}/README.md`, - "\n## This project was created with the [Solid CLI](https://solid-cli.netlify.app)\n", + "\n## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)\n", ); // Next steps.. const pM = detectPackageManager(); From 2c7e4bf6c0ab15b94020e33c115180d4651b710d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:53:18 +0100 Subject: [PATCH 217/290] chore: format --- packages/create/src/index.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index f81f164..73f85bc 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -42,7 +42,7 @@ export const createSolid = (version: string) => alias: "p", description: "Project name", }, - template: { + "template": { type: "string", required: false, alias: "t", @@ -57,16 +57,24 @@ export const createSolid = (version: string) => "ts": { type: "boolean", required: false, - description: "Use typescript" + description: "Use typescript", }, "js": { type: "boolean", required: false, - description: "Use javascript" - } + description: "Use javascript", + }, }, async run({ - args: { projectNamePositional, templatePositional, "project-name": projectNameOptional, template: templateOptional, solidstart, ts, js }, + args: { + projectNamePositional, + templatePositional, + "project-name": projectNameOptional, + "template": templateOptional, + solidstart, + ts, + js, + }, }) { // Show prompts for any unknown arguments let projectName: string = projectNamePositional ?? projectNameOptional; From 39a0d147623067e94995ed855873d69f61bc815f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:54:16 +0100 Subject: [PATCH 218/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 046e03b..3770e38 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.4 + +### Patch Changes + +- Update link in text added to project READMEs + ## 0.6.3 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 92116ec..bb0230b 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.3", + "version": "0.6.4", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 0891a50..2154a68 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.4 + +### Patch Changes + +- Update link in text added to project READMEs + ## 0.6.3 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index e1d3bef..eebeaec 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.3", + "version": "0.6.4", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 2f72e87759f95d76e5af4cedca0c2648ebadad0e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:55:10 +0100 Subject: [PATCH 219/290] refactor: move `jiti` into `devDependencies` --- package.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 6053069..8cfe88a 100644 --- a/package.json +++ b/package.json @@ -37,12 +37,10 @@ "@changesets/cli": "2.29.4", "prettier": "^3.5.3", "turbo": "^2.5.3", - "vitest": "^3.1.4" - }, - "packageManager": "pnpm@10.10.0", - "dependencies": { + "vitest": "^3.1.4", "jiti": "^2.4.2" }, + "packageManager": "pnpm@10.10.0", "pnpm": { "onlyBuiltDependencies": [ "@swc/core", From 44725abd127a187e57dfebfa04a9910e9754c042 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 25 May 2025 16:57:55 +0100 Subject: [PATCH 220/290] chore: update lockfile --- pnpm-lock.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7dae4c5..7af6155 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,10 +7,6 @@ settings: importers: .: - dependencies: - jiti: - specifier: ^2.4.2 - version: 2.4.2 devDependencies: '@changesets/cli': specifier: 2.29.4 @@ -18,6 +14,9 @@ importers: '@types/node': specifier: 22.15.21 version: 22.15.21 + jiti: + specifier: ^2.4.2 + version: 2.4.2 prettier: specifier: ^3.5.3 version: 3.5.3 From b1f96eba4aa8de7de1d6e4e6b1515dc3fa0f4d42 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 30 May 2025 19:14:21 +0100 Subject: [PATCH 221/290] fix: don't add "Created with Solid CLI" text if it's already there --- packages/create/src/index.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 73f85bc..f3b3a97 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -12,10 +12,10 @@ import { VanillaTemplate, } from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; -import { insertAtEnd } from "@solid-cli/utils/fs"; import { existsSync, writeFileSync } from "node:fs"; import { join } from "node:path"; import { createLibrary } from "./create-library"; +import { readFile, writeFile } from "node:fs/promises"; export { createVanilla, createStart }; export const createSolid = (version: string) => @@ -133,11 +133,12 @@ export const createSolid = (version: string) => // Add .gitignore writeFileSync(join(projectName, ".gitignore"), GIT_IGNORE); // Add "Created with Solid CLI" text to bottom of README - if (existsSync(`${projectName}/README.md`)) - await insertAtEnd( - `${projectName}/README.md`, - "\n## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)\n", - ); + const readmePath = `${projectName}/README.md`; + if (existsSync(readmePath)) { + const contents = (await readFile(readmePath)).toString(); + if (!contents.includes("This project was created with the [Solid CLI]")) + await writeFile(readmePath, contents + "\n## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)\n") + } // Next steps.. const pM = detectPackageManager(); p.note( From a868fbc3bcd2a270cc0f82f4c3c6aa729ab69ee6 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 30 May 2025 19:16:18 +0100 Subject: [PATCH 222/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 3770e38..a05cf37 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.5 + +### Patch Changes + +- Don't add "Created with Solid CLI" text to README if it's already there + ## 0.6.4 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index bb0230b..f7d98d6 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.4", + "version": "0.6.5", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 2154a68..22ab047 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.5 + +### Patch Changes + +- Don't add "Created with Solid CLI" text to README if it's already there + ## 0.6.4 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index eebeaec..5fe9d45 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.4", + "version": "0.6.5", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From cd2fe317de917340ce5606c7f98004eb7fe2bdd2 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:15:34 +0100 Subject: [PATCH 223/290] chore: update dependencies --- package.json | 8 +- packages/create/package.json | 2 +- packages/utils/package.json | 2 +- pnpm-lock.yaml | 259 ++++++++++++++++++++--------------- 4 files changed, 154 insertions(+), 117 deletions(-) diff --git a/package.json b/package.json index 8cfe88a..fce97eb 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,16 @@ "./packages/*" ], "devDependencies": { - "@types/node": "22.15.21", + "@types/node": "22.15.29", "tsup": "^8.5.0", "typescript": "^5.8.3", "@changesets/cli": "2.29.4", "prettier": "^3.5.3", - "turbo": "^2.5.3", - "vitest": "^3.1.4", + "turbo": "^2.5.4", + "vitest": "^3.2.1", "jiti": "^2.4.2" }, - "packageManager": "pnpm@10.10.0", + "packageManager": "pnpm@10.11.1", "pnpm": { "onlyBuiltDependencies": [ "@swc/core", diff --git a/packages/create/package.json b/packages/create/package.json index 5fe9d45..e8564de 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -42,7 +42,7 @@ "dependencies": { "@clack/prompts": "0.11.0", "picocolors": "^1.1.1", - "@begit/core": "^0.3.1", + "@begit/core": "^0.3.3", "citty": "^0.1.6", "sucrase": "^3.35.0", "@solid-cli/utils": "workspace:*" diff --git a/packages/utils/package.json b/packages/utils/package.json index 1bc8d68..93ac53f 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -75,7 +75,7 @@ "dependencies": { "@clack/core": "0.5.0", "@clack/prompts": "0.11.0", - "execa": "^9.5.3", + "execa": "^9.6.0", "picocolors": "^1.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7af6155..c452968 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: 2.29.4 version: 2.29.4 '@types/node': - specifier: 22.15.21 - version: 22.15.21 + specifier: 22.15.29 + version: 22.15.29 jiti: specifier: ^2.4.2 version: 2.4.2 @@ -24,20 +24,20 @@ importers: specifier: ^8.5.0 version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) turbo: - specifier: ^2.5.3 - version: 2.5.3 + specifier: ^2.5.4 + version: 2.5.4 typescript: specifier: ^5.8.3 version: 5.8.3 vitest: - specifier: ^3.1.4 - version: 3.1.4(@types/node@22.15.21) + specifier: ^3.2.1 + version: 3.2.1(@types/node@22.15.29) packages/create: dependencies: '@begit/core': - specifier: ^0.3.1 - version: 0.3.1 + specifier: ^0.3.3 + version: 0.3.3 '@clack/prompts': specifier: 0.11.0 version: 0.11.0 @@ -96,8 +96,8 @@ importers: specifier: 0.11.0 version: 0.11.0 execa: - specifier: ^9.5.3 - version: 9.5.3 + specifier: ^9.6.0 + version: 9.6.0 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -129,8 +129,8 @@ packages: resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} engines: {node: '>=6.9.0'} - '@begit/core@0.3.1': - resolution: {integrity: sha512-tjpsZqeLkGgApDW0Ra1553a55lqNhFSE6ZYUzzruLbN5inst63Qoa5J2XRNixA8lFTR3o1i2HQJioPv+J8/h9A==} + '@begit/core@0.3.3': + resolution: {integrity: sha512-ekoNr/hsoK71NYDEI0dffMAGPJWUh1Uiu4Zlp7lBtFN3gTmdUOV9HQssxkTE88440whM7ES5WKiokKw+cNqUqg==} '@changesets/apply-release-plan@7.0.12': resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} @@ -709,43 +709,49 @@ packages: '@swc/types@0.1.17': resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} + '@types/chai@5.2.2': + resolution: {integrity: sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==} + + '@types/deep-eql@4.0.2': + resolution: {integrity: sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==} + '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.15.21': - resolution: {integrity: sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==} + '@types/node@22.15.29': + resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} - '@vitest/expect@3.1.4': - resolution: {integrity: sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==} + '@vitest/expect@3.2.1': + resolution: {integrity: sha512-FqS/BnDOzV6+IpxrTg5GQRyLOCtcJqkwMwcS8qGCI2IyRVDwPAtutztaf1CjtPHlZlWtl1yUPCd7HM0cNiDOYw==} - '@vitest/mocker@3.1.4': - resolution: {integrity: sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==} + '@vitest/mocker@3.2.1': + resolution: {integrity: sha512-OXxMJnx1lkB+Vl65Re5BrsZEHc90s5NMjD23ZQ9NlU7f7nZiETGoX4NeKZSmsKjseuMq2uOYXdLOeoM0pJU+qw==} peerDependencies: msw: ^2.4.9 - vite: ^5.0.0 || ^6.0.0 + vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0 peerDependenciesMeta: msw: optional: true vite: optional: true - '@vitest/pretty-format@3.1.4': - resolution: {integrity: sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==} + '@vitest/pretty-format@3.2.1': + resolution: {integrity: sha512-xBh1X2GPlOGBupp6E1RcUQWIxw0w/hRLd3XyBS6H+dMdKTAqHDNsIR2AnJwPA3yYe9DFy3VUKTe3VRTrAiQ01g==} - '@vitest/runner@3.1.4': - resolution: {integrity: sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==} + '@vitest/runner@3.2.1': + resolution: {integrity: sha512-kygXhNTu/wkMYbwYpS3z/9tBe0O8qpdBuC3dD/AW9sWa0LE/DAZEjnHtWA9sIad7lpD4nFW1yQ+zN7mEKNH3yA==} - '@vitest/snapshot@3.1.4': - resolution: {integrity: sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==} + '@vitest/snapshot@3.2.1': + resolution: {integrity: sha512-5xko/ZpW2Yc65NVK9Gpfg2y4BFvcF+At7yRT5AHUpTg9JvZ4xZoyuRY4ASlmNcBZjMslV08VRLDrBOmUe2YX3g==} - '@vitest/spy@3.1.4': - resolution: {integrity: sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==} + '@vitest/spy@3.2.1': + resolution: {integrity: sha512-Nbfib34Z2rfcJGSetMxjDCznn4pCYPZOtQYox2kzebIJcgH75yheIKd5QYSFmR8DIZf2M8fwOm66qSDIfRFFfQ==} - '@vitest/utils@3.1.4': - resolution: {integrity: sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==} + '@vitest/utils@3.2.1': + resolution: {integrity: sha512-KkHlGhePEKZSub5ViknBcN5KEF+u7dSUr9NW8QsVICusUojrgrOnnY3DEWWO877ax2Pyopuk2qHmt+gkNKnBVw==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -875,6 +881,15 @@ packages: supports-color: optional: true + debug@4.4.1: + resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + deep-eql@5.0.2: resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} engines: {node: '>=6'} @@ -921,8 +936,8 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - execa@9.5.3: - resolution: {integrity: sha512-QFNnTvU3UjgWFy8Ef9iDHvIdcgZ344ebkwYx4/KLbR+CKQA4xBaHzv+iRpp86QfMHP8faFQLh8iOc57215y4Rg==} + execa@9.6.0: + resolution: {integrity: sha512-jpWzZ1ZhwUmeWRhS7Qv3mhpOhLfwI+uAX4e5fOcXqwMR7EcJ0pj2kV1CVzHVMX/LphnKWD3LObjZCoJ71lKpHw==} engines: {node: ^18.19.0 || >=20.5.0} expect-type@1.2.1: @@ -1007,8 +1022,8 @@ packages: resolution: {integrity: sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==} hasBin: true - human-signals@8.0.0: - resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==} + human-signals@8.0.1: + resolution: {integrity: sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==} engines: {node: '>=18.18.0'} iconv-lite@0.4.24: @@ -1428,16 +1443,20 @@ packages: resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} engines: {node: '>=12.0.0'} - tinypool@1.0.2: - resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==} + tinyglobby@0.2.14: + resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==} + engines: {node: '>=12.0.0'} + + tinypool@1.1.0: + resolution: {integrity: sha512-7CotroY9a8DKsKprEy/a14aCCm8jYVmR7aFy4fpkZM8sdpNJbKkixuNjgM50yCmip2ezc8z4N7k3oe2+rfRJCQ==} engines: {node: ^18.0.0 || >=20.0.0} tinyrainbow@2.0.0: resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} engines: {node: '>=14.0.0'} - tinyspy@3.0.2: - resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} + tinyspy@4.0.3: + resolution: {integrity: sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==} engines: {node: '>=14.0.0'} tmp@0.0.33: @@ -1481,38 +1500,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.5.3: - resolution: {integrity: sha512-YSItEVBUIvAGPUDpAB9etEmSqZI3T6BHrkBkeSErvICXn3dfqXUfeLx35LfptLDEbrzFUdwYFNmt8QXOwe9yaw==} + turbo-darwin-64@2.5.4: + resolution: {integrity: sha512-ah6YnH2dErojhFooxEzmvsoZQTMImaruZhFPfMKPBq8sb+hALRdvBNLqfc8NWlZq576FkfRZ/MSi4SHvVFT9PQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.5.3: - resolution: {integrity: sha512-5PefrwHd42UiZX7YA9m1LPW6x9YJBDErXmsegCkVp+GjmWrADfEOxpFrGQNonH3ZMj77WZB2PVE5Aw3gA+IOhg==} + turbo-darwin-arm64@2.5.4: + resolution: {integrity: sha512-2+Nx6LAyuXw2MdXb7pxqle3MYignLvS7OwtsP9SgtSBaMlnNlxl9BovzqdYAgkUW3AsYiQMJ/wBRb7d+xemM5A==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.5.3: - resolution: {integrity: sha512-M9xigFgawn5ofTmRzvjjLj3Lqc05O8VHKuOlWNUlnHPUltFquyEeSkpQNkE/vpPdOR14AzxqHbhhxtfS4qvb1w==} + turbo-linux-64@2.5.4: + resolution: {integrity: sha512-5May2kjWbc8w4XxswGAl74GZ5eM4Gr6IiroqdLhXeXyfvWEdm2mFYCSWOzz0/z5cAgqyGidF1jt1qzUR8hTmOA==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.5.3: - resolution: {integrity: sha512-auJRbYZ8SGJVqvzTikpg1bsRAsiI9Tk0/SDkA5Xgg0GdiHDH/BOzv1ZjDE2mjmlrO/obr19Dw+39OlMhwLffrw==} + turbo-linux-arm64@2.5.4: + resolution: {integrity: sha512-/2yqFaS3TbfxV3P5yG2JUI79P7OUQKOUvAnx4MV9Bdz6jqHsHwc9WZPpO4QseQm+NvmgY6ICORnoVPODxGUiJg==} cpu: [arm64] os: [linux] - turbo-windows-64@2.5.3: - resolution: {integrity: sha512-arLQYohuHtIEKkmQSCU9vtrKUg+/1TTstWB9VYRSsz+khvg81eX6LYHtXJfH/dK7Ho6ck+JaEh5G+QrE1jEmCQ==} + turbo-windows-64@2.5.4: + resolution: {integrity: sha512-EQUO4SmaCDhO6zYohxIjJpOKRN3wlfU7jMAj3CgcyTPvQR/UFLEKAYHqJOnJtymbQmiiM/ihX6c6W6Uq0yC7mA==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.5.3: - resolution: {integrity: sha512-3JPn66HAynJ0gtr6H+hjY4VHpu1RPKcEwGATvGUTmLmYSYBQieVlnGDRMMoYN066YfyPqnNGCfhYbXfH92Cm0g==} + turbo-windows-arm64@2.5.4: + resolution: {integrity: sha512-oQ8RrK1VS8lrxkLriotFq+PiF7iiGgkZtfLKF4DDKsmdbPo0O9R2mQxm7jHLuXraRCuIQDWMIw6dpcr7Iykf4A==} cpu: [arm64] os: [win32] - turbo@2.5.3: - resolution: {integrity: sha512-iHuaNcq5GZZnr3XDZNuu2LSyCzAOPwDuo5Qt+q64DfsTP1i3T2bKfxJhni2ZQxsvAoxRbuUK5QetJki4qc5aYA==} + turbo@2.5.4: + resolution: {integrity: sha512-kc8ZibdRcuWUG1pbYSBFWqmIjynlD8Lp7IB6U3vIzvOv9VG+6Sp8bzyeBWE3Oi8XV5KsQrznyRTBPvrf99E4mA==} hasBin: true typescript@5.8.3: @@ -1534,8 +1553,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.1.4: - resolution: {integrity: sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==} + vite-node@3.2.1: + resolution: {integrity: sha512-V4EyKQPxquurNJPtQJRZo8hKOoKNBRIhxcDbQFPFig0JdoWcUhwRgK8yoCXXrfYVPKS6XwirGHPszLnR8FbjCA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1567,16 +1586,16 @@ packages: terser: optional: true - vitest@3.1.4: - resolution: {integrity: sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==} + vitest@3.2.1: + resolution: {integrity: sha512-VZ40MBnlE1/V5uTgdqY3DmjUgZtIzsYq758JGlyQrv5syIsaYcabkfPkEuWML49Ph0D/SoqpVFd0dyVTr551oA==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.1.4 - '@vitest/ui': 3.1.4 + '@vitest/browser': 3.2.1 + '@vitest/ui': 3.2.1 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1647,7 +1666,7 @@ snapshots: '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 - '@begit/core@0.3.1': + '@begit/core@0.3.3': dependencies: tar: 7.4.3 @@ -2127,51 +2146,58 @@ snapshots: '@swc/counter': 0.1.3 optional: true + '@types/chai@5.2.2': + dependencies: + '@types/deep-eql': 4.0.2 + + '@types/deep-eql@4.0.2': {} + '@types/estree@1.0.6': {} '@types/node@12.20.55': {} - '@types/node@22.15.21': + '@types/node@22.15.29': dependencies: undici-types: 6.21.0 - '@vitest/expect@3.1.4': + '@vitest/expect@3.2.1': dependencies: - '@vitest/spy': 3.1.4 - '@vitest/utils': 3.1.4 + '@types/chai': 5.2.2 + '@vitest/spy': 3.2.1 + '@vitest/utils': 3.2.1 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.1.4(vite@5.2.10(@types/node@22.15.21))': + '@vitest/mocker@3.2.1(vite@5.2.10(@types/node@22.15.29))': dependencies: - '@vitest/spy': 3.1.4 + '@vitest/spy': 3.2.1 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.15.21) + vite: 5.2.10(@types/node@22.15.29) - '@vitest/pretty-format@3.1.4': + '@vitest/pretty-format@3.2.1': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.1.4': + '@vitest/runner@3.2.1': dependencies: - '@vitest/utils': 3.1.4 + '@vitest/utils': 3.2.1 pathe: 2.0.3 - '@vitest/snapshot@3.1.4': + '@vitest/snapshot@3.2.1': dependencies: - '@vitest/pretty-format': 3.1.4 + '@vitest/pretty-format': 3.2.1 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.1.4': + '@vitest/spy@3.2.1': dependencies: - tinyspy: 3.0.2 + tinyspy: 4.0.3 - '@vitest/utils@3.1.4': + '@vitest/utils@3.2.1': dependencies: - '@vitest/pretty-format': 3.1.4 + '@vitest/pretty-format': 3.2.1 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2274,6 +2300,10 @@ snapshots: dependencies: ms: 2.1.3 + debug@4.4.1: + dependencies: + ms: 2.1.3 + deep-eql@5.0.2: {} detect-indent@6.1.0: {} @@ -2355,13 +2385,13 @@ snapshots: dependencies: '@types/estree': 1.0.6 - execa@9.5.3: + execa@9.6.0: dependencies: '@sindresorhus/merge-streams': 4.0.0 cross-spawn: 7.0.6 figures: 6.1.0 get-stream: 9.0.1 - human-signals: 8.0.0 + human-signals: 8.0.1 is-plain-obj: 4.1.0 is-stream: 4.0.1 npm-run-path: 6.0.0 @@ -2465,7 +2495,7 @@ snapshots: human-id@4.1.1: {} - human-signals@8.0.0: {} + human-signals@8.0.1: {} iconv-lite@0.4.24: dependencies: @@ -2819,11 +2849,16 @@ snapshots: fdir: 6.4.4(picomatch@4.0.2) picomatch: 4.0.2 - tinypool@1.0.2: {} + tinyglobby@0.2.14: + dependencies: + fdir: 6.4.4(picomatch@4.0.2) + picomatch: 4.0.2 + + tinypool@1.1.0: {} tinyrainbow@2.0.0: {} - tinyspy@3.0.2: {} + tinyspy@4.0.3: {} tmp@0.0.33: dependencies: @@ -2872,32 +2907,32 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.5.3: + turbo-darwin-64@2.5.4: optional: true - turbo-darwin-arm64@2.5.3: + turbo-darwin-arm64@2.5.4: optional: true - turbo-linux-64@2.5.3: + turbo-linux-64@2.5.4: optional: true - turbo-linux-arm64@2.5.3: + turbo-linux-arm64@2.5.4: optional: true - turbo-windows-64@2.5.3: + turbo-windows-64@2.5.4: optional: true - turbo-windows-arm64@2.5.3: + turbo-windows-arm64@2.5.4: optional: true - turbo@2.5.3: + turbo@2.5.4: optionalDependencies: - turbo-darwin-64: 2.5.3 - turbo-darwin-arm64: 2.5.3 - turbo-linux-64: 2.5.3 - turbo-linux-arm64: 2.5.3 - turbo-windows-64: 2.5.3 - turbo-windows-arm64: 2.5.3 + turbo-darwin-64: 2.5.4 + turbo-darwin-arm64: 2.5.4 + turbo-linux-64: 2.5.4 + turbo-linux-arm64: 2.5.4 + turbo-windows-64: 2.5.4 + turbo-windows-arm64: 2.5.4 typescript@5.8.3: {} @@ -2909,13 +2944,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.1.4(@types/node@22.15.21): + vite-node@3.2.1(@types/node@22.15.29): dependencies: cac: 6.7.14 - debug: 4.4.0 + debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.15.21) + vite: 5.2.10(@types/node@22.15.29) transitivePeerDependencies: - '@types/node' - less @@ -2926,40 +2961,42 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.15.21): + vite@5.2.10(@types/node@22.15.29): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.34.9 optionalDependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.29 fsevents: 2.3.3 - vitest@3.1.4(@types/node@22.15.21): + vitest@3.2.1(@types/node@22.15.29): dependencies: - '@vitest/expect': 3.1.4 - '@vitest/mocker': 3.1.4(vite@5.2.10(@types/node@22.15.21)) - '@vitest/pretty-format': 3.1.4 - '@vitest/runner': 3.1.4 - '@vitest/snapshot': 3.1.4 - '@vitest/spy': 3.1.4 - '@vitest/utils': 3.1.4 + '@types/chai': 5.2.2 + '@vitest/expect': 3.2.1 + '@vitest/mocker': 3.2.1(vite@5.2.10(@types/node@22.15.29)) + '@vitest/pretty-format': 3.2.1 + '@vitest/runner': 3.2.1 + '@vitest/snapshot': 3.2.1 + '@vitest/spy': 3.2.1 + '@vitest/utils': 3.2.1 chai: 5.2.0 - debug: 4.4.0 + debug: 4.4.1 expect-type: 1.2.1 magic-string: 0.30.17 pathe: 2.0.3 + picomatch: 4.0.2 std-env: 3.9.0 tinybench: 2.9.0 tinyexec: 0.3.2 - tinyglobby: 0.2.13 - tinypool: 1.0.2 + tinyglobby: 0.2.14 + tinypool: 1.1.0 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.15.21) - vite-node: 3.1.4(@types/node@22.15.21) + vite: 5.2.10(@types/node@22.15.29) + vite-node: 3.2.1(@types/node@22.15.29) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.15.21 + '@types/node': 22.15.29 transitivePeerDependencies: - less - lightningcss From 97774b24ae835f94da0adabdc5ed7ac0288345d0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:35:30 +0100 Subject: [PATCH 224/290] refactor: add `isValidTemplate` function --- packages/create/src/utils/constants.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index ce66b2d..ae8d295 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -99,4 +99,16 @@ export function getTemplatesList(projectType: ProjectType) { return VANILLA_TEMPLATES as VanillaTemplate[]; } -// +/** + * Tests is the template given is a valid template, and returns it as a template if it is + * @param type expected type of the template + * @param maybe_template the template string to test + * @returns the template string if it is valid, undefined if not + */ +export function isValidTemplate(type: "vanilla", maybe_template: string): VanillaTemplate; +export function isValidTemplate(type: "start", maybe_template: string): StartTemplate; +export function isValidTemplate(type: "library", maybe_template: string): LibraryTemplate; +export function isValidTemplate(type: ProjectType, maybe_template: string) { + const templates = getTemplatesList(type); + return templates.find(t => t === maybe_template) +} From 2f2ce23de61e4efd42a50ee4880d01ac2ecf3740 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:40:11 +0100 Subject: [PATCH 225/290] docs: add various doc comments in the code --- packages/create/src/utils/constants.ts | 7 +++++++ packages/create/src/utils/ts-conversion.ts | 1 + 2 files changed, 8 insertions(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index ae8d295..e42d5de 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -40,6 +40,7 @@ export const JS_CONFIG = { // Supported templates +/**Supported Vanilla Templates */ const VANILLA_TEMPLATES = [ "ts", "ts-vitest", @@ -58,6 +59,7 @@ const VANILLA_TEMPLATES = [ ] as const satisfies string[]; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; +/**Supported Start Templates */ const START_TEMPLATES = [ "basic", "bare", @@ -80,12 +82,17 @@ const START_TEMPLATES = [ ] as const satisfies string[]; export type StartTemplate = (typeof START_TEMPLATES)[number]; +/**Supported Library Templates */ export const LIBRARY_TEMPLATES = ["solid-lib-starter"] as const satisfies string[]; export type LibraryTemplate = (typeof LIBRARY_TEMPLATES)[number]; export const PROJECT_TYPES = ["start", "vanilla", "library"] as const satisfies string[]; export type ProjectType = (typeof PROJECT_TYPES)[number]; +/** + * Fetches the template list for the project type given + * @param projectType type of project + */ export function getTemplatesList(projectType: "vanilla"): StartTemplate[]; export function getTemplatesList(projectType: "start"): VanillaTemplate[]; export function getTemplatesList(projectType: "library"): VanillaTemplate[]; diff --git a/packages/create/src/utils/ts-conversion.ts b/packages/create/src/utils/ts-conversion.ts index a13da71..36bb42d 100644 --- a/packages/create/src/utils/ts-conversion.ts +++ b/packages/create/src/utils/ts-conversion.ts @@ -4,6 +4,7 @@ import { join, resolve } from "node:path"; import { transform } from "sucrase"; import { rm } from "node:fs/promises"; import { JS_CONFIG } from "./constants"; + const convertToJS = async (file: Dirent, startPath: string) => { const src = join(startPath, file.name); const dest = resolve(startPath.replace(".project", ""), file.name); From 86a9a400f1cae53cd862eb9e93162c215553ba43 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 4 Jun 2025 21:50:15 +0100 Subject: [PATCH 226/290] feat: check that template is valid before attempting to create it --- packages/create/src/index.ts | 17 ++++++++++------- packages/create/src/utils/constants.ts | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index f3b3a97..1d95346 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -6,10 +6,9 @@ import { createStart } from "./create-start"; import { getTemplatesList, GIT_IGNORE, + isValidTemplate, PROJECT_TYPES, ProjectType, - StartTemplate, - VanillaTemplate, } from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; import { existsSync, writeFileSync } from "node:fs"; @@ -111,25 +110,29 @@ export const createSolid = (version: string) => // Need to transpile if the user wants Jabascript, but their selected template isn't Javascript const transpileToJS = useJS && !template.startsWith("js"); - if (projectType === "start") { + if (projectType === "start" && isValidTemplate("start", template)) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createStart({ template: template as StartTemplate, destination: projectName }, transpileToJS), + fn: () => createStart({ template, destination: projectName }, transpileToJS), }); - } else if (projectType === "library") { + } else if (projectType === "library" && isValidTemplate("library", template)) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", fn: () => createLibrary({ destination: projectName }), }); - } else { + } else if (projectType === "vanilla" && isValidTemplate(projectType, template)) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createVanilla({ template: template as VanillaTemplate, destination: projectName }, transpileToJS), + fn: () => createVanilla({ template, destination: projectName }, transpileToJS), }); } + else { + p.log.error(`Template ${template} is not valid for project type ${projectType}`); + process.exit(0); + } // Add .gitignore writeFileSync(join(projectName, ".gitignore"), GIT_IGNORE); // Add "Created with Solid CLI" text to bottom of README diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index e42d5de..30c2c16 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -112,10 +112,10 @@ export function getTemplatesList(projectType: ProjectType) { * @param maybe_template the template string to test * @returns the template string if it is valid, undefined if not */ -export function isValidTemplate(type: "vanilla", maybe_template: string): VanillaTemplate; -export function isValidTemplate(type: "start", maybe_template: string): StartTemplate; -export function isValidTemplate(type: "library", maybe_template: string): LibraryTemplate; +export function isValidTemplate(type: "vanilla", maybe_template: string): maybe_template is VanillaTemplate; +export function isValidTemplate(type: "start", maybe_template: string): maybe_template is StartTemplate; +export function isValidTemplate(type: "library", maybe_template: string): maybe_template is LibraryTemplate; export function isValidTemplate(type: ProjectType, maybe_template: string) { const templates = getTemplatesList(type); - return templates.find(t => t === maybe_template) + return templates.find(t => t === maybe_template) !== undefined } From 007e8320bfafbec1fdba07add6cd61d9ed1963ea Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 16 Jun 2025 15:55:45 +0100 Subject: [PATCH 227/290] chore: update dependencies --- package.json | 4 +- pnpm-lock.yaml | 133 +++++++++++++++++++++++++++---------------------- 2 files changed, 75 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index fce97eb..a4658db 100644 --- a/package.json +++ b/package.json @@ -31,13 +31,13 @@ "./packages/*" ], "devDependencies": { - "@types/node": "22.15.29", + "@types/node": "24.0.3", "tsup": "^8.5.0", "typescript": "^5.8.3", "@changesets/cli": "2.29.4", "prettier": "^3.5.3", "turbo": "^2.5.4", - "vitest": "^3.2.1", + "vitest": "^3.2.3", "jiti": "^2.4.2" }, "packageManager": "pnpm@10.11.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c452968..3641d0b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: 2.29.4 version: 2.29.4 '@types/node': - specifier: 22.15.29 - version: 22.15.29 + specifier: 24.0.3 + version: 24.0.3 jiti: specifier: ^2.4.2 version: 2.4.2 @@ -30,8 +30,8 @@ importers: specifier: ^5.8.3 version: 5.8.3 vitest: - specifier: ^3.2.1 - version: 3.2.1(@types/node@22.15.29) + specifier: ^3.2.3 + version: 3.2.3(@types/node@24.0.3) packages/create: dependencies: @@ -721,14 +721,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@22.15.29': - resolution: {integrity: sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==} + '@types/node@24.0.3': + resolution: {integrity: sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==} - '@vitest/expect@3.2.1': - resolution: {integrity: sha512-FqS/BnDOzV6+IpxrTg5GQRyLOCtcJqkwMwcS8qGCI2IyRVDwPAtutztaf1CjtPHlZlWtl1yUPCd7HM0cNiDOYw==} + '@vitest/expect@3.2.3': + resolution: {integrity: sha512-W2RH2TPWVHA1o7UmaFKISPvdicFJH+mjykctJFoAkUw+SPTJTGjUNdKscFBrqM7IPnCVu6zihtKYa7TkZS1dkQ==} - '@vitest/mocker@3.2.1': - resolution: {integrity: sha512-OXxMJnx1lkB+Vl65Re5BrsZEHc90s5NMjD23ZQ9NlU7f7nZiETGoX4NeKZSmsKjseuMq2uOYXdLOeoM0pJU+qw==} + '@vitest/mocker@3.2.3': + resolution: {integrity: sha512-cP6fIun+Zx8he4rbWvi+Oya6goKQDZK+Yq4hhlggwQBbrlOQ4qtZ+G4nxB6ZnzI9lyIb+JnvyiJnPC2AGbKSPA==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0 @@ -738,20 +738,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.2.1': - resolution: {integrity: sha512-xBh1X2GPlOGBupp6E1RcUQWIxw0w/hRLd3XyBS6H+dMdKTAqHDNsIR2AnJwPA3yYe9DFy3VUKTe3VRTrAiQ01g==} + '@vitest/pretty-format@3.2.3': + resolution: {integrity: sha512-yFglXGkr9hW/yEXngO+IKMhP0jxyFw2/qys/CK4fFUZnSltD+MU7dVYGrH8rvPcK/O6feXQA+EU33gjaBBbAng==} - '@vitest/runner@3.2.1': - resolution: {integrity: sha512-kygXhNTu/wkMYbwYpS3z/9tBe0O8qpdBuC3dD/AW9sWa0LE/DAZEjnHtWA9sIad7lpD4nFW1yQ+zN7mEKNH3yA==} + '@vitest/runner@3.2.3': + resolution: {integrity: sha512-83HWYisT3IpMaU9LN+VN+/nLHVBCSIUKJzGxC5RWUOsK1h3USg7ojL+UXQR3b4o4UBIWCYdD2fxuzM7PQQ1u8w==} - '@vitest/snapshot@3.2.1': - resolution: {integrity: sha512-5xko/ZpW2Yc65NVK9Gpfg2y4BFvcF+At7yRT5AHUpTg9JvZ4xZoyuRY4ASlmNcBZjMslV08VRLDrBOmUe2YX3g==} + '@vitest/snapshot@3.2.3': + resolution: {integrity: sha512-9gIVWx2+tysDqUmmM1L0hwadyumqssOL1r8KJipwLx5JVYyxvVRfxvMq7DaWbZZsCqZnu/dZedaZQh4iYTtneA==} - '@vitest/spy@3.2.1': - resolution: {integrity: sha512-Nbfib34Z2rfcJGSetMxjDCznn4pCYPZOtQYox2kzebIJcgH75yheIKd5QYSFmR8DIZf2M8fwOm66qSDIfRFFfQ==} + '@vitest/spy@3.2.3': + resolution: {integrity: sha512-JHu9Wl+7bf6FEejTCREy+DmgWe+rQKbK+y32C/k5f4TBIAlijhJbRBIRIOCEpVevgRsCQR2iHRUH2/qKVM/plw==} - '@vitest/utils@3.2.1': - resolution: {integrity: sha512-KkHlGhePEKZSub5ViknBcN5KEF+u7dSUr9NW8QsVICusUojrgrOnnY3DEWWO877ax2Pyopuk2qHmt+gkNKnBVw==} + '@vitest/utils@3.2.3': + resolution: {integrity: sha512-4zFBCU5Pf+4Z6v+rwnZ1HU1yzOKKvDkMXZrymE2PBlbjKJRlrOxbvpfPSvJTGRIwGoahaOGvp+kbCoxifhzJ1Q==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -1085,6 +1085,9 @@ packages: resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} engines: {node: '>=10'} + js-tokens@9.0.1: + resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} + js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -1413,6 +1416,9 @@ packages: resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} engines: {node: '>=18'} + strip-literal@3.0.0: + resolution: {integrity: sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==} + sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} engines: {node: '>=16 || 14 >=14.17'} @@ -1542,8 +1548,8 @@ packages: ufo@1.6.1: resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} - undici-types@6.21.0: - resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==} + undici-types@7.8.0: + resolution: {integrity: sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==} unicorn-magic@0.3.0: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} @@ -1553,8 +1559,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.2.1: - resolution: {integrity: sha512-V4EyKQPxquurNJPtQJRZo8hKOoKNBRIhxcDbQFPFig0JdoWcUhwRgK8yoCXXrfYVPKS6XwirGHPszLnR8FbjCA==} + vite-node@3.2.3: + resolution: {integrity: sha512-gc8aAifGuDIpZHrPjuHyP4dpQmYXqWw7D1GmDnWeNWP654UEXzVfQ5IHPSK5HaHkwB/+p1atpYpSdw/2kOv8iQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1586,16 +1592,16 @@ packages: terser: optional: true - vitest@3.2.1: - resolution: {integrity: sha512-VZ40MBnlE1/V5uTgdqY3DmjUgZtIzsYq758JGlyQrv5syIsaYcabkfPkEuWML49Ph0D/SoqpVFd0dyVTr551oA==} + vitest@3.2.3: + resolution: {integrity: sha512-E6U2ZFXe3N/t4f5BwUaVCKRLHqUpk1CBWeMh78UT4VaTPH/2dyvH6ALl29JTovEPu9dVKr/K/J4PkXgrMbw4Ww==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.2.1 - '@vitest/ui': 3.2.1 + '@vitest/browser': 3.2.3 + '@vitest/ui': 3.2.3 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2156,48 +2162,49 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@22.15.29': + '@types/node@24.0.3': dependencies: - undici-types: 6.21.0 + undici-types: 7.8.0 - '@vitest/expect@3.2.1': + '@vitest/expect@3.2.3': dependencies: '@types/chai': 5.2.2 - '@vitest/spy': 3.2.1 - '@vitest/utils': 3.2.1 + '@vitest/spy': 3.2.3 + '@vitest/utils': 3.2.3 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.2.1(vite@5.2.10(@types/node@22.15.29))': + '@vitest/mocker@3.2.3(vite@5.2.10(@types/node@24.0.3))': dependencies: - '@vitest/spy': 3.2.1 + '@vitest/spy': 3.2.3 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@22.15.29) + vite: 5.2.10(@types/node@24.0.3) - '@vitest/pretty-format@3.2.1': + '@vitest/pretty-format@3.2.3': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.2.1': + '@vitest/runner@3.2.3': dependencies: - '@vitest/utils': 3.2.1 + '@vitest/utils': 3.2.3 pathe: 2.0.3 + strip-literal: 3.0.0 - '@vitest/snapshot@3.2.1': + '@vitest/snapshot@3.2.3': dependencies: - '@vitest/pretty-format': 3.2.1 + '@vitest/pretty-format': 3.2.3 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.2.1': + '@vitest/spy@3.2.3': dependencies: tinyspy: 4.0.3 - '@vitest/utils@3.2.1': + '@vitest/utils@3.2.3': dependencies: - '@vitest/pretty-format': 3.2.1 + '@vitest/pretty-format': 3.2.3 loupe: 3.1.3 tinyrainbow: 2.0.0 @@ -2537,6 +2544,8 @@ snapshots: joycon@3.1.1: {} + js-tokens@9.0.1: {} + js-yaml@3.14.1: dependencies: argparse: 1.0.10 @@ -2811,6 +2820,10 @@ snapshots: strip-final-newline@4.0.0: {} + strip-literal@3.0.0: + dependencies: + js-tokens: 9.0.1 + sucrase@3.35.0: dependencies: '@jridgewell/gen-mapping': 0.3.3 @@ -2938,19 +2951,19 @@ snapshots: ufo@1.6.1: {} - undici-types@6.21.0: {} + undici-types@7.8.0: {} unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite-node@3.2.1(@types/node@22.15.29): + vite-node@3.2.3(@types/node@24.0.3): dependencies: cac: 6.7.14 debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@22.15.29) + vite: 5.2.10(@types/node@24.0.3) transitivePeerDependencies: - '@types/node' - less @@ -2961,25 +2974,25 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@22.15.29): + vite@5.2.10(@types/node@24.0.3): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.34.9 optionalDependencies: - '@types/node': 22.15.29 + '@types/node': 24.0.3 fsevents: 2.3.3 - vitest@3.2.1(@types/node@22.15.29): + vitest@3.2.3(@types/node@24.0.3): dependencies: '@types/chai': 5.2.2 - '@vitest/expect': 3.2.1 - '@vitest/mocker': 3.2.1(vite@5.2.10(@types/node@22.15.29)) - '@vitest/pretty-format': 3.2.1 - '@vitest/runner': 3.2.1 - '@vitest/snapshot': 3.2.1 - '@vitest/spy': 3.2.1 - '@vitest/utils': 3.2.1 + '@vitest/expect': 3.2.3 + '@vitest/mocker': 3.2.3(vite@5.2.10(@types/node@24.0.3)) + '@vitest/pretty-format': 3.2.3 + '@vitest/runner': 3.2.3 + '@vitest/snapshot': 3.2.3 + '@vitest/spy': 3.2.3 + '@vitest/utils': 3.2.3 chai: 5.2.0 debug: 4.4.1 expect-type: 1.2.1 @@ -2992,11 +3005,11 @@ snapshots: tinyglobby: 0.2.14 tinypool: 1.1.0 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@22.15.29) - vite-node: 3.2.1(@types/node@22.15.29) + vite: 5.2.10(@types/node@24.0.3) + vite-node: 3.2.3(@types/node@24.0.3) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.15.29 + '@types/node': 24.0.3 transitivePeerDependencies: - less - lightningcss From 694dd682df15afded500a555d045301ced10a3dc Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 1 Aug 2025 12:23:42 +0100 Subject: [PATCH 228/290] chore: update dependencies --- package.json | 16 ++-- pnpm-lock.yaml | 255 +++++++++++++++++++++++++------------------------ 2 files changed, 138 insertions(+), 133 deletions(-) diff --git a/package.json b/package.json index a4658db..1c1cb2d 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,16 @@ "./packages/*" ], "devDependencies": { - "@types/node": "24.0.3", + "@types/node": "24.1.0", "tsup": "^8.5.0", - "typescript": "^5.8.3", - "@changesets/cli": "2.29.4", - "prettier": "^3.5.3", - "turbo": "^2.5.4", - "vitest": "^3.2.3", - "jiti": "^2.4.2" + "typescript": "^5.9.2", + "@changesets/cli": "2.29.5", + "prettier": "^3.6.2", + "turbo": "^2.5.5", + "vitest": "^3.2.4", + "jiti": "^2.5.1" }, - "packageManager": "pnpm@10.11.1", + "packageManager": "pnpm@10.14.0", "pnpm": { "onlyBuiltDependencies": [ "@swc/core", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3641d0b..29eea07 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,29 +9,29 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.29.4 - version: 2.29.4 + specifier: 2.29.5 + version: 2.29.5 '@types/node': - specifier: 24.0.3 - version: 24.0.3 + specifier: 24.1.0 + version: 24.1.0 jiti: - specifier: ^2.4.2 - version: 2.4.2 + specifier: ^2.5.1 + version: 2.5.1 prettier: - specifier: ^3.5.3 - version: 3.5.3 + specifier: ^3.6.2 + version: 3.6.2 tsup: specifier: ^8.5.0 - version: 8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3) + version: 8.5.0(@swc/core@1.5.5)(jiti@2.5.1)(postcss@8.4.38)(typescript@5.9.2) turbo: - specifier: ^2.5.4 - version: 2.5.4 + specifier: ^2.5.5 + version: 2.5.5 typescript: - specifier: ^5.8.3 - version: 5.8.3 + specifier: ^5.9.2 + version: 5.9.2 vitest: - specifier: ^3.2.3 - version: 3.2.3(@types/node@24.0.3) + specifier: ^3.2.4 + version: 3.2.4(@types/node@24.1.0) packages/create: dependencies: @@ -135,14 +135,14 @@ packages: '@changesets/apply-release-plan@7.0.12': resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} - '@changesets/assemble-release-plan@6.0.8': - resolution: {integrity: sha512-y8+8LvZCkKJdbUlpXFuqcavpzJR80PN0OIfn8HZdwK7Sh6MgLXm4hKY5vu6/NDoKp8lAlM4ERZCqRMLxP4m+MQ==} + '@changesets/assemble-release-plan@6.0.9': + resolution: {integrity: sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==} '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.29.4': - resolution: {integrity: sha512-VW30x9oiFp/un/80+5jLeWgEU6Btj8IqOgI+X/zAYu4usVOWXjPIK5jSSlt5jsCU7/6Z7AxEkarxBxGUqkAmNg==} + '@changesets/cli@2.29.5': + resolution: {integrity: sha512-0j0cPq3fgxt2dPdFsg4XvO+6L66RC0pZybT9F4dG5TBrLA3jA/1pNkdTXH9IBBVHkgsKrNKenI3n1mPyPlIydg==} hasBin: true '@changesets/config@3.1.1': @@ -154,8 +154,8 @@ packages: '@changesets/get-dependents-graph@2.1.3': resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} - '@changesets/get-release-plan@4.0.12': - resolution: {integrity: sha512-KukdEgaafnyGryUwpHG2kZ7xJquOmWWWk5mmoeQaSvZTWH1DC5D/Sw6ClgGFYtQnOMSQhgoEbDxAbpIIayKH1g==} + '@changesets/get-release-plan@4.0.13': + resolution: {integrity: sha512-DWG1pus72FcNeXkM12tx+xtExyH/c9I1z+2aXlObH3i9YA7+WZEVaiHzHl03thpvAgWTRaH64MpfHxozfF7Dvg==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -721,14 +721,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@24.0.3': - resolution: {integrity: sha512-R4I/kzCYAdRLzfiCabn9hxWfbuHS573x+r0dJMkkzThEa7pbrcDWK+9zu3e7aBOouf+rQAciqPFMnxwr0aWgKg==} + '@types/node@24.1.0': + resolution: {integrity: sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==} - '@vitest/expect@3.2.3': - resolution: {integrity: sha512-W2RH2TPWVHA1o7UmaFKISPvdicFJH+mjykctJFoAkUw+SPTJTGjUNdKscFBrqM7IPnCVu6zihtKYa7TkZS1dkQ==} + '@vitest/expect@3.2.4': + resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==} - '@vitest/mocker@3.2.3': - resolution: {integrity: sha512-cP6fIun+Zx8he4rbWvi+Oya6goKQDZK+Yq4hhlggwQBbrlOQ4qtZ+G4nxB6ZnzI9lyIb+JnvyiJnPC2AGbKSPA==} + '@vitest/mocker@3.2.4': + resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==} peerDependencies: msw: ^2.4.9 vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0 @@ -738,20 +738,20 @@ packages: vite: optional: true - '@vitest/pretty-format@3.2.3': - resolution: {integrity: sha512-yFglXGkr9hW/yEXngO+IKMhP0jxyFw2/qys/CK4fFUZnSltD+MU7dVYGrH8rvPcK/O6feXQA+EU33gjaBBbAng==} + '@vitest/pretty-format@3.2.4': + resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==} - '@vitest/runner@3.2.3': - resolution: {integrity: sha512-83HWYisT3IpMaU9LN+VN+/nLHVBCSIUKJzGxC5RWUOsK1h3USg7ojL+UXQR3b4o4UBIWCYdD2fxuzM7PQQ1u8w==} + '@vitest/runner@3.2.4': + resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==} - '@vitest/snapshot@3.2.3': - resolution: {integrity: sha512-9gIVWx2+tysDqUmmM1L0hwadyumqssOL1r8KJipwLx5JVYyxvVRfxvMq7DaWbZZsCqZnu/dZedaZQh4iYTtneA==} + '@vitest/snapshot@3.2.4': + resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==} - '@vitest/spy@3.2.3': - resolution: {integrity: sha512-JHu9Wl+7bf6FEejTCREy+DmgWe+rQKbK+y32C/k5f4TBIAlijhJbRBIRIOCEpVevgRsCQR2iHRUH2/qKVM/plw==} + '@vitest/spy@3.2.4': + resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==} - '@vitest/utils@3.2.3': - resolution: {integrity: sha512-4zFBCU5Pf+4Z6v+rwnZ1HU1yzOKKvDkMXZrymE2PBlbjKJRlrOxbvpfPSvJTGRIwGoahaOGvp+kbCoxifhzJ1Q==} + '@vitest/utils@3.2.4': + resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -1077,8 +1077,8 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - jiti@2.4.2: - resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} + jiti@2.5.1: + resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==} hasBin: true joycon@3.1.1: @@ -1119,6 +1119,9 @@ packages: loupe@3.1.3: resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} + loupe@3.2.0: + resolution: {integrity: sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw==} + lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} @@ -1294,8 +1297,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.5.3: - resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==} + prettier@3.6.2: + resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} engines: {node: '>=14'} hasBin: true @@ -1453,8 +1456,8 @@ packages: resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==} engines: {node: '>=12.0.0'} - tinypool@1.1.0: - resolution: {integrity: sha512-7CotroY9a8DKsKprEy/a14aCCm8jYVmR7aFy4fpkZM8sdpNJbKkixuNjgM50yCmip2ezc8z4N7k3oe2+rfRJCQ==} + tinypool@1.1.1: + resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==} engines: {node: ^18.0.0 || >=20.0.0} tinyrainbow@2.0.0: @@ -1506,42 +1509,42 @@ packages: typescript: optional: true - turbo-darwin-64@2.5.4: - resolution: {integrity: sha512-ah6YnH2dErojhFooxEzmvsoZQTMImaruZhFPfMKPBq8sb+hALRdvBNLqfc8NWlZq576FkfRZ/MSi4SHvVFT9PQ==} + turbo-darwin-64@2.5.5: + resolution: {integrity: sha512-RYnTz49u4F5tDD2SUwwtlynABNBAfbyT2uU/brJcyh5k6lDLyNfYKdKmqd3K2ls4AaiALWrFKVSBsiVwhdFNzQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.5.4: - resolution: {integrity: sha512-2+Nx6LAyuXw2MdXb7pxqle3MYignLvS7OwtsP9SgtSBaMlnNlxl9BovzqdYAgkUW3AsYiQMJ/wBRb7d+xemM5A==} + turbo-darwin-arm64@2.5.5: + resolution: {integrity: sha512-Tk+ZeSNdBobZiMw9aFypQt0DlLsWSFWu1ymqsAdJLuPoAH05qCfYtRxE1pJuYHcJB5pqI+/HOxtJoQ40726Btw==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.5.4: - resolution: {integrity: sha512-5May2kjWbc8w4XxswGAl74GZ5eM4Gr6IiroqdLhXeXyfvWEdm2mFYCSWOzz0/z5cAgqyGidF1jt1qzUR8hTmOA==} + turbo-linux-64@2.5.5: + resolution: {integrity: sha512-2/XvMGykD7VgsvWesZZYIIVXMlgBcQy+ZAryjugoTcvJv8TZzSU/B1nShcA7IAjZ0q7OsZ45uP2cOb8EgKT30w==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.5.4: - resolution: {integrity: sha512-/2yqFaS3TbfxV3P5yG2JUI79P7OUQKOUvAnx4MV9Bdz6jqHsHwc9WZPpO4QseQm+NvmgY6ICORnoVPODxGUiJg==} + turbo-linux-arm64@2.5.5: + resolution: {integrity: sha512-DW+8CjCjybu0d7TFm9dovTTVg1VRnlkZ1rceO4zqsaLrit3DgHnN4to4uwyuf9s2V/BwS3IYcRy+HG9BL596Iw==} cpu: [arm64] os: [linux] - turbo-windows-64@2.5.4: - resolution: {integrity: sha512-EQUO4SmaCDhO6zYohxIjJpOKRN3wlfU7jMAj3CgcyTPvQR/UFLEKAYHqJOnJtymbQmiiM/ihX6c6W6Uq0yC7mA==} + turbo-windows-64@2.5.5: + resolution: {integrity: sha512-q5p1BOy8ChtSZfULuF1BhFMYIx6bevXu4fJ+TE/hyNfyHJIfjl90Z6jWdqAlyaFLmn99X/uw+7d6T/Y/dr5JwQ==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.5.4: - resolution: {integrity: sha512-oQ8RrK1VS8lrxkLriotFq+PiF7iiGgkZtfLKF4DDKsmdbPo0O9R2mQxm7jHLuXraRCuIQDWMIw6dpcr7Iykf4A==} + turbo-windows-arm64@2.5.5: + resolution: {integrity: sha512-AXbF1KmpHUq3PKQwddMGoKMYhHsy5t1YBQO8HZ04HLMR0rWv9adYlQ8kaeQJTko1Ay1anOBFTqaxfVOOsu7+1Q==} cpu: [arm64] os: [win32] - turbo@2.5.4: - resolution: {integrity: sha512-kc8ZibdRcuWUG1pbYSBFWqmIjynlD8Lp7IB6U3vIzvOv9VG+6Sp8bzyeBWE3Oi8XV5KsQrznyRTBPvrf99E4mA==} + turbo@2.5.5: + resolution: {integrity: sha512-eZ7wI6KjtT1eBqCnh2JPXWNUAxtoxxfi6VdBdZFvil0ychCOTxbm7YLRBi1JSt7U3c+u3CLxpoPxLdvr/Npr3A==} hasBin: true - typescript@5.8.3: - resolution: {integrity: sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==} + typescript@5.9.2: + resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==} engines: {node: '>=14.17'} hasBin: true @@ -1559,8 +1562,8 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.2.3: - resolution: {integrity: sha512-gc8aAifGuDIpZHrPjuHyP4dpQmYXqWw7D1GmDnWeNWP654UEXzVfQ5IHPSK5HaHkwB/+p1atpYpSdw/2kOv8iQ==} + vite-node@3.2.4: + resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true @@ -1592,16 +1595,16 @@ packages: terser: optional: true - vitest@3.2.3: - resolution: {integrity: sha512-E6U2ZFXe3N/t4f5BwUaVCKRLHqUpk1CBWeMh78UT4VaTPH/2dyvH6ALl29JTovEPu9dVKr/K/J4PkXgrMbw4Ww==} + vitest@3.2.4: + resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@types/debug': ^4.1.12 '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.2.3 - '@vitest/ui': 3.2.3 + '@vitest/browser': 3.2.4 + '@vitest/ui': 3.2.4 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1692,7 +1695,7 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.3 - '@changesets/assemble-release-plan@6.0.8': + '@changesets/assemble-release-plan@6.0.9': dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 @@ -1705,15 +1708,15 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.4': + '@changesets/cli@2.29.5': dependencies: '@changesets/apply-release-plan': 7.0.12 - '@changesets/assemble-release-plan': 6.0.8 + '@changesets/assemble-release-plan': 6.0.9 '@changesets/changelog-git': 0.2.1 '@changesets/config': 3.1.1 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 - '@changesets/get-release-plan': 4.0.12 + '@changesets/get-release-plan': 4.0.13 '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.2 @@ -1757,9 +1760,9 @@ snapshots: picocolors: 1.1.1 semver: 7.6.3 - '@changesets/get-release-plan@4.0.12': + '@changesets/get-release-plan@4.0.13': dependencies: - '@changesets/assemble-release-plan': 6.0.8 + '@changesets/assemble-release-plan': 6.0.9 '@changesets/config': 3.1.1 '@changesets/pre': 2.0.2 '@changesets/read': 0.6.5 @@ -2162,50 +2165,50 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@24.0.3': + '@types/node@24.1.0': dependencies: undici-types: 7.8.0 - '@vitest/expect@3.2.3': + '@vitest/expect@3.2.4': dependencies: '@types/chai': 5.2.2 - '@vitest/spy': 3.2.3 - '@vitest/utils': 3.2.3 + '@vitest/spy': 3.2.4 + '@vitest/utils': 3.2.4 chai: 5.2.0 tinyrainbow: 2.0.0 - '@vitest/mocker@3.2.3(vite@5.2.10(@types/node@24.0.3))': + '@vitest/mocker@3.2.4(vite@5.2.10(@types/node@24.1.0))': dependencies: - '@vitest/spy': 3.2.3 + '@vitest/spy': 3.2.4 estree-walker: 3.0.3 magic-string: 0.30.17 optionalDependencies: - vite: 5.2.10(@types/node@24.0.3) + vite: 5.2.10(@types/node@24.1.0) - '@vitest/pretty-format@3.2.3': + '@vitest/pretty-format@3.2.4': dependencies: tinyrainbow: 2.0.0 - '@vitest/runner@3.2.3': + '@vitest/runner@3.2.4': dependencies: - '@vitest/utils': 3.2.3 + '@vitest/utils': 3.2.4 pathe: 2.0.3 strip-literal: 3.0.0 - '@vitest/snapshot@3.2.3': + '@vitest/snapshot@3.2.4': dependencies: - '@vitest/pretty-format': 3.2.3 + '@vitest/pretty-format': 3.2.4 magic-string: 0.30.17 pathe: 2.0.3 - '@vitest/spy@3.2.3': + '@vitest/spy@3.2.4': dependencies: tinyspy: 4.0.3 - '@vitest/utils@3.2.3': + '@vitest/utils@3.2.4': dependencies: - '@vitest/pretty-format': 3.2.3 - loupe: 3.1.3 + '@vitest/pretty-format': 3.2.4 + loupe: 3.2.0 tinyrainbow: 2.0.0 acorn@8.14.1: {} @@ -2540,7 +2543,7 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@2.4.2: {} + jiti@2.5.1: {} joycon@3.1.1: {} @@ -2571,6 +2574,8 @@ snapshots: loupe@3.1.3: {} + loupe@3.2.0: {} + lru-cache@10.1.0: {} magic-string@0.30.17: @@ -2688,11 +2693,11 @@ snapshots: mlly: 1.7.4 pathe: 2.0.3 - postcss-load-config@6.0.1(jiti@2.4.2)(postcss@8.4.38): + postcss-load-config@6.0.1(jiti@2.5.1)(postcss@8.4.38): dependencies: lilconfig: 3.1.2 optionalDependencies: - jiti: 2.4.2 + jiti: 2.5.1 postcss: 8.4.38 postcss@8.4.38: @@ -2703,7 +2708,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.5.3: {} + prettier@3.6.2: {} pretty-ms@9.2.0: dependencies: @@ -2867,7 +2872,7 @@ snapshots: fdir: 6.4.4(picomatch@4.0.2) picomatch: 4.0.2 - tinypool@1.1.0: {} + tinypool@1.1.1: {} tinyrainbow@2.0.0: {} @@ -2891,7 +2896,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.5.0(@swc/core@1.5.5)(jiti@2.4.2)(postcss@8.4.38)(typescript@5.8.3): + tsup@8.5.0(@swc/core@1.5.5)(jiti@2.5.1)(postcss@8.4.38)(typescript@5.9.2): dependencies: bundle-require: 5.1.0(esbuild@0.25.0) cac: 6.7.14 @@ -2902,7 +2907,7 @@ snapshots: fix-dts-default-cjs-exports: 1.0.1 joycon: 3.1.1 picocolors: 1.1.1 - postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.4.38) + postcss-load-config: 6.0.1(jiti@2.5.1)(postcss@8.4.38) resolve-from: 5.0.0 rollup: 4.34.9 source-map: 0.8.0-beta.0 @@ -2913,41 +2918,41 @@ snapshots: optionalDependencies: '@swc/core': 1.5.5 postcss: 8.4.38 - typescript: 5.8.3 + typescript: 5.9.2 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.5.4: + turbo-darwin-64@2.5.5: optional: true - turbo-darwin-arm64@2.5.4: + turbo-darwin-arm64@2.5.5: optional: true - turbo-linux-64@2.5.4: + turbo-linux-64@2.5.5: optional: true - turbo-linux-arm64@2.5.4: + turbo-linux-arm64@2.5.5: optional: true - turbo-windows-64@2.5.4: + turbo-windows-64@2.5.5: optional: true - turbo-windows-arm64@2.5.4: + turbo-windows-arm64@2.5.5: optional: true - turbo@2.5.4: + turbo@2.5.5: optionalDependencies: - turbo-darwin-64: 2.5.4 - turbo-darwin-arm64: 2.5.4 - turbo-linux-64: 2.5.4 - turbo-linux-arm64: 2.5.4 - turbo-windows-64: 2.5.4 - turbo-windows-arm64: 2.5.4 + turbo-darwin-64: 2.5.5 + turbo-darwin-arm64: 2.5.5 + turbo-linux-64: 2.5.5 + turbo-linux-arm64: 2.5.5 + turbo-windows-64: 2.5.5 + turbo-windows-arm64: 2.5.5 - typescript@5.8.3: {} + typescript@5.9.2: {} ufo@1.6.1: {} @@ -2957,13 +2962,13 @@ snapshots: universalify@0.1.2: {} - vite-node@3.2.3(@types/node@24.0.3): + vite-node@3.2.4(@types/node@24.1.0): dependencies: cac: 6.7.14 debug: 4.4.1 es-module-lexer: 1.7.0 pathe: 2.0.3 - vite: 5.2.10(@types/node@24.0.3) + vite: 5.2.10(@types/node@24.1.0) transitivePeerDependencies: - '@types/node' - less @@ -2974,25 +2979,25 @@ snapshots: - supports-color - terser - vite@5.2.10(@types/node@24.0.3): + vite@5.2.10(@types/node@24.1.0): dependencies: esbuild: 0.20.2 postcss: 8.4.38 rollup: 4.34.9 optionalDependencies: - '@types/node': 24.0.3 + '@types/node': 24.1.0 fsevents: 2.3.3 - vitest@3.2.3(@types/node@24.0.3): + vitest@3.2.4(@types/node@24.1.0): dependencies: '@types/chai': 5.2.2 - '@vitest/expect': 3.2.3 - '@vitest/mocker': 3.2.3(vite@5.2.10(@types/node@24.0.3)) - '@vitest/pretty-format': 3.2.3 - '@vitest/runner': 3.2.3 - '@vitest/snapshot': 3.2.3 - '@vitest/spy': 3.2.3 - '@vitest/utils': 3.2.3 + '@vitest/expect': 3.2.4 + '@vitest/mocker': 3.2.4(vite@5.2.10(@types/node@24.1.0)) + '@vitest/pretty-format': 3.2.4 + '@vitest/runner': 3.2.4 + '@vitest/snapshot': 3.2.4 + '@vitest/spy': 3.2.4 + '@vitest/utils': 3.2.4 chai: 5.2.0 debug: 4.4.1 expect-type: 1.2.1 @@ -3003,13 +3008,13 @@ snapshots: tinybench: 2.9.0 tinyexec: 0.3.2 tinyglobby: 0.2.14 - tinypool: 1.1.0 + tinypool: 1.1.1 tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@24.0.3) - vite-node: 3.2.3(@types/node@24.0.3) + vite: 5.2.10(@types/node@24.1.0) + vite-node: 3.2.4(@types/node@24.1.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 24.0.3 + '@types/node': 24.1.0 transitivePeerDependencies: - less - lightningcss From c557fa418f2b9ce3ae44528e50d5fc823cede7b0 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 6 Aug 2025 12:42:12 +0100 Subject: [PATCH 229/290] feat: add `library` and `vanilla` flags --- packages/create/src/index.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 1d95346..db570aa 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -53,6 +53,18 @@ export const createSolid = (version: string) => alias: "s", description: "Create a SolidStart project", }, + "library": { + type: "boolean", + required: false, + alias: "l", + description: "Create a Library project", + }, + "vanilla": { + type: "boolean", + required: false, + alias: "v", + description: "Create a vanilla (SolidJS + Vite) project", + }, "ts": { type: "boolean", required: false, @@ -71,6 +83,8 @@ export const createSolid = (version: string) => "project-name": projectNameOptional, "template": templateOptional, solidstart, + library, + vanilla, ts, js, }, @@ -78,7 +92,7 @@ export const createSolid = (version: string) => // Show prompts for any unknown arguments let projectName: string = projectNamePositional ?? projectNameOptional; let template: string = templatePositional ?? templateOptional; - let projectType: ProjectType | undefined = solidstart ? "start" : undefined; + let projectType: ProjectType | undefined = solidstart ? "start" : (vanilla ? "vanilla" : (library ? "library" : undefined)); // False if user has selected ts, true if they have selected js, and undefined if they've done neither let useJS = ts ? !ts : js ? js : undefined; projectName ??= await cancelable( From 189a8566bb5176d44154e472b6689e4d3c090205 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 6 Aug 2025 12:47:22 +0100 Subject: [PATCH 230/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index a05cf37..8d227e8 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.6 + +### Patch Changes + +- Add CLI flags for creating `vanilla` and `library` projects + ## 0.6.5 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index f7d98d6..376da26 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.5", + "version": "0.6.6", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 22ab047..081b3e6 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.6 + +### Patch Changes + +- Add CLI flags for creating `vanilla` and `library` projects + ## 0.6.5 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index e8564de..dbd95db 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.5", + "version": "0.6.6", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 558ae8cb1703b04b5003be08fdcdd7dc56c71e37 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 6 Aug 2025 13:01:45 +0100 Subject: [PATCH 231/290] feat: export `createLibrary` from `@solid-cli/create` --- packages/create/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index db570aa..3378bae 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -15,7 +15,7 @@ import { existsSync, writeFileSync } from "node:fs"; import { join } from "node:path"; import { createLibrary } from "./create-library"; import { readFile, writeFile } from "node:fs/promises"; -export { createVanilla, createStart }; +export { createVanilla, createStart, createLibrary }; export const createSolid = (version: string) => defineCommand({ From 59344f86822abb8f50fb4e10953607d3c3c775c1 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 6 Aug 2025 13:05:21 +0100 Subject: [PATCH 232/290] docs: document using `@solid-cli/create` as a library --- packages/create/README.md | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/create/README.md b/packages/create/README.md index ce864de..74c4b75 100644 --- a/packages/create/README.md +++ b/packages/create/README.md @@ -1,29 +1,26 @@ ---- -description: Create Solid apps in one command with create-solid. ---- +# @solid-cli/create -# Create Solid +A library for easily initialising Solid projects -The easiest way to get started with Solid is by using `create-solid`. This CLI tool enables you to quickly start building a new Solid application, with everything set up for you. You can create a new app using the default SolidStart template or use one of the [Official SolidStart Examples](https://github.com/solidjs/solid-start/tree/main/examples). To get started, use the following command: +## Usage -```bash -#or -npm init solid@latest +### Initialising a Vanilla project -#or -pnpm create solid@latest +```ts +import { createVanilla } from "@solid-cli/create"; +createVanilla({ template: "ts", destination: "./ts" }); +``` -# or -yarn create solid +### Initialising a Start project -# or -bunx create-solid +```ts +import { createStart } from "@solid-cli/create"; +createStart({ template: "basic", destination: "./basic" }); ``` -## Why use Create Solid? - -`create-solid` allows you to create a new Solid app within seconds. It includes a number of benefits: +### Initialising a Library project -- **Interactive Experience**: Running `npm init solid@latest` (with no arguments) launches an interactive experience that guides you through setting up a project. -- **Zero Dependencies**: Initializing a project is as quick as one second. Create Solid has zero runtime dependencies. -- **Support for Examples**: Create Solid App can bootstrap your application using an example from the SolidStart official examples collection. +```ts +import { createLibrary } from "@solid-cli/create"; +createLibrary({ destination: "./library-project" }); +``` From c27ab913351cc07deda4d8eaaf504b0bd93cb227 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 10 Aug 2025 12:32:47 +0100 Subject: [PATCH 233/290] feat: add `with-strict-csp` to available start templates --- packages/create/src/utils/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 30c2c16..7223d83 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -78,6 +78,7 @@ const START_TEMPLATES = [ "with-trpc", "with-unocss", "with-vitest", + "with-strict-csp", "experiments", ] as const satisfies string[]; export type StartTemplate = (typeof START_TEMPLATES)[number]; From e2aa8cc9d597e571241073f5e885fd52f38e3aff Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 10 Aug 2025 12:33:49 +0100 Subject: [PATCH 234/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 8d227e8..88b2071 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.7 + +### Patch Changes + +- Add `with-strict-csp` template to Start + ## 0.6.6 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 376da26..5361657 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.6", + "version": "0.6.7", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 081b3e6..b106e0c 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.7 + +### Patch Changes + +- Add `with-strict-csp` template to Start + ## 0.6.6 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index dbd95db..efacfc6 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.6", + "version": "0.6.7", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 337e9784e42357c3da33aa58cd085173e4ac6efc Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:15:11 +0100 Subject: [PATCH 235/290] fix: disable ES transforms and preserve dynamic imports when transforming TS to JS fixes #64 --- packages/create/src/utils/ts-conversion.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/create/src/utils/ts-conversion.ts b/packages/create/src/utils/ts-conversion.ts index 36bb42d..10d9c37 100644 --- a/packages/create/src/utils/ts-conversion.ts +++ b/packages/create/src/utils/ts-conversion.ts @@ -16,6 +16,8 @@ const convertToJS = async (file: Dirent, startPath: string) => { let { code } = transform(await readFileToString(src), { transforms: ["typescript", "jsx"], jsxRuntime: "preserve", + disableESTransforms: true, + preserveDynamicImport: true, }); writeFileSync(dest.replace(".ts", ".js"), code, { flag: "wx" }); From de9992b0f5ad505b6f57e8fef63524415439d423 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:17:42 +0100 Subject: [PATCH 236/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 88b2071..5def7f5 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.8 + +### Patch Changes + +- Correctly perform TS->JS conversion by disabling ES transforms and preserving dynamic imports + ## 0.6.7 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 5361657..3944cd9 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.7", + "version": "0.6.8", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index b106e0c..6539e3c 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.8 + +### Patch Changes + +- Correctly perform TS->JS conversion by disabling ES transforms and preserving dynamic imports + ## 0.6.7 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index efacfc6..f3dbf38 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.7", + "version": "0.6.8", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 8f6a84dd7dbeb8adeed7a49d881eb4d9a440bcae Mon Sep 17 00:00:00 2001 From: Atila Fassina Date: Fri, 12 Sep 2025 19:34:56 +0200 Subject: [PATCH 237/290] replace SolidStart templates with the ones in templates repository --- packages/create/src/create-start.ts | 2 +- packages/create/src/utils/constants.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index 63e4da6..cde6000 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -11,7 +11,7 @@ export type CreateStartArgs = { export const createStartTS = ({ template, destination }: CreateStartArgs) => { return downloadRepo( { - repo: { owner: "solidjs", name: "solid-start", subdir: `examples/${template}` }, + repo: { owner: "solidjs", name: "templates", subdir: `solid-start/${template}` }, dest: destination, }, GithubFetcher, diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 7223d83..3b2cbbf 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -59,13 +59,13 @@ const VANILLA_TEMPLATES = [ ] as const satisfies string[]; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; -/**Supported Start Templates */ +/** + * @description This list is hardcoded. But templates are fetched from another github repo. + * @see https://github.com/solidjs/templates/tree/main/solid-start + */ const START_TEMPLATES = [ "basic", "bare", - "hackernews", - "notes", - "todomvc", "with-solidbase", "with-auth", "with-authjs", @@ -79,8 +79,8 @@ const START_TEMPLATES = [ "with-unocss", "with-vitest", "with-strict-csp", - "experiments", ] as const satisfies string[]; + export type StartTemplate = (typeof START_TEMPLATES)[number]; /**Supported Library Templates */ @@ -118,5 +118,5 @@ export function isValidTemplate(type: "start", maybe_template: string): maybe_te export function isValidTemplate(type: "library", maybe_template: string): maybe_template is LibraryTemplate; export function isValidTemplate(type: ProjectType, maybe_template: string) { const templates = getTemplatesList(type); - return templates.find(t => t === maybe_template) !== undefined + return templates.find((t) => t === maybe_template) !== undefined; } From 33081c0695bd0fafa2d35f53cd93b2582622986b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 19 Sep 2025 01:39:11 +0100 Subject: [PATCH 238/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 5def7f5..8f6d392 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.9 + +### Patch Changes + +- Fetch Start templates from solidjs/templates, rather than the Start repo + ## 0.6.8 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 3944cd9..0261470 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.8", + "version": "0.6.9", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 6539e3c..e7234b4 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.9 + +### Patch Changes + +- Fetch Start templates from solidjs/templates, rather than the Start repo + ## 0.6.8 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index f3dbf38..69cf607 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.8", + "version": "0.6.9", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From dd4b7d147fd2b1265e0b029723a4966b862f1056 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 19 Sep 2025 20:17:47 +0200 Subject: [PATCH 239/290] organize vanilla templates --- packages/create/src/create-vanilla.ts | 3 ++- packages/create/src/utils/constants.ts | 27 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index ee2cc63..0cebd73 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -15,9 +15,10 @@ export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { } return createVanillaTS(args); }; + export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { return await downloadRepo( - { repo: { owner: "solidjs", name: "templates", subdir: template }, dest: destination }, + { repo: { owner: "solidjs", name: "templates", subdir: `vanilla/${template}` }, dest: destination }, GithubFetcher, ); }; diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 3b2cbbf..7444b7a 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -42,20 +42,19 @@ export const JS_CONFIG = { /**Supported Vanilla Templates */ const VANILLA_TEMPLATES = [ - "ts", - "ts-vitest", - "ts-uvu", - "ts-unocss", - "ts-tailwindcss", - "ts-sass", - "ts-router", - "ts-router-file-based", - "ts-minimal", - "ts-jest", - "ts-bootstrap", - "js", - "js-vitest", - "js-tailwindcss", + "basic", + "bare", + "with-vitest", + "with-uvu", + "with-unocss", + "with-tailwindcss", + "with-sass", + "with-solid-router", + "with-pages-router-file-based", + "with-tanstack-router-config-based", + "with-tanstack-router-file-based", + "with-jest", + "with-bootstrap", ] as const satisfies string[]; export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; From b41f573e76558352582f88fed2ab11179268bcb2 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 19 Sep 2025 20:25:26 +0200 Subject: [PATCH 240/290] changelog --- packages/create/CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index e7234b4..df2fd62 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.10 + +### Patch Changes + +- Fetch Vanilla templates from /vanilla subdirectory of solidjs/templates, rather than from repo root + ## 0.6.9 ### Patch Changes From 11215c0fbbe0b620f27f55b48d30b23c37d18c33 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 19 Sep 2025 19:59:30 +0100 Subject: [PATCH 241/290] test: fix test for downloading templates --- packages/create/tests/template.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create/tests/template.test.ts b/packages/create/tests/template.test.ts index ac7027c..6fb0520 100644 --- a/packages/create/tests/template.test.ts +++ b/packages/create/tests/template.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; import { createVanilla } from "../src"; import { existsSync } from "fs"; -it("downloads and extracts the typescript template", async () => { - await createVanilla({ template: "ts", destination: "./test/ts" }, false); +it("downloads and extracts the basic template", async () => { + await createVanilla({ template: "basic", destination: "./test/ts" }, false); const appTsx = existsSync("./test/ts/src/App.tsx"); expect(appTsx).toBe(true); From 13bb49a8673de59e1ac34a680b087a2f0f5994a3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 19 Sep 2025 20:24:06 +0100 Subject: [PATCH 242/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/package.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 8f6d392..88c65d4 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.10 + +### Patch Changes + +- Fetch Vanilla templates from /vanilla subdirectory of solidjs/templates, rather than from repo root + ## 0.6.9 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 0261470..d03df84 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.9", + "version": "0.6.10", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/package.json b/packages/create/package.json index 69cf607..76f4a7f 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.9", + "version": "0.6.10", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From eeb3aad1599b2a1a6f925239292593e168e6f1ae Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 19 Sep 2025 22:56:23 +0200 Subject: [PATCH 243/290] with-vite-plugin-pages --- packages/create/src/utils/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 7444b7a..d26872e 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -50,7 +50,7 @@ const VANILLA_TEMPLATES = [ "with-tailwindcss", "with-sass", "with-solid-router", - "with-pages-router-file-based", + "with-vite-plugin-pages", "with-tanstack-router-config-based", "with-tanstack-router-file-based", "with-jest", From 100ae885937b8cf856d61716465bf8ee2961f1a5 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 19 Sep 2025 22:27:11 +0100 Subject: [PATCH 244/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 88c65d4..764c3b3 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.11 + +### Patch Changes + +- Rename `with-pages-router-file-based` to `with-vite-plugin-pages` + ## 0.6.10 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index d03df84..6ab18e1 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.10", + "version": "0.6.11", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index df2fd62..0c90750 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.11 + +### Patch Changes + +- Rename `with-pages-router-file-based` to `with-vite-plugin-pages` + ## 0.6.10 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index 76f4a7f..f9efea4 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.10", + "version": "0.6.11", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From bfd4478d783f1f2072a295a0016973e2cb30be34 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Tue, 11 Nov 2025 00:05:05 +0100 Subject: [PATCH 245/290] link tanstack start example --- packages/create/src/utils/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index d26872e..b886591 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -53,6 +53,7 @@ const VANILLA_TEMPLATES = [ "with-vite-plugin-pages", "with-tanstack-router-config-based", "with-tanstack-router-file-based", + "with-tanstack-start", "with-jest", "with-bootstrap", ] as const satisfies string[]; From 68f6b0687aa2bd056060b2e3b5bb91993d83ecab Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 9 Jan 2026 12:14:31 +0000 Subject: [PATCH 246/290] chore: update dependencies --- package.json | 18 +- packages/create/package.json | 2 +- packages/utils/package.json | 4 +- packages/utils/src/transform/parse.ts | 2 +- packages/utils/tsconfig.json | 2 +- pnpm-lock.yaml | 1469 ++++++++++++------------- 6 files changed, 729 insertions(+), 768 deletions(-) diff --git a/package.json b/package.json index 1c1cb2d..d7c0755 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,16 @@ "./packages/*" ], "devDependencies": { - "@types/node": "24.1.0", - "tsup": "^8.5.0", - "typescript": "^5.9.2", - "@changesets/cli": "2.29.5", - "prettier": "^3.6.2", - "turbo": "^2.5.5", - "vitest": "^3.2.4", - "jiti": "^2.5.1" + "@types/node": "25.0.3", + "tsup": "^8.5.1", + "typescript": "^5.9.3", + "@changesets/cli": "2.29.8", + "prettier": "^3.7.4", + "turbo": "^2.7.3", + "vitest": "^4.0.16", + "jiti": "^2.6.1" }, - "packageManager": "pnpm@10.14.0", + "packageManager": "pnpm@10.27.0", "pnpm": { "onlyBuiltDependencies": [ "@swc/core", diff --git a/packages/create/package.json b/packages/create/package.json index f9efea4..c2ee00e 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -44,7 +44,7 @@ "picocolors": "^1.1.1", "@begit/core": "^0.3.3", "citty": "^0.1.6", - "sucrase": "^3.35.0", + "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 93ac53f..1669d5a 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -67,7 +67,7 @@ "build": "tsc && tsup" }, "devDependencies": { - "magicast": "^0.3.5" + "magicast": "^0.5.1" }, "publishConfig": { "access": "public" @@ -75,7 +75,7 @@ "dependencies": { "@clack/core": "0.5.0", "@clack/prompts": "0.11.0", - "execa": "^9.6.0", + "execa": "^9.6.1", "picocolors": "^1.1.1" } } diff --git a/packages/utils/src/transform/parse.ts b/packages/utils/src/transform/parse.ts index 63581d5..6d23dd7 100644 --- a/packages/utils/src/transform/parse.ts +++ b/packages/utils/src/transform/parse.ts @@ -12,7 +12,7 @@ type ArrayExpression = Extract; const isNodeFunction = (node: ASTNodeFull) => node.type === "BlockStatement" || node.type === "ArrowFunctionExpression"; -const getReturnStatement = (node: ASTNodeFull | undefined) => { +const getReturnStatement = (node: ASTNode | undefined) => { if (!node) return; if (node.type === "BlockStatement" && node.body) { let returnStatement; diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 594e530..31a361a 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -7,7 +7,7 @@ "skipLibCheck": true, "declaration": true, "emitDeclarationOnly": true, - "moduleResolution": "Node", + "moduleResolution": "Bundler", "resolveJsonModule": true, "isolatedModules": true, "allowSyntheticDefaultImports": true, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 29eea07..98f9fb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,29 +9,29 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.29.5 - version: 2.29.5 + specifier: 2.29.8 + version: 2.29.8(@types/node@25.0.3) '@types/node': - specifier: 24.1.0 - version: 24.1.0 + specifier: 25.0.3 + version: 25.0.3 jiti: - specifier: ^2.5.1 - version: 2.5.1 + specifier: ^2.6.1 + version: 2.6.1 prettier: - specifier: ^3.6.2 - version: 3.6.2 + specifier: ^3.7.4 + version: 3.7.4 tsup: - specifier: ^8.5.0 - version: 8.5.0(@swc/core@1.5.5)(jiti@2.5.1)(postcss@8.4.38)(typescript@5.9.2) + specifier: ^8.5.1 + version: 8.5.1(@swc/core@1.5.5)(jiti@2.6.1)(postcss@8.5.6)(typescript@5.9.3) turbo: - specifier: ^2.5.5 - version: 2.5.5 + specifier: ^2.7.3 + version: 2.7.3 typescript: - specifier: ^5.9.2 - version: 5.9.2 + specifier: ^5.9.3 + version: 5.9.3 vitest: - specifier: ^3.2.4 - version: 3.2.4(@types/node@24.1.0) + specifier: ^4.0.16 + version: 4.0.16(@types/node@25.0.3)(jiti@2.6.1) packages/create: dependencies: @@ -51,8 +51,8 @@ importers: specifier: ^1.1.1 version: 1.1.1 sucrase: - specifier: ^3.35.0 - version: 3.35.0 + specifier: ^3.35.1 + version: 3.35.1 packages/create-solid: devDependencies: @@ -96,28 +96,28 @@ importers: specifier: 0.11.0 version: 0.11.0 execa: - specifier: ^9.6.0 - version: 9.6.0 + specifier: ^9.6.1 + version: 9.6.1 picocolors: specifier: ^1.1.1 version: 1.1.1 devDependencies: magicast: - specifier: ^0.3.5 - version: 0.3.5 + specifier: ^0.5.1 + version: 0.5.1 packages: - '@babel/helper-string-parser@7.24.8': - resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} + '@babel/helper-string-parser@7.27.1': + resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.24.7': - resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + '@babel/helper-validator-identifier@7.28.5': + resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} - '@babel/parser@7.25.6': - resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} + '@babel/parser@7.28.5': + resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==} engines: {node: '>=6.0.0'} hasBin: true @@ -125,15 +125,15 @@ packages: resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==} engines: {node: '>=6.9.0'} - '@babel/types@7.25.6': - resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} + '@babel/types@7.28.5': + resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==} engines: {node: '>=6.9.0'} '@begit/core@0.3.3': resolution: {integrity: sha512-ekoNr/hsoK71NYDEI0dffMAGPJWUh1Uiu4Zlp7lBtFN3gTmdUOV9HQssxkTE88440whM7ES5WKiokKw+cNqUqg==} - '@changesets/apply-release-plan@7.0.12': - resolution: {integrity: sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==} + '@changesets/apply-release-plan@7.0.14': + resolution: {integrity: sha512-ddBvf9PHdy2YY0OUiEl3TV78mH9sckndJR14QAt87KLEbIov81XO0q0QAmvooBxXlqRRP8I9B7XOzZwQG7JkWA==} '@changesets/assemble-release-plan@6.0.9': resolution: {integrity: sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==} @@ -141,12 +141,12 @@ packages: '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.29.5': - resolution: {integrity: sha512-0j0cPq3fgxt2dPdFsg4XvO+6L66RC0pZybT9F4dG5TBrLA3jA/1pNkdTXH9IBBVHkgsKrNKenI3n1mPyPlIydg==} + '@changesets/cli@2.29.8': + resolution: {integrity: sha512-1weuGZpP63YWUYjay/E84qqwcnt5yJMM0tep10Up7Q5cS/DGe2IZ0Uj3HNMxGhCINZuR7aO9WBMdKnPit5ZDPA==} hasBin: true - '@changesets/config@3.1.1': - resolution: {integrity: sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA==} + '@changesets/config@3.1.2': + resolution: {integrity: sha512-CYiRhA4bWKemdYi/uwImjPxqWNpqGPNbEBdX1BdONALFIDK7MCUj6FPkzD+z9gJcvDFUQJn9aDVf4UG7OT6Kog==} '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} @@ -154,8 +154,8 @@ packages: '@changesets/get-dependents-graph@2.1.3': resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} - '@changesets/get-release-plan@4.0.13': - resolution: {integrity: sha512-DWG1pus72FcNeXkM12tx+xtExyH/c9I1z+2aXlObH3i9YA7+WZEVaiHzHl03thpvAgWTRaH64MpfHxozfF7Dvg==} + '@changesets/get-release-plan@4.0.14': + resolution: {integrity: sha512-yjZMHpUHgl4Xl5gRlolVuxDkm4HgSJqT93Ri1Uz8kGrQb+5iJ8dkXJ20M2j/Y4iV5QzS2c5SeTxVSKX+2eMI0g==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -166,14 +166,14 @@ packages: '@changesets/logger@0.1.1': resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} - '@changesets/parse@0.4.1': - resolution: {integrity: sha512-iwksMs5Bf/wUItfcg+OXrEpravm5rEd9Bf4oyIPL4kVTmJQ7PNDSd6MDYkpSJR1pn7tz/k8Zf2DhTCqX08Ou+Q==} + '@changesets/parse@0.4.2': + resolution: {integrity: sha512-Uo5MC5mfg4OM0jU3up66fmSn6/NE9INK+8/Vn/7sMVcdWg46zfbvvUSjD9EMonVqPi9fbrJH9SXHn48Tr1f2yA==} '@changesets/pre@2.0.2': resolution: {integrity: sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==} - '@changesets/read@0.6.5': - resolution: {integrity: sha512-UPzNGhsSjHD3Veb0xO/MwvasGe8eMyNrR/sT9gR8Q3DhOQZirgKhhXv/8hVsI0QpPjR004Z9iFxoJU6in3uGMg==} + '@changesets/read@0.6.6': + resolution: {integrity: sha512-P5QaN9hJSQQKJShzzpBT13FzOSPyHbqdoIBUd2DJdgvnECCyO6LmAOWSV+O8se2TaZJVwSXjL+v9yhb+a9JeJg==} '@changesets/should-skip-package@0.1.2': resolution: {integrity: sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==} @@ -193,293 +193,170 @@ packages: '@clack/prompts@0.11.0': resolution: {integrity: sha512-pMN5FcrEw9hUkZA4f+zLlzivQSeQf5dRGJjSUbvVYDLvpKCdQx5OaknvKzgbtXOizhP+SJJJjqEbOe55uKKfAw==} - '@esbuild/aix-ppc64@0.20.2': - resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - - '@esbuild/aix-ppc64@0.25.0': - resolution: {integrity: sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==} + '@esbuild/aix-ppc64@0.27.2': + resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.20.2': - resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - - '@esbuild/android-arm64@0.25.0': - resolution: {integrity: sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==} + '@esbuild/android-arm64@0.27.2': + resolution: {integrity: sha512-pvz8ZZ7ot/RBphf8fv60ljmaoydPU12VuXHImtAs0XhLLw+EXBi2BLe3OYSBslR4rryHvweW5gmkKFwTiFy6KA==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.20.2': - resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - - '@esbuild/android-arm@0.25.0': - resolution: {integrity: sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==} + '@esbuild/android-arm@0.27.2': + resolution: {integrity: sha512-DVNI8jlPa7Ujbr1yjU2PfUSRtAUZPG9I1RwW4F4xFB1Imiu2on0ADiI/c3td+KmDtVKNbi+nffGDQMfcIMkwIA==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.20.2': - resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - - '@esbuild/android-x64@0.25.0': - resolution: {integrity: sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==} + '@esbuild/android-x64@0.27.2': + resolution: {integrity: sha512-z8Ank4Byh4TJJOh4wpz8g2vDy75zFL0TlZlkUkEwYXuPSgX8yzep596n6mT7905kA9uHZsf/o2OJZubl2l3M7A==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.20.2': - resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - - '@esbuild/darwin-arm64@0.25.0': - resolution: {integrity: sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==} + '@esbuild/darwin-arm64@0.27.2': + resolution: {integrity: sha512-davCD2Zc80nzDVRwXTcQP/28fiJbcOwvdolL0sOiOsbwBa72kegmVU0Wrh1MYrbuCL98Omp5dVhQFWRKR2ZAlg==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.20.2': - resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - - '@esbuild/darwin-x64@0.25.0': - resolution: {integrity: sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==} + '@esbuild/darwin-x64@0.27.2': + resolution: {integrity: sha512-ZxtijOmlQCBWGwbVmwOF/UCzuGIbUkqB1faQRf5akQmxRJ1ujusWsb3CVfk/9iZKr2L5SMU5wPBi1UWbvL+VQA==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.20.2': - resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - - '@esbuild/freebsd-arm64@0.25.0': - resolution: {integrity: sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==} + '@esbuild/freebsd-arm64@0.27.2': + resolution: {integrity: sha512-lS/9CN+rgqQ9czogxlMcBMGd+l8Q3Nj1MFQwBZJyoEKI50XGxwuzznYdwcav6lpOGv5BqaZXqvBSiB/kJ5op+g==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.20.2': - resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - - '@esbuild/freebsd-x64@0.25.0': - resolution: {integrity: sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==} + '@esbuild/freebsd-x64@0.27.2': + resolution: {integrity: sha512-tAfqtNYb4YgPnJlEFu4c212HYjQWSO/w/h/lQaBK7RbwGIkBOuNKQI9tqWzx7Wtp7bTPaGC6MJvWI608P3wXYA==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.20.2': - resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - - '@esbuild/linux-arm64@0.25.0': - resolution: {integrity: sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==} + '@esbuild/linux-arm64@0.27.2': + resolution: {integrity: sha512-hYxN8pr66NsCCiRFkHUAsxylNOcAQaxSSkHMMjcpx0si13t1LHFphxJZUiGwojB1a/Hd5OiPIqDdXONia6bhTw==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.20.2': - resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - - '@esbuild/linux-arm@0.25.0': - resolution: {integrity: sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==} + '@esbuild/linux-arm@0.27.2': + resolution: {integrity: sha512-vWfq4GaIMP9AIe4yj1ZUW18RDhx6EPQKjwe7n8BbIecFtCQG4CfHGaHuh7fdfq+y3LIA2vGS/o9ZBGVxIDi9hw==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.20.2': - resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - - '@esbuild/linux-ia32@0.25.0': - resolution: {integrity: sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==} + '@esbuild/linux-ia32@0.27.2': + resolution: {integrity: sha512-MJt5BRRSScPDwG2hLelYhAAKh9imjHK5+NE/tvnRLbIqUWa+0E9N4WNMjmp/kXXPHZGqPLxggwVhz7QP8CTR8w==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.20.2': - resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - - '@esbuild/linux-loong64@0.25.0': - resolution: {integrity: sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==} + '@esbuild/linux-loong64@0.27.2': + resolution: {integrity: sha512-lugyF1atnAT463aO6KPshVCJK5NgRnU4yb3FUumyVz+cGvZbontBgzeGFO1nF+dPueHD367a2ZXe1NtUkAjOtg==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.20.2': - resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - - '@esbuild/linux-mips64el@0.25.0': - resolution: {integrity: sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==} + '@esbuild/linux-mips64el@0.27.2': + resolution: {integrity: sha512-nlP2I6ArEBewvJ2gjrrkESEZkB5mIoaTswuqNFRv/WYd+ATtUpe9Y09RnJvgvdag7he0OWgEZWhviS1OTOKixw==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.20.2': - resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - - '@esbuild/linux-ppc64@0.25.0': - resolution: {integrity: sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==} + '@esbuild/linux-ppc64@0.27.2': + resolution: {integrity: sha512-C92gnpey7tUQONqg1n6dKVbx3vphKtTHJaNG2Ok9lGwbZil6DrfyecMsp9CrmXGQJmZ7iiVXvvZH6Ml5hL6XdQ==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.20.2': - resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - - '@esbuild/linux-riscv64@0.25.0': - resolution: {integrity: sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==} + '@esbuild/linux-riscv64@0.27.2': + resolution: {integrity: sha512-B5BOmojNtUyN8AXlK0QJyvjEZkWwy/FKvakkTDCziX95AowLZKR6aCDhG7LeF7uMCXEJqwa8Bejz5LTPYm8AvA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.20.2': - resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - - '@esbuild/linux-s390x@0.25.0': - resolution: {integrity: sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==} + '@esbuild/linux-s390x@0.27.2': + resolution: {integrity: sha512-p4bm9+wsPwup5Z8f4EpfN63qNagQ47Ua2znaqGH6bqLlmJ4bx97Y9JdqxgGZ6Y8xVTixUnEkoKSHcpRlDnNr5w==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.20.2': - resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - - '@esbuild/linux-x64@0.25.0': - resolution: {integrity: sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==} + '@esbuild/linux-x64@0.27.2': + resolution: {integrity: sha512-uwp2Tip5aPmH+NRUwTcfLb+W32WXjpFejTIOWZFw/v7/KnpCDKG66u4DLcurQpiYTiYwQ9B7KOeMJvLCu/OvbA==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-arm64@0.25.0': - resolution: {integrity: sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==} + '@esbuild/netbsd-arm64@0.27.2': + resolution: {integrity: sha512-Kj6DiBlwXrPsCRDeRvGAUb/LNrBASrfqAIok+xB0LxK8CHqxZ037viF13ugfsIpePH93mX7xfJp97cyDuTZ3cw==} engines: {node: '>=18'} cpu: [arm64] os: [netbsd] - '@esbuild/netbsd-x64@0.20.2': - resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - - '@esbuild/netbsd-x64@0.25.0': - resolution: {integrity: sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==} + '@esbuild/netbsd-x64@0.27.2': + resolution: {integrity: sha512-HwGDZ0VLVBY3Y+Nw0JexZy9o/nUAWq9MlV7cahpaXKW6TOzfVno3y3/M8Ga8u8Yr7GldLOov27xiCnqRZf0tCA==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.25.0': - resolution: {integrity: sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==} + '@esbuild/openbsd-arm64@0.27.2': + resolution: {integrity: sha512-DNIHH2BPQ5551A7oSHD0CKbwIA/Ox7+78/AWkbS5QoRzaqlev2uFayfSxq68EkonB+IKjiuxBFoV8ESJy8bOHA==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.20.2': - resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - - '@esbuild/openbsd-x64@0.25.0': - resolution: {integrity: sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==} + '@esbuild/openbsd-x64@0.27.2': + resolution: {integrity: sha512-/it7w9Nb7+0KFIzjalNJVR5bOzA9Vay+yIPLVHfIQYG/j+j9VTH84aNB8ExGKPU4AzfaEvN9/V4HV+F+vo8OEg==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.20.2': - resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] + '@esbuild/openharmony-arm64@0.27.2': + resolution: {integrity: sha512-LRBbCmiU51IXfeXk59csuX/aSaToeG7w48nMwA6049Y4J4+VbWALAuXcs+qcD04rHDuSCSRKdmY63sruDS5qag==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openharmony] - '@esbuild/sunos-x64@0.25.0': - resolution: {integrity: sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==} + '@esbuild/sunos-x64@0.27.2': + resolution: {integrity: sha512-kMtx1yqJHTmqaqHPAzKCAkDaKsffmXkPHThSfRwZGyuqyIeBvf08KSsYXl+abf5HDAPMJIPnbBfXvP2ZC2TfHg==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.20.2': - resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - - '@esbuild/win32-arm64@0.25.0': - resolution: {integrity: sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==} + '@esbuild/win32-arm64@0.27.2': + resolution: {integrity: sha512-Yaf78O/B3Kkh+nKABUF++bvJv5Ijoy9AN1ww904rOXZFLWVc5OLOfL56W+C8F9xn5JQZa3UX6m+IktJnIb1Jjg==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.20.2': - resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - - '@esbuild/win32-ia32@0.25.0': - resolution: {integrity: sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==} + '@esbuild/win32-ia32@0.27.2': + resolution: {integrity: sha512-Iuws0kxo4yusk7sw70Xa2E2imZU5HoixzxfGCdxwBdhiDgt9vX9VUCBhqcwY7/uh//78A1hMkkROMJq9l27oLQ==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.20.2': - resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} - engines: {node: '>=12'} + '@esbuild/win32-x64@0.27.2': + resolution: {integrity: sha512-sRdU18mcKf7F+YgheI/zGf5alZatMUTKj/jNS6l744f9u3WFu4v7twcUI9vu4mknF4Y9aDlblIie0IM+5xxaqQ==} + engines: {node: '>=18'} cpu: [x64] os: [win32] - '@esbuild/win32-x64@0.25.0': - resolution: {integrity: sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==} + '@inquirer/external-editor@1.0.3': + resolution: {integrity: sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==} engines: {node: '>=18'} - cpu: [x64] - os: [win32] + peerDependencies: + '@types/node': '>=18' + peerDependenciesMeta: + '@types/node': + optional: true '@isaacs/cliui@8.0.2': resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} @@ -507,6 +384,9 @@ packages: '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/sourcemap-codec@1.5.5': + resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/trace-mapping@0.3.19': resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} @@ -537,51 +417,111 @@ packages: cpu: [arm] os: [android] + '@rollup/rollup-android-arm-eabi@4.55.1': + resolution: {integrity: sha512-9R0DM/ykwfGIlNu6+2U09ga0WXeZ9MRC2Ter8jnz8415VbuIykVuc6bhdrbORFZANDmTDvq26mJrEVTl8TdnDg==} + cpu: [arm] + os: [android] + '@rollup/rollup-android-arm64@4.34.9': resolution: {integrity: sha512-4KW7P53h6HtJf5Y608T1ISKvNIYLWRKMvfnG0c44M6In4DQVU58HZFEVhWINDZKp7FZps98G3gxwC1sb0wXUUg==} cpu: [arm64] os: [android] + '@rollup/rollup-android-arm64@4.55.1': + resolution: {integrity: sha512-eFZCb1YUqhTysgW3sj/55du5cG57S7UTNtdMjCW7LwVcj3dTTcowCsC8p7uBdzKsZYa8J7IDE8lhMI+HX1vQvg==} + cpu: [arm64] + os: [android] + '@rollup/rollup-darwin-arm64@4.34.9': resolution: {integrity: sha512-0CY3/K54slrzLDjOA7TOjN1NuLKERBgk9nY5V34mhmuu673YNb+7ghaDUs6N0ujXR7fz5XaS5Aa6d2TNxZd0OQ==} cpu: [arm64] os: [darwin] + '@rollup/rollup-darwin-arm64@4.55.1': + resolution: {integrity: sha512-p3grE2PHcQm2e8PSGZdzIhCKbMCw/xi9XvMPErPhwO17vxtvCN5FEA2mSLgmKlCjHGMQTP6phuQTYWUnKewwGg==} + cpu: [arm64] + os: [darwin] + '@rollup/rollup-darwin-x64@4.34.9': resolution: {integrity: sha512-eOojSEAi/acnsJVYRxnMkPFqcxSMFfrw7r2iD9Q32SGkb/Q9FpUY1UlAu1DH9T7j++gZ0lHjnm4OyH2vCI7l7Q==} cpu: [x64] os: [darwin] + '@rollup/rollup-darwin-x64@4.55.1': + resolution: {integrity: sha512-rDUjG25C9qoTm+e02Esi+aqTKSBYwVTaoS1wxcN47/Luqef57Vgp96xNANwt5npq9GDxsH7kXxNkJVEsWEOEaQ==} + cpu: [x64] + os: [darwin] + '@rollup/rollup-freebsd-arm64@4.34.9': resolution: {integrity: sha512-2lzjQPJbN5UnHm7bHIUKFMulGTQwdvOkouJDpPysJS+QFBGDJqcfh+CxxtG23Ik/9tEvnebQiylYoazFMAgrYw==} cpu: [arm64] os: [freebsd] + '@rollup/rollup-freebsd-arm64@4.55.1': + resolution: {integrity: sha512-+JiU7Jbp5cdxekIgdte0jfcu5oqw4GCKr6i3PJTlXTCU5H5Fvtkpbs4XJHRmWNXF+hKmn4v7ogI5OQPaupJgOg==} + cpu: [arm64] + os: [freebsd] + '@rollup/rollup-freebsd-x64@4.34.9': resolution: {integrity: sha512-SLl0hi2Ah2H7xQYd6Qaiu01kFPzQ+hqvdYSoOtHYg/zCIFs6t8sV95kaoqjzjFwuYQLtOI0RZre/Ke0nPaQV+g==} cpu: [x64] os: [freebsd] + '@rollup/rollup-freebsd-x64@4.55.1': + resolution: {integrity: sha512-V5xC1tOVWtLLmr3YUk2f6EJK4qksksOYiz/TCsFHu/R+woubcLWdC9nZQmwjOAbmExBIVKsm1/wKmEy4z4u4Bw==} + cpu: [x64] + os: [freebsd] + '@rollup/rollup-linux-arm-gnueabihf@4.34.9': resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-gnueabihf@4.55.1': + resolution: {integrity: sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.34.9': resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} cpu: [arm] os: [linux] + '@rollup/rollup-linux-arm-musleabihf@4.55.1': + resolution: {integrity: sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==} + cpu: [arm] + os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.34.9': resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-gnu@4.55.1': + resolution: {integrity: sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==} + cpu: [arm64] + os: [linux] + '@rollup/rollup-linux-arm64-musl@4.34.9': resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} cpu: [arm64] os: [linux] + '@rollup/rollup-linux-arm64-musl@4.55.1': + resolution: {integrity: sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==} + cpu: [arm64] + os: [linux] + + '@rollup/rollup-linux-loong64-gnu@4.55.1': + resolution: {integrity: sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==} + cpu: [loong64] + os: [linux] + + '@rollup/rollup-linux-loong64-musl@4.55.1': + resolution: {integrity: sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==} + cpu: [loong64] + os: [linux] + '@rollup/rollup-linux-loongarch64-gnu@4.34.9': resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==} cpu: [loong64] @@ -592,41 +532,106 @@ packages: cpu: [ppc64] os: [linux] + '@rollup/rollup-linux-ppc64-gnu@4.55.1': + resolution: {integrity: sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==} + cpu: [ppc64] + os: [linux] + + '@rollup/rollup-linux-ppc64-musl@4.55.1': + resolution: {integrity: sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==} + cpu: [ppc64] + os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.34.9': resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} cpu: [riscv64] os: [linux] + '@rollup/rollup-linux-riscv64-gnu@4.55.1': + resolution: {integrity: sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==} + cpu: [riscv64] + os: [linux] + + '@rollup/rollup-linux-riscv64-musl@4.55.1': + resolution: {integrity: sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==} + cpu: [riscv64] + os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.34.9': resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} cpu: [s390x] os: [linux] + '@rollup/rollup-linux-s390x-gnu@4.55.1': + resolution: {integrity: sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==} + cpu: [s390x] + os: [linux] + '@rollup/rollup-linux-x64-gnu@4.34.9': resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-gnu@4.55.1': + resolution: {integrity: sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==} + cpu: [x64] + os: [linux] + '@rollup/rollup-linux-x64-musl@4.34.9': resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} cpu: [x64] os: [linux] + '@rollup/rollup-linux-x64-musl@4.55.1': + resolution: {integrity: sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==} + cpu: [x64] + os: [linux] + + '@rollup/rollup-openbsd-x64@4.55.1': + resolution: {integrity: sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==} + cpu: [x64] + os: [openbsd] + + '@rollup/rollup-openharmony-arm64@4.55.1': + resolution: {integrity: sha512-xzm44KgEP11te3S2HCSyYf5zIzWmx3n8HDCc7EE59+lTcswEWNpvMLfd9uJvVX8LCg9QWG67Xt75AuHn4vgsXw==} + cpu: [arm64] + os: [openharmony] + '@rollup/rollup-win32-arm64-msvc@4.34.9': resolution: {integrity: sha512-z4mQK9dAN6byRA/vsSgQiPeuO63wdiDxZ9yg9iyX2QTzKuQM7T4xlBoeUP/J8uiFkqxkcWndWi+W7bXdPbt27Q==} cpu: [arm64] os: [win32] + '@rollup/rollup-win32-arm64-msvc@4.55.1': + resolution: {integrity: sha512-yR6Bl3tMC/gBok5cz/Qi0xYnVbIxGx5Fcf/ca0eB6/6JwOY+SRUcJfI0OpeTpPls7f194as62thCt/2BjxYN8g==} + cpu: [arm64] + os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.34.9': resolution: {integrity: sha512-KB48mPtaoHy1AwDNkAJfHXvHp24H0ryZog28spEs0V48l3H1fr4i37tiyHsgKZJnCmvxsbATdZGBpbmxTE3a9w==} cpu: [ia32] os: [win32] + '@rollup/rollup-win32-ia32-msvc@4.55.1': + resolution: {integrity: sha512-3fZBidchE0eY0oFZBnekYCfg+5wAB0mbpCBuofh5mZuzIU/4jIVkbESmd2dOsFNS78b53CYv3OAtwqkZZmU5nA==} + cpu: [ia32] + os: [win32] + + '@rollup/rollup-win32-x64-gnu@4.55.1': + resolution: {integrity: sha512-xGGY5pXj69IxKb4yv/POoocPy/qmEGhimy/FoTpTSVju3FYXUQQMFCaZZXJVidsmGxRioZAwpThl/4zX41gRKg==} + cpu: [x64] + os: [win32] + '@rollup/rollup-win32-x64-msvc@4.34.9': resolution: {integrity: sha512-AyleYRPU7+rgkMWbEh71fQlrzRfeP6SyMnRf9XX4fCdDPAJumdSBqYEcWPMzVQ4ScAl7E4oFfK0GUVn77xSwbw==} cpu: [x64] os: [win32] + '@rollup/rollup-win32-x64-msvc@4.55.1': + resolution: {integrity: sha512-SPEpaL6DX4rmcXtnhdrQYgzQ5W2uW3SCJch88lB2zImhJRhIIK44fkUrgIV/Q8yUNfw5oyZ5vkeQsZLhCb06lw==} + cpu: [x64] + os: [win32] + '@sec-ant/readable-stream@0.4.1': resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} @@ -634,6 +639,9 @@ packages: resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} engines: {node: '>=18'} + '@standard-schema/spec@1.1.0': + resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==} + '@swc/core-darwin-arm64@1.5.5': resolution: {integrity: sha512-Ol5ZwZYdTOZsv2NwjcT/qVVALKzVFeh+IJ4GNarr3P99+38Dkwi81OqCI1o/WaDXQYKAQC/V+CzMbkEuJJfq9Q==} engines: {node: '>=10'} @@ -718,40 +726,43 @@ packages: '@types/estree@1.0.6': resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/estree@1.0.8': + resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} + '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@24.1.0': - resolution: {integrity: sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==} + '@types/node@25.0.3': + resolution: {integrity: sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==} - '@vitest/expect@3.2.4': - resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==} + '@vitest/expect@4.0.16': + resolution: {integrity: sha512-eshqULT2It7McaJkQGLkPjPjNph+uevROGuIMJdG3V+0BSR2w9u6J9Lwu+E8cK5TETlfou8GRijhafIMhXsimA==} - '@vitest/mocker@3.2.4': - resolution: {integrity: sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==} + '@vitest/mocker@4.0.16': + resolution: {integrity: sha512-yb6k4AZxJTB+q9ycAvsoxGn+j/po0UaPgajllBgt1PzoMAAmJGYFdDk0uCcRcxb3BrME34I6u8gHZTQlkqSZpg==} peerDependencies: msw: ^2.4.9 - vite: ^5.0.0 || ^6.0.0 || ^7.0.0-0 + vite: ^6.0.0 || ^7.0.0-0 peerDependenciesMeta: msw: optional: true vite: optional: true - '@vitest/pretty-format@3.2.4': - resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==} + '@vitest/pretty-format@4.0.16': + resolution: {integrity: sha512-eNCYNsSty9xJKi/UdVD8Ou16alu7AYiS2fCPRs0b1OdhJiV89buAXQLpTbe+X8V9L6qrs9CqyvU7OaAopJYPsA==} - '@vitest/runner@3.2.4': - resolution: {integrity: sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==} + '@vitest/runner@4.0.16': + resolution: {integrity: sha512-VWEDm5Wv9xEo80ctjORcTQRJ539EGPB3Pb9ApvVRAY1U/WkHXmmYISqU5E79uCwcW7xYUV38gwZD+RV755fu3Q==} - '@vitest/snapshot@3.2.4': - resolution: {integrity: sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==} + '@vitest/snapshot@4.0.16': + resolution: {integrity: sha512-sf6NcrYhYBsSYefxnry+DR8n3UV4xWZwWxYbCJUt2YdvtqzSPR7VfGrY0zsv090DAbjFZsi7ZaMi1KnSRyK1XA==} - '@vitest/spy@3.2.4': - resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==} + '@vitest/spy@4.0.16': + resolution: {integrity: sha512-4jIOWjKP0ZUaEmJm00E0cOBLU+5WE0BpeNr3XN6TEF05ltro6NJqHWxXD0kA8/Zc8Nh23AT8WQxwNG+WeROupw==} - '@vitest/utils@3.2.4': - resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==} + '@vitest/utils@4.0.16': + resolution: {integrity: sha512-h8z9yYhV3e1LEfaQ3zdypIrnAg/9hguReGZoS7Gl0aBG5xgA410zBqECqmaF/+RkTggRsfnzc1XaAHA6bmUufA==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -784,14 +795,13 @@ packages: argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} + argparse@2.0.1: + resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} + array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} - assertion-error@2.0.1: - resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==} - engines: {node: '>=12'} - balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} @@ -816,16 +826,12 @@ packages: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} engines: {node: '>=8'} - chai@5.2.0: - resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==} - engines: {node: '>=12'} - - chardet@0.7.0: - resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==} + chai@6.2.2: + resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==} + engines: {node: '>=18'} - check-error@2.1.1: - resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} - engines: {node: '>= 16'} + chardet@2.1.1: + resolution: {integrity: sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==} chokidar@4.0.3: resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} @@ -872,15 +878,6 @@ packages: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} engines: {node: '>= 8'} - debug@4.4.0: - resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.4.1: resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==} engines: {node: '>=6.0'} @@ -890,10 +887,6 @@ packages: supports-color: optional: true - deep-eql@5.0.2: - resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==} - engines: {node: '>=6'} - detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} @@ -918,13 +911,8 @@ packages: es-module-lexer@1.7.0: resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} - esbuild@0.20.2: - resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} - engines: {node: '>=12'} - hasBin: true - - esbuild@0.25.0: - resolution: {integrity: sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==} + esbuild@0.27.2: + resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==} engines: {node: '>=18'} hasBin: true @@ -936,21 +924,17 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - execa@9.6.0: - resolution: {integrity: sha512-jpWzZ1ZhwUmeWRhS7Qv3mhpOhLfwI+uAX4e5fOcXqwMR7EcJ0pj2kV1CVzHVMX/LphnKWD3LObjZCoJ71lKpHw==} + execa@9.6.1: + resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==} engines: {node: ^18.19.0 || >=20.5.0} - expect-type@1.2.1: - resolution: {integrity: sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==} + expect-type@1.3.0: + resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} engines: {node: '>=12.0.0'} extendable-error@0.1.7: resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==} - external-editor@3.1.0: - resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==} - engines: {node: '>=4'} - fast-glob@3.3.3: resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} engines: {node: '>=8.6.0'} @@ -966,6 +950,15 @@ packages: picomatch: optional: true + fdir@6.5.0: + resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} + engines: {node: '>=12.0.0'} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + figures@6.1.0: resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} engines: {node: '>=18'} @@ -1026,8 +1019,8 @@ packages: resolution: {integrity: sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==} engines: {node: '>=18.18.0'} - iconv-lite@0.4.24: - resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} + iconv-lite@0.7.2: + resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==} engines: {node: '>=0.10.0'} ignore@5.3.2: @@ -1077,21 +1070,22 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - jiti@2.5.1: - resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==} + jiti@2.6.1: + resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==} hasBin: true joycon@3.1.1: resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==} engines: {node: '>=10'} - js-tokens@9.0.1: - resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==} - js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true + js-yaml@4.1.1: + resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==} + hasBin: true + jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} @@ -1110,18 +1104,9 @@ packages: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} - lodash.sortby@4.7.0: - resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==} - lodash.startcase@4.4.0: resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==} - loupe@3.1.3: - resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==} - - loupe@3.2.0: - resolution: {integrity: sha512-2NCfZcT5VGVNX9mSZIxLRkEAegDGBpuQZBy13desuHeVORmBDyAET4TkJr4SjqQy3A8JDofMN6LpkK8Xcm/dlw==} - lru-cache@10.1.0: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} @@ -1129,8 +1114,11 @@ packages: magic-string@0.30.17: resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} - magicast@0.3.5: - resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==} + magic-string@0.30.21: + resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} + + magicast@0.5.1: + resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==} merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} @@ -1174,8 +1162,8 @@ packages: mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} - nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} + nanoid@3.3.11: + resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==} engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true @@ -1187,9 +1175,8 @@ packages: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} - os-tmpdir@1.0.2: - resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} - engines: {node: '>=0.10.0'} + obug@2.1.1: + resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==} outdent@0.5.0: resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==} @@ -1244,10 +1231,6 @@ packages: pathe@2.0.3: resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} - pathval@2.0.0: - resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==} - engines: {node: '>= 14.16'} - picocolors@1.1.1: resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} @@ -1259,6 +1242,10 @@ packages: resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} engines: {node: '>=12'} + picomatch@4.0.3: + resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} + engines: {node: '>=12'} + pify@4.0.1: resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} engines: {node: '>=6'} @@ -1288,8 +1275,8 @@ packages: yaml: optional: true - postcss@8.4.38: - resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} + postcss@8.5.6: + resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==} engines: {node: ^10 || ^12 || >=14} prettier@2.8.8: @@ -1297,8 +1284,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.6.2: - resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} + prettier@3.7.4: + resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==} engines: {node: '>=14'} hasBin: true @@ -1306,10 +1293,6 @@ packages: resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==} engines: {node: '>=18'} - punycode@2.3.0: - resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==} - engines: {node: '>=6'} - queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} @@ -1342,6 +1325,11 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true + rollup@4.55.1: + resolution: {integrity: sha512-wDv/Ht1BNHB4upNbK74s9usvl7hObDnvVzknxqY/E/O3X6rW1U1rV1aENEfJ54eFZDTNo7zv1f5N4edCluH7+A==} + engines: {node: '>=18.0.0', npm: '>=8.0.0'} + hasBin: true + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -1375,13 +1363,13 @@ packages: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - source-map-js@1.2.0: - resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + source-map-js@1.2.1: + resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} - source-map@0.8.0-beta.0: - resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} - engines: {node: '>= 8'} + source-map@0.7.6: + resolution: {integrity: sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==} + engines: {node: '>= 12'} spawndamnit@3.0.1: resolution: {integrity: sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==} @@ -1392,8 +1380,8 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - std-env@3.9.0: - resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==} + std-env@3.10.0: + resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==} string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} @@ -1419,14 +1407,16 @@ packages: resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} engines: {node: '>=18'} - strip-literal@3.0.0: - resolution: {integrity: sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==} - sucrase@3.35.0: resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==} engines: {node: '>=16 || 14 >=14.17'} hasBin: true + sucrase@3.35.1: + resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==} + engines: {node: '>=16 || 14 >=14.17'} + hasBin: true + tar@7.4.3: resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} engines: {node: '>=18'} @@ -1448,41 +1438,26 @@ packages: tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} - tinyglobby@0.2.13: - resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==} - engines: {node: '>=12.0.0'} + tinyexec@1.0.2: + resolution: {integrity: sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==} + engines: {node: '>=18'} tinyglobby@0.2.14: resolution: {integrity: sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==} engines: {node: '>=12.0.0'} - tinypool@1.1.1: - resolution: {integrity: sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==} - engines: {node: ^18.0.0 || >=20.0.0} - - tinyrainbow@2.0.0: - resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==} - engines: {node: '>=14.0.0'} + tinyglobby@0.2.15: + resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} + engines: {node: '>=12.0.0'} - tinyspy@4.0.3: - resolution: {integrity: sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==} + tinyrainbow@3.0.3: + resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==} engines: {node: '>=14.0.0'} - tmp@0.0.33: - resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==} - engines: {node: '>=0.6.0'} - - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} - tr46@1.0.1: - resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} - tree-kill@1.2.2: resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} hasBin: true @@ -1490,8 +1465,8 @@ packages: ts-interface-checker@0.1.13: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} - tsup@8.5.0: - resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==} + tsup@8.5.1: + resolution: {integrity: sha512-xtgkqwdhpKWr3tKPmCkvYmS9xnQK3m3XgxZHwSUjvfTjp7YfXe5tT3GgWi0F2N+ZSMsOeWeZFh7ZZFg5iPhing==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1509,50 +1484,50 @@ packages: typescript: optional: true - turbo-darwin-64@2.5.5: - resolution: {integrity: sha512-RYnTz49u4F5tDD2SUwwtlynABNBAfbyT2uU/brJcyh5k6lDLyNfYKdKmqd3K2ls4AaiALWrFKVSBsiVwhdFNzQ==} + turbo-darwin-64@2.7.3: + resolution: {integrity: sha512-aZHhvRiRHXbJw1EcEAq4aws1hsVVUZ9DPuSFaq9VVFAKCup7niIEwc22glxb7240yYEr1vLafdQ2U294Vcwz+w==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.5.5: - resolution: {integrity: sha512-Tk+ZeSNdBobZiMw9aFypQt0DlLsWSFWu1ymqsAdJLuPoAH05qCfYtRxE1pJuYHcJB5pqI+/HOxtJoQ40726Btw==} + turbo-darwin-arm64@2.7.3: + resolution: {integrity: sha512-CkVrHSq+Bnhl9sX2LQgqQYVfLTWC2gvI74C4758OmU0djfrssDKU9d4YQF0AYXXhIIRZipSXfxClQziIMD+EAg==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.5.5: - resolution: {integrity: sha512-2/XvMGykD7VgsvWesZZYIIVXMlgBcQy+ZAryjugoTcvJv8TZzSU/B1nShcA7IAjZ0q7OsZ45uP2cOb8EgKT30w==} + turbo-linux-64@2.7.3: + resolution: {integrity: sha512-GqDsCNnzzr89kMaLGpRALyigUklzgxIrSy2pHZVXyifgczvYPnLglex78Aj3T2gu+T3trPPH2iJ+pWucVOCC2Q==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.5.5: - resolution: {integrity: sha512-DW+8CjCjybu0d7TFm9dovTTVg1VRnlkZ1rceO4zqsaLrit3DgHnN4to4uwyuf9s2V/BwS3IYcRy+HG9BL596Iw==} + turbo-linux-arm64@2.7.3: + resolution: {integrity: sha512-NdCDTfIcIo3dWjsiaAHlxu5gW61Ed/8maah1IAF/9E3EtX0aAHNiBMbuYLZaR4vRJ7BeVkYB6xKWRtdFLZ0y3g==} cpu: [arm64] os: [linux] - turbo-windows-64@2.5.5: - resolution: {integrity: sha512-q5p1BOy8ChtSZfULuF1BhFMYIx6bevXu4fJ+TE/hyNfyHJIfjl90Z6jWdqAlyaFLmn99X/uw+7d6T/Y/dr5JwQ==} + turbo-windows-64@2.7.3: + resolution: {integrity: sha512-7bVvO987daXGSJVYBoG8R4Q+csT1pKIgLJYZevXRQ0Hqw0Vv4mKme/TOjYXs9Qb1xMKh51Tb3bXKDbd8/4G08g==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.5.5: - resolution: {integrity: sha512-AXbF1KmpHUq3PKQwddMGoKMYhHsy5t1YBQO8HZ04HLMR0rWv9adYlQ8kaeQJTko1Ay1anOBFTqaxfVOOsu7+1Q==} + turbo-windows-arm64@2.7.3: + resolution: {integrity: sha512-nTodweTbPmkvwMu/a55XvjMsPtuyUSC+sV7f/SR57K36rB2I0YG21qNETN+00LOTUW9B3omd8XkiXJkt4kx/cw==} cpu: [arm64] os: [win32] - turbo@2.5.5: - resolution: {integrity: sha512-eZ7wI6KjtT1eBqCnh2JPXWNUAxtoxxfi6VdBdZFvil0ychCOTxbm7YLRBi1JSt7U3c+u3CLxpoPxLdvr/Npr3A==} + turbo@2.7.3: + resolution: {integrity: sha512-+HjKlP4OfYk+qzvWNETA3cUO5UuK6b5MSc2UJOKyvBceKucQoQGb2g7HlC2H1GHdkfKrk4YF1VPvROkhVZDDLQ==} hasBin: true - typescript@5.9.2: - resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} hasBin: true ufo@1.6.1: resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} - undici-types@7.8.0: - resolution: {integrity: sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==} + undici-types@7.16.0: + resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} unicorn-magic@0.3.0: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} @@ -1562,59 +1537,72 @@ packages: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} - vite-node@3.2.4: - resolution: {integrity: sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} - hasBin: true - - vite@5.2.10: - resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} - engines: {node: ^18.0.0 || >=20.0.0} + vite@7.3.1: + resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==} + engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' + '@types/node': ^20.19.0 || >=22.12.0 + jiti: '>=1.21.0' + less: ^4.0.0 lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 + sass: ^1.70.0 + sass-embedded: ^1.70.0 + stylus: '>=0.54.8' + sugarss: ^5.0.0 + terser: ^5.16.0 + tsx: ^4.8.1 + yaml: ^2.4.2 peerDependenciesMeta: '@types/node': optional: true + jiti: + optional: true less: optional: true lightningcss: optional: true sass: optional: true + sass-embedded: + optional: true stylus: optional: true sugarss: optional: true terser: optional: true + tsx: + optional: true + yaml: + optional: true - vitest@3.2.4: - resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} + vitest@4.0.16: + resolution: {integrity: sha512-E4t7DJ9pESL6E3I8nFjPa4xGUd3PmiWDLsDztS2qXSJWfHtbQnwAWylaBvSNY48I3vr8PTqIZlyK8TE3V3CA4Q==} + engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' - '@types/debug': ^4.1.12 - '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 3.2.4 - '@vitest/ui': 3.2.4 + '@opentelemetry/api': ^1.9.0 + '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 + '@vitest/browser-playwright': 4.0.16 + '@vitest/browser-preview': 4.0.16 + '@vitest/browser-webdriverio': 4.0.16 + '@vitest/ui': 4.0.16 happy-dom: '*' jsdom: '*' peerDependenciesMeta: '@edge-runtime/vm': optional: true - '@types/debug': + '@opentelemetry/api': optional: true '@types/node': optional: true - '@vitest/browser': + '@vitest/browser-playwright': + optional: true + '@vitest/browser-preview': + optional: true + '@vitest/browser-webdriverio': optional: true '@vitest/ui': optional: true @@ -1623,12 +1611,6 @@ packages: jsdom: optional: true - webidl-conversions@4.0.2: - resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} - - whatwg-url@7.1.0: - resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} - which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -1657,31 +1639,30 @@ packages: snapshots: - '@babel/helper-string-parser@7.24.8': {} + '@babel/helper-string-parser@7.27.1': {} - '@babel/helper-validator-identifier@7.24.7': {} + '@babel/helper-validator-identifier@7.28.5': {} - '@babel/parser@7.25.6': + '@babel/parser@7.28.5': dependencies: - '@babel/types': 7.25.6 + '@babel/types': 7.28.5 '@babel/runtime@7.26.0': dependencies: regenerator-runtime: 0.14.1 - '@babel/types@7.25.6': + '@babel/types@7.28.5': dependencies: - '@babel/helper-string-parser': 7.24.8 - '@babel/helper-validator-identifier': 7.24.7 - to-fast-properties: 2.0.0 + '@babel/helper-string-parser': 7.27.1 + '@babel/helper-validator-identifier': 7.28.5 '@begit/core@0.3.3': dependencies: tar: 7.4.3 - '@changesets/apply-release-plan@7.0.12': + '@changesets/apply-release-plan@7.0.14': dependencies: - '@changesets/config': 3.1.1 + '@changesets/config': 3.1.2 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.4 '@changesets/should-skip-package': 0.1.2 @@ -1708,27 +1689,27 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.5': + '@changesets/cli@2.29.8(@types/node@25.0.3)': dependencies: - '@changesets/apply-release-plan': 7.0.12 + '@changesets/apply-release-plan': 7.0.14 '@changesets/assemble-release-plan': 6.0.9 '@changesets/changelog-git': 0.2.1 - '@changesets/config': 3.1.1 + '@changesets/config': 3.1.2 '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 - '@changesets/get-release-plan': 4.0.13 + '@changesets/get-release-plan': 4.0.14 '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.2 - '@changesets/read': 0.6.5 + '@changesets/read': 0.6.6 '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@changesets/write': 0.4.0 + '@inquirer/external-editor': 1.0.3(@types/node@25.0.3) '@manypkg/get-packages': 1.1.3 ansi-colors: 4.1.3 ci-info: 3.9.0 enquirer: 2.4.1 - external-editor: 3.1.0 fs-extra: 7.0.1 mri: 1.2.0 p-limit: 2.3.0 @@ -1738,8 +1719,10 @@ snapshots: semver: 7.6.3 spawndamnit: 3.0.1 term-size: 2.2.1 + transitivePeerDependencies: + - '@types/node' - '@changesets/config@3.1.1': + '@changesets/config@3.1.2': dependencies: '@changesets/errors': 0.2.0 '@changesets/get-dependents-graph': 2.1.3 @@ -1760,12 +1743,12 @@ snapshots: picocolors: 1.1.1 semver: 7.6.3 - '@changesets/get-release-plan@4.0.13': + '@changesets/get-release-plan@4.0.14': dependencies: '@changesets/assemble-release-plan': 6.0.9 - '@changesets/config': 3.1.1 + '@changesets/config': 3.1.2 '@changesets/pre': 2.0.2 - '@changesets/read': 0.6.5 + '@changesets/read': 0.6.6 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 @@ -1783,10 +1766,10 @@ snapshots: dependencies: picocolors: 1.1.1 - '@changesets/parse@0.4.1': + '@changesets/parse@0.4.2': dependencies: '@changesets/types': 6.1.0 - js-yaml: 3.14.1 + js-yaml: 4.1.1 '@changesets/pre@2.0.2': dependencies: @@ -1795,11 +1778,11 @@ snapshots: '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - '@changesets/read@0.6.5': + '@changesets/read@0.6.6': dependencies: '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 - '@changesets/parse': 0.4.1 + '@changesets/parse': 0.4.2 '@changesets/types': 6.1.0 fs-extra: 7.0.1 p-filter: 2.1.0 @@ -1832,149 +1815,90 @@ snapshots: picocolors: 1.1.1 sisteransi: 1.0.5 - '@esbuild/aix-ppc64@0.20.2': - optional: true - - '@esbuild/aix-ppc64@0.25.0': - optional: true - - '@esbuild/android-arm64@0.20.2': - optional: true - - '@esbuild/android-arm64@0.25.0': - optional: true - - '@esbuild/android-arm@0.20.2': - optional: true - - '@esbuild/android-arm@0.25.0': - optional: true - - '@esbuild/android-x64@0.20.2': - optional: true - - '@esbuild/android-x64@0.25.0': - optional: true - - '@esbuild/darwin-arm64@0.20.2': - optional: true - - '@esbuild/darwin-arm64@0.25.0': - optional: true - - '@esbuild/darwin-x64@0.20.2': - optional: true - - '@esbuild/darwin-x64@0.25.0': - optional: true - - '@esbuild/freebsd-arm64@0.20.2': - optional: true - - '@esbuild/freebsd-arm64@0.25.0': + '@esbuild/aix-ppc64@0.27.2': optional: true - '@esbuild/freebsd-x64@0.20.2': + '@esbuild/android-arm64@0.27.2': optional: true - '@esbuild/freebsd-x64@0.25.0': + '@esbuild/android-arm@0.27.2': optional: true - '@esbuild/linux-arm64@0.20.2': + '@esbuild/android-x64@0.27.2': optional: true - '@esbuild/linux-arm64@0.25.0': + '@esbuild/darwin-arm64@0.27.2': optional: true - '@esbuild/linux-arm@0.20.2': + '@esbuild/darwin-x64@0.27.2': optional: true - '@esbuild/linux-arm@0.25.0': + '@esbuild/freebsd-arm64@0.27.2': optional: true - '@esbuild/linux-ia32@0.20.2': + '@esbuild/freebsd-x64@0.27.2': optional: true - '@esbuild/linux-ia32@0.25.0': + '@esbuild/linux-arm64@0.27.2': optional: true - '@esbuild/linux-loong64@0.20.2': + '@esbuild/linux-arm@0.27.2': optional: true - '@esbuild/linux-loong64@0.25.0': + '@esbuild/linux-ia32@0.27.2': optional: true - '@esbuild/linux-mips64el@0.20.2': + '@esbuild/linux-loong64@0.27.2': optional: true - '@esbuild/linux-mips64el@0.25.0': + '@esbuild/linux-mips64el@0.27.2': optional: true - '@esbuild/linux-ppc64@0.20.2': + '@esbuild/linux-ppc64@0.27.2': optional: true - '@esbuild/linux-ppc64@0.25.0': + '@esbuild/linux-riscv64@0.27.2': optional: true - '@esbuild/linux-riscv64@0.20.2': + '@esbuild/linux-s390x@0.27.2': optional: true - '@esbuild/linux-riscv64@0.25.0': + '@esbuild/linux-x64@0.27.2': optional: true - '@esbuild/linux-s390x@0.20.2': + '@esbuild/netbsd-arm64@0.27.2': optional: true - '@esbuild/linux-s390x@0.25.0': + '@esbuild/netbsd-x64@0.27.2': optional: true - '@esbuild/linux-x64@0.20.2': + '@esbuild/openbsd-arm64@0.27.2': optional: true - '@esbuild/linux-x64@0.25.0': + '@esbuild/openbsd-x64@0.27.2': optional: true - '@esbuild/netbsd-arm64@0.25.0': + '@esbuild/openharmony-arm64@0.27.2': optional: true - '@esbuild/netbsd-x64@0.20.2': + '@esbuild/sunos-x64@0.27.2': optional: true - '@esbuild/netbsd-x64@0.25.0': + '@esbuild/win32-arm64@0.27.2': optional: true - '@esbuild/openbsd-arm64@0.25.0': + '@esbuild/win32-ia32@0.27.2': optional: true - '@esbuild/openbsd-x64@0.20.2': + '@esbuild/win32-x64@0.27.2': optional: true - '@esbuild/openbsd-x64@0.25.0': - optional: true - - '@esbuild/sunos-x64@0.20.2': - optional: true - - '@esbuild/sunos-x64@0.25.0': - optional: true - - '@esbuild/win32-arm64@0.20.2': - optional: true - - '@esbuild/win32-arm64@0.25.0': - optional: true - - '@esbuild/win32-ia32@0.20.2': - optional: true - - '@esbuild/win32-ia32@0.25.0': - optional: true - - '@esbuild/win32-x64@0.20.2': - optional: true - - '@esbuild/win32-x64@0.25.0': - optional: true + '@inquirer/external-editor@1.0.3(@types/node@25.0.3)': + dependencies: + chardet: 2.1.1 + iconv-lite: 0.7.2 + optionalDependencies: + '@types/node': 25.0.3 '@isaacs/cliui@8.0.2': dependencies: @@ -2003,6 +1927,8 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/trace-mapping@0.3.19': dependencies: '@jridgewell/resolve-uri': 3.1.1 @@ -2042,64 +1968,141 @@ snapshots: '@rollup/rollup-android-arm-eabi@4.34.9': optional: true + '@rollup/rollup-android-arm-eabi@4.55.1': + optional: true + '@rollup/rollup-android-arm64@4.34.9': optional: true + '@rollup/rollup-android-arm64@4.55.1': + optional: true + '@rollup/rollup-darwin-arm64@4.34.9': optional: true + '@rollup/rollup-darwin-arm64@4.55.1': + optional: true + '@rollup/rollup-darwin-x64@4.34.9': optional: true + '@rollup/rollup-darwin-x64@4.55.1': + optional: true + '@rollup/rollup-freebsd-arm64@4.34.9': optional: true + '@rollup/rollup-freebsd-arm64@4.55.1': + optional: true + '@rollup/rollup-freebsd-x64@4.34.9': optional: true + '@rollup/rollup-freebsd-x64@4.55.1': + optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.34.9': optional: true + '@rollup/rollup-linux-arm-gnueabihf@4.55.1': + optional: true + '@rollup/rollup-linux-arm-musleabihf@4.34.9': optional: true + '@rollup/rollup-linux-arm-musleabihf@4.55.1': + optional: true + '@rollup/rollup-linux-arm64-gnu@4.34.9': optional: true + '@rollup/rollup-linux-arm64-gnu@4.55.1': + optional: true + '@rollup/rollup-linux-arm64-musl@4.34.9': optional: true + '@rollup/rollup-linux-arm64-musl@4.55.1': + optional: true + + '@rollup/rollup-linux-loong64-gnu@4.55.1': + optional: true + + '@rollup/rollup-linux-loong64-musl@4.55.1': + optional: true + '@rollup/rollup-linux-loongarch64-gnu@4.34.9': optional: true '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': optional: true + '@rollup/rollup-linux-ppc64-gnu@4.55.1': + optional: true + + '@rollup/rollup-linux-ppc64-musl@4.55.1': + optional: true + '@rollup/rollup-linux-riscv64-gnu@4.34.9': optional: true + '@rollup/rollup-linux-riscv64-gnu@4.55.1': + optional: true + + '@rollup/rollup-linux-riscv64-musl@4.55.1': + optional: true + '@rollup/rollup-linux-s390x-gnu@4.34.9': optional: true + '@rollup/rollup-linux-s390x-gnu@4.55.1': + optional: true + '@rollup/rollup-linux-x64-gnu@4.34.9': optional: true + '@rollup/rollup-linux-x64-gnu@4.55.1': + optional: true + '@rollup/rollup-linux-x64-musl@4.34.9': optional: true + '@rollup/rollup-linux-x64-musl@4.55.1': + optional: true + + '@rollup/rollup-openbsd-x64@4.55.1': + optional: true + + '@rollup/rollup-openharmony-arm64@4.55.1': + optional: true + '@rollup/rollup-win32-arm64-msvc@4.34.9': optional: true + '@rollup/rollup-win32-arm64-msvc@4.55.1': + optional: true + '@rollup/rollup-win32-ia32-msvc@4.34.9': optional: true + '@rollup/rollup-win32-ia32-msvc@4.55.1': + optional: true + + '@rollup/rollup-win32-x64-gnu@4.55.1': + optional: true + '@rollup/rollup-win32-x64-msvc@4.34.9': optional: true + '@rollup/rollup-win32-x64-msvc@4.55.1': + optional: true + '@sec-ant/readable-stream@0.4.1': {} '@sindresorhus/merge-streams@4.0.0': {} + '@standard-schema/spec@1.1.0': {} + '@swc/core-darwin-arm64@1.5.5': optional: true @@ -2163,53 +2166,52 @@ snapshots: '@types/estree@1.0.6': {} + '@types/estree@1.0.8': {} + '@types/node@12.20.55': {} - '@types/node@24.1.0': + '@types/node@25.0.3': dependencies: - undici-types: 7.8.0 + undici-types: 7.16.0 - '@vitest/expect@3.2.4': + '@vitest/expect@4.0.16': dependencies: + '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.2 - '@vitest/spy': 3.2.4 - '@vitest/utils': 3.2.4 - chai: 5.2.0 - tinyrainbow: 2.0.0 + '@vitest/spy': 4.0.16 + '@vitest/utils': 4.0.16 + chai: 6.2.2 + tinyrainbow: 3.0.3 - '@vitest/mocker@3.2.4(vite@5.2.10(@types/node@24.1.0))': + '@vitest/mocker@4.0.16(vite@7.3.1(@types/node@25.0.3)(jiti@2.6.1))': dependencies: - '@vitest/spy': 3.2.4 + '@vitest/spy': 4.0.16 estree-walker: 3.0.3 - magic-string: 0.30.17 + magic-string: 0.30.21 optionalDependencies: - vite: 5.2.10(@types/node@24.1.0) + vite: 7.3.1(@types/node@25.0.3)(jiti@2.6.1) - '@vitest/pretty-format@3.2.4': + '@vitest/pretty-format@4.0.16': dependencies: - tinyrainbow: 2.0.0 + tinyrainbow: 3.0.3 - '@vitest/runner@3.2.4': + '@vitest/runner@4.0.16': dependencies: - '@vitest/utils': 3.2.4 + '@vitest/utils': 4.0.16 pathe: 2.0.3 - strip-literal: 3.0.0 - '@vitest/snapshot@3.2.4': + '@vitest/snapshot@4.0.16': dependencies: - '@vitest/pretty-format': 3.2.4 - magic-string: 0.30.17 + '@vitest/pretty-format': 4.0.16 + magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@3.2.4': - dependencies: - tinyspy: 4.0.3 + '@vitest/spy@4.0.16': {} - '@vitest/utils@3.2.4': + '@vitest/utils@4.0.16': dependencies: - '@vitest/pretty-format': 3.2.4 - loupe: 3.2.0 - tinyrainbow: 2.0.0 + '@vitest/pretty-format': 4.0.16 + tinyrainbow: 3.0.3 acorn@8.14.1: {} @@ -2231,9 +2233,9 @@ snapshots: dependencies: sprintf-js: 1.0.3 - array-union@2.1.0: {} + argparse@2.0.1: {} - assertion-error@2.0.1: {} + array-union@2.1.0: {} balanced-match@1.0.2: {} @@ -2249,24 +2251,16 @@ snapshots: dependencies: fill-range: 7.1.1 - bundle-require@5.1.0(esbuild@0.25.0): + bundle-require@5.1.0(esbuild@0.27.2): dependencies: - esbuild: 0.25.0 + esbuild: 0.27.2 load-tsconfig: 0.2.5 cac@6.7.14: {} - chai@5.2.0: - dependencies: - assertion-error: 2.0.1 - check-error: 2.1.1 - deep-eql: 5.0.2 - loupe: 3.1.3 - pathval: 2.0.0 + chai@6.2.2: {} - chardet@0.7.0: {} - - check-error@2.1.1: {} + chardet@2.1.1: {} chokidar@4.0.3: dependencies: @@ -2306,16 +2300,10 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - debug@4.4.0: - dependencies: - ms: 2.1.3 - debug@4.4.1: dependencies: ms: 2.1.3 - deep-eql@5.0.2: {} - detect-indent@6.1.0: {} dir-glob@3.0.1: @@ -2335,59 +2323,34 @@ snapshots: es-module-lexer@1.7.0: {} - esbuild@0.20.2: + esbuild@0.27.2: optionalDependencies: - '@esbuild/aix-ppc64': 0.20.2 - '@esbuild/android-arm': 0.20.2 - '@esbuild/android-arm64': 0.20.2 - '@esbuild/android-x64': 0.20.2 - '@esbuild/darwin-arm64': 0.20.2 - '@esbuild/darwin-x64': 0.20.2 - '@esbuild/freebsd-arm64': 0.20.2 - '@esbuild/freebsd-x64': 0.20.2 - '@esbuild/linux-arm': 0.20.2 - '@esbuild/linux-arm64': 0.20.2 - '@esbuild/linux-ia32': 0.20.2 - '@esbuild/linux-loong64': 0.20.2 - '@esbuild/linux-mips64el': 0.20.2 - '@esbuild/linux-ppc64': 0.20.2 - '@esbuild/linux-riscv64': 0.20.2 - '@esbuild/linux-s390x': 0.20.2 - '@esbuild/linux-x64': 0.20.2 - '@esbuild/netbsd-x64': 0.20.2 - '@esbuild/openbsd-x64': 0.20.2 - '@esbuild/sunos-x64': 0.20.2 - '@esbuild/win32-arm64': 0.20.2 - '@esbuild/win32-ia32': 0.20.2 - '@esbuild/win32-x64': 0.20.2 - - esbuild@0.25.0: - optionalDependencies: - '@esbuild/aix-ppc64': 0.25.0 - '@esbuild/android-arm': 0.25.0 - '@esbuild/android-arm64': 0.25.0 - '@esbuild/android-x64': 0.25.0 - '@esbuild/darwin-arm64': 0.25.0 - '@esbuild/darwin-x64': 0.25.0 - '@esbuild/freebsd-arm64': 0.25.0 - '@esbuild/freebsd-x64': 0.25.0 - '@esbuild/linux-arm': 0.25.0 - '@esbuild/linux-arm64': 0.25.0 - '@esbuild/linux-ia32': 0.25.0 - '@esbuild/linux-loong64': 0.25.0 - '@esbuild/linux-mips64el': 0.25.0 - '@esbuild/linux-ppc64': 0.25.0 - '@esbuild/linux-riscv64': 0.25.0 - '@esbuild/linux-s390x': 0.25.0 - '@esbuild/linux-x64': 0.25.0 - '@esbuild/netbsd-arm64': 0.25.0 - '@esbuild/netbsd-x64': 0.25.0 - '@esbuild/openbsd-arm64': 0.25.0 - '@esbuild/openbsd-x64': 0.25.0 - '@esbuild/sunos-x64': 0.25.0 - '@esbuild/win32-arm64': 0.25.0 - '@esbuild/win32-ia32': 0.25.0 - '@esbuild/win32-x64': 0.25.0 + '@esbuild/aix-ppc64': 0.27.2 + '@esbuild/android-arm': 0.27.2 + '@esbuild/android-arm64': 0.27.2 + '@esbuild/android-x64': 0.27.2 + '@esbuild/darwin-arm64': 0.27.2 + '@esbuild/darwin-x64': 0.27.2 + '@esbuild/freebsd-arm64': 0.27.2 + '@esbuild/freebsd-x64': 0.27.2 + '@esbuild/linux-arm': 0.27.2 + '@esbuild/linux-arm64': 0.27.2 + '@esbuild/linux-ia32': 0.27.2 + '@esbuild/linux-loong64': 0.27.2 + '@esbuild/linux-mips64el': 0.27.2 + '@esbuild/linux-ppc64': 0.27.2 + '@esbuild/linux-riscv64': 0.27.2 + '@esbuild/linux-s390x': 0.27.2 + '@esbuild/linux-x64': 0.27.2 + '@esbuild/netbsd-arm64': 0.27.2 + '@esbuild/netbsd-x64': 0.27.2 + '@esbuild/openbsd-arm64': 0.27.2 + '@esbuild/openbsd-x64': 0.27.2 + '@esbuild/openharmony-arm64': 0.27.2 + '@esbuild/sunos-x64': 0.27.2 + '@esbuild/win32-arm64': 0.27.2 + '@esbuild/win32-ia32': 0.27.2 + '@esbuild/win32-x64': 0.27.2 esprima@4.0.1: {} @@ -2395,7 +2358,7 @@ snapshots: dependencies: '@types/estree': 1.0.6 - execa@9.6.0: + execa@9.6.1: dependencies: '@sindresorhus/merge-streams': 4.0.0 cross-spawn: 7.0.6 @@ -2410,16 +2373,10 @@ snapshots: strip-final-newline: 4.0.0 yoctocolors: 2.1.1 - expect-type@1.2.1: {} + expect-type@1.3.0: {} extendable-error@0.1.7: {} - external-editor@3.1.0: - dependencies: - chardet: 0.7.0 - iconv-lite: 0.4.24 - tmp: 0.0.33 - fast-glob@3.3.3: dependencies: '@nodelib/fs.stat': 2.0.5 @@ -2436,6 +2393,10 @@ snapshots: optionalDependencies: picomatch: 4.0.2 + fdir@6.5.0(picomatch@4.0.3): + optionalDependencies: + picomatch: 4.0.3 + figures@6.1.0: dependencies: is-unicode-supported: 2.1.0 @@ -2507,7 +2468,7 @@ snapshots: human-signals@8.0.1: {} - iconv-lite@0.4.24: + iconv-lite@0.7.2: dependencies: safer-buffer: 2.1.2 @@ -2543,17 +2504,19 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@2.5.1: {} + jiti@2.6.1: {} joycon@3.1.1: {} - js-tokens@9.0.1: {} - js-yaml@3.14.1: dependencies: argparse: 1.0.10 esprima: 4.0.1 + js-yaml@4.1.1: + dependencies: + argparse: 2.0.1 + jsonfile@4.0.0: optionalDependencies: graceful-fs: 4.2.11 @@ -2568,25 +2531,23 @@ snapshots: dependencies: p-locate: 4.1.0 - lodash.sortby@4.7.0: {} - lodash.startcase@4.4.0: {} - loupe@3.1.3: {} - - loupe@3.2.0: {} - lru-cache@10.1.0: {} magic-string@0.30.17: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 - magicast@0.3.5: + magic-string@0.30.21: dependencies: - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 - source-map-js: 1.2.0 + '@jridgewell/sourcemap-codec': 1.5.5 + + magicast@0.5.1: + dependencies: + '@babel/parser': 7.28.5 + '@babel/types': 7.28.5 + source-map-js: 1.2.1 merge2@1.4.1: {} @@ -2627,7 +2588,7 @@ snapshots: object-assign: 4.1.1 thenify-all: 1.6.0 - nanoid@3.3.7: {} + nanoid@3.3.11: {} npm-run-path@6.0.0: dependencies: @@ -2636,7 +2597,7 @@ snapshots: object-assign@4.1.1: {} - os-tmpdir@1.0.2: {} + obug@2.1.1: {} outdent@0.5.0: {} @@ -2675,14 +2636,14 @@ snapshots: pathe@2.0.3: {} - pathval@2.0.0: {} - picocolors@1.1.1: {} picomatch@2.3.1: {} picomatch@4.0.2: {} + picomatch@4.0.3: {} + pify@4.0.1: {} pirates@4.0.6: {} @@ -2693,29 +2654,27 @@ snapshots: mlly: 1.7.4 pathe: 2.0.3 - postcss-load-config@6.0.1(jiti@2.5.1)(postcss@8.4.38): + postcss-load-config@6.0.1(jiti@2.6.1)(postcss@8.5.6): dependencies: lilconfig: 3.1.2 optionalDependencies: - jiti: 2.5.1 - postcss: 8.4.38 + jiti: 2.6.1 + postcss: 8.5.6 - postcss@8.4.38: + postcss@8.5.6: dependencies: - nanoid: 3.3.7 + nanoid: 3.3.11 picocolors: 1.1.1 - source-map-js: 1.2.0 + source-map-js: 1.2.1 prettier@2.8.8: {} - prettier@3.6.2: {} + prettier@3.7.4: {} pretty-ms@9.2.0: dependencies: parse-ms: 4.0.0 - punycode@2.3.0: {} - queue-microtask@1.2.3: {} read-yaml-file@1.1.0: @@ -2762,6 +2721,37 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.34.9 fsevents: 2.3.3 + rollup@4.55.1: + dependencies: + '@types/estree': 1.0.8 + optionalDependencies: + '@rollup/rollup-android-arm-eabi': 4.55.1 + '@rollup/rollup-android-arm64': 4.55.1 + '@rollup/rollup-darwin-arm64': 4.55.1 + '@rollup/rollup-darwin-x64': 4.55.1 + '@rollup/rollup-freebsd-arm64': 4.55.1 + '@rollup/rollup-freebsd-x64': 4.55.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.55.1 + '@rollup/rollup-linux-arm-musleabihf': 4.55.1 + '@rollup/rollup-linux-arm64-gnu': 4.55.1 + '@rollup/rollup-linux-arm64-musl': 4.55.1 + '@rollup/rollup-linux-loong64-gnu': 4.55.1 + '@rollup/rollup-linux-loong64-musl': 4.55.1 + '@rollup/rollup-linux-ppc64-gnu': 4.55.1 + '@rollup/rollup-linux-ppc64-musl': 4.55.1 + '@rollup/rollup-linux-riscv64-gnu': 4.55.1 + '@rollup/rollup-linux-riscv64-musl': 4.55.1 + '@rollup/rollup-linux-s390x-gnu': 4.55.1 + '@rollup/rollup-linux-x64-gnu': 4.55.1 + '@rollup/rollup-linux-x64-musl': 4.55.1 + '@rollup/rollup-openbsd-x64': 4.55.1 + '@rollup/rollup-openharmony-arm64': 4.55.1 + '@rollup/rollup-win32-arm64-msvc': 4.55.1 + '@rollup/rollup-win32-ia32-msvc': 4.55.1 + '@rollup/rollup-win32-x64-gnu': 4.55.1 + '@rollup/rollup-win32-x64-msvc': 4.55.1 + fsevents: 2.3.3 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -2784,11 +2774,9 @@ snapshots: slash@3.0.0: {} - source-map-js@1.2.0: {} + source-map-js@1.2.1: {} - source-map@0.8.0-beta.0: - dependencies: - whatwg-url: 7.1.0 + source-map@0.7.6: {} spawndamnit@3.0.1: dependencies: @@ -2799,7 +2787,7 @@ snapshots: stackback@0.0.2: {} - std-env@3.9.0: {} + std-env@3.10.0: {} string-width@4.2.3: dependencies: @@ -2825,10 +2813,6 @@ snapshots: strip-final-newline@4.0.0: {} - strip-literal@3.0.0: - dependencies: - js-tokens: 9.0.1 - sucrase@3.35.0: dependencies: '@jridgewell/gen-mapping': 0.3.3 @@ -2839,6 +2823,16 @@ snapshots: pirates: 4.0.6 ts-interface-checker: 0.1.13 + sucrase@3.35.1: + dependencies: + '@jridgewell/gen-mapping': 0.3.3 + commander: 4.1.1 + lines-and-columns: 1.2.4 + mz: 2.7.0 + pirates: 4.0.6 + tinyglobby: 0.2.15 + ts-interface-checker: 0.1.13 + tar@7.4.3: dependencies: '@isaacs/fs-minipass': 4.0.0 @@ -2862,176 +2856,143 @@ snapshots: tinyexec@0.3.2: {} - tinyglobby@0.2.13: - dependencies: - fdir: 6.4.4(picomatch@4.0.2) - picomatch: 4.0.2 + tinyexec@1.0.2: {} tinyglobby@0.2.14: dependencies: fdir: 6.4.4(picomatch@4.0.2) picomatch: 4.0.2 - tinypool@1.1.1: {} - - tinyrainbow@2.0.0: {} - - tinyspy@4.0.3: {} - - tmp@0.0.33: + tinyglobby@0.2.15: dependencies: - os-tmpdir: 1.0.2 + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 - to-fast-properties@2.0.0: {} + tinyrainbow@3.0.3: {} to-regex-range@5.0.1: dependencies: is-number: 7.0.0 - tr46@1.0.1: - dependencies: - punycode: 2.3.0 - tree-kill@1.2.2: {} ts-interface-checker@0.1.13: {} - tsup@8.5.0(@swc/core@1.5.5)(jiti@2.5.1)(postcss@8.4.38)(typescript@5.9.2): + tsup@8.5.1(@swc/core@1.5.5)(jiti@2.6.1)(postcss@8.5.6)(typescript@5.9.3): dependencies: - bundle-require: 5.1.0(esbuild@0.25.0) + bundle-require: 5.1.0(esbuild@0.27.2) cac: 6.7.14 chokidar: 4.0.3 consola: 3.4.0 - debug: 4.4.0 - esbuild: 0.25.0 + debug: 4.4.1 + esbuild: 0.27.2 fix-dts-default-cjs-exports: 1.0.1 joycon: 3.1.1 picocolors: 1.1.1 - postcss-load-config: 6.0.1(jiti@2.5.1)(postcss@8.4.38) + postcss-load-config: 6.0.1(jiti@2.6.1)(postcss@8.5.6) resolve-from: 5.0.0 rollup: 4.34.9 - source-map: 0.8.0-beta.0 + source-map: 0.7.6 sucrase: 3.35.0 tinyexec: 0.3.2 - tinyglobby: 0.2.13 + tinyglobby: 0.2.14 tree-kill: 1.2.2 optionalDependencies: '@swc/core': 1.5.5 - postcss: 8.4.38 - typescript: 5.9.2 + postcss: 8.5.6 + typescript: 5.9.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.5.5: + turbo-darwin-64@2.7.3: optional: true - turbo-darwin-arm64@2.5.5: + turbo-darwin-arm64@2.7.3: optional: true - turbo-linux-64@2.5.5: + turbo-linux-64@2.7.3: optional: true - turbo-linux-arm64@2.5.5: + turbo-linux-arm64@2.7.3: optional: true - turbo-windows-64@2.5.5: + turbo-windows-64@2.7.3: optional: true - turbo-windows-arm64@2.5.5: + turbo-windows-arm64@2.7.3: optional: true - turbo@2.5.5: + turbo@2.7.3: optionalDependencies: - turbo-darwin-64: 2.5.5 - turbo-darwin-arm64: 2.5.5 - turbo-linux-64: 2.5.5 - turbo-linux-arm64: 2.5.5 - turbo-windows-64: 2.5.5 - turbo-windows-arm64: 2.5.5 + turbo-darwin-64: 2.7.3 + turbo-darwin-arm64: 2.7.3 + turbo-linux-64: 2.7.3 + turbo-linux-arm64: 2.7.3 + turbo-windows-64: 2.7.3 + turbo-windows-arm64: 2.7.3 - typescript@5.9.2: {} + typescript@5.9.3: {} ufo@1.6.1: {} - undici-types@7.8.0: {} + undici-types@7.16.0: {} unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite-node@3.2.4(@types/node@24.1.0): + vite@7.3.1(@types/node@25.0.3)(jiti@2.6.1): dependencies: - cac: 6.7.14 - debug: 4.4.1 - es-module-lexer: 1.7.0 - pathe: 2.0.3 - vite: 5.2.10(@types/node@24.1.0) - transitivePeerDependencies: - - '@types/node' - - less - - lightningcss - - sass - - stylus - - sugarss - - supports-color - - terser - - vite@5.2.10(@types/node@24.1.0): - dependencies: - esbuild: 0.20.2 - postcss: 8.4.38 - rollup: 4.34.9 + esbuild: 0.27.2 + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 + postcss: 8.5.6 + rollup: 4.55.1 + tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 24.1.0 + '@types/node': 25.0.3 fsevents: 2.3.3 + jiti: 2.6.1 - vitest@3.2.4(@types/node@24.1.0): + vitest@4.0.16(@types/node@25.0.3)(jiti@2.6.1): dependencies: - '@types/chai': 5.2.2 - '@vitest/expect': 3.2.4 - '@vitest/mocker': 3.2.4(vite@5.2.10(@types/node@24.1.0)) - '@vitest/pretty-format': 3.2.4 - '@vitest/runner': 3.2.4 - '@vitest/snapshot': 3.2.4 - '@vitest/spy': 3.2.4 - '@vitest/utils': 3.2.4 - chai: 5.2.0 - debug: 4.4.1 - expect-type: 1.2.1 - magic-string: 0.30.17 + '@vitest/expect': 4.0.16 + '@vitest/mocker': 4.0.16(vite@7.3.1(@types/node@25.0.3)(jiti@2.6.1)) + '@vitest/pretty-format': 4.0.16 + '@vitest/runner': 4.0.16 + '@vitest/snapshot': 4.0.16 + '@vitest/spy': 4.0.16 + '@vitest/utils': 4.0.16 + es-module-lexer: 1.7.0 + expect-type: 1.3.0 + magic-string: 0.30.21 + obug: 2.1.1 pathe: 2.0.3 - picomatch: 4.0.2 - std-env: 3.9.0 + picomatch: 4.0.3 + std-env: 3.10.0 tinybench: 2.9.0 - tinyexec: 0.3.2 - tinyglobby: 0.2.14 - tinypool: 1.1.1 - tinyrainbow: 2.0.0 - vite: 5.2.10(@types/node@24.1.0) - vite-node: 3.2.4(@types/node@24.1.0) + tinyexec: 1.0.2 + tinyglobby: 0.2.15 + tinyrainbow: 3.0.3 + vite: 7.3.1(@types/node@25.0.3)(jiti@2.6.1) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 24.1.0 + '@types/node': 25.0.3 transitivePeerDependencies: + - jiti - less - lightningcss - msw - sass + - sass-embedded - stylus - sugarss - - supports-color - terser - - webidl-conversions@4.0.2: {} - - whatwg-url@7.1.0: - dependencies: - lodash.sortby: 4.7.0 - tr46: 1.0.1 - webidl-conversions: 4.0.2 + - tsx + - yaml which@2.0.2: dependencies: From 1127dfab2dc23ae8888055e73e2d744ac2af65b9 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Mon, 2 Feb 2026 20:13:52 +0000 Subject: [PATCH 247/290] chore: update dependencies --- package.json | 10 +- packages/create-solid/package.json | 4 +- packages/create/package.json | 4 +- packages/create/src/index.ts | 4 +- packages/full-solid/package.json | 4 +- packages/full-solid/src/start/index.ts | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 273 +++++++++++++------------ 8 files changed, 162 insertions(+), 143 deletions(-) diff --git a/package.json b/package.json index d7c0755..014b5fc 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,16 @@ "./packages/*" ], "devDependencies": { - "@types/node": "25.0.3", + "@types/node": "25.2.0", "tsup": "^8.5.1", "typescript": "^5.9.3", "@changesets/cli": "2.29.8", - "prettier": "^3.7.4", - "turbo": "^2.7.3", - "vitest": "^4.0.16", + "prettier": "^3.8.1", + "turbo": "^2.8.1", + "vitest": "^4.0.18", "jiti": "^2.6.1" }, - "packageManager": "pnpm@10.27.0", + "packageManager": "pnpm@10.28.2", "pnpm": { "onlyBuiltDependencies": [ "@swc/core", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 6ab18e1..6e603a6 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,9 +31,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.11.0", + "@clack/prompts": "1.0.0", "picocolors": "^1.1.1", - "citty": "^0.1.6", + "citty": "^0.2.0", "@solid-cli/create": "workspace:*" }, "publishConfig": { diff --git a/packages/create/package.json b/packages/create/package.json index c2ee00e..ccd9958 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -40,10 +40,10 @@ "access": "public" }, "dependencies": { - "@clack/prompts": "0.11.0", + "@clack/prompts": "1.0.0", "picocolors": "^1.1.1", "@begit/core": "^0.3.3", - "citty": "^0.1.6", + "citty": "^0.2.0", "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" } diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 3378bae..0114bc4 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -90,8 +90,8 @@ export const createSolid = (version: string) => }, }) { // Show prompts for any unknown arguments - let projectName: string = projectNamePositional ?? projectNameOptional; - let template: string = templatePositional ?? templateOptional; + let projectName = projectNamePositional ?? projectNameOptional; + let template = templatePositional ?? templateOptional; let projectType: ProjectType | undefined = solidstart ? "start" : (vanilla ? "vanilla" : (library ? "library" : undefined)); // False if user has selected ts, true if they have selected js, and undefined if they've done neither let useJS = ts ? !ts : js ? js : undefined; diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 24a4396..7181146 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,9 +30,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "0.11.0", + "@clack/prompts": "1.0.0", "picocolors": "^1.1.1", - "citty": "^0.1.6", + "citty": "^0.2.0", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*" }, diff --git a/packages/full-solid/src/start/index.ts b/packages/full-solid/src/start/index.ts index 0df4ad5..520876a 100644 --- a/packages/full-solid/src/start/index.ts +++ b/packages/full-solid/src/start/index.ts @@ -26,7 +26,7 @@ export const startCommands = defineCommand({ p.text({ message: "Route path", validate(value) { - if (value.length === 0) return "A route path is required"; + if (!value || value.length === 0) return "A route path is required"; }, }), ); diff --git a/packages/utils/package.json b/packages/utils/package.json index 1669d5a..e16b805 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -73,8 +73,8 @@ "access": "public" }, "dependencies": { - "@clack/core": "0.5.0", - "@clack/prompts": "0.11.0", + "@clack/core": "1.0.0", + "@clack/prompts": "1.0.0", "execa": "^9.6.1", "picocolors": "^1.1.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 98f9fb4..a9996a1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,28 +10,28 @@ importers: devDependencies: '@changesets/cli': specifier: 2.29.8 - version: 2.29.8(@types/node@25.0.3) + version: 2.29.8(@types/node@25.2.0) '@types/node': - specifier: 25.0.3 - version: 25.0.3 + specifier: 25.2.0 + version: 25.2.0 jiti: specifier: ^2.6.1 version: 2.6.1 prettier: - specifier: ^3.7.4 - version: 3.7.4 + specifier: ^3.8.1 + version: 3.8.1 tsup: specifier: ^8.5.1 version: 8.5.1(@swc/core@1.5.5)(jiti@2.6.1)(postcss@8.5.6)(typescript@5.9.3) turbo: - specifier: ^2.7.3 - version: 2.7.3 + specifier: ^2.8.1 + version: 2.8.1 typescript: specifier: ^5.9.3 version: 5.9.3 vitest: - specifier: ^4.0.16 - version: 4.0.16(@types/node@25.0.3)(jiti@2.6.1) + specifier: ^4.0.18 + version: 4.0.18(@types/node@25.2.0)(jiti@2.6.1) packages/create: dependencies: @@ -39,14 +39,14 @@ importers: specifier: ^0.3.3 version: 0.3.3 '@clack/prompts': - specifier: 0.11.0 - version: 0.11.0 + specifier: 1.0.0 + version: 1.0.0 '@solid-cli/utils': specifier: workspace:* version: link:../utils citty: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^0.2.0 + version: 0.2.0 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -57,14 +57,14 @@ importers: packages/create-solid: devDependencies: '@clack/prompts': - specifier: 0.11.0 - version: 0.11.0 + specifier: 1.0.0 + version: 1.0.0 '@solid-cli/create': specifier: workspace:* version: link:../create citty: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^0.2.0 + version: 0.2.0 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -72,8 +72,8 @@ importers: packages/full-solid: devDependencies: '@clack/prompts': - specifier: 0.11.0 - version: 0.11.0 + specifier: 1.0.0 + version: 1.0.0 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -81,8 +81,8 @@ importers: specifier: workspace:* version: link:../utils citty: - specifier: ^0.1.6 - version: 0.1.6 + specifier: ^0.2.0 + version: 0.2.0 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -90,11 +90,11 @@ importers: packages/utils: dependencies: '@clack/core': - specifier: 0.5.0 - version: 0.5.0 + specifier: 1.0.0 + version: 1.0.0 '@clack/prompts': - specifier: 0.11.0 - version: 0.11.0 + specifier: 1.0.0 + version: 1.0.0 execa: specifier: ^9.6.1 version: 9.6.1 @@ -187,11 +187,11 @@ packages: '@changesets/write@0.4.0': resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==} - '@clack/core@0.5.0': - resolution: {integrity: sha512-p3y0FIOwaYRUPRcMO7+dlmLh8PSRcrjuTndsiA0WAFbWES0mLZlrjVoBRZ9DzkPFJZG6KGkJmoEAY0ZcVWTkow==} + '@clack/core@1.0.0': + resolution: {integrity: sha512-Orf9Ltr5NeiEuVJS8Rk2XTw3IxNC2Bic3ash7GgYeA8LJ/zmSNpSQ/m5UAhe03lA6KFgklzZ5KTHs4OAMA/SAQ==} - '@clack/prompts@0.11.0': - resolution: {integrity: sha512-pMN5FcrEw9hUkZA4f+zLlzivQSeQf5dRGJjSUbvVYDLvpKCdQx5OaknvKzgbtXOizhP+SJJJjqEbOe55uKKfAw==} + '@clack/prompts@1.0.0': + resolution: {integrity: sha512-rWPXg9UaCFqErJVQ+MecOaWsozjaxol4yjnmYcGNipAWzdaWa2x+VJmKfGq7L0APwBohQOYdHC+9RO4qRXej+A==} '@esbuild/aix-ppc64@0.27.2': resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} @@ -476,116 +476,139 @@ packages: resolution: {integrity: sha512-88I+D3TeKItrw+Y/2ud4Tw0+3CxQ2kLgu3QvrogZ0OfkmX/DEppehus7L3TS2Q4lpB+hYyxhkQiYPJ6Mf5/dPg==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-gnueabihf@4.55.1': resolution: {integrity: sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.34.9': resolution: {integrity: sha512-3qyfWljSFHi9zH0KgtEPG4cBXHDFhwD8kwg6xLfHQ0IWuH9crp005GfoUUh/6w9/FWGBwEHg3lxK1iHRN1MFlA==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm-musleabihf@4.55.1': resolution: {integrity: sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.34.9': resolution: {integrity: sha512-6TZjPHjKZUQKmVKMUowF3ewHxctrRR09eYyvT5eFv8w/fXarEra83A2mHTVJLA5xU91aCNOUnM+DWFMSbQ0Nxw==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-gnu@4.55.1': resolution: {integrity: sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.34.9': resolution: {integrity: sha512-LD2fytxZJZ6xzOKnMbIpgzFOuIKlxVOpiMAXawsAZ2mHBPEYOnLRK5TTEsID6z4eM23DuO88X0Tq1mErHMVq0A==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-musl@4.55.1': resolution: {integrity: sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-loong64-gnu@4.55.1': resolution: {integrity: sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==} cpu: [loong64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-loong64-musl@4.55.1': resolution: {integrity: sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==} cpu: [loong64] os: [linux] + libc: [musl] '@rollup/rollup-linux-loongarch64-gnu@4.34.9': resolution: {integrity: sha512-dRAgTfDsn0TE0HI6cmo13hemKpVHOEyeciGtvlBTkpx/F65kTvShtY/EVyZEIfxFkV5JJTuQ9tP5HGBS0hfxIg==} cpu: [loong64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-powerpc64le-gnu@4.34.9': resolution: {integrity: sha512-PHcNOAEhkoMSQtMf+rJofwisZqaU8iQ8EaSps58f5HYll9EAY5BSErCZ8qBDMVbq88h4UxaNPlbrKqfWP8RfJA==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-ppc64-gnu@4.55.1': resolution: {integrity: sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-ppc64-musl@4.55.1': resolution: {integrity: sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==} cpu: [ppc64] os: [linux] + libc: [musl] '@rollup/rollup-linux-riscv64-gnu@4.34.9': resolution: {integrity: sha512-Z2i0Uy5G96KBYKjeQFKbbsB54xFOL5/y1P5wNBsbXB8yE+At3oh0DVMjQVzCJRJSfReiB2tX8T6HUFZ2k8iaKg==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-gnu@4.55.1': resolution: {integrity: sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.55.1': resolution: {integrity: sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==} cpu: [riscv64] os: [linux] + libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.34.9': resolution: {integrity: sha512-U+5SwTMoeYXoDzJX5dhDTxRltSrIax8KWwfaaYcynuJw8mT33W7oOgz0a+AaXtGuvhzTr2tVKh5UO8GVANTxyQ==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-s390x-gnu@4.55.1': resolution: {integrity: sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.34.9': resolution: {integrity: sha512-FwBHNSOjUTQLP4MG7y6rR6qbGw4MFeQnIBrMe161QGaQoBQLqSUEKlHIiVgF3g/mb3lxlxzJOpIBhaP+C+KP2A==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.55.1': resolution: {integrity: sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.34.9': resolution: {integrity: sha512-cYRpV4650z2I3/s6+5/LONkjIz8MBeqrk+vPXV10ORBnshpn8S32bPqQ2Utv39jCiDcO2eJTuSlPXpnvmaIgRA==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-linux-x64-musl@4.55.1': resolution: {integrity: sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-openbsd-x64@4.55.1': resolution: {integrity: sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==} @@ -665,24 +688,28 @@ packages: engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [glibc] '@swc/core-linux-arm64-musl@1.5.5': resolution: {integrity: sha512-DkzJc13ukXa7oJpyn24BjIgsiOybYrc+IxjsQyfNlDrrs1QXP4elStcpkD02SsIuSyHjZV8Hw2HFBMQB3OHPrA==} engines: {node: '>=10'} cpu: [arm64] os: [linux] + libc: [musl] '@swc/core-linux-x64-gnu@1.5.5': resolution: {integrity: sha512-kj4ZwWJGeBEUzHrRQP2VudN+kkkYH7OI1dPVDc6kWQx5X4329JeKOas4qY0l7gDVjBbRwN9IbbPI6TIn2KfAug==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [glibc] '@swc/core-linux-x64-musl@1.5.5': resolution: {integrity: sha512-6pTorCs4mYhPhYtC4jNOnhGgjNd3DZcRoZ9P0tzXXP69aCbYjvlgNH/NRvAROp9AaVFeZ7a7PmCWb6+Rbe7NKg==} engines: {node: '>=10'} cpu: [x64] os: [linux] + libc: [musl] '@swc/core-win32-arm64-msvc@1.5.5': resolution: {integrity: sha512-o0/9pstmEjwZyrY/bA+mymF0zH7E+GT/XCVqdKeWW9Wn3gTTyWa5MZnrFgI2THQ+AXwdglMB/Zo76ARQPaz/+A==} @@ -732,14 +759,14 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@25.0.3': - resolution: {integrity: sha512-W609buLVRVmeW693xKfzHeIV6nJGGz98uCPfeXI1ELMLXVeKYZ9m15fAMSaUPBHYLGFsVRcMmSCksQOrZV9BYA==} + '@types/node@25.2.0': + resolution: {integrity: sha512-DZ8VwRFUNzuqJ5khrvwMXHmvPe+zGayJhr2CDNiKB1WBE1ST8Djl00D0IC4vvNmHMdj6DlbYRIaFE7WHjlDl5w==} - '@vitest/expect@4.0.16': - resolution: {integrity: sha512-eshqULT2It7McaJkQGLkPjPjNph+uevROGuIMJdG3V+0BSR2w9u6J9Lwu+E8cK5TETlfou8GRijhafIMhXsimA==} + '@vitest/expect@4.0.18': + resolution: {integrity: sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==} - '@vitest/mocker@4.0.16': - resolution: {integrity: sha512-yb6k4AZxJTB+q9ycAvsoxGn+j/po0UaPgajllBgt1PzoMAAmJGYFdDk0uCcRcxb3BrME34I6u8gHZTQlkqSZpg==} + '@vitest/mocker@4.0.18': + resolution: {integrity: sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==} peerDependencies: msw: ^2.4.9 vite: ^6.0.0 || ^7.0.0-0 @@ -749,20 +776,20 @@ packages: vite: optional: true - '@vitest/pretty-format@4.0.16': - resolution: {integrity: sha512-eNCYNsSty9xJKi/UdVD8Ou16alu7AYiS2fCPRs0b1OdhJiV89buAXQLpTbe+X8V9L6qrs9CqyvU7OaAopJYPsA==} + '@vitest/pretty-format@4.0.18': + resolution: {integrity: sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==} - '@vitest/runner@4.0.16': - resolution: {integrity: sha512-VWEDm5Wv9xEo80ctjORcTQRJ539EGPB3Pb9ApvVRAY1U/WkHXmmYISqU5E79uCwcW7xYUV38gwZD+RV755fu3Q==} + '@vitest/runner@4.0.18': + resolution: {integrity: sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==} - '@vitest/snapshot@4.0.16': - resolution: {integrity: sha512-sf6NcrYhYBsSYefxnry+DR8n3UV4xWZwWxYbCJUt2YdvtqzSPR7VfGrY0zsv090DAbjFZsi7ZaMi1KnSRyK1XA==} + '@vitest/snapshot@4.0.18': + resolution: {integrity: sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==} - '@vitest/spy@4.0.16': - resolution: {integrity: sha512-4jIOWjKP0ZUaEmJm00E0cOBLU+5WE0BpeNr3XN6TEF05ltro6NJqHWxXD0kA8/Zc8Nh23AT8WQxwNG+WeROupw==} + '@vitest/spy@4.0.18': + resolution: {integrity: sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==} - '@vitest/utils@4.0.16': - resolution: {integrity: sha512-h8z9yYhV3e1LEfaQ3zdypIrnAg/9hguReGZoS7Gl0aBG5xgA410zBqECqmaF/+RkTggRsfnzc1XaAHA6bmUufA==} + '@vitest/utils@4.0.18': + resolution: {integrity: sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -845,8 +872,8 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} - citty@0.1.6: - resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==} + citty@0.2.0: + resolution: {integrity: sha512-8csy5IBFI2ex2hTVpaHN2j+LNE199AgiI7y4dMintrr8i0lQiFn+0AWMZrWdHKIgMOer65f8IThysYhoReqjWA==} color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} @@ -862,10 +889,6 @@ packages: confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} - consola@3.2.3: - resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} - engines: {node: ^14.18.0 || >=16.10.0} - consola@3.4.0: resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} engines: {node: ^14.18.0 || >=16.10.0} @@ -1284,8 +1307,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.7.4: - resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==} + prettier@3.8.1: + resolution: {integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==} engines: {node: '>=14'} hasBin: true @@ -1484,38 +1507,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.7.3: - resolution: {integrity: sha512-aZHhvRiRHXbJw1EcEAq4aws1hsVVUZ9DPuSFaq9VVFAKCup7niIEwc22glxb7240yYEr1vLafdQ2U294Vcwz+w==} + turbo-darwin-64@2.8.1: + resolution: {integrity: sha512-FQ6Uqxty/H1Nvn1dpBe8KUlMRclTuiyNSc1PCeDL/ad7M9ykpWutB51YpMpf9ibTA32M6wLdIRf+D96W6hDAtQ==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.7.3: - resolution: {integrity: sha512-CkVrHSq+Bnhl9sX2LQgqQYVfLTWC2gvI74C4758OmU0djfrssDKU9d4YQF0AYXXhIIRZipSXfxClQziIMD+EAg==} + turbo-darwin-arm64@2.8.1: + resolution: {integrity: sha512-4bCcEpGP2/aSXmeN2gl5SuAmS1q5ykjubnFvSoXjQoCKtDOV+vc4CTl/DduZzUUutCVUWXjl8OyfIQ+DGCaV4A==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.7.3: - resolution: {integrity: sha512-GqDsCNnzzr89kMaLGpRALyigUklzgxIrSy2pHZVXyifgczvYPnLglex78Aj3T2gu+T3trPPH2iJ+pWucVOCC2Q==} + turbo-linux-64@2.8.1: + resolution: {integrity: sha512-m99JRlWlEgXPR7mkThAbKh6jbTmWSOXM/c6rt8yd4Uxh0+wjq7+DYcQbead6aoOqmCP9akswZ8EXIv1ogKBblg==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.7.3: - resolution: {integrity: sha512-NdCDTfIcIo3dWjsiaAHlxu5gW61Ed/8maah1IAF/9E3EtX0aAHNiBMbuYLZaR4vRJ7BeVkYB6xKWRtdFLZ0y3g==} + turbo-linux-arm64@2.8.1: + resolution: {integrity: sha512-AsPlza3AsavJdl2o7FE67qyv0aLfmT1XwFQGzvwpoAO6Bj7S4a03tpUchZKNuGjNAkKVProQRFnB7PgUAScFXA==} cpu: [arm64] os: [linux] - turbo-windows-64@2.7.3: - resolution: {integrity: sha512-7bVvO987daXGSJVYBoG8R4Q+csT1pKIgLJYZevXRQ0Hqw0Vv4mKme/TOjYXs9Qb1xMKh51Tb3bXKDbd8/4G08g==} + turbo-windows-64@2.8.1: + resolution: {integrity: sha512-GdqNO6bYShRsr79B+2G/2ssjLEp9uBTvLBJSWRtRCiac/SEmv8T6RYv9hu+h5oGbFALtnKNp6BQBw78RJURsPw==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.7.3: - resolution: {integrity: sha512-nTodweTbPmkvwMu/a55XvjMsPtuyUSC+sV7f/SR57K36rB2I0YG21qNETN+00LOTUW9B3omd8XkiXJkt4kx/cw==} + turbo-windows-arm64@2.8.1: + resolution: {integrity: sha512-n40E6IpkzrShRo3yMdRpgnn1/sAbGC6tZXwyNu8fe9RsufeD7KBiaoRSvw8xLyqV3pd2yoTL2rdCXq24MnTCWA==} cpu: [arm64] os: [win32] - turbo@2.7.3: - resolution: {integrity: sha512-+HjKlP4OfYk+qzvWNETA3cUO5UuK6b5MSc2UJOKyvBceKucQoQGb2g7HlC2H1GHdkfKrk4YF1VPvROkhVZDDLQ==} + turbo@2.8.1: + resolution: {integrity: sha512-pbSMlRflA0RAuk/0jnAt8pzOYh1+sKaT8nVtcs75OFGVWD0evleQRmKtHJJV42QOhaC3Hx9mUUSOom/irasbjA==} hasBin: true typescript@5.9.3: @@ -1577,18 +1600,18 @@ packages: yaml: optional: true - vitest@4.0.16: - resolution: {integrity: sha512-E4t7DJ9pESL6E3I8nFjPa4xGUd3PmiWDLsDztS2qXSJWfHtbQnwAWylaBvSNY48I3vr8PTqIZlyK8TE3V3CA4Q==} + vitest@4.0.18: + resolution: {integrity: sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.0.16 - '@vitest/browser-preview': 4.0.16 - '@vitest/browser-webdriverio': 4.0.16 - '@vitest/ui': 4.0.16 + '@vitest/browser-playwright': 4.0.18 + '@vitest/browser-preview': 4.0.18 + '@vitest/browser-webdriverio': 4.0.18 + '@vitest/ui': 4.0.18 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -1689,7 +1712,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.8(@types/node@25.0.3)': + '@changesets/cli@2.29.8(@types/node@25.2.0)': dependencies: '@changesets/apply-release-plan': 7.0.14 '@changesets/assemble-release-plan': 6.0.9 @@ -1705,7 +1728,7 @@ snapshots: '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@changesets/write': 0.4.0 - '@inquirer/external-editor': 1.0.3(@types/node@25.0.3) + '@inquirer/external-editor': 1.0.3(@types/node@25.2.0) '@manypkg/get-packages': 1.1.3 ansi-colors: 4.1.3 ci-info: 3.9.0 @@ -1804,14 +1827,14 @@ snapshots: human-id: 4.1.1 prettier: 2.8.8 - '@clack/core@0.5.0': + '@clack/core@1.0.0': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.11.0': + '@clack/prompts@1.0.0': dependencies: - '@clack/core': 0.5.0 + '@clack/core': 1.0.0 picocolors: 1.1.1 sisteransi: 1.0.5 @@ -1893,12 +1916,12 @@ snapshots: '@esbuild/win32-x64@0.27.2': optional: true - '@inquirer/external-editor@1.0.3(@types/node@25.0.3)': + '@inquirer/external-editor@1.0.3(@types/node@25.2.0)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 25.0.3 + '@types/node': 25.2.0 '@isaacs/cliui@8.0.2': dependencies: @@ -2170,47 +2193,47 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@25.0.3': + '@types/node@25.2.0': dependencies: undici-types: 7.16.0 - '@vitest/expect@4.0.16': + '@vitest/expect@4.0.18': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.2 - '@vitest/spy': 4.0.16 - '@vitest/utils': 4.0.16 + '@vitest/spy': 4.0.18 + '@vitest/utils': 4.0.18 chai: 6.2.2 tinyrainbow: 3.0.3 - '@vitest/mocker@4.0.16(vite@7.3.1(@types/node@25.0.3)(jiti@2.6.1))': + '@vitest/mocker@4.0.18(vite@7.3.1(@types/node@25.2.0)(jiti@2.6.1))': dependencies: - '@vitest/spy': 4.0.16 + '@vitest/spy': 4.0.18 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@25.0.3)(jiti@2.6.1) + vite: 7.3.1(@types/node@25.2.0)(jiti@2.6.1) - '@vitest/pretty-format@4.0.16': + '@vitest/pretty-format@4.0.18': dependencies: tinyrainbow: 3.0.3 - '@vitest/runner@4.0.16': + '@vitest/runner@4.0.18': dependencies: - '@vitest/utils': 4.0.16 + '@vitest/utils': 4.0.18 pathe: 2.0.3 - '@vitest/snapshot@4.0.16': + '@vitest/snapshot@4.0.18': dependencies: - '@vitest/pretty-format': 4.0.16 + '@vitest/pretty-format': 4.0.18 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@4.0.16': {} + '@vitest/spy@4.0.18': {} - '@vitest/utils@4.0.16': + '@vitest/utils@4.0.18': dependencies: - '@vitest/pretty-format': 4.0.16 + '@vitest/pretty-format': 4.0.18 tinyrainbow: 3.0.3 acorn@8.14.1: {} @@ -2270,9 +2293,7 @@ snapshots: ci-info@3.9.0: {} - citty@0.1.6: - dependencies: - consola: 3.2.3 + citty@0.2.0: {} color-convert@2.0.1: dependencies: @@ -2284,8 +2305,6 @@ snapshots: confbox@0.1.8: {} - consola@3.2.3: {} - consola@3.4.0: {} cross-spawn@7.0.3: @@ -2356,7 +2375,7 @@ snapshots: estree-walker@3.0.3: dependencies: - '@types/estree': 1.0.6 + '@types/estree': 1.0.8 execa@9.6.1: dependencies: @@ -2669,7 +2688,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.7.4: {} + prettier@3.8.1: {} pretty-ms@9.2.0: dependencies: @@ -2907,32 +2926,32 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.7.3: + turbo-darwin-64@2.8.1: optional: true - turbo-darwin-arm64@2.7.3: + turbo-darwin-arm64@2.8.1: optional: true - turbo-linux-64@2.7.3: + turbo-linux-64@2.8.1: optional: true - turbo-linux-arm64@2.7.3: + turbo-linux-arm64@2.8.1: optional: true - turbo-windows-64@2.7.3: + turbo-windows-64@2.8.1: optional: true - turbo-windows-arm64@2.7.3: + turbo-windows-arm64@2.8.1: optional: true - turbo@2.7.3: + turbo@2.8.1: optionalDependencies: - turbo-darwin-64: 2.7.3 - turbo-darwin-arm64: 2.7.3 - turbo-linux-64: 2.7.3 - turbo-linux-arm64: 2.7.3 - turbo-windows-64: 2.7.3 - turbo-windows-arm64: 2.7.3 + turbo-darwin-64: 2.8.1 + turbo-darwin-arm64: 2.8.1 + turbo-linux-64: 2.8.1 + turbo-linux-arm64: 2.8.1 + turbo-windows-64: 2.8.1 + turbo-windows-arm64: 2.8.1 typescript@5.9.3: {} @@ -2944,7 +2963,7 @@ snapshots: universalify@0.1.2: {} - vite@7.3.1(@types/node@25.0.3)(jiti@2.6.1): + vite@7.3.1(@types/node@25.2.0)(jiti@2.6.1): dependencies: esbuild: 0.27.2 fdir: 6.5.0(picomatch@4.0.3) @@ -2953,19 +2972,19 @@ snapshots: rollup: 4.55.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.0.3 + '@types/node': 25.2.0 fsevents: 2.3.3 jiti: 2.6.1 - vitest@4.0.16(@types/node@25.0.3)(jiti@2.6.1): + vitest@4.0.18(@types/node@25.2.0)(jiti@2.6.1): dependencies: - '@vitest/expect': 4.0.16 - '@vitest/mocker': 4.0.16(vite@7.3.1(@types/node@25.0.3)(jiti@2.6.1)) - '@vitest/pretty-format': 4.0.16 - '@vitest/runner': 4.0.16 - '@vitest/snapshot': 4.0.16 - '@vitest/spy': 4.0.16 - '@vitest/utils': 4.0.16 + '@vitest/expect': 4.0.18 + '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.2.0)(jiti@2.6.1)) + '@vitest/pretty-format': 4.0.18 + '@vitest/runner': 4.0.18 + '@vitest/snapshot': 4.0.18 + '@vitest/spy': 4.0.18 + '@vitest/utils': 4.0.18 es-module-lexer: 1.7.0 expect-type: 1.3.0 magic-string: 0.30.21 @@ -2977,10 +2996,10 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.15 tinyrainbow: 3.0.3 - vite: 7.3.1(@types/node@25.0.3)(jiti@2.6.1) + vite: 7.3.1(@types/node@25.2.0)(jiti@2.6.1) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 25.0.3 + '@types/node': 25.2.0 transitivePeerDependencies: - jiti - less From 5150334abd1fbb896a635f0154feb85c897776f9 Mon Sep 17 00:00:00 2001 From: Luc van Kampen Date: Tue, 17 Feb 2026 20:11:13 +0100 Subject: [PATCH 248/290] Fix getting started command when directory is "." --- packages/create/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 0114bc4..af18fcf 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -159,8 +159,8 @@ export const createSolid = (version: string) => // Next steps.. const pM = detectPackageManager(); p.note( - `cd ${projectName} -${pM.name} install + projectName === "." ? "" : `cd ${projectName}\n` + + `${pM.name} install ${pM.name} ${pM.runScriptCommand("dev")}`, "To get started, run:", ); From 5a3fe528f996fa581e6befd387105a18a0c6b455 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:33:08 +0000 Subject: [PATCH 249/290] chore: format --- packages/create/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index af18fcf..078c1a7 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -160,7 +160,7 @@ export const createSolid = (version: string) => const pM = detectPackageManager(); p.note( projectName === "." ? "" : `cd ${projectName}\n` + - `${pM.name} install + `${pM.name} install ${pM.name} ${pM.runScriptCommand("dev")}`, "To get started, run:", ); From c5714d0cde03f377e3e06f7b0cab7e31215179b3 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:34:00 +0000 Subject: [PATCH 250/290] chore: update dependencies --- package.json | 6 +- packages/create-solid/package.json | 4 +- packages/create/package.json | 4 +- packages/full-solid/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 176 ++++++++++++++--------------- 6 files changed, 100 insertions(+), 100 deletions(-) diff --git a/package.json b/package.json index 014b5fc..00545bf 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,16 @@ "./packages/*" ], "devDependencies": { - "@types/node": "25.2.0", + "@types/node": "25.2.3", "tsup": "^8.5.1", "typescript": "^5.9.3", "@changesets/cli": "2.29.8", "prettier": "^3.8.1", - "turbo": "^2.8.1", + "turbo": "^2.8.10", "vitest": "^4.0.18", "jiti": "^2.6.1" }, - "packageManager": "pnpm@10.28.2", + "packageManager": "pnpm@10.30.0", "pnpm": { "onlyBuiltDependencies": [ "@swc/core", diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 6e603a6..670edaf 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,9 +31,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "1.0.0", + "@clack/prompts": "1.0.1", "picocolors": "^1.1.1", - "citty": "^0.2.0", + "citty": "^0.2.1", "@solid-cli/create": "workspace:*" }, "publishConfig": { diff --git a/packages/create/package.json b/packages/create/package.json index ccd9958..231173e 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -40,10 +40,10 @@ "access": "public" }, "dependencies": { - "@clack/prompts": "1.0.0", + "@clack/prompts": "1.0.1", "picocolors": "^1.1.1", "@begit/core": "^0.3.3", - "citty": "^0.2.0", + "citty": "^0.2.1", "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" } diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 7181146..7707d3d 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,9 +30,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "1.0.0", + "@clack/prompts": "1.0.1", "picocolors": "^1.1.1", - "citty": "^0.2.0", + "citty": "^0.2.1", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index e16b805..719e675 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -67,14 +67,14 @@ "build": "tsc && tsup" }, "devDependencies": { - "magicast": "^0.5.1" + "magicast": "^0.5.2" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "1.0.0", - "@clack/prompts": "1.0.0", + "@clack/core": "1.0.1", + "@clack/prompts": "1.0.1", "execa": "^9.6.1", "picocolors": "^1.1.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9996a1..ed4b5e0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,10 +10,10 @@ importers: devDependencies: '@changesets/cli': specifier: 2.29.8 - version: 2.29.8(@types/node@25.2.0) + version: 2.29.8(@types/node@25.2.3) '@types/node': - specifier: 25.2.0 - version: 25.2.0 + specifier: 25.2.3 + version: 25.2.3 jiti: specifier: ^2.6.1 version: 2.6.1 @@ -24,14 +24,14 @@ importers: specifier: ^8.5.1 version: 8.5.1(@swc/core@1.5.5)(jiti@2.6.1)(postcss@8.5.6)(typescript@5.9.3) turbo: - specifier: ^2.8.1 - version: 2.8.1 + specifier: ^2.8.10 + version: 2.8.10 typescript: specifier: ^5.9.3 version: 5.9.3 vitest: specifier: ^4.0.18 - version: 4.0.18(@types/node@25.2.0)(jiti@2.6.1) + version: 4.0.18(@types/node@25.2.3)(jiti@2.6.1) packages/create: dependencies: @@ -39,14 +39,14 @@ importers: specifier: ^0.3.3 version: 0.3.3 '@clack/prompts': - specifier: 1.0.0 - version: 1.0.0 + specifier: 1.0.1 + version: 1.0.1 '@solid-cli/utils': specifier: workspace:* version: link:../utils citty: - specifier: ^0.2.0 - version: 0.2.0 + specifier: ^0.2.1 + version: 0.2.1 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -57,14 +57,14 @@ importers: packages/create-solid: devDependencies: '@clack/prompts': - specifier: 1.0.0 - version: 1.0.0 + specifier: 1.0.1 + version: 1.0.1 '@solid-cli/create': specifier: workspace:* version: link:../create citty: - specifier: ^0.2.0 - version: 0.2.0 + specifier: ^0.2.1 + version: 0.2.1 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -72,8 +72,8 @@ importers: packages/full-solid: devDependencies: '@clack/prompts': - specifier: 1.0.0 - version: 1.0.0 + specifier: 1.0.1 + version: 1.0.1 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -81,8 +81,8 @@ importers: specifier: workspace:* version: link:../utils citty: - specifier: ^0.2.0 - version: 0.2.0 + specifier: ^0.2.1 + version: 0.2.1 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -90,11 +90,11 @@ importers: packages/utils: dependencies: '@clack/core': - specifier: 1.0.0 - version: 1.0.0 + specifier: 1.0.1 + version: 1.0.1 '@clack/prompts': - specifier: 1.0.0 - version: 1.0.0 + specifier: 1.0.1 + version: 1.0.1 execa: specifier: ^9.6.1 version: 9.6.1 @@ -103,8 +103,8 @@ importers: version: 1.1.1 devDependencies: magicast: - specifier: ^0.5.1 - version: 0.5.1 + specifier: ^0.5.2 + version: 0.5.2 packages: @@ -116,8 +116,8 @@ packages: resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} - '@babel/parser@7.28.5': - resolution: {integrity: sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==} + '@babel/parser@7.29.0': + resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==} engines: {node: '>=6.0.0'} hasBin: true @@ -125,8 +125,8 @@ packages: resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==} engines: {node: '>=6.9.0'} - '@babel/types@7.28.5': - resolution: {integrity: sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==} + '@babel/types@7.29.0': + resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==} engines: {node: '>=6.9.0'} '@begit/core@0.3.3': @@ -187,11 +187,11 @@ packages: '@changesets/write@0.4.0': resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==} - '@clack/core@1.0.0': - resolution: {integrity: sha512-Orf9Ltr5NeiEuVJS8Rk2XTw3IxNC2Bic3ash7GgYeA8LJ/zmSNpSQ/m5UAhe03lA6KFgklzZ5KTHs4OAMA/SAQ==} + '@clack/core@1.0.1': + resolution: {integrity: sha512-WKeyK3NOBwDOzagPR5H08rFk9D/WuN705yEbuZvKqlkmoLM2woKtXb10OO2k1NoSU4SFG947i2/SCYh+2u5e4g==} - '@clack/prompts@1.0.0': - resolution: {integrity: sha512-rWPXg9UaCFqErJVQ+MecOaWsozjaxol4yjnmYcGNipAWzdaWa2x+VJmKfGq7L0APwBohQOYdHC+9RO4qRXej+A==} + '@clack/prompts@1.0.1': + resolution: {integrity: sha512-/42G73JkuYdyWZ6m8d/CJtBrGl1Hegyc7Fy78m5Ob+jF85TOUmLR5XLce/U3LxYAw0kJ8CT5aI99RIvPHcGp/Q==} '@esbuild/aix-ppc64@0.27.2': resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} @@ -759,8 +759,8 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@25.2.0': - resolution: {integrity: sha512-DZ8VwRFUNzuqJ5khrvwMXHmvPe+zGayJhr2CDNiKB1WBE1ST8Djl00D0IC4vvNmHMdj6DlbYRIaFE7WHjlDl5w==} + '@types/node@25.2.3': + resolution: {integrity: sha512-m0jEgYlYz+mDJZ2+F4v8D1AyQb+QzsNqRuI7xg1VQX/KlKS0qT9r1Mo16yo5F/MtifXFgaofIFsdFMox2SxIbQ==} '@vitest/expect@4.0.18': resolution: {integrity: sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==} @@ -872,8 +872,8 @@ packages: resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} engines: {node: '>=8'} - citty@0.2.0: - resolution: {integrity: sha512-8csy5IBFI2ex2hTVpaHN2j+LNE199AgiI7y4dMintrr8i0lQiFn+0AWMZrWdHKIgMOer65f8IThysYhoReqjWA==} + citty@0.2.1: + resolution: {integrity: sha512-kEV95lFBhQgtogAPlQfJJ0WGVSokvLr/UEoFPiKKOXF7pl98HfUVUD0ejsuTCld/9xH9vogSywZ5KqHzXrZpqg==} color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} @@ -1140,8 +1140,8 @@ packages: magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} - magicast@0.5.1: - resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==} + magicast@0.5.2: + resolution: {integrity: sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==} merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} @@ -1507,38 +1507,38 @@ packages: typescript: optional: true - turbo-darwin-64@2.8.1: - resolution: {integrity: sha512-FQ6Uqxty/H1Nvn1dpBe8KUlMRclTuiyNSc1PCeDL/ad7M9ykpWutB51YpMpf9ibTA32M6wLdIRf+D96W6hDAtQ==} + turbo-darwin-64@2.8.10: + resolution: {integrity: sha512-A03fXh+B7S8mL3PbdhTd+0UsaGrhfyPkODvzBDpKRY7bbeac4MDFpJ7I+Slf2oSkCEeSvHKR7Z4U71uKRUfX7g==} cpu: [x64] os: [darwin] - turbo-darwin-arm64@2.8.1: - resolution: {integrity: sha512-4bCcEpGP2/aSXmeN2gl5SuAmS1q5ykjubnFvSoXjQoCKtDOV+vc4CTl/DduZzUUutCVUWXjl8OyfIQ+DGCaV4A==} + turbo-darwin-arm64@2.8.10: + resolution: {integrity: sha512-sidzowgWL3s5xCHLeqwC9M3s9M0i16W1nuQF3Mc7fPHpZ+YPohvcbVFBB2uoRRHYZg6yBnwD4gyUHKTeXfwtXA==} cpu: [arm64] os: [darwin] - turbo-linux-64@2.8.1: - resolution: {integrity: sha512-m99JRlWlEgXPR7mkThAbKh6jbTmWSOXM/c6rt8yd4Uxh0+wjq7+DYcQbead6aoOqmCP9akswZ8EXIv1ogKBblg==} + turbo-linux-64@2.8.10: + resolution: {integrity: sha512-YK9vcpL3TVtqonB021XwgaQhY9hJJbKKUhLv16osxV0HkcQASQWUqR56yMge7puh6nxU67rQlTq1b7ksR1T3KA==} cpu: [x64] os: [linux] - turbo-linux-arm64@2.8.1: - resolution: {integrity: sha512-AsPlza3AsavJdl2o7FE67qyv0aLfmT1XwFQGzvwpoAO6Bj7S4a03tpUchZKNuGjNAkKVProQRFnB7PgUAScFXA==} + turbo-linux-arm64@2.8.10: + resolution: {integrity: sha512-3+j2tL0sG95iBJTm+6J8/45JsETQABPqtFyYjVjBbi6eVGdtNTiBmHNKrbvXRlQ3ZbUG75bKLaSSDHSEEN+btQ==} cpu: [arm64] os: [linux] - turbo-windows-64@2.8.1: - resolution: {integrity: sha512-GdqNO6bYShRsr79B+2G/2ssjLEp9uBTvLBJSWRtRCiac/SEmv8T6RYv9hu+h5oGbFALtnKNp6BQBw78RJURsPw==} + turbo-windows-64@2.8.10: + resolution: {integrity: sha512-hdeF5qmVY/NFgiucf8FW0CWJWtyT2QPm5mIsX0W1DXAVzqKVXGq+Zf+dg4EUngAFKjDzoBeN6ec2Fhajwfztkw==} cpu: [x64] os: [win32] - turbo-windows-arm64@2.8.1: - resolution: {integrity: sha512-n40E6IpkzrShRo3yMdRpgnn1/sAbGC6tZXwyNu8fe9RsufeD7KBiaoRSvw8xLyqV3pd2yoTL2rdCXq24MnTCWA==} + turbo-windows-arm64@2.8.10: + resolution: {integrity: sha512-QGdr/Q8LWmj+ITMkSvfiz2glf0d7JG0oXVzGL3jxkGqiBI1zXFj20oqVY0qWi+112LO9SVrYdpHS0E/oGFrMbQ==} cpu: [arm64] os: [win32] - turbo@2.8.1: - resolution: {integrity: sha512-pbSMlRflA0RAuk/0jnAt8pzOYh1+sKaT8nVtcs75OFGVWD0evleQRmKtHJJV42QOhaC3Hx9mUUSOom/irasbjA==} + turbo@2.8.10: + resolution: {integrity: sha512-OxbzDES66+x7nnKGg2MwBA1ypVsZoDTLHpeaP4giyiHSixbsiTaMyeJqbEyvBdp5Cm28fc+8GG6RdQtic0ijwQ==} hasBin: true typescript@5.9.3: @@ -1666,15 +1666,15 @@ snapshots: '@babel/helper-validator-identifier@7.28.5': {} - '@babel/parser@7.28.5': + '@babel/parser@7.29.0': dependencies: - '@babel/types': 7.28.5 + '@babel/types': 7.29.0 '@babel/runtime@7.26.0': dependencies: regenerator-runtime: 0.14.1 - '@babel/types@7.28.5': + '@babel/types@7.29.0': dependencies: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 @@ -1712,7 +1712,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.8(@types/node@25.2.0)': + '@changesets/cli@2.29.8(@types/node@25.2.3)': dependencies: '@changesets/apply-release-plan': 7.0.14 '@changesets/assemble-release-plan': 6.0.9 @@ -1728,7 +1728,7 @@ snapshots: '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@changesets/write': 0.4.0 - '@inquirer/external-editor': 1.0.3(@types/node@25.2.0) + '@inquirer/external-editor': 1.0.3(@types/node@25.2.3) '@manypkg/get-packages': 1.1.3 ansi-colors: 4.1.3 ci-info: 3.9.0 @@ -1827,14 +1827,14 @@ snapshots: human-id: 4.1.1 prettier: 2.8.8 - '@clack/core@1.0.0': + '@clack/core@1.0.1': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@1.0.0': + '@clack/prompts@1.0.1': dependencies: - '@clack/core': 1.0.0 + '@clack/core': 1.0.1 picocolors: 1.1.1 sisteransi: 1.0.5 @@ -1916,12 +1916,12 @@ snapshots: '@esbuild/win32-x64@0.27.2': optional: true - '@inquirer/external-editor@1.0.3(@types/node@25.2.0)': + '@inquirer/external-editor@1.0.3(@types/node@25.2.3)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 25.2.0 + '@types/node': 25.2.3 '@isaacs/cliui@8.0.2': dependencies: @@ -2193,7 +2193,7 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@25.2.0': + '@types/node@25.2.3': dependencies: undici-types: 7.16.0 @@ -2206,13 +2206,13 @@ snapshots: chai: 6.2.2 tinyrainbow: 3.0.3 - '@vitest/mocker@4.0.18(vite@7.3.1(@types/node@25.2.0)(jiti@2.6.1))': + '@vitest/mocker@4.0.18(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1))': dependencies: '@vitest/spy': 4.0.18 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@25.2.0)(jiti@2.6.1) + vite: 7.3.1(@types/node@25.2.3)(jiti@2.6.1) '@vitest/pretty-format@4.0.18': dependencies: @@ -2293,7 +2293,7 @@ snapshots: ci-info@3.9.0: {} - citty@0.2.0: {} + citty@0.2.1: {} color-convert@2.0.1: dependencies: @@ -2562,10 +2562,10 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 - magicast@0.5.1: + magicast@0.5.2: dependencies: - '@babel/parser': 7.28.5 - '@babel/types': 7.28.5 + '@babel/parser': 7.29.0 + '@babel/types': 7.29.0 source-map-js: 1.2.1 merge2@1.4.1: {} @@ -2926,32 +2926,32 @@ snapshots: - tsx - yaml - turbo-darwin-64@2.8.1: + turbo-darwin-64@2.8.10: optional: true - turbo-darwin-arm64@2.8.1: + turbo-darwin-arm64@2.8.10: optional: true - turbo-linux-64@2.8.1: + turbo-linux-64@2.8.10: optional: true - turbo-linux-arm64@2.8.1: + turbo-linux-arm64@2.8.10: optional: true - turbo-windows-64@2.8.1: + turbo-windows-64@2.8.10: optional: true - turbo-windows-arm64@2.8.1: + turbo-windows-arm64@2.8.10: optional: true - turbo@2.8.1: + turbo@2.8.10: optionalDependencies: - turbo-darwin-64: 2.8.1 - turbo-darwin-arm64: 2.8.1 - turbo-linux-64: 2.8.1 - turbo-linux-arm64: 2.8.1 - turbo-windows-64: 2.8.1 - turbo-windows-arm64: 2.8.1 + turbo-darwin-64: 2.8.10 + turbo-darwin-arm64: 2.8.10 + turbo-linux-64: 2.8.10 + turbo-linux-arm64: 2.8.10 + turbo-windows-64: 2.8.10 + turbo-windows-arm64: 2.8.10 typescript@5.9.3: {} @@ -2963,7 +2963,7 @@ snapshots: universalify@0.1.2: {} - vite@7.3.1(@types/node@25.2.0)(jiti@2.6.1): + vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1): dependencies: esbuild: 0.27.2 fdir: 6.5.0(picomatch@4.0.3) @@ -2972,14 +2972,14 @@ snapshots: rollup: 4.55.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.2.0 + '@types/node': 25.2.3 fsevents: 2.3.3 jiti: 2.6.1 - vitest@4.0.18(@types/node@25.2.0)(jiti@2.6.1): + vitest@4.0.18(@types/node@25.2.3)(jiti@2.6.1): dependencies: '@vitest/expect': 4.0.18 - '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.2.0)(jiti@2.6.1)) + '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)) '@vitest/pretty-format': 4.0.18 '@vitest/runner': 4.0.18 '@vitest/snapshot': 4.0.18 @@ -2996,10 +2996,10 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.15 tinyrainbow: 3.0.3 - vite: 7.3.1(@types/node@25.2.0)(jiti@2.6.1) + vite: 7.3.1(@types/node@25.2.3)(jiti@2.6.1) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 25.2.0 + '@types/node': 25.2.3 transitivePeerDependencies: - jiti - less From 535971b77efb6364c341c1da1b3e3947234d503e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 19 Feb 2026 00:27:22 +0000 Subject: [PATCH 251/290] chore: update `begit` --- packages/create/package.json | 2 +- pnpm-lock.yaml | 44 +++++++++++------------------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/packages/create/package.json b/packages/create/package.json index 231173e..44581d4 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -42,7 +42,7 @@ "dependencies": { "@clack/prompts": "1.0.1", "picocolors": "^1.1.1", - "@begit/core": "^0.3.3", + "@begit/core": "^0.3.4", "citty": "^0.2.1", "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed4b5e0..a81c3eb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ importers: packages/create: dependencies: '@begit/core': - specifier: ^0.3.3 - version: 0.3.3 + specifier: ^0.3.4 + version: 0.3.4 '@clack/prompts': specifier: 1.0.1 version: 1.0.1 @@ -129,8 +129,8 @@ packages: resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==} engines: {node: '>=6.9.0'} - '@begit/core@0.3.3': - resolution: {integrity: sha512-ekoNr/hsoK71NYDEI0dffMAGPJWUh1Uiu4Zlp7lBtFN3gTmdUOV9HQssxkTE88440whM7ES5WKiokKw+cNqUqg==} + '@begit/core@0.3.4': + resolution: {integrity: sha512-vW4xQ51uXYB6apjY3Y1RkfHpTcyYpV2v+eb2ndEvF9HnJlGbkKmXQYCGlQd2SfLKBQJk5GDic0xwxA8japdTuw==} '@changesets/apply-release-plan@7.0.14': resolution: {integrity: sha512-ddBvf9PHdy2YY0OUiEl3TV78mH9sckndJR14QAt87KLEbIov81XO0q0QAmvooBxXlqRRP8I9B7XOzZwQG7JkWA==} @@ -1163,15 +1163,10 @@ packages: resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==} engines: {node: '>=16 || 14 >=14.17'} - minizlib@3.0.1: - resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==} + minizlib@3.1.0: + resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==} engines: {node: '>= 18'} - mkdirp@3.0.1: - resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} - engines: {node: '>=10'} - hasBin: true - mlly@1.7.4: resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==} @@ -1338,11 +1333,6 @@ packages: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rimraf@5.0.5: - resolution: {integrity: sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==} - engines: {node: '>=14'} - hasBin: true - rollup@4.34.9: resolution: {integrity: sha512-nF5XYqWWp9hx/LrpC8sZvvvmq0TeTjQgaZHYmAgwysT9nh8sWnZhBnM8ZyVbbJFIQBLwHDNoMqsBZBbUo4U8sQ==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -1440,8 +1430,8 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - tar@7.4.3: - resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==} + tar@7.5.9: + resolution: {integrity: sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==} engines: {node: '>=18'} term-size@2.2.1: @@ -1679,9 +1669,9 @@ snapshots: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 - '@begit/core@0.3.3': + '@begit/core@0.3.4': dependencies: - tar: 7.4.3 + tar: 7.5.9 '@changesets/apply-release-plan@7.0.14': dependencies: @@ -2583,12 +2573,9 @@ snapshots: minipass@7.1.2: {} - minizlib@3.0.1: + minizlib@3.1.0: dependencies: minipass: 7.1.2 - rimraf: 5.0.5 - - mkdirp@3.0.1: {} mlly@1.7.4: dependencies: @@ -2711,10 +2698,6 @@ snapshots: reusify@1.0.4: {} - rimraf@5.0.5: - dependencies: - glob: 10.3.10 - rollup@4.34.9: dependencies: '@types/estree': 1.0.6 @@ -2852,13 +2835,12 @@ snapshots: tinyglobby: 0.2.15 ts-interface-checker: 0.1.13 - tar@7.4.3: + tar@7.5.9: dependencies: '@isaacs/fs-minipass': 4.0.0 chownr: 3.0.0 minipass: 7.1.2 - minizlib: 3.0.1 - mkdirp: 3.0.1 + minizlib: 3.1.0 yallist: 5.0.0 term-size@2.2.1: {} From 7b06f5df93b166469c92bcdf59b228073300280d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 19 Feb 2026 14:26:30 +0000 Subject: [PATCH 252/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 8 ++++++++ packages/create/package.json | 2 +- packages/full-solid/CHANGELOG.md | 6 ++++++ packages/full-solid/package.json | 2 +- packages/utils/CHANGELOG.md | 6 ++++++ packages/utils/package.json | 2 +- 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 764c3b3..df1d14b 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.12 + +### Patch Changes + +- Update dependencies, add new template, and remove `cd` command if project is created in working directory + ## 0.6.11 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index 670edaf..fd6b53d 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.11", + "version": "0.6.12", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 0c90750..44daa6f 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,13 @@ # @solid-cli/create +## 0.6.12 + +### Patch Changes + +- Update dependencies, add new template, and remove `cd` command if project is created in working directory +- Updated dependencies + - @solid-cli/utils@0.6.2 + ## 0.6.11 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index 44581d4..e547bfa 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.11", + "version": "0.6.12", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/CHANGELOG.md b/packages/full-solid/CHANGELOG.md index 82d25df..8d2d90e 100644 --- a/packages/full-solid/CHANGELOG.md +++ b/packages/full-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/full +## 0.6.3 + +### Patch Changes + +- Update dependencies, add new template, and remove `cd` command if project is created in working directory + ## 0.6.1 ### Patch Changes diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 7707d3d..f79171a 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.2", + "version": "0.6.3", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 329d0b3..ba99c2d 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,3 +1,9 @@ # @solid-cli/utils +## 0.6.2 + +### Patch Changes + +- Update dependencies + ## 0.6.0 diff --git a/packages/utils/package.json b/packages/utils/package.json index 719e675..4196273 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.6.1", + "version": "0.6.2", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From 962d9b9fc031d0d74db7484ccd4ff587ed93ed14 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 19 Feb 2026 14:31:01 +0000 Subject: [PATCH 253/290] fix: keep displaying other commands when project is initialised in working directory --- packages/create/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 078c1a7..525d048 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -159,7 +159,7 @@ export const createSolid = (version: string) => // Next steps.. const pM = detectPackageManager(); p.note( - projectName === "." ? "" : `cd ${projectName}\n` + + (projectName === "." ? "" : `cd ${projectName}\n`) + `${pM.name} install ${pM.name} ${pM.runScriptCommand("dev")}`, "To get started, run:", From e2e2f7d3b5421385a0a6eba7e3c7da45f7cd9e92 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Thu, 19 Feb 2026 14:35:11 +0000 Subject: [PATCH 254/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index df1d14b..3ae4603 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.13 + +### Patch Changes + +- Keep showing `pnpm install` & `pnpm dev` commands when initialising a project in the current working directory + ## 0.6.12 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index fd6b53d..e001d51 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.12", + "version": "0.6.13", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 44daa6f..a45bd6d 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.6.13 + +### Patch Changes + +- Keep showing `pnpm install` & `pnpm dev` commands when initialising a project in the current working directory + ## 0.6.12 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index e547bfa..e144241 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.12", + "version": "0.6.13", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 28cb5dd522850a1f186f0df1ff2b8a0a5be52fc3 Mon Sep 17 00:00:00 2001 From: Atila Fassina Date: Sun, 15 Mar 2026 01:03:49 +0100 Subject: [PATCH 255/290] add support for v2 CLI flag --- packages/create/src/create-start.ts | 19 +++++---- packages/create/src/index.ts | 59 ++++++++++++++++++++------ packages/create/src/utils/constants.ts | 44 +++++++++++++++---- 3 files changed, 91 insertions(+), 31 deletions(-) diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index cde6000..90c3fc1 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -2,35 +2,36 @@ import { downloadRepo, GithubFetcher } from "@begit/core"; import { join } from "path"; import { writeFileSync } from "fs"; import { handleTSConversion } from "./utils/ts-conversion"; -import { GIT_IGNORE, StartTemplate } from "./utils/constants"; +import { GIT_IGNORE, StartTemplate, StartTemplateV2 } from "./utils/constants"; export type CreateStartArgs = { - template: StartTemplate; + template: StartTemplate | StartTemplateV2; destination: string; }; -export const createStartTS = ({ template, destination }: CreateStartArgs) => { +export const createStartTS = ({ template, destination }: CreateStartArgs, v2?: boolean) => { + const subdir = v2 ? `solid-start/v2/${template}` : `solid-start/${template}`; return downloadRepo( { - repo: { owner: "solidjs", name: "templates", subdir: `solid-start/${template}` }, + repo: { owner: "solidjs", name: "templates", subdir }, dest: destination, }, GithubFetcher, ); }; -export const createStartJS = async ({ template, destination }: CreateStartArgs) => { +export const createStartJS = async ({ template, destination }: CreateStartArgs, v2?: boolean) => { // Create typescript project in `/.project` // then transpile this to javascript and clean up const tempDir = join(destination, ".project"); - await createStartTS({ template, destination: tempDir }); + await createStartTS({ template, destination: tempDir }, v2); await handleTSConversion(tempDir, destination); // Add .gitignore writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); }; -export const createStart = (args: CreateStartArgs, transpile?: boolean) => { +export const createStart = (args: CreateStartArgs, transpile?: boolean, v2?: boolean) => { if (transpile) { - return createStartJS(args); + return createStartJS(args, v2); } - return createStartTS(args); + return createStartTS(args, v2); }; diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 525d048..fad16b6 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -3,13 +3,7 @@ import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "@solid-cli/utils/ui"; import { createStart } from "./create-start"; -import { - getTemplatesList, - GIT_IGNORE, - isValidTemplate, - PROJECT_TYPES, - ProjectType, -} from "./utils/constants"; +import { getTemplatesList, GIT_IGNORE, isValidTemplate, PROJECT_TYPES, ProjectType } from "./utils/constants"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; import { existsSync, writeFileSync } from "node:fs"; import { join } from "node:path"; @@ -53,6 +47,11 @@ export const createSolid = (version: string) => alias: "s", description: "Create a SolidStart project", }, + "v2": { + type: "boolean", + required: false, + description: "Create a SolidStart v2 project", + }, "library": { type: "boolean", required: false, @@ -87,12 +86,19 @@ export const createSolid = (version: string) => vanilla, ts, js, + v2, }, }) { // Show prompts for any unknown arguments let projectName = projectNamePositional ?? projectNameOptional; let template = templatePositional ?? templateOptional; - let projectType: ProjectType | undefined = solidstart ? "start" : (vanilla ? "vanilla" : (library ? "library" : undefined)); + let projectType: ProjectType | undefined = solidstart + ? "start" + : vanilla + ? "vanilla" + : library + ? "library" + : undefined; // False if user has selected ts, true if they have selected js, and undefined if they've done neither let useJS = ts ? !ts : js ? js : undefined; projectName ??= await cancelable( @@ -108,10 +114,30 @@ export const createSolid = (version: string) => })), }), ); + if (!projectType) return; + + let useV2: string | undefined; + if (projectType === "start") { + useV2 = v2 + ? "v2" + : await cancelable( + p.select({ + message: "Which version of SolidStart?", + initialValue: "v2", + options: [ + { value: "v2", label: "v2 (pre-release, recommended)" }, + { value: "v1", label: "v1 (stable)" }, + ], + }), + ); + } + const isV2 = useV2 === "v2"; + // Don't offer javascript if `projectType` is library useJS ??= projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); - const template_opts = getTemplatesList(projectType); + if (!projectType) return; + const template_opts = getTemplatesList(projectType, isV2); template ??= await cancelable( p.select({ message: "Which template would you like to use?", @@ -122,13 +148,15 @@ export const createSolid = (version: string) => }), ); + if (!template) return; + // Need to transpile if the user wants Jabascript, but their selected template isn't Javascript const transpileToJS = useJS && !template.startsWith("js"); - if (projectType === "start" && isValidTemplate("start", template)) { + if (projectType === "start" && isValidTemplate("start", template, isV2)) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createStart({ template, destination: projectName }, transpileToJS), + fn: () => createStart({ template, destination: projectName }, transpileToJS, isV2), }); } else if (projectType === "library" && isValidTemplate("library", template)) { await spinnerify({ @@ -142,8 +170,7 @@ export const createSolid = (version: string) => finishText: "Project created 🎉", fn: () => createVanilla({ template, destination: projectName }, transpileToJS), }); - } - else { + } else { p.log.error(`Template ${template} is not valid for project type ${projectType}`); process.exit(0); } @@ -154,7 +181,11 @@ export const createSolid = (version: string) => if (existsSync(readmePath)) { const contents = (await readFile(readmePath)).toString(); if (!contents.includes("This project was created with the [Solid CLI]")) - await writeFile(readmePath, contents + "\n## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)\n") + await writeFile( + readmePath, + contents + + "\n## This project was created with the [Solid CLI](https://github.com/solidjs-community/solid-cli)\n", + ); } // Next steps.. const pM = detectPackageManager(); diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index b886591..4d49568 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -83,6 +83,24 @@ const START_TEMPLATES = [ export type StartTemplate = (typeof START_TEMPLATES)[number]; +const START_TEMPLATES_V2 = [ + "basic", + "bare", + "hackernews", + "notes", + "with-auth", + "with-drizzle", + "with-mdx", + "with-prisma", + "with-solid-styled", + "with-tailwindcss", + "with-trpc", + "with-unocss", + "with-vitest", +] as const satisfies string[]; + +export type StartTemplateV2 = (typeof START_TEMPLATES_V2)[number]; + /**Supported Library Templates */ export const LIBRARY_TEMPLATES = ["solid-lib-starter"] as const satisfies string[]; export type LibraryTemplate = (typeof LIBRARY_TEMPLATES)[number]; @@ -94,12 +112,18 @@ export type ProjectType = (typeof PROJECT_TYPES)[number]; * Fetches the template list for the project type given * @param projectType type of project */ -export function getTemplatesList(projectType: "vanilla"): StartTemplate[]; -export function getTemplatesList(projectType: "start"): VanillaTemplate[]; -export function getTemplatesList(projectType: "library"): VanillaTemplate[]; -export function getTemplatesList(projectType: ProjectType): VanillaTemplate[] | StartTemplate[] | LibraryTemplate[]; -export function getTemplatesList(projectType: ProjectType) { +export function getTemplatesList(projectType: "vanilla", v2?: boolean): VanillaTemplate[]; +export function getTemplatesList(projectType: "start", v2?: boolean): StartTemplate[] | StartTemplateV2[]; +export function getTemplatesList(projectType: "library", v2?: boolean): LibraryTemplate[]; +export function getTemplatesList( + projectType: ProjectType, + v2?: boolean, +): VanillaTemplate[] | StartTemplate[] | StartTemplateV2[] | LibraryTemplate[]; +export function getTemplatesList(projectType: ProjectType, v2?: boolean) { if (projectType === "start") { + if (v2) { + return START_TEMPLATES_V2 as unknown as StartTemplateV2[]; + } return START_TEMPLATES as StartTemplate[]; } else if (projectType === "library") { return LIBRARY_TEMPLATES as LibraryTemplate[]; @@ -114,9 +138,13 @@ export function getTemplatesList(projectType: ProjectType) { * @returns the template string if it is valid, undefined if not */ export function isValidTemplate(type: "vanilla", maybe_template: string): maybe_template is VanillaTemplate; -export function isValidTemplate(type: "start", maybe_template: string): maybe_template is StartTemplate; +export function isValidTemplate( + type: "start", + maybe_template: string, + v2?: boolean, +): maybe_template is StartTemplate | StartTemplateV2; export function isValidTemplate(type: "library", maybe_template: string): maybe_template is LibraryTemplate; -export function isValidTemplate(type: ProjectType, maybe_template: string) { - const templates = getTemplatesList(type); +export function isValidTemplate(type: ProjectType, maybe_template: string, v2?: boolean) { + const templates = getTemplatesList(type, v2); return templates.find((t) => t === maybe_template) !== undefined; } From d4c6015aede8cbf3afcf23802dad5b206392e765 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 17 Mar 2026 13:46:18 +0000 Subject: [PATCH 256/290] fix: update URLs where start projects are fetched from --- packages/create/src/create-start.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index 90c3fc1..579f4dc 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -9,7 +9,7 @@ export type CreateStartArgs = { }; export const createStartTS = ({ template, destination }: CreateStartArgs, v2?: boolean) => { - const subdir = v2 ? `solid-start/v2/${template}` : `solid-start/${template}`; + const subdir = v2 ? `solid-start-v2/${template}` : `solid-start-v1/${template}`; return downloadRepo( { repo: { owner: "solidjs", name: "templates", subdir }, From d4e3d1dc68da9c19efbd069b55e35c3d36915598 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:33:45 +0100 Subject: [PATCH 257/290] chore: update to pnpm 11 --- package.json | 8 +------- pnpm-workspace.yaml | 5 ++++- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 00545bf..afc3f01 100644 --- a/package.json +++ b/package.json @@ -40,11 +40,5 @@ "vitest": "^4.0.18", "jiti": "^2.6.1" }, - "packageManager": "pnpm@10.30.0", - "pnpm": { - "onlyBuiltDependencies": [ - "@swc/core", - "esbuild" - ] - } + "packageManager": "pnpm@11.5.1+sha512.93f7b57422ea7068257235b4c16eb60762eb68e1dc23723199cc739043ea9be2c4143274a399d8c6defa2b1176226d9ca1c4b63482d6200c1a8fbaa78c1d1485" } diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b2f187c..b8ee828 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,5 @@ packages: - - packages/* \ No newline at end of file + - packages/* +allowBuilds: + '@swc/core': true + esbuild: true From 8a54329dd250dc959dccb77a8e0f5b532972891b Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:41:24 +0100 Subject: [PATCH 258/290] chore: upgrade to typescript 6 --- package.json | 14 +- packages/create/tsconfig.json | 3 +- packages/full-solid/tsconfig.json | 4 +- packages/utils/tsconfig.json | 1 + pnpm-lock.yaml | 440 +++++++++++++++--------------- 5 files changed, 226 insertions(+), 236 deletions(-) diff --git a/package.json b/package.json index afc3f01..cb8cdff 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,14 @@ "./packages/*" ], "devDependencies": { - "@types/node": "25.2.3", + "@types/node": "25.9.1", "tsup": "^8.5.1", - "typescript": "^5.9.3", - "@changesets/cli": "2.29.8", - "prettier": "^3.8.1", - "turbo": "^2.8.10", - "vitest": "^4.0.18", - "jiti": "^2.6.1" + "typescript": "^6.0.3", + "@changesets/cli": "2.31.0", + "prettier": "^3.8.3", + "turbo": "^2.9.16", + "vitest": "^4.1.8", + "jiti": "^2.7.0" }, "packageManager": "pnpm@11.5.1+sha512.93f7b57422ea7068257235b4c16eb60762eb68e1dc23723199cc739043ea9be2c4143274a399d8c6defa2b1176226d9ca1c4b63482d6200c1a8fbaa78c1d1485" } diff --git a/packages/create/tsconfig.json b/packages/create/tsconfig.json index 51a5a37..71194f0 100644 --- a/packages/create/tsconfig.json +++ b/packages/create/tsconfig.json @@ -8,9 +8,10 @@ "forceConsistentCasingInFileNames": true, "skipLibCheck": true, "resolveJsonModule": true, - + "types": ["node"], "declaration": true, "emitDeclarationOnly": true, + "rootDir": ".", "outDir": "types" }, "include": ["src/*"] diff --git a/packages/full-solid/tsconfig.json b/packages/full-solid/tsconfig.json index 55a0135..b354b62 100644 --- a/packages/full-solid/tsconfig.json +++ b/packages/full-solid/tsconfig.json @@ -1,6 +1,5 @@ { "compilerOptions": { - "baseUrl": ".", "noEmit": true, "module": "ESNext", "target": "ESNext", @@ -9,7 +8,8 @@ "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "skipLibCheck": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "types": ["node"] }, "include": ["src/*"] } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 31a361a..3ecd183 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -15,6 +15,7 @@ "noUnusedLocals": true, "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, + "rootDir": ".", "outDir": "types", "declarationMap": true }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a81c3eb..243666d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,29 +9,29 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.29.8 - version: 2.29.8(@types/node@25.2.3) + specifier: 2.31.0 + version: 2.31.0(@types/node@25.9.1) '@types/node': - specifier: 25.2.3 - version: 25.2.3 + specifier: 25.9.1 + version: 25.9.1 jiti: - specifier: ^2.6.1 - version: 2.6.1 + specifier: ^2.7.0 + version: 2.7.0 prettier: - specifier: ^3.8.1 - version: 3.8.1 + specifier: ^3.8.3 + version: 3.8.3 tsup: specifier: ^8.5.1 - version: 8.5.1(@swc/core@1.5.5)(jiti@2.6.1)(postcss@8.5.6)(typescript@5.9.3) + version: 8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@6.0.3) turbo: - specifier: ^2.8.10 - version: 2.8.10 + specifier: ^2.9.16 + version: 2.9.16 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^6.0.3 + version: 6.0.3 vitest: - specifier: ^4.0.18 - version: 4.0.18(@types/node@25.2.3)(jiti@2.6.1) + specifier: ^4.1.8 + version: 4.1.8(@types/node@25.9.1)(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0)) packages/create: dependencies: @@ -132,30 +132,30 @@ packages: '@begit/core@0.3.4': resolution: {integrity: sha512-vW4xQ51uXYB6apjY3Y1RkfHpTcyYpV2v+eb2ndEvF9HnJlGbkKmXQYCGlQd2SfLKBQJk5GDic0xwxA8japdTuw==} - '@changesets/apply-release-plan@7.0.14': - resolution: {integrity: sha512-ddBvf9PHdy2YY0OUiEl3TV78mH9sckndJR14QAt87KLEbIov81XO0q0QAmvooBxXlqRRP8I9B7XOzZwQG7JkWA==} + '@changesets/apply-release-plan@7.1.1': + resolution: {integrity: sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==} - '@changesets/assemble-release-plan@6.0.9': - resolution: {integrity: sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==} + '@changesets/assemble-release-plan@6.0.10': + resolution: {integrity: sha512-rSDcqdJ9KbVyjpBIuCidhvZNIiVt1XaIYp73ycVQRIA5n/j6wQaEk0ChRLMUQ1vkxZe51PTQ9OIhbg6HQMW45A==} '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.29.8': - resolution: {integrity: sha512-1weuGZpP63YWUYjay/E84qqwcnt5yJMM0tep10Up7Q5cS/DGe2IZ0Uj3HNMxGhCINZuR7aO9WBMdKnPit5ZDPA==} + '@changesets/cli@2.31.0': + resolution: {integrity: sha512-AhI4enNTgHu2IZr6K4WZyf0EPch4XVMn1yOMFmCD9gsfBGqMYaHXls5HyDv6/CL5axVQABz68eG30eCtbr2wFg==} hasBin: true - '@changesets/config@3.1.2': - resolution: {integrity: sha512-CYiRhA4bWKemdYi/uwImjPxqWNpqGPNbEBdX1BdONALFIDK7MCUj6FPkzD+z9gJcvDFUQJn9aDVf4UG7OT6Kog==} + '@changesets/config@3.1.4': + resolution: {integrity: sha512-pf0bvD/v6WI2cRlZ6hzpjtZdSlXDXMAJ+Iz7xfFzV4ZxJ8OGGAON+1qYc99ZPrijnt4xp3VGG7eNvAOGS24V1Q==} '@changesets/errors@0.2.0': resolution: {integrity: sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==} - '@changesets/get-dependents-graph@2.1.3': - resolution: {integrity: sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==} + '@changesets/get-dependents-graph@2.1.4': + resolution: {integrity: sha512-ZsS00x6WvmHq3sQv8oCMwL0f/z3wbXCVuSVTJwCnnmbC/iBdNJGFx1EcbMG4PC6sXRyH69liM4A2WKXzn/kRPg==} - '@changesets/get-release-plan@4.0.14': - resolution: {integrity: sha512-yjZMHpUHgl4Xl5gRlolVuxDkm4HgSJqT93Ri1Uz8kGrQb+5iJ8dkXJ20M2j/Y4iV5QzS2c5SeTxVSKX+2eMI0g==} + '@changesets/get-release-plan@4.0.16': + resolution: {integrity: sha512-2K5Om6CrMPm45rtvckfzWo7e9jOVCKLCnXia5eUPaURH7/LWzri7pK1TycdzAuAtehLkW7VPbWLCSExTHmiI6g==} '@changesets/get-version-range-type@0.4.0': resolution: {integrity: sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==} @@ -166,14 +166,14 @@ packages: '@changesets/logger@0.1.1': resolution: {integrity: sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==} - '@changesets/parse@0.4.2': - resolution: {integrity: sha512-Uo5MC5mfg4OM0jU3up66fmSn6/NE9INK+8/Vn/7sMVcdWg46zfbvvUSjD9EMonVqPi9fbrJH9SXHn48Tr1f2yA==} + '@changesets/parse@0.4.3': + resolution: {integrity: sha512-ZDmNc53+dXdWEv7fqIUSgRQOLYoUom5Z40gmLgmATmYR9NbL6FJJHwakcCpzaeCy+1D0m0n7mT4jj2B/MQPl7A==} '@changesets/pre@2.0.2': resolution: {integrity: sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==} - '@changesets/read@0.6.6': - resolution: {integrity: sha512-P5QaN9hJSQQKJShzzpBT13FzOSPyHbqdoIBUd2DJdgvnECCyO6LmAOWSV+O8se2TaZJVwSXjL+v9yhb+a9JeJg==} + '@changesets/read@0.6.7': + resolution: {integrity: sha512-D1G4AUYGrBEk8vj8MGwf75k9GpN6XL3wg8i42P2jZZwFLXnlr2Pn7r9yuQNbaMCarP7ZQWNJbV6XLeysAIMhTA==} '@changesets/should-skip-package@0.1.2': resolution: {integrity: sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==} @@ -744,6 +744,36 @@ packages: '@swc/types@0.1.17': resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} + '@turbo/darwin-64@2.9.16': + resolution: {integrity: sha512-jLjApWTSNd7JZ5JaLYfelW1ytnGQOvB7ivl+2RD1xQvJTbi8I9gBjzcga7tDZVPyaxpl10YTfJt3BrYXR18KDw==} + cpu: [x64] + os: [darwin] + + '@turbo/darwin-arm64@2.9.16': + resolution: {integrity: sha512-YPgrn+5HIGzrx0O2a631SV4MBQUe4W/DafMFUuBVgaU32PW9/OTT0ehviF0QSxTXuRJlHvW2eUTemddF5/spmw==} + cpu: [arm64] + os: [darwin] + + '@turbo/linux-64@2.9.16': + resolution: {integrity: sha512-vAEf1H6l26lTpl9FJ/peQo1NUB8RC0sbEJJz5mPcUhHA2bPDup2x3CZPgo/bH8S4cUcBLm4FN3UHd5iUO2RAew==} + cpu: [x64] + os: [linux] + + '@turbo/linux-arm64@2.9.16': + resolution: {integrity: sha512-xDBLR2PZg4BrQOchfG6svgpv5FCNJ2TOtT2psLdEJcdKo1BH+pnPs9Xj6pvUjgfkHbuvBOfeE4R6tvxMoQKDHQ==} + cpu: [arm64] + os: [linux] + + '@turbo/windows-64@2.9.16': + resolution: {integrity: sha512-NBAJnaUiGdgkSzQwUIdOvkCkcpTSu58G/sBGa0mvBtzfvFOOgrQwepKOOQ8cp6sWM6OcKDNFj2p1dsZA1OWjPg==} + cpu: [x64] + os: [win32] + + '@turbo/windows-arm64@2.9.16': + resolution: {integrity: sha512-Y7SJppD0Z8wjO3Ec0ZGd9KQ4Yv0BMnA8CIowj5Vp+OEVsosXDG2weK6/t1RRLfJmc2Ozrnd6y4DOgQys+mn3WQ==} + cpu: [arm64] + os: [win32] + '@types/chai@5.2.2': resolution: {integrity: sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==} @@ -759,37 +789,37 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@25.2.3': - resolution: {integrity: sha512-m0jEgYlYz+mDJZ2+F4v8D1AyQb+QzsNqRuI7xg1VQX/KlKS0qT9r1Mo16yo5F/MtifXFgaofIFsdFMox2SxIbQ==} + '@types/node@25.9.1': + resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==} - '@vitest/expect@4.0.18': - resolution: {integrity: sha512-8sCWUyckXXYvx4opfzVY03EOiYVxyNrHS5QxX3DAIi5dpJAAkyJezHCP77VMX4HKA2LDT/Jpfo8i2r5BE3GnQQ==} + '@vitest/expect@4.1.8': + resolution: {integrity: sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==} - '@vitest/mocker@4.0.18': - resolution: {integrity: sha512-HhVd0MDnzzsgevnOWCBj5Otnzobjy5wLBe4EdeeFGv8luMsGcYqDuFRMcttKWZA5vVO8RFjexVovXvAM4JoJDQ==} + '@vitest/mocker@4.1.8': + resolution: {integrity: sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==} peerDependencies: msw: ^2.4.9 - vite: ^6.0.0 || ^7.0.0-0 + vite: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: msw: optional: true vite: optional: true - '@vitest/pretty-format@4.0.18': - resolution: {integrity: sha512-P24GK3GulZWC5tz87ux0m8OADrQIUVDPIjjj65vBXYG17ZeU3qD7r+MNZ1RNv4l8CGU2vtTRqixrOi9fYk/yKw==} + '@vitest/pretty-format@4.1.8': + resolution: {integrity: sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==} - '@vitest/runner@4.0.18': - resolution: {integrity: sha512-rpk9y12PGa22Jg6g5M3UVVnTS7+zycIGk9ZNGN+m6tZHKQb7jrP7/77WfZy13Y/EUDd52NDsLRQhYKtv7XfPQw==} + '@vitest/runner@4.1.8': + resolution: {integrity: sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==} - '@vitest/snapshot@4.0.18': - resolution: {integrity: sha512-PCiV0rcl7jKQjbgYqjtakly6T1uwv/5BQ9SwBLekVg/EaYeQFPiXcgrC2Y7vDMA8dM1SUEAEV82kgSQIlXNMvA==} + '@vitest/snapshot@4.1.8': + resolution: {integrity: sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==} - '@vitest/spy@4.0.18': - resolution: {integrity: sha512-cbQt3PTSD7P2OARdVW3qWER5EGq7PHlvE+QfzSC0lbwO+xnt7+XH06ZzFjFRgzUX//JmpxrCu92VdwvEPlWSNw==} + '@vitest/spy@4.1.8': + resolution: {integrity: sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==} - '@vitest/utils@4.0.18': - resolution: {integrity: sha512-msMRKLMVLWygpK3u2Hybgi4MNjcYJvwTb0Ru09+fOyCXIgT5raYP041DRRdiJiI3k/2U6SEbAETB3YtBrUkCFA==} + '@vitest/utils@4.1.8': + resolution: {integrity: sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -868,10 +898,6 @@ packages: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} - ci-info@3.9.0: - resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==} - engines: {node: '>=8'} - citty@0.2.1: resolution: {integrity: sha512-kEV95lFBhQgtogAPlQfJJ0WGVSokvLr/UEoFPiKKOXF7pl98HfUVUD0ejsuTCld/9xH9vogSywZ5KqHzXrZpqg==} @@ -893,9 +919,8 @@ packages: resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==} engines: {node: ^14.18.0 || >=16.10.0} - cross-spawn@7.0.3: - resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==} - engines: {node: '>= 8'} + convert-source-map@2.0.0: + resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} cross-spawn@7.0.6: resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==} @@ -931,8 +956,8 @@ packages: resolution: {integrity: sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==} engines: {node: '>=8.6'} - es-module-lexer@1.7.0: - resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==} + es-module-lexer@2.1.0: + resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==} esbuild@0.27.2: resolution: {integrity: sha512-HyNQImnsOC7X9PMNaCIeAm4ISCQXs5a5YasTXVliKv4uuBo1dKrG0A+uQS8M5eXjVMnLg3WgXaKvprHlFJQffw==} @@ -1025,6 +1050,7 @@ packages: glob@10.3.10: resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==} engines: {node: '>=16 || 14 >=14.17'} + deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me hasBin: true globby@11.1.0: @@ -1093,8 +1119,8 @@ packages: resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==} engines: {node: '>=14'} - jiti@2.6.1: - resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==} + jiti@2.7.0: + resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==} hasBin: true joycon@3.1.1: @@ -1302,8 +1328,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.8.1: - resolution: {integrity: sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==} + prettier@3.8.3: + resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==} engines: {node: '>=14'} hasBin: true @@ -1393,8 +1419,8 @@ packages: stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} - std-env@3.10.0: - resolution: {integrity: sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==} + std-env@4.1.0: + resolution: {integrity: sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==} string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} @@ -1463,8 +1489,8 @@ packages: resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} - tinyrainbow@3.0.3: - resolution: {integrity: sha512-PSkbLUoxOFRzJYjjxHJt9xro7D+iilgMX/C9lawzVuYiIdcihh9DXmVibBe8lmcFrRi/VzlPjBxbN7rH24q8/Q==} + tinyrainbow@3.1.0: + resolution: {integrity: sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==} engines: {node: '>=14.0.0'} to-regex-range@5.0.1: @@ -1497,50 +1523,20 @@ packages: typescript: optional: true - turbo-darwin-64@2.8.10: - resolution: {integrity: sha512-A03fXh+B7S8mL3PbdhTd+0UsaGrhfyPkODvzBDpKRY7bbeac4MDFpJ7I+Slf2oSkCEeSvHKR7Z4U71uKRUfX7g==} - cpu: [x64] - os: [darwin] - - turbo-darwin-arm64@2.8.10: - resolution: {integrity: sha512-sidzowgWL3s5xCHLeqwC9M3s9M0i16W1nuQF3Mc7fPHpZ+YPohvcbVFBB2uoRRHYZg6yBnwD4gyUHKTeXfwtXA==} - cpu: [arm64] - os: [darwin] - - turbo-linux-64@2.8.10: - resolution: {integrity: sha512-YK9vcpL3TVtqonB021XwgaQhY9hJJbKKUhLv16osxV0HkcQASQWUqR56yMge7puh6nxU67rQlTq1b7ksR1T3KA==} - cpu: [x64] - os: [linux] - - turbo-linux-arm64@2.8.10: - resolution: {integrity: sha512-3+j2tL0sG95iBJTm+6J8/45JsETQABPqtFyYjVjBbi6eVGdtNTiBmHNKrbvXRlQ3ZbUG75bKLaSSDHSEEN+btQ==} - cpu: [arm64] - os: [linux] - - turbo-windows-64@2.8.10: - resolution: {integrity: sha512-hdeF5qmVY/NFgiucf8FW0CWJWtyT2QPm5mIsX0W1DXAVzqKVXGq+Zf+dg4EUngAFKjDzoBeN6ec2Fhajwfztkw==} - cpu: [x64] - os: [win32] - - turbo-windows-arm64@2.8.10: - resolution: {integrity: sha512-QGdr/Q8LWmj+ITMkSvfiz2glf0d7JG0oXVzGL3jxkGqiBI1zXFj20oqVY0qWi+112LO9SVrYdpHS0E/oGFrMbQ==} - cpu: [arm64] - os: [win32] - - turbo@2.8.10: - resolution: {integrity: sha512-OxbzDES66+x7nnKGg2MwBA1ypVsZoDTLHpeaP4giyiHSixbsiTaMyeJqbEyvBdp5Cm28fc+8GG6RdQtic0ijwQ==} + turbo@2.9.16: + resolution: {integrity: sha512-NqgRQy6j6dPYcdSdv0q1g9QsZg7SWg87RERM8otw/1AtKU2yTFVClOM7cbwKzOonZr/Ek1blTBucw64L9H0Bwg==} hasBin: true - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} + typescript@6.0.3: + resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} hasBin: true ufo@1.6.1: resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} - undici-types@7.16.0: - resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} + undici-types@7.24.6: + resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==} unicorn-magic@0.3.0: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} @@ -1590,20 +1586,23 @@ packages: yaml: optional: true - vitest@4.0.18: - resolution: {integrity: sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==} + vitest@4.1.8: + resolution: {integrity: sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.0.18 - '@vitest/browser-preview': 4.0.18 - '@vitest/browser-webdriverio': 4.0.18 - '@vitest/ui': 4.0.18 + '@vitest/browser-playwright': 4.1.8 + '@vitest/browser-preview': 4.1.8 + '@vitest/browser-webdriverio': 4.1.8 + '@vitest/coverage-istanbul': 4.1.8 + '@vitest/coverage-v8': 4.1.8 + '@vitest/ui': 4.1.8 happy-dom: '*' jsdom: '*' + vite: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: '@edge-runtime/vm': optional: true @@ -1617,6 +1616,10 @@ packages: optional: true '@vitest/browser-webdriverio': optional: true + '@vitest/coverage-istanbul': + optional: true + '@vitest/coverage-v8': + optional: true '@vitest/ui': optional: true happy-dom: @@ -1673,9 +1676,9 @@ snapshots: dependencies: tar: 7.5.9 - '@changesets/apply-release-plan@7.0.14': + '@changesets/apply-release-plan@7.1.1': dependencies: - '@changesets/config': 3.1.2 + '@changesets/config': 3.1.4 '@changesets/get-version-range-type': 0.4.0 '@changesets/git': 3.0.4 '@changesets/should-skip-package': 0.1.2 @@ -1689,10 +1692,10 @@ snapshots: resolve-from: 5.0.0 semver: 7.6.3 - '@changesets/assemble-release-plan@6.0.9': + '@changesets/assemble-release-plan@6.0.10': dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.3 + '@changesets/get-dependents-graph': 2.1.4 '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 @@ -1702,30 +1705,28 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.29.8(@types/node@25.2.3)': + '@changesets/cli@2.31.0(@types/node@25.9.1)': dependencies: - '@changesets/apply-release-plan': 7.0.14 - '@changesets/assemble-release-plan': 6.0.9 + '@changesets/apply-release-plan': 7.1.1 + '@changesets/assemble-release-plan': 6.0.10 '@changesets/changelog-git': 0.2.1 - '@changesets/config': 3.1.2 + '@changesets/config': 3.1.4 '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.3 - '@changesets/get-release-plan': 4.0.14 + '@changesets/get-dependents-graph': 2.1.4 + '@changesets/get-release-plan': 4.0.16 '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 '@changesets/pre': 2.0.2 - '@changesets/read': 0.6.6 + '@changesets/read': 0.6.7 '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@changesets/write': 0.4.0 - '@inquirer/external-editor': 1.0.3(@types/node@25.2.3) + '@inquirer/external-editor': 1.0.3(@types/node@25.9.1) '@manypkg/get-packages': 1.1.3 ansi-colors: 4.1.3 - ci-info: 3.9.0 enquirer: 2.4.1 fs-extra: 7.0.1 mri: 1.2.0 - p-limit: 2.3.0 package-manager-detector: 0.2.8 picocolors: 1.1.1 resolve-from: 5.0.0 @@ -1735,11 +1736,12 @@ snapshots: transitivePeerDependencies: - '@types/node' - '@changesets/config@3.1.2': + '@changesets/config@3.1.4': dependencies: '@changesets/errors': 0.2.0 - '@changesets/get-dependents-graph': 2.1.3 + '@changesets/get-dependents-graph': 2.1.4 '@changesets/logger': 0.1.1 + '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 @@ -1749,19 +1751,19 @@ snapshots: dependencies: extendable-error: 0.1.7 - '@changesets/get-dependents-graph@2.1.3': + '@changesets/get-dependents-graph@2.1.4': dependencies: '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 picocolors: 1.1.1 semver: 7.6.3 - '@changesets/get-release-plan@4.0.14': + '@changesets/get-release-plan@4.0.16': dependencies: - '@changesets/assemble-release-plan': 6.0.9 - '@changesets/config': 3.1.2 + '@changesets/assemble-release-plan': 6.0.10 + '@changesets/config': 3.1.4 '@changesets/pre': 2.0.2 - '@changesets/read': 0.6.6 + '@changesets/read': 0.6.7 '@changesets/types': 6.1.0 '@manypkg/get-packages': 1.1.3 @@ -1779,7 +1781,7 @@ snapshots: dependencies: picocolors: 1.1.1 - '@changesets/parse@0.4.2': + '@changesets/parse@0.4.3': dependencies: '@changesets/types': 6.1.0 js-yaml: 4.1.1 @@ -1791,11 +1793,11 @@ snapshots: '@manypkg/get-packages': 1.1.3 fs-extra: 7.0.1 - '@changesets/read@0.6.6': + '@changesets/read@0.6.7': dependencies: '@changesets/git': 3.0.4 '@changesets/logger': 0.1.1 - '@changesets/parse': 0.4.2 + '@changesets/parse': 0.4.3 '@changesets/types': 6.1.0 fs-extra: 7.0.1 p-filter: 2.1.0 @@ -1906,12 +1908,12 @@ snapshots: '@esbuild/win32-x64@0.27.2': optional: true - '@inquirer/external-editor@1.0.3(@types/node@25.2.3)': + '@inquirer/external-editor@1.0.3(@types/node@25.9.1)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 25.2.3 + '@types/node': 25.9.1 '@isaacs/cliui@8.0.2': dependencies: @@ -1945,7 +1947,7 @@ snapshots: '@jridgewell/trace-mapping@0.3.19': dependencies: '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.5 '@manypkg/find-root@1.1.0': dependencies: @@ -2171,6 +2173,24 @@ snapshots: '@swc/counter': 0.1.3 optional: true + '@turbo/darwin-64@2.9.16': + optional: true + + '@turbo/darwin-arm64@2.9.16': + optional: true + + '@turbo/linux-64@2.9.16': + optional: true + + '@turbo/linux-arm64@2.9.16': + optional: true + + '@turbo/windows-64@2.9.16': + optional: true + + '@turbo/windows-arm64@2.9.16': + optional: true + '@types/chai@5.2.2': dependencies: '@types/deep-eql': 4.0.2 @@ -2183,48 +2203,50 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@25.2.3': + '@types/node@25.9.1': dependencies: - undici-types: 7.16.0 + undici-types: 7.24.6 - '@vitest/expect@4.0.18': + '@vitest/expect@4.1.8': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.2 - '@vitest/spy': 4.0.18 - '@vitest/utils': 4.0.18 + '@vitest/spy': 4.1.8 + '@vitest/utils': 4.1.8 chai: 6.2.2 - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 - '@vitest/mocker@4.0.18(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1))': + '@vitest/mocker@4.1.8(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0))': dependencies: - '@vitest/spy': 4.0.18 + '@vitest/spy': 4.1.8 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@25.2.3)(jiti@2.6.1) + vite: 7.3.1(@types/node@25.9.1)(jiti@2.7.0) - '@vitest/pretty-format@4.0.18': + '@vitest/pretty-format@4.1.8': dependencies: - tinyrainbow: 3.0.3 + tinyrainbow: 3.1.0 - '@vitest/runner@4.0.18': + '@vitest/runner@4.1.8': dependencies: - '@vitest/utils': 4.0.18 + '@vitest/utils': 4.1.8 pathe: 2.0.3 - '@vitest/snapshot@4.0.18': + '@vitest/snapshot@4.1.8': dependencies: - '@vitest/pretty-format': 4.0.18 + '@vitest/pretty-format': 4.1.8 + '@vitest/utils': 4.1.8 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@4.0.18': {} + '@vitest/spy@4.1.8': {} - '@vitest/utils@4.0.18': + '@vitest/utils@4.1.8': dependencies: - '@vitest/pretty-format': 4.0.18 - tinyrainbow: 3.0.3 + '@vitest/pretty-format': 4.1.8 + convert-source-map: 2.0.0 + tinyrainbow: 3.1.0 acorn@8.14.1: {} @@ -2281,8 +2303,6 @@ snapshots: chownr@3.0.0: {} - ci-info@3.9.0: {} - citty@0.2.1: {} color-convert@2.0.1: @@ -2297,11 +2317,7 @@ snapshots: consola@3.4.0: {} - cross-spawn@7.0.3: - dependencies: - path-key: 3.1.1 - shebang-command: 2.0.0 - which: 2.0.2 + convert-source-map@2.0.0: {} cross-spawn@7.0.6: dependencies: @@ -2330,7 +2346,7 @@ snapshots: ansi-colors: 4.1.3 strip-ansi: 6.0.1 - es-module-lexer@1.7.0: {} + es-module-lexer@2.1.0: {} esbuild@0.27.2: optionalDependencies: @@ -2427,7 +2443,7 @@ snapshots: foreground-child@3.1.1: dependencies: - cross-spawn: 7.0.3 + cross-spawn: 7.0.6 signal-exit: 4.1.0 fs-extra@7.0.1: @@ -2513,7 +2529,7 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@2.6.1: {} + jiti@2.7.0: {} joycon@3.1.1: {} @@ -2660,11 +2676,11 @@ snapshots: mlly: 1.7.4 pathe: 2.0.3 - postcss-load-config@6.0.1(jiti@2.6.1)(postcss@8.5.6): + postcss-load-config@6.0.1(jiti@2.7.0)(postcss@8.5.6): dependencies: lilconfig: 3.1.2 optionalDependencies: - jiti: 2.6.1 + jiti: 2.7.0 postcss: 8.5.6 postcss@8.5.6: @@ -2675,7 +2691,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.8.1: {} + prettier@3.8.3: {} pretty-ms@9.2.0: dependencies: @@ -2789,7 +2805,7 @@ snapshots: stackback@0.0.2: {} - std-env@3.10.0: {} + std-env@4.1.0: {} string-width@4.2.3: dependencies: @@ -2869,7 +2885,7 @@ snapshots: fdir: 6.5.0(picomatch@4.0.3) picomatch: 4.0.3 - tinyrainbow@3.0.3: {} + tinyrainbow@3.1.0: {} to-regex-range@5.0.1: dependencies: @@ -2879,7 +2895,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.5.1(@swc/core@1.5.5)(jiti@2.6.1)(postcss@8.5.6)(typescript@5.9.3): + tsup@8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@6.0.3): dependencies: bundle-require: 5.1.0(esbuild@0.27.2) cac: 6.7.14 @@ -2890,7 +2906,7 @@ snapshots: fix-dts-default-cjs-exports: 1.0.1 joycon: 3.1.1 picocolors: 1.1.1 - postcss-load-config: 6.0.1(jiti@2.6.1)(postcss@8.5.6) + postcss-load-config: 6.0.1(jiti@2.7.0)(postcss@8.5.6) resolve-from: 5.0.0 rollup: 4.34.9 source-map: 0.7.6 @@ -2901,51 +2917,33 @@ snapshots: optionalDependencies: '@swc/core': 1.5.5 postcss: 8.5.6 - typescript: 5.9.3 + typescript: 6.0.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo-darwin-64@2.8.10: - optional: true - - turbo-darwin-arm64@2.8.10: - optional: true - - turbo-linux-64@2.8.10: - optional: true - - turbo-linux-arm64@2.8.10: - optional: true - - turbo-windows-64@2.8.10: - optional: true - - turbo-windows-arm64@2.8.10: - optional: true - - turbo@2.8.10: + turbo@2.9.16: optionalDependencies: - turbo-darwin-64: 2.8.10 - turbo-darwin-arm64: 2.8.10 - turbo-linux-64: 2.8.10 - turbo-linux-arm64: 2.8.10 - turbo-windows-64: 2.8.10 - turbo-windows-arm64: 2.8.10 + '@turbo/darwin-64': 2.9.16 + '@turbo/darwin-arm64': 2.9.16 + '@turbo/linux-64': 2.9.16 + '@turbo/linux-arm64': 2.9.16 + '@turbo/windows-64': 2.9.16 + '@turbo/windows-arm64': 2.9.16 - typescript@5.9.3: {} + typescript@6.0.3: {} ufo@1.6.1: {} - undici-types@7.16.0: {} + undici-types@7.24.6: {} unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1): + vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0): dependencies: esbuild: 0.27.2 fdir: 6.5.0(picomatch@4.0.3) @@ -2954,46 +2952,36 @@ snapshots: rollup: 4.55.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.2.3 + '@types/node': 25.9.1 fsevents: 2.3.3 - jiti: 2.6.1 - - vitest@4.0.18(@types/node@25.2.3)(jiti@2.6.1): - dependencies: - '@vitest/expect': 4.0.18 - '@vitest/mocker': 4.0.18(vite@7.3.1(@types/node@25.2.3)(jiti@2.6.1)) - '@vitest/pretty-format': 4.0.18 - '@vitest/runner': 4.0.18 - '@vitest/snapshot': 4.0.18 - '@vitest/spy': 4.0.18 - '@vitest/utils': 4.0.18 - es-module-lexer: 1.7.0 + jiti: 2.7.0 + + vitest@4.1.8(@types/node@25.9.1)(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0)): + dependencies: + '@vitest/expect': 4.1.8 + '@vitest/mocker': 4.1.8(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0)) + '@vitest/pretty-format': 4.1.8 + '@vitest/runner': 4.1.8 + '@vitest/snapshot': 4.1.8 + '@vitest/spy': 4.1.8 + '@vitest/utils': 4.1.8 + es-module-lexer: 2.1.0 expect-type: 1.3.0 magic-string: 0.30.21 obug: 2.1.1 pathe: 2.0.3 picomatch: 4.0.3 - std-env: 3.10.0 + std-env: 4.1.0 tinybench: 2.9.0 tinyexec: 1.0.2 tinyglobby: 0.2.15 - tinyrainbow: 3.0.3 - vite: 7.3.1(@types/node@25.2.3)(jiti@2.6.1) + tinyrainbow: 3.1.0 + vite: 7.3.1(@types/node@25.9.1)(jiti@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 25.2.3 + '@types/node': 25.9.1 transitivePeerDependencies: - - jiti - - less - - lightningcss - msw - - sass - - sass-embedded - - stylus - - sugarss - - terser - - tsx - - yaml which@2.0.2: dependencies: From 2edb871900323cd973350eb5f435e3f60b913433 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:42:45 +0100 Subject: [PATCH 259/290] chore: upgrade dependencies --- packages/create-solid/package.json | 4 +- packages/create/package.json | 4 +- packages/full-solid/package.json | 4 +- packages/utils/package.json | 6 +- pnpm-lock.yaml | 119 ++++++++++++++++++++--------- 5 files changed, 90 insertions(+), 47 deletions(-) diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index e001d51..ab8dba7 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,9 +31,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "1.0.1", + "@clack/prompts": "1.5.0", "picocolors": "^1.1.1", - "citty": "^0.2.1", + "citty": "^0.2.2", "@solid-cli/create": "workspace:*" }, "publishConfig": { diff --git a/packages/create/package.json b/packages/create/package.json index e144241..c32c3cc 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -40,10 +40,10 @@ "access": "public" }, "dependencies": { - "@clack/prompts": "1.0.1", + "@clack/prompts": "1.5.0", "picocolors": "^1.1.1", "@begit/core": "^0.3.4", - "citty": "^0.2.1", + "citty": "^0.2.2", "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" } diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index f79171a..1da9967 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,9 +30,9 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "1.0.1", + "@clack/prompts": "1.5.0", "picocolors": "^1.1.1", - "citty": "^0.2.1", + "citty": "^0.2.2", "@solid-cli/create": "workspace:*", "@solid-cli/utils": "workspace:*" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index 4196273..13afca1 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -67,14 +67,14 @@ "build": "tsc && tsup" }, "devDependencies": { - "magicast": "^0.5.2" + "magicast": "^0.5.3" }, "publishConfig": { "access": "public" }, "dependencies": { - "@clack/core": "1.0.1", - "@clack/prompts": "1.0.1", + "@clack/core": "1.4.0", + "@clack/prompts": "1.5.0", "execa": "^9.6.1", "picocolors": "^1.1.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 243666d..96388f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -39,14 +39,14 @@ importers: specifier: ^0.3.4 version: 0.3.4 '@clack/prompts': - specifier: 1.0.1 - version: 1.0.1 + specifier: 1.5.0 + version: 1.5.0 '@solid-cli/utils': specifier: workspace:* version: link:../utils citty: - specifier: ^0.2.1 - version: 0.2.1 + specifier: ^0.2.2 + version: 0.2.2 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -57,14 +57,14 @@ importers: packages/create-solid: devDependencies: '@clack/prompts': - specifier: 1.0.1 - version: 1.0.1 + specifier: 1.5.0 + version: 1.5.0 '@solid-cli/create': specifier: workspace:* version: link:../create citty: - specifier: ^0.2.1 - version: 0.2.1 + specifier: ^0.2.2 + version: 0.2.2 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -72,8 +72,8 @@ importers: packages/full-solid: devDependencies: '@clack/prompts': - specifier: 1.0.1 - version: 1.0.1 + specifier: 1.5.0 + version: 1.5.0 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -81,8 +81,8 @@ importers: specifier: workspace:* version: link:../utils citty: - specifier: ^0.2.1 - version: 0.2.1 + specifier: ^0.2.2 + version: 0.2.2 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -90,11 +90,11 @@ importers: packages/utils: dependencies: '@clack/core': - specifier: 1.0.1 - version: 1.0.1 + specifier: 1.4.0 + version: 1.4.0 '@clack/prompts': - specifier: 1.0.1 - version: 1.0.1 + specifier: 1.5.0 + version: 1.5.0 execa: specifier: ^9.6.1 version: 9.6.1 @@ -103,8 +103,8 @@ importers: version: 1.1.1 devDependencies: magicast: - specifier: ^0.5.2 - version: 0.5.2 + specifier: ^0.5.3 + version: 0.5.3 packages: @@ -112,12 +112,20 @@ packages: resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==} engines: {node: '>=6.9.0'} + '@babel/helper-string-parser@7.29.7': + resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==} + engines: {node: '>=6.9.0'} + '@babel/helper-validator-identifier@7.28.5': resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==} engines: {node: '>=6.9.0'} - '@babel/parser@7.29.0': - resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==} + '@babel/helper-validator-identifier@7.29.7': + resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==} + engines: {node: '>=6.9.0'} + + '@babel/parser@7.29.7': + resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==} engines: {node: '>=6.0.0'} hasBin: true @@ -129,6 +137,10 @@ packages: resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==} engines: {node: '>=6.9.0'} + '@babel/types@7.29.7': + resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==} + engines: {node: '>=6.9.0'} + '@begit/core@0.3.4': resolution: {integrity: sha512-vW4xQ51uXYB6apjY3Y1RkfHpTcyYpV2v+eb2ndEvF9HnJlGbkKmXQYCGlQd2SfLKBQJk5GDic0xwxA8japdTuw==} @@ -187,11 +199,13 @@ packages: '@changesets/write@0.4.0': resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==} - '@clack/core@1.0.1': - resolution: {integrity: sha512-WKeyK3NOBwDOzagPR5H08rFk9D/WuN705yEbuZvKqlkmoLM2woKtXb10OO2k1NoSU4SFG947i2/SCYh+2u5e4g==} + '@clack/core@1.4.0': + resolution: {integrity: sha512-7Wctjq6f7c1CPz8sPpkwUnz8yRgVANkpNupb81q432FjcJg4l+Sw7XANdNSdWfAKq0IHI0JTcUeK5dxs/HrGPw==} + engines: {node: '>= 20.12.0'} - '@clack/prompts@1.0.1': - resolution: {integrity: sha512-/42G73JkuYdyWZ6m8d/CJtBrGl1Hegyc7Fy78m5Ob+jF85TOUmLR5XLce/U3LxYAw0kJ8CT5aI99RIvPHcGp/Q==} + '@clack/prompts@1.5.0': + resolution: {integrity: sha512-wKh+wTjmrUoUdkZg8KpJO5X+p9PWV+KE9mePseq9UYWkukgTKsGS47RRL2HstwVcvDQH+PenrPJWII8+MfiiyA==} + engines: {node: '>= 20.12.0'} '@esbuild/aix-ppc64@0.27.2': resolution: {integrity: sha512-GZMB+a0mOMZs4MpDbj8RJp4cw+w1WV5NYD6xzgvzUJ5Ek2jerwfO2eADyI6ExDSUED+1X8aMbegahsJi+8mgpw==} @@ -898,8 +912,8 @@ packages: resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==} engines: {node: '>=18'} - citty@0.2.1: - resolution: {integrity: sha512-kEV95lFBhQgtogAPlQfJJ0WGVSokvLr/UEoFPiKKOXF7pl98HfUVUD0ejsuTCld/9xH9vogSywZ5KqHzXrZpqg==} + citty@0.2.2: + resolution: {integrity: sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==} color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} @@ -987,6 +1001,15 @@ packages: resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==} engines: {node: '>=8.6.0'} + fast-string-truncated-width@3.0.3: + resolution: {integrity: sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==} + + fast-string-width@3.0.2: + resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==} + + fast-wrap-ansi@0.2.2: + resolution: {integrity: sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==} + fastq@1.18.0: resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} @@ -1166,8 +1189,8 @@ packages: magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} - magicast@0.5.2: - resolution: {integrity: sha512-E3ZJh4J3S9KfwdjZhe2afj6R9lGIN5Pher1pF39UGrXRqq/VDaGVIGN13BjHd2u8B61hArAGOnso7nBOouW3TQ==} + magicast@0.5.3: + resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==} merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} @@ -1657,11 +1680,15 @@ snapshots: '@babel/helper-string-parser@7.27.1': {} + '@babel/helper-string-parser@7.29.7': {} + '@babel/helper-validator-identifier@7.28.5': {} - '@babel/parser@7.29.0': + '@babel/helper-validator-identifier@7.29.7': {} + + '@babel/parser@7.29.7': dependencies: - '@babel/types': 7.29.0 + '@babel/types': 7.29.7 '@babel/runtime@7.26.0': dependencies: @@ -1672,6 +1699,11 @@ snapshots: '@babel/helper-string-parser': 7.27.1 '@babel/helper-validator-identifier': 7.28.5 + '@babel/types@7.29.7': + dependencies: + '@babel/helper-string-parser': 7.29.7 + '@babel/helper-validator-identifier': 7.29.7 + '@begit/core@0.3.4': dependencies: tar: 7.5.9 @@ -1819,15 +1851,16 @@ snapshots: human-id: 4.1.1 prettier: 2.8.8 - '@clack/core@1.0.1': + '@clack/core@1.4.0': dependencies: - picocolors: 1.1.1 + fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 - '@clack/prompts@1.0.1': + '@clack/prompts@1.5.0': dependencies: - '@clack/core': 1.0.1 - picocolors: 1.1.1 + '@clack/core': 1.4.0 + fast-string-width: 3.0.2 + fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 '@esbuild/aix-ppc64@0.27.2': @@ -2303,7 +2336,7 @@ snapshots: chownr@3.0.0: {} - citty@0.2.1: {} + citty@0.2.2: {} color-convert@2.0.1: dependencies: @@ -2410,6 +2443,16 @@ snapshots: merge2: 1.4.1 micromatch: 4.0.8 + fast-string-truncated-width@3.0.3: {} + + fast-string-width@3.0.2: + dependencies: + fast-string-truncated-width: 3.0.3 + + fast-wrap-ansi@0.2.2: + dependencies: + fast-string-width: 3.0.2 + fastq@1.18.0: dependencies: reusify: 1.0.4 @@ -2568,9 +2611,9 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 - magicast@0.5.2: + magicast@0.5.3: dependencies: - '@babel/parser': 7.29.0 + '@babel/parser': 7.29.7 '@babel/types': 7.29.0 source-map-js: 1.2.1 From 6a7f95c4e2aab0d024f615fe74ef7a1bc8df1320 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:45:30 +0100 Subject: [PATCH 260/290] ci: update CI tasks to use latest LTS release (24) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index febcfe8..d530241 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 24 - name: Install dependencies run: pnpm install --ignore-scripts From 46b5c2d2d0126654929a4d69c382f9b8e11b091f Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:50:41 +0100 Subject: [PATCH 261/290] fix: adjust typescript `rootDir` so cold builds work correctly --- packages/create/tsconfig.json | 2 +- packages/utils/tsconfig.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create/tsconfig.json b/packages/create/tsconfig.json index 71194f0..e8c3977 100644 --- a/packages/create/tsconfig.json +++ b/packages/create/tsconfig.json @@ -11,7 +11,7 @@ "types": ["node"], "declaration": true, "emitDeclarationOnly": true, - "rootDir": ".", + "rootDir": "./src", "outDir": "types" }, "include": ["src/*"] diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 3ecd183..34933f5 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -15,7 +15,7 @@ "noUnusedLocals": true, "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, - "rootDir": ".", + "rootDir": "./src", "outDir": "types", "declarationMap": true }, From e1f279866ac72f86881a4e5ab8a85e9c0a178d72 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Tue, 2 Jun 2026 19:52:34 +0100 Subject: [PATCH 262/290] chore: remove outdated docs --- docs/.gitignore | 1 - docs/package.json | 15 - docs/pnpm-lock.yaml | 1135 ----------------- docs/pnpm-workspace.yaml | 0 docs/vitepress_docs/.vitepress/config.ts | 34 - docs/vitepress_docs/.vitepress/theme/index.ts | 16 - .../vitepress_docs/.vitepress/theme/style.css | 82 -- docs/vitepress_docs/about.md | 17 - docs/vitepress_docs/basic-commands.md | 84 -- docs/vitepress_docs/index.md | 23 - docs/vitepress_docs/installation.md | 41 - docs/vitepress_docs/start-commands.md | 64 - docs/vitepress_docs/supported-integrations.md | 21 - 13 files changed, 1533 deletions(-) delete mode 100644 docs/.gitignore delete mode 100644 docs/package.json delete mode 100644 docs/pnpm-lock.yaml delete mode 100644 docs/pnpm-workspace.yaml delete mode 100644 docs/vitepress_docs/.vitepress/config.ts delete mode 100644 docs/vitepress_docs/.vitepress/theme/index.ts delete mode 100644 docs/vitepress_docs/.vitepress/theme/style.css delete mode 100644 docs/vitepress_docs/about.md delete mode 100644 docs/vitepress_docs/basic-commands.md delete mode 100644 docs/vitepress_docs/index.md delete mode 100644 docs/vitepress_docs/installation.md delete mode 100644 docs/vitepress_docs/start-commands.md delete mode 100644 docs/vitepress_docs/supported-integrations.md diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index f3c937e..0000000 --- a/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vitepress_docs/.vitepress/cache \ No newline at end of file diff --git a/docs/package.json b/docs/package.json deleted file mode 100644 index fc7fb0a..0000000 --- a/docs/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "private": true, - "type": "module", - "scripts": { - "docs:dev": "vitepress dev vitepress_docs", - "docs:build": "vitepress build vitepress_docs", - "docs:preview": "vitepress preview vitepress_docs" - }, - "devDependencies": { - "flexsearch": "^0.7.43", - "vitepress": "1.1.3", - "vitepress-plugin-search": "1.0.4-alpha.22", - "vue": "^3.4.23" - } -} diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml deleted file mode 100644 index 37323a0..0000000 --- a/docs/pnpm-lock.yaml +++ /dev/null @@ -1,1135 +0,0 @@ -lockfileVersion: '6.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: - devDependencies: - flexsearch: - specifier: ^0.7.43 - version: 0.7.43 - vitepress: - specifier: 1.1.3 - version: 1.1.3(@algolia/client-search@4.22.1)(search-insights@2.13.0) - vitepress-plugin-search: - specifier: 1.0.4-alpha.22 - version: 1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.1.3)(vue@3.4.23) - vue: - specifier: ^3.4.23 - version: 3.4.23 - -packages: - - /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==} - dependencies: - '@algolia/autocomplete-plugin-algolia-insights': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0) - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) - transitivePeerDependencies: - - '@algolia/client-search' - - algoliasearch - - search-insights - dev: true - - /@algolia/autocomplete-plugin-algolia-insights@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==} - peerDependencies: - search-insights: '>= 1 < 3' - dependencies: - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) - search-insights: 2.13.0 - transitivePeerDependencies: - - '@algolia/client-search' - - algoliasearch - dev: true - - /@algolia/autocomplete-preset-algolia@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1): - resolution: {integrity: sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==} - peerDependencies: - '@algolia/client-search': '>= 4.9.1 < 6' - algoliasearch: '>= 4.9.1 < 6' - dependencies: - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) - '@algolia/client-search': 4.22.1 - algoliasearch: 4.22.1 - dev: true - - /@algolia/autocomplete-shared@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1): - resolution: {integrity: sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==} - peerDependencies: - '@algolia/client-search': '>= 4.9.1 < 6' - algoliasearch: '>= 4.9.1 < 6' - dependencies: - '@algolia/client-search': 4.22.1 - algoliasearch: 4.22.1 - dev: true - - /@algolia/cache-browser-local-storage@4.22.1: - resolution: {integrity: sha512-Sw6IAmOCvvP6QNgY9j+Hv09mvkvEIDKjYW8ow0UDDAxSXy664RBNQk3i/0nt7gvceOJ6jGmOTimaZoY1THmU7g==} - dependencies: - '@algolia/cache-common': 4.22.1 - dev: true - - /@algolia/cache-common@4.22.1: - resolution: {integrity: sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA==} - dev: true - - /@algolia/cache-in-memory@4.22.1: - resolution: {integrity: sha512-ve+6Ac2LhwpufuWavM/aHjLoNz/Z/sYSgNIXsinGofWOysPilQZPUetqLj8vbvi+DHZZaYSEP9H5SRVXnpsNNw==} - dependencies: - '@algolia/cache-common': 4.22.1 - dev: true - - /@algolia/client-account@4.22.1: - resolution: {integrity: sha512-k8m+oegM2zlns/TwZyi4YgCtyToackkOpE+xCaKCYfBfDtdGOaVZCM5YvGPtK+HGaJMIN/DoTL8asbM3NzHonw==} - dependencies: - '@algolia/client-common': 4.22.1 - '@algolia/client-search': 4.22.1 - '@algolia/transporter': 4.22.1 - dev: true - - /@algolia/client-analytics@4.22.1: - resolution: {integrity: sha512-1ssi9pyxyQNN4a7Ji9R50nSdISIumMFDwKNuwZipB6TkauJ8J7ha/uO60sPJFqQyqvvI+px7RSNRQT3Zrvzieg==} - dependencies: - '@algolia/client-common': 4.22.1 - '@algolia/client-search': 4.22.1 - '@algolia/requester-common': 4.22.1 - '@algolia/transporter': 4.22.1 - dev: true - - /@algolia/client-common@4.22.1: - resolution: {integrity: sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==} - dependencies: - '@algolia/requester-common': 4.22.1 - '@algolia/transporter': 4.22.1 - dev: true - - /@algolia/client-personalization@4.22.1: - resolution: {integrity: sha512-sl+/klQJ93+4yaqZ7ezOttMQ/nczly/3GmgZXJ1xmoewP5jmdP/X/nV5U7EHHH3hCUEHeN7X1nsIhGPVt9E1cQ==} - dependencies: - '@algolia/client-common': 4.22.1 - '@algolia/requester-common': 4.22.1 - '@algolia/transporter': 4.22.1 - dev: true - - /@algolia/client-search@4.22.1: - resolution: {integrity: sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==} - dependencies: - '@algolia/client-common': 4.22.1 - '@algolia/requester-common': 4.22.1 - '@algolia/transporter': 4.22.1 - dev: true - - /@algolia/logger-common@4.22.1: - resolution: {integrity: sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg==} - dev: true - - /@algolia/logger-console@4.22.1: - resolution: {integrity: sha512-O99rcqpVPKN1RlpgD6H3khUWylU24OXlzkavUAMy6QZd1776QAcauE3oP8CmD43nbaTjBexZj2nGsBH9Tc0FVA==} - dependencies: - '@algolia/logger-common': 4.22.1 - dev: true - - /@algolia/requester-browser-xhr@4.22.1: - resolution: {integrity: sha512-dtQGYIg6MteqT1Uay3J/0NDqD+UciHy3QgRbk7bNddOJu+p3hzjTRYESqEnoX/DpEkaNYdRHUKNylsqMpgwaEw==} - dependencies: - '@algolia/requester-common': 4.22.1 - dev: true - - /@algolia/requester-common@4.22.1: - resolution: {integrity: sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg==} - dev: true - - /@algolia/requester-node-http@4.22.1: - resolution: {integrity: sha512-JfmZ3MVFQkAU+zug8H3s8rZ6h0ahHZL/SpMaSasTCGYR5EEJsCc8SI5UZ6raPN2tjxa5bxS13BRpGSBUens7EA==} - dependencies: - '@algolia/requester-common': 4.22.1 - dev: true - - /@algolia/transporter@4.22.1: - resolution: {integrity: sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==} - dependencies: - '@algolia/cache-common': 4.22.1 - '@algolia/logger-common': 4.22.1 - '@algolia/requester-common': 4.22.1 - dev: true - - /@babel/helper-string-parser@7.23.4: - resolution: {integrity: sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==} - engines: {node: '>=6.9.0'} - dev: true - - /@babel/helper-validator-identifier@7.22.20: - resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==} - engines: {node: '>=6.9.0'} - dev: true - - /@babel/parser@7.24.4: - resolution: {integrity: sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==} - engines: {node: '>=6.0.0'} - hasBin: true - dependencies: - '@babel/types': 7.24.0 - dev: true - - /@babel/types@7.24.0: - resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-string-parser': 7.23.4 - '@babel/helper-validator-identifier': 7.22.20 - to-fast-properties: 2.0.0 - dev: true - - /@docsearch/css@3.6.0: - resolution: {integrity: sha512-+sbxb71sWre+PwDK7X2T8+bhS6clcVMLwBPznX45Qu6opJcgRjAp7gYSDzVFp187J+feSj5dNBN1mJoi6ckkUQ==} - dev: true - - /@docsearch/js@3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-QujhqINEElrkIfKwyyyTfbsfMAYCkylInLYMRqHy7PHc8xTBQCow73tlo/Kc7oIwBrCLf0P3YhjlOeV4v8hevQ==} - dependencies: - '@docsearch/react': 3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0) - preact: 10.19.6 - transitivePeerDependencies: - - '@algolia/client-search' - - '@types/react' - - react - - react-dom - - search-insights - dev: true - - /@docsearch/react@3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-HUFut4ztcVNmqy9gp/wxNbC7pTOHhgVVkHVGCACTuLhUKUhKAF9KYHJtMiLUJxEqiFLQiuri1fWF8zqwM/cu1w==} - peerDependencies: - '@types/react': '>= 16.8.0 < 19.0.0' - react: '>= 16.8.0 < 19.0.0' - react-dom: '>= 16.8.0 < 19.0.0' - search-insights: '>= 1 < 3' - peerDependenciesMeta: - '@types/react': - optional: true - react: - optional: true - react-dom: - optional: true - search-insights: - optional: true - dependencies: - '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1)(search-insights@2.13.0) - '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.22.1) - '@docsearch/css': 3.6.0 - algoliasearch: 4.22.1 - search-insights: 2.13.0 - transitivePeerDependencies: - - '@algolia/client-search' - dev: true - - /@esbuild/aix-ppc64@0.20.2: - resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [aix] - requiresBuild: true - dev: true - optional: true - - /@esbuild/android-arm64@0.20.2: - resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@esbuild/android-arm@0.20.2: - resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@esbuild/android-x64@0.20.2: - resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@esbuild/darwin-arm64@0.20.2: - resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@esbuild/darwin-x64@0.20.2: - resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@esbuild/freebsd-arm64@0.20.2: - resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/freebsd-x64@0.20.2: - resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-arm64@0.20.2: - resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-arm@0.20.2: - resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-ia32@0.20.2: - resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-loong64@0.20.2: - resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-mips64el@0.20.2: - resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-ppc64@0.20.2: - resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-riscv64@0.20.2: - resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-s390x@0.20.2: - resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/linux-x64@0.20.2: - resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@esbuild/netbsd-x64@0.20.2: - resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/openbsd-x64@0.20.2: - resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - - /@esbuild/sunos-x64@0.20.2: - resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - - /@esbuild/win32-arm64@0.20.2: - resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@esbuild/win32-ia32@0.20.2: - resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@esbuild/win32-x64@0.20.2: - resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@jridgewell/sourcemap-codec@1.4.15: - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - dev: true - - /@rollup/rollup-android-arm-eabi@4.13.0: - resolution: {integrity: sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-android-arm64@4.13.0: - resolution: {integrity: sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-darwin-arm64@4.13.0: - resolution: {integrity: sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-darwin-x64@4.13.0: - resolution: {integrity: sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-arm-gnueabihf@4.13.0: - resolution: {integrity: sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-arm64-gnu@4.13.0: - resolution: {integrity: sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-arm64-musl@4.13.0: - resolution: {integrity: sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-riscv64-gnu@4.13.0: - resolution: {integrity: sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-x64-gnu@4.13.0: - resolution: {integrity: sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-linux-x64-musl@4.13.0: - resolution: {integrity: sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-win32-arm64-msvc@4.13.0: - resolution: {integrity: sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-win32-ia32-msvc@4.13.0: - resolution: {integrity: sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@rollup/rollup-win32-x64-msvc@4.13.0: - resolution: {integrity: sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - /@shikijs/core@1.3.0: - resolution: {integrity: sha512-7fedsBfuILDTBmrYZNFI8B6ATTxhQAasUHllHmjvSZPnoq4bULWoTpHwmuQvZ8Aq03/tAa2IGo6RXqWtHdWaCA==} - dev: true - - /@shikijs/transformers@1.3.0: - resolution: {integrity: sha512-3mlpg2I9CjhjE96dEWQOGeCWoPcyTov3s4aAsHmgvnTHa8MBknEnCQy8/xivJPSpD+olqOqIEoHnLfbNJK29AA==} - dependencies: - shiki: 1.3.0 - dev: true - - /@types/estree@1.0.5: - resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} - dev: true - - /@types/flexsearch@0.7.6: - resolution: {integrity: sha512-H5IXcRn96/gaDmo+rDl2aJuIJsob8dgOXDqf8K0t8rWZd1AFNaaspmRsElESiU+EWE33qfbFPgI0OC/B1g9FCA==} - dev: true - - /@types/linkify-it@3.0.5: - resolution: {integrity: sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==} - dev: true - - /@types/markdown-it@12.2.3: - resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==} - dependencies: - '@types/linkify-it': 3.0.5 - '@types/mdurl': 1.0.5 - dev: true - - /@types/markdown-it@14.0.1: - resolution: {integrity: sha512-6WfOG3jXR78DW8L5cTYCVVGAsIFZskRHCDo5tbqa+qtKVt4oDRVH7hyIWu1SpDQJlmIoEivNQZ5h+AGAOrgOtQ==} - dependencies: - '@types/linkify-it': 3.0.5 - '@types/mdurl': 1.0.5 - dev: true - - /@types/mdurl@1.0.5: - resolution: {integrity: sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==} - dev: true - - /@types/web-bluetooth@0.0.20: - resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} - dev: true - - /@vitejs/plugin-vue@5.0.4(vite@5.2.10)(vue@3.4.23): - resolution: {integrity: sha512-WS3hevEszI6CEVEx28F8RjTX97k3KsrcY6kvTg7+Whm5y3oYvcqzVeGCU3hxSAn4uY2CLCkeokkGKpoctccilQ==} - engines: {node: ^18.0.0 || >=20.0.0} - peerDependencies: - vite: ^5.0.0 - vue: ^3.2.25 - dependencies: - vite: 5.2.10 - vue: 3.4.23 - dev: true - - /@vue/compiler-core@3.4.23: - resolution: {integrity: sha512-HAFmuVEwNqNdmk+w4VCQ2pkLk1Vw4XYiiyxEp3z/xvl14aLTUBw2OfVH3vBcx+FtGsynQLkkhK410Nah1N2yyQ==} - dependencies: - '@babel/parser': 7.24.4 - '@vue/shared': 3.4.23 - entities: 4.5.0 - estree-walker: 2.0.2 - source-map-js: 1.2.0 - dev: true - - /@vue/compiler-dom@3.4.23: - resolution: {integrity: sha512-t0b9WSTnCRrzsBGrDd1LNR5HGzYTr7LX3z6nNBG+KGvZLqrT0mY6NsMzOqlVMBKKXKVuusbbB5aOOFgTY+senw==} - dependencies: - '@vue/compiler-core': 3.4.23 - '@vue/shared': 3.4.23 - dev: true - - /@vue/compiler-sfc@3.4.23: - resolution: {integrity: sha512-fSDTKTfzaRX1kNAUiaj8JB4AokikzStWgHooMhaxyjZerw624L+IAP/fvI4ZwMpwIh8f08PVzEnu4rg8/Npssw==} - dependencies: - '@babel/parser': 7.24.4 - '@vue/compiler-core': 3.4.23 - '@vue/compiler-dom': 3.4.23 - '@vue/compiler-ssr': 3.4.23 - '@vue/shared': 3.4.23 - estree-walker: 2.0.2 - magic-string: 0.30.8 - postcss: 8.4.38 - source-map-js: 1.2.0 - dev: true - - /@vue/compiler-ssr@3.4.23: - resolution: {integrity: sha512-hb6Uj2cYs+tfqz71Wj6h3E5t6OKvb4MVcM2Nl5i/z1nv1gjEhw+zYaNOV+Xwn+SSN/VZM0DgANw5TuJfxfezPg==} - dependencies: - '@vue/compiler-dom': 3.4.23 - '@vue/shared': 3.4.23 - dev: true - - /@vue/devtools-api@7.0.27(vue@3.4.23): - resolution: {integrity: sha512-BFCFCusSDcw2UcOFD/QeK7OxD1x2C/m+uAN30Q7jLKECSW53hmz0urzJmX834GuWDZX/hIxkyUKnLLfEIP1c/w==} - dependencies: - '@vue/devtools-kit': 7.0.27(vue@3.4.23) - transitivePeerDependencies: - - vue - dev: true - - /@vue/devtools-kit@7.0.27(vue@3.4.23): - resolution: {integrity: sha512-/A5xM38pPCFX5Yhl/lRFAzjyK6VNsH670nww2WbjFKWqlu3I+lMxWKzQkCW6A1V8bduITgl2kHORfg2gTw6QaA==} - peerDependencies: - vue: ^3.0.0 - dependencies: - '@vue/devtools-shared': 7.0.27 - hookable: 5.5.3 - mitt: 3.0.1 - perfect-debounce: 1.0.0 - speakingurl: 14.0.1 - vue: 3.4.23 - dev: true - - /@vue/devtools-shared@7.0.27: - resolution: {integrity: sha512-4VxtmZ6yjhiSloqZZq2UYU0TBGxOJ8GxWvp5OlAH70zYqi0FIAyWGPkOhvfoZ7DKQyv2UU0mmKzFHjsEkelGyQ==} - dependencies: - rfdc: 1.3.1 - dev: true - - /@vue/reactivity@3.4.23: - resolution: {integrity: sha512-GlXR9PL+23fQ3IqnbSQ8OQKLodjqCyoCrmdLKZk3BP7jN6prWheAfU7a3mrltewTkoBm+N7qMEb372VHIkQRMQ==} - dependencies: - '@vue/shared': 3.4.23 - dev: true - - /@vue/runtime-core@3.4.23: - resolution: {integrity: sha512-FeQ9MZEXoFzFkFiw9MQQ/FWs3srvrP+SjDKSeRIiQHIhtkzoj0X4rWQlRNHbGuSwLra6pMyjAttwixNMjc/xLw==} - dependencies: - '@vue/reactivity': 3.4.23 - '@vue/shared': 3.4.23 - dev: true - - /@vue/runtime-dom@3.4.23: - resolution: {integrity: sha512-RXJFwwykZWBkMiTPSLEWU3kgVLNAfActBfWFlZd0y79FTUxexogd0PLG4HH2LfOktjRxV47Nulygh0JFXe5f9A==} - dependencies: - '@vue/runtime-core': 3.4.23 - '@vue/shared': 3.4.23 - csstype: 3.1.3 - dev: true - - /@vue/server-renderer@3.4.23(vue@3.4.23): - resolution: {integrity: sha512-LDwGHtnIzvKFNS8dPJ1SSU5Gvm36p2ck8wCZc52fc3k/IfjKcwCyrWEf0Yag/2wTFUBXrqizfhK9c/mC367dXQ==} - peerDependencies: - vue: 3.4.23 - dependencies: - '@vue/compiler-ssr': 3.4.23 - '@vue/shared': 3.4.23 - vue: 3.4.23 - dev: true - - /@vue/shared@3.4.23: - resolution: {integrity: sha512-wBQ0gvf+SMwsCQOyusNw/GoXPV47WGd1xB5A1Pgzy0sQ3Bi5r5xm3n+92y3gCnB3MWqnRDdvfkRGxhKtbBRNgg==} - dev: true - - /@vueuse/core@10.9.0(vue@3.4.23): - resolution: {integrity: sha512-/1vjTol8SXnx6xewDEKfS0Ra//ncg4Hb0DaZiwKf7drgfMsKFExQ+FnnENcN6efPen+1kIzhLQoGSy0eDUVOMg==} - dependencies: - '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 10.9.0 - '@vueuse/shared': 10.9.0(vue@3.4.23) - vue-demi: 0.14.7(vue@3.4.23) - transitivePeerDependencies: - - '@vue/composition-api' - - vue - dev: true - - /@vueuse/integrations@10.9.0(focus-trap@7.5.4)(vue@3.4.23): - resolution: {integrity: sha512-acK+A01AYdWSvL4BZmCoJAcyHJ6EqhmkQEXbQLwev1MY7NBnS+hcEMx/BzVoR9zKI+UqEPMD9u6PsyAuiTRT4Q==} - peerDependencies: - async-validator: '*' - axios: '*' - change-case: '*' - drauu: '*' - focus-trap: '*' - fuse.js: '*' - idb-keyval: '*' - jwt-decode: '*' - nprogress: '*' - qrcode: '*' - sortablejs: '*' - universal-cookie: '*' - peerDependenciesMeta: - async-validator: - optional: true - axios: - optional: true - change-case: - optional: true - drauu: - optional: true - focus-trap: - optional: true - fuse.js: - optional: true - idb-keyval: - optional: true - jwt-decode: - optional: true - nprogress: - optional: true - qrcode: - optional: true - sortablejs: - optional: true - universal-cookie: - optional: true - dependencies: - '@vueuse/core': 10.9.0(vue@3.4.23) - '@vueuse/shared': 10.9.0(vue@3.4.23) - focus-trap: 7.5.4 - vue-demi: 0.14.7(vue@3.4.23) - transitivePeerDependencies: - - '@vue/composition-api' - - vue - dev: true - - /@vueuse/metadata@10.9.0: - resolution: {integrity: sha512-iddNbg3yZM0X7qFY2sAotomgdHK7YJ6sKUvQqbvwnf7TmaVPxS4EJydcNsVejNdS8iWCtDk+fYXr7E32nyTnGA==} - dev: true - - /@vueuse/shared@10.9.0(vue@3.4.23): - resolution: {integrity: sha512-Uud2IWncmAfJvRaFYzv5OHDli+FbOzxiVEQdLCKQKLyhz94PIyFC3CHcH7EDMwIn8NPtD06+PNbC/PiO0LGLtw==} - dependencies: - vue-demi: 0.14.7(vue@3.4.23) - transitivePeerDependencies: - - '@vue/composition-api' - - vue - dev: true - - /algoliasearch@4.22.1: - resolution: {integrity: sha512-jwydKFQJKIx9kIZ8Jm44SdpigFwRGPESaxZBaHSV0XWN2yBJAOT4mT7ppvlrpA4UGzz92pqFnVKr/kaZXrcreg==} - dependencies: - '@algolia/cache-browser-local-storage': 4.22.1 - '@algolia/cache-common': 4.22.1 - '@algolia/cache-in-memory': 4.22.1 - '@algolia/client-account': 4.22.1 - '@algolia/client-analytics': 4.22.1 - '@algolia/client-common': 4.22.1 - '@algolia/client-personalization': 4.22.1 - '@algolia/client-search': 4.22.1 - '@algolia/logger-common': 4.22.1 - '@algolia/logger-console': 4.22.1 - '@algolia/requester-browser-xhr': 4.22.1 - '@algolia/requester-common': 4.22.1 - '@algolia/requester-node-http': 4.22.1 - '@algolia/transporter': 4.22.1 - dev: true - - /argparse@2.0.1: - resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - dev: true - - /csstype@3.1.3: - resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} - dev: true - - /entities@3.0.1: - resolution: {integrity: sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==} - engines: {node: '>=0.12'} - dev: true - - /entities@4.5.0: - resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} - engines: {node: '>=0.12'} - dev: true - - /esbuild@0.20.2: - resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/aix-ppc64': 0.20.2 - '@esbuild/android-arm': 0.20.2 - '@esbuild/android-arm64': 0.20.2 - '@esbuild/android-x64': 0.20.2 - '@esbuild/darwin-arm64': 0.20.2 - '@esbuild/darwin-x64': 0.20.2 - '@esbuild/freebsd-arm64': 0.20.2 - '@esbuild/freebsd-x64': 0.20.2 - '@esbuild/linux-arm': 0.20.2 - '@esbuild/linux-arm64': 0.20.2 - '@esbuild/linux-ia32': 0.20.2 - '@esbuild/linux-loong64': 0.20.2 - '@esbuild/linux-mips64el': 0.20.2 - '@esbuild/linux-ppc64': 0.20.2 - '@esbuild/linux-riscv64': 0.20.2 - '@esbuild/linux-s390x': 0.20.2 - '@esbuild/linux-x64': 0.20.2 - '@esbuild/netbsd-x64': 0.20.2 - '@esbuild/openbsd-x64': 0.20.2 - '@esbuild/sunos-x64': 0.20.2 - '@esbuild/win32-arm64': 0.20.2 - '@esbuild/win32-ia32': 0.20.2 - '@esbuild/win32-x64': 0.20.2 - dev: true - - /estree-walker@2.0.2: - resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} - dev: true - - /flexsearch@0.7.43: - resolution: {integrity: sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==} - dev: true - - /focus-trap@7.5.4: - resolution: {integrity: sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==} - dependencies: - tabbable: 6.2.0 - dev: true - - /fsevents@2.3.3: - resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==} - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /glob-to-regexp@0.4.1: - resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - dev: true - - /hookable@5.5.3: - resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} - dev: true - - /linkify-it@4.0.1: - resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==} - dependencies: - uc.micro: 1.0.6 - dev: true - - /magic-string@0.30.8: - resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - - /mark.js@8.11.1: - resolution: {integrity: sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==} - dev: true - - /markdown-it@13.0.2: - resolution: {integrity: sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==} - hasBin: true - dependencies: - argparse: 2.0.1 - entities: 3.0.1 - linkify-it: 4.0.1 - mdurl: 1.0.1 - uc.micro: 1.0.6 - dev: true - - /mdurl@1.0.1: - resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==} - dev: true - - /minisearch@6.3.0: - resolution: {integrity: sha512-ihFnidEeU8iXzcVHy74dhkxh/dn8Dc08ERl0xwoMMGqp4+LvRSCgicb+zGqWthVokQKvCSxITlh3P08OzdTYCQ==} - dev: true - - /mitt@3.0.1: - resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==} - dev: true - - /nanoid@3.3.7: - resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==} - engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} - hasBin: true - dev: true - - /perfect-debounce@1.0.0: - resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==} - dev: true - - /picocolors@1.0.0: - resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} - dev: true - - /postcss@8.4.38: - resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} - engines: {node: ^10 || ^12 || >=14} - dependencies: - nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.2.0 - dev: true - - /preact@10.19.6: - resolution: {integrity: sha512-gympg+T2Z1fG1unB8NH29yHJwnEaCH37Z32diPDku316OTnRPeMbiRV9kTrfZpocXjdfnWuFUl/Mj4BHaf6gnw==} - dev: true - - /rfdc@1.3.1: - resolution: {integrity: sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==} - dev: true - - /rollup@4.13.0: - resolution: {integrity: sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==} - engines: {node: '>=18.0.0', npm: '>=8.0.0'} - hasBin: true - dependencies: - '@types/estree': 1.0.5 - optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.13.0 - '@rollup/rollup-android-arm64': 4.13.0 - '@rollup/rollup-darwin-arm64': 4.13.0 - '@rollup/rollup-darwin-x64': 4.13.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.13.0 - '@rollup/rollup-linux-arm64-gnu': 4.13.0 - '@rollup/rollup-linux-arm64-musl': 4.13.0 - '@rollup/rollup-linux-riscv64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-gnu': 4.13.0 - '@rollup/rollup-linux-x64-musl': 4.13.0 - '@rollup/rollup-win32-arm64-msvc': 4.13.0 - '@rollup/rollup-win32-ia32-msvc': 4.13.0 - '@rollup/rollup-win32-x64-msvc': 4.13.0 - fsevents: 2.3.3 - dev: true - - /search-insights@2.13.0: - resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} - dev: true - - /shiki@1.3.0: - resolution: {integrity: sha512-9aNdQy/etMXctnPzsje1h1XIGm9YfRcSksKOGqZWXA/qP9G18/8fpz5Bjpma8bOgz3tqIpjERAd6/lLjFyzoww==} - dependencies: - '@shikijs/core': 1.3.0 - dev: true - - /source-map-js@1.2.0: - resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} - engines: {node: '>=0.10.0'} - dev: true - - /speakingurl@14.0.1: - resolution: {integrity: sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==} - engines: {node: '>=0.10.0'} - dev: true - - /tabbable@6.2.0: - resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} - dev: true - - /to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - dev: true - - /uc.micro@1.0.6: - resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==} - dev: true - - /vite@5.2.10: - resolution: {integrity: sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==} - engines: {node: ^18.0.0 || >=20.0.0} - hasBin: true - peerDependencies: - '@types/node': ^18.0.0 || >=20.0.0 - less: '*' - lightningcss: ^1.21.0 - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - lightningcss: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - esbuild: 0.20.2 - postcss: 8.4.38 - rollup: 4.13.0 - optionalDependencies: - fsevents: 2.3.3 - dev: true - - /vitepress-plugin-search@1.0.4-alpha.22(flexsearch@0.7.43)(vitepress@1.1.3)(vue@3.4.23): - resolution: {integrity: sha512-IAOEJu+kjVY+0pb6/PeRjIbr175HFFbnMdLmLjqcy7VWxkabIRZbLoQL1VUYDZl804o/Or+GaX02gsiMOnVxFA==} - engines: {node: ^14.13.1 || ^16.7.0 || >=18} - peerDependencies: - flexsearch: ^0.7.31 - vitepress: ^1.0.0-rc.35 - vue: '3' - dependencies: - '@types/flexsearch': 0.7.6 - '@types/markdown-it': 12.2.3 - flexsearch: 0.7.43 - glob-to-regexp: 0.4.1 - markdown-it: 13.0.2 - vitepress: 1.1.3(@algolia/client-search@4.22.1)(search-insights@2.13.0) - vue: 3.4.23 - dev: true - - /vitepress@1.1.3(@algolia/client-search@4.22.1)(search-insights@2.13.0): - resolution: {integrity: sha512-hGrIYN0w9IHWs0NQSnlMjKV/v/HLfD+Ywv5QdvCSkiT32mpNOOwUrZjnqZv/JL/WBPpUc94eghTUvmipxw0xrA==} - hasBin: true - peerDependencies: - markdown-it-mathjax3: ^4 - postcss: ^8 - peerDependenciesMeta: - markdown-it-mathjax3: - optional: true - postcss: - optional: true - dependencies: - '@docsearch/css': 3.6.0 - '@docsearch/js': 3.6.0(@algolia/client-search@4.22.1)(search-insights@2.13.0) - '@shikijs/core': 1.3.0 - '@shikijs/transformers': 1.3.0 - '@types/markdown-it': 14.0.1 - '@vitejs/plugin-vue': 5.0.4(vite@5.2.10)(vue@3.4.23) - '@vue/devtools-api': 7.0.27(vue@3.4.23) - '@vueuse/core': 10.9.0(vue@3.4.23) - '@vueuse/integrations': 10.9.0(focus-trap@7.5.4)(vue@3.4.23) - focus-trap: 7.5.4 - mark.js: 8.11.1 - minisearch: 6.3.0 - shiki: 1.3.0 - vite: 5.2.10 - vue: 3.4.23 - transitivePeerDependencies: - - '@algolia/client-search' - - '@types/node' - - '@types/react' - - '@vue/composition-api' - - async-validator - - axios - - change-case - - drauu - - fuse.js - - idb-keyval - - jwt-decode - - less - - lightningcss - - nprogress - - qrcode - - react - - react-dom - - sass - - search-insights - - sortablejs - - stylus - - sugarss - - terser - - typescript - - universal-cookie - dev: true - - /vue-demi@0.14.7(vue@3.4.23): - resolution: {integrity: sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - peerDependencies: - '@vue/composition-api': ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - '@vue/composition-api': - optional: true - dependencies: - vue: 3.4.23 - dev: true - - /vue@3.4.23: - resolution: {integrity: sha512-X1y6yyGJ28LMUBJ0k/qIeKHstGd+BlWQEOT40x3auJFTmpIhpbKLgN7EFsqalnJXq1Km5ybDEsp6BhuWKciUDg==} - peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true - dependencies: - '@vue/compiler-dom': 3.4.23 - '@vue/compiler-sfc': 3.4.23 - '@vue/runtime-dom': 3.4.23 - '@vue/server-renderer': 3.4.23(vue@3.4.23) - '@vue/shared': 3.4.23 - dev: true diff --git a/docs/pnpm-workspace.yaml b/docs/pnpm-workspace.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/docs/vitepress_docs/.vitepress/config.ts b/docs/vitepress_docs/.vitepress/config.ts deleted file mode 100644 index 754f6c0..0000000 --- a/docs/vitepress_docs/.vitepress/config.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { defineConfig } from "vitepress"; -import { SearchPlugin } from "vitepress-plugin-search"; -// https://vitepress.dev/reference/site-config -export default defineConfig({ - title: "Solid-CLI Docs", - description: "Documentation for the Solid CLI", - themeConfig: { - // https://vitepress.dev/reference/default-theme-config - nav: [ - { text: "Home", link: "/" }, - { text: "Guide", link: "/about" }, - ], - - sidebar: [ - { - text: "Getting started", - items: [ - { text: "About", link: "/about" }, - { text: "Installation", link: "/installation" }, - { text: "Basic Commands", link: "/basic-commands" }, - { text: "SolidStart Commands", link: "/start-commands" }, - ], - }, - { text: "Supported Integrations", link: "/supported-integrations" }, - ], - socialLinks: [ - { - icon: "github", - link: "https://github.com/solidjs-community/solid-cli", - }, - ], - }, - vite: { plugins: [SearchPlugin()] }, -}); diff --git a/docs/vitepress_docs/.vitepress/theme/index.ts b/docs/vitepress_docs/.vitepress/theme/index.ts deleted file mode 100644 index 09d0a1a..0000000 --- a/docs/vitepress_docs/.vitepress/theme/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -// https://vitepress.dev/guide/custom-theme -import { h } from "vue"; -import Theme from "vitepress/theme"; -import "./style.css"; - -export default { - extends: Theme, - Layout: () => { - return h(Theme.Layout, null, { - // https://vitepress.dev/guide/extending-default-theme#layout-slots - }); - }, - enhanceApp({ app, router, siteData }) { - // ... - }, -}; diff --git a/docs/vitepress_docs/.vitepress/theme/style.css b/docs/vitepress_docs/.vitepress/theme/style.css deleted file mode 100644 index bab0266..0000000 --- a/docs/vitepress_docs/.vitepress/theme/style.css +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Customize default theme styling by overriding CSS variables: - * https://github.com/vuejs/vitepress/blob/main/src/client/theme-default/styles/vars.css - */ - -/** - * Colors - * -------------------------------------------------------------------------- */ - -:root { - --vp-c-brand: #646cff; - --vp-c-brand-light: #747bff; - --vp-c-brand-lighter: #9499ff; - --vp-c-brand-lightest: #bcc0ff; - --vp-c-brand-dark: #535bf2; - --vp-c-brand-darker: #454ce1; - --vp-c-brand-dimm: rgba(100, 108, 255, 0.08); -} - -/** - * Component: Button - * -------------------------------------------------------------------------- */ - -:root { - --vp-button-brand-border: var(--vp-c-brand-light); - --vp-button-brand-text: var(--vp-c-white); - --vp-button-brand-bg: var(--vp-c-brand); - --vp-button-brand-hover-border: var(--vp-c-brand-light); - --vp-button-brand-hover-text: var(--vp-c-white); - --vp-button-brand-hover-bg: var(--vp-c-brand-light); - --vp-button-brand-active-border: var(--vp-c-brand-light); - --vp-button-brand-active-text: var(--vp-c-white); - --vp-button-brand-active-bg: var(--vp-button-brand-bg); -} - -/** - * Component: Home - * -------------------------------------------------------------------------- */ - -:root { - --vp-home-hero-name-color: transparent; - --vp-home-hero-name-background: -webkit-linear-gradient(120deg, #bd34fe 30%, #41d1ff); - - --vp-home-hero-image-background-image: linear-gradient(-45deg, #bd34fe 50%, #47caff 50%); - --vp-home-hero-image-filter: blur(40px); -} - -@media (min-width: 640px) { - :root { - --vp-home-hero-image-filter: blur(56px); - } -} - -@media (min-width: 960px) { - :root { - --vp-home-hero-image-filter: blur(72px); - } -} - -/** - * Component: Custom Block - * -------------------------------------------------------------------------- */ - -:root { - --vp-custom-block-tip-border: var(--vp-c-brand); - --vp-custom-block-tip-text: var(--vp-c-brand-darker); - --vp-custom-block-tip-bg: var(--vp-c-brand-dimm); -} - -.dark { - --vp-custom-block-tip-border: var(--vp-c-brand); - --vp-custom-block-tip-text: var(--vp-c-brand-lightest); - --vp-custom-block-tip-bg: var(--vp-c-brand-dimm); -} - -/** - * Component: Algolia - * -------------------------------------------------------------------------- */ - -.DocSearch { - --docsearch-primary-color: var(--vp-c-brand) !important; -} diff --git a/docs/vitepress_docs/about.md b/docs/vitepress_docs/about.md deleted file mode 100644 index 504eb5c..0000000 --- a/docs/vitepress_docs/about.md +++ /dev/null @@ -1,17 +0,0 @@ -# About - -The Solid CLI is a tool aiming to make the Solid development experience easier, faster, and less error prone. - -## Features - -### Automatic Config manipulation - -Can automatically update your config to enable solid features, such as toggling SSR, or adding adapters. - -### Adding integrations - -Can automatically install and configure supported packages. - -### Project creation - -Provides an easy way to create new projects, whether that be locally, or on a platform such as stackblitz or codesandbox. diff --git a/docs/vitepress_docs/basic-commands.md b/docs/vitepress_docs/basic-commands.md deleted file mode 100644 index 8fe045c..0000000 --- a/docs/vitepress_docs/basic-commands.md +++ /dev/null @@ -1,84 +0,0 @@ -# Basic Commands - -### `Add` - -```sh -solid add -``` - -Used to add packages and setup integrations. - -::: info -By default, when no arguments or flags are passed, this command will open up a searchable multiselect for you to be able to search through -all supported integrations and packages. You can select the ones you want to use through there. -::: - -**Options** - -| Option | Description | -| --------------- | ------------------------------------------------------------------------------------------------------ | -| `` | List of integrations you want to add to your project (ie. unocss, vitepwa, solid-devtools) | -| `--force` | Force apply any changes to the config to add the integration(s) even if they already exist `(boolean)` | - ---- - -### `New` - -```sh -solid new -``` - -Creates a new solid project with the selected variation and name. - -This can also be used to spin up a new stackblitz or codesandbox instance. - -**Options** - -| Option | Description | -| -------------------------- | ------------------------------------------------------------------------------------------- | -| `` | The variation you want to start the project from. One of the following: "bare", "js", "ts". | -| `` | The name of the project and the folder to create it in. | -| `--stackblitz (short: -s)` | Create the project with the variation in a stackblitz instance. `(boolean)` | - ---- - -### `Docs` - -```sh -solid docs -``` - -Searches for a given keyword within the main solid documentation sites - -**Options** - -| Option | Description | -| ----------- | ---------------------------------------------- | -| `` | The keyword to search within the docs websites | - ---- - -### `Set` - -```sh -solid set -``` - -Sets a specified config parameter to a specified value - -**Options** - -| Option | Description | -| --------- | -------------------------------- | -| `` | The key within the config to set | -| `` | The value to set that key to | - ---- - -### `Playground` - -```sh -solid playground -``` - -Attempts to open the [Solid Playground](https://playground.solidjs.com) in the browser diff --git a/docs/vitepress_docs/index.md b/docs/vitepress_docs/index.md deleted file mode 100644 index 551ee49..0000000 --- a/docs/vitepress_docs/index.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -# https://vitepress.dev/reference/default-theme-home-page -layout: home - -hero: - name: "Solid-CLI Docs" - text: "Documentation for the Solid CLI" - tagline: A solid cli - actions: - - theme: brand - text: Get started - link: /about -features: - - title: Package manager - icon: 📦 - details: Installs solid related packages, and automatically configures them in your project. - - title: Customisable - details: Plugins can be used to extend or manipulate existing functionality - icon: 🎨 - - title: Automatic configuration - icon: ♻ - details: Can automatically enable or disable features within solid, such as automatically enabling SSR ---- diff --git a/docs/vitepress_docs/installation.md b/docs/vitepress_docs/installation.md deleted file mode 100644 index 4729ad2..0000000 --- a/docs/vitepress_docs/installation.md +++ /dev/null @@ -1,41 +0,0 @@ -# Installation - -The CLI can be installed locally to your project via - -```sh -npm install @solid-cli/core -``` - -Or installed globally: - -### UNIX/MacOS/Linux - -In order to install global packages on Unix based systems you will need to grant npm special system permissions using the `sudo` command, suffixed by the command you would like to run. - -```sh -sudo npm install -g @solid-cli/core -``` - -### Windows - -```sh -npm install -g @solid-cli/core -``` - -It can then be invoked via the keyword `solid`, and the help page can be displayed with `solid --help` - -```txt -┌ Solid-CLI -solid - -where can be one of: - -- add - Can add and install integrations: `solid add unocss`. -- docs -- new - Creates a new solid project -- set -- start - Commands specific to solid start -- playground - -For more help, try running `solid --help` -``` diff --git a/docs/vitepress_docs/start-commands.md b/docs/vitepress_docs/start-commands.md deleted file mode 100644 index 28bfffd..0000000 --- a/docs/vitepress_docs/start-commands.md +++ /dev/null @@ -1,64 +0,0 @@ -# SolidStart Commands - -### `Mode` - -```sh -solid start mode -``` - -Set the rendering mode for solid to build for and use (ie. Client-Side Rendering (CSR), Server-Side Rendering (SSR), Static-Site Generation (SSG)) - -**Options** - -| Option | Description | -| -------- | -------------------------------------------------------------- | -| `` | The rendering mode to use. One of the following: csr, ssr, ssg | - ---- - -### `Route` - -```sh -solid start route -``` - -Creates a new route file in the file routes directory. - -**Options** - -| Option | Description | -| -------- | ------------------------------------------- | -| `` | The path to the new route | -| `` | The name of the `.tsx` file to be generated | - ---- - -### `Adapter` - -```sh -solid start adapter -``` - -Used to setup a SolidStart specific adapter. - -**Options** - -| Option | Description | -| --------- | -------------------------------- | -| `` | The name of the adapter `string` | -| `--force` | Force setup the adapater | - -### `Data` - -```sh -solid start data -``` - -Creates a new data file at the given path - -**Options** - -| Option | Description | -| -------- | ----------------------------------------------- | -| `` | The path to the new data file | -| `` | The name of the `.data.ts` file to be generated | diff --git a/docs/vitepress_docs/supported-integrations.md b/docs/vitepress_docs/supported-integrations.md deleted file mode 100644 index 934ee99..0000000 --- a/docs/vitepress_docs/supported-integrations.md +++ /dev/null @@ -1,21 +0,0 @@ -# Supported Integrations - -## Adapters - -- [AWS](https://github.com/solidjs/solid-start/tree/main/packages/start-aws) -- [Cloudflare-pages](https://github.com/solidjs/solid-start/tree/main/packages/start-cloudflare-pages) -- [Cloudflare-workers](https://github.com/solidjs/solid-start/tree/main/packages/start-cloudflare-workers) -- [Deno](https://github.com/solidjs/solid-start/tree/main/packages/start-deno) -- [Netlify](https://github.com/solidjs/solid-start/tree/main/packages/start-netlify) -- [Node](https://github.com/solidjs/solid-start/tree/main/packages/start-node) -- [Static](https://github.com/solidjs/solid-start/tree/main/packages/start-static) -- [Vercel](https://github.com/solidjs/solid-start/tree/main/packages/start-vercel) - -## Packages - -These packages will be automatically installed and configured with sensible defaults: - -- [UnoCSS](https://unocss.dev/) -- [Tailwind CSS](https://tailwindcss.com/) -- [Solid Devtools](https://github.com/thetarnav/solid-devtools) -- [VitePWA](https://vite-pwa-org.netlify.app) From 4cdb866efd33c7c756646984146488adcb978268 Mon Sep 17 00:00:00 2001 From: Colin McDonnell <3084745+colinhacks@users.noreply.github.com> Date: Tue, 30 Jun 2026 19:01:48 -0700 Subject: [PATCH 263/290] feat: detect nub package manager --- packages/utils/src/package-manager/index.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/utils/src/package-manager/index.ts b/packages/utils/src/package-manager/index.ts index a1720e5..d7c6230 100644 --- a/packages/utils/src/package-manager/index.ts +++ b/packages/utils/src/package-manager/index.ts @@ -40,6 +40,15 @@ export const detectPackageManager = (): PackageManager => { return `task ${s}`; }, }; + case userAgent.startsWith("nub"): + return { + name: "nub", + runner: "nubx", + installCommand: "add", + runScriptCommand(s) { + return `run ${s}`; + }, + }; default: return { name: "npm", From 44a06d52315b02677f20d1782d607a579868d053 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 12 Jul 2026 11:25:10 +0100 Subject: [PATCH 264/290] chore: update start v2 templates list --- packages/create/src/utils/constants.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 4d49568..d665539 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -86,9 +86,11 @@ export type StartTemplate = (typeof START_TEMPLATES)[number]; const START_TEMPLATES_V2 = [ "basic", "bare", + "with-solidbase", "hackernews", "notes", "with-auth", + "with-authjs", "with-drizzle", "with-mdx", "with-prisma", @@ -97,6 +99,8 @@ const START_TEMPLATES_V2 = [ "with-trpc", "with-unocss", "with-vitest", + "with-strict-csp", + "with-tanstack-router", ] as const satisfies string[]; export type StartTemplateV2 = (typeof START_TEMPLATES_V2)[number]; From cdb7843e5d270c5f03bcaa1a81b095f764fee00d Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 12 Jul 2026 11:38:13 +0100 Subject: [PATCH 265/290] chore: update dependencies --- package.json | 16 +- packages/create-solid/package.json | 2 +- packages/create/package.json | 4 +- packages/full-solid/package.json | 2 +- packages/utils/package.json | 4 +- pnpm-lock.yaml | 501 ++++++++++++++++++++--------- pnpm-workspace.yaml | 2 + turbo.json | 2 +- 8 files changed, 359 insertions(+), 174 deletions(-) diff --git a/package.json b/package.json index cb8cdff..2827480 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,14 @@ "./packages/*" ], "devDependencies": { - "@types/node": "25.9.1", - "tsup": "^8.5.1", - "typescript": "^6.0.3", "@changesets/cli": "2.31.0", - "prettier": "^3.8.3", - "turbo": "^2.9.16", - "vitest": "^4.1.8", - "jiti": "^2.7.0" + "@types/node": "26.1.1", + "jiti": "^2.7.0", + "prettier": "^3.9.5", + "tsup": "^8.5.1", + "turbo": "^2.10.4", + "typescript": "^7.0.2", + "vitest": "^4.1.10" }, - "packageManager": "pnpm@11.5.1+sha512.93f7b57422ea7068257235b4c16eb60762eb68e1dc23723199cc739043ea9be2c4143274a399d8c6defa2b1176226d9ca1c4b63482d6200c1a8fbaa78c1d1485" + "packageManager": "pnpm@11.12.0" } diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ab8dba7..ffadf41 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -31,7 +31,7 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "1.5.0", + "@clack/prompts": "1.7.0", "picocolors": "^1.1.1", "citty": "^0.2.2", "@solid-cli/create": "workspace:*" diff --git a/packages/create/package.json b/packages/create/package.json index c32c3cc..b392ae3 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -40,9 +40,9 @@ "access": "public" }, "dependencies": { - "@clack/prompts": "1.5.0", + "@clack/prompts": "1.7.0", "picocolors": "^1.1.1", - "@begit/core": "^0.3.4", + "@begit/core": "^0.3.5", "citty": "^0.2.2", "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 1da9967..e36e068 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -30,7 +30,7 @@ "test": "vitest run" }, "devDependencies": { - "@clack/prompts": "1.5.0", + "@clack/prompts": "1.7.0", "picocolors": "^1.1.1", "citty": "^0.2.2", "@solid-cli/create": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index 13afca1..8799b99 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -73,8 +73,8 @@ "access": "public" }, "dependencies": { - "@clack/core": "1.4.0", - "@clack/prompts": "1.5.0", + "@clack/core": "1.4.3", + "@clack/prompts": "1.7.0", "execa": "^9.6.1", "picocolors": "^1.1.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 96388f1..759677c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,37 +10,37 @@ importers: devDependencies: '@changesets/cli': specifier: 2.31.0 - version: 2.31.0(@types/node@25.9.1) + version: 2.31.0(@types/node@26.1.1) '@types/node': - specifier: 25.9.1 - version: 25.9.1 + specifier: 26.1.1 + version: 26.1.1 jiti: specifier: ^2.7.0 version: 2.7.0 prettier: - specifier: ^3.8.3 - version: 3.8.3 + specifier: ^3.9.5 + version: 3.9.5 tsup: specifier: ^8.5.1 - version: 8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@6.0.3) + version: 8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@7.0.2) turbo: - specifier: ^2.9.16 - version: 2.9.16 + specifier: ^2.10.4 + version: 2.10.4 typescript: - specifier: ^6.0.3 - version: 6.0.3 + specifier: ^7.0.2 + version: 7.0.2 vitest: - specifier: ^4.1.8 - version: 4.1.8(@types/node@25.9.1)(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0)) + specifier: ^4.1.10 + version: 4.1.10(@types/node@26.1.1)(vite@7.3.1(@types/node@26.1.1)(jiti@2.7.0)) packages/create: dependencies: '@begit/core': - specifier: ^0.3.4 - version: 0.3.4 + specifier: ^0.3.5 + version: 0.3.5 '@clack/prompts': - specifier: 1.5.0 - version: 1.5.0 + specifier: 1.7.0 + version: 1.7.0 '@solid-cli/utils': specifier: workspace:* version: link:../utils @@ -57,8 +57,8 @@ importers: packages/create-solid: devDependencies: '@clack/prompts': - specifier: 1.5.0 - version: 1.5.0 + specifier: 1.7.0 + version: 1.7.0 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -72,8 +72,8 @@ importers: packages/full-solid: devDependencies: '@clack/prompts': - specifier: 1.5.0 - version: 1.5.0 + specifier: 1.7.0 + version: 1.7.0 '@solid-cli/create': specifier: workspace:* version: link:../create @@ -90,11 +90,11 @@ importers: packages/utils: dependencies: '@clack/core': - specifier: 1.4.0 - version: 1.4.0 + specifier: 1.4.3 + version: 1.4.3 '@clack/prompts': - specifier: 1.5.0 - version: 1.5.0 + specifier: 1.7.0 + version: 1.7.0 execa: specifier: ^9.6.1 version: 9.6.1 @@ -141,8 +141,8 @@ packages: resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==} engines: {node: '>=6.9.0'} - '@begit/core@0.3.4': - resolution: {integrity: sha512-vW4xQ51uXYB6apjY3Y1RkfHpTcyYpV2v+eb2ndEvF9HnJlGbkKmXQYCGlQd2SfLKBQJk5GDic0xwxA8japdTuw==} + '@begit/core@0.3.5': + resolution: {integrity: sha512-yU9TTCFKhIFV/JCWM/1Fqx0Kb/3kzvXLyuD8aXfCMrReIuI9IM/riPoVSHyT2l/h1XICau/NRV5cZXFF5RhcnQ==} '@changesets/apply-release-plan@7.1.1': resolution: {integrity: sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==} @@ -199,12 +199,12 @@ packages: '@changesets/write@0.4.0': resolution: {integrity: sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==} - '@clack/core@1.4.0': - resolution: {integrity: sha512-7Wctjq6f7c1CPz8sPpkwUnz8yRgVANkpNupb81q432FjcJg4l+Sw7XANdNSdWfAKq0IHI0JTcUeK5dxs/HrGPw==} + '@clack/core@1.4.3': + resolution: {integrity: sha512-/kr3UWNtdJfxZtPgDqUOmG2pvwlmcLGheex5yiZKdwbzZJxhV+HMNR9QNmyY5cGwTNV6LrR7Jtp+KjhUAP1qBQ==} engines: {node: '>= 20.12.0'} - '@clack/prompts@1.5.0': - resolution: {integrity: sha512-wKh+wTjmrUoUdkZg8KpJO5X+p9PWV+KE9mePseq9UYWkukgTKsGS47RRL2HstwVcvDQH+PenrPJWII8+MfiiyA==} + '@clack/prompts@1.7.0': + resolution: {integrity: sha512-y7/yvZ2TPAnR9+jnc00klvNNLkJiXFFrQA/hlLCcxA9a2A4zQIOimyFQ9XfwYKiGD1fb5GY8vbKIIgO8d5Tb2A==} engines: {node: '>= 20.12.0'} '@esbuild/aix-ppc64@0.27.2': @@ -395,9 +395,6 @@ packages: '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - '@jridgewell/sourcemap-codec@1.5.0': - resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} - '@jridgewell/sourcemap-codec@1.5.5': resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} @@ -758,33 +755,33 @@ packages: '@swc/types@0.1.17': resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} - '@turbo/darwin-64@2.9.16': - resolution: {integrity: sha512-jLjApWTSNd7JZ5JaLYfelW1ytnGQOvB7ivl+2RD1xQvJTbi8I9gBjzcga7tDZVPyaxpl10YTfJt3BrYXR18KDw==} + '@turbo/darwin-64@2.10.4': + resolution: {integrity: sha512-m1MUEI4MJ69r5CwfMYxmHi0H0rrgiYCBOp0tgBZ9x/YVvOb5uu/lRIDyDwdtH054R2yWeQaIigUGu6aCX9f8cA==} cpu: [x64] os: [darwin] - '@turbo/darwin-arm64@2.9.16': - resolution: {integrity: sha512-YPgrn+5HIGzrx0O2a631SV4MBQUe4W/DafMFUuBVgaU32PW9/OTT0ehviF0QSxTXuRJlHvW2eUTemddF5/spmw==} + '@turbo/darwin-arm64@2.10.4': + resolution: {integrity: sha512-VQ1Yxs5zkPT+2z7t1P4mvn6JmcKLkOCAsPuK9XbOvuVj0DlTlETfIXNisX0771v/vTWHOQqiwoGi+TtAUq8efw==} cpu: [arm64] os: [darwin] - '@turbo/linux-64@2.9.16': - resolution: {integrity: sha512-vAEf1H6l26lTpl9FJ/peQo1NUB8RC0sbEJJz5mPcUhHA2bPDup2x3CZPgo/bH8S4cUcBLm4FN3UHd5iUO2RAew==} + '@turbo/linux-64@2.10.4': + resolution: {integrity: sha512-IzV1QovmwX7mfGnVinmE++2IB8tbeo38weltiuH5zNqwCTBjLs/DytyRKx+bmnhHdXIq9SheR8p0Nip/LBUPHg==} cpu: [x64] os: [linux] - '@turbo/linux-arm64@2.9.16': - resolution: {integrity: sha512-xDBLR2PZg4BrQOchfG6svgpv5FCNJ2TOtT2psLdEJcdKo1BH+pnPs9Xj6pvUjgfkHbuvBOfeE4R6tvxMoQKDHQ==} + '@turbo/linux-arm64@2.10.4': + resolution: {integrity: sha512-rfujSQkP5aYiRn0PgTM7F00WkJCP/bKDVZbOx3WmrZwa/vHA0bplhCl328kpX7VI9HH2vI90ISGwuSVgJgoqTw==} cpu: [arm64] os: [linux] - '@turbo/windows-64@2.9.16': - resolution: {integrity: sha512-NBAJnaUiGdgkSzQwUIdOvkCkcpTSu58G/sBGa0mvBtzfvFOOgrQwepKOOQ8cp6sWM6OcKDNFj2p1dsZA1OWjPg==} + '@turbo/windows-64@2.10.4': + resolution: {integrity: sha512-NnspP7Wd5fa3Wwnqv9bKfhegqZzuHBgbPxdZU/idTLQcazx/vgKu95JlCx2YHY0hdvKCnPcARrDwM+KEUmaO7A==} cpu: [x64] os: [win32] - '@turbo/windows-arm64@2.9.16': - resolution: {integrity: sha512-Y7SJppD0Z8wjO3Ec0ZGd9KQ4Yv0BMnA8CIowj5Vp+OEVsosXDG2weK6/t1RRLfJmc2Ozrnd6y4DOgQys+mn3WQ==} + '@turbo/windows-arm64@2.10.4': + resolution: {integrity: sha512-Iv02YgOpaEShc2OkG7mgCJ2pEw1RUKiKbs0h8W5wAf4jZ5vpmraTEjuGTgHRuOORQnC1GN3KHo5WB+hu1abRMA==} cpu: [arm64] os: [win32] @@ -803,14 +800,134 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@25.9.1': - resolution: {integrity: sha512-xfrlY7UD5rMJk3ZVJP8BNzS28J36YJg+xp+LPXV1TdWxr8uMH5A860QNxYDGQe/ylDSgjxE52Q9VnO7p75tJxg==} + '@types/node@26.1.1': + resolution: {integrity: sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw==} + + '@typescript/typescript-aix-ppc64@7.0.2': + resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==} + engines: {node: '>=16.20.0'} + cpu: [ppc64] + os: [aix] + + '@typescript/typescript-darwin-arm64@7.0.2': + resolution: {integrity: sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [darwin] + + '@typescript/typescript-darwin-x64@7.0.2': + resolution: {integrity: sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [darwin] + + '@typescript/typescript-freebsd-arm64@7.0.2': + resolution: {integrity: sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [freebsd] + + '@typescript/typescript-freebsd-x64@7.0.2': + resolution: {integrity: sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [freebsd] + + '@typescript/typescript-linux-arm64@7.0.2': + resolution: {integrity: sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [linux] + + '@typescript/typescript-linux-arm@7.0.2': + resolution: {integrity: sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==} + engines: {node: '>=16.20.0'} + cpu: [arm] + os: [linux] + + '@typescript/typescript-linux-loong64@7.0.2': + resolution: {integrity: sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==} + engines: {node: '>=16.20.0'} + cpu: [loong64] + os: [linux] + + '@typescript/typescript-linux-mips64el@7.0.2': + resolution: {integrity: sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==} + engines: {node: '>=16.20.0'} + cpu: [mips64el] + os: [linux] + + '@typescript/typescript-linux-ppc64@7.0.2': + resolution: {integrity: sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==} + engines: {node: '>=16.20.0'} + cpu: [ppc64] + os: [linux] + + '@typescript/typescript-linux-riscv64@7.0.2': + resolution: {integrity: sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==} + engines: {node: '>=16.20.0'} + cpu: [riscv64] + os: [linux] - '@vitest/expect@4.1.8': - resolution: {integrity: sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==} + '@typescript/typescript-linux-s390x@7.0.2': + resolution: {integrity: sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==} + engines: {node: '>=16.20.0'} + cpu: [s390x] + os: [linux] - '@vitest/mocker@4.1.8': - resolution: {integrity: sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==} + '@typescript/typescript-linux-x64@7.0.2': + resolution: {integrity: sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [linux] + + '@typescript/typescript-netbsd-arm64@7.0.2': + resolution: {integrity: sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [netbsd] + + '@typescript/typescript-netbsd-x64@7.0.2': + resolution: {integrity: sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [netbsd] + + '@typescript/typescript-openbsd-arm64@7.0.2': + resolution: {integrity: sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [openbsd] + + '@typescript/typescript-openbsd-x64@7.0.2': + resolution: {integrity: sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [openbsd] + + '@typescript/typescript-sunos-x64@7.0.2': + resolution: {integrity: sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [sunos] + + '@typescript/typescript-win32-arm64@7.0.2': + resolution: {integrity: sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [win32] + + '@typescript/typescript-win32-x64@7.0.2': + resolution: {integrity: sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [win32] + + '@vitest/expect@4.1.10': + resolution: {integrity: sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==} + + '@vitest/mocker@4.1.10': + resolution: {integrity: sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==} peerDependencies: msw: ^2.4.9 vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -820,20 +937,20 @@ packages: vite: optional: true - '@vitest/pretty-format@4.1.8': - resolution: {integrity: sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==} + '@vitest/pretty-format@4.1.10': + resolution: {integrity: sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==} - '@vitest/runner@4.1.8': - resolution: {integrity: sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==} + '@vitest/runner@4.1.10': + resolution: {integrity: sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==} - '@vitest/snapshot@4.1.8': - resolution: {integrity: sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==} + '@vitest/snapshot@4.1.10': + resolution: {integrity: sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==} - '@vitest/spy@4.1.8': - resolution: {integrity: sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==} + '@vitest/spy@4.1.10': + resolution: {integrity: sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==} - '@vitest/utils@4.1.8': - resolution: {integrity: sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==} + '@vitest/utils@4.1.10': + resolution: {integrity: sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==} acorn@8.14.1: resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==} @@ -1183,9 +1300,6 @@ packages: resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} engines: {node: 14 || >=16.14} - magic-string@0.30.17: - resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} - magic-string@0.30.21: resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==} @@ -1305,10 +1419,6 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - picomatch@4.0.2: - resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} - engines: {node: '>=12'} - picomatch@4.0.3: resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} @@ -1351,8 +1461,8 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.8.3: - resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==} + prettier@3.9.5: + resolution: {integrity: sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==} engines: {node: '>=14'} hasBin: true @@ -1479,8 +1589,8 @@ packages: engines: {node: '>=16 || 14 >=14.17'} hasBin: true - tar@7.5.9: - resolution: {integrity: sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==} + tar@7.5.19: + resolution: {integrity: sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==} engines: {node: '>=18'} term-size@2.2.1: @@ -1546,20 +1656,20 @@ packages: typescript: optional: true - turbo@2.9.16: - resolution: {integrity: sha512-NqgRQy6j6dPYcdSdv0q1g9QsZg7SWg87RERM8otw/1AtKU2yTFVClOM7cbwKzOonZr/Ek1blTBucw64L9H0Bwg==} + turbo@2.10.4: + resolution: {integrity: sha512-GQpduILaKjoaGljw097ScsSyKTtZSY7cZ3bJktzfTkPMyCf3ShKLuXK2IaOEN2Plziml+ArR7WJ1m+V4VbnaKQ==} hasBin: true - typescript@6.0.3: - resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} - engines: {node: '>=14.17'} + typescript@7.0.2: + resolution: {integrity: sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==} + engines: {node: '>=16.20.0'} hasBin: true ufo@1.6.1: resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} - undici-types@7.24.6: - resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==} + undici-types@8.3.0: + resolution: {integrity: sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==} unicorn-magic@0.3.0: resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} @@ -1609,20 +1719,20 @@ packages: yaml: optional: true - vitest@4.1.8: - resolution: {integrity: sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==} + vitest@4.1.10: + resolution: {integrity: sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==} engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' '@opentelemetry/api': ^1.9.0 '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0 - '@vitest/browser-playwright': 4.1.8 - '@vitest/browser-preview': 4.1.8 - '@vitest/browser-webdriverio': 4.1.8 - '@vitest/coverage-istanbul': 4.1.8 - '@vitest/coverage-v8': 4.1.8 - '@vitest/ui': 4.1.8 + '@vitest/browser-playwright': 4.1.10 + '@vitest/browser-preview': 4.1.10 + '@vitest/browser-webdriverio': 4.1.10 + '@vitest/coverage-istanbul': 4.1.10 + '@vitest/coverage-v8': 4.1.10 + '@vitest/ui': 4.1.10 happy-dom: '*' jsdom: '*' vite: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -1704,9 +1814,9 @@ snapshots: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@begit/core@0.3.4': + '@begit/core@0.3.5': dependencies: - tar: 7.5.9 + tar: 7.5.19 '@changesets/apply-release-plan@7.1.1': dependencies: @@ -1737,7 +1847,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.31.0(@types/node@25.9.1)': + '@changesets/cli@2.31.0(@types/node@26.1.1)': dependencies: '@changesets/apply-release-plan': 7.1.1 '@changesets/assemble-release-plan': 6.0.10 @@ -1753,7 +1863,7 @@ snapshots: '@changesets/should-skip-package': 0.1.2 '@changesets/types': 6.1.0 '@changesets/write': 0.4.0 - '@inquirer/external-editor': 1.0.3(@types/node@25.9.1) + '@inquirer/external-editor': 1.0.3(@types/node@26.1.1) '@manypkg/get-packages': 1.1.3 ansi-colors: 4.1.3 enquirer: 2.4.1 @@ -1851,14 +1961,14 @@ snapshots: human-id: 4.1.1 prettier: 2.8.8 - '@clack/core@1.4.0': + '@clack/core@1.4.3': dependencies: fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 - '@clack/prompts@1.5.0': + '@clack/prompts@1.7.0': dependencies: - '@clack/core': 1.4.0 + '@clack/core': 1.4.3 fast-string-width: 3.0.2 fast-wrap-ansi: 0.2.2 sisteransi: 1.0.5 @@ -1941,12 +2051,12 @@ snapshots: '@esbuild/win32-x64@0.27.2': optional: true - '@inquirer/external-editor@1.0.3(@types/node@25.9.1)': + '@inquirer/external-editor@1.0.3(@types/node@26.1.1)': dependencies: chardet: 2.1.1 iconv-lite: 0.7.2 optionalDependencies: - '@types/node': 25.9.1 + '@types/node': 26.1.1 '@isaacs/cliui@8.0.2': dependencies: @@ -1973,8 +2083,6 @@ snapshots: '@jridgewell/sourcemap-codec@1.4.15': {} - '@jridgewell/sourcemap-codec@1.5.0': {} - '@jridgewell/sourcemap-codec@1.5.5': {} '@jridgewell/trace-mapping@0.3.19': @@ -2206,22 +2314,22 @@ snapshots: '@swc/counter': 0.1.3 optional: true - '@turbo/darwin-64@2.9.16': + '@turbo/darwin-64@2.10.4': optional: true - '@turbo/darwin-arm64@2.9.16': + '@turbo/darwin-arm64@2.10.4': optional: true - '@turbo/linux-64@2.9.16': + '@turbo/linux-64@2.10.4': optional: true - '@turbo/linux-arm64@2.9.16': + '@turbo/linux-arm64@2.10.4': optional: true - '@turbo/windows-64@2.9.16': + '@turbo/windows-64@2.10.4': optional: true - '@turbo/windows-arm64@2.9.16': + '@turbo/windows-arm64@2.10.4': optional: true '@types/chai@5.2.2': @@ -2236,48 +2344,108 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@25.9.1': + '@types/node@26.1.1': dependencies: - undici-types: 7.24.6 + undici-types: 8.3.0 + + '@typescript/typescript-aix-ppc64@7.0.2': + optional: true + + '@typescript/typescript-darwin-arm64@7.0.2': + optional: true + + '@typescript/typescript-darwin-x64@7.0.2': + optional: true + + '@typescript/typescript-freebsd-arm64@7.0.2': + optional: true + + '@typescript/typescript-freebsd-x64@7.0.2': + optional: true + + '@typescript/typescript-linux-arm64@7.0.2': + optional: true + + '@typescript/typescript-linux-arm@7.0.2': + optional: true + + '@typescript/typescript-linux-loong64@7.0.2': + optional: true + + '@typescript/typescript-linux-mips64el@7.0.2': + optional: true + + '@typescript/typescript-linux-ppc64@7.0.2': + optional: true + + '@typescript/typescript-linux-riscv64@7.0.2': + optional: true - '@vitest/expect@4.1.8': + '@typescript/typescript-linux-s390x@7.0.2': + optional: true + + '@typescript/typescript-linux-x64@7.0.2': + optional: true + + '@typescript/typescript-netbsd-arm64@7.0.2': + optional: true + + '@typescript/typescript-netbsd-x64@7.0.2': + optional: true + + '@typescript/typescript-openbsd-arm64@7.0.2': + optional: true + + '@typescript/typescript-openbsd-x64@7.0.2': + optional: true + + '@typescript/typescript-sunos-x64@7.0.2': + optional: true + + '@typescript/typescript-win32-arm64@7.0.2': + optional: true + + '@typescript/typescript-win32-x64@7.0.2': + optional: true + + '@vitest/expect@4.1.10': dependencies: '@standard-schema/spec': 1.1.0 '@types/chai': 5.2.2 - '@vitest/spy': 4.1.8 - '@vitest/utils': 4.1.8 + '@vitest/spy': 4.1.10 + '@vitest/utils': 4.1.10 chai: 6.2.2 tinyrainbow: 3.1.0 - '@vitest/mocker@4.1.8(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0))': + '@vitest/mocker@4.1.10(vite@7.3.1(@types/node@26.1.1)(jiti@2.7.0))': dependencies: - '@vitest/spy': 4.1.8 + '@vitest/spy': 4.1.10 estree-walker: 3.0.3 magic-string: 0.30.21 optionalDependencies: - vite: 7.3.1(@types/node@25.9.1)(jiti@2.7.0) + vite: 7.3.1(@types/node@26.1.1)(jiti@2.7.0) - '@vitest/pretty-format@4.1.8': + '@vitest/pretty-format@4.1.10': dependencies: tinyrainbow: 3.1.0 - '@vitest/runner@4.1.8': + '@vitest/runner@4.1.10': dependencies: - '@vitest/utils': 4.1.8 + '@vitest/utils': 4.1.10 pathe: 2.0.3 - '@vitest/snapshot@4.1.8': + '@vitest/snapshot@4.1.10': dependencies: - '@vitest/pretty-format': 4.1.8 - '@vitest/utils': 4.1.8 + '@vitest/pretty-format': 4.1.10 + '@vitest/utils': 4.1.10 magic-string: 0.30.21 pathe: 2.0.3 - '@vitest/spy@4.1.8': {} + '@vitest/spy@4.1.10': {} - '@vitest/utils@4.1.8': + '@vitest/utils@4.1.10': dependencies: - '@vitest/pretty-format': 4.1.8 + '@vitest/pretty-format': 4.1.10 convert-source-map: 2.0.0 tinyrainbow: 3.1.0 @@ -2457,9 +2625,9 @@ snapshots: dependencies: reusify: 1.0.4 - fdir@6.4.4(picomatch@4.0.2): + fdir@6.4.4(picomatch@4.0.3): optionalDependencies: - picomatch: 4.0.2 + picomatch: 4.0.3 fdir@6.5.0(picomatch@4.0.3): optionalDependencies: @@ -2480,7 +2648,7 @@ snapshots: fix-dts-default-cjs-exports@1.0.1: dependencies: - magic-string: 0.30.17 + magic-string: 0.30.21 mlly: 1.7.4 rollup: 4.34.9 @@ -2603,10 +2771,6 @@ snapshots: lru-cache@10.1.0: {} - magic-string@0.30.17: - dependencies: - '@jridgewell/sourcemap-codec': 1.5.0 - magic-string@0.30.21: dependencies: '@jridgewell/sourcemap-codec': 1.5.5 @@ -2695,7 +2859,7 @@ snapshots: path-scurry@1.10.1: dependencies: lru-cache: 10.1.0 - minipass: 5.0.0 + minipass: 7.1.2 path-type@4.0.0: {} @@ -2705,8 +2869,6 @@ snapshots: picomatch@2.3.1: {} - picomatch@4.0.2: {} - picomatch@4.0.3: {} pify@4.0.1: {} @@ -2734,7 +2896,7 @@ snapshots: prettier@2.8.8: {} - prettier@3.8.3: {} + prettier@3.9.5: {} pretty-ms@9.2.0: dependencies: @@ -2894,7 +3056,7 @@ snapshots: tinyglobby: 0.2.15 ts-interface-checker: 0.1.13 - tar@7.5.9: + tar@7.5.19: dependencies: '@isaacs/fs-minipass': 4.0.0 chownr: 3.0.0 @@ -2920,8 +3082,8 @@ snapshots: tinyglobby@0.2.14: dependencies: - fdir: 6.4.4(picomatch@4.0.2) - picomatch: 4.0.2 + fdir: 6.4.4(picomatch@4.0.3) + picomatch: 4.0.3 tinyglobby@0.2.15: dependencies: @@ -2938,7 +3100,7 @@ snapshots: ts-interface-checker@0.1.13: {} - tsup@8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@6.0.3): + tsup@8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@7.0.2): dependencies: bundle-require: 5.1.0(esbuild@0.27.2) cac: 6.7.14 @@ -2960,33 +3122,54 @@ snapshots: optionalDependencies: '@swc/core': 1.5.5 postcss: 8.5.6 - typescript: 6.0.3 + typescript: 7.0.2 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - turbo@2.9.16: + turbo@2.10.4: optionalDependencies: - '@turbo/darwin-64': 2.9.16 - '@turbo/darwin-arm64': 2.9.16 - '@turbo/linux-64': 2.9.16 - '@turbo/linux-arm64': 2.9.16 - '@turbo/windows-64': 2.9.16 - '@turbo/windows-arm64': 2.9.16 - - typescript@6.0.3: {} + '@turbo/darwin-64': 2.10.4 + '@turbo/darwin-arm64': 2.10.4 + '@turbo/linux-64': 2.10.4 + '@turbo/linux-arm64': 2.10.4 + '@turbo/windows-64': 2.10.4 + '@turbo/windows-arm64': 2.10.4 + + typescript@7.0.2: + optionalDependencies: + '@typescript/typescript-aix-ppc64': 7.0.2 + '@typescript/typescript-darwin-arm64': 7.0.2 + '@typescript/typescript-darwin-x64': 7.0.2 + '@typescript/typescript-freebsd-arm64': 7.0.2 + '@typescript/typescript-freebsd-x64': 7.0.2 + '@typescript/typescript-linux-arm': 7.0.2 + '@typescript/typescript-linux-arm64': 7.0.2 + '@typescript/typescript-linux-loong64': 7.0.2 + '@typescript/typescript-linux-mips64el': 7.0.2 + '@typescript/typescript-linux-ppc64': 7.0.2 + '@typescript/typescript-linux-riscv64': 7.0.2 + '@typescript/typescript-linux-s390x': 7.0.2 + '@typescript/typescript-linux-x64': 7.0.2 + '@typescript/typescript-netbsd-arm64': 7.0.2 + '@typescript/typescript-netbsd-x64': 7.0.2 + '@typescript/typescript-openbsd-arm64': 7.0.2 + '@typescript/typescript-openbsd-x64': 7.0.2 + '@typescript/typescript-sunos-x64': 7.0.2 + '@typescript/typescript-win32-arm64': 7.0.2 + '@typescript/typescript-win32-x64': 7.0.2 ufo@1.6.1: {} - undici-types@7.24.6: {} + undici-types@8.3.0: {} unicorn-magic@0.3.0: {} universalify@0.1.2: {} - vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0): + vite@7.3.1(@types/node@26.1.1)(jiti@2.7.0): dependencies: esbuild: 0.27.2 fdir: 6.5.0(picomatch@4.0.3) @@ -2995,19 +3178,19 @@ snapshots: rollup: 4.55.1 tinyglobby: 0.2.15 optionalDependencies: - '@types/node': 25.9.1 + '@types/node': 26.1.1 fsevents: 2.3.3 jiti: 2.7.0 - vitest@4.1.8(@types/node@25.9.1)(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0)): + vitest@4.1.10(@types/node@26.1.1)(vite@7.3.1(@types/node@26.1.1)(jiti@2.7.0)): dependencies: - '@vitest/expect': 4.1.8 - '@vitest/mocker': 4.1.8(vite@7.3.1(@types/node@25.9.1)(jiti@2.7.0)) - '@vitest/pretty-format': 4.1.8 - '@vitest/runner': 4.1.8 - '@vitest/snapshot': 4.1.8 - '@vitest/spy': 4.1.8 - '@vitest/utils': 4.1.8 + '@vitest/expect': 4.1.10 + '@vitest/mocker': 4.1.10(vite@7.3.1(@types/node@26.1.1)(jiti@2.7.0)) + '@vitest/pretty-format': 4.1.10 + '@vitest/runner': 4.1.10 + '@vitest/snapshot': 4.1.10 + '@vitest/spy': 4.1.10 + '@vitest/utils': 4.1.10 es-module-lexer: 2.1.0 expect-type: 1.3.0 magic-string: 0.30.21 @@ -3019,10 +3202,10 @@ snapshots: tinyexec: 1.0.2 tinyglobby: 0.2.15 tinyrainbow: 3.1.0 - vite: 7.3.1(@types/node@25.9.1)(jiti@2.7.0) + vite: 7.3.1(@types/node@26.1.1)(jiti@2.7.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 25.9.1 + '@types/node': 26.1.1 transitivePeerDependencies: - msw diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b8ee828..ce79da9 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -3,3 +3,5 @@ packages: allowBuilds: '@swc/core': true esbuild: true +minimumReleaseAgeExclude: + - '@begit/core@0.3.5' diff --git a/turbo.json b/turbo.json index 2bd8cbe..957f92e 100644 --- a/turbo.json +++ b/turbo.json @@ -1,5 +1,5 @@ { - "$schema": "https://turbo.build/schema.json", + "$schema": "https://v2-10-4.turborepo.dev/schema.json", "tasks": { "build": { "dependsOn": ["^build"], From f25dae290a34224afe03981bf11183b98bda7985 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Sun, 12 Jul 2026 11:41:17 +0100 Subject: [PATCH 266/290] chore: version & release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 8 ++++++++ packages/create/package.json | 2 +- packages/full-solid/CHANGELOG.md | 6 ++++++ packages/full-solid/package.json | 2 +- packages/utils/CHANGELOG.md | 6 ++++++ packages/utils/package.json | 2 +- 8 files changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 3ae4603..ffcd8a8 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.6.14 + +### Patch Changes + +- update dependencies and add to solid start v2 templates list + ## 0.6.13 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ffadf41..d7229fd 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.13", + "version": "0.6.14", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index a45bd6d..fa07394 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,13 @@ # @solid-cli/create +## 0.6.14 + +### Patch Changes + +- update dependencies and add to solid start v2 templates list +- Updated dependencies + - @solid-cli/utils@0.6.3 + ## 0.6.13 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index b392ae3..3e7e90a 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.13", + "version": "0.6.14", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/CHANGELOG.md b/packages/full-solid/CHANGELOG.md index 8d2d90e..fcba47f 100644 --- a/packages/full-solid/CHANGELOG.md +++ b/packages/full-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/full +## 0.6.4 + +### Patch Changes + +- update dependencies and add to solid start v2 templates list + ## 0.6.3 ### Patch Changes diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index e36e068..8cf6196 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.3", + "version": "0.6.4", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index ba99c2d..75de0f7 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/utils +## 0.6.3 + +### Patch Changes + +- update dependencies and add to solid start v2 templates list + ## 0.6.2 ### Patch Changes diff --git a/packages/utils/package.json b/packages/utils/package.json index 8799b99..83424b7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.6.2", + "version": "0.6.3", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From d8ef0ecf8c0e719d6c799930480bf28212273258 Mon Sep 17 00:00:00 2001 From: nerdchanii Date: Mon, 13 Jul 2026 20:48:43 +0900 Subject: [PATCH 267/290] fix: clean up v2 templates list --- packages/create/src/utils/constants.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index d665539..bf5f7cc 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -86,21 +86,19 @@ export type StartTemplate = (typeof START_TEMPLATES)[number]; const START_TEMPLATES_V2 = [ "basic", "bare", - "with-solidbase", - "hackernews", - "notes", "with-auth", "with-authjs", "with-drizzle", "with-mdx", "with-prisma", "with-solid-styled", + "with-solidbase", + "with-strict-csp", "with-tailwindcss", + "with-tanstack-router", "with-trpc", "with-unocss", "with-vitest", - "with-strict-csp", - "with-tanstack-router", ] as const satisfies string[]; export type StartTemplateV2 = (typeof START_TEMPLATES_V2)[number]; From 60467c1050e1e7e6808581991b4fb971b3d749bf Mon Sep 17 00:00:00 2001 From: nerdchanii Date: Mon, 20 Jul 2026 22:57:36 +0900 Subject: [PATCH 268/290] fix: remove with-tanstack-router from v2 templates list --- packages/create/src/utils/constants.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index bf5f7cc..6fc3a0e 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -74,7 +74,6 @@ const START_TEMPLATES = [ "with-prisma", "with-solid-styled", "with-tailwindcss", - "with-tanstack-router", "with-trpc", "with-unocss", "with-vitest", From fd84cd521b0f7dfb7eb93963a0d12bf416d49883 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 22 Jul 2026 19:24:16 +0100 Subject: [PATCH 269/290] chore: update dependencies --- package.json | 8 +-- packages/create/package.json | 2 +- packages/utils/package.json | 2 +- pnpm-lock.yaml | 126 +++++++++++++++++++---------------- pnpm-workspace.yaml | 9 ++- turbo.json | 2 +- 6 files changed, 82 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index 2827480..d897b76 100644 --- a/package.json +++ b/package.json @@ -31,14 +31,14 @@ "./packages/*" ], "devDependencies": { - "@changesets/cli": "2.31.0", + "@changesets/cli": "2.31.1", "@types/node": "26.1.1", "jiti": "^2.7.0", - "prettier": "^3.9.5", + "prettier": "^3.9.6", "tsup": "^8.5.1", - "turbo": "^2.10.4", + "turbo": "^2.10.6", "typescript": "^7.0.2", "vitest": "^4.1.10" }, - "packageManager": "pnpm@11.12.0" + "packageManager": "pnpm@11.15.1" } diff --git a/packages/create/package.json b/packages/create/package.json index 3e7e90a..304b52f 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -42,7 +42,7 @@ "dependencies": { "@clack/prompts": "1.7.0", "picocolors": "^1.1.1", - "@begit/core": "^0.3.5", + "@begit/core": "^0.4.0", "citty": "^0.2.2", "sucrase": "^3.35.1", "@solid-cli/utils": "workspace:*" diff --git a/packages/utils/package.json b/packages/utils/package.json index 83424b7..ab4fbf5 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -75,7 +75,7 @@ "dependencies": { "@clack/core": "1.4.3", "@clack/prompts": "1.7.0", - "execa": "^9.6.1", + "execa": "^10.0.0", "picocolors": "^1.1.1" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 759677c..443594d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: devDependencies: '@changesets/cli': - specifier: 2.31.0 - version: 2.31.0(@types/node@26.1.1) + specifier: 2.31.1 + version: 2.31.1(@types/node@26.1.1) '@types/node': specifier: 26.1.1 version: 26.1.1 @@ -18,14 +18,14 @@ importers: specifier: ^2.7.0 version: 2.7.0 prettier: - specifier: ^3.9.5 - version: 3.9.5 + specifier: ^3.9.6 + version: 3.9.6 tsup: specifier: ^8.5.1 version: 8.5.1(@swc/core@1.5.5)(jiti@2.7.0)(postcss@8.5.6)(typescript@7.0.2) turbo: - specifier: ^2.10.4 - version: 2.10.4 + specifier: ^2.10.6 + version: 2.10.6 typescript: specifier: ^7.0.2 version: 7.0.2 @@ -36,8 +36,8 @@ importers: packages/create: dependencies: '@begit/core': - specifier: ^0.3.5 - version: 0.3.5 + specifier: ^0.4.0 + version: 0.4.0 '@clack/prompts': specifier: 1.7.0 version: 1.7.0 @@ -96,8 +96,8 @@ importers: specifier: 1.7.0 version: 1.7.0 execa: - specifier: ^9.6.1 - version: 9.6.1 + specifier: ^10.0.0 + version: 10.0.0 picocolors: specifier: ^1.1.1 version: 1.1.1 @@ -141,8 +141,8 @@ packages: resolution: {integrity: sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==} engines: {node: '>=6.9.0'} - '@begit/core@0.3.5': - resolution: {integrity: sha512-yU9TTCFKhIFV/JCWM/1Fqx0Kb/3kzvXLyuD8aXfCMrReIuI9IM/riPoVSHyT2l/h1XICau/NRV5cZXFF5RhcnQ==} + '@begit/core@0.4.0': + resolution: {integrity: sha512-Z4HNWYe5NZ5wZfDgDxmP9yJn1sYYtYABnJS+2l2BItqLijlcq1gvnRtw9KMXpTN8XD1xbe1QM1sWzu83VKRQig==} '@changesets/apply-release-plan@7.1.1': resolution: {integrity: sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==} @@ -153,8 +153,8 @@ packages: '@changesets/changelog-git@0.2.1': resolution: {integrity: sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==} - '@changesets/cli@2.31.0': - resolution: {integrity: sha512-AhI4enNTgHu2IZr6K4WZyf0EPch4XVMn1yOMFmCD9gsfBGqMYaHXls5HyDv6/CL5axVQABz68eG30eCtbr2wFg==} + '@changesets/cli@2.31.1': + resolution: {integrity: sha512-uO05WTcRBwuVOJVSW8Cmpqw6q0WDL53ajGCMyszutvOe5toOnunbpM4jZzf+qxBOz7i0AzopZ8diBuewjmF40w==} hasBin: true '@changesets/config@3.1.4': @@ -755,33 +755,33 @@ packages: '@swc/types@0.1.17': resolution: {integrity: sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==} - '@turbo/darwin-64@2.10.4': - resolution: {integrity: sha512-m1MUEI4MJ69r5CwfMYxmHi0H0rrgiYCBOp0tgBZ9x/YVvOb5uu/lRIDyDwdtH054R2yWeQaIigUGu6aCX9f8cA==} + '@turbo/darwin-64@2.10.6': + resolution: {integrity: sha512-S+yIyZkmjYBQbIM7sTqMAwnLeMjSK60Q9grUDPbTWvkRjbsn5k1Rt5sPvTX80M4PnlYQBwLiYsjlu6tHsuIqQQ==} cpu: [x64] os: [darwin] - '@turbo/darwin-arm64@2.10.4': - resolution: {integrity: sha512-VQ1Yxs5zkPT+2z7t1P4mvn6JmcKLkOCAsPuK9XbOvuVj0DlTlETfIXNisX0771v/vTWHOQqiwoGi+TtAUq8efw==} + '@turbo/darwin-arm64@2.10.6': + resolution: {integrity: sha512-gnS8G78EjvJzDc1+tFES5BYXdlF+292n+h57G9G+5LJYelRh195f4Ed22RCo4EFIbI4Du9S5xfE9YjrqhoZaxQ==} cpu: [arm64] os: [darwin] - '@turbo/linux-64@2.10.4': - resolution: {integrity: sha512-IzV1QovmwX7mfGnVinmE++2IB8tbeo38weltiuH5zNqwCTBjLs/DytyRKx+bmnhHdXIq9SheR8p0Nip/LBUPHg==} + '@turbo/linux-64@2.10.6': + resolution: {integrity: sha512-lPv5AVkzvhs4z6Isr2ZE2UYt9Ndym5aWSMEIRh9OROnAdyEG1CFugJwAn/aFuDMmiCoHasyvD5tTDmVVTTrYxw==} cpu: [x64] os: [linux] - '@turbo/linux-arm64@2.10.4': - resolution: {integrity: sha512-rfujSQkP5aYiRn0PgTM7F00WkJCP/bKDVZbOx3WmrZwa/vHA0bplhCl328kpX7VI9HH2vI90ISGwuSVgJgoqTw==} + '@turbo/linux-arm64@2.10.6': + resolution: {integrity: sha512-yeQ24es8pz+FhZxt25HIXj4ml7HpWMrmOL1BtCP4XUz7mBJZdAfC7z7HGF+wPSUZoKmoSZbL4r4QWbRddhPZIQ==} cpu: [arm64] os: [linux] - '@turbo/windows-64@2.10.4': - resolution: {integrity: sha512-NnspP7Wd5fa3Wwnqv9bKfhegqZzuHBgbPxdZU/idTLQcazx/vgKu95JlCx2YHY0hdvKCnPcARrDwM+KEUmaO7A==} + '@turbo/windows-64@2.10.6': + resolution: {integrity: sha512-JiFscBN83F43VG3oM+QU2LvgHcf11tgirLJ3c1QDJBtulTCbDwupzIjqB9yBlfiMWAe6g3ssD6gqLP6a4g7FzA==} cpu: [x64] os: [win32] - '@turbo/windows-arm64@2.10.4': - resolution: {integrity: sha512-Iv02YgOpaEShc2OkG7mgCJ2pEw1RUKiKbs0h8W5wAf4jZ5vpmraTEjuGTgHRuOORQnC1GN3KHo5WB+hu1abRMA==} + '@turbo/windows-arm64@2.10.6': + resolution: {integrity: sha512-emWVdriXsaSVS5VXJxy4DppQ0UnGD+PUKu40DGjC3E5JXeoszL09B/1xU6B+Y8lJQg38cFoaB1NqGC4ayY5SQQ==} cpu: [arm64] os: [win32] @@ -1103,9 +1103,9 @@ packages: estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - execa@9.6.1: - resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==} - engines: {node: ^18.19.0 || >=20.5.0} + execa@10.0.0: + resolution: {integrity: sha512-Cxl6MKxB1dr1H0FHmiizJ+lavKF7pV+fcDZFyqMB8d5m7qUPm/OtZYcD5vPWePKxSnTQ57KuBd9mtdZ3oNCvyQ==} + engines: {node: '>=22'} expect-type@1.3.0: resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==} @@ -1461,13 +1461,13 @@ packages: engines: {node: '>=10.13.0'} hasBin: true - prettier@3.9.5: - resolution: {integrity: sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==} + prettier@3.9.6: + resolution: {integrity: sha512-OpN0zzVdiaiAhxpuuj5efpIS4sY9j7bY6uR5mnj5yPzGkdkjNKSJeUThPb60Jw29QuAZgA4o+/iB49kFiaBX6g==} engines: {node: '>=14'} hasBin: true - pretty-ms@9.2.0: - resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==} + pretty-ms@9.3.0: + resolution: {integrity: sha512-gjVS5hOP+M3wMm5nmNOucbIrqudzs9v/57bWRHQWLYklXqoXKrVfYW2W9+glfGsqtPgpiz5WwyEEB+ksXIx3gQ==} engines: {node: '>=18'} queue-microtask@1.2.3: @@ -1656,8 +1656,8 @@ packages: typescript: optional: true - turbo@2.10.4: - resolution: {integrity: sha512-GQpduILaKjoaGljw097ScsSyKTtZSY7cZ3bJktzfTkPMyCf3ShKLuXK2IaOEN2Plziml+ArR7WJ1m+V4VbnaKQ==} + turbo@2.10.6: + resolution: {integrity: sha512-3VfH7fK7WQ/ZHYjvfWyVnPRpcNaX3ZqXfGDMdc82eGdM0ESATyxFK4R4PM3wNsVFsdkUFZ4pZpkNeG37dxOv+g==} hasBin: true typescript@7.0.2: @@ -1760,6 +1760,11 @@ packages: jsdom: optional: true + which-command@0.1.0: + resolution: {integrity: sha512-XZyoF5/5hZtXitIwzrU4NKK+Wtbb9aB9CezUEw2Q0wlYK8NUYQxC1rRXgNueYLtBAJwXIb+/tFVk4dozciNJMA==} + engines: {node: '>=22'} + hasBin: true + which@2.0.2: resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==} engines: {node: '>= 8'} @@ -1782,8 +1787,8 @@ packages: resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==} engines: {node: '>=18'} - yoctocolors@2.1.1: - resolution: {integrity: sha512-GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==} + yoctocolors@2.1.2: + resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==} engines: {node: '>=18'} snapshots: @@ -1814,7 +1819,7 @@ snapshots: '@babel/helper-string-parser': 7.29.7 '@babel/helper-validator-identifier': 7.29.7 - '@begit/core@0.3.5': + '@begit/core@0.4.0': dependencies: tar: 7.5.19 @@ -1847,7 +1852,7 @@ snapshots: dependencies: '@changesets/types': 6.1.0 - '@changesets/cli@2.31.0(@types/node@26.1.1)': + '@changesets/cli@2.31.1(@types/node@26.1.1)': dependencies: '@changesets/apply-release-plan': 7.1.1 '@changesets/assemble-release-plan': 6.0.10 @@ -2314,22 +2319,22 @@ snapshots: '@swc/counter': 0.1.3 optional: true - '@turbo/darwin-64@2.10.4': + '@turbo/darwin-64@2.10.6': optional: true - '@turbo/darwin-arm64@2.10.4': + '@turbo/darwin-arm64@2.10.6': optional: true - '@turbo/linux-64@2.10.4': + '@turbo/linux-64@2.10.6': optional: true - '@turbo/linux-arm64@2.10.4': + '@turbo/linux-arm64@2.10.6': optional: true - '@turbo/windows-64@2.10.4': + '@turbo/windows-64@2.10.6': optional: true - '@turbo/windows-arm64@2.10.4': + '@turbo/windows-arm64@2.10.6': optional: true '@types/chai@5.2.2': @@ -2584,20 +2589,21 @@ snapshots: dependencies: '@types/estree': 1.0.8 - execa@9.6.1: + execa@10.0.0: dependencies: '@sindresorhus/merge-streams': 4.0.0 - cross-spawn: 7.0.6 figures: 6.1.0 get-stream: 9.0.1 human-signals: 8.0.1 is-plain-obj: 4.1.0 is-stream: 4.0.1 npm-run-path: 6.0.0 - pretty-ms: 9.2.0 + path-key: 4.0.0 + pretty-ms: 9.3.0 signal-exit: 4.1.0 strip-final-newline: 4.0.0 - yoctocolors: 2.1.1 + which-command: 0.1.0 + yoctocolors: 2.1.2 expect-type@1.3.0: {} @@ -2896,9 +2902,9 @@ snapshots: prettier@2.8.8: {} - prettier@3.9.5: {} + prettier@3.9.6: {} - pretty-ms@9.2.0: + pretty-ms@9.3.0: dependencies: parse-ms: 4.0.0 @@ -3129,14 +3135,14 @@ snapshots: - tsx - yaml - turbo@2.10.4: + turbo@2.10.6: optionalDependencies: - '@turbo/darwin-64': 2.10.4 - '@turbo/darwin-arm64': 2.10.4 - '@turbo/linux-64': 2.10.4 - '@turbo/linux-arm64': 2.10.4 - '@turbo/windows-64': 2.10.4 - '@turbo/windows-arm64': 2.10.4 + '@turbo/darwin-64': 2.10.6 + '@turbo/darwin-arm64': 2.10.6 + '@turbo/linux-64': 2.10.6 + '@turbo/linux-arm64': 2.10.6 + '@turbo/windows-64': 2.10.6 + '@turbo/windows-arm64': 2.10.6 typescript@7.0.2: optionalDependencies: @@ -3209,6 +3215,8 @@ snapshots: transitivePeerDependencies: - msw + which-command@0.1.0: {} + which@2.0.2: dependencies: isexe: 2.0.0 @@ -3232,4 +3240,4 @@ snapshots: yallist@5.0.0: {} - yoctocolors@2.1.1: {} + yoctocolors@2.1.2: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index ce79da9..0f024f2 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -4,4 +4,11 @@ allowBuilds: '@swc/core': true esbuild: true minimumReleaseAgeExclude: - - '@begit/core@0.3.5' + - '@begit/core@0.3.5 || 0.4.0' + - '@turbo/darwin-64@2.10.6' + - '@turbo/darwin-arm64@2.10.6' + - '@turbo/linux-64@2.10.6' + - '@turbo/linux-arm64@2.10.6' + - '@turbo/windows-64@2.10.6' + - '@turbo/windows-arm64@2.10.6' + - turbo@2.10.6 diff --git a/turbo.json b/turbo.json index 957f92e..08facab 100644 --- a/turbo.json +++ b/turbo.json @@ -1,5 +1,5 @@ { - "$schema": "https://v2-10-4.turborepo.dev/schema.json", + "$schema": "https://v2-10-6.turborepo.dev/schema.json", "tasks": { "build": { "dependsOn": ["^build"], From 31c42710d5c2ef8af5e6616c50b333105f5f1353 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 22 Jul 2026 19:27:32 +0100 Subject: [PATCH 270/290] chore: version and release --- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 11 +++++++++++ packages/create/package.json | 2 +- packages/full-solid/CHANGELOG.md | 6 ++++++ packages/full-solid/package.json | 2 +- packages/utils/CHANGELOG.md | 6 ++++++ packages/utils/package.json | 2 +- 8 files changed, 33 insertions(+), 4 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index ffcd8a8..030d8d0 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.8.0 + +### Minor Changes + +- support fetching without the github API (so fetching should no work when hitting the github api limit) + ## 0.6.14 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index d7229fd..b53240a 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.6.14", + "version": "0.8.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index fa07394..63e16e9 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,16 @@ # @solid-cli/create +## 0.8.0 + +### Minor Changes + +- support fetching without the github API (so fetching should no work when hitting the github api limit) + +### Patch Changes + +- Updated dependencies + - @solid-cli/utils@0.7.0 + ## 0.6.14 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index 304b52f..249ba26 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.6.14", + "version": "0.8.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/full-solid/CHANGELOG.md b/packages/full-solid/CHANGELOG.md index fcba47f..95f2d0e 100644 --- a/packages/full-solid/CHANGELOG.md +++ b/packages/full-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/full +## 0.8.0 + +### Minor Changes + +- support fetching without the github API (so fetching should no work when hitting the github api limit) + ## 0.6.4 ### Patch Changes diff --git a/packages/full-solid/package.json b/packages/full-solid/package.json index 8cf6196..bc95197 100644 --- a/packages/full-solid/package.json +++ b/packages/full-solid/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/full", - "version": "0.6.4", + "version": "0.8.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 75de0f7..544c42c 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/utils +## 0.7.0 + +### Minor Changes + +- support fetching without the github API (so fetching should no work when hitting the github api limit) + ## 0.6.3 ### Patch Changes diff --git a/packages/utils/package.json b/packages/utils/package.json index ab4fbf5..f1f0e3d 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/utils", - "version": "0.6.3", + "version": "0.7.0", "description": "A collection of utilities for the Solid CLI", "license": "MIT", "homepage": "https://solid-cli.netlify.app", From dd4a9f3c9ab8f690842c00ca7d3e51d991dd02a4 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 22 Jul 2026 19:35:44 +0100 Subject: [PATCH 271/290] docs: remove warning banner from README as create CLI is stable --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index d4479ba..aa0e49a 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,6 @@ Solid CLI

-> [!WARNING] -> This project is under heavy development and is not yet complete. More features coming soon! - # Solid CLI [![Build and Test](https://github.com/solidjs-community/solid-cli/actions/workflows/tests.yml/badge.svg)](https://github.com/solidjs-community/solid-cli/actions/workflows/tests.yml) From 12145c89a8be2fd0b538be38c40db0f453b69acf Mon Sep 17 00:00:00 2001 From: nerdchanii Date: Thu, 23 Jul 2026 13:43:11 +0900 Subject: [PATCH 272/290] fix: restore with-tanstack-router in v1 --- packages/create/src/utils/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index 6fc3a0e..bf5f7cc 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -74,6 +74,7 @@ const START_TEMPLATES = [ "with-prisma", "with-solid-styled", "with-tailwindcss", + "with-tanstack-router", "with-trpc", "with-unocss", "with-vitest", From 3d9b68a24731c0a74b0d47ed2176ef7dca2b2a23 Mon Sep 17 00:00:00 2001 From: nerdchanii Date: Thu, 23 Jul 2026 13:44:18 +0900 Subject: [PATCH 273/290] fix: remove with-tanstack-router in v2 --- packages/create/src/utils/constants.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index bf5f7cc..d4130ee 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -95,7 +95,6 @@ const START_TEMPLATES_V2 = [ "with-solidbase", "with-strict-csp", "with-tailwindcss", - "with-tanstack-router", "with-trpc", "with-unocss", "with-vitest", From c9b72ef42fb5ff4f4c30a5f9f9a40c21f8cad465 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Tue, 4 Aug 2026 21:57:21 +0200 Subject: [PATCH 274/290] fix: start 2 is stable --- packages/create/src/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index fad16b6..4a7cf87 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -125,8 +125,8 @@ export const createSolid = (version: string) => message: "Which version of SolidStart?", initialValue: "v2", options: [ - { value: "v2", label: "v2 (pre-release, recommended)" }, - { value: "v1", label: "v1 (stable)" }, + { value: "v2", label: "2 (Stable)" }, + { value: "v1", label: "1 (Legacy)" }, ], }), ); From 5621942b25f8d3401048345e25532b304c6f0592 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Tue, 4 Aug 2026 21:58:56 +0200 Subject: [PATCH 275/290] changeset --- .changeset/nasty-baboons-teach.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/nasty-baboons-teach.md diff --git a/.changeset/nasty-baboons-teach.md b/.changeset/nasty-baboons-teach.md new file mode 100644 index 0000000..a0cfcda --- /dev/null +++ b/.changeset/nasty-baboons-teach.md @@ -0,0 +1,5 @@ +--- +"@solid-cli/create": patch +--- + +SolidStart v2 is now Stable From 56975f67f84c1ae2e66a2710177f5c119b488c24 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Wed, 5 Aug 2026 00:12:30 +0100 Subject: [PATCH 276/290] chore: version and release --- .changeset/nasty-baboons-teach.md | 5 ----- packages/create-solid/CHANGELOG.md | 6 ++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 6 ++++++ packages/create/package.json | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 .changeset/nasty-baboons-teach.md diff --git a/.changeset/nasty-baboons-teach.md b/.changeset/nasty-baboons-teach.md deleted file mode 100644 index a0cfcda..0000000 --- a/.changeset/nasty-baboons-teach.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@solid-cli/create": patch ---- - -SolidStart v2 is now Stable diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 030d8d0..3bd388b 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,11 @@ # create-solid +## 0.8.1 + +### Patch Changes + +- make start v2 stable + ## 0.8.0 ### Minor Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index b53240a..f5715fc 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.8.0", + "version": "0.8.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 63e16e9..3f5f799 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,11 @@ # @solid-cli/create +## 0.8.1 + +### Patch Changes + +- 5621942: SolidStart v2 is now Stable + ## 0.8.0 ### Minor Changes diff --git a/packages/create/package.json b/packages/create/package.json index 249ba26..506537f 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.8.0", + "version": "0.8.1", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From 68caa9ff8ffacc48376f66d5ba28da2d70255d70 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Tue, 11 Aug 2026 14:25:00 -0700 Subject: [PATCH 277/290] feat: Solid 2.0 template support - New "Solid 2.0" project type (--solid) scaffolding the solid-v2/* templates; listed first but not preselected while core is in beta - Optional streaming-SSR flip (--ssr / prompt, default No) on templates that support it: ssr: true in vite.config.ts, the generic production server.js (verbatim from solid-v2/fullstack), and a matching start script - JS variants via the existing sucrase conversion, adapted for turnkey templates (no index.html rewrite, .ts refs in vite.config retargeted, .d.ts dropped, minimal jsconfig) - templates.json manifest read from the templates repo HEAD (2s timeout, silent fallback to the baked-in lists) now drives template names, subdir paths and per-template flags, so template additions/reorganizations no longer require a CLI release - Template downloads can be pinned to a templates-repo ref per release (TEMPLATES_REF, SOLID_CLI_TEMPLATES_REF override) Co-authored-by: Cursor --- .changeset/solid-v2-templates.md | 12 ++ packages/create/src/create-solid-v2.ts | 49 +++++++ packages/create/src/create-start.ts | 22 ++- packages/create/src/create-vanilla.ts | 17 ++- packages/create/src/index.ts | 84 ++++++++--- packages/create/src/utils/constants.ts | 44 +++++- packages/create/src/utils/download.ts | 19 +++ packages/create/src/utils/manifest.ts | 119 ++++++++++++++++ packages/create/src/utils/ssr-flip.ts | 133 ++++++++++++++++++ packages/create/src/utils/ts-conversion.ts | 8 +- .../fixtures/solid-v2-basic/package.json | 30 ++++ .../fixtures/solid-v2-basic/vite.config.ts | 32 +++++ packages/create/tests/manifest.test.ts | 80 +++++++++++ packages/create/tests/ssr-flip.test.ts | 48 +++++++ packages/create/tests/template.test.ts | 9 +- scripts/gen-ssr-flip-server.mjs | 15 ++ vitest.config.ts | 7 +- 17 files changed, 677 insertions(+), 51 deletions(-) create mode 100644 .changeset/solid-v2-templates.md create mode 100644 packages/create/src/create-solid-v2.ts create mode 100644 packages/create/src/utils/download.ts create mode 100644 packages/create/src/utils/manifest.ts create mode 100644 packages/create/src/utils/ssr-flip.ts create mode 100644 packages/create/tests/fixtures/solid-v2-basic/package.json create mode 100644 packages/create/tests/fixtures/solid-v2-basic/vite.config.ts create mode 100644 packages/create/tests/manifest.test.ts create mode 100644 packages/create/tests/ssr-flip.test.ts create mode 100644 scripts/gen-ssr-flip-server.mjs diff --git a/.changeset/solid-v2-templates.md b/.changeset/solid-v2-templates.md new file mode 100644 index 0000000..c2477d5 --- /dev/null +++ b/.changeset/solid-v2-templates.md @@ -0,0 +1,12 @@ +--- +"create-solid": minor +"@solid-cli/create": minor +--- + +Solid 2.0 template support + +- New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is in beta; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. +- Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. +- JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). +- Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. +- Template tarball downloads can be pinned to a templates-repo ref per CLI release (`TEMPLATES_REF`, overridable via `SOLID_CLI_TEMPLATES_REF`). diff --git a/packages/create/src/create-solid-v2.ts b/packages/create/src/create-solid-v2.ts new file mode 100644 index 0000000..c4366d4 --- /dev/null +++ b/packages/create/src/create-solid-v2.ts @@ -0,0 +1,49 @@ +import { join } from "node:path"; +import { existsSync, writeFileSync } from "node:fs"; +import { readFile, writeFile } from "node:fs/promises"; +import { handleTSConversion } from "./utils/ts-conversion"; +import { GIT_IGNORE, JS_CONFIG_SOLID_V2, SolidV2Template } from "./utils/constants"; +import { downloadTemplate } from "./utils/download"; +import { applySsrFlip } from "./utils/ssr-flip"; + +export type CreateSolidV2Args = { + template: SolidV2Template | (string & {}); + destination: string; + /** Subdir prefix inside the templates repo (from templates.json), defaults to "solid-v2" */ + path?: string; +}; + +export const createSolidV2 = (args: CreateSolidV2Args, transpile?: boolean, ssr?: boolean) => { + if (transpile) { + return createSolidV2JS(args, ssr); + } + return createSolidV2TS(args, ssr); +}; + +export const createSolidV2TS = async ({ template, destination, path = "solid-v2" }: CreateSolidV2Args, ssr?: boolean) => { + await downloadTemplate(`${path}/${template}`, destination); + if (ssr) await applySsrFlip(destination); +}; + +export const createSolidV2JS = async (args: CreateSolidV2Args, ssr?: boolean) => { + // Create typescript project in `/.project` + // then transpile this to javascript and clean up. + // The SSR flip runs inside the temp dir, before conversion, so the config + // edit happens on the `.ts` source (server.js is already plain JS). + const tempDir = join(args.destination, ".project"); + await createSolidV2TS({ ...args, destination: tempDir }, ssr); + await handleTSConversion(tempDir, args.destination, JS_CONFIG_SOLID_V2); + // Solid 2.0 templates have no `index.html` (turnkey entries), but their vite + // config references `.ts`/`.tsx` files by path (setup files, middleware, test + // globs) — retarget those to the transpiled `.js`/`.jsx` output + const viteConfigPath = join(args.destination, "vite.config.js"); + if (existsSync(viteConfigPath)) { + const viteConfig = (await readFile(viteConfigPath)) + .toString() + .replace(/\.tsx(?=['"])/g, ".jsx") + .replace(/\.ts(?=['"])/g, ".js"); + await writeFile(viteConfigPath, viteConfig); + } + // Add .gitignore + writeFileSync(join(args.destination, ".gitignore"), GIT_IGNORE); +}; diff --git a/packages/create/src/create-start.ts b/packages/create/src/create-start.ts index 579f4dc..0b4bc29 100644 --- a/packages/create/src/create-start.ts +++ b/packages/create/src/create-start.ts @@ -1,29 +1,25 @@ -import { downloadRepo, GithubFetcher } from "@begit/core"; import { join } from "path"; import { writeFileSync } from "fs"; import { handleTSConversion } from "./utils/ts-conversion"; import { GIT_IGNORE, StartTemplate, StartTemplateV2 } from "./utils/constants"; +import { downloadTemplate } from "./utils/download"; export type CreateStartArgs = { - template: StartTemplate | StartTemplateV2; + template: StartTemplate | StartTemplateV2 | (string & {}); destination: string; + /** Subdir prefix inside the templates repo (from templates.json), defaults to "solid-start-v2"/"solid-start-v1" */ + path?: string; }; -export const createStartTS = ({ template, destination }: CreateStartArgs, v2?: boolean) => { - const subdir = v2 ? `solid-start-v2/${template}` : `solid-start-v1/${template}`; - return downloadRepo( - { - repo: { owner: "solidjs", name: "templates", subdir }, - dest: destination, - }, - GithubFetcher, - ); +export const createStartTS = ({ template, destination, path }: CreateStartArgs, v2?: boolean) => { + const prefix = path ?? (v2 ? "solid-start-v2" : "solid-start-v1"); + return downloadTemplate(`${prefix}/${template}`, destination); }; -export const createStartJS = async ({ template, destination }: CreateStartArgs, v2?: boolean) => { +export const createStartJS = async ({ template, destination, path }: CreateStartArgs, v2?: boolean) => { // Create typescript project in `/.project` // then transpile this to javascript and clean up const tempDir = join(destination, ".project"); - await createStartTS({ template, destination: tempDir }, v2); + await createStartTS({ template, destination: tempDir, path }, v2); await handleTSConversion(tempDir, destination); // Add .gitignore writeFileSync(join(destination, ".gitignore"), GIT_IGNORE); diff --git a/packages/create/src/create-vanilla.ts b/packages/create/src/create-vanilla.ts index 0cebd73..a27d564 100644 --- a/packages/create/src/create-vanilla.ts +++ b/packages/create/src/create-vanilla.ts @@ -1,13 +1,15 @@ -import { downloadRepo, GithubFetcher } from "@begit/core"; import { join } from "node:path"; import { writeFileSync } from "node:fs"; import { readFile } from "node:fs/promises"; import { handleTSConversion } from "./utils/ts-conversion"; import { GIT_IGNORE, VanillaTemplate } from "./utils/constants"; +import { downloadTemplate } from "./utils/download"; export type CreateVanillaArgs = { - template: VanillaTemplate; + template: VanillaTemplate | (string & {}); destination: string; + /** Subdir prefix inside the templates repo (from templates.json), defaults to "vanilla" */ + path?: string; }; export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { if (transpile) { @@ -16,18 +18,15 @@ export const createVanilla = (args: CreateVanillaArgs, transpile?: boolean) => { return createVanillaTS(args); }; -export const createVanillaTS = async ({ template, destination }: CreateVanillaArgs) => { - return await downloadRepo( - { repo: { owner: "solidjs", name: "templates", subdir: `vanilla/${template}` }, dest: destination }, - GithubFetcher, - ); +export const createVanillaTS = async ({ template, destination, path = "vanilla" }: CreateVanillaArgs) => { + return await downloadTemplate(`${path}/${template}`, destination); }; -export const createVanillaJS = async ({ template, destination }: CreateVanillaArgs) => { +export const createVanillaJS = async ({ template, destination, path }: CreateVanillaArgs) => { // Create typescript project in `/.project` // then transpile this to javascript and clean up const tempDir = join(destination, ".project"); - await createVanillaTS({ template, destination: tempDir }); + await createVanillaTS({ template, destination: tempDir, path }); await handleTSConversion(tempDir, destination); // Replace `index.tsx` with `index.jsx` in `index.html` const indexPath = join(destination, "index.html"); diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 4a7cf87..8c3bffd 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -3,13 +3,22 @@ import { createVanilla } from "./create-vanilla"; import * as p from "@clack/prompts"; import { cancelable, spinnerify } from "@solid-cli/utils/ui"; import { createStart } from "./create-start"; -import { getTemplatesList, GIT_IGNORE, isValidTemplate, PROJECT_TYPES, ProjectType } from "./utils/constants"; +import { createSolidV2 } from "./create-solid-v2"; +import { GIT_IGNORE, isValidTemplate, LIBRARY_TEMPLATES, PROJECT_TYPES, ProjectType } from "./utils/constants"; +import { fetchTemplatesManifest, groupKeyFor, ManifestTemplate, resolveGroup } from "./utils/manifest"; import { detectPackageManager } from "@solid-cli/utils/package-manager"; import { existsSync, writeFileSync } from "node:fs"; import { join } from "node:path"; import { createLibrary } from "./create-library"; import { readFile, writeFile } from "node:fs/promises"; -export { createVanilla, createStart, createLibrary }; +export { createVanilla, createStart, createLibrary, createSolidV2 }; + +const PROJECT_TYPE_LABELS: Record = { + solid: "Solid 2.0 (Beta)", + start: "SolidStart (Solid 1.x)", + vanilla: "SolidJS + Vite (Solid 1.x)", + library: "Library", +}; export const createSolid = (version: string) => defineCommand({ @@ -41,6 +50,11 @@ export const createSolid = (version: string) => alias: "t", description: "Template name", }, + "solid": { + type: "boolean", + required: false, + description: "Create a Solid 2.0 project", + }, "solidstart": { type: "boolean", required: false, @@ -64,6 +78,11 @@ export const createSolid = (version: string) => alias: "v", description: "Create a vanilla (SolidJS + Vite) project", }, + "ssr": { + type: "boolean", + required: false, + description: "Enable server-side rendering (Solid 2.0 templates that support it)", + }, "ts": { type: "boolean", required: false, @@ -81,9 +100,11 @@ export const createSolid = (version: string) => templatePositional, "project-name": projectNameOptional, "template": templateOptional, + solid, solidstart, library, vanilla, + ssr, ts, js, v2, @@ -92,25 +113,30 @@ export const createSolid = (version: string) => // Show prompts for any unknown arguments let projectName = projectNamePositional ?? projectNameOptional; let template = templatePositional ?? templateOptional; - let projectType: ProjectType | undefined = solidstart - ? "start" - : vanilla - ? "vanilla" - : library - ? "library" - : undefined; + let projectType: ProjectType | undefined = solid + ? "solid" + : solidstart + ? "start" + : vanilla + ? "vanilla" + : library + ? "library" + : undefined; // False if user has selected ts, true if they have selected js, and undefined if they've done neither let useJS = ts ? !ts : js ? js : undefined; + // Live template lists/paths from the templates repo; undefined falls back to the baked-in lists + const manifest = await fetchTemplatesManifest(); projectName ??= await cancelable( p.text({ message: "Project Name", placeholder: "solid-project", defaultValue: "solid-project" }), ); projectType ??= await cancelable( p.select({ message: "What type of project would you like to create?", + // Solid 2.0 is listed first but not preselected while core is in beta initialValue: "start", options: PROJECT_TYPES.map((t) => ({ value: t, - label: t === "start" ? "SolidStart" : t === "vanilla" ? "SolidJS + Vite" : "Library", + label: PROJECT_TYPE_LABELS[t], })), }), ); @@ -137,26 +163,48 @@ export const createSolid = (version: string) => useJS ??= projectType === "library" ? false : !(await cancelable(p.confirm({ message: "Use Typescript?" }))); if (!projectType) return; - const template_opts = getTemplatesList(projectType, isV2); + const group = projectType === "library" ? undefined : resolveGroup(manifest, groupKeyFor(projectType, isV2)); + const template_opts: ManifestTemplate[] = group + ? group.templates + : LIBRARY_TEMPLATES.map((name) => ({ name })); template ??= await cancelable( p.select({ message: "Which template would you like to use?", - initialValue: "ts", + initialValue: (template_opts.find((t) => t.default) ?? template_opts[0])?.name, options: template_opts - .filter((s) => (useJS ? s : !s.startsWith("js"))) - .map((s: string) => ({ label: s, value: s })), + .filter((t) => (useJS ? t : !t.name.startsWith("js"))) + .map((t) => ({ label: t.name, value: t.name })), }), ); if (!template) return; + const chosenTemplate = template_opts.find((t) => t.name === template); + + // SSR flip: only offered on Solid 2.0 templates that support it (e.g. "basic") + let enableSSR = false; + if (projectType === "solid" && chosenTemplate?.ssrToggle) { + enableSSR = + ssr ?? + (await cancelable( + p.confirm({ message: "Enable server-side rendering (streaming SSR)?", initialValue: false }), + )); + } else if (ssr) { + p.log.warn(`--ssr is not supported for this template and will be ignored`); + } // Need to transpile if the user wants Jabascript, but their selected template isn't Javascript const transpileToJS = useJS && !template.startsWith("js"); - if (projectType === "start" && isValidTemplate("start", template, isV2)) { + if (projectType === "solid" && chosenTemplate) { + await spinnerify({ + startText: "Creating project", + finishText: "Project created 🎉", + fn: () => createSolidV2({ template, destination: projectName, path: group?.path }, transpileToJS, enableSSR), + }); + } else if (projectType === "start" && chosenTemplate) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createStart({ template, destination: projectName }, transpileToJS, isV2), + fn: () => createStart({ template, destination: projectName, path: group?.path }, transpileToJS, isV2), }); } else if (projectType === "library" && isValidTemplate("library", template)) { await spinnerify({ @@ -164,11 +212,11 @@ export const createSolid = (version: string) => finishText: "Project created 🎉", fn: () => createLibrary({ destination: projectName }), }); - } else if (projectType === "vanilla" && isValidTemplate(projectType, template)) { + } else if (projectType === "vanilla" && chosenTemplate) { await spinnerify({ startText: "Creating project", finishText: "Project created 🎉", - fn: () => createVanilla({ template, destination: projectName }, transpileToJS), + fn: () => createVanilla({ template, destination: projectName, path: group?.path }, transpileToJS), }); } else { p.log.error(`Template ${template} is not valid for project type ${projectType}`); diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index d4130ee..f7bac15 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -38,10 +38,18 @@ export const JS_CONFIG = { }, }; +// The solid-v2 templates don't use the `~/*` path alias +export const JS_CONFIG_SOLID_V2 = { + compilerOptions: { + jsx: "preserve", + jsxImportSource: "solid-js", + }, +}; + // Supported templates /**Supported Vanilla Templates */ -const VANILLA_TEMPLATES = [ +export const VANILLA_TEMPLATES = [ "basic", "bare", "with-vitest", @@ -63,7 +71,7 @@ export type VanillaTemplate = (typeof VANILLA_TEMPLATES)[number]; * @description This list is hardcoded. But templates are fetched from another github repo. * @see https://github.com/solidjs/templates/tree/main/solid-start */ -const START_TEMPLATES = [ +export const START_TEMPLATES = [ "basic", "bare", "with-solidbase", @@ -83,7 +91,7 @@ const START_TEMPLATES = [ export type StartTemplate = (typeof START_TEMPLATES)[number]; -const START_TEMPLATES_V2 = [ +export const START_TEMPLATES_V2 = [ "basic", "bare", "with-auth", @@ -102,11 +110,31 @@ const START_TEMPLATES_V2 = [ export type StartTemplateV2 = (typeof START_TEMPLATES_V2)[number]; +/** + * Solid 2.0 templates (templates repo: `solid-v2/`) + * @see https://github.com/solidjs/templates/tree/main/solid-v2 + */ +export const SOLID_V2_TEMPLATES = [ + "basic", + "bare", + "fullstack", + "fullstack-tanstack", + "with-bootstrap", + "with-sass", + "with-tailwindcss", + "with-tanstack-router", + "with-unocss", + "with-vitest-browser-mode", +] as const satisfies string[]; +export type SolidV2Template = (typeof SOLID_V2_TEMPLATES)[number]; + /**Supported Library Templates */ export const LIBRARY_TEMPLATES = ["solid-lib-starter"] as const satisfies string[]; export type LibraryTemplate = (typeof LIBRARY_TEMPLATES)[number]; -export const PROJECT_TYPES = ["start", "vanilla", "library"] as const satisfies string[]; +// "solid" (Solid 2.0) is listed first, but "start" remains the preselected +// default while Solid 2.0 core is in beta +export const PROJECT_TYPES = ["solid", "start", "vanilla", "library"] as const satisfies string[]; export type ProjectType = (typeof PROJECT_TYPES)[number]; /** @@ -114,14 +142,17 @@ export type ProjectType = (typeof PROJECT_TYPES)[number]; * @param projectType type of project */ export function getTemplatesList(projectType: "vanilla", v2?: boolean): VanillaTemplate[]; +export function getTemplatesList(projectType: "solid", v2?: boolean): SolidV2Template[]; export function getTemplatesList(projectType: "start", v2?: boolean): StartTemplate[] | StartTemplateV2[]; export function getTemplatesList(projectType: "library", v2?: boolean): LibraryTemplate[]; export function getTemplatesList( projectType: ProjectType, v2?: boolean, -): VanillaTemplate[] | StartTemplate[] | StartTemplateV2[] | LibraryTemplate[]; +): VanillaTemplate[] | SolidV2Template[] | StartTemplate[] | StartTemplateV2[] | LibraryTemplate[]; export function getTemplatesList(projectType: ProjectType, v2?: boolean) { - if (projectType === "start") { + if (projectType === "solid") { + return SOLID_V2_TEMPLATES as unknown as SolidV2Template[]; + } else if (projectType === "start") { if (v2) { return START_TEMPLATES_V2 as unknown as StartTemplateV2[]; } @@ -139,6 +170,7 @@ export function getTemplatesList(projectType: ProjectType, v2?: boolean) { * @returns the template string if it is valid, undefined if not */ export function isValidTemplate(type: "vanilla", maybe_template: string): maybe_template is VanillaTemplate; +export function isValidTemplate(type: "solid", maybe_template: string): maybe_template is SolidV2Template; export function isValidTemplate( type: "start", maybe_template: string, diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts new file mode 100644 index 0000000..0788521 --- /dev/null +++ b/packages/create/src/utils/download.ts @@ -0,0 +1,19 @@ +import { downloadRepo, GithubFetcher } from "@begit/core"; + +export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; + +/** + * Optional ref (tag, sha or branch) of solidjs/templates that scaffold downloads + * are pinned to. Set this at release time (e.g. to a `cli-x.y` tag) so a published + * CLI version keeps scaffolding exactly what it was tested against, immune to + * later reorganizations of the templates repo. `undefined` means live HEAD of the + * default branch, which is the historical behavior. + */ +export const TEMPLATES_REF: string | undefined = undefined; + +/** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ +export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; + +/** Downloads `subdir` of the solidjs/templates repo (at the pinned ref, if any) into `destination` */ +export const downloadTemplate = (subdir: string, destination: string) => + downloadRepo({ repo: { ...TEMPLATES_REPO, subdir, hash: templatesRef() }, dest: destination }, GithubFetcher); diff --git a/packages/create/src/utils/manifest.ts b/packages/create/src/utils/manifest.ts new file mode 100644 index 0000000..6855e68 --- /dev/null +++ b/packages/create/src/utils/manifest.ts @@ -0,0 +1,119 @@ +import { + SOLID_V2_TEMPLATES, + START_TEMPLATES, + START_TEMPLATES_V2, + VANILLA_TEMPLATES, + ProjectType, +} from "./constants"; + +/** + * `templates.json` manifest published at the root of the solidjs/templates repo. + * When reachable, it is the source of truth for template names, subdir paths and + * per-template flags, so the templates repo can add/reorganize templates without + * requiring a CLI release. The baked-in lists in `constants.ts` are the fallback. + */ +export type ManifestTemplate = { + name: string; + /** Preselected in the template prompt */ + default?: boolean; + /** Offer the "Enable server-side rendering?" prompt for this template */ + ssrToggle?: boolean; +}; + +export type ManifestGroup = { + label?: string; + /** Subdir prefix inside the templates repo, e.g. "solid-v2" */ + path: string; + status?: string; + templates: ManifestTemplate[]; +}; + +export type TemplatesManifest = { + version: number; + groups: Record; +}; + +/** Manifest groups the CLI understands (library comes from a different repo and stays baked-in) */ +export type ManifestGroupKey = "solid" | "start-v2" | "start-v1" | "vanilla"; + +export const MANIFEST_URL = "https://raw.githubusercontent.com/solidjs/templates/HEAD/templates.json"; +const MANIFEST_TIMEOUT_MS = 2000; + +const asTemplates = (names: readonly string[], defaultName?: string, ssrToggle?: string): ManifestTemplate[] => + names.map((name) => ({ + name, + ...(name === defaultName ? { default: true } : {}), + ...(name === ssrToggle ? { ssrToggle: true } : {}), + })); + +/** Baked-in fallback, used whenever the manifest can't be fetched or parsed */ +export const BAKED_GROUPS: Record = { + "solid": { + label: "Solid 2.0", + path: "solid-v2", + templates: asTemplates(SOLID_V2_TEMPLATES, "basic", "basic"), + }, + "start-v2": { + label: "SolidStart 2", + path: "solid-start-v2", + templates: asTemplates(START_TEMPLATES_V2, "basic"), + }, + "start-v1": { + label: "SolidStart 1", + path: "solid-start-v1", + templates: asTemplates(START_TEMPLATES, "basic"), + }, + "vanilla": { + label: "SolidJS + Vite", + path: "vanilla", + templates: asTemplates(VANILLA_TEMPLATES, "basic"), + }, +}; + +/** + * Validates an untrusted parsed JSON value into a `TemplatesManifest`. + * Returns `undefined` for anything unusable (unknown major version, wrong shape), + * dropping malformed groups/entries rather than failing outright. + */ +export const parseManifest = (raw: unknown): TemplatesManifest | undefined => { + if (!raw || typeof raw !== "object") return undefined; + const manifest = raw as TemplatesManifest; + if (manifest.version !== 1) return undefined; + if (!manifest.groups || typeof manifest.groups !== "object") return undefined; + const groups: Record = {}; + for (const [key, group] of Object.entries(manifest.groups)) { + if (!group || typeof group !== "object") continue; + if (typeof group.path !== "string" || !Array.isArray(group.templates)) continue; + const templates = group.templates.filter( + (t): t is ManifestTemplate => !!t && typeof t === "object" && typeof t.name === "string", + ); + if (templates.length === 0) continue; + groups[key] = { ...group, templates }; + } + if (Object.keys(groups).length === 0) return undefined; + return { version: 1, groups }; +}; + +/** + * Fetches the live manifest from the templates repo (HEAD, small file, short timeout). + * Any failure — offline, timeout, 404, malformed JSON, unknown version — resolves to + * `undefined` so callers silently fall back to the baked-in lists. + */ +export const fetchTemplatesManifest = async (): Promise => { + try { + const url = process.env.SOLID_CLI_TEMPLATES_MANIFEST_URL || MANIFEST_URL; + const res = await fetch(url, { signal: AbortSignal.timeout(MANIFEST_TIMEOUT_MS) }); + if (!res.ok) return undefined; + return parseManifest(await res.json()); + } catch { + return undefined; + } +}; + +/** Maps the CLI's project type (+ SolidStart version) to a manifest group key */ +export const groupKeyFor = (projectType: Exclude, startV2?: boolean): ManifestGroupKey => + projectType === "start" ? (startV2 ? "start-v2" : "start-v1") : projectType; + +/** Resolves a group from the manifest, falling back to the baked-in lists */ +export const resolveGroup = (manifest: TemplatesManifest | undefined, key: ManifestGroupKey): ManifestGroup => + manifest?.groups[key] ?? BAKED_GROUPS[key]; diff --git a/packages/create/src/utils/ssr-flip.ts b/packages/create/src/utils/ssr-flip.ts new file mode 100644 index 0000000..08b59d6 --- /dev/null +++ b/packages/create/src/utils/ssr-flip.ts @@ -0,0 +1,133 @@ +import { existsSync } from "node:fs"; +import { readFile, writeFile } from "node:fs/promises"; +import { join } from "node:path"; +import { log } from "@clack/prompts"; + +/** + * Flips a client-mode Solid 2.0 template (e.g. `solid-v2/basic`) into streaming SSR. + * The delta to the `solid-v2/fullstack` template's server posture is exactly three files: + * 1. `vite.config.ts` — add `ssr: true` to the `solid({ start: true, ... })` call + * 2. `server.js` — the generic production node server (verbatim from `solid-v2/fullstack`) + * 3. `package.json` — point the `start` script at that server + */ + +export const SSR_ANCHOR = "solid({ start: true"; +/** The template documents the flip with this hint; drop it once the flip is applied */ +export const SSR_HINT_COMMENT = " // add `ssr: true` for streaming SSR"; +export const SSR_START_SCRIPT = "node --env-file-if-exists=.env server.js"; + +/** + * Production node server for turnkey SSR apps. Verbatim copy of + * `solid-v2/fullstack/server.js` from the templates repo — fully generic: it only + * imports node builtins plus the built server bundle's `handleRequest`. + * Regenerate with `node scripts/gen-ssr-flip-server.mjs ` + * when the template changes. + */ +// @generated-server-js-start +export const SERVER_JS = `// The entire production server for a turnkey SSR app: static client assets +// plus one import — the built server bundle's \`handleRequest\`, an +// adapter-agnostic web \`Request -> Response\` handler that streams the SSR +// render, resolves hashed client assets through the build manifest, and +// (with serverFunctions enabled) serves the \`/_server\` endpoint too. The +// node <-> web plumbing below is the only glue; on a web-native platform +// (workers, Deno, Bun.serve) \`handleRequest\` is used directly. +import { createServer } from 'node:http'; +import { readFileSync } from 'node:fs'; +import { Readable } from 'node:stream'; +import { fileURLToPath } from 'node:url'; +import path from 'node:path'; +import { handleRequest } from './dist/server/server.js'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const port = process.env.PORT || 3000; + +const MIME = { + '.js': 'application/javascript', + '.css': 'text/css', + '.html': 'text/html', + '.json': 'application/json', + '.ico': 'image/x-icon', + '.svg': 'image/svg+xml', +}; + +function webRequest(req) { + const url = new URL(req.url || '/', \`http://\${req.headers.host || \`localhost:\${port}\`}\`); + const method = req.method || 'GET'; + const body = method === 'GET' || method === 'HEAD' ? undefined : Readable.toWeb(req); + return new Request(url, { + method, + headers: req.headers, + body, + ...(body ? { duplex: 'half' } : {}), + }); +} + +const server = createServer(async (req, res) => { + const url = req.url || '/'; + + // Static client assets first. + if (url !== '/' && !url.includes('..')) { + try { + const content = readFileSync(path.resolve(__dirname, 'dist/client' + url.split('?')[0])); + res.setHeader('Content-Type', MIME[path.extname(url)] || 'application/octet-stream'); + res.end(content); + return; + } catch { + // Fall through to the handler (SSR routes, /_server, ...). + } + } + + try { + const response = await handleRequest(webRequest(req)); + res.statusCode = response.status; + const cookies = response.headers.getSetCookie?.(); + response.headers.forEach((value, key) => { + if (key !== 'set-cookie') res.setHeader(key, value); + }); + if (cookies?.length) res.setHeader('set-cookie', cookies); + if (response.body) { + for await (const chunk of response.body) res.write(chunk); + } + res.end(); + } catch (e) { + console.error(e); + res.statusCode = 500; + res.end(e.message); + } +}); + +server.listen(port, () => { + console.log(\`Server running at http://localhost:\${port}\`); +}); +`; +// @generated-server-js-end + +/** + * Applies the SSR flip to a scaffolded template directory (before any TS→JS conversion, + * so the config edit happens on the `.ts` source). + * + * If the `vite.config.ts` anchor is missing (template drifted), the flip is aborted + * with a warning instead of writing a broken config, leaving a working client-mode app. + */ +export const applySsrFlip = async (dir: string): Promise => { + const viteConfigPath = join(dir, "vite.config.ts"); + const abort = (reason: string) => { + log.warn(`Skipping SSR setup: ${reason}. The project was created in client mode.`); + return false; + }; + if (!existsSync(viteConfigPath)) return abort("no vite.config.ts found"); + const viteConfig = (await readFile(viteConfigPath)).toString(); + if (!viteConfig.includes(SSR_ANCHOR)) return abort("unrecognized vite.config.ts"); + + await writeFile( + viteConfigPath, + viteConfig.replace(SSR_ANCHOR, `${SSR_ANCHOR}, ssr: true`).replace(SSR_HINT_COMMENT, ""), + ); + await writeFile(join(dir, "server.js"), SERVER_JS); + + const packageJsonPath = join(dir, "package.json"); + const packageJson = JSON.parse((await readFile(packageJsonPath)).toString()); + packageJson.scripts = { ...packageJson.scripts, start: SSR_START_SCRIPT }; + await writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2) + "\n"); + return true; +}; diff --git a/packages/create/src/utils/ts-conversion.ts b/packages/create/src/utils/ts-conversion.ts index 10d9c37..e0bd5a0 100644 --- a/packages/create/src/utils/ts-conversion.ts +++ b/packages/create/src/utils/ts-conversion.ts @@ -12,7 +12,9 @@ const convertToJS = async (file: Dirent, startPath: string) => { mkdirSync(dest, { recursive: true }); recurseFiles(resolve(startPath, file.name), convertToJS); } else if (file.isFile()) { - if (src.endsWith(".ts") || src.endsWith(".tsx")) { + if (src.endsWith(".d.ts")) { + // Type declarations have no JS counterpart + } else if (src.endsWith(".ts") || src.endsWith(".tsx")) { let { code } = transform(await readFileToString(src), { transforms: ["typescript", "jsx"], jsxRuntime: "preserve", @@ -26,9 +28,9 @@ const convertToJS = async (file: Dirent, startPath: string) => { } } }; -export const handleTSConversion = async (tempDir: string, projectName: string) => { +export const handleTSConversion = async (tempDir: string, projectName: string, jsConfig: object = JS_CONFIG) => { await rm(resolve(tempDir, "tsconfig.json")); - writeFileSync(resolve(projectName, "jsconfig.json"), JSON.stringify(JS_CONFIG, null, 2), { flag: "wx" }); + writeFileSync(resolve(projectName, "jsconfig.json"), JSON.stringify(jsConfig, null, 2), { flag: "wx" }); // Convert all ts files in temp directory into js recurseFiles(tempDir, convertToJS); diff --git a/packages/create/tests/fixtures/solid-v2-basic/package.json b/packages/create/tests/fixtures/solid-v2-basic/package.json new file mode 100644 index 0000000..d351538 --- /dev/null +++ b/packages/create/tests/fixtures/solid-v2-basic/package.json @@ -0,0 +1,30 @@ +{ + "name": "example-basic", + "version": "0.0.0", + "description": "", + "type": "module", + "scripts": { + "start": "vite", + "dev": "vite", + "build": "vite build", + "serve": "vite preview", + "test": "vitest" + }, + "license": "MIT", + "devDependencies": { + "@solidjs/testing-library": "1.0.0-beta.2", + "@testing-library/jest-dom": "^6.6.3", + "filesystem-routing": "0.2.1", + "jsdom": "^25.0.1", + "typescript": "^5.9.2", + "vite": "^8.1.5", + "vite-plugin-solid": "3.0.0-next.24", + "vitest": "^4.0.0" + }, + "dependencies": { + "@solidjs/meta": "1.0.0-next.1", + "@solidjs/router": "2.0.0-next.15", + "@solidjs/web": "2.0.0-beta.33", + "solid-js": "2.0.0-beta.33" + } +} diff --git a/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts b/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts new file mode 100644 index 0000000..554fb1d --- /dev/null +++ b/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts @@ -0,0 +1,32 @@ +import { fileRoutes } from 'filesystem-routing/vite'; +import { defineConfig } from 'vitest/config'; +import solid from 'vite-plugin-solid'; + +export default defineConfig({ + // Turnkey client mode: no index.html and no mount file — the plugin + // generates the entries around src/App.tsx, wrapped in src/Document.tsx + // (or a built-in shell). `vite build` prerenders the shell into + // dist/client/index.html and emits a purely static dist/client. + plugins: [ + // `extensions` makes vite-plugin-solid also compile the `?pick=` route + // modules the fileRoutes plugin emits (their ids end in a query string). + solid({ start: true, extensions: ['.jsx', '.tsx'] }), // add `ssr: true` for streaming SSR + fileRoutes(), + ], + server: { + port: 3000, + }, + test: { + environment: 'jsdom', + globals: false, + setupFiles: ['./vitest-setup.ts'], + // if you have few tests, try commenting this + // out to improve performance: + isolate: false, + }, + build: { + target: 'esnext', + // Keep images as asset files instead of inlining them into the JS bundle. + assetsInlineLimit: 0, + }, +}); diff --git a/packages/create/tests/manifest.test.ts b/packages/create/tests/manifest.test.ts new file mode 100644 index 0000000..ae78e1b --- /dev/null +++ b/packages/create/tests/manifest.test.ts @@ -0,0 +1,80 @@ +import { afterEach, expect, it } from "vitest"; +import { fetchTemplatesManifest, parseManifest, resolveGroup } from "../src/utils/manifest"; + +const validManifest = { + version: 1, + groups: { + solid: { + label: "Solid 2.0", + path: "solid-v2", + templates: [{ name: "basic", default: true, ssrToggle: true }, { name: "bare" }], + }, + }, +}; + +it("parses a valid manifest", () => { + const manifest = parseManifest(validManifest); + expect(manifest).toBeDefined(); + expect(manifest!.groups["solid"].path).toBe("solid-v2"); + expect(manifest!.groups["solid"].templates.map((t) => t.name)).toEqual(["basic", "bare"]); +}); + +it("rejects unknown manifest versions and malformed documents", () => { + expect(parseManifest({ ...validManifest, version: 2 })).toBeUndefined(); + expect(parseManifest(null)).toBeUndefined(); + expect(parseManifest("nonsense")).toBeUndefined(); + expect(parseManifest({ version: 1 })).toBeUndefined(); + expect(parseManifest({ version: 1, groups: { solid: { templates: "not-an-array" } } })).toBeUndefined(); +}); + +it("drops malformed groups and template entries but keeps the rest", () => { + const manifest = parseManifest({ + version: 1, + groups: { + solid: { path: "solid-v2", templates: [{ name: "basic" }, { notAName: true }, "bare"] }, + broken: { path: 42, templates: [{ name: "x" }] }, + }, + }); + expect(manifest).toBeDefined(); + expect(Object.keys(manifest!.groups)).toEqual(["solid"]); + expect(manifest!.groups["solid"].templates).toEqual([{ name: "basic" }]); +}); + +it("resolves groups from the manifest, falling back to baked-in lists", () => { + const manifest = parseManifest(validManifest); + expect(resolveGroup(manifest, "solid").templates.map((t) => t.name)).toEqual(["basic", "bare"]); + + // Groups missing from the manifest fall back per-group + expect(resolveGroup(manifest, "vanilla").path).toBe("vanilla"); + + // No manifest at all: everything comes from the baked-in lists + const baked = resolveGroup(undefined, "solid"); + expect(baked.path).toBe("solid-v2"); + expect(baked.templates.map((t) => t.name)).toEqual([ + "basic", + "bare", + "fullstack", + "fullstack-tanstack", + "with-bootstrap", + "with-sass", + "with-tailwindcss", + "with-tanstack-router", + "with-unocss", + "with-vitest-browser-mode", + ]); + const basic = baked.templates.find((t) => t.name === "basic")!; + expect(basic.default).toBe(true); + expect(basic.ssrToggle).toBe(true); + expect(resolveGroup(undefined, "start-v2").path).toBe("solid-start-v2"); + expect(resolveGroup(undefined, "start-v1").path).toBe("solid-start-v1"); +}); + +afterEach(() => { + delete process.env.SOLID_CLI_TEMPLATES_MANIFEST_URL; +}); + +it("silently returns undefined when the manifest fetch fails", async () => { + // Unroutable address: connection is refused immediately + process.env.SOLID_CLI_TEMPLATES_MANIFEST_URL = "http://127.0.0.1:1/templates.json"; + expect(await fetchTemplatesManifest()).toBeUndefined(); +}); diff --git a/packages/create/tests/ssr-flip.test.ts b/packages/create/tests/ssr-flip.test.ts new file mode 100644 index 0000000..bdaa739 --- /dev/null +++ b/packages/create/tests/ssr-flip.test.ts @@ -0,0 +1,48 @@ +import { beforeEach, expect, it } from "vitest"; +import { mkdtempSync, copyFileSync, existsSync, readFileSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { applySsrFlip, SERVER_JS, SSR_HINT_COMMENT, SSR_START_SCRIPT } from "../src/utils/ssr-flip"; + +const fixtures = fileURLToPath(new URL("./fixtures/solid-v2-basic/", import.meta.url)); + +let dir: string; +beforeEach(() => { + dir = mkdtempSync(join(tmpdir(), "ssr-flip-")); + copyFileSync(join(fixtures, "vite.config.ts"), join(dir, "vite.config.ts")); + copyFileSync(join(fixtures, "package.json"), join(dir, "package.json")); +}); + +it("flips the basic template to streaming SSR", async () => { + expect(await applySsrFlip(dir)).toBe(true); + + const viteConfig = readFileSync(join(dir, "vite.config.ts")).toString(); + expect(viteConfig).toContain("solid({ start: true, ssr: true"); + expect(viteConfig).not.toContain(SSR_HINT_COMMENT); + + // The production server is a verbatim copy of solid-v2/fullstack/server.js + expect(readFileSync(join(dir, "server.js")).toString()).toBe(SERVER_JS); + + const packageJson = JSON.parse(readFileSync(join(dir, "package.json")).toString()); + expect(packageJson.scripts.start).toBe(SSR_START_SCRIPT); + // The other scripts are untouched + expect(packageJson.scripts.dev).toBe("vite"); + expect(packageJson.scripts.build).toBe("vite build"); +}); + +it("aborts without writing anything when the vite config anchor is missing", async () => { + const drifted = `import { defineConfig } from "vite";\nexport default defineConfig({});\n`; + writeFileSync(join(dir, "vite.config.ts"), drifted); + const packageJsonBefore = readFileSync(join(dir, "package.json")).toString(); + + expect(await applySsrFlip(dir)).toBe(false); + + expect(readFileSync(join(dir, "vite.config.ts")).toString()).toBe(drifted); + expect(existsSync(join(dir, "server.js"))).toBe(false); + expect(readFileSync(join(dir, "package.json")).toString()).toBe(packageJsonBefore); +}); + +it("aborts when there is no vite.config.ts", async () => { + expect(await applySsrFlip(mkdtempSync(join(tmpdir(), "ssr-flip-empty-")))).toBe(false); +}); diff --git a/packages/create/tests/template.test.ts b/packages/create/tests/template.test.ts index 6fb0520..bb6fc0c 100644 --- a/packages/create/tests/template.test.ts +++ b/packages/create/tests/template.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import { createVanilla } from "../src"; +import { createSolidV2, createVanilla } from "../src"; import { existsSync } from "fs"; it("downloads and extracts the basic template", async () => { await createVanilla({ template: "basic", destination: "./test/ts" }, false); @@ -7,3 +7,10 @@ it("downloads and extracts the basic template", async () => { const appTsx = existsSync("./test/ts/src/App.tsx"); expect(appTsx).toBe(true); }); + +it("downloads and extracts the solid-v2 basic template", async () => { + await createSolidV2({ template: "basic", destination: "./test/solid-v2" }, false); + + const appTsx = existsSync("./test/solid-v2/src/App.tsx"); + expect(appTsx).toBe(true); +}); diff --git a/scripts/gen-ssr-flip-server.mjs b/scripts/gen-ssr-flip-server.mjs new file mode 100644 index 0000000..c1f199e --- /dev/null +++ b/scripts/gen-ssr-flip-server.mjs @@ -0,0 +1,15 @@ +// One-off generator: embeds solid-v2/fullstack/server.js into ssr-flip.ts as an +// escaped template literal, guaranteeing the scaffolded file byte-matches the template. +import { readFileSync, writeFileSync } from "node:fs"; + +const [src, dest] = process.argv.slice(2); +const content = readFileSync(src, "utf8"); +const escaped = content.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${"); + +const target = readFileSync(dest, "utf8"); +const updated = target.replace( + /(\/\/ @generated-server-js-start\nexport const SERVER_JS = `)[\s\S]*?(`;\n\/\/ @generated-server-js-end)/, + `$1${escaped}$2`, +); +writeFileSync(dest, updated); +console.log("embedded", content.length, "bytes"); diff --git a/vitest.config.ts b/vitest.config.ts index bef45c6..3bc10e7 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,4 +1,9 @@ import { defineConfig } from "vitest/config"; export default defineConfig({ - test: { globalSetup: ["./setup.ts"] }, + test: { + globalSetup: ["./setup.ts"], + // "test" is where template-download tests scaffold projects; + // the scaffolded templates carry test files of their own + exclude: ["**/node_modules/**", "**/test/**"], + }, }); From 8d682044a2873ef7208a8af5685bbc68a40359ce Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Tue, 11 Aug 2026 16:08:53 -0700 Subject: [PATCH 278/290] chore: pin TEMPLATES_REF to templates main (c3032d9) carrying solid-v2 + templates.json Co-authored-by: Cursor --- packages/create/src/utils/download.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index 0788521..e972998 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -9,7 +9,7 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * later reorganizations of the templates repo. `undefined` means live HEAD of the * default branch, which is the historical behavior. */ -export const TEMPLATES_REF: string | undefined = undefined; +export const TEMPLATES_REF: string | undefined = "c3032d95cd6d6ab4782eb64902a12829a36d0731"; /** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; From 048ca9244d32af00295dfffff1bd1d4a27d1d3f5 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Tue, 11 Aug 2026 21:48:15 -0700 Subject: [PATCH 279/290] chore: bump TEMPLATES_REF to templates main (b3d888d) for browser-mode fixes Picks up two template fixes: solid-v2/with-vitest-browser-mode sets environment: 'node' explicitly so `pnpm test` exits 0, and vanilla/with-vitest-browser-mode's corrupted import specifier is repaired. Co-authored-by: Cursor --- packages/create/src/utils/download.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index e972998..a62a6e5 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -9,7 +9,7 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * later reorganizations of the templates repo. `undefined` means live HEAD of the * default branch, which is the historical behavior. */ -export const TEMPLATES_REF: string | undefined = "c3032d95cd6d6ab4782eb64902a12829a36d0731"; +export const TEMPLATES_REF: string | undefined = "b3d888d309c7173feee2b4cb3ddba8e788af559b"; /** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; From 5833ad173d8a66f087fe9ad399d670c2b0b87894 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Wed, 12 Aug 2026 03:40:53 -0700 Subject: [PATCH 280/290] fix: use @solidjs/web as jsxImportSource in solid-v2 jsconfig The JS variants of the Solid 2.0 templates were getting a jsconfig.json with jsxImportSource "solid-js", but the templates' own tsconfig.json declares "@solidjs/web" (Solid 2.0's JSX runtime lives there, and vite-plugin-solid 3.x compiles against it). Match the templates. Raised by @brenelz in #82 review. Co-authored-by: Cursor --- packages/create/src/utils/constants.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index f7bac15..b973bf3 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -38,11 +38,12 @@ export const JS_CONFIG = { }, }; -// The solid-v2 templates don't use the `~/*` path alias +// The solid-v2 templates don't use the `~/*` path alias, and Solid 2.0's JSX +// runtime lives in `@solidjs/web` (matches the templates' tsconfig.json) export const JS_CONFIG_SOLID_V2 = { compilerOptions: { jsx: "preserve", - jsxImportSource: "solid-js", + jsxImportSource: "@solidjs/web", }, }; From 2e3d9385d47f0d0ddd89baf740ac7c89abdc668d Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Wed, 12 Aug 2026 08:14:54 -0700 Subject: [PATCH 281/290] fix: dedupe extensions array when converting solid-v2 vite config to JS The blanket `.tsx` -> `.jsx` retarget regex in createSolidV2JS rewrote both entries of `extensions: ['.jsx', '.tsx']` to the same value, leaving `['.jsx', '.jsx']` in the converted vite.config.js. Dedupe the array after the rewrite, and also retarget `.ts`/`.tsx` filename mentions in config comments and the README (`.d.ts` mentions are left alone since those files are deleted, not transpiled). Co-authored-by: Cursor --- packages/create/src/create-solid-v2.ts | 32 ++++++++++++++++------- packages/create/tests/ts-retarget.test.ts | 28 ++++++++++++++++++++ 2 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 packages/create/tests/ts-retarget.test.ts diff --git a/packages/create/src/create-solid-v2.ts b/packages/create/src/create-solid-v2.ts index c4366d4..cfac554 100644 --- a/packages/create/src/create-solid-v2.ts +++ b/packages/create/src/create-solid-v2.ts @@ -25,6 +25,22 @@ export const createSolidV2TS = async ({ template, destination, path = "solid-v2" if (ssr) await applySsrFlip(destination); }; +/** + * Retarget `.ts`/`.tsx` filename mentions in converted text (vite config, + * README) to the transpiled `.js`/`.jsx` output. `.d.ts` files are deleted + * (not transpiled) by the conversion, so their mentions are left alone. + */ +export const retargetTSFilenames = (text: string) => + text + .replace(/\.tsx\b/g, ".jsx") + .replace(/(? { + const deduped = [...new Set(entries.split(",").map((entry) => entry.trim()).filter(Boolean))]; + return `extensions: [${deduped.join(", ")}]`; + }); + export const createSolidV2JS = async (args: CreateSolidV2Args, ssr?: boolean) => { // Create typescript project in `/.project` // then transpile this to javascript and clean up. @@ -34,15 +50,13 @@ export const createSolidV2JS = async (args: CreateSolidV2Args, ssr?: boolean) => await createSolidV2TS({ ...args, destination: tempDir }, ssr); await handleTSConversion(tempDir, args.destination, JS_CONFIG_SOLID_V2); // Solid 2.0 templates have no `index.html` (turnkey entries), but their vite - // config references `.ts`/`.tsx` files by path (setup files, middleware, test - // globs) — retarget those to the transpiled `.js`/`.jsx` output - const viteConfigPath = join(args.destination, "vite.config.js"); - if (existsSync(viteConfigPath)) { - const viteConfig = (await readFile(viteConfigPath)) - .toString() - .replace(/\.tsx(?=['"])/g, ".jsx") - .replace(/\.ts(?=['"])/g, ".js"); - await writeFile(viteConfigPath, viteConfig); + // config and README reference `.ts`/`.tsx` files (setup files, comments, + // route examples) — retarget those to the transpiled `.js`/`.jsx` output + for (const file of ["vite.config.js", "README.md"]) { + const filePath = join(args.destination, file); + if (existsSync(filePath)) { + await writeFile(filePath, retargetTSFilenames((await readFile(filePath)).toString())); + } } // Add .gitignore writeFileSync(join(args.destination, ".gitignore"), GIT_IGNORE); diff --git a/packages/create/tests/ts-retarget.test.ts b/packages/create/tests/ts-retarget.test.ts new file mode 100644 index 0000000..cabb70b --- /dev/null +++ b/packages/create/tests/ts-retarget.test.ts @@ -0,0 +1,28 @@ +import { expect, it } from "vitest"; +import { readFileSync } from "node:fs"; +import { fileURLToPath } from "node:url"; +import { retargetTSFilenames } from "../src/create-solid-v2"; + +const fixtureConfig = fileURLToPath(new URL("./fixtures/solid-v2-basic/vite.config.ts", import.meta.url)); + +it("dedupes the extensions array instead of writing ['.jsx', '.jsx']", () => { + const converted = retargetTSFilenames(readFileSync(fixtureConfig).toString()); + + expect(converted).toContain("extensions: ['.jsx']"); + expect(converted).not.toContain("'.tsx'"); + expect(converted).not.toContain("'.jsx', '.jsx'"); + // Setup files are transpiled alongside the rest of the template + expect(converted).toContain("./vitest-setup.js"); +}); + +it("retargets filename mentions in comments and prose", () => { + const converted = retargetTSFilenames( + "// generates the entries around src/App.tsx\nSee `vite.config.ts` and `src/routes/users/[id].tsx`. Type declarations stay in `global.d.ts`.", + ); + + expect(converted).toContain("src/App.jsx"); + expect(converted).toContain("`vite.config.js`"); + expect(converted).toContain("[id].jsx"); + // `.d.ts` files are deleted by the conversion, not renamed + expect(converted).toContain("global.d.ts"); +}); From 170f509d287dcdb1006afafe6d4aaa172caea100 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Wed, 12 Aug 2026 08:16:28 -0700 Subject: [PATCH 282/290] chore: bump TEMPLATES_REF to templates main (4f54cb7) for browser-mode cleanup solid-v2/with-vitest-browser-mode drops its environment: 'node' workaround now that vite-plugin-solid 3.0.0-next.26 gates its jsdom default on browser.enabled; the templates commit was verified on a fresh install (pnpm install && pnpm test exits 0, test passes in real Chromium). Co-authored-by: Cursor --- packages/create/src/utils/download.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index a62a6e5..85ae7bc 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -9,7 +9,7 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * later reorganizations of the templates repo. `undefined` means live HEAD of the * default branch, which is the historical behavior. */ -export const TEMPLATES_REF: string | undefined = "b3d888d309c7173feee2b4cb3ddba8e788af559b"; +export const TEMPLATES_REF: string | undefined = "4f54cb7e3362037c43cece30bb7f228becfddcee"; /** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; From 738119468c5a82bbde10bdc00fc965b08f2af443 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Wed, 12 Aug 2026 13:11:55 -0700 Subject: [PATCH 283/290] chore: bump TEMPLATES_REF to templates main (6f2ef07) for the @solidjs/vite-plugin rename vite-plugin-solid is now published as @solidjs/vite-plugin (3.0.0-next.27, identical code plus the rename); the templates commit repins all ten solid-v2 templates and was verified on fresh installs (basic, fullstack, fullstack- tanstack, with-vitest-browser-mode). The solid-v2-basic test fixture mirrors the rename so it keeps matching what the CLI scaffolds; no CLI source baked the old package name (manifest handling is template-name based). Full suite passes: 18/18. Co-authored-by: Cursor --- packages/create/src/utils/download.ts | 2 +- packages/create/tests/fixtures/solid-v2-basic/package.json | 2 +- packages/create/tests/fixtures/solid-v2-basic/vite.config.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index 85ae7bc..71055fe 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -9,7 +9,7 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * later reorganizations of the templates repo. `undefined` means live HEAD of the * default branch, which is the historical behavior. */ -export const TEMPLATES_REF: string | undefined = "4f54cb7e3362037c43cece30bb7f228becfddcee"; +export const TEMPLATES_REF: string | undefined = "6f2ef070adf5d3ad981c94cc891256def7090067"; /** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; diff --git a/packages/create/tests/fixtures/solid-v2-basic/package.json b/packages/create/tests/fixtures/solid-v2-basic/package.json index d351538..71e9a8f 100644 --- a/packages/create/tests/fixtures/solid-v2-basic/package.json +++ b/packages/create/tests/fixtures/solid-v2-basic/package.json @@ -13,12 +13,12 @@ "license": "MIT", "devDependencies": { "@solidjs/testing-library": "1.0.0-beta.2", + "@solidjs/vite-plugin": "3.0.0-next.27", "@testing-library/jest-dom": "^6.6.3", "filesystem-routing": "0.2.1", "jsdom": "^25.0.1", "typescript": "^5.9.2", "vite": "^8.1.5", - "vite-plugin-solid": "3.0.0-next.24", "vitest": "^4.0.0" }, "dependencies": { diff --git a/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts b/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts index 554fb1d..683f1c7 100644 --- a/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts +++ b/packages/create/tests/fixtures/solid-v2-basic/vite.config.ts @@ -1,6 +1,6 @@ import { fileRoutes } from 'filesystem-routing/vite'; import { defineConfig } from 'vitest/config'; -import solid from 'vite-plugin-solid'; +import solid from '@solidjs/vite-plugin'; export default defineConfig({ // Turnkey client mode: no index.html and no mount file — the plugin @@ -8,7 +8,7 @@ export default defineConfig({ // (or a built-in shell). `vite build` prerenders the shell into // dist/client/index.html and emits a purely static dist/client. plugins: [ - // `extensions` makes vite-plugin-solid also compile the `?pick=` route + // `extensions` makes @solidjs/vite-plugin also compile the `?pick=` route // modules the fileRoutes plugin emits (their ids end in a query string). solid({ start: true, extensions: ['.jsx', '.tsx'] }), // add `ssr: true` for streaming SSR fileRoutes(), From 623bc44cf5b5c139736afcbccd01f764341d1670 Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Wed, 12 Aug 2026 17:21:02 -0700 Subject: [PATCH 284/290] =?UTF-8?q?chore:=20bump=20TEMPLATES=5FREF=20to=20?= =?UTF-8?q?templates=20main=20(b09b545)=20for=20the=20solid=202.0.0-rc.0?= =?UTF-8?q?=20repin=20=E2=80=94=20solid-v2-basic=20fixture=20mirrors=20the?= =?UTF-8?q?=20template's=20new=20pins=20(solid=20^2.0.0-rc.0,=20@solidjs/v?= =?UTF-8?q?ite-plugin=203.0.0-next.28,=20@solidjs/router=202.0.0-next.16)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- packages/create/src/utils/download.ts | 2 +- .../create/tests/fixtures/solid-v2-basic/package.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index 71055fe..e0c4cce 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -9,7 +9,7 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * later reorganizations of the templates repo. `undefined` means live HEAD of the * default branch, which is the historical behavior. */ -export const TEMPLATES_REF: string | undefined = "6f2ef070adf5d3ad981c94cc891256def7090067"; +export const TEMPLATES_REF: string | undefined = "b09b545bd62057ffd620ff6f80052e47d99b4672"; /** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; diff --git a/packages/create/tests/fixtures/solid-v2-basic/package.json b/packages/create/tests/fixtures/solid-v2-basic/package.json index 71e9a8f..63bc532 100644 --- a/packages/create/tests/fixtures/solid-v2-basic/package.json +++ b/packages/create/tests/fixtures/solid-v2-basic/package.json @@ -13,7 +13,7 @@ "license": "MIT", "devDependencies": { "@solidjs/testing-library": "1.0.0-beta.2", - "@solidjs/vite-plugin": "3.0.0-next.27", + "@solidjs/vite-plugin": "3.0.0-next.28", "@testing-library/jest-dom": "^6.6.3", "filesystem-routing": "0.2.1", "jsdom": "^25.0.1", @@ -23,8 +23,8 @@ }, "dependencies": { "@solidjs/meta": "1.0.0-next.1", - "@solidjs/router": "2.0.0-next.15", - "@solidjs/web": "2.0.0-beta.33", - "solid-js": "2.0.0-beta.33" + "@solidjs/router": "2.0.0-next.16", + "@solidjs/web": "^2.0.0-rc.0", + "solid-js": "^2.0.0-rc.0" } } From c9ee5c8a7f8b01be3f4c87549388db0f8577270e Mon Sep 17 00:00:00 2001 From: Ryan Carniato Date: Wed, 12 Aug 2026 23:35:29 -0700 Subject: [PATCH 285/290] =?UTF-8?q?chore:=20bump=20TEMPLATES=5FREF=20to=20?= =?UTF-8?q?templates=20main=20(f88b107)=20for=20the=20@solidjs/meta=201.0.?= =?UTF-8?q?0-next.2=20repin=20=E2=80=94=20solid-v2-basic=20fixture=20mirro?= =?UTF-8?q?rs=20the=20templates'=20new=20caret=20ranges=20(@solidjs/meta?= =?UTF-8?q?=20^1.0.0-next.2,=20@solidjs/router=20^2.0.0-next.16,=20@solidj?= =?UTF-8?q?s/vite-plugin=20^3.0.0-next.28)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- packages/create/src/utils/download.ts | 2 +- packages/create/tests/fixtures/solid-v2-basic/package.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index e0c4cce..b560c33 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -9,7 +9,7 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * later reorganizations of the templates repo. `undefined` means live HEAD of the * default branch, which is the historical behavior. */ -export const TEMPLATES_REF: string | undefined = "b09b545bd62057ffd620ff6f80052e47d99b4672"; +export const TEMPLATES_REF: string | undefined = "f88b107279694c1cb9a6de8bb1daad09abb263b0"; /** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; diff --git a/packages/create/tests/fixtures/solid-v2-basic/package.json b/packages/create/tests/fixtures/solid-v2-basic/package.json index 63bc532..8e3b105 100644 --- a/packages/create/tests/fixtures/solid-v2-basic/package.json +++ b/packages/create/tests/fixtures/solid-v2-basic/package.json @@ -13,7 +13,7 @@ "license": "MIT", "devDependencies": { "@solidjs/testing-library": "1.0.0-beta.2", - "@solidjs/vite-plugin": "3.0.0-next.28", + "@solidjs/vite-plugin": "^3.0.0-next.28", "@testing-library/jest-dom": "^6.6.3", "filesystem-routing": "0.2.1", "jsdom": "^25.0.1", @@ -22,8 +22,8 @@ "vitest": "^4.0.0" }, "dependencies": { - "@solidjs/meta": "1.0.0-next.1", - "@solidjs/router": "2.0.0-next.16", + "@solidjs/meta": "^1.0.0-next.2", + "@solidjs/router": "^2.0.0-next.16", "@solidjs/web": "^2.0.0-rc.0", "solid-js": "^2.0.0-rc.0" } From fdeaa4526891e4c38f5ccf6f59a3f28bb9e02c02 Mon Sep 17 00:00:00 2001 From: Brenley Dueck Date: Fri, 14 Aug 2026 05:33:42 -0500 Subject: [PATCH 286/290] fix: label Solid 2.0 as RC (#86) --- .changeset/solid-v2-templates.md | 2 +- packages/create/src/index.ts | 4 ++-- packages/create/src/utils/constants.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.changeset/solid-v2-templates.md b/.changeset/solid-v2-templates.md index c2477d5..81dd317 100644 --- a/.changeset/solid-v2-templates.md +++ b/.changeset/solid-v2-templates.md @@ -5,7 +5,7 @@ Solid 2.0 template support -- New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is in beta; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. +- New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is a release candidate; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. - Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. - JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). - Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. diff --git a/packages/create/src/index.ts b/packages/create/src/index.ts index 8c3bffd..624bf2a 100644 --- a/packages/create/src/index.ts +++ b/packages/create/src/index.ts @@ -14,7 +14,7 @@ import { readFile, writeFile } from "node:fs/promises"; export { createVanilla, createStart, createLibrary, createSolidV2 }; const PROJECT_TYPE_LABELS: Record = { - solid: "Solid 2.0 (Beta)", + solid: "Solid 2.0 (RC)", start: "SolidStart (Solid 1.x)", vanilla: "SolidJS + Vite (Solid 1.x)", library: "Library", @@ -132,7 +132,7 @@ export const createSolid = (version: string) => projectType ??= await cancelable( p.select({ message: "What type of project would you like to create?", - // Solid 2.0 is listed first but not preselected while core is in beta + // Solid 2.0 is listed first but not preselected while core is a release candidate initialValue: "start", options: PROJECT_TYPES.map((t) => ({ value: t, diff --git a/packages/create/src/utils/constants.ts b/packages/create/src/utils/constants.ts index b973bf3..6a0ecb6 100644 --- a/packages/create/src/utils/constants.ts +++ b/packages/create/src/utils/constants.ts @@ -134,7 +134,7 @@ export const LIBRARY_TEMPLATES = ["solid-lib-starter"] as const satisfies string export type LibraryTemplate = (typeof LIBRARY_TEMPLATES)[number]; // "solid" (Solid 2.0) is listed first, but "start" remains the preselected -// default while Solid 2.0 core is in beta +// default while Solid 2.0 core is a release candidate export const PROJECT_TYPES = ["solid", "start", "vanilla", "library"] as const satisfies string[]; export type ProjectType = (typeof PROJECT_TYPES)[number]; From 534cea34d25c3a95808bd1dd2331e6239bd5688e Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 14 Aug 2026 11:37:15 +0100 Subject: [PATCH 287/290] fix: always scaffold from live templates HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Template downloads were pinned to a baked-in solidjs/templates SHA (TEMPLATES_REF), so every upstream template or dependency repin needed a CLI release to reach users. Drop the pin and the SOLID_CLI_TEMPLATES_REF override: scaffolds now come from live HEAD of the default branch, matching what the templates.json manifest already did. Rework the download tests to survive upstream churn: they resolve the template name and subdir from the live manifest, then assert the scaffold is a usable project (package.json parses, has scripts and dependencies, src/ is non-empty) instead of pinning specific filenames or dependency versions. Each test now also starts from a clean destination and removes it afterwards — the previous tests asserted against ./test/ts, which a leftover scaffold from an earlier run could satisfy on its own. Co-Authored-By: Claude Opus 5 (1M context) --- .changeset/solid-v2-templates.md | 2 +- packages/create/src/utils/download.ts | 18 +++---- packages/create/tests/template.test.ts | 69 ++++++++++++++++++++++---- 3 files changed, 66 insertions(+), 23 deletions(-) diff --git a/.changeset/solid-v2-templates.md b/.changeset/solid-v2-templates.md index 81dd317..bf08c8f 100644 --- a/.changeset/solid-v2-templates.md +++ b/.changeset/solid-v2-templates.md @@ -9,4 +9,4 @@ Solid 2.0 template support - Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. - JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). - Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. -- Template tarball downloads can be pinned to a templates-repo ref per CLI release (`TEMPLATES_REF`, overridable via `SOLID_CLI_TEMPLATES_REF`). +- Template tarball downloads track live HEAD of the templates repo, matching the `templates.json` manifest, so template contents and their dependency updates reach users without a CLI release. diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index b560c33..e36963b 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -3,17 +3,11 @@ import { downloadRepo, GithubFetcher } from "@begit/core"; export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; /** - * Optional ref (tag, sha or branch) of solidjs/templates that scaffold downloads - * are pinned to. Set this at release time (e.g. to a `cli-x.y` tag) so a published - * CLI version keeps scaffolding exactly what it was tested against, immune to - * later reorganizations of the templates repo. `undefined` means live HEAD of the - * default branch, which is the historical behavior. + * Downloads `subdir` of the solidjs/templates repo into `destination`. + * + * No ref is pinned: scaffolds always come from live HEAD of the default branch, + * matching the `templates.json` manifest, so template updates reach users + * without a CLI release. */ -export const TEMPLATES_REF: string | undefined = "f88b107279694c1cb9a6de8bb1daad09abb263b0"; - -/** `SOLID_CLI_TEMPLATES_REF` overrides the baked ref, for testing against branches/forks */ -export const templatesRef = () => process.env.SOLID_CLI_TEMPLATES_REF || TEMPLATES_REF; - -/** Downloads `subdir` of the solidjs/templates repo (at the pinned ref, if any) into `destination` */ export const downloadTemplate = (subdir: string, destination: string) => - downloadRepo({ repo: { ...TEMPLATES_REPO, subdir, hash: templatesRef() }, dest: destination }, GithubFetcher); + downloadRepo({ repo: { ...TEMPLATES_REPO, subdir }, dest: destination }, GithubFetcher); diff --git a/packages/create/tests/template.test.ts b/packages/create/tests/template.test.ts index bb6fc0c..d4bdda3 100644 --- a/packages/create/tests/template.test.ts +++ b/packages/create/tests/template.test.ts @@ -1,16 +1,65 @@ -import { expect, it } from "vitest"; +import { afterEach, expect, it } from "vitest"; +import { existsSync, readdirSync, readFileSync, rmSync } from "node:fs"; +import { join } from "node:path"; import { createSolidV2, createVanilla } from "../src"; -import { existsSync } from "fs"; -it("downloads and extracts the basic template", async () => { - await createVanilla({ template: "basic", destination: "./test/ts" }, false); +import { fetchTemplatesManifest, resolveGroup, type ManifestGroupKey } from "../src/utils/manifest"; - const appTsx = existsSync("./test/ts/src/App.tsx"); - expect(appTsx).toBe(true); +/** + * These download from live solidjs/templates HEAD, so they assert the plumbing — + * that the right subdir was fetched and extracted into a usable project — rather + * than specific files or dependency versions. Template contents, pins and file + * layout all change upstream without a CLI release, and must not fail CI here. + */ + +/** Template name + subdir the CLI would actually use, from the live manifest (baked-in fallback) */ +const liveTarget = async (key: ManifestGroupKey) => { + const group = resolveGroup(await fetchTemplatesManifest(), key); + const template = group.templates.find((t) => t.default) ?? group.templates[0]; + return { path: group.path, template: template.name }; +}; + +// begit resolves the destination against `process.cwd()`, so scaffold targets have to be +// repo-relative. `test/` is gitignored; each run starts from a clean directory so a +// leftover scaffold can never satisfy the assertions on its own. +const destinations: string[] = []; +const scratch = (name: string) => { + const destination = join("test", name); + rmSync(destination, { recursive: true, force: true }); + destinations.push(destination); + return destination; +}; + +afterEach(() => { + for (const destination of destinations.splice(0)) rmSync(destination, { recursive: true, force: true }); }); -it("downloads and extracts the solid-v2 basic template", async () => { - await createSolidV2({ template: "basic", destination: "./test/solid-v2" }, false); +const expectScaffold = (destination: string) => { + const packageJsonPath = join(destination, "package.json"); + expect(existsSync(packageJsonPath)).toBe(true); + + const packageJson = JSON.parse(readFileSync(packageJsonPath).toString()); + expect(typeof packageJson.name).toBe("string"); + expect(Object.keys(packageJson.scripts ?? {}).length).toBeGreaterThan(0); + expect(Object.keys(packageJson.dependencies ?? {}).length).toBeGreaterThan(0); + + // Some source to build, whatever the entry files happen to be called + expect(readdirSync(join(destination, "src")).length).toBeGreaterThan(0); +}; + +it("downloads and extracts the vanilla template", async () => { + const destination = scratch("vanilla"); + const { path, template } = await liveTarget("vanilla"); + + await createVanilla({ template, destination, path }, false); + + expectScaffold(destination); +}); + +it("downloads and extracts the solid-v2 template", async () => { + const destination = scratch("solid-v2"); + const { path, template } = await liveTarget("solid"); + + await createSolidV2({ template, destination, path }, false); - const appTsx = existsSync("./test/solid-v2/src/App.tsx"); - expect(appTsx).toBe(true); + expectScaffold(destination); }); From 89e9feb0051e149fd014adb1a3f59a047f84efde Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 14 Aug 2026 11:37:40 +0100 Subject: [PATCH 288/290] chore: version and release Co-Authored-By: Claude Opus 5 (1M context) --- .changeset/solid-v2-templates.md | 12 ------------ packages/create-solid/CHANGELOG.md | 12 ++++++++++++ packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 12 ++++++++++++ packages/create/package.json | 2 +- 5 files changed, 26 insertions(+), 14 deletions(-) delete mode 100644 .changeset/solid-v2-templates.md diff --git a/.changeset/solid-v2-templates.md b/.changeset/solid-v2-templates.md deleted file mode 100644 index bf08c8f..0000000 --- a/.changeset/solid-v2-templates.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -"create-solid": minor -"@solid-cli/create": minor ---- - -Solid 2.0 template support - -- New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is a release candidate; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. -- Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. -- JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). -- Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. -- Template tarball downloads track live HEAD of the templates repo, matching the `templates.json` manifest, so template contents and their dependency updates reach users without a CLI release. diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index 3bd388b..af213a7 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,5 +1,17 @@ # create-solid +## 0.9.0 + +### Minor Changes + +- 68caa9f: Solid 2.0 template support + + - New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is a release candidate; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. + - Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. + - JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). + - Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. + - Template tarball downloads track live HEAD of the templates repo, matching the `templates.json` manifest, so template contents and their dependency updates reach users without a CLI release. + ## 0.8.1 ### Patch Changes diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index f5715fc..ce090f2 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.8.1", + "version": "0.9.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 3f5f799..547f092 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,5 +1,17 @@ # @solid-cli/create +## 0.9.0 + +### Minor Changes + +- 68caa9f: Solid 2.0 template support + + - New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is a release candidate; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. + - Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. + - JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). + - Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. + - Template tarball downloads track live HEAD of the templates repo, matching the `templates.json` manifest, so template contents and their dependency updates reach users without a CLI release. + ## 0.8.1 ### Patch Changes diff --git a/packages/create/package.json b/packages/create/package.json index 506537f..5a6d9cb 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.8.1", + "version": "0.9.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ From e067e1bfa2832a493ddd456ce7ffc34c53af0e5c Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 14 Aug 2026 12:00:30 +0100 Subject: [PATCH 289/290] chore: version and release 0.10.0 0.9.0 was published from an earlier state (baked templates ref 4f54cb7, SOLID_CLI_TEMPLATES_REF, "Solid 2.0 (Beta)"), so its changelog entry is corrected to describe what actually shipped and the live-HEAD work moves to 0.10.0. Also skip begit's fetch_latest_commit: resolving HEAD to a sha goes through api.github.com, rate limited to 60 requests/hour unauthenticated, which the pinned version never had to call. The archive endpoint is not rate limited, so scaffolds fetch the tarball directly. Co-Authored-By: Claude Opus 5 (1M context) --- packages/create-solid/CHANGELOG.md | 14 ++++++++++++-- packages/create-solid/package.json | 2 +- packages/create/CHANGELOG.md | 14 ++++++++++++-- packages/create/package.json | 2 +- packages/create/src/utils/download.ts | 15 ++++++++++++++- 5 files changed, 40 insertions(+), 7 deletions(-) diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index af213a7..ee21f64 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -1,16 +1,26 @@ # create-solid +## 0.10.0 + +### Minor Changes + +- Always scaffold from the latest templates + + - Template downloads are no longer pinned to a baked-in solidjs/templates commit. Scaffolds come from live HEAD of the default branch, matching the `templates.json` manifest, so upstream template changes and dependency repins reach users without a CLI release. + - Removed the `SOLID_CLI_TEMPLATES_REF` environment override that shipped in 0.9.0, along with the pin it existed to escape. + - Scaffolding still avoids api.github.com, which is rate limited to 60 requests/hour for unauthenticated users: templates are fetched straight from the archive endpoint rather than resolving HEAD to a commit sha first. + - Solid 2.0 is labelled "Solid 2.0 (RC)" in the project picker now that Solid 2.0 core is a release candidate. It stays listed first but not preselected. + ## 0.9.0 ### Minor Changes - 68caa9f: Solid 2.0 template support - - New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is a release candidate; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. + - New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is in beta; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. - Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. - JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). - Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. - - Template tarball downloads track live HEAD of the templates repo, matching the `templates.json` manifest, so template contents and their dependency updates reach users without a CLI release. ## 0.8.1 diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json index ce090f2..bb67865 100644 --- a/packages/create-solid/package.json +++ b/packages/create-solid/package.json @@ -1,6 +1,6 @@ { "name": "create-solid", - "version": "0.9.0", + "version": "0.10.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 547f092..8858555 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -1,16 +1,26 @@ # @solid-cli/create +## 0.10.0 + +### Minor Changes + +- Always scaffold from the latest templates + + - Template downloads are no longer pinned to a baked-in solidjs/templates commit. Scaffolds come from live HEAD of the default branch, matching the `templates.json` manifest, so upstream template changes and dependency repins reach users without a CLI release. + - Removed the `SOLID_CLI_TEMPLATES_REF` environment override that shipped in 0.9.0, along with the pin it existed to escape. + - Scaffolding still avoids api.github.com, which is rate limited to 60 requests/hour for unauthenticated users: templates are fetched straight from the archive endpoint rather than resolving HEAD to a commit sha first. + - Solid 2.0 is labelled "Solid 2.0 (RC)" in the project picker now that Solid 2.0 core is a release candidate. It stays listed first but not preselected. + ## 0.9.0 ### Minor Changes - 68caa9f: Solid 2.0 template support - - New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is a release candidate; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. + - New "Solid 2.0" top-level project type scaffolding the `solid-v2/*` templates from solidjs/templates (basic, bare, fullstack, fullstack-tanstack, with-\*). Listed first but not preselected while Solid 2.0 core is in beta; existing flags (`-s`, `-v`, `-l`, `--v2`) keep their meaning, plus new `--solid` and `--ssr` flags. - Optional streaming SSR on templates that support it (currently `basic`): a scaffold-time flip that sets `ssr: true` in `vite.config.ts`, adds the generic production `server.js`, and points the `start` script at it. Defaults to No. - JavaScript variants of the Solid 2.0 templates via the existing sucrase TS→JS conversion (no `index.html` rewrite; `.ts`/`.tsx` references inside `vite.config` are retargeted, `.d.ts` files dropped, minimal `jsconfig.json`). - Template lists, subdir paths and per-template flags are now read from a `templates.json` manifest at the templates repo HEAD (2s timeout), with silent fallback to the baked-in lists — so new templates and future repo reorganizations no longer require a CLI release. - - Template tarball downloads track live HEAD of the templates repo, matching the `templates.json` manifest, so template contents and their dependency updates reach users without a CLI release. ## 0.8.1 diff --git a/packages/create/package.json b/packages/create/package.json index 5a6d9cb..e745e00 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@solid-cli/create", - "version": "0.9.0", + "version": "0.10.0", "description": "Create Solid apps with low configuration", "author": "Thomas Beer", "contributors": [ diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index e36963b..3744b58 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -8,6 +8,19 @@ export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; * No ref is pinned: scaffolds always come from live HEAD of the default branch, * matching the `templates.json` manifest, so template updates reach users * without a CLI release. + * + * `fetch_latest_commit` is off because resolving HEAD to a sha goes through + * api.github.com, which is rate limited to 60 requests/hour for unauthenticated + * users — the archive download itself is not. Without a sha there is nothing to + * key a cache on, so caching is off too and every scaffold fetches a fresh + * tarball, which is what tracking HEAD means. */ export const downloadTemplate = (subdir: string, destination: string) => - downloadRepo({ repo: { ...TEMPLATES_REPO, subdir }, dest: destination }, GithubFetcher); + downloadRepo( + { + repo: { ...TEMPLATES_REPO, subdir }, + dest: destination, + opts: { cache: false, fetch_latest_commit: false }, + }, + GithubFetcher, + ); From b3eda6d3bdf8b7244760ccfe6a418bf1861fc6f5 Mon Sep 17 00:00:00 2001 From: Thomas Beer <71586988+Tommypop2@users.noreply.github.com> Date: Fri, 14 Aug 2026 12:18:39 +0100 Subject: [PATCH 290/290] fix: cache template tarballs by resolved HEAD sha MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolving HEAD to a commit sha lets begit key its cache on it and skip the download entirely on later scaffolds — a warm run is roughly twice as fast. The lookup goes through api.github.com (60 requests/hour unauthenticated), so it degrades instead of failing: a throw, a missing sha, or a lookup slower than 2s all fall back to fetching HEAD from the archive endpoint uncached. The live-download tests get a 60s budget. Their earlier intermittent failures were vitest's 5s default expiring on a cold-cache ~3MB tarball, not a defect in the code under test. Co-Authored-By: Claude Opus 5 (1M context) --- packages/create-solid/CHANGELOG.md | 2 +- packages/create/CHANGELOG.md | 2 +- packages/create/src/utils/download.ts | 50 ++++++++++++++++++++------ packages/create/tests/download.test.ts | 38 ++++++++++++++++++++ packages/create/tests/template.test.ts | 36 ++++++++++++------- 5 files changed, 103 insertions(+), 25 deletions(-) create mode 100644 packages/create/tests/download.test.ts diff --git a/packages/create-solid/CHANGELOG.md b/packages/create-solid/CHANGELOG.md index ee21f64..cc52156 100644 --- a/packages/create-solid/CHANGELOG.md +++ b/packages/create-solid/CHANGELOG.md @@ -8,7 +8,7 @@ - Template downloads are no longer pinned to a baked-in solidjs/templates commit. Scaffolds come from live HEAD of the default branch, matching the `templates.json` manifest, so upstream template changes and dependency repins reach users without a CLI release. - Removed the `SOLID_CLI_TEMPLATES_REF` environment override that shipped in 0.9.0, along with the pin it existed to escape. - - Scaffolding still avoids api.github.com, which is rate limited to 60 requests/hour for unauthenticated users: templates are fetched straight from the archive endpoint rather than resolving HEAD to a commit sha first. + - HEAD is resolved to a commit sha before downloading so the tarball can be cached under it and reused by later scaffolds. That lookup goes through api.github.com, which is rate limited to 60 requests/hour for unauthenticated users, so any failure — rate limited, offline, slow — falls back to fetching HEAD from the archive endpoint directly, uncached. - Solid 2.0 is labelled "Solid 2.0 (RC)" in the project picker now that Solid 2.0 core is a release candidate. It stays listed first but not preselected. ## 0.9.0 diff --git a/packages/create/CHANGELOG.md b/packages/create/CHANGELOG.md index 8858555..80a8250 100644 --- a/packages/create/CHANGELOG.md +++ b/packages/create/CHANGELOG.md @@ -8,7 +8,7 @@ - Template downloads are no longer pinned to a baked-in solidjs/templates commit. Scaffolds come from live HEAD of the default branch, matching the `templates.json` manifest, so upstream template changes and dependency repins reach users without a CLI release. - Removed the `SOLID_CLI_TEMPLATES_REF` environment override that shipped in 0.9.0, along with the pin it existed to escape. - - Scaffolding still avoids api.github.com, which is rate limited to 60 requests/hour for unauthenticated users: templates are fetched straight from the archive endpoint rather than resolving HEAD to a commit sha first. + - HEAD is resolved to a commit sha before downloading so the tarball can be cached under it and reused by later scaffolds. That lookup goes through api.github.com, which is rate limited to 60 requests/hour for unauthenticated users, so any failure — rate limited, offline, slow — falls back to fetching HEAD from the archive endpoint directly, uncached. - Solid 2.0 is labelled "Solid 2.0 (RC)" in the project picker now that Solid 2.0 core is a release candidate. It stays listed first but not preselected. ## 0.9.0 diff --git a/packages/create/src/utils/download.ts b/packages/create/src/utils/download.ts index 3744b58..93fc918 100644 --- a/packages/create/src/utils/download.ts +++ b/packages/create/src/utils/download.ts @@ -2,25 +2,53 @@ import { downloadRepo, GithubFetcher } from "@begit/core"; export const TEMPLATES_REPO = { owner: "solidjs", name: "templates" } as const; +/** A slow commit lookup must not hold up a scaffold — it is only there to enable caching */ +const LATEST_COMMIT_TIMEOUT_MS = 2000; + +/** + * Resolves HEAD of the templates repo to a commit sha, so begit can key its + * tarball cache on it and reuse the download across scaffolds. + * + * This goes through api.github.com, which is rate limited to 60 requests/hour + * for unauthenticated users (the archive endpoint the tarball itself comes from + * is not). Every failure — rate limited, offline, timeout, unexpected payload — + * resolves to `undefined`, and the caller falls back to fetching HEAD directly. + */ +export const latestTemplatesCommit = async (): Promise => { + const lookup = (async () => { + try { + return await GithubFetcher.fetchLatestCommit(TEMPLATES_REPO); + } catch { + return undefined; + } + })(); + let timer: ReturnType; + const timeout = new Promise((resolve) => { + timer = setTimeout(() => resolve(undefined), LATEST_COMMIT_TIMEOUT_MS); + }); + return Promise.race([lookup, timeout]).finally(() => clearTimeout(timer)); +}; + /** * Downloads `subdir` of the solidjs/templates repo into `destination`. * * No ref is pinned: scaffolds always come from live HEAD of the default branch, * matching the `templates.json` manifest, so template updates reach users - * without a CLI release. - * - * `fetch_latest_commit` is off because resolving HEAD to a sha goes through - * api.github.com, which is rate limited to 60 requests/hour for unauthenticated - * users — the archive download itself is not. Without a sha there is nothing to - * key a cache on, so caching is off too and every scaffold fetches a fresh - * tarball, which is what tracking HEAD means. + * without a CLI release. HEAD is resolved to a sha first so begit can cache the + * tarball under it and skip the download next time; when that lookup fails we + * fetch HEAD directly instead, uncached — slower, but never a broken scaffold. */ -export const downloadTemplate = (subdir: string, destination: string) => - downloadRepo( +export const downloadTemplate = async (subdir: string, destination: string) => { + const hash = await latestTemplatesCommit(); + return downloadRepo( { - repo: { ...TEMPLATES_REPO, subdir }, + repo: { ...TEMPLATES_REPO, subdir, hash }, dest: destination, - opts: { cache: false, fetch_latest_commit: false }, + // HEAD is already resolved (or deliberately left unresolved) above, so begit + // must not call the API itself. Without a sha there is nothing to key a cache + // entry on, so the tarball is discarded rather than left behind unkeyed. + opts: { cache: !!hash, fetch_latest_commit: false }, }, GithubFetcher, ); +}; diff --git a/packages/create/tests/download.test.ts b/packages/create/tests/download.test.ts new file mode 100644 index 0000000..703e386 --- /dev/null +++ b/packages/create/tests/download.test.ts @@ -0,0 +1,38 @@ +import { afterEach, expect, it, vi } from "vitest"; +import { GithubFetcher } from "@begit/core"; +import { latestTemplatesCommit } from "../src/utils/download"; + +afterEach(() => { + vi.restoreAllMocks(); + vi.useRealTimers(); +}); + +it("resolves HEAD to a sha so begit can cache the tarball under it", async () => { + vi.spyOn(GithubFetcher, "fetchLatestCommit").mockResolvedValue("c3032d9"); + + expect(await latestTemplatesCommit()).toBe("c3032d9"); +}); + +it("falls back to no sha when the commit lookup throws", async () => { + // Offline, DNS failure, or a non-JSON response from the API + vi.spyOn(GithubFetcher, "fetchLatestCommit").mockRejectedValue(new Error("fetch failed")); + + expect(await latestTemplatesCommit()).toBeUndefined(); +}); + +it("falls back to no sha when the API answers without one", async () => { + // What a rate-limited response looks like by the time begit is done with it + vi.spyOn(GithubFetcher, "fetchLatestCommit").mockResolvedValue(undefined); + + expect(await latestTemplatesCommit()).toBeUndefined(); +}); + +it("falls back to no sha rather than letting a hanging lookup block the scaffold", async () => { + vi.useFakeTimers(); + vi.spyOn(GithubFetcher, "fetchLatestCommit").mockReturnValue(new Promise(() => {})); + + const resolved = latestTemplatesCommit(); + await vi.advanceTimersByTimeAsync(2000); + + expect(await resolved).toBeUndefined(); +}); diff --git a/packages/create/tests/template.test.ts b/packages/create/tests/template.test.ts index d4bdda3..179b2ee 100644 --- a/packages/create/tests/template.test.ts +++ b/packages/create/tests/template.test.ts @@ -46,20 +46,32 @@ const expectScaffold = (destination: string) => { expect(readdirSync(join(destination, "src")).length).toBeGreaterThan(0); }; -it("downloads and extracts the vanilla template", async () => { - const destination = scratch("vanilla"); - const { path, template } = await liveTarget("vanilla"); +// A cold begit cache means pulling the whole templates tarball (~3MB), which does not +// reliably fit in vitest's 5s default on a slow or contended connection +const DOWNLOAD_TIMEOUT_MS = 60_000; - await createVanilla({ template, destination, path }, false); +it( + "downloads and extracts the vanilla template", + async () => { + const destination = scratch("vanilla"); + const { path, template } = await liveTarget("vanilla"); - expectScaffold(destination); -}); + await createVanilla({ template, destination, path }, false); -it("downloads and extracts the solid-v2 template", async () => { - const destination = scratch("solid-v2"); - const { path, template } = await liveTarget("solid"); + expectScaffold(destination); + }, + DOWNLOAD_TIMEOUT_MS, +); - await createSolidV2({ template, destination, path }, false); +it( + "downloads and extracts the solid-v2 template", + async () => { + const destination = scratch("solid-v2"); + const { path, template } = await liveTarget("solid"); - expectScaffold(destination); -}); + await createSolidV2({ template, destination, path }, false); + + expectScaffold(destination); + }, + DOWNLOAD_TIMEOUT_MS, +);