Merge remote-tracking branch 'origin/2.x-dev' into renovate/2.x-dev-g…

…lob-8.x
nuxt · Feb 1, 2023 · efdbf53 · efdbf53
2 parents ded9ef1 + 3293ce7
commit efdbf53
Show file tree

Hide file tree

Showing 17 changed files with 721 additions and 725 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -41,7 +41,7 @@ module.exports = {
   ],
 
   transformIgnorePatterns: [
-    'node_modules/(?!(@nuxt|nuxt|devalue))',
+    'node_modules/(?!(@nuxt|@sindresorhus|@szmarczak|nuxt|devalue|got|p-cancelable|cacheable-request|normalize-url|responselike|lowercase-keys|mimic-response|form-data-encoder|cacheable-lookup|get-port))',
     'packages/utils/test/serialize\\.test\\.input\\.js'
   ],
 

diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
     "@babel/core": "^7.20.12",
     "@babel/preset-env": "^7.20.2",
     "@ls-lint/ls-lint": "^1.11.2",
-    "@nuxtjs/eslint-config": "^11.0.0",
-    "@nuxtjs/eslint-config-typescript": "^11.0.0",
+    "@nuxtjs/eslint-config": "^12.0.0",
+    "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@rollup/plugin-alias": "^3.1.9",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
@@ -61,30 +61,30 @@
     "express": "^4.18.2",
     "finalhandler": "^1.2.0",
     "fs-extra": "^10.1.0",
-    "get-port": "^5.1.1",
+    "get-port": "^6.1.2",
     "glob": "^8.1.0",
-    "got": "^11.8.6",
+    "got": "^12.5.3",
     "improved-yarn-audit": "^3.0.0",
     "jest": "^28.1.1",
     "jest-environment-jsdom": "^29.4.1",
     "jest-util": "^29.4.1",
     "jiti": "^1.16.2",
-    "jsdom": "^20.0.3",
+    "jsdom": "^21.1.0",
     "jsonfile": "^6.1.0",
     "klaw-sync": "^6.0.0",
-    "lerna": "^5.6.2",
+    "lerna": "^6.4.1",
     "lodash": "^4.17.21",
     "node-fetch-native": "^1.0.1",
-    "puppeteer-core": "^17.1.3",
+    "puppeteer-core": "^19.6.3",
     "request": "^2.88.2",
-    "rimraf": "^3.0.2",
+    "rimraf": "^4.1.2",
     "rollup": "2.79.1",
     "rollup-plugin-esbuild": "^4.10.3",
     "rollup-plugin-license": "^2.9.1",
     "sass": "^1.58.0",
     "sass-loader": "^10.1.1",
-    "sort-package-json": "^1.57.0",
-    "typescript": "~4.9",
+    "sort-package-json": "^2.4.0",
+    "typescript": "~4.9.5",
     "vue-jest": "^4.0.1"
   }
 }
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -16,9 +16,9 @@
     "destr": "^1.2.2",
     "dotenv": "^16.0.3",
     "lodash": "^4.17.21",
-    "rc9": "^1.2.4",
+    "rc9": "^2.0.1",
     "std-env": "^3.3.1",
-    "ufo": "^0.8.6"
+    "ufo": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/generator/package.json b/packages/generator/package.json
@@ -16,7 +16,7 @@
     "fs-extra": "^10.1.0",
     "html-minifier": "^4.0.0",
     "node-html-parser": "^6.1.4",
-    "ufo": "^0.8.6"
+    "ufo": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/generator/src/generator.js b/packages/generator/src/generator.js
@@ -121,7 +121,7 @@ or disable the build step: \`generate({ build: false })\``)
         )
       } catch (e) {
         consola.error('Could not resolve routes')
-        throw e // eslint-disable-line no-unreachable
+        throw e
       }
     }
     let routes = []

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -24,7 +24,7 @@
     "serve-placeholder": "^1.2.4",
     "serve-static": "^1.15.0",
     "server-destroy": "^1.0.1",
-    "ufo": "^0.8.6"
+    "ufo": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -25,7 +25,7 @@
     "@types/serve-static": "1.15.0",
     "@types/terser-webpack-plugin": "4.2.1",
     "@types/webpack": "4.41.33",
-    "@types/webpack-bundle-analyzer": "4.4.1",
+    "@types/webpack-bundle-analyzer": "4.6.0",
     "@types/webpack-dev-middleware": "5.3.0",
     "@types/webpack-hot-middleware": "2.25.6"
   },

diff --git a/packages/types/test/vue.ts b/packages/types/test/vue.ts
@@ -61,9 +61,9 @@ options.loading = true
 
 const middlewares: Middleware[] = [
   'foo',
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
+
   () => {},
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
+
   async () => {}
 ]
 

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -19,7 +19,7 @@
     "serialize-javascript": "^6.0.1",
     "signal-exit": "^3.0.7",
     "ua-parser-js": "^1.0.33",
-    "ufo": "^0.8.6"
+    "ufo": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/utils/src/route.js b/packages/utils/src/route.js
@@ -41,7 +41,6 @@ export const flatRoutes = function flatRoutes (router, fileName = '', routes = [
   return routes
 }
 
-// eslint-disable-next-line default-param-last
 function cleanChildrenRoutes (routes, isChild = false, routeNameSplitter = '-', trailingSlash, parentRouteName) {
   const regExpIndex = new RegExp(`${routeNameSplitter}index$`)
   const regExpParentRouteName = new RegExp(`^${parentRouteName}${routeNameSplitter}`)

diff --git a/packages/utils/test/serialize.test.input.js b/packages/utils/test/serialize.test.input.js
@@ -9,15 +9,15 @@ module.exports = {
     fn3: foobar => {
       return 3
     },
-    // eslint-disable-next-line arrow-parens
+
     fn4: arg1 =>
       2 * arg1,
     fn5: () => {},
-    // eslint-disable-next-line arrow-parens
+
     fn6: foobar => (foobar ? 1 : 0)
   },
   normal: {
-    fn: function () {} // eslint-disable-line object-shorthand
+    fn: function () {}
   },
   shorthand: {
     fn () {},

diff --git a/packages/vue-app/package.json b/packages/vue-app/package.json
@@ -14,7 +14,7 @@
   ],
   "dependencies": {
     "node-fetch-native": "^1.0.1",
-    "ufo": "^0.8.6",
+    "ufo": "^1.0.1",
     "unfetch": "^4.2.0",
     "vue": "^2.7.10",
     "vue-client-only": "^2.1.0",

diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
@@ -15,7 +15,7 @@
     "fs-extra": "^10.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^5.1.1",
-    "ufo": "^0.8.6",
+    "ufo": "^1.0.1",
     "vue": "^2.7.10",
     "vue-meta": "^2.4.0",
     "vue-server-renderer": "^2.7.14"

diff --git a/packages/webpack/package.json b/packages/webpack/package.json
@@ -42,7 +42,7 @@
     "terser-webpack-plugin": "^4.2.3",
     "thread-loader": "^3.0.4",
     "time-fix-plugin": "^2.0.7",
-    "ufo": "^0.8.6",
+    "ufo": "^1.0.1",
     "url-loader": "^4.1.1",
     "vue-loader": "^15.10.1",
     "vue-style-loader": "^4.1.3",

diff --git a/test/dev/async-config.size-limit.test.js b/test/dev/async-config.size-limit.test.js
@@ -26,7 +26,7 @@ describe('nuxt basic resources size limit', () => {
     const LEGACY_JS_RESOURCES_GZIP_KB_SIZE = 88
     expect(legacyResourcesSize.gzip).toBeWithinSize(LEGACY_JS_RESOURCES_GZIP_KB_SIZE)
 
-    const LEGACY_JS_RESOURCES_BROTLI_KB_SIZE = 72
+    const LEGACY_JS_RESOURCES_BROTLI_KB_SIZE = 73
     expect(legacyResourcesSize.brotli).toBeWithinSize(LEGACY_JS_RESOURCES_BROTLI_KB_SIZE)
   })
 

diff --git a/test/utils/index.js b/test/utils/index.js
@@ -1,8 +1,11 @@
 import klawSync from 'klaw-sync'
-import got from 'got'
+import { got } from 'got'
+
+// eslint-disable-next-line
+import getPort from 'get-port'
 
 export { getNuxtConfig } from '../../packages/config'
-export { default as getPort } from 'get-port'
+export { getPort }
 
 export * from './nuxt'
 export * from './resource-size'