Merge branch 'main' into fix/21721-spa-loading

.github/workflows/ci.yml

@@ -75,7 +75,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
         with:
           config: |
             paths:
@@ -91,7 +91,7 @@ jobs:
           queries: +security-and-quality
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
         with:
           category: "/language:javascript-typescript"
 

.github/workflows/docs-check-links.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Lychee link checker
-        uses: lycheeverse/lychee-action@ae4699150ab670dcfb64cc74e8680e776d9caae2 # for v1.8.0
+        uses: lycheeverse/lychee-action@f81112d0d2814ded911bd23e3beaa9dda9093915 # for v1.8.0
         with:
           # arguments with file types to check
           args: >-

.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@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
         if: github.repository == 'nuxt/nuxt' && success()
         with:
           sarif_file: results.sarif

docs/1.getting-started/3.configuration.md

@@ -33,7 +33,6 @@ You don't have to use TypeScript to build an application with Nuxt. However, it
 You can configure fully typed, per-environment overrides in your nuxt.config
 
 ```ts twoslash [nuxt.config.ts]
-// @errors: 2353
 export default defineNuxtConfig({
   $production: {
     routeRules: {
@@ -43,13 +42,15 @@ export default defineNuxtConfig({
   $development: {
     //
   },
-  $myCustomName: {
+  $env: {
+    staging: {
       // 
+    }
   },
 })
 ```
 
-To select an environment when running a Nuxt CLI command, simply pass the name to the `--envName` flag, like so: `nuxi build --envName myCustomName`.
+To select an environment when running a Nuxt CLI command, simply pass the name to the `--envName` flag, like so: `nuxi build --envName staging`.
 
 To learn more about the mechanism behind these overrides, please refer to the `c12` documentation on [environment-specific configuration](https://github.com/unjs/c12?tab=readme-ov-file#environment-specific-configuration).
 

package.json

@@ -107,7 +107,7 @@
     "rimraf": "6.0.1",
     "semver": "7.6.3",
     "sherif": "1.0.1",
-    "std-env": "3.7.0",
+    "std-env": "3.8.0",
     "tinyexec": "0.3.1",
     "tinyglobby": "0.2.10",
     "typescript": "5.6.3",

packages/nuxt/package.json

@@ -105,7 +105,7 @@
     "radix3": "^1.1.2",
     "scule": "^1.3.0",
     "semver": "^7.6.3",
-    "std-env": "^3.7.0",
+    "std-env": "^3.8.0",
     "strip-literal": "^2.1.0",
     "tinyglobby": "0.2.10",
     "ufo": "^1.5.4",

packages/rspack/package.json

@@ -60,7 +60,7 @@
     "postcss-loader": "^8.1.1",
     "postcss-url": "^10.1.3",
     "pug-plain-loader": "^1.1.0",
-    "std-env": "^3.7.0",
+    "std-env": "^3.8.0",
     "time-fix-plugin": "^2.0.7",
     "ufo": "^1.5.4",
     "unenv": "^1.10.0",

packages/schema/package.json

@@ -70,7 +70,7 @@
     "pathe": "^1.1.2",
     "pkg-types": "^1.2.1",
     "scule": "^1.3.0",
-    "std-env": "^3.7.0",
+    "std-env": "^3.8.0",
     "ufo": "^1.5.4",
     "uncrypto": "^0.1.3",
     "unimport": "^3.13.1",

packages/vite/package.json

@@ -57,7 +57,7 @@
     "pkg-types": "^1.2.1",
     "postcss": "^8.4.47",
     "rollup-plugin-visualizer": "^5.12.0",
-    "std-env": "^3.7.0",
+    "std-env": "^3.8.0",
     "strip-literal": "^2.1.0",
     "ufo": "^1.5.4",
     "unenv": "^1.10.0",

packages/webpack/package.json

@@ -60,7 +60,7 @@
     "postcss-loader": "^8.1.1",
     "postcss-url": "^10.1.3",
     "pug-plain-loader": "^1.1.0",
-    "std-env": "^3.7.0",
+    "std-env": "^3.8.0",
     "time-fix-plugin": "^2.0.7",
     "ufo": "^1.5.4",
     "unenv": "^1.10.0",

pnpm-lock.yaml

@@ -162,8 +162,8 @@ importers:
         specifier: 1.0.1
         version: 1.0.1
       std-env:
-        specifier: 3.7.0
+        specifier: 3.8.0
-        version: 3.7.0
+        version: 3.8.0
       tinyexec:
         specifier: 0.3.1
         version: 0.3.1
@@ -424,8 +424,8 @@ importers:
         specifier: ^7.6.3
         version: 7.6.3
       std-env:
-        specifier: ^3.7.0
+        specifier: ^3.8.0
-        version: 3.7.0
+        version: 3.8.0
       strip-literal:
         specifier: ^2.1.0
         version: 2.1.0
@@ -602,8 +602,8 @@ importers:
         specifier: ^1.1.0
         version: 1.1.0(pug@3.0.3)
       std-env:
-        specifier: ^3.7.0
+        specifier: ^3.8.0
-        version: 3.7.0
+        version: 3.8.0
       time-fix-plugin:
         specifier: ^2.0.7
         version: 2.0.7(webpack@5.96.1)
@@ -696,8 +696,8 @@ importers:
         specifier: ^1.3.0
         version: 1.3.0
       std-env:
-        specifier: ^3.7.0
+        specifier: ^3.8.0
-        version: 3.7.0
+        version: 3.8.0
       ufo:
         specifier: 1.5.4
         version: 1.5.4
@@ -910,8 +910,8 @@ importers:
         specifier: ^5.12.0
         version: 5.12.0(rollup@4.24.4)
       std-env:
-        specifier: ^3.7.0
+        specifier: ^3.8.0
-        version: 3.7.0
+        version: 3.8.0
       strip-literal:
         specifier: ^2.1.0
         version: 2.1.0
@@ -1052,8 +1052,8 @@ importers:
         specifier: ^1.1.0
         version: 1.1.0(pug@3.0.3)
       std-env:
-        specifier: ^3.7.0
+        specifier: ^3.8.0
-        version: 3.7.0
+        version: 3.8.0
       time-fix-plugin:
         specifier: ^2.0.7
         version: 2.0.7(webpack@5.96.1)
@@ -6878,6 +6878,9 @@ packages:
   std-env@3.7.0:
     resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
 
+  std-env@3.8.0:
+    resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==}
+
   stop-iteration-iterator@1.0.0:
     resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
     engines: {node: '>= 0.4'}
@@ -8774,7 +8777,7 @@ snapshots:
       semver: 7.6.3
       shiki: 1.22.0
       sirv: 3.0.0
-      std-env: 3.7.0
+      std-env: 3.8.0
       third-party-capital: 2.3.0
       ufo: 1.5.4
       unimport: 3.13.1(rollup@4.24.4)(webpack-sources@3.2.3)
@@ -8839,7 +8842,7 @@ snapshots:
       parse-git-config: 3.0.0
       pathe: 1.1.2
       rc9: 2.1.2
-      std-env: 3.7.0
+      std-env: 3.8.0
 
   '@nuxt/test-utils@3.14.4(@testing-library/vue@8.1.0(@vue/compiler-sfc@3.5.12)(vue@3.5.12(typescript@5.6.3)))(@vue/test-utils@2.4.6)(h3-nightly@2.0.0-1718872656.6765a6e)(happy-dom@15.11.0)(magicast@0.3.5)(nitropack@2.9.7(magicast@0.3.5)(webpack-sources@3.2.3))(playwright-core@1.48.2)(vite@5.4.10(@types/node@22.9.0)(sass@1.78.0)(terser@5.32.0))(vitest@2.1.4(@types/node@22.9.0)(happy-dom@15.11.0)(sass@1.78.0)(terser@5.32.0))(vue-router@4.4.5(vue@3.5.12(typescript@5.6.3)))(vue@3.5.12(typescript@5.6.3))(webpack-sources@3.2.3)':
     dependencies:
@@ -8862,7 +8865,7 @@ snapshots:
       perfect-debounce: 1.0.0
       radix3: 1.1.2
       scule: 1.3.0
-      std-env: 3.7.0
+      std-env: 3.8.0
       tinyexec: 0.3.1
       ufo: 1.5.4
       unenv: 1.10.0
@@ -10044,7 +10047,7 @@ snapshots:
       istanbul-reports: 3.1.7
       magic-string: 0.30.12
       magicast: 0.3.5
-      std-env: 3.7.0
+      std-env: 3.8.0
       test-exclude: 7.0.1
       tinyrainbow: 1.2.0
       vitest: 2.1.4(@types/node@22.9.0)(happy-dom@15.11.0)(sass@1.78.0)(terser@5.32.0)
@@ -10770,7 +10773,7 @@ snapshots:
       pkg-types: 1.2.1
       scule: 1.3.0
       semver: 7.6.3
-      std-env: 3.7.0
+      std-env: 3.8.0
       yaml: 2.5.1
     transitivePeerDependencies:
       - magicast
@@ -12598,7 +12601,7 @@ snapshots:
       mlly: 1.7.2
       node-forge: 1.3.1
       pathe: 1.1.2
-      std-env: 3.7.0
+      std-env: 3.8.0
       ufo: 1.5.4
       untun: 0.1.3
       uqr: 0.1.2
@@ -13326,7 +13329,7 @@ snapshots:
       semver: 7.6.3
       serve-placeholder: 2.0.2
       serve-static: 1.16.2
-      std-env: 3.7.0
+      std-env: 3.8.0
       ufo: 1.5.4
       uncrypto: 0.1.3
       unctx: 2.3.1(webpack-sources@3.2.3)
@@ -14559,6 +14562,8 @@ snapshots:
 
   std-env@3.7.0: {}
 
+  std-env@3.8.0: {}
+
   stop-iteration-iterator@1.0.0:
     dependencies:
       internal-slot: 1.0.7
@@ -15307,7 +15312,7 @@ snapshots:
       magic-string: 0.30.12
       pathe: 1.1.2
       picocolors: 1.1.1
-      std-env: 3.7.0
+      std-env: 3.8.0
       strip-literal: 2.1.0
       tinybench: 2.9.0
       tinypool: 0.8.4
@@ -15573,7 +15578,7 @@ snapshots:
       ansis: 3.3.2
       consola: 3.2.3
       pretty-time: 1.1.0
-      std-env: 3.7.0
+      std-env: 3.8.0
     optionalDependencies:
       '@rspack/core': 1.1.0
       webpack: 5.96.1