From 4913caaadd06efdbc08d3c7033525357ad459931 Mon Sep 17 00:00:00 2001 From: kotarella1110 Date: Wed, 27 Sep 2023 12:59:11 +0900 Subject: [PATCH] fix: fix import and export regex to accurately match whitespace, including newlines --- src/steps/generateChanges.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/steps/generateChanges.ts b/src/steps/generateChanges.ts index 5f9dfcb..203a51e 100644 --- a/src/steps/generateChanges.ts +++ b/src/steps/generateChanges.ts @@ -7,10 +7,10 @@ import { normalizePath } from "~/utils/path"; import type { Alias, Change, ProgramPaths, TextChange } from "~/types"; export const IMPORT_EXPORT_REGEX = - /((?:require\(|require\.resolve\(|import\()|(?:import|export) (?:.*from )?)['"]([^'"]*)['"]\)?/g; + /((?:require\(|require\.resolve\(|import\()|(?:import|export)\s+(?:[\s\S]*?from\s+)?)['"]([^'"]*)['"]\)?/g; export const ESM_IMPORT_EXPORT_REGEX = - /(?:(?:import\()|(?:import|export)\s+(?:.*from\s+)?)['"]([^'"]*)['"]\)?/g; + /(?:(?:import\()|(?:import|export)\s+(?:[\s\S]*?from\s+)?)['"]([^'"]*)['"]\)?/g export const COMMONJS_IMPORT_EXPORT_REGEX = /(?:(?:require\(|require\.resolve\()\s+)['"]([^'"]*)['"]\)/g;