diff --git a/packages/nuxt3/src/cli/commands/webpack.ts b/packages/nuxt3/src/cli/commands/webpack.ts index 9c881cf94d..d57e4fefb6 100644 --- a/packages/nuxt3/src/cli/commands/webpack.ts +++ b/packages/nuxt3/src/cli/commands/webpack.ts @@ -88,7 +88,7 @@ function advancedGet (obj = {}, query = '') { const v = get(i, l) if (!v) { - return + return false } if ( @@ -99,6 +99,8 @@ function advancedGet (obj = {}, query = '') { ) { return true } + + return false }) if (result.length === 1) { diff --git a/packages/nuxt3/src/config/options.ts b/packages/nuxt3/src/config/options.ts index 6e7f93c0ed..1d2522bb3a 100644 --- a/packages/nuxt3/src/config/options.ts +++ b/packages/nuxt3/src/config/options.ts @@ -385,8 +385,11 @@ function normalizeConfig (_options: CliConfiguration) { overrideProp(options.server, 'timing', { total: true, ...options.server.timing }) } - overrideProp(options, 'serverMiddleware', Array.isArray(options.serverMiddleware) ? options.serverMiddleware : Object.entries(options.serverMiddleware) - .map(([path, handler]) => ({ path, handler })) + overrideProp(options, 'serverMiddleware', + Array.isArray(options.serverMiddleware) + ? options.serverMiddleware + : Object.entries(options.serverMiddleware) + .map(([path, handler]) => ({ path, handler })) ) // Generate staticAssets diff --git a/packages/nuxt3/src/generator/generator.ts b/packages/nuxt3/src/generator/generator.ts index 51a520ab64..3decc609c7 100644 --- a/packages/nuxt3/src/generator/generator.ts +++ b/packages/nuxt3/src/generator/generator.ts @@ -329,7 +329,7 @@ export default class Generator { // If crawler activated and called from generateRoutes() if (this.options.generate.crawler && this.options.render.ssr) { const possibleTrailingSlash = this.options.router.trailingSlash ? '/' : '' - parse(html).querySelectorAll('a').map((el) => { + parse(html).querySelectorAll('a').forEach((el) => { const sanitizedHref = (el.getAttribute('href') || '') .replace(this.options.router.base, '/') .replace(/\/+$/, '') diff --git a/packages/nuxt3/src/server/jsdom.ts b/packages/nuxt3/src/server/jsdom.ts index 23c4934a82..9885780120 100644 --- a/packages/nuxt3/src/server/jsdom.ts +++ b/packages/nuxt3/src/server/jsdom.ts @@ -15,7 +15,7 @@ export default async function renderAndGetWindow ( loadedCallback, loadingTimeout = 2000, globals - }: Options + }: Partial = {} ) { const jsdom = await import('jsdom') .then(m => m.default || m) diff --git a/packages/nuxt3/src/utils/route.ts b/packages/nuxt3/src/utils/route.ts index 82c762feed..1e8819a4ba 100644 --- a/packages/nuxt3/src/utils/route.ts +++ b/packages/nuxt3/src/utils/route.ts @@ -117,17 +117,21 @@ export const sortRoutes = function sortRoutes (routes: NuxtRouteConfig[]) { // If a.length >= b.length if (i === _b.length - 1 && res === 0) { // unless * found sort by level, then alphabetically - res = _a[i] === '*' ? -1 : ( - _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length) - ) + res = _a[i] === '*' + ? -1 + : ( + _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length) + ) } } if (res === 0) { // unless * found sort by level, then alphabetically - res = _a[i - 1] === '*' && _b[i] ? 1 : ( - _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length) - ) + res = _a[i - 1] === '*' && _b[i] + ? 1 + : ( + _a.length === _b.length ? a.path.localeCompare(b.path) : (_a.length - _b.length) + ) } return res }) diff --git a/packages/nuxt3/src/webpack/plugins/externals.ts b/packages/nuxt3/src/webpack/plugins/externals.ts index 62cfb3497c..088e03acaa 100644 --- a/packages/nuxt3/src/webpack/plugins/externals.ts +++ b/packages/nuxt3/src/webpack/plugins/externals.ts @@ -5,7 +5,7 @@ function contains (arr, val) { return arr && arr.includes(val) } -const atPrefix = new RegExp('^@', 'g') +const atPrefix = /^@/g function readDir (dirName) { if (!fs.existsSync(dirName)) { @@ -95,10 +95,7 @@ function containsPattern (arr, val) { ) } -const scopedModuleRegex = new RegExp( - '@[a-zA-Z0-9][\\w-.]+/[a-zA-Z0-9][\\w-.]+([a-zA-Z0-9./]+)?', - 'g' -) +const scopedModuleRegex = /@[a-zA-Z0-9][\\w-.]+\/[a-zA-Z0-9][\\w-.]+([a-zA-Z0-9./]+)?/g function getModuleName (request, includeAbsolutePaths) { let req = request diff --git a/packages/nuxt3/src/webpack/presets/base.ts b/packages/nuxt3/src/webpack/presets/base.ts index 4848bb32e0..a1a562dd0e 100644 --- a/packages/nuxt3/src/webpack/presets/base.ts +++ b/packages/nuxt3/src/webpack/presets/base.ts @@ -192,7 +192,8 @@ function getOutput (ctx: WebpackConfigContext): Configuration['output'] { path: resolve(options.buildDir, 'dist', ctx.isServer ? 'server' : 'client'), filename: fileName(ctx, 'app'), chunkFilename: fileName(ctx, 'chunk'), - publicPath: isUrl(options.build.publicPath) ? options.build.publicPath + publicPath: isUrl(options.build.publicPath) + ? options.build.publicPath : urlJoin(options.router.base, options.build.publicPath) } } diff --git a/packages/nuxt3/src/webpack/utils/postcss.ts b/packages/nuxt3/src/webpack/utils/postcss.ts index 1e734d8699..0a8460c687 100644 --- a/packages/nuxt3/src/webpack/utils/postcss.ts +++ b/packages/nuxt3/src/webpack/utils/postcss.ts @@ -153,7 +153,7 @@ export default class PostcssConfig { const plugin = this.nuxt.resolver.requireModule(p) const opts = plugins[p] if (opts === false) { - return // Disabled + return false // Disabled } return plugin(opts) })