Use eslint-plugin-regexp (#9993)

.eslintrc.cjs

@@ -7,13 +7,14 @@ module.exports = {
  'plugin:@typescript-eslint/recommended-type-checked',
  'plugin:@typescript-eslint/stylistic-type-checked',
  'prettier',
+ 'plugin:regexp/recommended',
  ],
  parser: '@typescript-eslint/parser',
  parserOptions: {
  project: ['./packages/*/tsconfig.json', './tsconfig.eslint.json'],
  tsconfigRootDir: __dirname,
  },
- plugins: ['@typescript-eslint', 'prettier', 'no-only-tests'],
+ plugins: ['@typescript-eslint', 'prettier', 'no-only-tests', 'regexp'],
  rules: {
  // These off/configured-differently-by-default rules fit well for us
  '@typescript-eslint/switch-exhaustiveness-check': 'error',
@@ -72,6 +73,9 @@ module.exports = {
  // These rules enabled by the preset configs don't work well for us
  '@typescript-eslint/await-thenable': 'off',
  'prefer-const': 'off',
+
+ // In some cases, using explicit letter-casing is more performant than the `i` flag
+ 'regexp/use-ignore-case': 'off',
  },
  overrides: [
  {

package.json

@@ -59,12 +59,13 @@
  "eslint-config-prettier": "^9.0.0",
  "eslint-plugin-no-only-tests": "^3.1.0",
  "eslint-plugin-prettier": "^5.0.0",
+ "eslint-plugin-regexp": "^2.2.0",
+ "globby": "^14.0.0",
  "only-allow": "^1.1.1",
  "organize-imports-cli": "^0.10.0",
  "prettier": "^3.1.0",
  "prettier-plugin-astro": "^0.12.2",
  "tiny-glob": "^0.2.9",
- "globby": "^14.0.0",
  "turbo": "^1.10.12",
  "typescript": "~5.2.2"
  },

packages/astro-prism/src/plugin.ts

@@ -16,6 +16,7 @@ export function addAstro(Prism: typeof import('prismjs')) {
 
  let script = Prism.util.clone(Prism.languages[scriptLang]);
 
+ // eslint-disable-next-line regexp/no-useless-assertions
  let space = /(?:\s|\/\/.*(?!.)|\/\*(?:[^*]|\*(?!\/))\*\/)/.source;
  let braces = /(?:\{(?:\{(?:\{[^{}]*\}|[^{}])*\}|[^{}])*\})/.source;
  let spread = /(?:\{<S>*\.{3}(?:[^{}]|<BRACES>)*\})/.source;
@@ -39,13 +40,13 @@ export function addAstro(Prism: typeof import('prismjs')) {
  Prism.languages.astro = Prism.languages.extend('markup', script);
 
  (Prism.languages.astro as any).tag.pattern = re(
- /<\/?(?:[\w.:-]+(?:<S>+(?:[\w.:$-]+(?:=(?:"(?:\\[^]|[^\\"])*"|'(?:\\[^]|[^\\'])*'|[^\s{'"/>=]+|<BRACES>))?|<SPREAD>))*<S>*\/?)?>/
+ /<\/?(?:[\w.:-]+(?:<S>+(?:[\w.:$-]+(?:=(?:"(?:\\[\s\S]|[^\\"])*"|'(?:\\[\s\S]|[^\\'])*'|[^\s{'"/>=]+|<BRACES>))?|<SPREAD>))*<S>*\/?)?>/
  .source
  );
 
- (Prism.languages.astro as any).tag.inside['tag'].pattern = /^<\/?[^\s>\/]*/i;
+ (Prism.languages.astro as any).tag.inside['tag'].pattern = /^<\/?[^\s>/]*/;
  (Prism.languages.astro as any).tag.inside['attr-value'].pattern =
- /=(?!\{)(?:"(?:\\[^]|[^\\"])*"|'(?:\\[^]|[^\\'])*'|[^\s'">]+)/i;
+ /=(?!\{)(?:"(?:\\[\s\S]|[^\\"])*"|'(?:\\[\s\S]|[^\\'])*'|[^\s'">]+)/;
  (Prism.languages.astro as any).tag.inside['tag'].inside['class-name'] =
  /^[A-Z]\w*(?:\.[A-Z]\w*)*$/;
  (Prism.languages.astro as any).tag.inside['comment'] = script['comment'];
@@ -71,7 +72,7 @@ export function addAstro(Prism: typeof import('prismjs')) {
  pattern: re(/=<BRACES>/.source),
  inside: {
  'script-punctuation': {
- pattern: /^=(?={)/,
+ pattern: /^=(?=\{)/,
  alias: 'punctuation',
  },
  rest: Prism.languages.astro,

packages/astro-rss/src/util.ts

@@ -10,10 +10,10 @@ export function createCanonicalURL(
  let pathname = url.replace(/\/index.html$/, ''); // index.html is not canonical
  if (trailingSlash === false) {
  // remove the trailing slash
- pathname = pathname.replace(/(\/+)?$/, '');
+ pathname = pathname.replace(/\/*$/, '');
  } else if (!getUrlExtension(url)) {
  // add trailing slash if there’s no extension or `trailingSlash` is true
- pathname = pathname.replace(/(\/+)?$/, '/');
+ pathname = pathname.replace(/\/*$/, '/');
  }
 
  pathname = pathname.replace(/\/+/g, '/'); // remove duplicate slashes (URL() won’t)

packages/astro/src/assets/services/vendor/squoosh/codecs.ts

@@ -291,6 +291,8 @@ export const codecs = {
  avif: {
  name: 'AVIF',
  extension: 'avif',
+ // Disable eslint rule to not touch the original code
+ // eslint-disable-next-line no-control-regex, regexp/control-character-escape
  detectors: [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/],
  dec: () =>
  instantiateEmscriptenWasm(avifDec as DecodeModuleFactory, avifDecWasm),
@@ -321,6 +323,8 @@ export const codecs = {
  oxipng: {
  name: 'OxiPNG',
  extension: 'png',
+ // Disable eslint rule to not touch the original code
+ // eslint-disable-next-line no-control-regex, regexp/control-character-escape
  detectors: [/^\x89PNG\x0D\x0A\x1A\x0A/],
  dec: async () => {
  await pngEncDecInit()

packages/astro/src/cli/add/index.ts

@@ -384,11 +384,11 @@ const toIdent = (name: string) => {
  const ident = name
  .trim()
  // Remove astro or (astrojs) prefix and suffix
- .replace(/[-_\.\/]?astro(?:js)?[-_\.]?/g, '')
+ .replace(/[-_./]?astro(?:js)?[-_.]?/g, '')
  // drop .js suffix
  .replace(/\.js/, '')
  // convert to camel case
- .replace(/(?:[\.\-\_\/]+)([a-zA-Z])/g, (_, w) => w.toUpperCase())
+ .replace(/[.\-_/]+([a-zA-Z])/g, (_, w) => w.toUpperCase())
  // drop invalid first characters
  .replace(/^[^a-zA-Z$_]+/, '');
  return `${ident[0].toLowerCase()}${ident.slice(1)}`;

packages/astro/src/core/build/css-asset-name.ts

@@ -103,7 +103,7 @@ function getFirstParentId(parents: [ModuleInfo, number, number][]) {
  return parents[0]?.[0].id;
 }
 
-const charsToReplaceRe = /[.\[\]]/g;
+const charsToReplaceRe = /[.[\]]/g;
 const underscoresRe = /_+/g;
 /**
  * Prettify base names so they're easier to read:

packages/astro/src/core/build/plugins/plugin-manifest.ts

@@ -19,7 +19,7 @@ import type { StaticBuildOptions } from '../types.js';
 import { normalizeTheLocale } from '../../../i18n/index.js';
 
 const manifestReplace = '@@ASTRO_MANIFEST_REPLACE@@';
-const replaceExp = new RegExp(`['"](${manifestReplace})['"]`, 'g');
+const replaceExp = new RegExp(`['"]${manifestReplace}['"]`, 'g');
 
 export const SSR_MANIFEST_VIRTUAL_MODULE_ID = '@astrojs-manifest';
 export const RESOLVED_SSR_MANIFEST_VIRTUAL_MODULE_ID = '\0' + SSR_MANIFEST_VIRTUAL_MODULE_ID;

packages/astro/src/core/build/static-build.ts

@@ -524,7 +524,7 @@ export function makeAstroPageEntryPointFileName(
  const name = route?.route ?? pageModuleId;
  return `pages${name
  .replace(/\/$/, '/index')
- .replaceAll(/[\[\]]/g, '_')
+ .replaceAll(/[[\]]/g, '_')
  .replaceAll('...', '---')}.astro.mjs`;
 }
 

packages/astro/src/core/create-vite.ts

@@ -90,7 +90,7 @@ export async function createVite(
  pkgJson.keywords?.includes('astro') ||
  pkgJson.keywords?.includes('astro-component') ||
  // Attempt: package is named `astro-something` or `@scope/astro-something`. ✅ Likely a community package
- /^(@[^\/]+\/)?astro\-/.test(pkgJson.name)
+ /^(?:@[^/]+\/)?astro-/.test(pkgJson.name)
  );
  },
  isFrameworkPkgByName(pkgName) {

packages/astro/src/core/dev/restart.ts

@@ -29,8 +29,8 @@ async function createRestartedContainer(
  return newContainer;
 }
 
-const configRE = new RegExp(`.*astro\.config\.((mjs)|(cjs)|(js)|(ts))$`);
-const preferencesRE = new RegExp(`.*\.astro\/settings\.json$`);
+const configRE = /.*astro.config.(?:mjs|cjs|js|ts)$/;
+const preferencesRE = /.*\.astro\/settings.json$/;
 
 export function shouldRestartContainer(
  { settings, inlineConfig, restartInFlight }: Container,

packages/astro/src/core/errors/dev/utils.ts

@@ -132,7 +132,7 @@ export function collectErrorMetadata(e: any, rootFolder?: URL | undefined): Erro
 function generateHint(err: ErrorWithMetadata): string | undefined {
  const commonBrowserAPIs = ['document', 'window'];
 
- if (/Unknown file extension \"\.(jsx|vue|svelte|astro|css)\" for /.test(err.message)) {
+ if (/Unknown file extension "\.(?:jsx|vue|svelte|astro|css)" for /.test(err.message)) {
  return 'You likely need to add this package to `vite.ssr.noExternal` in your astro config file.';
  } else if (commonBrowserAPIs.some((api) => err.toString().includes(api))) {
  const hint = `Browser APIs are not available on the server.
@@ -172,10 +172,12 @@ function collectInfoFromStacktrace(error: SSRError & { stack: string }): StackIn
  error.id ||
  // TODO: this could be better, `src` might be something else
  stackText.split('\n').find((ln) => ln.includes('src') || ln.includes('node_modules'));
+ // Disable eslint as we're not sure how to improve this regex yet
+ // eslint-disable-next-line regexp/no-super-linear-backtracking
  const source = possibleFilePath?.replace(/^[^(]+\(([^)]+).*$/, '$1').replace(/^\s+at\s+/, '');
 
- let file = source?.replace(/(:[0-9]+)/g, '');
- const location = /:([0-9]+):([0-9]+)/g.exec(source!) ?? [];
+ let file = source?.replace(/:\d+/g, '');
+ const location = /:(\d+):(\d+)/.exec(source!) ?? [];
  const line = location[1];
  const column = location[2];
 
@@ -195,8 +197,8 @@ function collectInfoFromStacktrace(error: SSRError & { stack: string }): StackIn
  // Derive plugin from stack (if possible)
  if (!stackInfo.plugin) {
  stackInfo.plugin =
- /withastro\/astro\/packages\/integrations\/([\w-]+)/gim.exec(stackText)?.at(1) ||
- /(@astrojs\/[\w-]+)\/(server|client|index)/gim.exec(stackText)?.at(1) ||
+ /withastro\/astro\/packages\/integrations\/([\w-]+)/i.exec(stackText)?.at(1) ||
+ /(@astrojs\/[\w-]+)\/(server|client|index)/i.exec(stackText)?.at(1) ||
  undefined;
  }
 
@@ -208,7 +210,7 @@ function collectInfoFromStacktrace(error: SSRError & { stack: string }): StackIn
 
 function cleanErrorStack(stack: string) {
  return stack
- .split(/\n/g)
+ .split(/\n/)
  .map((l) => l.replace(/\/@fs\//g, '/'))
  .join('\n');
 }
@@ -233,10 +235,10 @@ export function getDocsForError(err: ErrorWithMetadata): string | undefined {
  * Render a subset of Markdown to HTML or a CLI output
  */
 export function renderErrorMarkdown(markdown: string, target: 'html' | 'cli') {
- const linkRegex = /\[([^\[]+)\]\((.*)\)/gm;
- const boldRegex = /\*\*(.+)\*\*/gm;
- const urlRegex = / (\b(https?|ftp):\/\/[-A-Z0-9+&@#\\/%?=~_|!:,.;]*[-A-Z0-9+&@#\\/%=~_|])/gim;
- const codeRegex = /`([^`]+)`/gim;
+ const linkRegex = /\[([^[]+)\]\((.*)\)/g;
+ const boldRegex = /\*\*(.+)\*\*/g;
+ const urlRegex = / ((?:https?|ftp):\/\/[-\w+&@#\\/%?=~|!:,.;]*[-\w+&@#\\/%=~|])/gi;
+ const codeRegex = /`([^`]+)`/g;
 
  if (target === 'html') {
  return escape(markdown)

packages/astro/src/core/errors/errors-data.ts

@@ -587,7 +587,7 @@ export const PrerenderDynamicEndpointPathCollide = {
  message: (pathname: string) =>
  `Could not render \`${pathname}\` with an \`undefined\` param as the generated path will collide during prerendering. Prevent passing \`undefined\` as \`params\` for the endpoint's \`getStaticPaths()\` function, or add an additional extension to the endpoint's filename.`,
  hint: (filename: string) =>
- `Rename \`${filename}\` to \`${filename.replace(/\.(js|ts)/, (m) => `.json` + m)}\``,
+ `Rename \`${filename}\` to \`${filename.replace(/\.(?:js|ts)/, (m) => `.json` + m)}\``,
 } satisfies ErrorData;
 /**
  * @docs

packages/astro/src/core/logger/vite.ts

@@ -12,15 +12,15 @@ function isAstroSrcFile(id: string | null) {
 }
 
 // capture "page reload some/Component.vue (additional info)" messages
-const vitePageReloadMsg = /page reload (.*)( \(.*\))?/;
+const vitePageReloadMsg = /page reload (.*)/;
 // capture "hmr update some/Component.vue" messages
 const viteHmrUpdateMsg = /hmr update (.*)/;
 // capture "vite v5.0.0 building SSR bundle for production..." and "vite v5.0.0 building for production..." messages
 const viteBuildMsg = /vite.*building.*for production/;
 // capture "\n Shortcuts" messages
-const viteShortcutTitleMsg = /^\s*Shortcuts\s*$/s;
+const viteShortcutTitleMsg = /^\s*Shortcuts\s*$/;
 // capture "press * + enter to ..." messages
-const viteShortcutHelpMsg = /press\s+(.*?)\s+to\s+(.*)$/s;
+const viteShortcutHelpMsg = /press (.+?) to (.+)$/s;
 
 export function createViteLogger(
  astroLogger: AstroLogger,
@@ -39,8 +39,7 @@ export function createViteLogger(
  // Rewrite HMR page reload message
  if ((m = vitePageReloadMsg.exec(stripped))) {
  if (isAstroSrcFile(m[1])) return;
- const extra = m[2] ?? '';
- astroLogger.info('watch', m[1] + extra);
+ astroLogger.info('watch', m[1]);
  }
  // Rewrite HMR update message
  else if ((m = viteHmrUpdateMsg.exec(stripped))) {

packages/astro/src/core/messages.ts

@@ -225,7 +225,7 @@ export function formatConfigErrorMessage(err: ZodError) {
 
 // a regex to match the first line of a stack trace
 const STACK_LINE_REGEXP = /^\s+at /g;
-const IRRELEVANT_STACK_REGEXP = /(node_modules|astro[\/\\]dist)/g;
+const IRRELEVANT_STACK_REGEXP = /node_modules|astro[/\\]dist/g;
 function formatErrorStackTrace(
  err: Error | ErrorWithMetadata,
  showFullStacktrace: boolean

packages/astro/src/core/preview/vite-plugin-astro-preview.ts

@@ -7,7 +7,7 @@ import { notFoundTemplate, subpathNotUsedTemplate } from '../../template/4xx.js'
 import { cleanUrl } from '../../vite-plugin-utils/index.js';
 import { stripBase } from './util.js';
 
-const HAS_FILE_EXTENSION_REGEXP = /^.*\.[^\\]+$/;
+const HAS_FILE_EXTENSION_REGEXP = /\.[^/]+$/;
 
 export function vitePluginAstroPreview(settings: AstroSettings): Plugin {
  const { base, outDir, trailingSlash } = settings.config;

packages/astro/src/core/routing/manifest/create.ts

@@ -43,13 +43,15 @@ function countOccurrences(needle: string, haystack: string) {
 
 function getParts(part: string, file: string) {
  const result: RoutePart[] = [];
+ // Disable eslint as we're not sure how to improve this regex yet
+ // eslint-disable-next-line regexp/no-super-linear-backtracking
  part.split(/\[(.+?\(.+?\)|.+?)\]/).map((str, i) => {
  if (!str) return;
  const dynamic = i % 2 === 1;
 
  const [, content] = dynamic ? /([^(]+)$/.exec(str) || [null, null] : [null, str];
 
- if (!content || (dynamic && !/^(\.\.\.)?[a-zA-Z0-9_$]+$/.test(content))) {
+ if (!content || (dynamic && !/^(?:\.\.\.)?[\w$]+$/.test(content))) {
  throw new Error(`Invalid route ${file} — parameter name must match /^[a-zA-Z0-9_$]+$/`);
  }
 

packages/astro/src/events/error.ts

@@ -26,7 +26,7 @@ interface ConfigErrorEventPayload extends ErrorEventPayload {
  * This is only used for errors that do not come from us so we can get a basic
  * and anonymous idea of what the error is about.
  */
-const ANONYMIZE_MESSAGE_REGEX = /^(\w| )+/;
+const ANONYMIZE_MESSAGE_REGEX = /^(?:\w| )+/;
 function anonymizeErrorMessage(msg: string): string | undefined {
  const matchedMessage = msg.match(ANONYMIZE_MESSAGE_REGEX);
  if (!matchedMessage?.[0]) {
@@ -100,7 +100,7 @@ function getSafeErrorMessage(message: string | Function): string {
  .trim()
  .slice(1, -1)
  .replace(
- /\${([^}]+)}/gm,
+ /\$\{([^}]+)\}/g,
  (str, match1) =>
  `${match1
  .split(/\.?(?=[A-Z])/)

packages/astro/src/i18n/middleware.ts

@@ -32,13 +32,6 @@ function pathnameHasLocale(pathname: string, locales: Locales): boolean {
  return false;
 }
 
-type MiddlewareOptions = {
- i18n: SSRManifest['i18n'];
- base: SSRManifest['base'];
- trailingSlash: SSRManifest['trailingSlash'];
- buildFormat: SSRManifest['buildFormat'];
-};
-
 export function createI18nMiddleware(
  i18n: SSRManifest['i18n'],
  base: SSRManifest['base'],

packages/astro/src/runtime/client/dev-toolbar/apps/audit/a11y.ts

@@ -240,7 +240,7 @@ export const a11y: AuditRuleWithSelector[] = [
  message:
  'Screen readers already announce `img` elements as an image. There is no need to use words such as "image", "photo", and/or "picture".',
  selector: 'img[alt]:not([aria-hidden])',
- match: (img: HTMLImageElement) => /\b(image|picture|photo)\b/i.test(img.alt),
+ match: (img: HTMLImageElement) => /\b(?:image|picture|photo)\b/i.test(img.alt),
  },
  {
  code: 'a11y-incorrect-aria-attribute-type',

packages/astro/src/runtime/server/render/component.ts

@@ -65,8 +65,8 @@ function isHTMLComponent(Component: unknown) {
  return Component && (Component as any)['astro:html'] === true;
 }
 
-const ASTRO_SLOT_EXP = /\<\/?astro-slot\b[^>]*>/g;
-const ASTRO_STATIC_SLOT_EXP = /\<\/?astro-static-slot\b[^>]*>/g;
+const ASTRO_SLOT_EXP = /<\/?astro-slot\b[^>]*>/g;
+const ASTRO_STATIC_SLOT_EXP = /<\/?astro-static-slot\b[^>]*>/g;
 function removeStaticAstroSlot(html: string, supportsAstroStaticSlot: boolean) {
  const exp = supportsAstroStaticSlot ? ASTRO_STATIC_SLOT_EXP : ASTRO_SLOT_EXP;
  return html.replace(exp, '');
@@ -390,7 +390,7 @@ If you're still stuck, please open an issue on GitHub or join us at https://astr
 }
 
 function sanitizeElementName(tag: string) {
- const unsafe = /[&<>'"\s]+/g;
+ const unsafe = /[&<>'"\s]+/;
  if (!unsafe.test(tag)) return tag;
  return tag.trim().split(unsafe)[0].trim();
 }

packages/astro/src/runtime/server/render/util.ts

@@ -7,17 +7,17 @@ import { HTMLString, markHTMLString } from '../escape.js';
 export const voidElementNames =
  /^(area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i;
 const htmlBooleanAttributes =
- /^(allowfullscreen|async|autofocus|autoplay|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|itemscope)$/i;
-const htmlEnumAttributes = /^(contenteditable|draggable|spellcheck|value)$/i;
+ /^(?:allowfullscreen|async|autofocus|autoplay|controls|default|defer|disabled|disablepictureinpicture|disableremoteplayback|formnovalidate|hidden|loop|nomodule|novalidate|open|playsinline|readonly|required|reversed|scoped|seamless|itemscope)$/i;
+const htmlEnumAttributes = /^(?:contenteditable|draggable|spellcheck|value)$/i;
 // Note: SVG is case-sensitive!
-const svgEnumAttributes = /^(autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
+const svgEnumAttributes = /^(?:autoReverse|externalResourcesRequired|focusable|preserveAlpha)$/i;
 
 const STATIC_DIRECTIVES = new Set(['set:html', 'set:text']);
 
 // converts (most) arbitrary strings to valid JS identifiers
 const toIdent = (k: string) =>
- k.trim().replace(/(?:(?!^)\b\w|\s+|[^\w]+)/g, (match, index) => {
- if (/[^\w]|\s/.test(match)) return '';
+ k.trim().replace(/(?!^)\b\w|\s+|\W+/g, (match, index) => {
+ if (/\W/.test(match)) return '';
  return index === 0 ? match : match.toUpperCase();
  });
 

packages/astro/src/virtual-modules/content.ts

@@ -66,6 +66,7 @@ export const reference = noop;
 /** Run `astro sync` to generate high fidelity types */
 export type CollectionKey = any;
 /** Run `astro sync` to generate high fidelity types */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export type CollectionEntry<C> = any;
 /** Run `astro sync` to generate high fidelity types */
 export type ContentCollectionKey = any;