fix: fix config import

aralroca · Mar 23, 2024 · fc8d554 · fc8d554
1 parent 9d0ab86
commit fc8d554
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/examples-and-tests/react/plugin.test.tsx b/examples-and-tests/react/plugin.test.tsx
@@ -9,6 +9,7 @@ const configPath = join(import.meta.dir, "config.tsx");
 const currentFile = import.meta.url.replace("file://", "");
 const jsxRuntimePath = import.meta.resolveSync("react/jsx-dev-runtime");
 const importJSXRuntime = `import {jsx, jsxDEV} from "${jsxRuntimePath}";`;
+const importConfig = `import {prerenderConfig} from "${configPath}";`;
 
 describe("React", () => {
   describe("plugin", () => {
@@ -62,7 +63,7 @@ describe("React", () => {
       );
       const expected = normalizeQuotes(`
         ${importJSXRuntime}
-        import prerenderConfig from "prerender-macro";
+        ${importConfig}
         import Foo from "./components";
         import {Bar} from "./components";
         
@@ -102,7 +103,7 @@ describe("React", () => {
       );
       const expected = normalizeQuotes(`
         ${importJSXRuntime}
-        import prerenderConfig from "prerender-macro";
+        ${importConfig}
         import {Bar} from "./components";
         import Foo from "./components";
         
@@ -137,7 +138,7 @@ describe("React", () => {
       );
       const expected = normalizeQuotes(`
         ${importJSXRuntime}
-        import prerenderConfig from "prerender-macro";
+        ${importConfig}
         import {Bar} from "./components";
         
         export default function Test() {
@@ -168,7 +169,7 @@ describe("React", () => {
       );
       const expected = normalizeQuotes(`
         ${importJSXRuntime}
-        import prerenderConfig from "prerender-macro";
+        ${importConfig}
         import Foo from "./components";
         
         export default function Test() {

diff --git a/package/index.ts b/package/index.ts
@@ -1,6 +1,7 @@
 import type { BunPlugin } from "bun";
 import { dirname } from "node:path";
 import ts from "typescript";
+import { prerender } from "./prerender";
 
 const transpiler = new Bun.Transpiler({ loader: "tsx" });
 const JSX_RUNTIME = ["jsx-runtime", "jsx-dev-runtime"];
@@ -57,7 +58,7 @@ export function transpile({
 
   if (!importsWithPrerender.length) return code;
 
-  let modifiedAst = addExtraImports(sourceFile, config);
+  let modifiedAst = addExtraImports(sourceFile, prerenderConfigPath, config);
 
   modifiedAst = replaceJSXToMacroCall(
     modifiedAst,
@@ -132,7 +133,11 @@ function isPrerenderImport(node: ts.Node): node is ts.ImportDeclaration {
   );
 }
 
-function addExtraImports(ast: ts.SourceFile, config?: Config) {
+function addExtraImports(
+  ast: ts.SourceFile,
+  prerenderConfigPath: string,
+  config?: Config,
+) {
   const allImports = [...ast.statements];
 
   allImports.unshift(
@@ -167,10 +172,16 @@ function addExtraImports(ast: ts.SourceFile, config?: Config) {
         undefined,
         ts.factory.createImportClause(
           false,
-          ts.factory.createIdentifier("prerenderConfig"),
           undefined,
+          ts.factory.createNamedImports([
+            ts.factory.createImportSpecifier(
+              false,
+              ts.factory.createIdentifier("prerenderConfig"),
+              ts.factory.createIdentifier("prerenderConfig"),
+            ),
+          ]),
         ),
-        ts.factory.createStringLiteral("prerender-macro"),
+        ts.factory.createStringLiteral(prerenderConfigPath),
       ),
     );
   }