@danielx/civet 0.11.4 → 0.11.6

package/dist/node-worker.mjs

@@ -1,4 +1,4 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\node-worker.civet.jsx
+// source/node-worker.civet
 import { parentPort } from "node:worker_threads";
 import module from "node:module";
 try {
@@ -22,7 +22,6 @@ try {
         }
         return parentPort.postMessage({ id, result, errors: args[1]?.errors });
       } catch (error) {
-        console.log(`Civet worker failed to compile:`, error);
         return parentPort.postMessage({ id, error: {
           type: error.constructor.name,
           name: error.name,

package/dist/ts-diagnostic.js

@@ -1,3 +1,4 @@
+"use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -15,13 +16,13 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var ts_diagnostic_civet_exports = {};
-__export(ts_diagnostic_civet_exports, {
+var ts_diagnostic_exports = {};
+__export(ts_diagnostic_exports, {
   flattenDiagnosticMessageText: () => flattenDiagnosticMessageText,
   remapPosition: () => remapPosition,
   remapRange: () => remapRange
 });
-module.exports = __toCommonJS(ts_diagnostic_civet_exports);
+module.exports = __toCommonJS(ts_diagnostic_exports);
 function remapPosition(position, sourcemapLines) {
   if (!sourcemapLines) return position;
   const { line, character } = position;

package/dist/types.d.ts

@@ -70,6 +70,10 @@ declare module "@danielx/civet" {
      * Default is false.
      */
     inlineMap?: boolean
+    /**
+     * Upstream source map to chain with Civet's generated source map.
+     */
+    upstreamSourceMap?: string | object
     /**
      * Whether to return an AST of the parsed code instead of transpiled code.
      * Default is false.
@@ -142,10 +146,13 @@ declare module "@danielx/civet" {
   export type SourceMapping = [number] | [number, number, number, number]
 
   export class SourceMap {
-    constructor(source: string)
+    constructor(source: string, sourceFileName: string)
     updateSourceMap?(outputStr: string, inputPos: number): void
-    json(srcFileName: string, outFileName: string): unknown
+    json(outFileName: string): unknown
+    composeUpstream(upstreamMap: string | object): void
+    composeDownstream(downstreamMap: string | object): void
     source: string
+    sourceFileName: string
     lines: SourceMapping[][]
     /** @deprecated */
     data: { lines: SourceMapping[][] }

package/dist/unplugin/astro.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,14 +27,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
-var astro_civet_exports = {};
-__export(astro_civet_exports, {
-  default: () => astro_civet_default
+// source/unplugin/astro.civet
+var astro_exports = {};
+__export(astro_exports, {
+  default: () => astro_default
 });
-module.exports = __toCommonJS(astro_civet_exports);
+module.exports = __toCommonJS(astro_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var astro_civet_default = function(opts = {}) {
+var astro_default = (function(opts = {}) {
   return {
     name: "@danielx/civet",
     hooks: {
@@ -46,4 +47,4 @@ var astro_civet_default = function(opts = {}) {
       }
     }
   };
-};
+});

package/dist/unplugin/astro.mjs

@@ -1,6 +1,8 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\astro.civet.jsx
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
+
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/astro.civet.jsx
 import civetUnplugin, {} from "./unplugin.mjs";
-var astro_civet_default = function(opts = {}) {
+var astro_civet_default = (function(opts = {}) {
   return {
     name: "@danielx/civet",
     hooks: {
@@ -13,7 +15,7 @@ var astro_civet_default = function(opts = {}) {
       }
     }
   };
-};
+});
 export {
   astro_civet_default as default
 };

package/dist/unplugin/esbuild.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,11 +27,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
-var esbuild_civet_exports = {};
-__export(esbuild_civet_exports, {
-  default: () => esbuild_civet_default
+// source/unplugin/esbuild.civet
+var esbuild_exports = {};
+__export(esbuild_exports, {
+  default: () => esbuild_default
 });
-module.exports = __toCommonJS(esbuild_civet_exports);
+module.exports = __toCommonJS(esbuild_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var esbuild_civet_default = import_unplugin.default.esbuild;
+var esbuild_default = import_unplugin.default.esbuild;

package/dist/unplugin/esbuild.mjs

@@ -1,4 +1,6 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\esbuild.civet.jsx
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
+
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/esbuild.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var esbuild_civet_default = civetUnplugin.esbuild;
 export {

package/dist/unplugin/farm.d.ts

@@ -1,2 +1,4 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => JsPlugin;
+import type { UnpluginInstance } from "unplugin";
+import { type PluginOptions } from "./unplugin.js";
+declare const _default: UnpluginInstance<PluginOptions>["farm"];
 export default _default;

package/dist/unplugin/farm.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,11 +27,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
-var farm_civet_exports = {};
-__export(farm_civet_exports, {
-  default: () => farm_civet_default
+// source/unplugin/farm.civet
+var farm_exports = {};
+__export(farm_exports, {
+  default: () => farm_default
 });
-module.exports = __toCommonJS(farm_civet_exports);
+module.exports = __toCommonJS(farm_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var farm_civet_default = import_unplugin.default.farm;
+var farm_default = import_unplugin.default.farm;

package/dist/unplugin/farm.mjs

@@ -1,5 +1,7 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\farm.civet.jsx
-import civetUnplugin from "./unplugin.mjs";
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
+
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/farm.civet.jsx
+import civetUnplugin, {} from "./unplugin.mjs";
 var farm_civet_default = civetUnplugin.farm;
 export {
   farm_civet_default as default

package/dist/unplugin/rolldown.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => any;
+declare const _default: (options: import("./unplugin.js").PluginOptions) => import("rolldown").Plugin<any> | import("rolldown").Plugin<any>[];
 export default _default;

package/dist/unplugin/rolldown.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,11 +27,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
-var rolldown_civet_exports = {};
-__export(rolldown_civet_exports, {
-  default: () => rolldown_civet_default
+// source/unplugin/rolldown.civet
+var rolldown_exports = {};
+__export(rolldown_exports, {
+  default: () => rolldown_default
 });
-module.exports = __toCommonJS(rolldown_civet_exports);
+module.exports = __toCommonJS(rolldown_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var rolldown_civet_default = import_unplugin.default.rolldown;
+var rolldown_default = import_unplugin.default.rolldown;

package/dist/unplugin/rolldown.mjs

@@ -1,4 +1,6 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rolldown.civet.jsx
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
+
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rolldown.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rolldown_civet_default = civetUnplugin.rolldown;
 export {

package/dist/unplugin/rollup.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => import("rollup").Plugin<any> | import("rollup").Plugin<any>[];
+declare const _default: (options: import("./unplugin.js").PluginOptions) => import("unplugin").RollupPlugin<any> | import("unplugin").RollupPlugin<any>[];
 export default _default;

package/dist/unplugin/rollup.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,11 +27,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
-var rollup_civet_exports = {};
-__export(rollup_civet_exports, {
-  default: () => rollup_civet_default
+// source/unplugin/rollup.civet
+var rollup_exports = {};
+__export(rollup_exports, {
+  default: () => rollup_default
 });
-module.exports = __toCommonJS(rollup_civet_exports);
+module.exports = __toCommonJS(rollup_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var rollup_civet_default = import_unplugin.default.rollup;
+var rollup_default = import_unplugin.default.rollup;

package/dist/unplugin/rollup.mjs

@@ -1,4 +1,6 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rollup.civet.jsx
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
+
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rollup.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rollup_civet_default = civetUnplugin.rollup;
 export {

package/dist/unplugin/rspack.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,11 +27,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
-var rspack_civet_exports = {};
-__export(rspack_civet_exports, {
-  default: () => rspack_civet_default
+// source/unplugin/rspack.civet
+var rspack_exports = {};
+__export(rspack_exports, {
+  default: () => rspack_default
 });
-module.exports = __toCommonJS(rspack_civet_exports);
+module.exports = __toCommonJS(rspack_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var rspack_civet_default = import_unplugin.default.rspack;
+var rspack_default = import_unplugin.default.rspack;

package/dist/unplugin/rspack.mjs

@@ -1,4 +1,6 @@
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\rspack.civet.jsx
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
+
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/rspack.civet.jsx
 import civetUnplugin from "./unplugin.mjs";
 var rspack_civet_default = civetUnplugin.rspack;
 export {

package/dist/unplugin/unplugin.js

@@ -1,3 +1,4 @@
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -26,14 +27,14 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
-var unplugin_civet_exports = {};
-__export(unplugin_civet_exports, {
-  default: () => unplugin_civet_default,
+// source/unplugin/unplugin.civet
+var unplugin_exports = {};
+__export(unplugin_exports, {
+  default: () => unplugin_default,
   rawPlugin: () => rawPlugin,
   slash: () => slash
 });
-module.exports = __toCommonJS(unplugin_civet_exports);
+module.exports = __toCommonJS(unplugin_exports);
 var import_unplugin = require("unplugin");
 var import_civet = __toESM(require("@danielx/civet"));
 var import_config = require("@danielx/civet/config");
@@ -41,20 +42,15 @@ var import_ts_diagnostic = require("@danielx/civet/ts-diagnostic");
 var fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 
-// node_modules/@typescript/vfs/dist/vfs.esm.js
+// node_modules/.pnpm/@typescript+vfs@1.6.4_typescript@5.8.3/node_modules/@typescript/vfs/dist/vfs.esm.js
 function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
+  return _extends = Object.assign ? Object.assign.bind() : function(n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+    return n;
+  }, _extends.apply(null, arguments);
 }
 var hasLocalStorage = false;
 try {
@@ -62,7 +58,7 @@ try {
 } catch (error) {
 }
 var hasProcess = typeof process !== "undefined";
-var shouldDebug = hasLocalStorage && /* @__PURE__ */ localStorage.getItem("DEBUG") || hasProcess && process.env.DEBUG;
+var shouldDebug = hasLocalStorage && typeof localStorage.getItem === "function" && /* @__PURE__ */ localStorage.getItem("DEBUG") || hasProcess && process.env.DEBUG;
 var debugLog = shouldDebug ? console.log : function(_message) {
   return "";
 };
@@ -89,7 +85,10 @@ var defaultCompilerOptions = function defaultCompilerOptions2(ts) {
     module: ts.ModuleKind.ESNext,
     suppressOutputPathCheck: true,
     skipLibCheck: true,
-    skipDefaultLibCheck: true,
+    skipDefaultLibCheck: true
+  }, ts.versionMajorMinor && Number(ts.versionMajorMinor.split(".")[0]) >= 6 ? {
+    ignoreDeprecations: "6.0"
+  } : {
     moduleResolution: ts.ModuleResolutionKind.NodeJs
   });
 };
@@ -213,32 +212,38 @@ var requirePath = function requirePath2() {
   return require(String.fromCharCode(112, 97, 116, 104));
 };
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// source/unplugin/unplugin.civet
 var import_os = __toESM(require("os"));
-
-// source/unplugin/constants.mjs
 var DEFAULT_EXTENSIONS = [".mjs", ".js", ".mts", ".ts", ".jsx", ".tsx", ".json"];
-
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
 var DiagnosticCategory = {};
 DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
 DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
 DiagnosticCategory[DiagnosticCategory["Suggestion"] = 2] = "Suggestion";
 DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
-var postfixRE = /[?#].*$/s;
+var queryPostfixRE = /\?.*$/s;
+var escapedHashRE = /\0#/g;
 var isWindows = import_os.default.platform() === "win32";
 var windowsSlashRE = /\\/g;
 var civetSuffix = ".civet";
 var workerRE = /(?:\?|&)(?:worker|sharedworker)(?:&|$|#)/;
 function extractCivetFilename(id, outputExtension) {
   let postfix = "";
-  let filename = id.replace(postfixRE, (match) => {
+  id = id.replace(escapedHashRE, "#");
+  let filename = id.replace(queryPostfixRE, (match) => {
     postfix = match;
     return "";
   });
   if (filename.endsWith(outputExtension)) {
     filename = filename.slice(0, -outputExtension.length);
   }
+  const hashIndex = filename.lastIndexOf("#");
+  if (hashIndex >= 0 && !tryStatSync(filename)) {
+    postfix = filename.slice(hashIndex) + postfix;
+    filename = filename.slice(0, hashIndex);
+    if (filename.endsWith(outputExtension)) {
+      filename = filename.slice(0, -outputExtension.length);
+    }
+  }
   return { filename, postfix };
 }
 function tryStatSync(file) {
@@ -298,6 +303,7 @@ var rawPlugin = (options = {}, meta) => {
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
+  let outDir = import_path.default.join(rootDir, "dist");
   let esbuildOptions;
   let configErrors;
   let configFileNames;
@@ -337,7 +343,7 @@ var rawPlugin = (options = {}, meta) => {
         compileOptions.threads = options.threads;
       }
       if (transformTS || ts === "tsc") {
-        let mogrify = function(key) {
+        let mogrify2 = function(key) {
           if (key in config && Array.isArray(config[key])) {
             return config[key] = config[key].map((item) => {
               if (!(typeof item === "string")) {
@@ -349,6 +355,7 @@ var rawPlugin = (options = {}, meta) => {
           ;
           return;
         };
+        var mogrify = mogrify2;
         const ts2 = await tsPromise;
         const tsConfigPath = ts2.findConfigFile(process.cwd(), ts2.sys.fileExists);
         if (!tsConfigPath) {
@@ -362,7 +369,7 @@ var rawPlugin = (options = {}, meta) => {
           console.error(ts2.formatDiagnostic(error, getFormatHost(ts2.sys)));
           throw error;
         }
-        mogrify("files");
+        mogrify2("files");
         const system = { ...ts2.sys };
         const { readDirectory: systemReadDirectory } = system;
         system.readDirectory = (path2, extensions, excludes, includes, depth) => {
@@ -413,7 +420,7 @@ var rawPlugin = (options = {}, meta) => {
         };
         system.readFile = (filename, encoding = "utf-8") => {
           if (import_path.default.basename(filename) === "package.json") {
-            let recurse = function(node) {
+            let recurse2 = function(node) {
               if (node != null && typeof node === "object") {
                 for (const key in node) {
                   const value = node[key];
@@ -423,18 +430,19 @@ var rawPlugin = (options = {}, meta) => {
                       modified = true;
                     }
                   } else if (value) {
-                    recurse(value);
+                    recurse2(value);
                   }
                 }
               }
             };
+            var recurse = recurse2;
             const json = systemReadFile(filename, encoding);
             if (!json) {
               return json;
             }
             const parsed = JSON.parse(json);
             let modified = false;
-            recurse(parsed.imports);
+            recurse2(parsed.imports);
             return modified ? JSON.stringify(parsed) : json;
           }
           if (!filename.endsWith(".civet.tsx")) return systemReadFile(filename, encoding);
@@ -587,7 +595,7 @@ var rawPlugin = (options = {}, meta) => {
       if (options2.scan && meta.framework === "vite") {
         resolved = `\0${resolved}`;
       }
-      return resolved + outExt + postfix;
+      return resolved + (meta.framework === "esbuild" ? "" : outExt) + postfix;
     },
     loadInclude(id) {
       const { filename, postfix } = extractCivetFilename(id, outExt);
@@ -625,18 +633,19 @@ var rawPlugin = (options = {}, meta) => {
         }
       }
       try {
-        let checkErrors = function() {
+        let checkErrors2 = function() {
           if (civetOptions.errors.length) {
             throw new import_civet.default.ParseErrors(civetOptions.errors);
           }
           ;
           return;
         };
+        var checkErrors = checkErrors2;
         let compiled;
         let sourceMap;
         const civetOptions = {
           ...compileOptions,
-          filename: id,
+          filename,
           errors: []
         };
         const rawCivetSource = (0, import_civet.decode)(await fs.promises.readFile(filename));
@@ -644,7 +653,10 @@ var rawPlugin = (options = {}, meta) => {
           ...civetOptions,
           ast: true
         });
-        const civetSourceMap = new import_civet.SourceMap(rawCivetSource);
+        const civetSourceMap = new import_civet.SourceMap(
+          rawCivetSource,
+          normalizePath(import_path.default.relative(outDir, filename))
+        );
         if (ts === "civet") {
           compiled = await import_civet.default.generate(ast, {
             ...civetOptions,
@@ -652,21 +664,21 @@ var rawPlugin = (options = {}, meta) => {
             sourceMap: civetSourceMap
           });
           sourceMap = civetSourceMap;
-          checkErrors();
+          checkErrors2();
         } else {
           const compiledTS = await import_civet.default.generate(ast, {
             ...civetOptions,
             js: false,
             sourceMap: civetSourceMap
           });
-          checkErrors();
+          checkErrors2();
           switch (ts) {
             case "esbuild": {
               const esbuildTransform = (await import("esbuild")).transform;
               const result = await esbuildTransform(compiledTS, {
                 jsx: "preserve",
                 loader: "tsx",
-                sourcefile: id,
+                sourcefile: filename,
                 sourcemap: "external"
               });
               compiled = result.code;
@@ -690,7 +702,7 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         if (transformTS) {
-          for (let ref3 = import_civet.lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref3.length; i < len; i++) {
+          for (let ref3 = import_civet.lib.gatherRecursive(ast, (($) => $.type === "ModuleSpecifier")), i = 0, len = ref3.length; i < len; i++) {
             const _spec = ref3[i];
             const spec = _spec;
             if (spec.module?.input) {
@@ -702,7 +714,7 @@ var rawPlugin = (options = {}, meta) => {
             js: false,
             sourceMap: civetSourceMap
           });
-          checkErrors();
+          checkErrors2();
           const tsx = filename + ".tsx";
           fsMap.set(tsx, compiledTS);
           sourceMaps.set(tsx, civetSourceMap);
@@ -712,10 +724,7 @@ var rawPlugin = (options = {}, meta) => {
             sourceMaps.set(slashed, civetSourceMap);
           }
         }
-        const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-          import_path.default.relative(rootDir, extractCivetFilename(id, outExt).filename),
-          import_path.default.relative(rootDir, id)
-        ));
+        const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(normalizePath(import_path.default.relative(outDir, id))));
         let transformed = {
           code: compiled,
           map: jsonSourceMap
@@ -733,8 +742,12 @@ var rawPlugin = (options = {}, meta) => {
       }
     },
     esbuild: {
+      // Explicitly set the loader so esbuild handles the compiled output
+      // correctly even though the virtual module id no longer ends in .jsx/.tsx.
+      loader: ts === "preserve" ? "tsx" : "jsx",
       config(options2) {
         esbuildOptions = options2;
+        outDir = options2.outdir || import_path.default.dirname(options2.outfile);
       }
     },
     vite: {
@@ -743,6 +756,7 @@ var rawPlugin = (options = {}, meta) => {
           skipWorker = true;
         }
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
+        outDir = import_path.default.resolve(rootDir, config.build?.outDir ?? "dist");
         if (implicitExtension) {
           config.resolve ??= {};
           config.resolve.extensions ??= DEFAULT_EXTENSIONS;
@@ -792,7 +806,6 @@ var rawPlugin = (options = {}, meta) => {
     },
     webpack(compiler) {
       if (implicitExtension) {
-        compiler.options ??= {};
         compiler.options.resolve ??= {};
         compiler.options.resolve.extensions ??= ["", ".js", ".json", ".wasm"];
         compiler.options.resolve.extensions.unshift(".civet");
@@ -821,7 +834,7 @@ var rawPlugin = (options = {}, meta) => {
   return plugin;
 };
 var unplugin = (0, import_unplugin.createUnplugin)(rawPlugin);
-var unplugin_civet_default = unplugin;
+var unplugin_default = unplugin;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   rawPlugin,