@danielx/civet 0.6.61 → 0.6.63

package/dist/esbuild.js

@@ -90,7 +90,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
   const implicitExtension = options.implicitExtension ?? true;
   let fsMap = /* @__PURE__ */ new Map();
   const sourceMaps = /* @__PURE__ */ new Map();
-  let compilerOptions;
+  let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
   let esbuildOptions;
   const tsPromise = transformTS || options.ts === "tsc" ? import("typescript").then((m) => m.default) : null;
@@ -128,6 +128,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           ...configContents.options,
           target: ts.ScriptTarget.ESNext
         };
+        compilerOptionsWithSourceMap = {
+          ...compilerOptions,
+          sourceMap: true
+        };
         fsMap = /* @__PURE__ */ new Map();
       }
     },
@@ -235,7 +239,7 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
       const filename = import_path.default.resolve(process.cwd(), id.slice(0, -outExt.length));
       const rawCivetSource = await fs.promises.readFile(filename, "utf-8");
       this.addWatchFile(filename);
-      let compiled = void 0;
+      let compiled;
       if (options.ts === "civet" && !transformTS) {
         compiled = import_civet.default.compile(rawCivetSource, {
           filename: id,
@@ -248,15 +252,16 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           js: false,
           sourceMap: true
         });
-        const resolved = import_path.default.resolve(process.cwd(), id);
+        const resolved = filename + outExt;
         sourceMaps.set(
           resolved,
           compiledTS.sourceMap
         );
         if (transformTS) {
-          fsMap.set(resolved, compiledTS.code);
-          const slashed = slash(resolved);
-          if (resolved !== slashed)
+          const tsx = filename + ".tsx";
+          fsMap.set(tsx, compiledTS.code);
+          const slashed = slash(tsx);
+          if (tsx !== slashed)
             fsMap.set(slashed, compiledTS.code);
         }
         switch (options.ts) {
@@ -273,10 +278,13 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
           case "tsc": {
             const tsTranspile = (await tsPromise).transpileModule;
-            const result = tsTranspile(compiledTS.code, { compilerOptions });
+            const result = tsTranspile(
+              compiledTS.code,
+              { compilerOptions: compilerOptionsWithSourceMap }
+            );
             compiled = {
               code: result.outputText,
-              sourceMap: result.sourceMapText ?? ""
+              sourceMap: result.sourceMapText
             };
             break;
           }
@@ -300,10 +308,10 @@ var civetUnplugin = (0, import_unplugin.createUnplugin)((options = {}, meta) =>
           }
         }
       }
-      const jsonSourceMap = typeof compiled.sourceMap == "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
+      const jsonSourceMap = compiled.sourceMap && (typeof compiled.sourceMap === "string" ? JSON.parse(compiled.sourceMap) : compiled.sourceMap.json(
         import_path.default.basename(id.replace(/\.[jt]sx$/, "")),
         import_path.default.basename(id)
-      );
+      ));
       let transformed = {
         code: compiled.code,
         map: jsonSourceMap