improve: adapte template string (#36)

originjs · Oct 17, 2022 · 568f5b7 · 568f5b7
1 parent 1d476d7
commit 568f5b7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/vite-plugin-commonjs/__tests__/transform.spec.ts b/packages/vite-plugin-commonjs/__tests__/transform.spec.ts
@@ -6,6 +6,10 @@ test('transform require', () => {
     let result = transformRequire(code, 'main.ts');
     expect(result.code).toMatch(/import \* as .+ from "react";/);
 
+    code = `require(\`react\`);`;
+    result = transformRequire(code, 'main.ts');
+    expect(result.code).toMatch(/import \* as .+ from 'react';/);
+
     //nested require
     code = `_interopRequire(require('./DatePicker'));`
     result = transformRequire(code, 'main.ts');

diff --git a/packages/vite-plugin-commonjs/src/lib.ts b/packages/vite-plugin-commonjs/src/lib.ts
@@ -1,5 +1,5 @@
 const commonJSRegex: RegExp = /\b(module\.exports|exports\.\w+|exports\s*=\s*|exports\s*\[.*\]\s*=\s*)/;
-const requireRegex: RegExp = /(?<!\.)\b_{0,2}require\s*\(\s*(["'].*?["'])\s*\)/g;
+const requireRegex: RegExp = /(?<!\.)\b_{0,2}require\s*\(\s*(["'`].*?["'`])\s*\)/g;
 const IMPORT_STRING_PREFIX: String = "__require_for_vite";
 const multilineCommentsRegex = /\/\*(.|[\r\n])*?\*\//gm
 const singleCommentsRegex = /([^\:])\/\/.*/g
@@ -33,7 +33,7 @@ export function transformRequire(code: string, id: string): TransformRequireResu
     }
     replaced = true;
     packageName = `${IMPORT_STRING_PREFIX}_${randomString(6)}`;
-    importsString += `import * as ${packageName} from ${item[1]};\n`;
+    importsString += `import * as ${packageName} from ${item[1].replace(/`/g, `'`)};\n`;
     code = code.replace(item[0], `(${packageName}.default || ${packageName})`);
   }