diff --git a/package.json b/package.json index 523eb21628..f2821a0f0d 100644 --- a/package.json +++ b/package.json @@ -44,31 +44,31 @@ }, "devDependencies": { "@actions/core": "^1.10.0", - "@nuxt/kit": "workspace:*", - "@nuxt/schema": "workspace:*", "@nuxt/test-utils": "workspace:*", - "@nuxt/vite-builder": "workspace:*", "@nuxt/webpack-builder": "workspace:*", "@nuxtjs/eslint-config-typescript": "^12.0.0", "@types/crawler": "^1.2.2", "@types/node": "^18.15.11", - "@types/rimraf": "^3.0.2", "@types/semver": "^7.3.13", - "@unocss/reset": "^0.51.4", "case-police": "^0.5.14", "changelogen": "^0.5.3", "crawler": "^1.4.0", + "devalue": "^4.3.0", "eslint": "^8.38.0", + "eslint-import-resolver-typescript": "^3.5.5", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsdoc": "^41.1.2", "execa": "^7.1.1", - "expect-type": "^0.15.0", + "fs-extra": "^11.1.1", "globby": "^13.1.4", + "h3": "^1.6.4", "jiti": "^1.18.2", "markdownlint-cli": "^0.33.0", "nuxi": "workspace:*", "nuxt": "workspace:*", "ofetch": "^1.0.1", "pathe": "^1.1.0", + "playwright": "^1.32.3", "rimraf": "^5.0.0", "semver": "^7.5.0", "std-env": "^3.3.2", @@ -77,6 +77,8 @@ "unbuild": "^1.2.1", "vite": "^4.2.2", "vitest": "^0.30.1", + "vue": "3.2.47", + "vue-eslint-parser": "^9.1.1", "vue-tsc": "^1.2.0" }, "packageManager": "pnpm@8.3.0", diff --git a/packages/kit/package.json b/packages/kit/package.json index 647cc1b6a9..0fe02c9d33 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -40,9 +40,14 @@ "untyped": "^1.3.2" }, "devDependencies": { + "@types/hash-sum": "^1.0.0", "@types/lodash.template": "^4.5.1", "@types/semver": "^7.3.13", - "unbuild": "latest" + "nitropack": "^2.3.3", + "unbuild": "latest", + "vite": "^4.2.1", + "vitest": "^0.30.1", + "webpack": "^5.79.0" }, "engines": { "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" diff --git a/packages/nuxi/package.json b/packages/nuxi/package.json index b5d8175303..bd2e0a78db 100644 --- a/packages/nuxi/package.json +++ b/packages/nuxi/package.json @@ -31,6 +31,7 @@ "colorette": "^2.0.20", "consola": "^3.1.0", "deep-object-diff": "^1.1.9", + "defu": "^6.1.2", "destr": "^1.2.2", "execa": "^7.1.1", "flat": "^5.0.2", @@ -40,11 +41,13 @@ "listhen": "^1.0.4", "mlly": "^1.2.0", "mri": "^1.2.0", + "ohash": "^1.0.0", "pathe": "^1.1.0", "perfect-debounce": "^0.1.3", "pkg-types": "^1.0.2", "scule": "^1.0.0", "semver": "^7.5.0", + "ufo": "^1.1.1", "unbuild": "latest" }, "optionalDependencies": { diff --git a/packages/nuxt/build.config.ts b/packages/nuxt/build.config.ts index 40bdd582a0..dfaf1d97a0 100644 --- a/packages/nuxt/build.config.ts +++ b/packages/nuxt/build.config.ts @@ -29,7 +29,6 @@ export default defineBuildConfig({ externals: [ 'nuxt', 'nuxt/schema', - '@vue/reactivity', '@vue/shared', '@unhead/vue' ] diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 45c13547d1..d9d2b8145b 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -37,10 +37,6 @@ "#app": { "types": "./dist/app/index.d.ts", "import": "./dist/app/index.js" - }, - "#pages": { - "types": "./dist/pages/runtime/index.d.ts", - "import": "./dist/pages/runtime/index.js" } }, "files": [ @@ -64,7 +60,6 @@ "@nuxt/vite-builder": "workspace:../vite", "@unhead/ssr": "^1.1.26", "@unhead/vue": "^1.1.26", - "@vue/reactivity": "^3.2.47", "@vue/shared": "^3.2.47", "chokidar": "^3.5.3", "cookie-es": "^0.5.0", @@ -76,7 +71,6 @@ "fs-extra": "^11.1.1", "globby": "^13.1.4", "h3": "^1.6.4", - "hash-sum": "^2.0.0", "hookable": "^5.5.3", "jiti": "^1.18.2", "knitwork": "^1.0.0", @@ -105,10 +99,14 @@ "vue-router": "^4.1.6" }, "devDependencies": { + "@types/estree": "^1.0.0", "@types/fs-extra": "^11.0.1", - "@types/hash-sum": "^1.0.0", "@types/prompts": "^2.4.4", - "unbuild": "latest" + "@vitejs/plugin-vue": "^4.1.0", + "acorn": "^8.8.2", + "unbuild": "latest", + "vite": "^4.2.1", + "vitest": "^0.30.1" }, "peerDependencies": { "@types/node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" diff --git a/packages/schema/package.json b/packages/schema/package.json index d457840fbc..2be2511b1b 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -21,26 +21,26 @@ "prepack": "unbuild" }, "devDependencies": { - "@types/lodash.template": "^4.5.1", - "@types/semver": "^7.3.13", "@unhead/schema": "^1.1.26", "@vitejs/plugin-vue": "^4.1.0", "@vitejs/plugin-vue-jsx": "^3.0.1", + "h3": "^1.6.4", + "ignore": "^5.2.4", "nitropack": "^2.3.3", "unbuild": "latest", "unctx": "^2.3.0", - "vite": "~4.2.2" + "vite": "~4.2.2", + "vue": "3.2.47", + "vue-bundle-renderer": "^1.0.3", + "vue-router": "^4.1.6", + "webpack": "^5.79.0" }, "dependencies": { - "c12": "^1.3.0", - "create-require": "^1.1.1", "defu": "^6.1.2", "hookable": "^5.5.3", - "jiti": "^1.18.2", "pathe": "^1.1.0", "pkg-types": "^1.0.2", "postcss-import-resolver": "^2.0.0", - "scule": "^1.0.0", "std-env": "^3.3.2", "ufo": "^1.1.1", "unimport": "^3.0.6", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index b3858e5db7..0627d8a8fc 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -28,7 +28,6 @@ "defu": "^6.1.2", "execa": "^7.1.1", "get-port-please": "^3.0.1", - "jiti": "^1.18.2", "ofetch": "^1.0.1", "pathe": "^1.1.0", "ufo": "^1.1.1" diff --git a/packages/test-utils/src/setup/jest.ts b/packages/test-utils/src/setup/jest.ts index 3402e80d1b..32870b7635 100644 --- a/packages/test-utils/src/setup/jest.ts +++ b/packages/test-utils/src/setup/jest.ts @@ -1,7 +1,7 @@ import type { TestHooks } from '../types' export default async function setupJest (hooks: TestHooks) { - // @ts-expect-error jest is not a dependency + // @ts-expect-error TODO: jest is not a dependency const jest = await import('jest') hooks.ctx.mockFn = jest.fn diff --git a/packages/vite/package.json b/packages/vite/package.json index 0bdcfb3f02..21b5d624cc 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -19,6 +19,7 @@ }, "devDependencies": { "@nuxt/schema": "workspace:../schema", + "@types/estree": "^1.0.0", "unbuild": "latest", "vue": "3.2.47" }, @@ -28,7 +29,6 @@ "@vitejs/plugin-vue": "^4.1.0", "@vitejs/plugin-vue-jsx": "^3.0.1", "autoprefixer": "^10.4.14", - "chokidar": "^3.5.3", "clear": "^0.1.0", "cssnano": "^6.0.0", "defu": "^6.1.2", diff --git a/packages/vite/src/utils/logger.ts b/packages/vite/src/utils/logger.ts index 7b25658b2a..600e4ce163 100644 --- a/packages/vite/src/utils/logger.ts +++ b/packages/vite/src/utils/logger.ts @@ -2,7 +2,7 @@ import type * as vite from 'vite' import { logger } from '@nuxt/kit' import { hasTTY, isCI } from 'std-env' import clear from 'clear' -import type { NuxtOptions } from 'nuxt/schema' +import type { NuxtOptions } from '@nuxt/schema' let duplicateCount = 0 let lastType: vite.LogType | null = null diff --git a/packages/webpack/build.config.ts b/packages/webpack/build.config.ts index c6e6021e26..4068746abe 100644 --- a/packages/webpack/build.config.ts +++ b/packages/webpack/build.config.ts @@ -14,12 +14,10 @@ export default defineBuildConfig({ 'vue-loader', 'css-loader', 'file-loader', - 'style-resources-loader', 'url-loader', 'vue' ], externals: [ - '@nuxt/schema', - 'h3' + '@nuxt/schema' ] }) diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 852a094ca6..d2aa37cdea 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -19,7 +19,6 @@ "prepack": "unbuild" }, "dependencies": { - "@babel/core": "^7.21.4", "@nuxt/friendly-errors-webpack-plugin": "^2.5.2", "@nuxt/kit": "workspace:../kit", "autoprefixer": "^10.4.14", @@ -32,6 +31,7 @@ "file-loader": "^6.2.0", "fork-ts-checker-webpack-plugin": "^8.0.0", "fs-extra": "^11.1.1", + "h3": "^1.6.4", "hash-sum": "^2.0.0", "lodash-es": "^4.17.21", "magic-string": "^0.30.0", @@ -45,7 +45,6 @@ "postcss-import": "^15.1.0", "postcss-loader": "^7.2.4", "postcss-url": "^10.1.3", - "style-resources-loader": "^1.5.0", "time-fix-plugin": "^2.0.7", "ufo": "^1.1.1", "unplugin": "^1.3.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f924e9dd4e..1ad24773d0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,18 +21,9 @@ importers: '@actions/core': specifier: ^1.10.0 version: 1.10.0 - '@nuxt/kit': - specifier: workspace:* - version: link:packages/kit - '@nuxt/schema': - specifier: workspace:* - version: link:packages/schema '@nuxt/test-utils': specifier: workspace:* version: link:packages/test-utils - '@nuxt/vite-builder': - specifier: workspace:* - version: link:packages/vite '@nuxt/webpack-builder': specifier: workspace:* version: link:packages/webpack @@ -45,15 +36,9 @@ importers: '@types/node': specifier: ^18.15.11 version: 18.15.11 - '@types/rimraf': - specifier: ^3.0.2 - version: 3.0.2 '@types/semver': specifier: ^7.3.13 version: 7.3.13 - '@unocss/reset': - specifier: ^0.51.4 - version: 0.51.4 case-police: specifier: ^0.5.14 version: 0.5.14 @@ -63,21 +48,33 @@ importers: crawler: specifier: ^1.4.0 version: 1.4.0 + devalue: + specifier: ^4.3.0 + version: 4.3.0 eslint: specifier: ^8.38.0 version: 8.38.0 + eslint-import-resolver-typescript: + specifier: ^3.5.5 + version: 3.5.5(@typescript-eslint/parser@5.54.1)(eslint-plugin-import@2.27.5)(eslint@8.38.0) + eslint-plugin-import: + specifier: ^2.27.5 + version: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) eslint-plugin-jsdoc: specifier: ^41.1.2 version: 41.1.2(eslint@8.38.0) execa: specifier: ^7.1.1 version: 7.1.1 - expect-type: - specifier: ^0.15.0 - version: 0.15.0 + fs-extra: + specifier: ^11.1.1 + version: 11.1.1 globby: specifier: ^13.1.4 version: 13.1.4 + h3: + specifier: ^1.6.4 + version: 1.6.4 jiti: specifier: ^1.18.2 version: 1.18.2 @@ -96,6 +93,9 @@ importers: pathe: specifier: ^1.1.0 version: 1.1.0 + playwright: + specifier: ^1.32.3 + version: 1.32.3 rimraf: specifier: ^5.0.0 version: 5.0.0 @@ -120,6 +120,12 @@ importers: vitest: specifier: ^0.30.1 version: 0.30.1(playwright@1.32.3) + vue: + specifier: 3.2.47 + version: 3.2.47 + vue-eslint-parser: + specifier: ^9.1.1 + version: 9.1.1(eslint@8.38.0) vue-tsc: specifier: ^1.2.0 version: 1.2.0(typescript@5.0.4) @@ -415,15 +421,30 @@ importers: specifier: ^1.3.2 version: 1.3.2 devDependencies: + '@types/hash-sum': + specifier: ^1.0.0 + version: 1.0.0 '@types/lodash.template': specifier: ^4.5.1 version: 4.5.1 '@types/semver': specifier: ^7.3.13 version: 7.3.13 + nitropack: + specifier: ^2.3.3 + version: 2.3.3 unbuild: specifier: ^1.2.0 version: 1.2.0 + vite: + specifier: ^4.2.1 + version: 4.2.1(@types/node@18.15.11) + vitest: + specifier: ^0.30.1 + version: 0.30.1(playwright@1.32.3) + webpack: + specifier: ^5.79.0 + version: 5.79.0 packages/nuxi: optionalDependencies: @@ -470,6 +491,9 @@ importers: deep-object-diff: specifier: ^1.1.9 version: 1.1.9 + defu: + specifier: ^6.1.2 + version: 6.1.2 destr: specifier: ^1.2.2 version: 1.2.2 @@ -497,6 +521,9 @@ importers: mri: specifier: ^1.2.0 version: 1.2.0 + ohash: + specifier: ^1.0.0 + version: 1.0.0 pathe: specifier: ^1.1.0 version: 1.1.0 @@ -512,6 +539,9 @@ importers: semver: specifier: ^7.5.0 version: 7.5.0 + ufo: + specifier: ^1.1.1 + version: 1.1.1 unbuild: specifier: ^1.2.0 version: 1.2.0 @@ -545,9 +575,6 @@ importers: '@unhead/vue': specifier: ^1.1.26 version: 1.1.26(vue@3.2.47) - '@vue/reactivity': - specifier: ^3.2.47 - version: 3.2.47 '@vue/shared': specifier: ^3.2.47 version: 3.2.47 @@ -581,9 +608,6 @@ importers: h3: specifier: ^1.6.4 version: 1.6.4 - hash-sum: - specifier: ^2.0.0 - version: 2.0.0 hookable: specifier: ^5.5.3 version: 5.5.3 @@ -663,36 +687,39 @@ importers: specifier: ^4.1.6 version: 4.1.6(vue@3.2.47) devDependencies: + '@types/estree': + specifier: ^1.0.0 + version: 1.0.0 '@types/fs-extra': specifier: ^11.0.1 version: 11.0.1 - '@types/hash-sum': - specifier: ^1.0.0 - version: 1.0.0 '@types/prompts': specifier: ^2.4.4 version: 2.4.4 + '@vitejs/plugin-vue': + specifier: ^4.1.0 + version: 4.1.0(vite@4.2.1)(vue@3.2.47) + acorn: + specifier: ^8.8.2 + version: 8.8.2 unbuild: specifier: ^1.2.0 version: 1.2.0 + vite: + specifier: ^4.2.1 + version: 4.2.1(@types/node@18.15.11) + vitest: + specifier: ^0.30.1 + version: 0.30.1(playwright@1.32.3) packages/schema: dependencies: - c12: - specifier: ^1.3.0 - version: 1.3.0 - create-require: - specifier: ^1.1.1 - version: 1.1.1 defu: specifier: ^6.1.2 version: 6.1.2 hookable: specifier: ^5.5.3 version: 5.5.3 - jiti: - specifier: ^1.18.2 - version: 1.18.2 pathe: specifier: ^1.1.0 version: 1.1.0 @@ -702,9 +729,6 @@ importers: postcss-import-resolver: specifier: ^2.0.0 version: 2.0.0 - scule: - specifier: ^1.0.0 - version: 1.0.0 std-env: specifier: ^3.3.2 version: 3.3.2 @@ -718,12 +742,6 @@ importers: specifier: ^1.3.2 version: 1.3.2 devDependencies: - '@types/lodash.template': - specifier: ^4.5.1 - version: 4.5.1 - '@types/semver': - specifier: ^7.3.13 - version: 7.3.13 '@unhead/schema': specifier: ^1.1.26 version: 1.1.26 @@ -733,6 +751,12 @@ importers: '@vitejs/plugin-vue-jsx': specifier: ^3.0.1 version: 3.0.1(vite@4.2.1)(vue@3.2.47) + h3: + specifier: ^1.6.4 + version: 1.6.4 + ignore: + specifier: ^5.2.4 + version: 5.2.4 nitropack: specifier: ^2.3.3 version: 2.3.3 @@ -745,6 +769,18 @@ importers: vite: specifier: ^4.2.1 version: 4.2.1(@types/node@18.15.11) + vue: + specifier: 3.2.47 + version: 3.2.47 + vue-bundle-renderer: + specifier: ^1.0.3 + version: 1.0.3 + vue-router: + specifier: ^4.1.6 + version: 4.1.6(vue@3.2.47) + webpack: + specifier: ^5.79.0 + version: 5.79.0 packages/test-utils: dependencies: @@ -766,9 +802,6 @@ importers: get-port-please: specifier: ^3.0.1 version: 3.0.1 - jiti: - specifier: ^1.18.2 - version: 1.18.2 ofetch: specifier: ^1.0.1 version: 1.0.1 @@ -809,9 +842,6 @@ importers: autoprefixer: specifier: ^10.4.14 version: 10.4.14(postcss@8.4.22) - chokidar: - specifier: ^3.5.3 - version: 3.5.3 clear: specifier: ^0.1.0 version: 0.1.0 @@ -903,6 +933,9 @@ importers: '@nuxt/schema': specifier: workspace:* version: link:../schema + '@types/estree': + specifier: ^1.0.0 + version: 1.0.0 unbuild: specifier: ^1.2.0 version: 1.2.0 @@ -912,9 +945,6 @@ importers: packages/webpack: dependencies: - '@babel/core': - specifier: ^7.21.4 - version: 7.21.4 '@nuxt/friendly-errors-webpack-plugin': specifier: ^2.5.2 version: 2.5.2(webpack@5.79.0) @@ -951,6 +981,9 @@ importers: fs-extra: specifier: ^11.1.1 version: 11.1.1 + h3: + specifier: ^1.6.4 + version: 1.6.4 hash-sum: specifier: ^2.0.0 version: 2.0.0 @@ -990,9 +1023,6 @@ importers: postcss-url: specifier: ^10.1.3 version: 10.1.3(postcss@8.4.22) - style-resources-loader: - specifier: ^1.5.0 - version: 1.5.0(webpack@5.79.0) time-fix-plugin: specifier: ^2.0.7 version: 2.0.7(webpack@5.79.0) @@ -1866,27 +1896,28 @@ packages: peerDependencies: eslint: ^8.23.0 dependencies: - '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0) + '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) '@typescript-eslint/eslint-plugin': 5.54.1(@typescript-eslint/parser@5.54.1)(eslint@8.38.0)(typescript@5.0.4) '@typescript-eslint/parser': 5.54.1(eslint@8.38.0)(typescript@5.0.4) eslint: 8.38.0 - eslint-import-resolver-typescript: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.38.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0) + eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.54.1)(eslint-plugin-import@2.27.5)(eslint@8.38.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) eslint-plugin-vue: 9.9.0(eslint@8.38.0) transitivePeerDependencies: + - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - typescript dev: true - /@nuxtjs/eslint-config@12.0.0(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0): + /@nuxtjs/eslint-config@12.0.0(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0): resolution: {integrity: sha512-ewenelo75x0eYEUK+9EBXjc/OopQCvdkmYmlZuoHq5kub/vtiRpyZ/autppwokpHUq8tiVyl2ejMakoiHiDTrg==} peerDependencies: eslint: ^8.23.0 dependencies: eslint: 8.38.0 eslint-config-standard: 17.0.0(eslint-plugin-import@2.27.5)(eslint-plugin-n@15.6.1)(eslint-plugin-promise@6.1.1)(eslint@8.38.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) eslint-plugin-n: 15.6.1(eslint@8.38.0) eslint-plugin-node: 11.1.0(eslint@8.38.0) eslint-plugin-promise: 6.1.1(eslint@8.38.0) @@ -2142,13 +2173,6 @@ packages: '@types/node': 18.15.11 dev: true - /@types/glob@8.1.0: - resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==} - dependencies: - '@types/minimatch': 5.1.2 - '@types/node': 18.15.11 - dev: true - /@types/hash-sum@1.0.0: resolution: {integrity: sha512-FdLBT93h3kcZ586Aee66HPCVJ6qvxVjBlDWNmxSGSbCZe9hTsjRKdSsl4y1T+3zfujxo9auykQMnFsfyHWD7wg==} dev: true @@ -2198,10 +2222,6 @@ packages: resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==} dev: true - /@types/minimatch@5.1.2: - resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==} - dev: true - /@types/mri@1.1.1: resolution: {integrity: sha512-nJOuiTlsvmClSr3+a/trTSx4DTuY/VURsWGKSf/eeavh0LRMqdsK60ti0TlwM5iHiGOK3/Ibkxsbr7i9rzGreA==} dev: true @@ -2231,13 +2251,6 @@ packages: /@types/resolve@1.20.2: resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - /@types/rimraf@3.0.2: - resolution: {integrity: sha512-F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ==} - dependencies: - '@types/glob': 8.1.0 - '@types/node': 18.15.11 - dev: true - /@types/semver@7.3.13: resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==} dev: true @@ -2624,10 +2637,6 @@ packages: resolution: {integrity: sha512-m6+M3E2cTPhX+2aKocRfDqQt7ebEtjJHH8sVYpX8xJoN0vOqjSNmUYc6AIkwUYljx4QbEC3thcQSbqel82RbXQ==} dev: true - /@unocss/reset@0.51.4: - resolution: {integrity: sha512-3FnajZSOrQ4qSbpkY1IGRIFYw8I9E98SBXvjMnHqSl8k4YPbBP29W3YrgSVBMOnPNRL67hRcTaMF3nmbnBuWtQ==} - dev: true - /@unocss/scope@0.45.30: resolution: {integrity: sha512-SBxjMNLGHiZA32hGTGZL1wpPfzegCd3WB8LdrZwAgo85EbMYCq8UEL6YhScjL3+FIwhcZQutenasLoRNcbFHqw==} dev: true @@ -2865,7 +2874,6 @@ packages: /@vue/devtools-api@6.5.0: resolution: {integrity: sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==} - dev: false /@vue/reactivity-transform@3.2.47: resolution: {integrity: sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==} @@ -4240,7 +4248,6 @@ packages: /devalue@4.3.0: resolution: {integrity: sha512-n94yQo4LI3w7erwf84mhRUkUJfhLoCZiLyoOZ/QFsDbcWNZePrLwbQpvZBUG2TNxwV3VjCKPxkiiQA6pe3TrTA==} - dev: false /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} @@ -4769,7 +4776,7 @@ packages: eslint-plugin-promise: ^6.0.0 dependencies: eslint: 8.38.0 - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) eslint-plugin-n: 15.6.1(eslint@8.38.0) eslint-plugin-promise: 6.1.1(eslint@8.38.0) dev: true @@ -4784,8 +4791,8 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@3.5.3(eslint-plugin-import@2.27.5)(eslint@8.38.0): - resolution: {integrity: sha512-njRcKYBc3isE42LaTcJNVANR3R99H9bAxBDMNDr2W7yq5gYPxbU3MkdhsQukxZ/Xg9C2vcyLlDsbKfRDg0QvCQ==} + /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.54.1)(eslint-plugin-import@2.27.5)(eslint@8.38.0): + resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -4794,17 +4801,21 @@ packages: debug: 4.3.4 enhanced-resolve: 5.12.0 eslint: 8.38.0 - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0) - get-tsconfig: 4.4.0 + eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) + get-tsconfig: 4.5.0 globby: 13.1.4 is-core-module: 2.11.0 is-glob: 4.0.3 synckit: 0.8.5 transitivePeerDependencies: + - '@typescript-eslint/parser' + - eslint-import-resolver-node + - eslint-import-resolver-webpack - supports-color dev: true - /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0): + /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0): resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==} engines: {node: '>=4'} peerDependencies: @@ -4829,7 +4840,7 @@ packages: debug: 3.2.7 eslint: 8.38.0 eslint-import-resolver-node: 0.3.7 - eslint-import-resolver-typescript: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.38.0) + eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.54.1)(eslint-plugin-import@2.27.5)(eslint@8.38.0) transitivePeerDependencies: - supports-color dev: true @@ -4856,7 +4867,7 @@ packages: regexpp: 3.2.0 dev: true - /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0): + /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0): resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} engines: {node: '>=4'} peerDependencies: @@ -4874,7 +4885,7 @@ packages: doctrine: 2.1.0 eslint: 8.38.0 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.3)(eslint@8.38.0) + eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.54.1)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.38.0) has: 1.0.3 is-core-module: 2.11.0 is-glob: 4.0.3 @@ -4984,7 +4995,7 @@ packages: nth-check: 2.1.1 postcss-selector-parser: 6.0.11 semver: 7.5.0 - vue-eslint-parser: 9.1.0(eslint@8.38.0) + vue-eslint-parser: 9.1.1(eslint@8.38.0) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -5162,10 +5173,6 @@ packages: signal-exit: 3.0.7 strip-final-newline: 3.0.0 - /expect-type@0.15.0: - resolution: {integrity: sha512-yWnriYB4e8G54M5/fAFj7rCIBiKs1HAACaY13kCz6Ku0dezjS9aMcfcdVK2X8Tv2tEV1BPz/wKfQ7WA4S/d8aA==} - dev: true - /extend@3.0.2: resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==} dev: true @@ -5477,6 +5484,11 @@ packages: /get-tsconfig@4.4.0: resolution: {integrity: sha512-0Gdjo/9+FzsYhXCEFueo2aY1z1tpXrxWZzP7k8ul9qt1U5o8rYJwTJYmaeHdrVosYIVYkOy2iwCJ9FdpocJhPQ==} + dev: false + + /get-tsconfig@4.5.0: + resolution: {integrity: sha512-MjhiaIWCJ1sAU4pIQ5i5OfOuHHxVo1oYeNsWTON7jxYkod8pHocXeh+SSbmu5OZZZK73B6cbJ2XADzXehLyovQ==} + dev: true /getpass@0.1.7: resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} @@ -7965,15 +7977,6 @@ packages: /safer-buffer@2.1.2: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} - /schema-utils@2.7.1: - resolution: {integrity: sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==} - engines: {node: '>= 8.9.0'} - dependencies: - '@types/json-schema': 7.0.11 - ajv: 6.12.6 - ajv-keywords: 3.5.2(ajv@6.12.6) - dev: false - /schema-utils@3.1.1: resolution: {integrity: sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==} engines: {node: '>= 10.13.0'} @@ -8300,19 +8303,6 @@ packages: dependencies: acorn: 8.8.2 - /style-resources-loader@1.5.0(webpack@5.79.0): - resolution: {integrity: sha512-fIfyvQ+uvXaCBGGAgfh+9v46ARQB1AWdaop2RpQw0PBVuROsTBqGvx8dj0kxwjGOAyq3vepe4AOK3M6+Q/q2jw==} - engines: {node: '>=8.9'} - peerDependencies: - webpack: ^3.0.0 || ^4.0.0 || ^5.0.0 - dependencies: - glob: 7.2.3 - loader-utils: 2.0.4 - schema-utils: 2.7.1 - tslib: 2.5.0 - webpack: 5.79.0 - dev: false - /stylehacks@6.0.0(postcss@8.4.22): resolution: {integrity: sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==} engines: {node: ^14 || ^16 || >=18.0} @@ -9205,7 +9195,6 @@ packages: resolution: {integrity: sha512-EfjX+5TTUl70bki9hPuVp+54JiZOvFIfoWBcfXsSwLzKEiDYyHNi5iX8srnqLIv3YRnvxgbntdcG1WPq0MvffQ==} dependencies: ufo: 1.1.1 - dev: false /vue-demi@0.13.11(vue@3.2.47): resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==} @@ -9226,8 +9215,8 @@ packages: resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==} dev: false - /vue-eslint-parser@9.1.0(eslint@8.38.0): - resolution: {integrity: sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ==} + /vue-eslint-parser@9.1.1(eslint@8.38.0): + resolution: {integrity: sha512-C2aI/r85Q6tYcz4dpgvrs4wH/MqVrRAVIdpYedrxnATDHHkb+TroeRcDpKWGZCx/OcECMWfz7tVwQ8e+Opy6rA==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' @@ -9270,7 +9259,6 @@ packages: dependencies: '@vue/devtools-api': 6.5.0 vue: 3.2.47 - dev: false /vue-template-compiler@2.7.14: resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==} diff --git a/test/fixtures/basic/extends/bar/app/router.options.ts b/test/fixtures/basic/extends/bar/app/router.options.ts index ea8b48b182..51deb4e6e1 100644 --- a/test/fixtures/basic/extends/bar/app/router.options.ts +++ b/test/fixtures/basic/extends/bar/app/router.options.ts @@ -1,5 +1,5 @@ -import type { RouterOptions } from '@nuxt/schema' +import type { RouterOptions } from 'nuxt/schema' -export default { +export default { linkExactActiveClass: 'bar-exact-active-class' } diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts index 532255b0e4..6d2ab1d996 100644 --- a/test/fixtures/basic/nuxt.config.ts +++ b/test/fixtures/basic/nuxt.config.ts @@ -1,5 +1,5 @@ -import { addComponent, addVitePlugin, addWebpackPlugin } from '@nuxt/kit' -import type { NuxtPage } from '@nuxt/schema' +import { addComponent, addVitePlugin, addWebpackPlugin } from 'nuxt/kit' +import type { NuxtPage } from 'nuxt/schema' import { createUnplugin } from 'unplugin' import { withoutLeadingSlash } from 'ufo' diff --git a/test/fixtures/basic/package.json b/test/fixtures/basic/package.json index d4090519f1..353cf32447 100644 --- a/test/fixtures/basic/package.json +++ b/test/fixtures/basic/package.json @@ -5,6 +5,14 @@ "build": "nuxi build" }, "dependencies": { + "@nuxt/webpack-builder": "workspace:*", "nuxt": "workspace:*" + }, + "devDependencies": { + "ofetch": "^1.0.1", + "ufo": "^1.1.1", + "unplugin": "^1.3.1", + "vitest": "^0.30.1", + "vue-router": "^4.1.6" } } diff --git a/test/fixtures/basic/types.ts b/test/fixtures/basic/types.ts index b76f065b0d..15985c7496 100644 --- a/test/fixtures/basic/types.ts +++ b/test/fixtures/basic/types.ts @@ -1,10 +1,9 @@ -import { expectTypeOf } from 'expect-type' -import { describe, it } from 'vitest' +import { describe, expectTypeOf, it } from 'vitest' import type { Ref } from 'vue' -import type { AppConfig, RuntimeValue } from '@nuxt/schema' import type { FetchError } from 'ofetch' import type { NavigationFailure, RouteLocationNormalizedLoaded, RouteLocationRaw, Router, useRouter as vueUseRouter } from 'vue-router' +import type { AppConfig, RuntimeValue } from 'nuxt/schema' import { defineNuxtConfig } from 'nuxt/config' import { callWithNuxt, isVue3 } from '#app' import type { NavigateToOptions } from '#app/composables/router'