Merge remote-tracking branch 'origin/2.x' into bugfix/sorte-route-fix

nuxt · May 19, 2023 · 3c12270 · 3c12270
2 parents 640529c + 71c3595
commit 3c12270
Show file tree

Hide file tree

Showing 16 changed files with 48 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
     "puppeteer-core": "^20.2.1",
     "request": "^2.88.2",
     "rimraf": "^4.4.1",
-    "rollup": "3.21.8",
+    "rollup": "3.22.0",
     "rollup-plugin-esbuild": "^5.0.0",
     "rollup-plugin-license": "^3.0.1",
     "sass": "^1.62.1",

diff --git a/packages/babel-preset-app/package.json b/packages/babel-preset-app/package.json
@@ -28,7 +28,7 @@
     "regenerator-runtime": "^0.13.11"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/builder/package.json b/packages/builder/package.json
@@ -25,7 +25,7 @@
     "upath": "^2.0.1"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -38,7 +38,7 @@
     "wrap-ansi": "^7.0.0"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -21,7 +21,7 @@
     "ufo": "^1.1.2"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -18,7 +18,7 @@
     "lodash": "^4.17.21"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/generator/package.json b/packages/generator/package.json
@@ -19,7 +19,7 @@
     "ufo": "^1.1.2"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -27,7 +27,7 @@
     "ufo": "^1.1.2"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -28,7 +28,7 @@
     "@types/webpack-hot-middleware": "2.25.5"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -22,7 +22,7 @@
     "ufo": "^1.1.2"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/utils/test/__snapshots__/route.test.js.snap b/packages/utils/test/__snapshots__/route.test.js.snap
@@ -44,6 +44,12 @@ exports[`util: route util: route create createRoutes should allow snake case rou
     "name": "subpage-param",
     "path": "/subpage/:param?",
   },
+  {
+    "chunkName": "pages/parent/_",
+    "component": "/some/nuxt/app/pages/parent/_.vue",
+    "name": "parent-all",
+    "path": "/parent/*",
+  },
   {
     "chunkName": "pages/_param",
     "component": "/some/nuxt/app/pages/_param.vue",
@@ -171,6 +177,15 @@ exports[`util: route util: route create createRoutes should enforce trailing sla
       "strict": true,
     },
   },
+  {
+    "chunkName": "pages/parent/_",
+    "component": "/some/nuxt/app/pages/parent/_.vue",
+    "name": "parent-all",
+    "path": "/parent/*",
+    "pathToRegexpOptions": {
+      "strict": true,
+    },
+  },
   {
     "chunkName": "pages/_param",
     "component": "/some/nuxt/app/pages/_param.vue",
@@ -248,6 +263,15 @@ exports[`util: route util: route create createRoutes should remove trailing slas
       "strict": true,
     },
   },
+  {
+    "chunkName": "pages/parent/_",
+    "component": "/some/nuxt/app/pages/parent/_.vue",
+    "name": "parent-all",
+    "path": "/parent/*",
+    "pathToRegexpOptions": {
+      "strict": true,
+    },
+  },
   {
     "chunkName": "pages/_param",
     "component": "/some/nuxt/app/pages/_param.vue",

diff --git a/packages/utils/test/route.test.js b/packages/utils/test/route.test.js
@@ -212,7 +212,8 @@ describe('util: route', () => {
       'pages/another_route/_id.vue',
       'pages/parent/index.vue',
       'pages/parent/child/index.vue',
-      'pages/parent/child/test.vue'
+      'pages/parent/child/test.vue',
+      'pages/parent/_.vue'
     ]
     const srcDir = '/some/nuxt/app'
     const pagesDir = 'pages'

diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json
@@ -25,7 +25,7 @@
     "vuex": "^3.6.2"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
@@ -21,7 +21,7 @@
     "vue-server-renderer": "^2.7.14"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -14,7 +14,7 @@
     "@nuxt/utils": "2.16.3",
     "babel-loader": "^8.3.0",
     "cache-loader": "^4.1.0",
-    "caniuse-lite": "^1.0.30001487",
+    "caniuse-lite": "^1.0.30001488",
     "consola": "^3.1.0",
     "css-loader": "^5.2.7",
     "cssnano": "^6.0.1",
@@ -57,7 +57,7 @@
     "webpackbar": "^5.0.2"
   },
   "engines": {
-    "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+    "node": "^14.18.0 || >=16.10.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/yarn.lock b/yarn.lock
@@ -4651,10 +4651,10 @@ caniuse-lite@^1.0.30001464:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz#3859898b3cab65fc8905bb923df36ad35058153c"
   integrity sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==
 
-caniuse-lite@^1.0.30001487:
-  version "1.0.30001487"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001487.tgz#d882d1a34d89c11aea53b8cdc791931bdab5fe1b"
-  integrity sha512-83564Z3yWGqXsh2vaH/mhXfEM0wX+NlBCm1jYHOb97TrTWJEmPTccZgeLTPBUUb0PNVo+oomb7wkimZBIERClA==
+caniuse-lite@^1.0.30001488:
+  version "1.0.30001488"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001488.tgz#d19d7b6e913afae3e98f023db97c19e9ddc5e91f"
+  integrity sha512-NORIQuuL4xGpIy6iCCQGN4iFjlBXtfKWIenlUuyZJumLRIindLb7wXM+GO8erEhb7vXfcnf4BAg2PrSDN5TNLQ==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -13167,10 +13167,10 @@ rollup-plugin-license@^3.0.1:
     spdx-expression-validate "~2.0.0"
     spdx-satisfies "~5.0.1"
 
-rollup@3.21.8:
-  version "3.21.8"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-3.21.8.tgz#fc768008fe2c953f18210370fd70fe1ffff59e2c"
-  integrity sha512-SSFV2T2fWtQ/vvBip85u2Nr0GNKireabH9d7nXswBg+XSH+jbVDSYptRAEbCEsquhs503rpPA9POYAp0/Jhasw==
+rollup@3.22.0:
+  version "3.22.0"
+  resolved "https://registry.npmjs.org/rollup/-/rollup-3.22.0.tgz#e6671baebdd473154ac7998bbc57faabcd7bba20"
+  integrity sha512-imsigcWor5Y/dC0rz2q0bBt9PabcL3TORry2hAa6O6BuMvY71bqHyfReAz5qyAqiQATD1m70qdntqBfBQjVWpQ==
   optionalDependencies:
     fsevents "~2.3.2"