Skip to content

Commit 9963f71

Browse files
sapphi-redsapphi-red
committed
perf: regex perf and stylistic issues
1 parent 3a365d1 commit 9963f71

File tree

36 files changed

+94
-87
lines changed

36 files changed

+94
-87
lines changed

‎.eslintrc.cjs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ module.exports = defineConfig({
9898
memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
9999
allowSeparatedGroups: false
100100
}
101-
]
101+
],
102+
103+
'regexp/no-contradiction-with-assertion': 'error'
102104
},
103105
overrides: [
104106
{

‎packages/create-vite/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ function copy(src: string, dest: string) {
388388
}
389389

390390
function isValidPackageName(projectName: string) {
391-
return /^(?:@[a-z0-9-*~][a-z0-9-*._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/.test(
391+
return /^(?:@[a-z\d\-*~][a-z\d\-*._~]*\/)?[a-z\d\-~][a-z\d\-._~]*$/.test(
392392
projectName
393393
)
394394
}
@@ -399,7 +399,7 @@ function toValidPackageName(projectName: string) {
399399
.toLowerCase()
400400
.replace(/\s+/g, '-')
401401
.replace(/^[._]/, '')
402-
.replace(/[^a-z0-9-~]+/g, '-')
402+
.replace(/[^a-z\d\-~]+/g, '-')
403403
}
404404

405405
function copyDir(srcDir: string, destDir: string) {

‎packages/plugin-react/src/fast-refresh.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if (import.meta.hot) {
5656
RefreshRuntime.register(type, __SOURCE__ + " " + id)
5757
};
5858
window.$RefreshSig$ = RefreshRuntime.createSignatureFunctionForTransform;
59-
}`.replace(/[\n]+/gm, '')
59+
}`.replace(/\n+/g, '')
6060

6161
const timeout = `
6262
if (!window.__vite_plugin_react_timeout) {

‎packages/plugin-react/src/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
110110
// - import * as React from 'react';
111111
// - import React from 'react';
112112
// - import React, {useEffect} from 'react';
113-
const importReactRE = /(^|\n)import\s+(\*\s+as\s+)?React(,|\s+)/
113+
const importReactRE = /(?:^|\n)import\s+(?:\*\s+as\s+)?React(?:,|\s+)/
114114

115115
// Any extension, including compound ones like '.bs.js'
116-
const fileExtensionRE = /\.[^\/\s\?]+$/
116+
const fileExtensionRE = /\.[^/\s?]+$/
117117

118118
const viteBabel: Plugin = {
119119
name: 'vite:react-babel',
@@ -202,7 +202,7 @@ export default function viteReact(opts: Options = {}): PluginOption[] {
202202
filepath.match(fileExtensionRE) ||
203203
[]
204204

205-
if (/\.(mjs|[tj]sx?)$/.test(extension)) {
205+
if (/\.(?:mjs|[tj]sx?)$/.test(extension)) {
206206
const isJSX = extension.endsWith('x')
207207
const isNodeModules = id.includes('/node_modules/')
208208
const isProjectFile =

‎packages/plugin-vue/src/handleHotUpdate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type { ResolvedOptions } from '.'
1111

1212
const debug = _debug('vite:hmr')
1313

14-
const directRequestRE = /(\?|&)direct\b/
14+
const directRequestRE = /(?:\?|&)direct\b/
1515

1616
/**
1717
* Vite-specific HMR handling
@@ -148,7 +148,7 @@ export async function handleHotUpdate(
148148
affectedModules.add(mainModule)
149149
} else if (mainModule && !affectedModules.has(mainModule)) {
150150
const styleImporters = [...mainModule.importers].filter((m) =>
151-
/\.css($|\?)/.test(m.url)
151+
/\.css(?:$|\?)/.test(m.url)
152152
)
153153
styleImporters.forEach((m) => affectedModules.add(m))
154154
}

‎packages/vite/src/node/config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ export async function resolveConfig(
465465
)
466466

467467
const clientAlias = [
468-
{ find: /^[\/]?@vite\/env/, replacement: () => ENV_ENTRY },
469-
{ find: /^[\/]?@vite\/client/, replacement: () => CLIENT_ENTRY }
468+
{ find: /^\/?@vite\/env/, replacement: () => ENV_ENTRY },
469+
{ find: /^\/?@vite\/client/, replacement: () => CLIENT_ENTRY }
470470
]
471471

472472
// resolve alias with internal client alias

‎packages/vite/src/node/constants.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ export const DEFAULT_CONFIG_FILES = [
4646

4747
export const JS_TYPES_RE = /\.(?:j|t)sx?$|\.mjs$/
4848

49-
export const OPTIMIZABLE_ENTRY_RE = /\.(?:[cm]?[jt]s)$/
49+
export const OPTIMIZABLE_ENTRY_RE = /\.[cm]?[jt]s$/
5050

51-
export const SPECIAL_QUERY_RE = /[\?&](?:worker|sharedworker|raw|url)\b/
51+
export const SPECIAL_QUERY_RE = /[?&](?:worker|sharedworker|raw|url)\b/
5252

5353
/**
5454
* Prefix for resolved fs paths, since windows paths may not be valid as URLs.
@@ -129,7 +129,7 @@ export const DEFAULT_ASSETS_RE = new RegExp(
129129
`\\.(` + KNOWN_ASSET_TYPES.join('|') + `)(\\?.*)?$`
130130
)
131131

132-
export const DEP_VERSION_RE = /[\?&](v=[\w\.-]+)\b/
132+
export const DEP_VERSION_RE = /[?&](v=[\w.-]+)\b/
133133

134134
export const loopbackHosts = new Set([
135135
'localhost',

‎packages/vite/src/node/optimizer/esbuildDepPlugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export function esbuildCjsExternalPlugin(externals: string[]): Plugin {
265265
name: 'cjs-external',
266266
setup(build) {
267267
const escape = (text: string) =>
268-
`^${text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')}$`
268+
`^${text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')}$`
269269
const filter = new RegExp(externals.map(escape).join('|'))
270270

271271
build.onResolve({ filter: /.*/, namespace: 'external' }, (args) => ({

‎packages/vite/src/node/optimizer/scan.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const htmlTypesRE = /\.(html|vue|svelte|astro|imba)$/
4040
// since even missed imports can be caught at runtime, and false positives will
4141
// simply be ignored.
4242
export const importsRE =
43-
/(?<!\/\/.*)(?<=^|;|\*\/)\s*import(?!\s+type)(?:[\w*{}\n\r\t, ]+from\s*)?\s*("[^"]+"|'[^']+')\s*(?=$|;|\/\/|\/\*)/gm
43+
/(?<!\/\/.*)(?<=^|;|\*\/)\s*import(?!\s+type)(?:[\w*{}\n\r\t, ]+from)?\s*("[^"]+"|'[^']+')\s*(?=$|;|\/\/|\/\*)/gm
4444

4545
export async function scanImports(config: ResolvedConfig): Promise<{
4646
deps: Record<string, string>
@@ -149,13 +149,13 @@ function globEntries(pattern: string | string[], config: ResolvedConfig) {
149149
}
150150

151151
const scriptModuleRE =
152-
/(<script\b[^>]*type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gims
153-
export const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims
152+
/(<script\b[^>]+type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gis
153+
export const scriptRE = /(<script(?:\s[^>]*>|>))(.*?)<\/script>/gis
154154
export const commentRE = /<!--.*?-->/gs
155-
const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
156-
const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
157-
const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
158-
const contextRE = /\bcontext\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
155+
const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/i
156+
const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/i
157+
const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/i
158+
const contextRE = /\bcontext\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/i
159159

160160
function esbuildScanPlugin(
161161
config: ResolvedConfig,

‎packages/vite/src/node/plugins/asset.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const duplicateAssets = new WeakMap<
2929
Map<string, OutputAsset>
3030
>()
3131

32-
const rawRE = /(\?|&)raw(?:&|$)/
32+
const rawRE = /(?:\?|&)raw(?:&|$)/
3333
const urlRE = /(\?|&)url(?:&|$)/
3434

3535
const assetCache = new WeakMap<ResolvedConfig, Map<string, string>>()
@@ -173,7 +173,7 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
173173
return
174174
}
175175

176-
id = id.replace(urlRE, '$1').replace(/[\?&]$/, '')
176+
id = id.replace(urlRE, '$1').replace(/[?&]$/, '')
177177
const url = await fileToUrl(id, config, this)
178178
return `export default ${JSON.stringify(url)}`
179179
},

‎packages/vite/src/node/plugins/assetImportMetaUrl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
3838
) {
3939
let s: MagicString | undefined
4040
const assetImportMetaUrlRE =
41-
/\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*,?\s*\)/g
41+
/\bnew\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*(?:,\s*)?\)/g
4242
const cleanString = stripLiteral(code)
4343

4444
let match: RegExpExecArray | null

‎packages/vite/src/node/plugins/css.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,14 @@ export interface CSSModulesOptions {
111111

112112
const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)($|\\?)`
113113
const cssLangRE = new RegExp(cssLangs)
114+
// eslint-disable-next-line regexp/no-unused-capturing-group
114115
const cssModuleRE = new RegExp(`\\.module${cssLangs}`)
115-
const directRequestRE = /(\?|&)direct\b/
116-
const htmlProxyRE = /(\?|&)html-proxy\b/
116+
const directRequestRE = /(?:\?|&)direct\b/
117+
const htmlProxyRE = /(?:\?|&)html-proxy\b/
117118
const commonjsProxyRE = /\?commonjs-proxy/
118-
const inlineRE = /(\?|&)inline\b/
119-
const inlineCSSRE = /(\?|&)inline-css\b/
120-
const usedRE = /(\?|&)used\b/
119+
const inlineRE = /(?:\?|&)inline\b/
120+
const inlineCSSRE = /(?:\?|&)inline-css\b/
121+
const usedRE = /(?:\?|&)used\b/
121122
const varRE = /^var\(/i
122123

123124
const cssBundleName = 'style.css'
@@ -1175,11 +1176,12 @@ type CssUrlReplacer = (
11751176
) => string | Promise<string>
11761177
// https://drafts.csswg.org/css-syntax-3/#identifier-code-point
11771178
export const cssUrlRE =
1178-
/(?<=^|[^\w\-\u0080-\uffff])url\(\s*('[^']+'|"[^"]+"|[^'")]+)\s*\)/
1179+
/(?<=^|[^\w\-\u0080-\uffff])url\((\s*('[^']+'|"[^"]+")\s*|[^'")]+)\)/
11791180
export const cssDataUriRE =
1180-
/(?<=^|[^\w\-\u0080-\uffff])data-uri\(\s*('[^']+'|"[^"]+"|[^'")]+)\s*\)/
1181+
/(?<=^|[^\w\-\u0080-\uffff])data-uri\((\s*('[^']+'|"[^"]+")\s*|[^'")]+)\)/
11811182
export const importCssRE = /@import ('[^']+\.css'|"[^"]+\.css"|[^'")]+\.css)/
1182-
const cssImageSetRE = /(?<=image-set\()((?:[\w\-]+\([^\)]*\)|[^)])*)(?=\))/
1183+
// eslint-disable-next-line regexp/no-unused-capturing-group, regexp/no-super-linear-backtracking -- TODO: FIXME backtracking
1184+
const cssImageSetRE = /(?<=image-set\()((?:[\w\-]+\([^)]*\)|[^)])*)(?=\))/
11831185

11841186
const UrlRewritePostcssPlugin: PostCSS.PluginCreator<{
11851187
replacer: CssUrlReplacer
@@ -1235,7 +1237,7 @@ function rewriteCssUrls(
12351237
): Promise<string> {
12361238
return asyncReplace(css, cssUrlRE, async (match) => {
12371239
const [matched, rawUrl] = match
1238-
return await doUrlReplace(rawUrl, matched, replacer)
1240+
return await doUrlReplace(rawUrl.trim(), matched, replacer)
12391241
})
12401242
}
12411243

@@ -1245,7 +1247,7 @@ function rewriteCssDataUris(
12451247
): Promise<string> {
12461248
return asyncReplace(css, cssDataUriRE, async (match) => {
12471249
const [matched, rawUrl] = match
1248-
return await doUrlReplace(rawUrl, matched, replacer, 'data-uri')
1250+
return await doUrlReplace(rawUrl.trim(), matched, replacer, 'data-uri')
12491251
})
12501252
}
12511253

@@ -1262,7 +1264,7 @@ function rewriteImportCss(
12621264
// TODO: image and cross-fade could contain a "url" that needs to be processed
12631265
// https://drafts.csswg.org/css-images-4/#image-notation
12641266
// https://drafts.csswg.org/css-images-4/#cross-fade-function
1265-
const cssNotProcessedRE = /(gradient|element|cross-fade|image)\(/
1267+
const cssNotProcessedRE = /(?:gradient|element|cross-fade|image)\(/
12661268

12671269
async function rewriteCssImageSet(
12681270
css: string,
@@ -1391,7 +1393,7 @@ export async function hoistAtRules(css: string): Promise<string> {
13911393
// to top when multiple files are concatenated.
13921394
// match until semicolon that's not in quotes
13931395
const atImportRE =
1394-
/@import\s*(?:url\([^\)]*\)|"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'|[^;]*).*?;/gm
1396+
/@import(?:\s*(?:url\([^)]*\)|"(?:[^"]|(?<=\\)")*"|'(?:[^']|(?<=\\)')*').*?|[^;]*);/g
13951397
while ((match = atImportRE.exec(cleanCss))) {
13961398
s.remove(match.index, match.index + match[0].length)
13971399
// Use `appendLeft` instead of `prepend` to preserve original @import order
@@ -1401,7 +1403,7 @@ export async function hoistAtRules(css: string): Promise<string> {
14011403
// #6333
14021404
// CSS @charset must be the top-first in the file, hoist the first to top
14031405
const atCharsetRE =
1404-
/@charset\s*(?:"([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*'|[^;]*).*?;/gm
1406+
/@charset(?:\s*(?:"(?:[^"]|(?<=\\)")*"|'(?:[^']|(?<=\\)')*').*?|[^;]*);/g
14051407
let foundCharset = false
14061408
while ((match = atCharsetRE.exec(cleanCss))) {
14071409
s.remove(match.index, match.index + match[0].length)

‎packages/vite/src/node/plugins/define.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { transformStableResult } from '../utils'
55
import { isCSSRequest } from './css'
66
import { isHTMLRequest } from './html'
77

8-
const nonJsRe = /\.(json)($|\?)/
8+
const nonJsRe = /\.json(?:$|\?)/
99
const isNonJsRequest = (request: string): boolean => nonJsRe.test(request)
1010

1111
export function definePlugin(config: ResolvedConfig): Plugin {

‎packages/vite/src/node/plugins/esbuild.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import { searchForWorkspaceRoot } from '..'
2727
const debug = createDebugger('vite:esbuild')
2828

2929
const INJECT_HELPERS_IIFE_RE =
30-
/^(.*)((?:const|var) [^\s]+=function\([^)]*?\){"use strict";)/s
30+
/^(.*)((?:const|var) \S+=function\([^)]*\)\{"use strict";)/s
3131
const INJECT_HELPERS_UMD_RE =
32-
/^(.*)(\(function\([^)]*?\){.+amd.+function\([^)]*?\){"use strict";)/s
32+
/^(.*)(\(function\([^)]*\)\{.+amd.+function\([^)]*\)\{"use strict";)/s
3333

3434
let server: ViteDevServer
3535

‎packages/vite/src/node/plugins/html.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ const htmlProxyRE = /\?html-proxy=?(?:&inline-css)?&index=(\d+)\.(js|css)$/
4444
const inlineCSSRE = /__VITE_INLINE_CSS__([a-z\d]{8}_\d+)__/g
4545
// Do not allow preceding '.', but do allow preceding '...' for spread operations
4646
const inlineImportRE =
47-
/(?<!(?<!\.\.)\.)\bimport\s*\(("([^"]|(?<=\\)")*"|'([^']|(?<=\\)')*')\)/g
48-
const htmlLangRE = /\.(html|htm)$/
47+
/(?<!(?<!\.\.)\.)\bimport\s*\(("(?:[^"]|(?<=\\)")*"|'(?:[^']|(?<=\\)')*')\)/g
48+
const htmlLangRE = /\.(?:html|htm)$/
4949

5050
const importMapRE =
51-
/[ \t]*<script[^>]*type\s*=\s*["']?importmap["']?[^>]*>.*?<\/script>/is
52-
const moduleScriptRE = /[ \t]*<script[^>]*type\s*=\s*["']?module["']?[^>]*>/is
51+
/[ \t]*<script[^>]*type\s*=\s*(?:"importmap"|'importmap'|importmap)[^>]*>.*?<\/script>/is
52+
const moduleScriptRE =
53+
/[ \t]*<script[^>]*type\s*=\s*(?:"module"|'module'|module)[^>]*>/i
5354

5455
export const isHTMLProxy = (id: string): boolean => htmlProxyRE.test(id)
5556

@@ -197,7 +198,7 @@ export function getScriptInfo(node: DefaultTreeAdapterMap['element']): {
197198
return { src, sourceCodeLocation, isModule, isAsync }
198199
}
199200

200-
const attrValueStartRE = /=[\s\t\n\r]*(.)/
201+
const attrValueStartRE = /=\s*(.)/
201202

202203
export function overwriteAttrValue(
203204
s: MagicString,

‎packages/vite/src/node/plugins/importAnalysis.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ const debug = createDebugger('vite:import-analysis')
7171

7272
const clientDir = normalizePath(CLIENT_DIR)
7373

74-
const skipRE = /\.(map|json)($|\?)/
74+
const skipRE = /\.(?:map|json)(?:$|\?)/
7575
export const canSkipImportAnalysis = (id: string): boolean =>
7676
skipRE.test(id) || isDirectCSSRequest(id)
7777

78-
const optimizedDepChunkRE = /\/chunk-[A-Z0-9]{8}\.js/
79-
const optimizedDepDynamicRE = /-[A-Z0-9]{8}\.js/
78+
const optimizedDepChunkRE = /\/chunk-[A-Z\d]{8}\.js/
79+
const optimizedDepDynamicRE = /-[A-Z\d]{8}\.js/
8080

8181
export function isExplicitImportRequired(url: string): boolean {
8282
return !isJSRequest(cleanUrl(url)) && !isCSSRequest(url)
@@ -347,7 +347,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
347347
// query can break 3rd party plugin's extension checks.
348348
if (
349349
(isRelative || isSelfImport) &&
350-
!/[\?&]import=?\b/.test(url) &&
350+
!/[?&]import=?\b/.test(url) &&
351351
!url.match(DEP_VERSION_RE)
352352
) {
353353
const versionMatch = importer.match(DEP_VERSION_RE)
@@ -583,7 +583,7 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
583583
.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '')
584584
.trim()
585585
if (
586-
!/^('.*'|".*"|`.*`)$/.test(url) ||
586+
!/^(?:'.*'|".*"|`.*`)$/.test(url) ||
587587
isExplicitImportRequired(url.slice(1, -1))
588588
) {
589589
needQueryInjectHelper = true

‎packages/vite/src/node/plugins/importAnalysisBuild.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ const preloadMarkerWithQuote = `"${preloadMarker}"` as const
3838
const dynamicImportPrefixRE = /import\s*\(/
3939

4040
// TODO: abstract
41-
const optimizedDepChunkRE = /\/chunk-[A-Z0-9]{8}\.js/
42-
const optimizedDepDynamicRE = /-[A-Z0-9]{8}\.js/
41+
const optimizedDepChunkRE = /\/chunk-[A-Z\d]{8}\.js/
42+
const optimizedDepDynamicRE = /-[A-Z\d]{8}\.js/
4343

4444
function toRelativePath(filename: string, importer: string) {
4545
const relPath = path.relative(path.dirname(importer), filename)

‎packages/vite/src/node/plugins/json.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ export interface JsonOptions {
2626
}
2727

2828
// Custom json filter for vite
29-
const jsonExtRE = /\.json($|\?)(?!commonjs-(proxy|external))/
29+
const jsonExtRE = /\.json(?:$|\?)(?!commonjs-(?:proxy|external))/
3030

31-
const jsonLangs = `\\.(json|json5)($|\\?)`
31+
const jsonLangs = `\\.(?:json|json5)(?:$|\\?)`
3232
const jsonLangRE = new RegExp(jsonLangs)
3333
export const isJSONRequest = (request: string): boolean =>
3434
jsonLangRE.test(request)
@@ -71,7 +71,7 @@ export function jsonPlugin(
7171
map: { mappings: '' }
7272
}
7373
} catch (e) {
74-
const errorMessageList = /[\d]+/.exec(e.message)
74+
const errorMessageList = /\d+/.exec(e.message)
7575
const position = errorMessageList && parseInt(errorMessageList[0], 10)
7676
const msg = position
7777
? `, invalid JSON syntax found at line ${position}`

‎packages/vite/src/node/plugins/resolve.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const browserExternalId = '__vite-browser-external'
5555
// special id for packages that are optional peer deps
5656
export const optionalPeerDepId = '__vite-optional-peer-dep'
5757

58-
const nodeModulesInPathRE = /(^|\/)node_modules\//
58+
const nodeModulesInPathRE = /(?:^|\/)node_modules\//
5959

6060
const isDebug = process.env.DEBUG
6161
const debug = createDebugger('vite:resolve-details', {

‎packages/vite/src/node/plugins/splitVendorChunk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { UserConfig } from '../../node'
88
import type { Plugin } from '../plugin'
99

1010
// This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
11-
const cssLangs = `\\.(css|less|sass|scss|styl|stylus|pcss|postcss)($|\\?)`
11+
const cssLangs = `\\.(?:css|less|sass|scss|styl|stylus|pcss|postcss)(?:$|\\?)`
1212
const cssLangRE = new RegExp(cssLangs)
1313
export const isCSSRequest = (request: string): boolean =>
1414
cssLangRE.test(request)

0 commit comments

Comments
 (0)