Merge remote-tracking branch 'upstream/3.x' into 3.x

# Conflicts: # packages/kit/package.json # packages/schema/package.json # packages/ui-templates/package.json # pnpm-lock.yaml
translation-gang · Oct 4, 2024 · 99e55c1 · 99e55c1
2 parents 42303f7 + 31a91c4
commit 99e55c1
Show file tree

Hide file tree

Showing 14 changed files with 940 additions and 936 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:lts@sha256:af65937f2a7e69098ba4126188aaa70834dfe24c4a0761372bfa9cde1af9248f
+FROM node:lts@sha256:db5dd2f30cb82a8bdbd16acd4a8f3f2789f5b24f6ce43f98aa041be848c82e45
 
 RUN apt-get update && \
     apt-get install -fy libnss3 libnspr4 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdbus-1-3 libdrm2 libxkbcommon0 libatspi2.0-0 libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm1 libasound2 && \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,7 +75,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+        uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           config: |
             paths:
@@ -91,7 +91,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+        uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           category: "/language:javascript-typescript"
 
@@ -242,7 +242,7 @@ jobs:
           TEST_PAYLOAD: ${{ matrix.payload }}
           SKIP_BUNDLE_SIZE: ${{ github.event_name != 'push' || matrix.env == 'dev' || matrix.builder == 'webpack' || matrix.context == 'default' || matrix.payload == 'js' || runner.os == 'Windows' }}
 
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
         if: github.event_name != 'push' && matrix.env == 'built' && matrix.builder == 'vite' && matrix.context == 'default' && matrix.os == 'ubuntu-latest' && matrix.manifest == 'manifest-on'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/.github/workflows/docs-check-links.yml b/.github/workflows/docs-check-links.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Lychee link checker
-        uses: lycheeverse/lychee-action@5047c2a4052946424ce139fe111135f6d7c0fe0b # for v1.8.0
+        uses: lycheeverse/lychee-action@897f08a07f689df1a43076f4374af272f66a6dd1 # for v1.8.0
         with:
           # arguments with file types to check
           args: >-

diff --git a/.github/workflows/lint-workflows.yml b/.github/workflows/lint-workflows.yml
@@ -26,6 +26,6 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       # From https://github.com/rhysd/actionlint/blob/main/docs/usage.md#use-actionlint-on-github-actions
       - name: Check workflow files
-        uses: docker://rhysd/actionlint:1.7.2@sha256:89d3f90f82781dee3c8724651129634b08cf2241bbd67fcd02a1c5198119fc5e
+        uses: docker://rhysd/actionlint:1.7.3@sha256:7617f05bd698cd2f1c3aedc05bc733ccec92cca0738f3e8722c32c5b42c70ae6
         with:
           args: -color
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -68,7 +68,7 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         if: github.repository == 'nuxt/nuxt' && success()
         with:
           sarif_file: results.sarif
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "nuxt": "workspace:*",
     "ohash": "1.1.4",
     "postcss": "8.4.47",
-    "rollup": "4.22.5",
+    "rollup": "4.24.0",
     "send": ">=0.19.0",
     "typescript": "5.6.2",
     "ufo": "1.5.4",
@@ -64,10 +64,10 @@
     "@types/eslint__js": "8.42.3",
     "@types/node": "20.16.10",
     "@types/semver": "7.5.8",
-    "@unhead/schema": "1.11.6",
-    "@unhead/vue": "1.11.6",
+    "@unhead/schema": "1.11.7",
+    "@unhead/vue": "1.11.7",
     "@vitejs/plugin-vue": "5.1.4",
-    "@vitest/coverage-v8": "2.1.1",
+    "@vitest/coverage-v8": "2.1.2",
     "@vue/test-utils": "2.4.6",
     "autoprefixer": "10.4.20",
     "case-police": "0.7.0",
@@ -78,11 +78,11 @@
     "devalue": "5.1.1",
     "eslint": "9.11.1",
     "eslint-plugin-no-only-tests": "3.3.0",
-    "eslint-plugin-perfectionist": "3.7.0",
+    "eslint-plugin-perfectionist": "3.8.0",
     "eslint-typegen": "0.3.2",
     "h3": "1.12.0",
     "happy-dom": "15.7.4",
-    "jiti": "2.0.0",
+    "jiti": "2.1.0",
     "markdownlint-cli": "0.42.0",
     "nitropack": "2.9.7",
     "nuxi": "3.14.0",
@@ -96,16 +96,16 @@
     "sherif": "1.0.0",
     "std-env": "3.7.0",
     "tinyexec": "0.3.0",
-    "tinyglobby": "0.2.6",
+    "tinyglobby": "0.2.9",
     "typescript": "5.6.2",
     "ufo": "1.5.4",
-    "vitest": "2.1.1",
+    "vitest": "2.1.2",
     "vitest-environment-nuxt": "1.0.1",
     "vue": "3.5.10",
     "vue-router": "4.4.5",
     "vue-tsc": "2.1.6"
   },
-  "packageManager": "pnpm@9.11.0",
+  "packageManager": "pnpm@9.12.0",
   "engines": {
     "node": "^16.10.0 || >=18.0.0"
   },

diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/kit",
-  "version": "3.12.2",
+  "version": "3.13.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -27,33 +27,35 @@
   },
   "dependencies": {
     "@nuxt/schema": "workspace:*",
-    "c12": "^2.0.0-beta.2",
+    "c12": "^2.0.0",
     "consola": "^3.2.3",
     "defu": "^6.1.4",
     "destr": "^2.0.3",
-    "errx": "^0.1.0",
     "globby": "^14.0.2",
     "hash-sum": "^2.0.0",
     "ignore": "^6.0.2",
-    "jiti": "^2.0.0",
+    "jiti": "^2.1.0",
     "klona": "^2.0.6",
+    "knitwork": "^1.1.0",
     "mlly": "^1.7.1",
     "pathe": "^1.1.2",
     "pkg-types": "^1.2.0",
     "scule": "^1.3.0",
     "semver": "^7.6.3",
     "ufo": "^1.5.4",
     "unctx": "^2.3.1",
-    "unimport": "^3.13.0",
+    "unimport": "^3.13.1",
     "untyped": "^1.5.0"
   },
   "devDependencies": {
     "@types/hash-sum": "1.0.2",
+    "@types/lodash-es": "4.17.12",
     "@types/semver": "7.5.8",
-    "nitro": "npm:[email protected]",
-    "unbuild": "3.0.0-rc.7",
+    "lodash-es": "4.17.21",
+    "nitropack": "2.9.7",
+    "unbuild": "latest",
     "vite": "5.4.8",
-    "vitest": "2.1.1",
+    "vitest": "2.1.2",
     "webpack": "5.95.0"
   },
   "engines": {

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
@@ -60,18 +60,18 @@
   },
   "dependencies": {
     "@nuxt/devalue": "^2.0.2",
-    "@nuxt/devtools": "^1.5.1",
+    "@nuxt/devtools": "^1.5.2",
     "@nuxt/kit": "workspace:*",
     "@nuxt/schema": "workspace:*",
     "@nuxt/telemetry": "^2.6.0",
     "@nuxt/vite-builder": "workspace:*",
-    "@unhead/dom": "^1.11.6",
-    "@unhead/shared": "^1.11.6",
-    "@unhead/ssr": "^1.11.6",
-    "@unhead/vue": "^1.11.6",
+    "@unhead/dom": "^1.11.7",
+    "@unhead/shared": "^1.11.7",
+    "@unhead/ssr": "^1.11.7",
+    "@unhead/vue": "^1.11.7",
     "@vue/shared": "^3.5.10",
     "acorn": "8.12.1",
-    "c12": "^1.11.2",
+    "c12": "^2.0.0",
     "chokidar": "^3.6.0",
     "compatx": "^0.1.8",
     "consola": "^3.2.3",
@@ -88,7 +88,7 @@
     "hookable": "^5.5.3",
     "ignore": "^6.0.2",
     "impound": "^0.1.0",
-    "jiti": "^2.0.0",
+    "jiti": "^2.1.0",
     "klona": "^2.0.6",
     "knitwork": "^1.1.0",
     "magic-string": "^0.30.11",
@@ -107,14 +107,14 @@
     "semver": "^7.6.3",
     "std-env": "^3.7.0",
     "strip-literal": "^2.1.0",
-    "tinyglobby": "0.2.6",
+    "tinyglobby": "0.2.9",
     "ufo": "^1.5.4",
     "ultrahtml": "^1.5.3",
     "uncrypto": "^0.1.3",
     "unctx": "^2.3.1",
     "unenv": "^1.10.0",
-    "unhead": "^1.11.6",
-    "unimport": "^3.13.0",
+    "unhead": "^1.11.7",
+    "unimport": "^3.13.1",
     "unplugin": "^1.14.1",
     "unplugin-vue-router": "^0.10.8",
     "unstorage": "^1.12.0",
@@ -133,7 +133,7 @@
     "@vue/compiler-sfc": "3.5.10",
     "unbuild": "latest",
     "vite": "5.4.8",
-    "vitest": "2.1.1"
+    "vitest": "2.1.2"
   },
   "peerDependencies": {
     "@parcel/watcher": "^2.1.0",

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/schema",
-  "version": "3.12.2",
+  "version": "3.13.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -39,19 +39,19 @@
     "@types/file-loader": "5.0.4",
     "@types/pug": "2.0.10",
     "@types/sass-loader": "8.0.9",
-    "@unhead/schema": "1.11.6",
+    "@unhead/schema": "1.11.7",
     "@vitejs/plugin-vue": "5.1.4",
     "@vitejs/plugin-vue-jsx": "4.0.1",
     "@vue/compiler-core": "3.5.10",
     "@vue/compiler-sfc": "3.5.10",
     "@vue/language-core": "2.1.6",
-    "c12": "2.0.0-beta.2",
+    "c12": "2.0.0",
     "esbuild-loader": "4.2.2",
-    "h3": "npm:[email protected]",
+    "h3": "1.12.0",
     "ignore": "6.0.2",
-    "nitro": "npm:[email protected]",
+    "nitropack": "2.9.7",
     "ofetch": "1.4.0",
-    "unbuild": "3.0.0-rc.7",
+    "unbuild": "latest",
     "unctx": "2.3.1",
     "unenv": "1.10.0",
     "vite": "5.4.8",
@@ -73,7 +73,7 @@
     "std-env": "^3.7.0",
     "ufo": "^1.5.4",
     "uncrypto": "^0.1.3",
-    "unimport": "^3.13.0",
+    "unimport": "^3.13.1",
     "untyped": "^1.5.0"
   },
   "engines": {

diff --git a/packages/ui-templates/package.json b/packages/ui-templates/package.json
@@ -18,18 +18,20 @@
     "test": "pnpm lint && pnpm build"
   },
   "devDependencies": {
-    "@unocss/reset": "0.62.4",
+    "@types/lodash-es": "4.17.12",
+    "@unocss/reset": "0.63.2",
     "critters": "0.0.24",
     "html-validate": "8.24.0",
     "htmlnano": "2.1.1",
-    "jiti": "2.0.0",
+    "jiti": "2.1.0",
     "knitwork": "1.1.0",
+    "lodash-es": "4.17.21",
     "pathe": "1.1.2",
     "prettier": "3.3.3",
     "scule": "1.3.0",
     "tinyexec": "0.3.0",
-    "tinyglobby": "0.2.6",
-    "unocss": "0.62.4",
+    "tinyglobby": "0.2.9",
+    "unocss": "0.63.2",
     "vite": "5.4.8"
   }
 }
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -27,7 +27,7 @@
     "@nuxt/schema": "workspace:*",
     "@types/clear": "0.1.4",
     "@types/estree": "1.0.6",
-    "rollup": "4.22.5",
+    "rollup": "4.24.0",
     "unbuild": "latest",
     "vue": "3.5.10"
   },
@@ -47,7 +47,7 @@
     "externality": "^1.0.2",
     "get-port-please": "^3.1.2",
     "h3": "^1.12.0",
-    "jiti": "^2.0.0",
+    "jiti": "^2.1.0",
     "knitwork": "^1.1.0",
     "magic-string": "^0.30.11",
     "mlly": "^1.7.1",
@@ -63,7 +63,7 @@
     "unenv": "^1.10.0",
     "unplugin": "^1.14.1",
     "vite": "^5.4.8",
-    "vite-node": "^2.1.1",
+    "vite-node": "^2.1.2",
     "vite-plugin-checker": "^0.8.0",
     "vue-bundle-renderer": "^2.1.1"
   },

diff --git a/packages/vite/src/plugins/ssr-styles.ts b/packages/vite/src/plugins/ssr-styles.ts
@@ -71,7 +71,9 @@ export function ssrStylesPlugin (options: SSRStylePluginOptions): Plugin {
           : outputOptions.assetFileNames({
             type: 'asset',
             name: `${fileName}-styles.mjs`,
+            names: [`${fileName}-styles.mjs`],
             originalFileName: `${fileName}-styles.mjs`,
+            originalFileNames: [`${fileName}-styles.mjs`],
             source: '',
           })
 

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -39,7 +39,7 @@
     "fork-ts-checker-webpack-plugin": "^9.0.2",
     "h3": "^1.12.0",
     "hash-sum": "^2.0.0",
-    "jiti": "^2.0.0",
+    "jiti": "^2.1.0",
     "lodash-es": "4.17.21",
     "magic-string": "^0.30.11",
     "memfs": "^4.12.0",