From 4712e994112a97feba447b3edb4afb65e968ed63 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Wed, 20 Apr 2022 10:52:39 +0200 Subject: [PATCH] refactor!: rename nuxt3 to nuxt (#4449) --- .eslintrc | 8 +-- .../1.getting-started/1.quick-start.md | 8 +-- .../2.guide/1.concepts/1.introduction.md | 2 +- .../3.directory-structure/18.nuxt.config.md | 2 +- .../3.directory-structure/4.components.md | 4 +- .../2.guide/6.going-further/1.internals.md | 6 +-- docs/content/2.guide/6.going-further/5.esm.md | 4 +- .../2.guide/6.going-further/7.testing.md | 2 +- docs/content/3.api/4.advanced/1.hooks.md | 2 +- docs/content/migration/2.configuration.md | 4 +- docs/content/migration/8.runtime-config.md | 2 +- .../config-extends/base/nuxt.config.ts | 2 +- .../advanced/config-extends/nuxt.config.ts | 2 +- examples/advanced/config-extends/package.json | 2 +- .../advanced/config-extends/ui/nuxt.config.ts | 2 +- .../module-extend-pages/nuxt.config.ts | 2 +- .../advanced/module-extend-pages/package.json | 2 +- examples/advanced/testing/nuxt.config.ts | 2 +- examples/advanced/testing/package.json | 2 +- examples/app/error-handling/nuxt.config.ts | 2 +- examples/app/error-handling/package.json | 2 +- examples/app/plugins/nuxt.config.ts | 2 +- examples/app/plugins/package.json | 2 +- examples/app/teleport/nuxt.config.ts | 2 +- examples/app/teleport/package.json | 2 +- .../auto-imports/components/nuxt.config.ts | 2 +- examples/auto-imports/components/package.json | 2 +- .../auto-imports/composables/nuxt.config.ts | 2 +- .../auto-imports/composables/package.json | 2 +- .../composables/use-async-data/nuxt.config.ts | 2 +- .../composables/use-async-data/package.json | 2 +- .../composables/use-cookie/nuxt.config.ts | 2 +- examples/composables/use-cookie/package.json | 2 +- examples/composables/use-fetch/nuxt.config.ts | 2 +- examples/composables/use-fetch/package.json | 2 +- examples/composables/use-head/nuxt.config.ts | 2 +- examples/composables/use-head/package.json | 2 +- examples/composables/use-state/nuxt.config.ts | 2 +- examples/composables/use-state/package.json | 2 +- .../essentials/hello-world/nuxt.config.ts | 2 +- examples/essentials/hello-world/package.json | 2 +- .../reactivity-transform/nuxt.config.ts | 2 +- .../reactivity-transform/package.json | 2 +- .../experimental/vite-node/nuxt.config.ts | 2 +- examples/experimental/vite-node/package.json | 2 +- examples/experimental/wasm/nuxt.config.ts | 2 +- examples/experimental/wasm/package.json | 2 +- examples/other/locale/nuxt.config.ts | 2 +- examples/other/locale/package.json | 2 +- examples/routing/layouts/nuxt.config.ts | 2 +- examples/routing/layouts/package.json | 2 +- examples/routing/middleware/nuxt.config.ts | 2 +- examples/routing/middleware/package.json | 2 +- examples/routing/nuxt-link/nuxt.config.ts | 2 +- examples/routing/nuxt-link/package.json | 2 +- examples/routing/pages/nuxt.config.ts | 2 +- examples/routing/pages/package.json | 2 +- .../routing/universal-router/nuxt.config.ts | 2 +- .../routing/universal-router/package.json | 2 +- examples/server/routes/nuxt.config.ts | 2 +- examples/server/routes/package.json | 2 +- package.json | 2 +- packages/kit/src/loader/nuxt.ts | 8 +-- packages/nuxi/src/commands/upgrade.ts | 10 ++-- packages/{nuxt3 => nuxt}/README.md | 0 packages/{nuxt3 => nuxt}/app.d.ts | 0 packages/{nuxt3 => nuxt}/bin/nuxt.mjs | 0 packages/{nuxt3 => nuxt}/build.config.ts | 0 packages/{nuxt3 => nuxt}/package.json | 2 +- .../{nuxt3 => nuxt}/src/app/compat/capi.ts | 0 .../src/app/compat/legacy-app.ts | 0 .../src/app/compat/vue-demi.ts | 0 .../src/app/components/client-only.mjs | 0 .../src/app/components/index.ts | 0 .../src/app/components/layout.ts | 0 .../src/app/components/nuxt-error-boundary.ts | 0 .../src/app/components/nuxt-error-page.vue | 0 .../src/app/components/nuxt-link.ts | 0 .../src/app/components/nuxt-root.vue | 0 .../src/app/components/server-placeholder.ts | 0 .../src/app/components/utils.ts | 0 .../src/app/composables/asyncData.ts | 0 .../src/app/composables/component.ts | 0 .../src/app/composables/cookie.ts | 0 .../src/app/composables/error.ts | 0 .../src/app/composables/fetch.ts | 0 .../src/app/composables/hydrate.ts | 0 .../src/app/composables/index.ts | 0 .../src/app/composables/router.ts | 0 .../src/app/composables/ssr.ts | 0 .../src/app/composables/state.ts | 0 .../src/app/composables/utils.ts | 0 .../{nuxt3 => nuxt}/src/app/entry.async.ts | 0 packages/{nuxt3 => nuxt}/src/app/entry.ts | 0 packages/{nuxt3 => nuxt}/src/app/index.ts | 0 packages/{nuxt3 => nuxt}/src/app/nuxt.ts | 0 .../src/app/plugins/logs.client.dev.ts | 0 .../src/app/plugins/preload.server.ts | 0 .../src/app/plugins/progress.client.ts | 0 .../{nuxt3 => nuxt}/src/app/plugins/router.ts | 0 .../src/app/types/augments.d.ts | 0 .../src/auto-imports/composables.ts | 0 .../src/auto-imports/module.ts | 0 .../src/auto-imports/presets.ts | 0 .../src/auto-imports/transform.ts | 0 .../{nuxt3 => nuxt}/src/components/loader.ts | 0 .../{nuxt3 => nuxt}/src/components/module.ts | 0 .../{nuxt3 => nuxt}/src/components/scan.ts | 0 .../src/components/templates.ts | 0 packages/{nuxt3 => nuxt}/src/core/app.ts | 0 packages/{nuxt3 => nuxt}/src/core/builder.ts | 0 packages/{nuxt3 => nuxt}/src/core/modules.ts | 0 packages/{nuxt3 => nuxt}/src/core/nitro.ts | 2 +- packages/{nuxt3 => nuxt}/src/core/nuxt.ts | 4 +- .../src/core/plugins/import-protection.ts | 0 .../{nuxt3 => nuxt}/src/core/plugins/unctx.ts | 0 .../src/core/runtime/nitro/error.ts | 0 .../src/core/runtime/nitro/paths.ts | 0 .../src/core/runtime/nitro/renderer.ts | 0 .../src/core/runtime/nitro/vue2.ts | 0 .../src/core/runtime/nitro/vue3.ts | 0 .../{nuxt3 => nuxt}/src/core/templates.ts | 2 +- packages/{nuxt3 => nuxt}/src/dirs.ts | 0 packages/{nuxt3 => nuxt}/src/head/module.ts | 0 .../src/head/runtime/components.ts | 0 .../src/head/runtime/composables.ts | 0 .../{nuxt3 => nuxt}/src/head/runtime/index.ts | 0 .../src/head/runtime/lib/vue-meta.plugin.ts | 0 .../head/runtime/lib/vueuse-head.plugin.ts | 0 .../src/head/runtime/plugin.ts | 0 packages/{nuxt3 => nuxt}/src/index.ts | 0 packages/{nuxt3 => nuxt}/src/pages/macros.ts | 0 packages/{nuxt3 => nuxt}/src/pages/module.ts | 0 .../{nuxt3 => nuxt}/src/pages/runtime/app.vue | 0 .../src/pages/runtime/composables.ts | 0 .../src/pages/runtime/index.ts | 0 .../{nuxt3 => nuxt}/src/pages/runtime/page.ts | 0 .../src/pages/runtime/router.ts | 0 .../src/pages/runtime/utils.ts | 0 packages/{nuxt3 => nuxt}/src/pages/utils.ts | 0 .../{nuxt3 => nuxt}/test/auto-imports.test.ts | 2 +- .../test/fixture/components/HelloWorld.vue | 0 .../test/fixture/components/Nuxt3.client.vue | 0 .../test/fixture/components/Nuxt3.server.vue | 0 .../components/parent-folder/index.server.vue | 0 .../{nuxt3 => nuxt}/test/nuxt-link.test.ts | 0 packages/{nuxt3 => nuxt}/test/pages.test.ts | 0 .../test/scan-components.test.ts | 0 packages/{nuxt3 => nuxt}/types.d.ts | 0 packages/schema/src/types/hooks.ts | 2 +- packages/vite/src/server.ts | 2 +- packages/vite/src/vite-node.ts | 2 +- packages/webpack/src/configs/server.ts | 1 + playground/nuxt.config.ts | 2 +- playground/package.json | 2 +- scripts/bump-edge.ts | 5 +- scripts/nu | 2 - .../fixtures/basic/extends/bar/nuxt.config.ts | 2 +- .../fixtures/basic/extends/foo/nuxt.config.ts | 2 +- test/fixtures/basic/nuxt.config.ts | 2 +- test/fixtures/basic/types.ts | 2 +- tsconfig.json | 4 +- vitest.config.ts | 2 +- yarn.lock | 54 +++++++++---------- 164 files changed, 130 insertions(+), 132 deletions(-) rename packages/{nuxt3 => nuxt}/README.md (100%) rename packages/{nuxt3 => nuxt}/app.d.ts (100%) rename packages/{nuxt3 => nuxt}/bin/nuxt.mjs (100%) rename packages/{nuxt3 => nuxt}/build.config.ts (100%) rename packages/{nuxt3 => nuxt}/package.json (98%) rename packages/{nuxt3 => nuxt}/src/app/compat/capi.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/compat/legacy-app.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/compat/vue-demi.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/components/client-only.mjs (100%) rename packages/{nuxt3 => nuxt}/src/app/components/index.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/components/layout.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/components/nuxt-error-boundary.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/components/nuxt-error-page.vue (100%) rename packages/{nuxt3 => nuxt}/src/app/components/nuxt-link.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/components/nuxt-root.vue (100%) rename packages/{nuxt3 => nuxt}/src/app/components/server-placeholder.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/components/utils.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/asyncData.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/component.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/cookie.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/error.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/fetch.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/hydrate.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/index.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/router.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/ssr.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/state.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/composables/utils.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/entry.async.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/entry.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/index.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/nuxt.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/plugins/logs.client.dev.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/plugins/preload.server.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/plugins/progress.client.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/plugins/router.ts (100%) rename packages/{nuxt3 => nuxt}/src/app/types/augments.d.ts (100%) rename packages/{nuxt3 => nuxt}/src/auto-imports/composables.ts (100%) rename packages/{nuxt3 => nuxt}/src/auto-imports/module.ts (100%) rename packages/{nuxt3 => nuxt}/src/auto-imports/presets.ts (100%) rename packages/{nuxt3 => nuxt}/src/auto-imports/transform.ts (100%) rename packages/{nuxt3 => nuxt}/src/components/loader.ts (100%) rename packages/{nuxt3 => nuxt}/src/components/module.ts (100%) rename packages/{nuxt3 => nuxt}/src/components/scan.ts (100%) rename packages/{nuxt3 => nuxt}/src/components/templates.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/app.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/builder.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/modules.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/nitro.ts (99%) rename packages/{nuxt3 => nuxt}/src/core/nuxt.ts (98%) rename packages/{nuxt3 => nuxt}/src/core/plugins/import-protection.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/plugins/unctx.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/runtime/nitro/error.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/runtime/nitro/paths.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/runtime/nitro/renderer.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/runtime/nitro/vue2.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/runtime/nitro/vue3.ts (100%) rename packages/{nuxt3 => nuxt}/src/core/templates.ts (99%) rename packages/{nuxt3 => nuxt}/src/dirs.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/module.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/runtime/components.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/runtime/composables.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/runtime/index.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/runtime/lib/vue-meta.plugin.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/runtime/lib/vueuse-head.plugin.ts (100%) rename packages/{nuxt3 => nuxt}/src/head/runtime/plugin.ts (100%) rename packages/{nuxt3 => nuxt}/src/index.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/macros.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/module.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/runtime/app.vue (100%) rename packages/{nuxt3 => nuxt}/src/pages/runtime/composables.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/runtime/index.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/runtime/page.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/runtime/router.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/runtime/utils.ts (100%) rename packages/{nuxt3 => nuxt}/src/pages/utils.ts (100%) rename packages/{nuxt3 => nuxt}/test/auto-imports.test.ts (99%) rename packages/{nuxt3 => nuxt}/test/fixture/components/HelloWorld.vue (100%) rename packages/{nuxt3 => nuxt}/test/fixture/components/Nuxt3.client.vue (100%) rename packages/{nuxt3 => nuxt}/test/fixture/components/Nuxt3.server.vue (100%) rename packages/{nuxt3 => nuxt}/test/fixture/components/parent-folder/index.server.vue (100%) rename packages/{nuxt3 => nuxt}/test/nuxt-link.test.ts (100%) rename packages/{nuxt3 => nuxt}/test/pages.test.ts (100%) rename packages/{nuxt3 => nuxt}/test/scan-components.test.ts (100%) rename packages/{nuxt3 => nuxt}/types.d.ts (100%) delete mode 100755 scripts/nu diff --git a/.eslintrc b/.eslintrc index d1646bb9d9..4b6b21596a 100644 --- a/.eslintrc +++ b/.eslintrc @@ -27,13 +27,13 @@ { "zones": [ { - "from": "packages/nuxt3/src/!(core)/**/*", - "target": "packages/nuxt3/src/core", + "from": "packages/nuxt/src/!(core)/**/*", + "target": "packages/nuxt/src/core", "message": "core should not directly import from modules." }, { - "from": "packages/nuxt3/src/!(app)/**/*", - "target": "packages/nuxt3/src/app", + "from": "packages/nuxt/src/!(app)/**/*", + "target": "packages/nuxt/src/app", "message": "app should not directly import from modules." }, { diff --git a/docs/content/1.getting-started/1.quick-start.md b/docs/content/1.getting-started/1.quick-start.md index c39e3ac0d6..d4e23104c3 100644 --- a/docs/content/1.getting-started/1.quick-start.md +++ b/docs/content/1.getting-started/1.quick-start.md @@ -42,19 +42,19 @@ Open a terminal, or from [Visual Studio Code](https://code.visualstudio.com/), o ::code-group ```bash [npx] -npx nuxi init nuxt3-app +npx nuxi init nuxt-app ``` ```bash [pnpm] -pnpm dlx nuxi init nuxt3-app +pnpm dlx nuxi init nuxt-app ``` :: -Open `nuxt3-app` folder in visual studio code: +Open `nuxt-app` folder in visual studio code: ```bash -code nuxt3-app +code nuxt-app ``` Install the dependencies: diff --git a/docs/content/2.guide/1.concepts/1.introduction.md b/docs/content/2.guide/1.concepts/1.introduction.md index 70197414dd..32a2305fbf 100644 --- a/docs/content/2.guide/1.concepts/1.introduction.md +++ b/docs/content/2.guide/1.concepts/1.introduction.md @@ -25,7 +25,7 @@ On top of this setup, Nuxt provides a [directory structure](/guide/directory-str Nuxt is composed of different [core packages](https://github.com/nuxt/framework/tree/main/packages): ::list{type=info} -- Core Engine: [nuxt3](https://github.com/nuxt/framework/tree/main/packages/nuxt3) +- Core Engine: [nuxt](https://github.com/nuxt/framework/tree/main/packages/nuxt) - Bundlers: [@nuxt/vite-builder](https://github.com/nuxt/framework/tree/main/packages/vite) and [@nuxt/webpack-builder](https://github.com/nuxt/framework/tree/main/packages/webpack) - Command line interface: [nuxi](https://github.com/nuxt/framework/tree/main/packages/nuxi) - Server engine: [nitro](https://github.com/unjs/nitro) diff --git a/docs/content/2.guide/3.directory-structure/18.nuxt.config.md b/docs/content/2.guide/3.directory-structure/18.nuxt.config.md index 7023de7391..575d664c33 100644 --- a/docs/content/2.guide/3.directory-structure/18.nuxt.config.md +++ b/docs/content/2.guide/3.directory-structure/18.nuxt.config.md @@ -9,7 +9,7 @@ head.title: Nuxt configuration file Nuxt can be easily configured with a single `nuxt.config` file, which can have either a `.js`, `.ts` or `.mjs` extension. ```ts -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ // My Nuxt config diff --git a/docs/content/2.guide/3.directory-structure/4.components.md b/docs/content/2.guide/3.directory-structure/4.components.md index 3aa592954a..6e5300b7f9 100644 --- a/docs/content/2.guide/3.directory-structure/4.components.md +++ b/docs/content/2.guide/3.directory-structure/4.components.md @@ -66,8 +66,8 @@ const MyButton = resolveComponent('MyButton') Alternatively, though not recommended, you can register all your components globally, which will create async chunks for all your components and make them available throughout your application. ```diff - import { defineNuxtConfig } from 'nuxt3' - + import { defineNuxtConfig } from 'nuxt' + export default defineNuxtConfig({ components: { + global: true, diff --git a/docs/content/2.guide/6.going-further/1.internals.md b/docs/content/2.guide/6.going-further/1.internals.md index 8ab2bebb38..2c1bdaf5b3 100644 --- a/docs/content/2.guide/6.going-further/1.internals.md +++ b/docs/content/2.guide/6.going-further/1.internals.md @@ -14,7 +14,7 @@ Therefore only one instance of Nuxt is allowed to run per process. To extend the Nuxt interface and hook into different stages of the build process, we can use [Nuxt Modules](/guide/going-further/modules). -For more details, check out [the source code](https://github.com/nuxt/framework/blob/main/packages/nuxt3/src/core/nuxt.ts). +For more details, check out [the source code](https://github.com/nuxt/framework/blob/main/packages/nuxt/src/core/nuxt.ts). ## The NuxtApp interface @@ -38,7 +38,7 @@ const nuxtApp = { vueApp, // the global Vue application: https://vuejs.org/api/application.html#application-api // These let you call and add runtime NuxtApp hooks - // https://github.com/nuxt/framework/blob/main/packages/nuxt3/src/app/nuxt.ts#L18 + // https://github.com/nuxt/framework/blob/main/packages/nuxt/src/app/nuxt.ts#L18 hooks, hook, callHook, @@ -63,7 +63,7 @@ const nuxtApp = { } ``` -For more details, check out [the source code](https://github.com/nuxt/framework/blob/main/packages/nuxt3/src/app/nuxt.ts). +For more details, check out [the source code](https://github.com/nuxt/framework/blob/main/packages/nuxt/src/app/nuxt.ts). ## Runtime Context vs. Build Context diff --git a/docs/content/2.guide/6.going-further/5.esm.md b/docs/content/2.guide/6.going-further/5.esm.md index 954cf5f1bb..5ca60aeb39 100644 --- a/docs/content/2.guide/6.going-further/5.esm.md +++ b/docs/content/2.guide/6.going-further/5.esm.md @@ -117,7 +117,7 @@ If you encounter these errors, the issue is almost certainly with the upstream l In the meantime, you can tell Nuxt not to try to import these libraries by adding them to `build.transpile`: ```js -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ build: { @@ -133,7 +133,7 @@ You may find that you _also_ need to add other packages that are being imported In some cases, you may also need to manually alias the library to the CJS version, for example: ```js -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ alias: { diff --git a/docs/content/2.guide/6.going-further/7.testing.md b/docs/content/2.guide/6.going-further/7.testing.md index da44e8ef37..bfcc9ad876 100644 --- a/docs/content/2.guide/6.going-further/7.testing.md +++ b/docs/content/2.guide/6.going-further/7.testing.md @@ -148,7 +148,7 @@ To test the modules we create, we could set up some Nuxt apps as fixtures and te ```ts // nuxt.config.js -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' import MyModule from '../../src' export default defineNuxtConfig({ diff --git a/docs/content/3.api/4.advanced/1.hooks.md b/docs/content/3.api/4.advanced/1.hooks.md index 83f8dd4841..7bf7b02883 100644 --- a/docs/content/3.api/4.advanced/1.hooks.md +++ b/docs/content/3.api/4.advanced/1.hooks.md @@ -5,7 +5,7 @@ # App Hooks (runtime) -Check the [app source code](https://github.com/nuxt/framework/blob/main/packages/nuxt3/src/app/nuxt.ts#L18) for all available hooks. +Check the [app source code](https://github.com/nuxt/framework/blob/main/packages/nuxt/src/app/nuxt.ts#L18) for all available hooks. Hook | Arguments | Description -----------------------|-------------------|--------------- diff --git a/docs/content/migration/2.configuration.md b/docs/content/migration/2.configuration.md index 7ab0088251..52bbfc6da6 100644 --- a/docs/content/migration/2.configuration.md +++ b/docs/content/migration/2.configuration.md @@ -26,7 +26,7 @@ Nuxt configuration will be loaded using [`unjs/jiti`](https://github.com/unjs/ji ``` ```ts [Nuxt 3] - import { defineNuxtConfig } from 'nuxt3' + import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ // ... @@ -50,7 +50,7 @@ Nuxt configuration will be loaded using [`unjs/jiti`](https://github.com/unjs/ji ``` ```ts [Nuxt 3] - import { defineNuxtConfig } from 'nuxt3' + import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ hooks: { diff --git a/docs/content/migration/8.runtime-config.md b/docs/content/migration/8.runtime-config.md index 46038dffd9..12e08fec03 100644 --- a/docs/content/migration/8.runtime-config.md +++ b/docs/content/migration/8.runtime-config.md @@ -21,7 +21,7 @@ When referencing these variables within your components, you will have to use th ::code-group ```ts [nuxt.config.ts] -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ runtimeConfig: { diff --git a/examples/advanced/config-extends/base/nuxt.config.ts b/examples/advanced/config-extends/base/nuxt.config.ts index 0f8be0165d..8bcb917dc5 100644 --- a/examples/advanced/config-extends/base/nuxt.config.ts +++ b/examples/advanced/config-extends/base/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ autoImports: { diff --git a/examples/advanced/config-extends/nuxt.config.ts b/examples/advanced/config-extends/nuxt.config.ts index 27351ed2a6..1e99ce00bc 100644 --- a/examples/advanced/config-extends/nuxt.config.ts +++ b/examples/advanced/config-extends/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ extends: [ diff --git a/examples/advanced/config-extends/package.json b/examples/advanced/config-extends/package.json index 2beba927a2..05b9160019 100644 --- a/examples/advanced/config-extends/package.json +++ b/examples/advanced/config-extends/package.json @@ -3,7 +3,7 @@ "private": true, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" }, "scripts": { "dev": "nuxi dev", diff --git a/examples/advanced/config-extends/ui/nuxt.config.ts b/examples/advanced/config-extends/ui/nuxt.config.ts index 06d8bba06b..5fb57ea54c 100644 --- a/examples/advanced/config-extends/ui/nuxt.config.ts +++ b/examples/advanced/config-extends/ui/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ components: [ diff --git a/examples/advanced/module-extend-pages/nuxt.config.ts b/examples/advanced/module-extend-pages/nuxt.config.ts index 171d48eb19..0b86f8d08f 100644 --- a/examples/advanced/module-extend-pages/nuxt.config.ts +++ b/examples/advanced/module-extend-pages/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/advanced/module-extend-pages/package.json b/examples/advanced/module-extend-pages/package.json index 29c946ab80..927a7b86fa 100644 --- a/examples/advanced/module-extend-pages/package.json +++ b/examples/advanced/module-extend-pages/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/advanced/testing/nuxt.config.ts b/examples/advanced/testing/nuxt.config.ts index a3e4d68096..8b0aa104ad 100644 --- a/examples/advanced/testing/nuxt.config.ts +++ b/examples/advanced/testing/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ }) diff --git a/examples/advanced/testing/package.json b/examples/advanced/testing/package.json index 42bac9855c..f61395d1bb 100644 --- a/examples/advanced/testing/package.json +++ b/examples/advanced/testing/package.json @@ -7,6 +7,6 @@ "start": "nuxi preview" }, "devDependencies": { - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/app/error-handling/nuxt.config.ts b/examples/app/error-handling/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/app/error-handling/nuxt.config.ts +++ b/examples/app/error-handling/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/app/error-handling/package.json b/examples/app/error-handling/package.json index df38fea458..6ad6a54d78 100644 --- a/examples/app/error-handling/package.json +++ b/examples/app/error-handling/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/app/plugins/nuxt.config.ts b/examples/app/plugins/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/app/plugins/nuxt.config.ts +++ b/examples/app/plugins/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/app/plugins/package.json b/examples/app/plugins/package.json index fef2596e16..497aa5b749 100644 --- a/examples/app/plugins/package.json +++ b/examples/app/plugins/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/app/teleport/nuxt.config.ts b/examples/app/teleport/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/app/teleport/nuxt.config.ts +++ b/examples/app/teleport/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/app/teleport/package.json b/examples/app/teleport/package.json index b66c77a6ff..472713f550 100644 --- a/examples/app/teleport/package.json +++ b/examples/app/teleport/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/auto-imports/components/nuxt.config.ts b/examples/auto-imports/components/nuxt.config.ts index 8971086b9b..0bc8ef8274 100644 --- a/examples/auto-imports/components/nuxt.config.ts +++ b/examples/auto-imports/components/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/auto-imports/components/package.json b/examples/auto-imports/components/package.json index 059fae08b2..da4101de40 100644 --- a/examples/auto-imports/components/package.json +++ b/examples/auto-imports/components/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/auto-imports/composables/nuxt.config.ts b/examples/auto-imports/composables/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/auto-imports/composables/nuxt.config.ts +++ b/examples/auto-imports/composables/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/auto-imports/composables/package.json b/examples/auto-imports/composables/package.json index a8b8d6832b..bf2dc2eb2a 100644 --- a/examples/auto-imports/composables/package.json +++ b/examples/auto-imports/composables/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/composables/use-async-data/nuxt.config.ts b/examples/composables/use-async-data/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/composables/use-async-data/nuxt.config.ts +++ b/examples/composables/use-async-data/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/composables/use-async-data/package.json b/examples/composables/use-async-data/package.json index 66b7d6a172..8fd1681a5e 100644 --- a/examples/composables/use-async-data/package.json +++ b/examples/composables/use-async-data/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/composables/use-cookie/nuxt.config.ts b/examples/composables/use-cookie/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/composables/use-cookie/nuxt.config.ts +++ b/examples/composables/use-cookie/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/composables/use-cookie/package.json b/examples/composables/use-cookie/package.json index 8318d75518..1c50569285 100644 --- a/examples/composables/use-cookie/package.json +++ b/examples/composables/use-cookie/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/composables/use-fetch/nuxt.config.ts b/examples/composables/use-fetch/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/composables/use-fetch/nuxt.config.ts +++ b/examples/composables/use-fetch/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/composables/use-fetch/package.json b/examples/composables/use-fetch/package.json index 32ba0aa58d..42121d82f0 100644 --- a/examples/composables/use-fetch/package.json +++ b/examples/composables/use-fetch/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/composables/use-head/nuxt.config.ts b/examples/composables/use-head/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/composables/use-head/nuxt.config.ts +++ b/examples/composables/use-head/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/composables/use-head/package.json b/examples/composables/use-head/package.json index e51f03c9e2..f68ed1e878 100644 --- a/examples/composables/use-head/package.json +++ b/examples/composables/use-head/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/composables/use-state/nuxt.config.ts b/examples/composables/use-state/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/composables/use-state/nuxt.config.ts +++ b/examples/composables/use-state/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/composables/use-state/package.json b/examples/composables/use-state/package.json index e8afbce719..73eb6f63a2 100644 --- a/examples/composables/use-state/package.json +++ b/examples/composables/use-state/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/essentials/hello-world/nuxt.config.ts b/examples/essentials/hello-world/nuxt.config.ts index a3e4d68096..8b0aa104ad 100644 --- a/examples/essentials/hello-world/nuxt.config.ts +++ b/examples/essentials/hello-world/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ }) diff --git a/examples/essentials/hello-world/package.json b/examples/essentials/hello-world/package.json index 0ffb9d6b51..53d0920b49 100644 --- a/examples/essentials/hello-world/package.json +++ b/examples/essentials/hello-world/package.json @@ -7,6 +7,6 @@ "start": "nuxi preview" }, "devDependencies": { - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/experimental/reactivity-transform/nuxt.config.ts b/examples/experimental/reactivity-transform/nuxt.config.ts index 7338c58d9e..4959137de4 100644 --- a/examples/experimental/reactivity-transform/nuxt.config.ts +++ b/examples/experimental/reactivity-transform/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/experimental/reactivity-transform/package.json b/examples/experimental/reactivity-transform/package.json index 91e7d73118..bde9ee4d09 100644 --- a/examples/experimental/reactivity-transform/package.json +++ b/examples/experimental/reactivity-transform/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/experimental/vite-node/nuxt.config.ts b/examples/experimental/vite-node/nuxt.config.ts index aec3a1ce8c..d2551556ec 100644 --- a/examples/experimental/vite-node/nuxt.config.ts +++ b/examples/experimental/vite-node/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/experimental/vite-node/package.json b/examples/experimental/vite-node/package.json index a2be03f24e..ed49fadaec 100644 --- a/examples/experimental/vite-node/package.json +++ b/examples/experimental/vite-node/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/experimental/wasm/nuxt.config.ts b/examples/experimental/wasm/nuxt.config.ts index bb07de4e08..0d7edfc694 100644 --- a/examples/experimental/wasm/nuxt.config.ts +++ b/examples/experimental/wasm/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ nitro: { diff --git a/examples/experimental/wasm/package.json b/examples/experimental/wasm/package.json index 02354c1253..40a6870a98 100644 --- a/examples/experimental/wasm/package.json +++ b/examples/experimental/wasm/package.json @@ -3,7 +3,7 @@ "private": true, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" }, "scripts": { "dev": "nuxi dev", diff --git a/examples/other/locale/nuxt.config.ts b/examples/other/locale/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/other/locale/nuxt.config.ts +++ b/examples/other/locale/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/other/locale/package.json b/examples/other/locale/package.json index 7c41c10fe2..c738792a59 100644 --- a/examples/other/locale/package.json +++ b/examples/other/locale/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/routing/layouts/nuxt.config.ts b/examples/routing/layouts/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/routing/layouts/nuxt.config.ts +++ b/examples/routing/layouts/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/routing/layouts/package.json b/examples/routing/layouts/package.json index 0e51d39553..e66e047364 100644 --- a/examples/routing/layouts/package.json +++ b/examples/routing/layouts/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/routing/middleware/nuxt.config.ts b/examples/routing/middleware/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/routing/middleware/nuxt.config.ts +++ b/examples/routing/middleware/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/routing/middleware/package.json b/examples/routing/middleware/package.json index 7d1046d4d1..9bc8d0cde4 100644 --- a/examples/routing/middleware/package.json +++ b/examples/routing/middleware/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/routing/nuxt-link/nuxt.config.ts b/examples/routing/nuxt-link/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/routing/nuxt-link/nuxt.config.ts +++ b/examples/routing/nuxt-link/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/routing/nuxt-link/package.json b/examples/routing/nuxt-link/package.json index 0fca3e69e5..2fc384fb94 100644 --- a/examples/routing/nuxt-link/package.json +++ b/examples/routing/nuxt-link/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/routing/pages/nuxt.config.ts b/examples/routing/pages/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/routing/pages/nuxt.config.ts +++ b/examples/routing/pages/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/routing/pages/package.json b/examples/routing/pages/package.json index fdd10b21d4..eec7869cec 100644 --- a/examples/routing/pages/package.json +++ b/examples/routing/pages/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/routing/universal-router/nuxt.config.ts b/examples/routing/universal-router/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/routing/universal-router/nuxt.config.ts +++ b/examples/routing/universal-router/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/routing/universal-router/package.json b/examples/routing/universal-router/package.json index 78e4d0411e..e5e570cab7 100644 --- a/examples/routing/universal-router/package.json +++ b/examples/routing/universal-router/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/examples/server/routes/nuxt.config.ts b/examples/server/routes/nuxt.config.ts index 9850816d15..36c7f84d69 100644 --- a/examples/server/routes/nuxt.config.ts +++ b/examples/server/routes/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ modules: [ diff --git a/examples/server/routes/package.json b/examples/server/routes/package.json index c8a8e30e51..fdf8c4c994 100644 --- a/examples/server/routes/package.json +++ b/examples/server/routes/package.json @@ -8,6 +8,6 @@ }, "devDependencies": { "@nuxt/ui": "^0.1.0", - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" } } diff --git a/package.json b/package.json index 5073673989..9a5499dfdf 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "resolutions": { "jiti": "^1.13.0", "nitropack-dev": "link:../nitropack", - "nuxt3": "workspace:./packages/nuxt3", + "nuxt": "workspace:./packages/nuxt", "vite": "^2.9.5", "unbuild": "^0.7.4" }, diff --git a/packages/kit/src/loader/nuxt.ts b/packages/kit/src/loader/nuxt.ts index 840b7109be..1756f56540 100644 --- a/packages/kit/src/loader/nuxt.ts +++ b/packages/kit/src/loader/nuxt.ts @@ -27,7 +27,7 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise { // Apply dev as config override opts.overrides.dev = !!opts.dev - const nearestNuxtPkg = await Promise.all(['nuxt3', 'nuxt-edge', 'nuxt'] + const nearestNuxtPkg = await Promise.all(['nuxt3', 'nuxt', 'nuxt-edge'] .map(pkg => resolvePackageJSON(pkg, { url: opts.cwd }).catch(() => null))) .then(r => r.filter(Boolean).sort((a, b) => b.length - a.length)[0]) if (!nearestNuxtPkg) { @@ -38,7 +38,7 @@ export async function loadNuxt (opts: LoadNuxtOptions): Promise { // Nuxt 3 if (majorVersion === 3) { - const { loadNuxt } = await importModule('nuxt3', resolveOpts) + const { loadNuxt } = await importModule(pkg.name, resolveOpts) const nuxt = await loadNuxt(opts) return nuxt } @@ -61,11 +61,11 @@ export async function buildNuxt (nuxt: Nuxt): Promise { // Nuxt 3 if (nuxt.options._majorVersion === 3) { - const { build } = await importModule('nuxt3', resolveOpts) + const { build } = await tryImportModule('nuxt3', resolveOpts) || await importModule('nuxt', resolveOpts) return build(nuxt) } // Nuxt 2 - const { build } = await tryImportModule('nuxt-edge', resolveOpts) || await tryImportModule('nuxt', resolveOpts) + const { build } = await tryImportModule('nuxt-edge', resolveOpts) || await importModule('nuxt', resolveOpts) return build(nuxt) } diff --git a/packages/nuxi/src/commands/upgrade.ts b/packages/nuxi/src/commands/upgrade.ts index 4bf2185023..92f0794f99 100644 --- a/packages/nuxi/src/commands/upgrade.ts +++ b/packages/nuxi/src/commands/upgrade.ts @@ -7,10 +7,10 @@ import { getPackageManager, packageManagerLocks } from '../utils/packageManagers import { defineNuxtCommand } from './index' async function getNuxtVersion (paths: string | string[]) { - const pkgJson = resolveModule('nuxt3/package.json', paths) + const pkgJson = resolveModule('nuxt/package.json', paths) const pkg = pkgJson && JSON.parse(await fsp.readFile(pkgJson, 'utf8')) if (!pkg.version) { - consola.warn('Cannot find any installed nuxt3 versions in ', paths) + consola.warn('Cannot find any installed nuxt versions in ', paths) } return pkg.version || '0.0.0' } @@ -19,7 +19,7 @@ export default defineNuxtCommand({ meta: { name: 'upgrade', usage: 'npx nuxi upgrade [--force|-f]', - description: 'Upgrade nuxt3' + description: 'Upgrade nuxt' }, async invoke (args) { const rootDir = resolve(args._[0] || '.') @@ -47,14 +47,14 @@ export default defineNuxtCommand({ await Promise.all(['node_modules/.cache', resolve(rootDir, '.nuxt'), 'node_modules/.vite'].map((path) => { return existsSync(path) ? fsp.rm(path, { recursive: true }) : undefined })) - execSync(`${packageManager} ${packageManager === 'yarn' ? 'add' : 'install'} -D nuxt3@latest`, { stdio: 'inherit' }) + execSync(`${packageManager} ${packageManager === 'yarn' ? 'add' : 'install'} -D nuxt@latest`, { stdio: 'inherit' }) } const upgradedVersion = await getNuxtVersion(rootDir) consola.info('Upgraded nuxt version:', upgradedVersion) if (upgradedVersion === currentVersion) { - consola.success('You\'re already using the latest version of nuxt3.') + consola.success('You\'re already using the latest version of nuxt.') } else { consola.success('Successfully upgraded nuxt from', currentVersion, 'to', upgradedVersion) const commitA = currentVersion.split('.').pop() diff --git a/packages/nuxt3/README.md b/packages/nuxt/README.md similarity index 100% rename from packages/nuxt3/README.md rename to packages/nuxt/README.md diff --git a/packages/nuxt3/app.d.ts b/packages/nuxt/app.d.ts similarity index 100% rename from packages/nuxt3/app.d.ts rename to packages/nuxt/app.d.ts diff --git a/packages/nuxt3/bin/nuxt.mjs b/packages/nuxt/bin/nuxt.mjs similarity index 100% rename from packages/nuxt3/bin/nuxt.mjs rename to packages/nuxt/bin/nuxt.mjs diff --git a/packages/nuxt3/build.config.ts b/packages/nuxt/build.config.ts similarity index 100% rename from packages/nuxt3/build.config.ts rename to packages/nuxt/build.config.ts diff --git a/packages/nuxt3/package.json b/packages/nuxt/package.json similarity index 98% rename from packages/nuxt3/package.json rename to packages/nuxt/package.json index 9f826bf6df..889b5afd36 100644 --- a/packages/nuxt3/package.json +++ b/packages/nuxt/package.json @@ -1,5 +1,5 @@ { - "name": "nuxt3", + "name": "nuxt", "version": "3.0.0", "repository": "nuxt/framework", "license": "MIT", diff --git a/packages/nuxt3/src/app/compat/capi.ts b/packages/nuxt/src/app/compat/capi.ts similarity index 100% rename from packages/nuxt3/src/app/compat/capi.ts rename to packages/nuxt/src/app/compat/capi.ts diff --git a/packages/nuxt3/src/app/compat/legacy-app.ts b/packages/nuxt/src/app/compat/legacy-app.ts similarity index 100% rename from packages/nuxt3/src/app/compat/legacy-app.ts rename to packages/nuxt/src/app/compat/legacy-app.ts diff --git a/packages/nuxt3/src/app/compat/vue-demi.ts b/packages/nuxt/src/app/compat/vue-demi.ts similarity index 100% rename from packages/nuxt3/src/app/compat/vue-demi.ts rename to packages/nuxt/src/app/compat/vue-demi.ts diff --git a/packages/nuxt3/src/app/components/client-only.mjs b/packages/nuxt/src/app/components/client-only.mjs similarity index 100% rename from packages/nuxt3/src/app/components/client-only.mjs rename to packages/nuxt/src/app/components/client-only.mjs diff --git a/packages/nuxt3/src/app/components/index.ts b/packages/nuxt/src/app/components/index.ts similarity index 100% rename from packages/nuxt3/src/app/components/index.ts rename to packages/nuxt/src/app/components/index.ts diff --git a/packages/nuxt3/src/app/components/layout.ts b/packages/nuxt/src/app/components/layout.ts similarity index 100% rename from packages/nuxt3/src/app/components/layout.ts rename to packages/nuxt/src/app/components/layout.ts diff --git a/packages/nuxt3/src/app/components/nuxt-error-boundary.ts b/packages/nuxt/src/app/components/nuxt-error-boundary.ts similarity index 100% rename from packages/nuxt3/src/app/components/nuxt-error-boundary.ts rename to packages/nuxt/src/app/components/nuxt-error-boundary.ts diff --git a/packages/nuxt3/src/app/components/nuxt-error-page.vue b/packages/nuxt/src/app/components/nuxt-error-page.vue similarity index 100% rename from packages/nuxt3/src/app/components/nuxt-error-page.vue rename to packages/nuxt/src/app/components/nuxt-error-page.vue diff --git a/packages/nuxt3/src/app/components/nuxt-link.ts b/packages/nuxt/src/app/components/nuxt-link.ts similarity index 100% rename from packages/nuxt3/src/app/components/nuxt-link.ts rename to packages/nuxt/src/app/components/nuxt-link.ts diff --git a/packages/nuxt3/src/app/components/nuxt-root.vue b/packages/nuxt/src/app/components/nuxt-root.vue similarity index 100% rename from packages/nuxt3/src/app/components/nuxt-root.vue rename to packages/nuxt/src/app/components/nuxt-root.vue diff --git a/packages/nuxt3/src/app/components/server-placeholder.ts b/packages/nuxt/src/app/components/server-placeholder.ts similarity index 100% rename from packages/nuxt3/src/app/components/server-placeholder.ts rename to packages/nuxt/src/app/components/server-placeholder.ts diff --git a/packages/nuxt3/src/app/components/utils.ts b/packages/nuxt/src/app/components/utils.ts similarity index 100% rename from packages/nuxt3/src/app/components/utils.ts rename to packages/nuxt/src/app/components/utils.ts diff --git a/packages/nuxt3/src/app/composables/asyncData.ts b/packages/nuxt/src/app/composables/asyncData.ts similarity index 100% rename from packages/nuxt3/src/app/composables/asyncData.ts rename to packages/nuxt/src/app/composables/asyncData.ts diff --git a/packages/nuxt3/src/app/composables/component.ts b/packages/nuxt/src/app/composables/component.ts similarity index 100% rename from packages/nuxt3/src/app/composables/component.ts rename to packages/nuxt/src/app/composables/component.ts diff --git a/packages/nuxt3/src/app/composables/cookie.ts b/packages/nuxt/src/app/composables/cookie.ts similarity index 100% rename from packages/nuxt3/src/app/composables/cookie.ts rename to packages/nuxt/src/app/composables/cookie.ts diff --git a/packages/nuxt3/src/app/composables/error.ts b/packages/nuxt/src/app/composables/error.ts similarity index 100% rename from packages/nuxt3/src/app/composables/error.ts rename to packages/nuxt/src/app/composables/error.ts diff --git a/packages/nuxt3/src/app/composables/fetch.ts b/packages/nuxt/src/app/composables/fetch.ts similarity index 100% rename from packages/nuxt3/src/app/composables/fetch.ts rename to packages/nuxt/src/app/composables/fetch.ts diff --git a/packages/nuxt3/src/app/composables/hydrate.ts b/packages/nuxt/src/app/composables/hydrate.ts similarity index 100% rename from packages/nuxt3/src/app/composables/hydrate.ts rename to packages/nuxt/src/app/composables/hydrate.ts diff --git a/packages/nuxt3/src/app/composables/index.ts b/packages/nuxt/src/app/composables/index.ts similarity index 100% rename from packages/nuxt3/src/app/composables/index.ts rename to packages/nuxt/src/app/composables/index.ts diff --git a/packages/nuxt3/src/app/composables/router.ts b/packages/nuxt/src/app/composables/router.ts similarity index 100% rename from packages/nuxt3/src/app/composables/router.ts rename to packages/nuxt/src/app/composables/router.ts diff --git a/packages/nuxt3/src/app/composables/ssr.ts b/packages/nuxt/src/app/composables/ssr.ts similarity index 100% rename from packages/nuxt3/src/app/composables/ssr.ts rename to packages/nuxt/src/app/composables/ssr.ts diff --git a/packages/nuxt3/src/app/composables/state.ts b/packages/nuxt/src/app/composables/state.ts similarity index 100% rename from packages/nuxt3/src/app/composables/state.ts rename to packages/nuxt/src/app/composables/state.ts diff --git a/packages/nuxt3/src/app/composables/utils.ts b/packages/nuxt/src/app/composables/utils.ts similarity index 100% rename from packages/nuxt3/src/app/composables/utils.ts rename to packages/nuxt/src/app/composables/utils.ts diff --git a/packages/nuxt3/src/app/entry.async.ts b/packages/nuxt/src/app/entry.async.ts similarity index 100% rename from packages/nuxt3/src/app/entry.async.ts rename to packages/nuxt/src/app/entry.async.ts diff --git a/packages/nuxt3/src/app/entry.ts b/packages/nuxt/src/app/entry.ts similarity index 100% rename from packages/nuxt3/src/app/entry.ts rename to packages/nuxt/src/app/entry.ts diff --git a/packages/nuxt3/src/app/index.ts b/packages/nuxt/src/app/index.ts similarity index 100% rename from packages/nuxt3/src/app/index.ts rename to packages/nuxt/src/app/index.ts diff --git a/packages/nuxt3/src/app/nuxt.ts b/packages/nuxt/src/app/nuxt.ts similarity index 100% rename from packages/nuxt3/src/app/nuxt.ts rename to packages/nuxt/src/app/nuxt.ts diff --git a/packages/nuxt3/src/app/plugins/logs.client.dev.ts b/packages/nuxt/src/app/plugins/logs.client.dev.ts similarity index 100% rename from packages/nuxt3/src/app/plugins/logs.client.dev.ts rename to packages/nuxt/src/app/plugins/logs.client.dev.ts diff --git a/packages/nuxt3/src/app/plugins/preload.server.ts b/packages/nuxt/src/app/plugins/preload.server.ts similarity index 100% rename from packages/nuxt3/src/app/plugins/preload.server.ts rename to packages/nuxt/src/app/plugins/preload.server.ts diff --git a/packages/nuxt3/src/app/plugins/progress.client.ts b/packages/nuxt/src/app/plugins/progress.client.ts similarity index 100% rename from packages/nuxt3/src/app/plugins/progress.client.ts rename to packages/nuxt/src/app/plugins/progress.client.ts diff --git a/packages/nuxt3/src/app/plugins/router.ts b/packages/nuxt/src/app/plugins/router.ts similarity index 100% rename from packages/nuxt3/src/app/plugins/router.ts rename to packages/nuxt/src/app/plugins/router.ts diff --git a/packages/nuxt3/src/app/types/augments.d.ts b/packages/nuxt/src/app/types/augments.d.ts similarity index 100% rename from packages/nuxt3/src/app/types/augments.d.ts rename to packages/nuxt/src/app/types/augments.d.ts diff --git a/packages/nuxt3/src/auto-imports/composables.ts b/packages/nuxt/src/auto-imports/composables.ts similarity index 100% rename from packages/nuxt3/src/auto-imports/composables.ts rename to packages/nuxt/src/auto-imports/composables.ts diff --git a/packages/nuxt3/src/auto-imports/module.ts b/packages/nuxt/src/auto-imports/module.ts similarity index 100% rename from packages/nuxt3/src/auto-imports/module.ts rename to packages/nuxt/src/auto-imports/module.ts diff --git a/packages/nuxt3/src/auto-imports/presets.ts b/packages/nuxt/src/auto-imports/presets.ts similarity index 100% rename from packages/nuxt3/src/auto-imports/presets.ts rename to packages/nuxt/src/auto-imports/presets.ts diff --git a/packages/nuxt3/src/auto-imports/transform.ts b/packages/nuxt/src/auto-imports/transform.ts similarity index 100% rename from packages/nuxt3/src/auto-imports/transform.ts rename to packages/nuxt/src/auto-imports/transform.ts diff --git a/packages/nuxt3/src/components/loader.ts b/packages/nuxt/src/components/loader.ts similarity index 100% rename from packages/nuxt3/src/components/loader.ts rename to packages/nuxt/src/components/loader.ts diff --git a/packages/nuxt3/src/components/module.ts b/packages/nuxt/src/components/module.ts similarity index 100% rename from packages/nuxt3/src/components/module.ts rename to packages/nuxt/src/components/module.ts diff --git a/packages/nuxt3/src/components/scan.ts b/packages/nuxt/src/components/scan.ts similarity index 100% rename from packages/nuxt3/src/components/scan.ts rename to packages/nuxt/src/components/scan.ts diff --git a/packages/nuxt3/src/components/templates.ts b/packages/nuxt/src/components/templates.ts similarity index 100% rename from packages/nuxt3/src/components/templates.ts rename to packages/nuxt/src/components/templates.ts diff --git a/packages/nuxt3/src/core/app.ts b/packages/nuxt/src/core/app.ts similarity index 100% rename from packages/nuxt3/src/core/app.ts rename to packages/nuxt/src/core/app.ts diff --git a/packages/nuxt3/src/core/builder.ts b/packages/nuxt/src/core/builder.ts similarity index 100% rename from packages/nuxt3/src/core/builder.ts rename to packages/nuxt/src/core/builder.ts diff --git a/packages/nuxt3/src/core/modules.ts b/packages/nuxt/src/core/modules.ts similarity index 100% rename from packages/nuxt3/src/core/modules.ts rename to packages/nuxt/src/core/modules.ts diff --git a/packages/nuxt3/src/core/nitro.ts b/packages/nuxt/src/core/nitro.ts similarity index 99% rename from packages/nuxt3/src/core/nitro.ts rename to packages/nuxt/src/core/nitro.ts index 0a3ec4f872..186a93b4a6 100644 --- a/packages/nuxt3/src/core/nitro.ts +++ b/packages/nuxt/src/core/nitro.ts @@ -105,7 +105,7 @@ export async function initNitro (nuxt: Nuxt) { // Connect hooks nuxt.hook('close', () => nitro.hooks.callHook('close')) - // Register nuxt3 protection patterns + // Register nuxt protection patterns nitro.hooks.hook('rollup:before', (nitro) => { const plugin = ImportProtectionPlugin.rollup({ rootDir: nuxt.options.rootDir, diff --git a/packages/nuxt3/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts similarity index 98% rename from packages/nuxt3/src/core/nuxt.ts rename to packages/nuxt/src/core/nuxt.ts index 81b49b8c73..ea842f27f0 100644 --- a/packages/nuxt3/src/core/nuxt.ts +++ b/packages/nuxt/src/core/nuxt.ts @@ -42,9 +42,9 @@ async function initNuxt (nuxt: Nuxt) { nuxtCtx.set(nuxt) nuxt.hook('close', () => nuxtCtx.unset()) - // Add nuxt3 types + // Add nuxt types nuxt.hook('prepare:types', (opts) => { - opts.references.push({ types: 'nuxt3' }) + opts.references.push({ types: 'nuxt' }) opts.references.push({ path: resolve(nuxt.options.buildDir, 'types/plugins.d.ts') }) // Add vue shim if (nuxt.options.typescript.shim) { diff --git a/packages/nuxt3/src/core/plugins/import-protection.ts b/packages/nuxt/src/core/plugins/import-protection.ts similarity index 100% rename from packages/nuxt3/src/core/plugins/import-protection.ts rename to packages/nuxt/src/core/plugins/import-protection.ts diff --git a/packages/nuxt3/src/core/plugins/unctx.ts b/packages/nuxt/src/core/plugins/unctx.ts similarity index 100% rename from packages/nuxt3/src/core/plugins/unctx.ts rename to packages/nuxt/src/core/plugins/unctx.ts diff --git a/packages/nuxt3/src/core/runtime/nitro/error.ts b/packages/nuxt/src/core/runtime/nitro/error.ts similarity index 100% rename from packages/nuxt3/src/core/runtime/nitro/error.ts rename to packages/nuxt/src/core/runtime/nitro/error.ts diff --git a/packages/nuxt3/src/core/runtime/nitro/paths.ts b/packages/nuxt/src/core/runtime/nitro/paths.ts similarity index 100% rename from packages/nuxt3/src/core/runtime/nitro/paths.ts rename to packages/nuxt/src/core/runtime/nitro/paths.ts diff --git a/packages/nuxt3/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts similarity index 100% rename from packages/nuxt3/src/core/runtime/nitro/renderer.ts rename to packages/nuxt/src/core/runtime/nitro/renderer.ts diff --git a/packages/nuxt3/src/core/runtime/nitro/vue2.ts b/packages/nuxt/src/core/runtime/nitro/vue2.ts similarity index 100% rename from packages/nuxt3/src/core/runtime/nitro/vue2.ts rename to packages/nuxt/src/core/runtime/nitro/vue2.ts diff --git a/packages/nuxt3/src/core/runtime/nitro/vue3.ts b/packages/nuxt/src/core/runtime/nitro/vue3.ts similarity index 100% rename from packages/nuxt3/src/core/runtime/nitro/vue3.ts rename to packages/nuxt/src/core/runtime/nitro/vue3.ts diff --git a/packages/nuxt3/src/core/templates.ts b/packages/nuxt/src/core/templates.ts similarity index 99% rename from packages/nuxt3/src/core/templates.ts rename to packages/nuxt/src/core/templates.ts index 839345db28..2604a7b416 100644 --- a/packages/nuxt3/src/core/templates.ts +++ b/packages/nuxt/src/core/templates.ts @@ -96,7 +96,7 @@ export const pluginsDeclaration = { const EXTENSION_RE = new RegExp(`(?<=\\w)(${ctx.nuxt.options.extensions.map(e => escapeRE(e)).join('|')})$`, 'g') const tsImports = ctx.app.plugins.map(p => (isAbsolute(p.src) ? relative(join(ctx.nuxt.options.buildDir, 'types'), p.src) : p.src).replace(EXTENSION_RE, '')) - return `// Generated by Nuxt3' + return `// Generated by Nuxt' import type { Plugin } from '#app' type Decorate> = { [K in keyof T as K extends string ? \`$\${K}\` : never]: T[K] } diff --git a/packages/nuxt3/src/dirs.ts b/packages/nuxt/src/dirs.ts similarity index 100% rename from packages/nuxt3/src/dirs.ts rename to packages/nuxt/src/dirs.ts diff --git a/packages/nuxt3/src/head/module.ts b/packages/nuxt/src/head/module.ts similarity index 100% rename from packages/nuxt3/src/head/module.ts rename to packages/nuxt/src/head/module.ts diff --git a/packages/nuxt3/src/head/runtime/components.ts b/packages/nuxt/src/head/runtime/components.ts similarity index 100% rename from packages/nuxt3/src/head/runtime/components.ts rename to packages/nuxt/src/head/runtime/components.ts diff --git a/packages/nuxt3/src/head/runtime/composables.ts b/packages/nuxt/src/head/runtime/composables.ts similarity index 100% rename from packages/nuxt3/src/head/runtime/composables.ts rename to packages/nuxt/src/head/runtime/composables.ts diff --git a/packages/nuxt3/src/head/runtime/index.ts b/packages/nuxt/src/head/runtime/index.ts similarity index 100% rename from packages/nuxt3/src/head/runtime/index.ts rename to packages/nuxt/src/head/runtime/index.ts diff --git a/packages/nuxt3/src/head/runtime/lib/vue-meta.plugin.ts b/packages/nuxt/src/head/runtime/lib/vue-meta.plugin.ts similarity index 100% rename from packages/nuxt3/src/head/runtime/lib/vue-meta.plugin.ts rename to packages/nuxt/src/head/runtime/lib/vue-meta.plugin.ts diff --git a/packages/nuxt3/src/head/runtime/lib/vueuse-head.plugin.ts b/packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts similarity index 100% rename from packages/nuxt3/src/head/runtime/lib/vueuse-head.plugin.ts rename to packages/nuxt/src/head/runtime/lib/vueuse-head.plugin.ts diff --git a/packages/nuxt3/src/head/runtime/plugin.ts b/packages/nuxt/src/head/runtime/plugin.ts similarity index 100% rename from packages/nuxt3/src/head/runtime/plugin.ts rename to packages/nuxt/src/head/runtime/plugin.ts diff --git a/packages/nuxt3/src/index.ts b/packages/nuxt/src/index.ts similarity index 100% rename from packages/nuxt3/src/index.ts rename to packages/nuxt/src/index.ts diff --git a/packages/nuxt3/src/pages/macros.ts b/packages/nuxt/src/pages/macros.ts similarity index 100% rename from packages/nuxt3/src/pages/macros.ts rename to packages/nuxt/src/pages/macros.ts diff --git a/packages/nuxt3/src/pages/module.ts b/packages/nuxt/src/pages/module.ts similarity index 100% rename from packages/nuxt3/src/pages/module.ts rename to packages/nuxt/src/pages/module.ts diff --git a/packages/nuxt3/src/pages/runtime/app.vue b/packages/nuxt/src/pages/runtime/app.vue similarity index 100% rename from packages/nuxt3/src/pages/runtime/app.vue rename to packages/nuxt/src/pages/runtime/app.vue diff --git a/packages/nuxt3/src/pages/runtime/composables.ts b/packages/nuxt/src/pages/runtime/composables.ts similarity index 100% rename from packages/nuxt3/src/pages/runtime/composables.ts rename to packages/nuxt/src/pages/runtime/composables.ts diff --git a/packages/nuxt3/src/pages/runtime/index.ts b/packages/nuxt/src/pages/runtime/index.ts similarity index 100% rename from packages/nuxt3/src/pages/runtime/index.ts rename to packages/nuxt/src/pages/runtime/index.ts diff --git a/packages/nuxt3/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts similarity index 100% rename from packages/nuxt3/src/pages/runtime/page.ts rename to packages/nuxt/src/pages/runtime/page.ts diff --git a/packages/nuxt3/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts similarity index 100% rename from packages/nuxt3/src/pages/runtime/router.ts rename to packages/nuxt/src/pages/runtime/router.ts diff --git a/packages/nuxt3/src/pages/runtime/utils.ts b/packages/nuxt/src/pages/runtime/utils.ts similarity index 100% rename from packages/nuxt3/src/pages/runtime/utils.ts rename to packages/nuxt/src/pages/runtime/utils.ts diff --git a/packages/nuxt3/src/pages/utils.ts b/packages/nuxt/src/pages/utils.ts similarity index 100% rename from packages/nuxt3/src/pages/utils.ts rename to packages/nuxt/src/pages/utils.ts diff --git a/packages/nuxt3/test/auto-imports.test.ts b/packages/nuxt/test/auto-imports.test.ts similarity index 99% rename from packages/nuxt3/test/auto-imports.test.ts rename to packages/nuxt/test/auto-imports.test.ts index 67c4ca5067..b7b6ea40a0 100644 --- a/packages/nuxt3/test/auto-imports.test.ts +++ b/packages/nuxt/test/auto-imports.test.ts @@ -53,7 +53,7 @@ describe('auto-imports:transform', () => { const excludedNuxtHelpers = ['useHydration'] -describe('auto-imports:nuxt3', () => { +describe('auto-imports:nuxt', () => { try { const { __dirname } = createCommonJS(import.meta.url) const entrypointContents = readFileSync(join(__dirname, '../src/app/composables/index.ts'), 'utf8') diff --git a/packages/nuxt3/test/fixture/components/HelloWorld.vue b/packages/nuxt/test/fixture/components/HelloWorld.vue similarity index 100% rename from packages/nuxt3/test/fixture/components/HelloWorld.vue rename to packages/nuxt/test/fixture/components/HelloWorld.vue diff --git a/packages/nuxt3/test/fixture/components/Nuxt3.client.vue b/packages/nuxt/test/fixture/components/Nuxt3.client.vue similarity index 100% rename from packages/nuxt3/test/fixture/components/Nuxt3.client.vue rename to packages/nuxt/test/fixture/components/Nuxt3.client.vue diff --git a/packages/nuxt3/test/fixture/components/Nuxt3.server.vue b/packages/nuxt/test/fixture/components/Nuxt3.server.vue similarity index 100% rename from packages/nuxt3/test/fixture/components/Nuxt3.server.vue rename to packages/nuxt/test/fixture/components/Nuxt3.server.vue diff --git a/packages/nuxt3/test/fixture/components/parent-folder/index.server.vue b/packages/nuxt/test/fixture/components/parent-folder/index.server.vue similarity index 100% rename from packages/nuxt3/test/fixture/components/parent-folder/index.server.vue rename to packages/nuxt/test/fixture/components/parent-folder/index.server.vue diff --git a/packages/nuxt3/test/nuxt-link.test.ts b/packages/nuxt/test/nuxt-link.test.ts similarity index 100% rename from packages/nuxt3/test/nuxt-link.test.ts rename to packages/nuxt/test/nuxt-link.test.ts diff --git a/packages/nuxt3/test/pages.test.ts b/packages/nuxt/test/pages.test.ts similarity index 100% rename from packages/nuxt3/test/pages.test.ts rename to packages/nuxt/test/pages.test.ts diff --git a/packages/nuxt3/test/scan-components.test.ts b/packages/nuxt/test/scan-components.test.ts similarity index 100% rename from packages/nuxt3/test/scan-components.test.ts rename to packages/nuxt/test/scan-components.test.ts diff --git a/packages/nuxt3/types.d.ts b/packages/nuxt/types.d.ts similarity index 100% rename from packages/nuxt3/types.d.ts rename to packages/nuxt/types.d.ts diff --git a/packages/schema/src/types/hooks.ts b/packages/schema/src/types/hooks.ts index 4bc257108f..5b5c2c091a 100644 --- a/packages/schema/src/types/hooks.ts +++ b/packages/schema/src/types/hooks.ts @@ -65,7 +65,7 @@ export interface NuxtHooks { // Kit 'kit:compatibility': (compatibility: NuxtCompatibility, issues: NuxtCompatibilityIssues) => HookResult - // nuxt3 + // nuxt 'app:resolve': (app: NuxtApp) => HookResult 'app:templates': (app: NuxtApp) => HookResult 'app:templatesGenerated': (app: NuxtApp) => HookResult diff --git a/packages/vite/src/server.ts b/packages/vite/src/server.ts index b59edd66fa..cb2f14b847 100644 --- a/packages/vite/src/server.ts +++ b/packages/vite/src/server.ts @@ -47,7 +47,7 @@ export async function buildServer (ctx: ViteBuildContext) { /\.(es|esm|esm-browser|esm-bundler).js$/, '/__vue-jsx', '#app', - /nuxt3\/(dist|src|app)/, + /(nuxt|nuxt3)\/(dist|src|app)/, /@nuxt\/nitro\/(dist|src)/ ] }, diff --git a/packages/vite/src/vite-node.ts b/packages/vite/src/vite-node.ts index b94040594c..20491a7564 100644 --- a/packages/vite/src/vite-node.ts +++ b/packages/vite/src/vite-node.ts @@ -58,7 +58,7 @@ function createViteNodeMiddleware (ctx: ViteBuildContext) { const node: ViteNodeServer = new ViteNodeServer(ctx.ssrServer, { deps: { inline: [ - /\/nuxt3\//, + /\/(nuxt|nuxt3)\//, /^#/, ...ctx.nuxt.options.build.transpile as string[] ] diff --git a/packages/webpack/src/configs/server.ts b/packages/webpack/src/configs/server.ts index 582c803e96..f84e031be8 100644 --- a/packages/webpack/src/configs/server.ts +++ b/packages/webpack/src/configs/server.ts @@ -40,6 +40,7 @@ function serverStandalone (ctx: WebpackConfigContext) { const inline = [ 'src/', '#app', + 'nuxt', 'nuxt3', '!', '-!', diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts index a3e4d68096..8b0aa104ad 100644 --- a/playground/nuxt.config.ts +++ b/playground/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({ }) diff --git a/playground/package.json b/playground/package.json index d6e042fc39..d802542abe 100644 --- a/playground/package.json +++ b/playground/package.json @@ -2,7 +2,7 @@ "name": "nuxt-playground", "private": true, "devDependencies": { - "nuxt3": "latest" + "nuxt": "npm:nuxt3@latest" }, "scripts": { "dev": "nuxi dev", diff --git a/scripts/bump-edge.ts b/scripts/bump-edge.ts index b461161ae6..e92e3c9571 100644 --- a/scripts/bump-edge.ts +++ b/scripts/bump-edge.ts @@ -95,9 +95,8 @@ async function main () { for (const pkg of workspace.packages.filter(p => !p.data.private)) { workspace.setVersion(pkg.data.name, `${pkg.data.version}-${date}.${commit}`) - if (pkg.data.name !== 'nuxt3' /* TODO: Hardcoded! */) { - workspace.rename(pkg.data.name, pkg.data.name + '-edge') - } + const newname = pkg.data.name === 'nuxt' ? 'nuxt3' : (pkg.data.name + '-edge') + workspace.rename(pkg.data.name, newname) } await workspace.save() diff --git a/scripts/nu b/scripts/nu deleted file mode 100755 index 0fbc847853..0000000000 --- a/scripts/nu +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env node -require('../packages/nuxi/bin/nuxi') diff --git a/test/fixtures/basic/extends/bar/nuxt.config.ts b/test/fixtures/basic/extends/bar/nuxt.config.ts index 9c8174d1a0..2221b92fc9 100644 --- a/test/fixtures/basic/extends/bar/nuxt.config.ts +++ b/test/fixtures/basic/extends/bar/nuxt.config.ts @@ -1,3 +1,3 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({}) diff --git a/test/fixtures/basic/extends/foo/nuxt.config.ts b/test/fixtures/basic/extends/foo/nuxt.config.ts index 9c8174d1a0..2221b92fc9 100644 --- a/test/fixtures/basic/extends/foo/nuxt.config.ts +++ b/test/fixtures/basic/extends/foo/nuxt.config.ts @@ -1,3 +1,3 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' export default defineNuxtConfig({}) diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts index b2eed60cc2..83e2fbf0d5 100644 --- a/test/fixtures/basic/nuxt.config.ts +++ b/test/fixtures/basic/nuxt.config.ts @@ -1,4 +1,4 @@ -import { defineNuxtConfig } from 'nuxt3' +import { defineNuxtConfig } from 'nuxt' import { addComponent } from '@nuxt/kit' export default defineNuxtConfig({ diff --git a/test/fixtures/basic/types.ts b/test/fixtures/basic/types.ts index 0cf64ae8cc..35d73a2f3b 100644 --- a/test/fixtures/basic/types.ts +++ b/test/fixtures/basic/types.ts @@ -3,7 +3,7 @@ import { describe, it } from 'vitest' import type { Ref } from 'vue' import { NavigationFailure, RouteLocationNormalizedLoaded, RouteLocationRaw, useRouter as vueUseRouter } from 'vue-router' -import { defineNuxtConfig } from '~~/../../../packages/nuxt3/src' +import { defineNuxtConfig } from '~~/../../../packages/nuxt/src' import { useRouter } from '#imports' import { isVue3 } from '#app' diff --git a/tsconfig.json b/tsconfig.json index 90ca56853b..6b9af49789 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,10 +15,10 @@ ], "paths": { "#app": [ - "./packages/nuxt3/src/app/index" + "./packages/nuxt/src/app/index" ], "#app/*": [ - "./packages/nuxt3/src/app/*" + "./packages/nuxt/src/app/*" ] } }, diff --git a/vitest.config.ts b/vitest.config.ts index 5c8d9473b0..77c147dbb3 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -4,7 +4,7 @@ import { isWindows } from 'std-env' export default defineConfig({ alias: { - '#app': resolve('./packages/nuxt3/src/app/index.ts'), + '#app': resolve('./packages/nuxt/src/app/index.ts'), '@nuxt/test-utils': resolve('./packages/test-utils/src/index.ts') }, esbuild: { diff --git a/yarn.lock b/yarn.lock index 847e743451..ef6528a967 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6408,7 +6408,7 @@ __metadata: resolution: "example-components@workspace:examples/auto-imports/components" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6417,7 +6417,7 @@ __metadata: resolution: "example-composables@workspace:examples/auto-imports/composables" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6426,7 +6426,7 @@ __metadata: resolution: "example-config-extends@workspace:examples/advanced/config-extends" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6435,7 +6435,7 @@ __metadata: resolution: "example-error-handling@workspace:examples/app/error-handling" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6443,7 +6443,7 @@ __metadata: version: 0.0.0-use.local resolution: "example-hello-world@workspace:examples/essentials/hello-world" dependencies: - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6452,7 +6452,7 @@ __metadata: resolution: "example-layouts@workspace:examples/routing/layouts" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6461,7 +6461,7 @@ __metadata: resolution: "example-locale@workspace:examples/other/locale" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6470,7 +6470,7 @@ __metadata: resolution: "example-middleware@workspace:examples/routing/middleware" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6479,7 +6479,7 @@ __metadata: resolution: "example-module-extend-pages@workspace:examples/advanced/module-extend-pages" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6488,7 +6488,7 @@ __metadata: resolution: "example-nuxt-link@workspace:examples/routing/nuxt-link" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6497,7 +6497,7 @@ __metadata: resolution: "example-pages@workspace:examples/routing/pages" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6506,7 +6506,7 @@ __metadata: resolution: "example-plugins@workspace:examples/app/plugins" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6515,7 +6515,7 @@ __metadata: resolution: "example-reactivity-transform@workspace:examples/experimental/reactivity-transform" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6524,7 +6524,7 @@ __metadata: resolution: "example-server-routes@workspace:examples/server/routes" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6533,7 +6533,7 @@ __metadata: resolution: "example-teleport@workspace:examples/app/teleport" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6541,7 +6541,7 @@ __metadata: version: 0.0.0-use.local resolution: "example-testing@workspace:examples/advanced/testing" dependencies: - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6550,7 +6550,7 @@ __metadata: resolution: "example-universal-router@workspace:examples/routing/universal-router" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6559,7 +6559,7 @@ __metadata: resolution: "example-use-async-data@workspace:examples/composables/use-async-data" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6568,7 +6568,7 @@ __metadata: resolution: "example-use-cookie@workspace:examples/composables/use-cookie" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6577,7 +6577,7 @@ __metadata: resolution: "example-use-fetch@workspace:examples/composables/use-fetch" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6586,7 +6586,7 @@ __metadata: resolution: "example-use-head@workspace:examples/composables/use-head" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6595,7 +6595,7 @@ __metadata: resolution: "example-use-state@workspace:examples/composables/use-state" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6604,7 +6604,7 @@ __metadata: resolution: "example-vite-node@workspace:examples/experimental/vite-node" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -6613,7 +6613,7 @@ __metadata: resolution: "example-wasm@workspace:examples/experimental/wasm" dependencies: "@nuxt/ui": ^0.1.0 - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft @@ -10274,13 +10274,13 @@ __metadata: version: 0.0.0-use.local resolution: "nuxt-playground@workspace:playground" dependencies: - nuxt3: latest + nuxt: "npm:nuxt3@latest" languageName: unknown linkType: soft -"nuxt3@workspace:./packages/nuxt3, nuxt3@workspace:packages/nuxt3": +"nuxt@workspace:./packages/nuxt, nuxt@workspace:packages/nuxt": version: 0.0.0-use.local - resolution: "nuxt3@workspace:packages/nuxt3" + resolution: "nuxt@workspace:packages/nuxt" dependencies: "@nuxt/kit": 3.0.0 "@nuxt/schema": 3.0.0