From df2bc8a72e444bf90e906e2efad5d53d1a4bdb29 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 25 Aug 2023 16:39:27 +0100 Subject: [PATCH 01/13] build: skip releasing `nuxi` --- scripts/release-edge.sh | 3 +++ scripts/release-rc.sh | 3 +++ scripts/release.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/scripts/release-edge.sh b/scripts/release-edge.sh index a419169524..88bdde3218 100755 --- a/scripts/release-edge.sh +++ b/scripts/release-edge.sh @@ -20,6 +20,9 @@ fi # Release packages for p in packages/* ; do + if [[ $p == "packages/nuxi" ]] ; then + continue + fi pushd $p echo "Publishing $p" cp ../../LICENSE . diff --git a/scripts/release-rc.sh b/scripts/release-rc.sh index d362b2a4b1..3fefacc757 100755 --- a/scripts/release-rc.sh +++ b/scripts/release-rc.sh @@ -10,6 +10,9 @@ pnpm build # Release packages for PKG in packages/* ; do + if [[ $p == "packages/nuxi" ]] ; then + continue + fi pushd $PKG TAG="latest" if [ "$PKG" == "packages/nuxt" ]; then diff --git a/scripts/release.sh b/scripts/release.sh index 47e082fe5e..eefc2c9178 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -10,6 +10,9 @@ pnpm build # Release packages for PKG in packages/* ; do + if [[ $p == "packages/nuxi" ]] ; then + continue + fi pushd $PKG TAG="latest" echo "⚡ Publishing $PKG with tag $TAG" From 0094b569c713f3cfc9b49b07e1af5733dc45da99 Mon Sep 17 00:00:00 2001 From: pooya parsa Date: Fri, 25 Aug 2023 18:19:22 +0200 Subject: [PATCH 02/13] feat(schema): export `./schema/config.schema.json` subpath (#22813) --- packages/schema/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/schema/package.json b/packages/schema/package.json index ef7d5d3955..8dab752194 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -16,6 +16,7 @@ "types": "./dist/builder-env.d.ts", "import": "./dist/builder-env.mjs" }, + "./schema/config.schema.json": "./schema/config.schema.json", "./package.json": "./package.json" }, "files": [ From 536a4aa24927d3087e338f87403434b0fa39498e Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Fri, 25 Aug 2023 23:16:43 +0100 Subject: [PATCH 03/13] chore: update `nuxi` to v3.7.0 --- package.json | 2 +- packages/nuxt/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 1b1f2101f0..1cc211f14a 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "jiti": "1.19.3", "markdownlint-cli": "^0.33.0", "nitropack": "2.6.0", - "nuxi": "npm:nuxi-ng@0.3.0-1692970235.c259efa", + "nuxi": "3.7.0", "nuxt": "workspace:*", "nuxt-vitest": "0.10.2", "ofetch": "1.3.3", diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 3edd31a440..8aac6f5597 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -82,7 +82,7 @@ "magic-string": "^0.30.3", "mlly": "^1.4.0", "nitropack": "^2.6.0", - "nuxi": "npm:nuxi-ng@0.3.0-1692970235.c259efa", + "nuxi": "^3.7.0", "nypm": "^0.3.1", "ofetch": "^1.3.3", "ohash": "^1.1.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e57430b2c9..36aa01e909 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -95,8 +95,8 @@ importers: specifier: 2.6.0 version: 2.6.0 nuxi: - specifier: npm:nuxi-ng@0.3.0-1692970235.c259efa - version: /nuxi-ng@0.3.0-1692970235.c259efa + specifier: 3.7.0 + version: 3.7.0 nuxt: specifier: workspace:* version: link:packages/nuxt @@ -336,8 +336,8 @@ importers: specifier: ^2.6.0 version: 2.6.0 nuxi: - specifier: npm:nuxi-ng@0.3.0-1692970235.c259efa - version: /nuxi-ng@0.3.0-1692970235.c259efa + specifier: ^3.7.0 + version: 3.7.0 nypm: specifier: ^0.3.1 version: 0.3.1 @@ -8163,8 +8163,8 @@ packages: dependencies: boolbase: 1.0.0 - /nuxi-ng@0.3.0-1692970235.c259efa: - resolution: {integrity: sha512-/yp+V+Vpype1fau39yktrkFu2UZ2jo5bSdvDB8lI3LEdYT7sF9zg+6HqP+0OAV4Vnmst6ATxwY+pZiK+ds5mig==} + /nuxi@3.7.0: + resolution: {integrity: sha512-FZEwNCGeEdE+CyKCoThZm+Lv+u4TnbClTyYvvby3a2joK5t8nc7upNiZ7hsd+xoOeNuZW7CZHsQp9szJm2ev9Q==} engines: {node: ^14.18.0 || >=16.10.0} hasBin: true optionalDependencies: From bf843636b9ad87eb139c201159bd211368dde234 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 25 Aug 2023 23:46:13 +0100 Subject: [PATCH 04/13] chore(deps): update all non-major dependencies (main) (#22819) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Roe --- package.json | 4 +- packages/kit/package.json | 4 +- packages/nuxt/package.json | 4 +- packages/schema/package.json | 2 +- packages/vite/package.json | 2 +- packages/webpack/package.json | 2 +- pnpm-lock.yaml | 272 +++++++++++++++++----------------- 7 files changed, 143 insertions(+), 147 deletions(-) diff --git a/package.json b/package.json index 1cc211f14a..0b210ee960 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "cheerio": "1.0.0-rc.12", "consola": "3.2.3", "devalue": "4.3.2", - "eslint": "8.47.0", + "eslint": "8.48.0", "eslint-plugin-import": "2.28.1", "eslint-plugin-jsdoc": "41.1.2", "eslint-plugin-no-only-tests": "3.1.0", @@ -63,7 +63,7 @@ "happy-dom": "10.11.0", "jiti": "1.19.3", "markdownlint-cli": "^0.33.0", - "nitropack": "2.6.0", + "nitropack": "2.6.1", "nuxi": "3.7.0", "nuxt": "workspace:*", "nuxt-vitest": "0.10.2", diff --git a/packages/kit/package.json b/packages/kit/package.json index 41bcaf5137..4105a26e0d 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -29,7 +29,7 @@ "ignore": "^5.2.4", "jiti": "^1.19.3", "knitwork": "^1.0.0", - "mlly": "^1.4.0", + "mlly": "^1.4.1", "pathe": "^1.1.1", "pkg-types": "^1.0.3", "scule": "^1.0.0", @@ -44,7 +44,7 @@ "@types/lodash-es": "4.17.8", "@types/semver": "7.5.0", "lodash-es": "4.17.21", - "nitropack": "2.6.0", + "nitropack": "2.6.1", "unbuild": "latest", "vite": "4.4.9", "vitest": "0.33.0", diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 8aac6f5597..114f08d08a 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -80,8 +80,8 @@ "klona": "^2.0.6", "knitwork": "^1.0.0", "magic-string": "^0.30.3", - "mlly": "^1.4.0", - "nitropack": "^2.6.0", + "mlly": "^1.4.1", + "nitropack": "^2.6.1", "nuxi": "^3.7.0", "nypm": "^0.3.1", "ofetch": "^1.3.3", diff --git a/packages/schema/package.json b/packages/schema/package.json index 8dab752194..c7119fa0c3 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -39,7 +39,7 @@ "esbuild-loader": "4.0.1", "h3": "1.8.0", "ignore": "5.2.4", - "nitropack": "2.6.0", + "nitropack": "2.6.1", "unbuild": "latest", "unctx": "2.3.1", "vite": "4.4.9", diff --git a/packages/vite/package.json b/packages/vite/package.json index de42a2e9c4..fd5dceebf3 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -44,7 +44,7 @@ "h3": "^1.8.0", "knitwork": "^1.0.0", "magic-string": "^0.30.3", - "mlly": "^1.4.0", + "mlly": "^1.4.1", "ohash": "^1.1.3", "pathe": "^1.1.1", "perfect-debounce": "^1.0.0", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 538f452a7b..d70db33cef 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -38,7 +38,7 @@ "magic-string": "^0.30.3", "memfs": "^4.2.1", "mini-css-extract-plugin": "^2.7.6", - "mlly": "^1.4.0", + "mlly": "^1.4.1", "ohash": "^1.1.3", "pathe": "^1.1.1", "pify": "^6.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 36aa01e909..75c019dfaa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,7 +30,7 @@ importers: version: link:packages/webpack '@nuxtjs/eslint-config-typescript': specifier: 12.0.0 - version: 12.0.0(eslint@8.47.0)(typescript@5.2.2) + version: 12.0.0(eslint@8.48.0)(typescript@5.2.2) '@types/fs-extra': specifier: 11.0.1 version: 11.0.1 @@ -59,14 +59,14 @@ importers: specifier: 4.3.2 version: 4.3.2 eslint: - specifier: 8.47.0 - version: 8.47.0 + specifier: 8.48.0 + version: 8.48.0 eslint-plugin-import: specifier: 2.28.1 - version: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) + version: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) eslint-plugin-jsdoc: specifier: 41.1.2 - version: 41.1.2(eslint@8.47.0) + version: 41.1.2(eslint@8.48.0) eslint-plugin-no-only-tests: specifier: 3.1.0 version: 3.1.0 @@ -92,8 +92,8 @@ importers: specifier: ^0.33.0 version: 0.33.0 nitropack: - specifier: 2.6.0 - version: 2.6.0 + specifier: 2.6.1 + version: 2.6.1 nuxi: specifier: 3.7.0 version: 3.7.0 @@ -141,7 +141,7 @@ importers: version: 3.3.4 vue-eslint-parser: specifier: 9.3.1 - version: 9.3.1(eslint@8.47.0) + version: 9.3.1(eslint@8.48.0) vue-router: specifier: 4.2.4 version: 4.2.4(vue@3.3.4) @@ -185,8 +185,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 mlly: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.1 + version: 1.4.1 pathe: specifier: ^1.1.1 version: 1.1.1 @@ -225,8 +225,8 @@ importers: specifier: 4.17.21 version: 4.17.21 nitropack: - specifier: 2.6.0 - version: 2.6.0 + specifier: 2.6.1 + version: 2.6.1 unbuild: specifier: latest version: 2.0.0(typescript@5.2.2) @@ -330,11 +330,11 @@ importers: specifier: ^0.30.3 version: 0.30.3 mlly: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.1 + version: 1.4.1 nitropack: - specifier: ^2.6.0 - version: 2.6.0 + specifier: ^2.6.1 + version: 2.6.1 nuxi: specifier: ^3.7.0 version: 3.7.0 @@ -500,8 +500,8 @@ importers: specifier: 5.2.4 version: 5.2.4 nitropack: - specifier: 2.6.0 - version: 2.6.0 + specifier: 2.6.1 + version: 2.6.1 unbuild: specifier: latest version: 2.0.0(typescript@5.2.2) @@ -633,8 +633,8 @@ importers: specifier: ^0.30.3 version: 0.30.3 mlly: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.1 + version: 1.4.1 ohash: specifier: ^1.1.3 version: 1.1.3 @@ -679,7 +679,7 @@ importers: version: 0.33.0(@types/node@18.17.11) vite-plugin-checker: specifier: ^0.6.2 - version: 0.6.2(eslint@8.47.0)(typescript@5.2.2)(vite@4.4.9)(vue-tsc@1.8.8) + version: 0.6.2(eslint@8.48.0)(typescript@5.2.2)(vite@4.4.9)(vue-tsc@1.8.8) vue-bundle-renderer: specifier: ^2.0.0 version: 2.0.0 @@ -763,8 +763,8 @@ importers: specifier: ^2.7.6 version: 2.7.6(webpack@5.88.2) mlly: - specifier: ^1.4.0 - version: 1.4.0 + specifier: ^1.4.1 + version: 1.4.1 ohash: specifier: ^1.1.3 version: 1.1.3 @@ -1922,13 +1922,13 @@ packages: requiresBuild: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.47.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.48.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.47.0 + eslint: 8.48.0 eslint-visitor-keys: 3.4.3 /@eslint-community/regexpp@4.6.2: @@ -1951,8 +1951,8 @@ packages: transitivePeerDependencies: - supports-color - /@eslint/js@8.47.0: - resolution: {integrity: sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==} + /@eslint/js@8.48.0: + resolution: {integrity: sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} /@humanwhocodes/config-array@0.11.10: @@ -2158,19 +2158,19 @@ packages: - encoding - supports-color - /@netlify/functions@2.0.1: - resolution: {integrity: sha512-YrgCmz078II0LKknXKj5NbtGBuzek1JC+ZYi4xHcLhZD+HIGlerlmkhnVydWVPoA7fdd2IeSUd9CFFL7bY+y5Q==} + /@netlify/functions@2.0.2: + resolution: {integrity: sha512-goWRtaIPUK/q47qLYtfGGj7HgJIRaT0snw7zZ0yeoNTfQfCRwQwvRrMAsXkCsCtq2N2Oo81L26SpkMxEQMk9hg==} engines: {node: '>=14.0.0'} dependencies: - '@netlify/serverless-functions-api': 1.7.1 + '@netlify/serverless-functions-api': 1.7.3 is-promise: 4.0.0 /@netlify/node-cookies@0.1.0: resolution: {integrity: sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==} engines: {node: ^14.16.0 || >=16.0.0} - /@netlify/serverless-functions-api@1.7.1: - resolution: {integrity: sha512-vF9g62n+BFfBXtWtmVBJ5debyMERVDtuLlMlKDPYBp6QjEuJnaggxczLlRofZ2mtsBXs7mAlna6gIcBswFLJJQ==} + /@netlify/serverless-functions-api@1.7.3: + resolution: {integrity: sha512-n6/7cJlSWvvbBlUOEAbkGyEld80S6KbG/ldQI9OhLfe1lTatgKmrTNIgqVNpaWpUdTgP2OHWFjmFBzkxxBWs5w==} engines: {node: ^14.18.0 || >=16.0.0} dependencies: '@netlify/node-cookies': 0.1.0 @@ -2404,18 +2404,18 @@ packages: pathe: 1.1.1 dev: true - /@nuxtjs/eslint-config-typescript@12.0.0(eslint@8.47.0)(typescript@5.2.2): + /@nuxtjs/eslint-config-typescript@12.0.0(eslint@8.48.0)(typescript@5.2.2): resolution: {integrity: sha512-HJR0ho5MYuOCFjkL+eMX/VXbUwy36J12DUMVy+dj3Qz1GYHwX92Saxap3urFzr8oPkzzFiuOknDivfCeRBWakg==} peerDependencies: eslint: ^8.23.0 dependencies: - '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.47.0)(typescript@5.2.2) - '@typescript-eslint/parser': 5.62.0(eslint@8.47.0)(typescript@5.2.2) - eslint: 8.47.0 - eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.28.1)(eslint@8.47.0) - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) - eslint-plugin-vue: 9.16.1(eslint@8.47.0) + '@nuxtjs/eslint-config': 12.0.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.2.2) + eslint: 8.48.0 + eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.28.1)(eslint@8.48.0) + eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) + eslint-plugin-vue: 9.16.1(eslint@8.48.0) transitivePeerDependencies: - eslint-import-resolver-node - eslint-import-resolver-webpack @@ -2423,19 +2423,19 @@ packages: - typescript dev: true - /@nuxtjs/eslint-config@12.0.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0): + /@nuxtjs/eslint-config@12.0.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0): resolution: {integrity: sha512-ewenelo75x0eYEUK+9EBXjc/OopQCvdkmYmlZuoHq5kub/vtiRpyZ/autppwokpHUq8tiVyl2ejMakoiHiDTrg==} peerDependencies: eslint: ^8.23.0 dependencies: - eslint: 8.47.0 - eslint-config-standard: 17.1.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.47.0) - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) - eslint-plugin-n: 15.7.0(eslint@8.47.0) - eslint-plugin-node: 11.1.0(eslint@8.47.0) - eslint-plugin-promise: 6.1.1(eslint@8.47.0) - eslint-plugin-unicorn: 44.0.2(eslint@8.47.0) - eslint-plugin-vue: 9.16.1(eslint@8.47.0) + eslint: 8.48.0 + eslint-config-standard: 17.1.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0) + eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) + eslint-plugin-n: 15.7.0(eslint@8.48.0) + eslint-plugin-node: 11.1.0(eslint@8.48.0) + eslint-plugin-promise: 6.1.1(eslint@8.48.0) + eslint-plugin-unicorn: 44.0.2(eslint@8.48.0) + eslint-plugin-vue: 9.16.1(eslint@8.48.0) local-pkg: 0.4.3 transitivePeerDependencies: - '@typescript-eslint/parser' @@ -2526,7 +2526,6 @@ packages: dependencies: is-glob: 4.0.3 micromatch: 4.0.5 - napi-wasm: 1.1.0 bundledDependencies: - napi-wasm @@ -3037,7 +3036,7 @@ packages: dependencies: '@types/yargs-parser': 21.0.0 - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.47.0)(typescript@5.2.2): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.48.0)(typescript@5.2.2): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3049,12 +3048,12 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.6.2 - '@typescript-eslint/parser': 5.62.0(eslint@8.47.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.2.2) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.47.0)(typescript@5.2.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.47.0)(typescript@5.2.2) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.48.0)(typescript@5.2.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.48.0)(typescript@5.2.2) debug: 4.3.4 - eslint: 8.47.0 + eslint: 8.48.0 graphemer: 1.4.0 ignore: 5.2.4 natural-compare-lite: 1.4.0 @@ -3065,7 +3064,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.47.0)(typescript@5.2.2): + /@typescript-eslint/parser@5.62.0(eslint@8.48.0)(typescript@5.2.2): resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3079,7 +3078,7 @@ packages: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) debug: 4.3.4 - eslint: 8.47.0 + eslint: 8.48.0 typescript: 5.2.2 transitivePeerDependencies: - supports-color @@ -3093,7 +3092,7 @@ packages: '@typescript-eslint/visitor-keys': 5.62.0 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.47.0)(typescript@5.2.2): + /@typescript-eslint/type-utils@5.62.0(eslint@8.48.0)(typescript@5.2.2): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3104,9 +3103,9 @@ packages: optional: true dependencies: '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.47.0)(typescript@5.2.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.48.0)(typescript@5.2.2) debug: 4.3.4 - eslint: 8.47.0 + eslint: 8.48.0 tsutils: 3.21.0(typescript@5.2.2) typescript: 5.2.2 transitivePeerDependencies: @@ -3139,19 +3138,19 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.47.0)(typescript@5.2.2): + /@typescript-eslint/utils@5.62.0(eslint@8.48.0)(typescript@5.2.2): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) '@types/json-schema': 7.0.12 '@types/semver': 7.5.0 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.2.2) - eslint: 8.47.0 + eslint: 8.48.0 eslint-scope: 5.1.1 semver: 7.5.4 transitivePeerDependencies: @@ -4228,7 +4227,7 @@ packages: dotenv: 16.3.1 giget: 1.1.2 jiti: 1.19.3 - mlly: 1.4.0 + mlly: 1.4.1 ohash: 1.1.3 pathe: 1.1.1 perfect-debounce: 1.0.0 @@ -4448,8 +4447,8 @@ packages: resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==} engines: {node: '>=8'} - /citty@0.1.2: - resolution: {integrity: sha512-Me9nf0/BEmMOnuQzMOVXgpzkMUNbd0Am8lTl/13p0aRGAoLGk5T5sdet/42CrIGmWdG67BgHUhcKK1my1ujUEg==} + /citty@0.1.3: + resolution: {integrity: sha512-tb6zTEb2BDSrzFedqFYFUKUuKNaxVJWCm7o02K4kADGkBDyyiz7D40rDMpguczdZyAN3aetd5fhpB01HkreNyg==} dependencies: consola: 3.2.3 @@ -5345,7 +5344,7 @@ packages: resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==} engines: {node: '>=12'} - /eslint-config-standard@17.1.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.47.0): + /eslint-config-standard@17.1.0(eslint-plugin-import@2.28.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.48.0): resolution: {integrity: sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==} engines: {node: '>=12.0.0'} peerDependencies: @@ -5354,10 +5353,10 @@ packages: eslint-plugin-n: '^15.0.0 || ^16.0.0 ' eslint-plugin-promise: ^6.0.0 dependencies: - eslint: 8.47.0 - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) - eslint-plugin-n: 15.7.0(eslint@8.47.0) - eslint-plugin-promise: 6.1.1(eslint@8.47.0) + eslint: 8.48.0 + eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) + eslint-plugin-n: 15.7.0(eslint@8.48.0) + eslint-plugin-promise: 6.1.1(eslint@8.48.0) dev: true /eslint-import-resolver-node@0.3.8: @@ -5370,7 +5369,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.28.1)(eslint@8.47.0): + /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.28.1)(eslint@8.48.0): resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -5379,9 +5378,9 @@ packages: dependencies: debug: 4.3.4 enhanced-resolve: 5.15.0 - eslint: 8.47.0 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.8)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) - eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) + eslint: 8.48.0 + eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.8)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) + eslint-plugin-import: 2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) get-tsconfig: 4.7.0 globby: 13.2.2 is-core-module: 2.13.0 @@ -5394,7 +5393,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.8)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.8)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -5415,38 +5414,38 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.47.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.2.2) debug: 3.2.7 - eslint: 8.47.0 + eslint: 8.48.0 eslint-import-resolver-node: 0.3.8 - eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.28.1)(eslint@8.47.0) + eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.28.1)(eslint@8.48.0) transitivePeerDependencies: - supports-color dev: true - /eslint-plugin-es@3.0.1(eslint@8.47.0): + /eslint-plugin-es@3.0.1(eslint@8.48.0): resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=4.19.1' dependencies: - eslint: 8.47.0 + eslint: 8.48.0 eslint-utils: 2.1.0 regexpp: 3.2.0 dev: true - /eslint-plugin-es@4.1.0(eslint@8.47.0): + /eslint-plugin-es@4.1.0(eslint@8.48.0): resolution: {integrity: sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=4.19.1' dependencies: - eslint: 8.47.0 + eslint: 8.48.0 eslint-utils: 2.1.0 regexpp: 3.2.0 dev: true - /eslint-plugin-import@2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0): + /eslint-plugin-import@2.28.1(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0): resolution: {integrity: sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==} engines: {node: '>=4'} peerDependencies: @@ -5456,16 +5455,16 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.47.0)(typescript@5.2.2) + '@typescript-eslint/parser': 5.62.0(eslint@8.48.0)(typescript@5.2.2) array-includes: 3.1.6 array.prototype.findlastindex: 1.2.2 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.47.0 + eslint: 8.48.0 eslint-import-resolver-node: 0.3.8 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.8)(eslint-import-resolver-typescript@3.5.5)(eslint@8.47.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.8)(eslint-import-resolver-typescript@3.5.5)(eslint@8.48.0) has: 1.0.3 is-core-module: 2.13.0 is-glob: 4.0.3 @@ -5481,7 +5480,7 @@ packages: - supports-color dev: true - /eslint-plugin-jsdoc@41.1.2(eslint@8.47.0): + /eslint-plugin-jsdoc@41.1.2(eslint@8.48.0): resolution: {integrity: sha512-MePJXdGiPW7AG06CU5GbKzYtKpoHwTq1lKijjq+RwL/cQkZtBZ59Zbv5Ep0RVxSMnq6242249/n+w4XrTZ1Afg==} engines: {node: ^14 || ^16 || ^17 || ^18 || ^19} peerDependencies: @@ -5492,7 +5491,7 @@ packages: comment-parser: 1.3.1 debug: 4.3.4 escape-string-regexp: 4.0.0 - eslint: 8.47.0 + eslint: 8.48.0 esquery: 1.5.0 semver: 7.5.4 spdx-expression-parse: 3.0.1 @@ -5500,16 +5499,16 @@ packages: - supports-color dev: true - /eslint-plugin-n@15.7.0(eslint@8.47.0): + /eslint-plugin-n@15.7.0(eslint@8.48.0): resolution: {integrity: sha512-jDex9s7D/Qial8AGVIHq4W7NswpUD5DPDL2RH8Lzd9EloWUuvUkHfv4FRLMipH5q2UtyurorBkPeNi1wVWNh3Q==} engines: {node: '>=12.22.0'} peerDependencies: eslint: '>=7.0.0' dependencies: builtins: 5.0.1 - eslint: 8.47.0 - eslint-plugin-es: 4.1.0(eslint@8.47.0) - eslint-utils: 3.0.0(eslint@8.47.0) + eslint: 8.48.0 + eslint-plugin-es: 4.1.0(eslint@8.48.0) + eslint-utils: 3.0.0(eslint@8.48.0) ignore: 5.2.4 is-core-module: 2.13.0 minimatch: 3.1.2 @@ -5522,14 +5521,14 @@ packages: engines: {node: '>=5.0.0'} dev: true - /eslint-plugin-node@11.1.0(eslint@8.47.0): + /eslint-plugin-node@11.1.0(eslint@8.48.0): resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==} engines: {node: '>=8.10.0'} peerDependencies: eslint: '>=5.16.0' dependencies: - eslint: 8.47.0 - eslint-plugin-es: 3.0.1(eslint@8.47.0) + eslint: 8.48.0 + eslint-plugin-es: 3.0.1(eslint@8.48.0) eslint-utils: 2.1.0 ignore: 5.2.4 minimatch: 3.1.2 @@ -5537,16 +5536,16 @@ packages: semver: 6.3.1 dev: true - /eslint-plugin-promise@6.1.1(eslint@8.47.0): + /eslint-plugin-promise@6.1.1(eslint@8.48.0): resolution: {integrity: sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: - eslint: 8.47.0 + eslint: 8.48.0 dev: true - /eslint-plugin-unicorn@44.0.2(eslint@8.47.0): + /eslint-plugin-unicorn@44.0.2(eslint@8.48.0): resolution: {integrity: sha512-GLIDX1wmeEqpGaKcnMcqRvMVsoabeF0Ton0EX4Th5u6Kmf7RM9WBl705AXFEsns56ESkEs0uyelLuUTvz9Tr0w==} engines: {node: '>=14.18'} peerDependencies: @@ -5555,8 +5554,8 @@ packages: '@babel/helper-validator-identifier': 7.22.5 ci-info: 3.8.0 clean-regexp: 1.0.0 - eslint: 8.47.0 - eslint-utils: 3.0.0(eslint@8.47.0) + eslint: 8.48.0 + eslint-utils: 3.0.0(eslint@8.48.0) esquery: 1.5.0 indent-string: 4.0.0 is-builtin-module: 3.2.1 @@ -5569,19 +5568,19 @@ packages: strip-indent: 3.0.0 dev: true - /eslint-plugin-vue@9.16.1(eslint@8.47.0): + /eslint-plugin-vue@9.16.1(eslint@8.48.0): resolution: {integrity: sha512-2FtnTqazA6aYONfDuOZTk0QzwhAwi7Z4+uJ7+GHeGxcKapjqWlDsRWDenvyG/utyOfAS5bVRmAG3cEWiYEz2bA==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0) - eslint: 8.47.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) + eslint: 8.48.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.0.13 semver: 7.5.4 - vue-eslint-parser: 9.3.1(eslint@8.47.0) + vue-eslint-parser: 9.3.1(eslint@8.48.0) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color @@ -5608,13 +5607,13 @@ packages: eslint-visitor-keys: 1.3.0 dev: true - /eslint-utils@3.0.0(eslint@8.47.0): + /eslint-utils@3.0.0(eslint@8.48.0): resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==} engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0} peerDependencies: eslint: '>=5' dependencies: - eslint: 8.47.0 + eslint: 8.48.0 eslint-visitor-keys: 2.1.0 dev: true @@ -5632,15 +5631,15 @@ packages: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - /eslint@8.47.0: - resolution: {integrity: sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==} + /eslint@8.48.0: + resolution: {integrity: sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.48.0) '@eslint-community/regexpp': 4.6.2 '@eslint/eslintrc': 2.1.2 - '@eslint/js': 8.47.0 + '@eslint/js': 8.48.0 '@humanwhocodes/config-array': 0.11.10 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -5792,7 +5791,7 @@ packages: resolution: {integrity: sha512-LyExtJWKxtgVzmgtEHyQtLFpw1KFhQphF9nTG8TpAIVkiI/xQ3FJh75tRFLYl4hkn7BNIIdLJInuDAavX35pMw==} dependencies: enhanced-resolve: 5.15.0 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 ufo: 1.3.0 dev: false @@ -7119,7 +7118,7 @@ packages: dependencies: '@parcel/watcher': 2.3.0 '@parcel/watcher-wasm': 2.3.0-alpha.3 - citty: 0.1.2 + citty: 0.1.3 clipboardy: 3.0.0 consola: 3.2.3 defu: 6.1.2 @@ -7127,7 +7126,7 @@ packages: h3: 1.8.0 http-shutdown: 1.2.2 jiti: 1.19.3 - mlly: 1.4.0 + mlly: 1.4.1 node-forge: 1.3.1 pathe: 1.1.1 ufo: 1.3.0 @@ -7894,20 +7893,20 @@ packages: typescript: optional: true dependencies: - citty: 0.1.2 + citty: 0.1.3 defu: 6.1.2 esbuild: 0.18.20 fs-extra: 11.1.1 globby: 13.2.2 jiti: 1.19.3 - mlly: 1.4.0 + mlly: 1.4.1 mri: 1.2.0 pathe: 1.1.1 typescript: 5.2.2 dev: true - /mlly@1.4.0: - resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} + /mlly@1.4.1: + resolution: {integrity: sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==} dependencies: acorn: 8.10.0 pathe: 1.1.1 @@ -7948,9 +7947,6 @@ packages: engines: {node: ^14 || ^16 || >=18} hasBin: true - /napi-wasm@1.1.0: - resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==} - /natural-compare-lite@1.4.0: resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} dev: true @@ -7961,13 +7957,13 @@ packages: /neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - /nitropack@2.6.0: - resolution: {integrity: sha512-swhwjrNz0Zc5pBBrL3jdd4v1aJKNv0XbjCk1OreOm0zRbP8WxreGP5sAGpwDVpMH9mpIxyz5A5OSBzKa2lkkuQ==} + /nitropack@2.6.1: + resolution: {integrity: sha512-BoVM7nWx/S5S7TUU3z0DqiY/VVIHu6zng3vJyGMjESIW/FDhc3ecPDJRkNzdUXG5zZ3Ex7ZNll2AsdNHZImcpA==} engines: {node: ^16.11.0 || >=17.0.0} hasBin: true dependencies: '@cloudflare/kv-asset-handler': 0.3.0 - '@netlify/functions': 2.0.1 + '@netlify/functions': 2.0.2 '@rollup/plugin-alias': 5.0.0(rollup@3.28.1) '@rollup/plugin-commonjs': 25.0.4(rollup@3.28.1) '@rollup/plugin-inject': 5.0.3(rollup@3.28.1) @@ -7983,7 +7979,7 @@ packages: c12: 1.4.2 chalk: 5.3.0 chokidar: 3.5.3 - citty: 0.1.2 + citty: 0.1.3 consola: 3.2.3 cookie-es: 1.0.0 defu: 6.1.2 @@ -8005,7 +8001,7 @@ packages: listhen: 1.4.0 magic-string: 0.30.3 mime: 3.0.0 - mlly: 1.4.0 + mlly: 1.4.1 mri: 1.2.0 node-fetch-native: 1.4.0 ofetch: 1.3.3 @@ -8603,7 +8599,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 /playwright-core@1.37.1: @@ -10385,7 +10381,7 @@ packages: jiti: 1.19.3 magic-string: 0.30.3 mkdist: 1.3.0(typescript@5.2.2) - mlly: 1.4.0 + mlly: 1.4.1 mri: 1.2.0 pathe: 1.1.1 pkg-types: 1.0.3 @@ -10416,7 +10412,7 @@ packages: '@rollup/plugin-replace': 5.0.2(rollup@3.28.1) '@rollup/pluginutils': 5.0.3(rollup@3.28.1) chalk: 5.3.0 - citty: 0.1.2 + citty: 0.1.3 consola: 3.2.3 defu: 6.1.2 esbuild: 0.19.2 @@ -10425,7 +10421,7 @@ packages: jiti: 1.19.3 magic-string: 0.30.3 mkdist: 1.3.0(typescript@5.2.2) - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 pretty-bytes: 6.1.1 @@ -10494,7 +10490,7 @@ packages: fast-glob: 3.3.1 local-pkg: 0.4.3 magic-string: 0.30.3 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 pkg-types: 1.0.3 scule: 1.0.0 @@ -10599,7 +10595,7 @@ packages: fast-glob: 3.3.1 json5: 2.2.3 local-pkg: 0.4.3 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 scule: 1.0.0 unplugin: 1.4.0 @@ -10679,7 +10675,7 @@ packages: resolution: {integrity: sha512-Xyo/3TLi2pMLr8SFSXAHVTEpEtVrqXZTzXkZAglRIairiO+utD6y7bCemYejj7GazEwomMwpNB1Gg3hoehY+zA==} hasBin: true dependencies: - citty: 0.1.2 + citty: 0.1.3 consola: 3.2.3 pathe: 1.1.1 @@ -10813,7 +10809,7 @@ packages: dependencies: cac: 6.7.14 debug: 4.3.4 - mlly: 1.4.0 + mlly: 1.4.1 pathe: 1.1.1 picocolors: 1.0.0 vite: 4.4.9(@types/node@18.17.11) @@ -10827,7 +10823,7 @@ packages: - supports-color - terser - /vite-plugin-checker@0.6.2(eslint@8.47.0)(typescript@5.2.2)(vite@4.4.9)(vue-tsc@1.8.8): + /vite-plugin-checker@0.6.2(eslint@8.48.0)(typescript@5.2.2)(vite@4.4.9)(vue-tsc@1.8.8): resolution: {integrity: sha512-YvvvQ+IjY09BX7Ab+1pjxkELQsBd4rPhWNw8WLBeFVxu/E7O+n6VYAqNsKdK/a2luFlX/sMpoWdGFfg4HvwdJQ==} engines: {node: '>=14.16'} peerDependencies: @@ -10863,7 +10859,7 @@ packages: chalk: 4.1.2 chokidar: 3.5.3 commander: 8.3.0 - eslint: 8.47.0 + eslint: 8.48.0 fast-glob: 3.3.1 fs-extra: 11.1.1 lodash.debounce: 4.0.8 @@ -11105,14 +11101,14 @@ packages: resolution: {integrity: sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==} dev: false - /vue-eslint-parser@9.3.1(eslint@8.47.0): + /vue-eslint-parser@9.3.1(eslint@8.48.0): resolution: {integrity: sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' dependencies: debug: 4.3.4 - eslint: 8.47.0 + eslint: 8.48.0 eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 From 9013f88e75f499e650463e3c80d116d0ce898a14 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 26 Aug 2023 00:26:08 +0100 Subject: [PATCH 05/13] v3.7.0 --- packages/kit/package.json | 2 +- packages/nuxt/package.json | 2 +- packages/schema/package.json | 2 +- packages/test-utils/package.json | 2 +- packages/vite/package.json | 2 +- packages/webpack/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/kit/package.json b/packages/kit/package.json index 4105a26e0d..63d9db093e 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/kit", - "version": "3.6.5", + "version": "3.7.0", "repository": "nuxt/nuxt", "license": "MIT", "type": "module", diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 114f08d08a..020c990a5e 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -1,6 +1,6 @@ { "name": "nuxt", - "version": "3.6.5", + "version": "3.7.0", "repository": "nuxt/nuxt", "license": "MIT", "type": "module", diff --git a/packages/schema/package.json b/packages/schema/package.json index c7119fa0c3..083adef852 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/schema", - "version": "3.6.5", + "version": "3.7.0", "repository": "nuxt/nuxt", "license": "MIT", "type": "module", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 03cde41644..64e6c7cb4a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/test-utils", - "version": "3.6.5", + "version": "3.7.0", "repository": "nuxt/nuxt", "license": "MIT", "type": "module", diff --git a/packages/vite/package.json b/packages/vite/package.json index fd5dceebf3..1d56db32a1 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/vite-builder", - "version": "3.6.5", + "version": "3.7.0", "repository": "nuxt/nuxt", "license": "MIT", "type": "module", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index d70db33cef..90a838d263 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -1,6 +1,6 @@ { "name": "@nuxt/webpack-builder", - "version": "3.6.5", + "version": "3.7.0", "repository": "nuxt/nuxt", "license": "MIT", "type": "module", From adb6ec6742395a68cb95961a9ad3b5faf962387b Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sat, 26 Aug 2023 00:44:57 +0100 Subject: [PATCH 06/13] chore: fix variable name in release scripts --- scripts/release-rc.sh | 2 +- scripts/release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release-rc.sh b/scripts/release-rc.sh index 3fefacc757..8c9ade8f7e 100755 --- a/scripts/release-rc.sh +++ b/scripts/release-rc.sh @@ -10,7 +10,7 @@ pnpm build # Release packages for PKG in packages/* ; do - if [[ $p == "packages/nuxi" ]] ; then + if [[ $PKG == "packages/nuxi" ]] ; then continue fi pushd $PKG diff --git a/scripts/release.sh b/scripts/release.sh index eefc2c9178..f33fcb7f34 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -10,7 +10,7 @@ pnpm build # Release packages for PKG in packages/* ; do - if [[ $p == "packages/nuxi" ]] ; then + if [[ $PKG == "packages/nuxi" ]] ; then continue fi pushd $PKG From 424dc8d7c0448b4bdc3051791adbeed15907220f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= Date: Sat, 26 Aug 2023 16:45:17 +0200 Subject: [PATCH 07/13] fix(nuxt): exclude resolved vite virtual modules prefix (#22834) --- packages/nuxt/src/components/transform.ts | 2 +- packages/nuxt/src/core/plugins/resolve-deep-imports.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/components/transform.ts b/packages/nuxt/src/components/transform.ts index 579cf42e7b..6d1a45af39 100644 --- a/packages/nuxt/src/components/transform.ts +++ b/packages/nuxt/src/components/transform.ts @@ -47,7 +47,7 @@ export function createTransformPlugin (nuxt: Nuxt, getComponents: getComponentsT name: 'nuxt:components:imports', transformInclude (id) { id = normalize(id) - return id.startsWith('virtual:') || id.startsWith(nuxt.options.buildDir) || !isIgnored(id) + return id.startsWith('virtual:') || id.startsWith('\0virtual:') || id.startsWith(nuxt.options.buildDir) || !isIgnored(id) }, async transform (code, id) { // Virtual component wrapper diff --git a/packages/nuxt/src/core/plugins/resolve-deep-imports.ts b/packages/nuxt/src/core/plugins/resolve-deep-imports.ts index ba4aaf7bd4..032117178e 100644 --- a/packages/nuxt/src/core/plugins/resolve-deep-imports.ts +++ b/packages/nuxt/src/core/plugins/resolve-deep-imports.ts @@ -7,11 +7,12 @@ import type { Nuxt } from '@nuxt/schema' import { pkgDir } from '../../dirs' export function resolveDeepImportsPlugin (nuxt: Nuxt): Plugin { + const exclude: string[] = ['virtual:', '\0virtual:', '/__skip_vite'] return { name: 'nuxt:resolve-bare-imports', enforce: 'post', async resolveId (id, importer, options) { - if (!importer || isAbsolute(id) || !isAbsolute(importer) || id.startsWith('virtual:') || id.startsWith('/__skip_vite')) { + if (!importer || isAbsolute(id) || !isAbsolute(importer) || exclude.some(e => id.startsWith(e))) { return } id = normalize(id) From a256c8740675aca23f3afcd7d41fe9f9b1b3291f Mon Sep 17 00:00:00 2001 From: Maik Kowol Date: Sun, 27 Aug 2023 21:44:43 +0200 Subject: [PATCH 08/13] fix(nuxt): ensure typed layout prop persists through build (#22855) --- packages/nuxt/src/app/components/nuxt-layout.ts | 2 +- test/fixtures/basic-types/types.ts | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/app/components/nuxt-layout.ts b/packages/nuxt/src/app/components/nuxt-layout.ts index 82c321479d..752978b2ab 100644 --- a/packages/nuxt/src/app/components/nuxt-layout.ts +++ b/packages/nuxt/src/app/components/nuxt-layout.ts @@ -81,7 +81,7 @@ export default defineComponent({ } } }) as unknown as DefineComponent<{ - name?: unknown extends PageMeta['layout'] ? MaybeRef : PageMeta['layout'] + name?: (unknown extends PageMeta['layout'] ? MaybeRef : PageMeta['layout']) | undefined; }> const LayoutProvider = defineComponent({ diff --git a/test/fixtures/basic-types/types.ts b/test/fixtures/basic-types/types.ts index d0a46e66fa..2adf7b4d34 100644 --- a/test/fixtures/basic-types/types.ts +++ b/test/fixtures/basic-types/types.ts @@ -7,7 +7,7 @@ import type { AppConfig, RuntimeValue } from 'nuxt/schema' import { defineNuxtConfig } from 'nuxt/config' import { callWithNuxt, isVue3 } from '#app' import type { NavigateToOptions } from '#app/composables/router' -import { NuxtLink, NuxtPage, WithTypes } from '#components' +import { NuxtLayout, NuxtLink, NuxtPage, WithTypes } from '#components' import { useRouter } from '#imports' interface TestResponse { message: string } @@ -207,6 +207,13 @@ describe('layouts', () => { // @ts-expect-error Invalid layout definePageMeta({ layout: 'invalid-layout' }) }) + + it('allows typing layouts', () => { + h(NuxtLayout, { name: 'custom' }) + + // @ts-expect-error Invalid layout + h(NuxtLayout, { name: 'invalid-layout' }) + }) }) describe('modules', () => { From d905e5f51916dbe797b90800f7f590e1b7857239 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 27 Aug 2023 23:06:15 +0100 Subject: [PATCH 09/13] chore(deps): update all non-major dependencies (main) (#22822) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Roe --- package.json | 2 +- packages/nuxt/package.json | 10 +-- packages/schema/package.json | 4 +- packages/test-utils/package.json | 2 +- packages/vite/package.json | 4 +- packages/webpack/package.json | 2 +- pnpm-lock.yaml | 124 +++++++++++++++---------------- test/bundle.test.ts | 8 +- 8 files changed, 78 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 0b210ee960..6dcdd3d001 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "execa": "7.2.0", "fs-extra": "11.1.1", "globby": "13.2.2", - "h3": "1.8.0", + "h3": "1.8.1", "happy-dom": "10.11.0", "jiti": "1.19.3", "markdownlint-cli": "^0.33.0", diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 020c990a5e..cbd130ee9a 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -58,9 +58,9 @@ "@nuxt/telemetry": "^2.4.1", "@nuxt/ui-templates": "^1.3.1", "@nuxt/vite-builder": "workspace:../vite", - "@unhead/dom": "^1.3.7", - "@unhead/ssr": "^1.3.7", - "@unhead/vue": "^1.3.7", + "@unhead/dom": "^1.3.9", + "@unhead/ssr": "^1.3.9", + "@unhead/vue": "^1.3.9", "@vue/shared": "^3.3.4", "acorn": "8.10.0", "c12": "^1.4.2", @@ -74,7 +74,7 @@ "estree-walker": "^3.0.3", "fs-extra": "^11.1.1", "globby": "^13.2.2", - "h3": "^1.8.0", + "h3": "^1.8.1", "hookable": "^5.5.3", "jiti": "^1.19.3", "klona": "^2.0.6", @@ -97,7 +97,7 @@ "ultrahtml": "^1.3.0", "uncrypto": "^0.1.3", "unctx": "^2.3.1", - "unenv": "^1.7.3", + "unenv": "^1.7.4", "unimport": "^3.2.0", "unplugin": "^1.4.0", "unplugin-vue-router": "^0.6.4", diff --git a/packages/schema/package.json b/packages/schema/package.json index 083adef852..b54a073a40 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -32,12 +32,12 @@ "@types/file-loader": "5.0.1", "@types/pug": "2.0.6", "@types/sass-loader": "8.0.5", - "@unhead/schema": "1.3.7", + "@unhead/schema": "1.3.9", "@vitejs/plugin-vue": "4.3.3", "@vitejs/plugin-vue-jsx": "3.0.2", "@vue/compiler-core": "3.3.4", "esbuild-loader": "4.0.1", - "h3": "1.8.0", + "h3": "1.8.1", "ignore": "5.2.4", "nitropack": "2.6.1", "unbuild": "latest", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 64e6c7cb4a..767d2e48e9 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -27,7 +27,7 @@ "consola": "^3.2.3", "defu": "^6.1.2", "execa": "^7.2.0", - "get-port-please": "^3.0.1", + "get-port-please": "^3.0.2", "ofetch": "^1.3.3", "pathe": "^1.1.1", "ufo": "^1.3.0" diff --git a/packages/vite/package.json b/packages/vite/package.json index 1d56db32a1..479852c8e2 100644 --- a/packages/vite/package.json +++ b/packages/vite/package.json @@ -40,8 +40,8 @@ "estree-walker": "^3.0.3", "externality": "^1.0.2", "fs-extra": "^11.1.1", - "get-port-please": "^3.0.1", - "h3": "^1.8.0", + "get-port-please": "^3.0.2", + "h3": "^1.8.1", "knitwork": "^1.0.0", "magic-string": "^0.30.3", "mlly": "^1.4.1", diff --git a/packages/webpack/package.json b/packages/webpack/package.json index 90a838d263..c708960276 100644 --- a/packages/webpack/package.json +++ b/packages/webpack/package.json @@ -32,7 +32,7 @@ "file-loader": "^6.2.0", "fork-ts-checker-webpack-plugin": "^8.0.0", "fs-extra": "^11.1.1", - "h3": "^1.8.0", + "h3": "^1.8.1", "hash-sum": "^2.0.0", "lodash-es": "^4.17.21", "magic-string": "^0.30.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 75c019dfaa..e9f880e266 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -80,8 +80,8 @@ importers: specifier: 13.2.2 version: 13.2.2 h3: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.8.1 + version: 1.8.1 happy-dom: specifier: 10.11.0 version: 10.11.0 @@ -264,14 +264,14 @@ importers: specifier: ^14.18.0 || >=16.10.0 version: 18.17.11 '@unhead/dom': - specifier: ^1.3.7 - version: 1.3.7 + specifier: ^1.3.9 + version: 1.3.9 '@unhead/ssr': - specifier: ^1.3.7 - version: 1.3.7 + specifier: ^1.3.9 + version: 1.3.9 '@unhead/vue': - specifier: ^1.3.7 - version: 1.3.7(vue@3.3.4) + specifier: ^1.3.9 + version: 1.3.9(vue@3.3.4) '@vue/shared': specifier: ^3.3.4 version: 3.3.4 @@ -312,8 +312,8 @@ importers: specifier: ^13.2.2 version: 13.2.2 h3: - specifier: ^1.8.0 - version: 1.8.0 + specifier: ^1.8.1 + version: 1.8.1 hookable: specifier: ^5.5.3 version: 5.5.3 @@ -381,8 +381,8 @@ importers: specifier: ^2.3.1 version: 2.3.1 unenv: - specifier: ^1.7.3 - version: 1.7.3 + specifier: ^1.7.4 + version: 1.7.4 unimport: specifier: ^3.2.0 version: 3.2.0(rollup@3.28.1) @@ -479,8 +479,8 @@ importers: specifier: 8.0.5 version: 8.0.5 '@unhead/schema': - specifier: 1.3.7 - version: 1.3.7 + specifier: 1.3.9 + version: 1.3.9 '@vitejs/plugin-vue': specifier: 4.3.3 version: 4.3.3(vite@4.4.9)(vue@3.3.4) @@ -494,8 +494,8 @@ importers: specifier: 4.0.1 version: 4.0.1(webpack@5.88.2) h3: - specifier: 1.8.0 - version: 1.8.0 + specifier: 1.8.1 + version: 1.8.1 ignore: specifier: 5.2.4 version: 5.2.4 @@ -548,8 +548,8 @@ importers: specifier: ^7.2.0 version: 7.2.0 get-port-please: - specifier: ^3.0.1 - version: 3.0.1 + specifier: ^3.0.2 + version: 3.0.2 ofetch: specifier: ^1.3.3 version: 1.3.3 @@ -621,11 +621,11 @@ importers: specifier: ^11.1.1 version: 11.1.1 get-port-please: - specifier: ^3.0.1 - version: 3.0.1 + specifier: ^3.0.2 + version: 3.0.2 h3: - specifier: ^1.8.0 - version: 1.8.0 + specifier: ^1.8.1 + version: 1.8.1 knitwork: specifier: ^1.0.0 version: 1.0.0 @@ -745,8 +745,8 @@ importers: specifier: ^11.1.1 version: 11.1.1 h3: - specifier: ^1.8.0 - version: 1.8.0 + specifier: ^1.8.1 + version: 1.8.1 hash-sum: specifier: ^2.0.0 version: 2.0.0 @@ -3166,41 +3166,41 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@unhead/dom@1.3.7: - resolution: {integrity: sha512-utDjimElXvPrpArysKbrUFWacF4exwXB5tOZ9H3SUJOJxIPtz4GZZgkPTPv+UHV9Z+21MP/a6dFldc5j9EAO4A==} + /@unhead/dom@1.3.9: + resolution: {integrity: sha512-bTbPFjXjmk8MC0cBC+7Bgf0Mcw62gsE2XqOhMH/qQo6NP4vR2XGxqy054Y7MGurznR1JVAqxUiU3cR/oxWFk3g==} dependencies: - '@unhead/schema': 1.3.7 - '@unhead/shared': 1.3.7 + '@unhead/schema': 1.3.9 + '@unhead/shared': 1.3.9 dev: false - /@unhead/schema@1.3.7: - resolution: {integrity: sha512-C0+wA2ZZl4d2Aj0z3mFoDKDTv/22z0Tu5giXj+T+iEmfAir9k6kH2UrrCDMkHUP/mRnBSEg1URBrFq2al34VKg==} + /@unhead/schema@1.3.9: + resolution: {integrity: sha512-iIa0dczd2qTOxwYZbVR+iAKdlELnLTlKSFsN/YuJ/33sRi5VFa9D8TDBEPLec9gpcjB/bH0FhERfR4bb4UbRuA==} dependencies: hookable: 5.5.3 zhead: 2.0.10 - /@unhead/shared@1.3.7: - resolution: {integrity: sha512-73bs2B5wCMCr+X81qbEVPwFd/7pN8SXSgsSSwq9KkhmB+hC3bipiDST+Fe1h7F80lZ4iu9EwjrNxNlXw+tLjsw==} + /@unhead/shared@1.3.9: + resolution: {integrity: sha512-lBXK1gzsg3XOnsOgYUVTT2RKOvM+AB0myDXkwQb0jsJB3Tc1qVOSz9JAOR+ZGrosSr7+Iv91+Fu/0E+knxaj2Q==} dependencies: - '@unhead/schema': 1.3.7 + '@unhead/schema': 1.3.9 dev: false - /@unhead/ssr@1.3.7: - resolution: {integrity: sha512-6FNA2h4AA3I52YQUJ7JqAi0JmixFTa/hM9UWoLDGu9FpFJKiQfRX4s1bm8RPaLC+HTR/GhGdUcwkT4gxU54SLg==} + /@unhead/ssr@1.3.9: + resolution: {integrity: sha512-FTt4IQOAxHiSfRM7IoJJiFnUEBH8CG5zkJOQ/LydG19QpYa9/AGOi4xvngeCr++1as51p2hWoRO6gPxSRhV8cA==} dependencies: - '@unhead/schema': 1.3.7 - '@unhead/shared': 1.3.7 + '@unhead/schema': 1.3.9 + '@unhead/shared': 1.3.9 dev: false - /@unhead/vue@1.3.7(vue@3.3.4): - resolution: {integrity: sha512-ekvE592mAJxwoscCt/6Z2gwXHb4IzWIUsy/vcBXd/aEo0bOPww9qObCyS3/GxhknRdItDhJOwfO9CId+bSRG8Q==} + /@unhead/vue@1.3.9(vue@3.3.4): + resolution: {integrity: sha512-rVAsRLBc+3Y//NRmr7vmRs5yhIf65jYSvcj0V5DtDfDwql7BbGgc3VIIEvY0+EjLQuNsS5kxwm78LSPCIl/3Xw==} peerDependencies: vue: '>=2.7 || >=3' dependencies: - '@unhead/schema': 1.3.7 - '@unhead/shared': 1.3.7 + '@unhead/schema': 1.3.9 + '@unhead/shared': 1.3.9 hookable: 5.5.3 - unhead: 1.3.7 + unhead: 1.3.9 vue: 3.3.4 dev: false @@ -6053,8 +6053,8 @@ packages: engines: {node: '>=8.0.0'} dev: true - /get-port-please@3.0.1: - resolution: {integrity: sha512-R5pcVO8Z1+pVDu8Ml3xaJCEkBiiy1VQN9za0YqH8GIi1nIqD4IzQhzY6dDzMRtdS1lyiGlucRzm8IN8wtLIXng==} + /get-port-please@3.0.2: + resolution: {integrity: sha512-c14cAITf0E+uqdxGALvyYHwOL7UsnWcv3oDtgDAZksiVSGN87xlWVUWGZcmWQU3cICdaOxT+6LdQzUfK2ei1SA==} /get-stdin@9.0.0: resolution: {integrity: sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==} @@ -6237,8 +6237,8 @@ packages: dependencies: duplexer: 0.1.2 - /h3@1.8.0: - resolution: {integrity: sha512-057VY83X7Tg5n4XU2GV9M3dsCWUU4jtw2Lc/r4GjAcf9Jb6GI1mD5F8TCQHUcvLMEgtx6lbfobOFu7Vdmejihg==} + /h3@1.8.1: + resolution: {integrity: sha512-m5rFuu+5bpwBBHqqS0zexjK+Q8dhtFRvO9JXQG0RvSPL6QrIT6vv42vuBM22SLOgGMoZYsHk0y7VPidt9s+nkw==} dependencies: cookie-es: 1.0.0 defu: 6.1.2 @@ -6247,7 +6247,7 @@ packages: radix3: 1.1.0 ufo: 1.3.0 uncrypto: 0.1.3 - unenv: 1.7.3 + unenv: 1.7.4 /happy-dom@10.11.0: resolution: {integrity: sha512-CmUT4LOLzvAsbYqgTJESrPyvF0gxLDkDG/KK1o/HYU7+c9o/VVIKXl3feJZnuCYbGqemw7meiQaZcL4SMgn1jQ==} @@ -7122,8 +7122,8 @@ packages: clipboardy: 3.0.0 consola: 3.2.3 defu: 6.1.2 - get-port-please: 3.0.1 - h3: 1.8.0 + get-port-please: 3.0.2 + h3: 1.8.1 http-shutdown: 1.2.2 jiti: 1.19.3 mlly: 1.4.1 @@ -7991,7 +7991,7 @@ packages: fs-extra: 11.1.1 globby: 13.2.2 gzip-size: 7.0.0 - h3: 1.8.0 + h3: 1.8.1 hookable: 5.5.3 httpxy: 0.1.2 is-primitive: 3.0.1 @@ -8022,7 +8022,7 @@ packages: ufo: 1.3.0 uncrypto: 0.1.3 unctx: 2.3.1 - unenv: 1.7.3 + unenv: 1.7.4 unimport: 3.2.0(rollup@3.28.1) unstorage: 1.9.0 transitivePeerDependencies: @@ -8211,7 +8211,7 @@ packages: '@vitejs/plugin-vue-jsx': 3.0.2(vite@4.4.9)(vue@3.3.4) '@vitest/ui': 0.33.0(vitest@0.33.0) defu: 6.1.2 - get-port-please: 3.0.1 + get-port-please: 3.0.2 perfect-debounce: 1.0.0 std-env: 3.4.3 vite: 4.4.9(@types/node@18.17.11) @@ -10452,8 +10452,8 @@ packages: dependencies: busboy: 1.6.0 - /unenv@1.7.3: - resolution: {integrity: sha512-5NGaBSP0acq5FAnjw9m6sA/QaImYkEjpYXPc99l/KUIb1qbxki1PSvX3ZNnK3pWIC2XwIHrOul2P7FiHyWgeXA==} + /unenv@1.7.4: + resolution: {integrity: sha512-fjYsXYi30It0YCQYqLOcT6fHfMXsBr2hw9XC7ycf8rTG7Xxpe3ZssiqUnD0khrjiZEmkBXWLwm42yCSCH46fMw==} dependencies: consola: 3.2.3 defu: 6.1.2 @@ -10461,12 +10461,12 @@ packages: node-fetch-native: 1.4.0 pathe: 1.1.1 - /unhead@1.3.7: - resolution: {integrity: sha512-XRkDIaIK325UyKwSqV6fDbFKJ4HYuT5mCEnIhUqNBtUYv6b7jdXzYTfUiZSb1ciJyTqvzRHFWDtmGtJo1L375Q==} + /unhead@1.3.9: + resolution: {integrity: sha512-vzWZJW8l6dlNM5egJs3c7NMHWZ+iw2x7jCZtU2rrhwFINlKCaA3J42fvOeDxx6t5QR9dfZ96HF2AeNlCcPT+bQ==} dependencies: - '@unhead/dom': 1.3.7 - '@unhead/schema': 1.3.7 - '@unhead/shared': 1.3.7 + '@unhead/dom': 1.3.9 + '@unhead/schema': 1.3.9 + '@unhead/shared': 1.3.9 hookable: 5.5.3 dev: false @@ -10655,7 +10655,7 @@ packages: anymatch: 3.1.3 chokidar: 3.5.3 destr: 2.0.1 - h3: 1.8.0 + h3: 1.8.1 ioredis: 5.3.2 listhen: 1.4.0 lru-cache: 10.0.1 @@ -10930,11 +10930,11 @@ packages: '@vue/test-utils': 2.4.1(vue@3.3.4) defu: 6.1.2 estree-walker: 3.0.3 - h3: 1.8.0 + h3: 1.8.1 happy-dom: 10.11.0 magic-string: 0.30.3 ofetch: 1.3.3 - unenv: 1.7.3 + unenv: 1.7.4 vitest: 0.33.0(happy-dom@10.11.0) vue: 3.3.4 vue-router: 4.2.4(vue@3.3.4) diff --git a/test/bundle.test.ts b/test/bundle.test.ts index f1005e216e..8d12b77efa 100644 --- a/test/bundle.test.ts +++ b/test/bundle.test.ts @@ -19,7 +19,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM for (const outputDir of ['.output', '.output-inline']) { it('default client bundle size', async () => { const clientStats = await analyzeSizes('**/*.js', join(rootDir, outputDir, 'public')) - expect.soft(roundToKilobytes(clientStats.totalBytes)).toMatchInlineSnapshot('"96.6k"') + expect.soft(roundToKilobytes(clientStats.totalBytes)).toMatchInlineSnapshot('"96.9k"') expect(clientStats.files.map(f => f.replace(/\..*\.js/, '.js'))).toMatchInlineSnapshot(` [ "_nuxt/entry.js", @@ -32,7 +32,7 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM const serverDir = join(rootDir, '.output/server') const serverStats = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir) - expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"297k"') + expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"300k"') const modules = await analyzeSizes('node_modules/**/*', serverDir) expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot('"1822k"') @@ -71,10 +71,10 @@ describe.skipIf(process.env.SKIP_BUNDLE_SIZE === 'true' || process.env.ECOSYSTEM const serverDir = join(rootDir, '.output-inline/server') const serverStats = await analyzeSizes(['**/*.mjs', '!node_modules'], serverDir) - expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"603k"') + expect.soft(roundToKilobytes(serverStats.totalBytes)).toMatchInlineSnapshot('"606k"') const modules = await analyzeSizes('node_modules/**/*', serverDir) - expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot('"70.5k"') + expect.soft(roundToKilobytes(modules.totalBytes)).toMatchInlineSnapshot('"70.6k"') const packages = modules.files .filter(m => m.endsWith('package.json')) From bfd06589fdc6d062596e27059135be7337391815 Mon Sep 17 00:00:00 2001 From: Heb Date: Mon, 28 Aug 2023 15:34:47 +0700 Subject: [PATCH 10/13] docs: add info about dynamic nested routes (#22862) --- docs/2.guide/2.directory-structure/1.pages.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/2.guide/2.directory-structure/1.pages.md b/docs/2.guide/2.directory-structure/1.pages.md index 079cd39827..dec282c074 100644 --- a/docs/2.guide/2.directory-structure/1.pages.md +++ b/docs/2.guide/2.directory-structure/1.pages.md @@ -134,6 +134,10 @@ if (route.params.group === 'admins' && !route.params.id) { ``` +::alert{type="info"} +Named parent routes will take priority over nested dynamic routes. For the `/foo/hello` route, `~/pages/foo.vue` will take priority over `~/pages/foo/[slug].vue` . Use `~/pages/foo/index.vue` and `~/pages/foo/[slug].vue` to match `/foo` and `/foo/hello` with different pages,. +:: + ## Catch-all Route If you need a catch-all route, you create it by using a file named like `[...slug].vue`. This will match _all_ routes under that path. From a5cc858a4c390fc4d95a39d6c0851da60f381350 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 10:07:48 +0100 Subject: [PATCH 11/13] chore(deps): update all non-major dependencies (main) (#22858) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel Roe --- package.json | 4 +- packages/kit/package.json | 2 +- packages/nuxt/package.json | 4 +- packages/schema/package.json | 2 +- pnpm-lock.yaml | 90 ++++++++++++++++++------------------ 5 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 6dcdd3d001..f91f47cec6 100644 --- a/package.json +++ b/package.json @@ -63,8 +63,8 @@ "happy-dom": "10.11.0", "jiti": "1.19.3", "markdownlint-cli": "^0.33.0", - "nitropack": "2.6.1", - "nuxi": "3.7.0", + "nitropack": "2.6.2", + "nuxi": "3.7.2", "nuxt": "workspace:*", "nuxt-vitest": "0.10.2", "ofetch": "1.3.3", diff --git a/packages/kit/package.json b/packages/kit/package.json index 63d9db093e..1900cd6339 100644 --- a/packages/kit/package.json +++ b/packages/kit/package.json @@ -44,7 +44,7 @@ "@types/lodash-es": "4.17.8", "@types/semver": "7.5.0", "lodash-es": "4.17.21", - "nitropack": "2.6.1", + "nitropack": "2.6.2", "unbuild": "latest", "vite": "4.4.9", "vitest": "0.33.0", diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index cbd130ee9a..c2d5de5467 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -81,8 +81,8 @@ "knitwork": "^1.0.0", "magic-string": "^0.30.3", "mlly": "^1.4.1", - "nitropack": "^2.6.1", - "nuxi": "^3.7.0", + "nitropack": "^2.6.2", + "nuxi": "^3.7.2", "nypm": "^0.3.1", "ofetch": "^1.3.3", "ohash": "^1.1.3", diff --git a/packages/schema/package.json b/packages/schema/package.json index b54a073a40..f8618b6a96 100644 --- a/packages/schema/package.json +++ b/packages/schema/package.json @@ -39,7 +39,7 @@ "esbuild-loader": "4.0.1", "h3": "1.8.1", "ignore": "5.2.4", - "nitropack": "2.6.1", + "nitropack": "2.6.2", "unbuild": "latest", "unctx": "2.3.1", "vite": "4.4.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9f880e266..8fd2669033 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -92,11 +92,11 @@ importers: specifier: ^0.33.0 version: 0.33.0 nitropack: - specifier: 2.6.1 - version: 2.6.1 + specifier: 2.6.2 + version: 2.6.2 nuxi: - specifier: 3.7.0 - version: 3.7.0 + specifier: 3.7.2 + version: 3.7.2 nuxt: specifier: workspace:* version: link:packages/nuxt @@ -225,8 +225,8 @@ importers: specifier: 4.17.21 version: 4.17.21 nitropack: - specifier: 2.6.1 - version: 2.6.1 + specifier: 2.6.2 + version: 2.6.2 unbuild: specifier: latest version: 2.0.0(typescript@5.2.2) @@ -333,11 +333,11 @@ importers: specifier: ^1.4.1 version: 1.4.1 nitropack: - specifier: ^2.6.1 - version: 2.6.1 + specifier: ^2.6.2 + version: 2.6.2 nuxi: - specifier: ^3.7.0 - version: 3.7.0 + specifier: ^3.7.2 + version: 3.7.2 nypm: specifier: ^0.3.1 version: 0.3.1 @@ -500,8 +500,8 @@ importers: specifier: 5.2.4 version: 5.2.4 nitropack: - specifier: 2.6.1 - version: 2.6.1 + specifier: 2.6.2 + version: 2.6.2 unbuild: specifier: latest version: 2.0.0(typescript@5.2.2) @@ -2289,7 +2289,7 @@ packages: detab: 3.0.2 json5: 2.2.3 knitwork: 1.0.0 - listhen: 1.4.0 + listhen: 1.4.3 mdast-util-to-hast: 12.3.0 mdurl: 1.0.1 ohash: 1.1.3 @@ -2520,8 +2520,8 @@ packages: requiresBuild: true optional: true - /@parcel/watcher-wasm@2.3.0-alpha.3: - resolution: {integrity: sha512-kTkqlYhGhCM9EaoZMyjNzqKRSdTyp/vN+/uoJ2fzN+UCiWUI+jMKacwnBgu13T1F0mrcNqEWtYEXTRaZmnml1w==} + /@parcel/watcher-wasm@2.3.0: + resolution: {integrity: sha512-ejBAX8H0ZGsD8lSICDNyMbSEtPMWgDL0WFCt/0z7hyf5v8Imz4rAM8xY379mBsECkq/Wdqa5WEDLqtjZ+6NxfA==} engines: {node: '>= 10.0.0'} dependencies: is-glob: 4.0.3 @@ -2618,7 +2618,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 @@ -2636,7 +2636,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) commondir: 1.0.1 estree-walker: 2.0.2 glob: 8.1.0 @@ -2653,7 +2653,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) estree-walker: 2.0.2 magic-string: 0.30.3 rollup: 3.28.1 @@ -2667,7 +2667,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) rollup: 3.28.1 /@rollup/plugin-node-resolve@15.2.1(rollup@3.28.1): @@ -2679,7 +2679,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) '@types/resolve': 1.20.2 deepmerge: 4.3.1 is-builtin-module: 3.2.1 @@ -2696,7 +2696,7 @@ packages: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) magic-string: 0.30.3 rollup: 3.28.1 @@ -2732,8 +2732,8 @@ packages: estree-walker: 2.0.2 picomatch: 2.3.1 - /@rollup/pluginutils@5.0.3(rollup@3.28.1): - resolution: {integrity: sha512-hfllNN4a80rwNQ9QCxhxuHCGHMAvabXqxNdaChUSSadMre7t4iEUI6fFAhBOn/eIYTgYVhBv7vCLsAJ4u3lf3g==} + /@rollup/pluginutils@5.0.4(rollup@3.28.1): + resolution: {integrity: sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0||^3.0.0 @@ -3357,7 +3357,7 @@ packages: optional: true dependencies: '@babel/types': 7.22.10 - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) '@vue/compiler-sfc': 3.3.4 ast-kit: 0.9.4(rollup@3.28.1) local-pkg: 0.4.3 @@ -4019,7 +4019,7 @@ packages: engines: {node: '>=16.14.0'} dependencies: '@babel/parser': 7.22.10 - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) pathe: 1.1.1 transitivePeerDependencies: - rollup @@ -6444,8 +6444,8 @@ packages: transitivePeerDependencies: - supports-color - /httpxy@0.1.2: - resolution: {integrity: sha512-8IldwriN7eS7Pe1pPRE6L7S1LW551lBJ3N9oI4HLYGZTXl2JBkdINEi+mDZwhwykw1OBVI2li3zhPSi7r1N8lQ==} + /httpxy@0.1.4: + resolution: {integrity: sha512-ArXKNWhU5taozl6fFnu01M9HiInAqSOw4mUp+7DY/zbTHPmS8JBqH0IC3VLovRBd9b8ZE03ztemcxzeWT6pCoA==} /human-signals@2.1.0: resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} @@ -7112,12 +7112,12 @@ packages: uc.micro: 1.0.6 dev: true - /listhen@1.4.0: - resolution: {integrity: sha512-gEOMJKTak+WLjPITBVbv2kR0WKVUSnl5XPwvoFYheyaQPzh/jdA+pRZeUujJkjabNMDsBxwuaYH7HYLpzzGEJA==} + /listhen@1.4.3: + resolution: {integrity: sha512-qVWeM07q7q5R3jwB+Zm603khFQ3yq5OLmAwLIlE3Ftv1K9yfwx4R6/tbCkkr0/SrIyKnHK9xY1C6j03uGOSnIQ==} hasBin: true dependencies: '@parcel/watcher': 2.3.0 - '@parcel/watcher-wasm': 2.3.0-alpha.3 + '@parcel/watcher-wasm': 2.3.0 citty: 0.1.3 clipboardy: 3.0.0 consola: 3.2.3 @@ -7130,7 +7130,7 @@ packages: node-forge: 1.3.1 pathe: 1.1.1 ufo: 1.3.0 - untun: 0.1.1 + untun: 0.1.2 uqr: 0.1.2 /loader-runner@4.3.0: @@ -7957,8 +7957,8 @@ packages: /neo-async@2.6.2: resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==} - /nitropack@2.6.1: - resolution: {integrity: sha512-BoVM7nWx/S5S7TUU3z0DqiY/VVIHu6zng3vJyGMjESIW/FDhc3ecPDJRkNzdUXG5zZ3Ex7ZNll2AsdNHZImcpA==} + /nitropack@2.6.2: + resolution: {integrity: sha512-gzbxLIhCoQrK+NrgW5Szuo6zzFEU/bqoohimyJ8IkETI3MXlYtLphlW/UVE8pv8UQ0IJ2HzxFpZ7Ldd0+bQ35A==} engines: {node: ^16.11.0 || >=17.0.0} hasBin: true dependencies: @@ -7972,7 +7972,7 @@ packages: '@rollup/plugin-replace': 5.0.2(rollup@3.28.1) '@rollup/plugin-terser': 0.4.3(rollup@3.28.1) '@rollup/plugin-wasm': 6.1.3(rollup@3.28.1) - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) '@types/http-proxy': 1.17.11 '@vercel/nft': 0.23.1 archiver: 6.0.0 @@ -7993,12 +7993,12 @@ packages: gzip-size: 7.0.0 h3: 1.8.1 hookable: 5.5.3 - httpxy: 0.1.2 + httpxy: 0.1.4 is-primitive: 3.0.1 jiti: 1.19.3 klona: 2.0.6 knitwork: 1.0.0 - listhen: 1.4.0 + listhen: 1.4.3 magic-string: 0.30.3 mime: 3.0.0 mlly: 1.4.1 @@ -8159,8 +8159,8 @@ packages: dependencies: boolbase: 1.0.0 - /nuxi@3.7.0: - resolution: {integrity: sha512-FZEwNCGeEdE+CyKCoThZm+Lv+u4TnbClTyYvvby3a2joK5t8nc7upNiZ7hsd+xoOeNuZW7CZHsQp9szJm2ev9Q==} + /nuxi@3.7.2: + resolution: {integrity: sha512-WNczi4X5ms8v63BTlCH+ZZDPzoFI0/V5KW8an4Zv6qOngtONHALw1u6qvtcAqG2tuMDu8gdJuzxMZL2845Dbig==} engines: {node: ^14.18.0 || >=16.10.0} hasBin: true optionalDependencies: @@ -10371,7 +10371,7 @@ packages: '@rollup/plugin-json': 6.0.0(rollup@3.28.1) '@rollup/plugin-node-resolve': 15.2.1(rollup@3.28.1) '@rollup/plugin-replace': 5.0.2(rollup@3.28.1) - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) chalk: 5.3.0 consola: 3.2.3 defu: 6.1.2 @@ -10410,7 +10410,7 @@ packages: '@rollup/plugin-json': 6.0.0(rollup@3.28.1) '@rollup/plugin-node-resolve': 15.2.1(rollup@3.28.1) '@rollup/plugin-replace': 5.0.2(rollup@3.28.1) - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) chalk: 5.3.0 citty: 0.1.3 consola: 3.2.3 @@ -10485,7 +10485,7 @@ packages: /unimport@3.2.0(rollup@3.28.1): resolution: {integrity: sha512-9buxPxkNwxwxAlH/RfOFHxtQTUrlmBGi9Ai9HezY2yYbkoOhgJTYPI6+WqxI1EZphoM9cw1SHoCFRkXSb8/fjQ==} dependencies: - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) escape-string-regexp: 5.0.0 fast-glob: 3.3.1 local-pkg: 0.4.3 @@ -10588,7 +10588,7 @@ packages: optional: true dependencies: '@babel/types': 7.22.10 - '@rollup/pluginutils': 5.0.3(rollup@3.28.1) + '@rollup/pluginutils': 5.0.4(rollup@3.28.1) '@vue-macros/common': 1.6.2(rollup@3.28.1)(vue@3.3.4) ast-walker-scope: 0.4.2 chokidar: 3.5.3 @@ -10657,7 +10657,7 @@ packages: destr: 2.0.1 h3: 1.8.1 ioredis: 5.3.2 - listhen: 1.4.0 + listhen: 1.4.3 lru-cache: 10.0.1 mri: 1.2.0 node-fetch-native: 1.4.0 @@ -10671,8 +10671,8 @@ packages: engines: {node: '>=8'} dev: true - /untun@0.1.1: - resolution: {integrity: sha512-Xyo/3TLi2pMLr8SFSXAHVTEpEtVrqXZTzXkZAglRIairiO+utD6y7bCemYejj7GazEwomMwpNB1Gg3hoehY+zA==} + /untun@0.1.2: + resolution: {integrity: sha512-wLAMWvxfqyTiBODA1lg3IXHQtjggYLeTK7RnSfqtOXixWJ3bAa2kK/HHmOOg19upteqO3muLvN6O/icbyQY33Q==} hasBin: true dependencies: citty: 0.1.3 From 6198a1151485882e4e27bdd31d112c69fff230ff Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Mon, 28 Aug 2023 17:46:49 +0100 Subject: [PATCH 12/13] fix(nuxt): render server components when `ssr: false` (#22869) --- packages/nuxt/src/app/components/nuxt-island.ts | 2 +- packages/nuxt/src/core/nuxt.ts | 7 +++++++ packages/nuxt/src/core/runtime/nitro/renderer.ts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/app/components/nuxt-island.ts b/packages/nuxt/src/app/components/nuxt-island.ts index 3955b8d8ef..0c4fb8c67b 100644 --- a/packages/nuxt/src/app/components/nuxt-island.ts +++ b/packages/nuxt/src/app/components/nuxt-island.ts @@ -171,7 +171,7 @@ export default defineComponent({ if (import.meta.client && !nuxtApp.isHydrating && props.lazy) { fetchComponent() - } else if (import.meta.server || !nuxtApp.isHydrating) { + } else if (import.meta.server || !nuxtApp.isHydrating || !nuxtApp.payload.serverRendered) { await fetchComponent() } diff --git a/packages/nuxt/src/core/nuxt.ts b/packages/nuxt/src/core/nuxt.ts index 36ccb593be..03b4f0a398 100644 --- a/packages/nuxt/src/core/nuxt.ts +++ b/packages/nuxt/src/core/nuxt.ts @@ -8,6 +8,7 @@ import escapeRE from 'escape-string-regexp' import fse from 'fs-extra' import { withoutLeadingSlash } from 'ufo' /* eslint-disable import/no-restricted-paths */ +import defu from 'defu' import pagesModule from '../pages/module' import metaModule from '../head/module' import componentsModule from '../components/module' @@ -283,6 +284,12 @@ async function initNuxt (nuxt: Nuxt) { priority: 10, // built-in that we do not expect the user to override filePath: resolve(nuxt.options.appDir, 'components/nuxt-island') }) + + if (!nuxt.options.ssr) { + nuxt.options.ssr = true + nuxt.options.nitro.routeRules ||= {} + nuxt.options.nitro.routeRules['/**'] = defu(nuxt.options.nitro.routeRules['/**'], { ssr: false }) + } } // Add experimental cross-origin prefetch support using Speculation Rules API diff --git a/packages/nuxt/src/core/runtime/nitro/renderer.ts b/packages/nuxt/src/core/runtime/nitro/renderer.ts index bc2b75cb9a..13c053a3ca 100644 --- a/packages/nuxt/src/core/runtime/nitro/renderer.ts +++ b/packages/nuxt/src/core/runtime/nitro/renderer.ts @@ -259,7 +259,7 @@ export default defineRenderHandler(async (event): Promise Date: Tue, 29 Aug 2023 18:55:59 +0900 Subject: [PATCH 13/13] docs: update nuxt bridge migration guide (#22815) --- docs/6.bridge/1.overview.md | 284 ++---------------- docs/6.bridge/10.configuration.md | 83 +++++ docs/6.bridge/2.typescript.md | 32 ++ docs/6.bridge/3.bridge-composition-api.md | 122 ++++++++ docs/6.bridge/4.plugins-and-middleware.md | 44 +++ ...ition-api.md => 5.nuxt3-compatible-api.md} | 174 ++++------- docs/6.bridge/6.meta.md | 109 +++++++ docs/6.bridge/7.runtime-config.md | 31 ++ docs/6.bridge/8.nitro.md | 75 +++++ docs/6.bridge/9.vite.md | 34 +++ 10 files changed, 604 insertions(+), 384 deletions(-) create mode 100644 docs/6.bridge/10.configuration.md create mode 100644 docs/6.bridge/2.typescript.md create mode 100644 docs/6.bridge/3.bridge-composition-api.md create mode 100644 docs/6.bridge/4.plugins-and-middleware.md rename docs/6.bridge/{2.bridge-composition-api.md => 5.nuxt3-compatible-api.md} (55%) create mode 100644 docs/6.bridge/6.meta.md create mode 100644 docs/6.bridge/7.runtime-config.md create mode 100644 docs/6.bridge/8.nitro.md create mode 100644 docs/6.bridge/9.vite.md diff --git a/docs/6.bridge/1.overview.md b/docs/6.bridge/1.overview.md index 704fe3717b..0871c4d9a0 100644 --- a/docs/6.bridge/1.overview.md +++ b/docs/6.bridge/1.overview.md @@ -1,6 +1,6 @@ # Overview -Experience Nuxt 3 features on existing Nuxt 2 projects. +Reduce the differences with Nuxt 3 and reduce the burden of migration to Nuxt 3. ::alert If you're starting a fresh Nuxt 3 project, please skip this section and go to [Nuxt 3 Installation](/docs/getting-started/introduction). @@ -12,9 +12,11 @@ Nuxt Bridge provides identical features to Nuxt 3 ([docs](/docs/guide/concepts/a Bridge is a forward-compatibility layer that allows you to experience many of the new Nuxt 3 features by simply installing and enabling a Nuxt module. -Using Nuxt Bridge, you can make sure your project is (almost) ready for Nuxt 3 and have the best developer experience without needing a major rewrite or risk breaking changes. +Using Nuxt Bridge, you can make sure your project is (almost) ready for Nuxt 3 and you can gradually proceed with the transition to Nuxt 3. -## Upgrade Nuxt 2 +## First Step + +### Upgrade Nuxt 2 Make sure your dev server (`nuxt dev`) isn't running, remove any package lock files (`package-lock.json` and `yarn.lock`), and install the latest Nuxt 2 version: @@ -41,7 +43,7 @@ npm install Once the installation is complete, make sure both development and production builds are working as expected before proceeding. :: -## Install Nuxt Bridge +### Install Nuxt Bridge Install `@nuxt/bridge-edge` as a development dependency: @@ -57,57 +59,7 @@ npm install -D @nuxt/bridge@npm:@nuxt/bridge-edge :: -## Update Your Scripts - -You will also need to update your scripts within your `package.json` to reflect the fact that Nuxt will now produce a Nitro server as build output. - -### Nuxi - -Nuxt 3 introduced the new Nuxt CLI command [`nuxi`](/docs/api/commands/add). Update your scripts as follows to leverage the better support from Nuxt Bridge: - -```diff -{ - "scripts": { -- "dev": "nuxt", -+ "dev": "nuxi dev", -- "build": "nuxt build", -+ "build": "nuxi build", -- "start": "nuxt start", -+ "start": "nuxi preview" - } -} -``` - -::alert -If `nitro: false`, use the `nuxt` command. -:: - -### Static Target - -If you have set `target: 'static'` in your `nuxt.config` then you need to ensure that you update your build script to be `nuxi generate`. - -```json [package.json] -{ - "scripts": { - "build": "nuxi generate" - } -} -``` - -### Server Target - -For all other situations, you can use the `nuxi build` command. - -```json [package.json] -{ - "scripts": { - "build": "nuxi build", - "start": "nuxi preview" - } -} -``` - -## Update `nuxt.config` +### Update `nuxt.config` Please make sure to avoid any CommonJS syntax such as `module.exports`, `require` or `require.resolve` in your config file. It will soon be deprecated and unsupported. @@ -117,227 +69,35 @@ You can use static `import`, dynamic `import()` and `export default` instead. Us import { defineNuxtConfig } from '@nuxt/bridge' export default defineNuxtConfig({ - // Your existing configuration + bridge: false }) ``` -## Update `tsconfig.json` +Try running `nuxt dev` once here. You will see that the application works as before. -If you are using TypeScript, you can edit your `tsconfig.json` to benefit from auto-generated Nuxt types: +(If 'bridge' is set to false, your application will operate without any changes as before.) -```diff [tsconfig.json] -{ -+ "extends": "./.nuxt/tsconfig.json", - "compilerOptions": { - ... - } -} -``` +## Upgrade Steps -::alert -As `.nuxt/tsconfig.json` is generated and not checked into version control, you'll need to generate that file before running your tests. Add `nuxi prepare` as a step before your tests, otherwise you'll see `TS5083: Cannot read file '~/.nuxt/tsconfig.json'` -:: -::alert -You may also need to add `@vue/runtime-dom` as a devDependency if you are struggling to get template type inference working with [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar). -:: -::alert -Keep in mind that all options extended from `./.nuxt/tsconfig.json` will be overwritten by the options defined in your `tsconfig.json`. -Overwriting options such as `"compilerOptions.paths"` with your own configuration will lead TypeScript to not factor in the module resolutions from `./.nuxt/tsconfig.json`. This can lead to module resolutions such as `#imports` not being recognized. +With Nuxt Bridge, the migration to Nuxt 3 can proceed in steps. +The below `Upgrade Steps` does not need to be done all at once. -In case you need to extend options provided by `./.nuxt/tsconfig.json` further, you can use the `alias` property within your `nuxt.config`. `nuxi` will pick them up and extend `./.nuxt/tsconfig.json` accordingly. -:: +- [TypeScript](/docs/bridge/typescript) -## Update Runtime Config +- [Migrate Legacy Composition API](/docs/bridge/bridge-composition-api) -Nuxt 3 approaches runtime config differently than Nuxt 2, using a new combined `runtimeConfig` option. +- [Plugins and Middleware](/docs/bridge/plugins-and-middleware) -First, you'll need to combine your `publicRuntimeConfig` and `privateRuntimeConfig` properties into a new one called `runtimeConfig`, with the public config within a key called `public`. +- [Migrate New Composition API](/docs/bridge/nuxt3-compatible-api) -```diff -// nuxt.config.js -- privateRuntimeConfig: { -- apiKey: process.env.NUXT_API_KEY || 'super-secret-key' -- }, -- publicRuntimeConfig: { -- websiteURL: 'https://public-data.com' -- } -+ runtimeConfig: { -+ apiKey: process.env.NUXT_API_KEY || 'super-secret-key', -+ public: { -+ websiteURL: 'https://public-data.com' -+ } -+ } -``` +- [Meta Tags](/docs/bridge/meta) -This also means that when you need to access public runtime config, it's behind a property called `public`. If you use public runtime config, you'll need to update your code. +- [Runtime Config](/docs/bridge/runtime-config) -```diff -// MyWidget.vue --
Website: {{ $config.websiteURL }}
-+
Website: {{ $config.public.websiteURL }}
-``` +- [Nitro](/docs/bridge/nitro) -## Migrate Composition API +- [Vite](/docs/bridge/vite) -If you were using `@vue/composition-api` or `@nuxtjs/composition-api`, please read the [composition api migration guide](/docs/bridge/bridge-composition-api). - -### Migrate from CommonJS to ESM +## Migrate from CommonJS to ESM Nuxt 3 natively supports TypeScript and ECMAScript Modules. Please check [Native ES Modules](/docs/guide/concepts/esm) for more info and upgrading. - -## Remove Incompatible and Obsolete Modules - -- Remove `@nuxt/content` (1.x). A rewrite for Nuxt 3 [is available](https://content.nuxtjs.org/) (2.x) -- Remove `nuxt-vite`: Bridge enables same functionality -- Remove `@nuxt/typescript-build`: Bridge enables same functionality -- Remove `@nuxt/typescript-runtime` and `nuxt-ts`: Nuxt 2 has built-in runtime support -- Remove `@nuxt/nitro`: Bridge injects same functionality -- Remove `@vue/composition-api` from your dependencies ([migration guide](/docs/bridge/bridge-composition-api)). -- Remove `@nuxtjs/composition-api` from your dependencies (and from your modules in `nuxt.config`) ([migration guide](/docs/bridge/bridge-composition-api)). - -## Exclude Built Nitro Folder From Git - -Add the folder `.output` to the `.gitignore` file. - -## Ensure Everything Goes Well - -✔️ Try with `nuxi dev` and `nuxi build` (or `nuxi generate`) to see if everything goes well. - -🐛 Is something wrong? Please let us know by creating an issue. Also, you can easily disable the bridge in the meantime: - -```ts [nuxt.config.js|ts] -import { defineNuxtConfig } from '@nuxt/bridge' -export default defineNuxtConfig({ - bridge: false // Temporarily disable bridge integration -}) -``` - -## New Plugins Format (Optional) - -You can now migrate to the Nuxt 3 plugins API, which is slightly different in format from Nuxt 2. - -Plugins now take only one argument (`nuxtApp`). You can find out more in [the docs](/docs/guide/directory-structure/plugins). - -```js -export default defineNuxtPlugin(nuxtApp => { - nuxtApp.provide('injected', () => 'my injected function') - // now available on `nuxtApp.$injected` -}) -``` - -::alert -If you want to use the new Nuxt composables (such as [`useNuxtApp`](/docs/api/composables/use-nuxt-app) or `useRuntimeConfig`) within your plugins, you will need to use the `defineNuxtPlugin` helper for those plugins. -:: - -::alert{type=warning} -Although a compatibility interface is provided via `nuxtApp.vueApp` you should avoid registering plugins, directives, mixins or components this way without adding your own logic to ensure they are not installed more than once, or this may cause a memory leak. -:: - -## New Middleware Format (Optional) - -You can now migrate to the Nuxt 3 middleware API, which is slightly different in format from Nuxt 2. - -Middleware now take only two argument (`to`, `from`). You can find out more in [the docs](/docs/guide/directory-structure/middleware). - -```js -export default defineNuxtRouteMiddleware((to) => { - if (to.path !== '/') { - return navigateTo('/') - } -}) -``` - -::alert{type=warning} -Use of `defineNuxtRouteMiddleware` is not supported outside of the middleware directory. -:: - -::alert{type=warning} -Nuxt Bridge does not support `definePageMeta`. -:: - -## New `useHead` (Optional) - -Nuxt Bridge provides a new Nuxt 3 meta API that can be accessed with a new [`useHead`](/docs/api/composables/use-head) composable. - -```vue - -``` - -You will also need to enable this feature explicitly in your `nuxt.config`: - -```js -import { defineNuxtConfig } from '@nuxt/bridge' -export default defineNuxtConfig({ - bridge: { - meta: true - } -}) -``` - -::alert -This [`useHead`](/docs/api/composables/use-head) composable uses `@vueuse/head` under the hood (rather than `vue-meta`) to manipulate your ``. You need to add `@vueuse/head` to your package.json file for it to work properly. -:: - -::alert{type=warning} -We recommend not using the native Nuxt 2 `head()` properties in addition to [`useHead`](/docs/api/composables/use-head) , as they may conflict. -:: - -For more information on how to use this composable, see [the docs](/docs/getting-started/seo-meta). - -## Feature Flags - -You can optionally disable some features from bridge or opt-in to less stable ones. In normal circumstances, it is always best to stick with defaults! - -You can check [bridge/src/module.ts](https://github.com/nuxt/bridge/blob/main/packages/bridge/src/module.ts) for latest defaults. - -```ts [nuxt.config.js|ts] -import { defineNuxtConfig } from '@nuxt/bridge' -export default defineNuxtConfig({ - bridge: { - - // -- Opt-in features -- - - // Use Vite as the bundler instead of webpack 4 - // vite: true, - - // Enable Nuxt 3 compatible useHead - // meta: true, - - // -- Default features -- - - // Use legacy server instead of Nitro - // nitro: false, - - // Disable Nuxt 3 compatible `nuxtApp` interface - // app: false, - - // Disable Composition API support - // capi: false, - - // ... or just disable legacy Composition API support - // capi: { - // legacy: false - // }, - - // Do not transpile modules - // transpile: false, - - // Disable +``` + +### Disabling Auto-imports + +If you want to disable auto-importing composables and utilities, you can set `imports.autoImport` to `false` in the `nuxt.config` file. + +```ts [nuxt.config.ts] +export default defineNuxtConfig({ + imports: { + autoImport: false + } +}) +``` + +This will disable auto-imports completely but it's still possible to use [explicit imports](#explicit-imports) from `#imports`. diff --git a/docs/6.bridge/6.meta.md b/docs/6.bridge/6.meta.md new file mode 100644 index 0000000000..346dd45145 --- /dev/null +++ b/docs/6.bridge/6.meta.md @@ -0,0 +1,109 @@ +# Meta Tags + +If you need to access the component state with `head`, you should migrate to using [`useHead`](/docs/api/composables/use-head) . + +If you need to use the Options API, there is a `head()` method you can use when you use `defineNuxtComponent`. + +## Migration + +### Set `bridge.meta` + +```js +import { defineNuxtConfig } from '@nuxt/bridge' +export default defineNuxtConfig({ + bridge: { + meta: true + } +}) +``` + +### Update head properties + +In your `nuxt.config`, rename `head` to `meta`. (Note that objects no longer have a `hid` key for deduplication.) + +::code-group + +```ts [Nuxt 2] +export default { + head: { + titleTemplate: '%s - Nuxt', + meta: [ + { charset: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { hid: 'description', name: 'description', content: 'Meta description' } + ] + } +} +``` + +```ts [Nuxt 3] +export default defineNuxtConfig({ + app: { + head: { + titleTemplate: '%s - Nuxt', + meta: [ + { charset: 'utf-8' }, + { name: 'viewport', content: 'width=device-width, initial-scale=1' }, + { name: 'description', content: 'Meta description' } + ] + } + } +}) +``` + +:: + +## `useHead` Composables + +Nuxt Bridge provides a new Nuxt 3 meta API that can be accessed with a new [`useHead`](/docs/api/composables/use-head) composable. + +```vue + +``` + +::alert +This [`useHead`](/docs/api/composables/use-head) composable uses `@unhead/vue` under the hood (rather than `vue-meta`) to manipulate your ``. +:: + +::alert{type=warning} +We recommend not using the native Nuxt 2 `head()` properties in addition to [`useHead`](/docs/api/composables/use-head) , as they may conflict. +:: + +For more information on how to use this composable, see [the docs](/docs/getting-started/seo-meta). + +## Options API + +```vue + +``` + +## Title Template + +If you want to use a function (for full control), then this cannot be set in your nuxt.config, and it is recommended instead to set it within your `/layouts` directory. + +```vue [layouts/default.vue] + +``` diff --git a/docs/6.bridge/7.runtime-config.md b/docs/6.bridge/7.runtime-config.md new file mode 100644 index 0000000000..73e8e7d703 --- /dev/null +++ b/docs/6.bridge/7.runtime-config.md @@ -0,0 +1,31 @@ +# Runtime Config + +## Update Runtime Config + +Nuxt 3 approaches runtime config differently than Nuxt 2, using a new combined `runtimeConfig` option. + +First, you'll need to combine your `publicRuntimeConfig` and `privateRuntimeConfig` properties into a new one called `runtimeConfig`, with the public config within a key called `public`. + +```diff +// nuxt.config.js +- privateRuntimeConfig: { +- apiKey: process.env.NUXT_API_KEY || 'super-secret-key' +- }, +- publicRuntimeConfig: { +- websiteURL: 'https://public-data.com' +- } ++ runtimeConfig: { ++ apiKey: process.env.NUXT_API_KEY || 'super-secret-key', ++ public: { ++ websiteURL: 'https://public-data.com' ++ } ++ } +``` + +This also means that when you need to access public runtime config, it's behind a property called `public`. If you use public runtime config, you'll need to update your code. + +```diff +// MyWidget.vue +-
Website: {{ $config.websiteURL }}
++
Website: {{ $config.public.websiteURL }}
+``` diff --git a/docs/6.bridge/8.nitro.md b/docs/6.bridge/8.nitro.md new file mode 100644 index 0000000000..e5cb531579 --- /dev/null +++ b/docs/6.bridge/8.nitro.md @@ -0,0 +1,75 @@ +# Nitro + +## Remove Modules + +- Remove `@nuxt/nitro`: Bridge injects same functionality + +## Update Config + +```ts [nuxt.config.js|ts] +import { defineNuxtConfig } from '@nuxt/bridge' + +export default defineNuxtConfig({ + bridge: { + nitro: true + } +}) +``` + +## Update Your Scripts + +You will also need to update your scripts within your `package.json` to reflect the fact that Nuxt will now produce a Nitro server as build output. + +### Nuxi + +Nuxt 3 introduced the new Nuxt CLI command [`nuxi`](/docs/api/commands/add). Update your scripts as follows to leverage the better support from Nuxt Bridge: + +```diff +{ + "scripts": { +- "dev": "nuxt", ++ "dev": "nuxi dev", +- "build": "nuxt build", ++ "build": "nuxi build", +- "start": "nuxt start", ++ "start": "nuxi preview" + } +} +``` + +::alert +If `nitro: false`, use the `nuxt` command. +:: + +### Static Target + +If you have set `target: 'static'` in your `nuxt.config` then you need to ensure that you update your build script to be `nuxi generate`. + +```json [package.json] +{ + "scripts": { + "build": "nuxi generate" + } +} +``` + +### Server Target + +For all other situations, you can use the `nuxi build` command. + +```json [package.json] +{ + "scripts": { + "build": "nuxi build", + "start": "nuxi preview" + } +} +``` + +## Exclude Built Nitro Folder From Git + +Add the folder `.output` to the `.gitignore` file. + +## Ensure Everything Goes Well + +✔️ Try with `nuxi dev` and `nuxi build` (or `nuxi generate`) to see if everything goes well. diff --git a/docs/6.bridge/9.vite.md b/docs/6.bridge/9.vite.md new file mode 100644 index 0000000000..4bf7d289aa --- /dev/null +++ b/docs/6.bridge/9.vite.md @@ -0,0 +1,34 @@ +# Vite + +::alert{type=warning} +When using `vite`, [nitro](/docs/bridge/nitro) must have been configured. +:: + +## Remove Modules + +- Remove `nuxt-vite`: Bridge enables same functionality + +## Update Config + +```ts [nuxt.config.js|ts] +import { defineNuxtConfig } from '@nuxt/bridge' + +export default defineNuxtConfig({ + bridge: { + vite: true, + nitro: true + } +}) +``` + +## Configuration + +```ts [nuxt.config.js|ts] +import { defineNuxtConfig } from '@nuxt/bridge' + +export default defineNuxtConfig({ + vite: { + // Config for Vite + } +}) +```