diff --git a/package.json b/package.json index 6101732d23..071906140f 100644 --- a/package.json +++ b/package.json @@ -65,6 +65,7 @@ }, "devDependencies": { "@arethetypeswrong/cli": "0.17.3", + "@nuxt/cli": "3.20.0", "@nuxt/eslint-config": "0.7.5", "@nuxt/kit": "workspace:*", "@nuxt/rspack-builder": "workspace:*", @@ -96,7 +97,6 @@ "markdownlint-cli": "0.43.0", "memfs": "4.14.1", "nitropack": "2.10.4", - "nuxi": "3.20.0", "nuxt": "workspace:*", "nuxt-content-twoslash": "0.1.2", "ofetch": "1.4.1", diff --git a/packages/nuxt/bin/nuxt.mjs b/packages/nuxt/bin/nuxt.mjs index 7faab34846..8c0237f4ee 100755 --- a/packages/nuxt/bin/nuxt.mjs +++ b/packages/nuxt/bin/nuxt.mjs @@ -1,2 +1,2 @@ #!/usr/bin/env node -import 'nuxi/cli' +import '@nuxt/cli/cli' diff --git a/packages/nuxt/build.config.ts b/packages/nuxt/build.config.ts index 1f8a82cf20..4301b165fb 100644 --- a/packages/nuxt/build.config.ts +++ b/packages/nuxt/build.config.ts @@ -22,7 +22,7 @@ export default defineBuildConfig({ }, }, dependencies: [ - 'nuxi', + '@nuxt/cli', 'vue-router', 'ofetch', ], diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index d9f908e111..520a76bc07 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -69,6 +69,7 @@ "test:attw": "attw --pack" }, "dependencies": { + "@nuxt/cli": "^3.20.0", "@nuxt/devalue": "^2.0.2", "@nuxt/devtools": "^1.7.0", "@nuxt/kit": "workspace:*", @@ -105,7 +106,6 @@ "mlly": "^1.7.4", "nanotar": "^0.1.1", "nitropack": "^2.10.4", - "nuxi": "^3.20.0", "nypm": "^0.4.1", "ofetch": "^1.4.1", "ohash": "^1.1.4", diff --git a/packages/nuxt/src/core/features.ts b/packages/nuxt/src/core/features.ts index 6e22d04bff..d19b4021c0 100644 --- a/packages/nuxt/src/core/features.ts +++ b/packages/nuxt/src/core/features.ts @@ -53,7 +53,7 @@ export function installNuxtModule (name: string, options?: EnsurePackageInstalle installPrompts.add(name) const nuxt = useNuxt() return promptToInstall(name, async () => { - const { runCommand } = await import('nuxi') + const { runCommand } = await import('@nuxt/cli') await runCommand('module', ['add', name, '--cwd', nuxt.options.rootDir]) }, { rootDir: nuxt.options.rootDir, searchPaths: nuxt.options.modulesDir, ...options }) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 100cf5723e..cdfe628333 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,6 +41,9 @@ importers: '@arethetypeswrong/cli': specifier: 0.17.3 version: 0.17.3 + '@nuxt/cli': + specifier: 3.20.0 + version: 3.20.0(magicast@0.3.5) '@nuxt/eslint-config': specifier: 0.7.5 version: 0.7.5(@vue/compiler-sfc@3.5.13)(eslint@9.18.0(jiti@2.4.2))(typescript@5.7.3) @@ -134,9 +137,6 @@ importers: nitropack: specifier: 2.10.4 version: 2.10.4(typescript@5.7.3) - nuxi: - specifier: 3.20.0 - version: 3.20.0 nuxt: specifier: workspace:* version: link:packages/nuxt @@ -282,6 +282,9 @@ importers: packages/nuxt: dependencies: + '@nuxt/cli': + specifier: ^3.20.0 + version: 3.20.0(magicast@0.3.5) '@nuxt/devalue': specifier: ^2.0.2 version: 2.0.2 @@ -393,9 +396,6 @@ importers: nitropack: specifier: ^2.10.4 version: 2.10.4(typescript@5.7.3) - nuxi: - specifier: ^3.20.0 - version: 3.20.0 nypm: specifier: ^0.4.1 version: 0.4.1 @@ -480,7 +480,7 @@ importers: devDependencies: '@nuxt/scripts': specifier: 0.9.5 - version: 0.9.5(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(db0@0.2.1)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2)) + version: 0.9.5(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(db0@0.2.1)(fuse.js@7.0.0)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2)) '@parcel/watcher': specifier: 2.5.0 version: 2.5.0 @@ -2004,6 +2004,11 @@ packages: resolution: {integrity: sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + '@nuxt/cli@3.20.0': + resolution: {integrity: sha512-TmQPjIHXJFPTssPMMFuLF48nr9cm6ctaNwrnhDFl4xLunfLR4rrMJNJAQhepWyukg970ZgokZVbUYMqf6eCnTQ==} + engines: {node: ^16.10.0 || >=18.0.0} + hasBin: true + '@nuxt/devalue@2.0.2': resolution: {integrity: sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==} @@ -4511,6 +4516,10 @@ packages: functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} + fuse.js@7.0.0: + resolution: {integrity: sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==} + engines: {node: '>=10'} + gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -5785,11 +5794,6 @@ packages: nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} - nuxi@3.20.0: - resolution: {integrity: sha512-E1R6QvUoinlAkP1EMesU0Dn1xLDLFli9LzaVAYdsmC2frHGIc15jMDRzwkAgK/8ae0H+tjHlfi/Qps/jZwF+7g==} - engines: {node: ^16.10.0 || >=18.0.0} - hasBin: true - nuxt-content-twoslash@0.1.2: resolution: {integrity: sha512-7vCO04V0uyCXtjh40HgVIVKRReUlXc4efMNMdgDtx3Y7p9mnChRt9eRRD3c8VlDD27pLlkrTTnE2n15bu/SqbQ==} hasBin: true @@ -8663,6 +8667,34 @@ snapshots: '@npmcli/name-from-folder@2.0.0': {} + '@nuxt/cli@3.20.0(magicast@0.3.5)': + dependencies: + c12: 2.0.1(magicast@0.3.5) + chokidar: 4.0.3 + citty: 0.1.6 + clipboardy: 4.0.0 + consola: 3.3.3 + defu: 6.1.4 + fuse.js: 7.0.0 + giget: 1.2.3 + h3: 1.13.1 + httpxy: 0.1.5 + jiti: 2.4.2 + listhen: 1.9.0 + nypm: 0.4.1 + ofetch: 1.4.1 + ohash: 1.1.4 + pathe: 2.0.1 + perfect-debounce: 1.0.0 + pkg-types: 1.3.0 + scule: 1.3.0 + semver: 7.6.3 + std-env: 3.8.0 + tinyexec: 0.3.2 + ufo: 1.5.4 + transitivePeerDependencies: + - magicast + '@nuxt/devalue@2.0.2': {} '@nuxt/devtools-kit@1.5.1(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))': @@ -8679,7 +8711,7 @@ snapshots: execa: 7.2.0 vite: 6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1) - '@nuxt/devtools-ui-kit@1.5.1(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2))': + '@nuxt/devtools-ui-kit@1.5.1(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(fuse.js@7.0.0)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2))': dependencies: '@iconify-json/carbon': 1.2.1 '@iconify-json/logos': 1.2.0 @@ -8695,7 +8727,7 @@ snapshots: '@unocss/preset-mini': 0.62.4 '@unocss/reset': 0.62.4 '@vueuse/core': 11.1.0(vue@3.5.13(typescript@5.7.3)) - '@vueuse/integrations': 11.1.0(change-case@5.4.4)(focus-trap@7.6.0)(vue@3.5.13(typescript@5.7.3)) + '@vueuse/integrations': 11.1.0(change-case@5.4.4)(focus-trap@7.6.0)(fuse.js@7.0.0)(vue@3.5.13(typescript@5.7.3)) '@vueuse/nuxt': 11.1.0(nuxt@packages+nuxt)(vue@3.5.13(typescript@5.7.3)) defu: 6.1.4 focus-trap: 7.6.0 @@ -8838,10 +8870,10 @@ snapshots: string-width: 4.2.3 webpack: 5.97.1 - '@nuxt/scripts@0.9.5(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(db0@0.2.1)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2))': + '@nuxt/scripts@0.9.5(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(db0@0.2.1)(fuse.js@7.0.0)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(typescript@5.7.3)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2))': dependencies: '@nuxt/devtools-kit': 1.7.0(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1)) - '@nuxt/devtools-ui-kit': 1.5.1(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2)) + '@nuxt/devtools-ui-kit': 1.5.1(@nuxt/devtools@1.7.0(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3)))(@unocss/webpack@0.62.4(rollup@4.30.1)(webpack@5.97.1(esbuild@0.24.2)))(@vue/compiler-core@3.5.13)(change-case@5.4.4)(fuse.js@7.0.0)(nuxt@packages+nuxt)(postcss@8.4.49)(rollup@4.30.1)(vite@6.0.7(@types/node@22.10.5)(jiti@2.4.2)(sass@1.78.0)(terser@5.37.0)(tsx@4.19.2)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.3))(webpack@5.97.1(esbuild@0.24.2)) '@nuxt/kit': link:packages/kit '@stripe/stripe-js': 4.8.0 '@types/google.maps': 3.58.1 @@ -10381,7 +10413,7 @@ snapshots: - '@vue/composition-api' - vue - '@vueuse/integrations@11.1.0(change-case@5.4.4)(focus-trap@7.6.0)(vue@3.5.13(typescript@5.7.3))': + '@vueuse/integrations@11.1.0(change-case@5.4.4)(focus-trap@7.6.0)(fuse.js@7.0.0)(vue@3.5.13(typescript@5.7.3))': dependencies: '@vueuse/core': 11.1.0(vue@3.5.13(typescript@5.7.3)) '@vueuse/shared': 11.1.0(vue@3.5.13(typescript@5.7.3)) @@ -10389,6 +10421,7 @@ snapshots: optionalDependencies: change-case: 5.4.4 focus-trap: 7.6.0 + fuse.js: 7.0.0 transitivePeerDependencies: - '@vue/composition-api' - vue @@ -11996,6 +12029,8 @@ snapshots: functions-have-names@1.2.3: {} + fuse.js@7.0.0: {} + gensync@1.0.0-beta.2: {} get-caller-file@2.0.5: {} @@ -13585,8 +13620,6 @@ snapshots: dependencies: boolbase: 1.0.0 - nuxi@3.20.0: {} - nuxt-content-twoslash@0.1.2(@nuxtjs/mdc@0.8.3): dependencies: '@nuxt/kit': link:packages/kit