@danielx/civet 0.11.5 → 0.11.6

package/dist/unplugin/unplugin.mjs

@@ -1,3 +1,4 @@
+import { createRequire as __civetCreateRequire } from 'node:module'; const require = __civetCreateRequire(import.meta.url);
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
@@ -5,7 +6,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
 
-// unplugin-civet:C:\Users\edemaine\Projects\Civet\source\unplugin\unplugin.civet.jsx
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/unplugin.civet.jsx
 import { createUnplugin } from "unplugin";
 import civet, { decode, lib, SourceMap } from "@danielx/civet";
 import { findInDir, loadConfig } from "@danielx/civet/config";
@@ -16,7 +17,7 @@ import {
 import * as fs from "fs";
 import path from "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() {
   return _extends = Object.assign ? Object.assign.bind() : function(n) {
     for (var e = 1; e < arguments.length; e++) {
@@ -186,32 +187,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
+// unplugin-civet:/home/runner/work/Civet/Civet/source/unplugin/unplugin.civet.jsx
 import os from "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 = os.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) {
@@ -271,6 +278,7 @@ var rawPlugin = (options = {}, meta) => {
   const sourceMaps = /* @__PURE__ */ new Map();
   let compilerOptions, compilerOptionsWithSourceMap;
   let rootDir = process.cwd();
+  let outDir = path.join(rootDir, "dist");
   let esbuildOptions;
   let configErrors;
   let configFileNames;
@@ -560,7 +568,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);
@@ -609,7 +617,7 @@ var rawPlugin = (options = {}, meta) => {
         let sourceMap;
         const civetOptions = {
           ...compileOptions,
-          filename: id,
+          filename,
           errors: []
         };
         const rawCivetSource = decode(await fs.promises.readFile(filename));
@@ -617,7 +625,10 @@ var rawPlugin = (options = {}, meta) => {
           ...civetOptions,
           ast: true
         });
-        const civetSourceMap = new SourceMap(rawCivetSource);
+        const civetSourceMap = new SourceMap(
+          rawCivetSource,
+          normalizePath(path.relative(outDir, filename))
+        );
         if (ts === "civet") {
           compiled = await civet.generate(ast, {
             ...civetOptions,
@@ -639,7 +650,7 @@ var rawPlugin = (options = {}, meta) => {
               const result = await esbuildTransform(compiledTS, {
                 jsx: "preserve",
                 loader: "tsx",
-                sourcefile: id,
+                sourcefile: filename,
                 sourcemap: "external"
               });
               compiled = result.code;
@@ -663,7 +674,7 @@ var rawPlugin = (options = {}, meta) => {
           }
         }
         if (transformTS) {
-          for (let ref3 = lib.gatherRecursive(ast, ($) => $.type === "ModuleSpecifier"), i = 0, len = ref3.length; i < len; i++) {
+          for (let ref3 = lib.gatherRecursive(ast, (($) => $.type === "ModuleSpecifier")), i = 0, len = ref3.length; i < len; i++) {
             const _spec = ref3[i];
             const spec = _spec;
             if (spec.module?.input) {
@@ -685,10 +696,7 @@ var rawPlugin = (options = {}, meta) => {
             sourceMaps.set(slashed, civetSourceMap);
           }
         }
-        const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(
-          path.relative(rootDir, extractCivetFilename(id, outExt).filename),
-          path.relative(rootDir, id)
-        ));
+        const jsonSourceMap = sourceMap && (typeof sourceMap === "string" ? JSON.parse(sourceMap) : sourceMap.json(normalizePath(path.relative(outDir, id))));
         let transformed = {
           code: compiled,
           map: jsonSourceMap
@@ -706,8 +714,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 || path.dirname(options2.outfile);
       }
     },
     vite: {
@@ -716,6 +728,7 @@ var rawPlugin = (options = {}, meta) => {
           skipWorker = true;
         }
         rootDir = path.resolve(process.cwd(), config.root ?? "");
+        outDir = path.resolve(rootDir, config.build?.outDir ?? "dist");
         if (implicitExtension) {
           config.resolve ??= {};
           config.resolve.extensions ??= DEFAULT_EXTENSIONS;
@@ -765,7 +778,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");

package/dist/unplugin/vite.d.ts

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

package/dist/unplugin/vite.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\vite.civet.jsx
-var vite_civet_exports = {};
-__export(vite_civet_exports, {
-  default: () => vite_civet_default
+// source/unplugin/vite.civet
+var vite_exports = {};
+__export(vite_exports, {
+  default: () => vite_default
 });
-module.exports = __toCommonJS(vite_civet_exports);
+module.exports = __toCommonJS(vite_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var vite_civet_default = import_unplugin.default.vite;
+var vite_default = import_unplugin.default.vite;

package/dist/unplugin/vite.mjs

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

package/dist/unplugin/webpack.d.ts

@@ -1,2 +1,2 @@
-declare const _default: (options: import("./unplugin.js").PluginOptions) => WebpackPluginInstance;
+declare const _default: (options: import("./unplugin.js").PluginOptions) => import("unplugin").WebpackPluginInstance;
 export default _default;

package/dist/unplugin/webpack.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\webpack.civet.jsx
-var webpack_civet_exports = {};
-__export(webpack_civet_exports, {
-  default: () => webpack_civet_default
+// source/unplugin/webpack.civet
+var webpack_exports = {};
+__export(webpack_exports, {
+  default: () => webpack_default
 });
-module.exports = __toCommonJS(webpack_civet_exports);
+module.exports = __toCommonJS(webpack_exports);
 var import_unplugin = __toESM(require("./unplugin.js"));
-var webpack_civet_default = import_unplugin.default.webpack;
+var webpack_default = import_unplugin.default.webpack;

package/dist/unplugin/webpack.mjs

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.11.5",
+  "version": "0.11.6",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",
@@ -95,46 +95,52 @@
   },
   "scripts": {
     "build": "bash ./build/build.sh",
-    "build:self": "yarn build && bash ./build/build-self.sh",
-    "docs:dev": "yarn build && vitepress dev civet.dev",
-    "docs:build": "yarn build && vitepress build civet.dev",
-    "docs:preview": "yarn build && vitepress preview civet.dev",
-    "prepublishOnly": "yarn build && yarn test && yarn changelog --release",
+    "build:self": "pnpm build && bash ./build/build-self.sh",
+    "clean:cache": "rm -rf .cache",
+    "docs:dev": "pnpm build && vitepress dev civet.dev",
+    "docs:build": "pnpm build && vitepress build civet.dev",
+    "docs:preview": "pnpm build && vitepress preview civet.dev",
+    "prepublishOnly": "pnpm build && pnpm test:coverage && pnpm changelog --verify",
     "test": "bash ./build/test.sh",
-    "test:self": "yarn build && mocha --config .mocharc-self.json",
-    "changelog": "civet build/changelog.civet"
+    "test:coverage": "cross-env CIVET_COVERAGE=1 bash ./build/test.sh",
+    "test:self": "cross-env CIVET_SOURCE=./dist/main.js pnpm test",
+    "changelog": "civet build/changelog.civet",
+    "release": "pnpm changelog --release"
   },
   "author": "Daniel X. Moore",
   "license": "MIT",
   "dependencies": {
     "@cspotcode/source-map-support": "^0.8.1",
-    "unplugin": "^2.3.2"
+    "unplugin": "2.3.11"
   },
   "devDependencies": {
+    "@babel/core": "^7.29.0",
+    "@babel/parser": "^7.29.2",
     "@danielx/civet": "0.9.4",
-    "@danielx/hera": "^0.8.17",
+    "@danielx/hera": "0.8.19",
     "@prettier/sync": "^0.5.2",
     "@types/assert": "^1.5.6",
     "@types/mocha": "^10.0.8",
     "@types/node": "^22.10.2",
     "@typescript/vfs": "^1.6.4",
     "c8": "^7.12.0",
-    "esbuild": "0.24.0",
+    "cross-env": "7.0.3",
+    "esbuild": "0.27.5",
     "marked": "^4.2.4",
     "mocha": "^10.7.3",
     "prettier": "^3.2.5",
+    "shiki": "^3.0.0",
     "terser": "^5.16.1",
-    "ts-node": "^10.9.2",
     "tslib": "^2.4.0",
     "typescript": "^5.5.2",
-    "vite": "^4.4.12",
+    "vite": "^8.0.3",
     "vitepress": "^1.0.0-alpha.35",
     "vscode-languageserver": "^8.1.0",
     "vscode-languageserver-textdocument": "^1.0.8",
     "vue": "^3.2.45"
   },
   "peerDependencies": {
-    "typescript": "^4.5 || ^5.0",
+    "typescript": ">=4.5",
     "yaml": "^2.4.5"
   },
   "peerDependenciesMeta": {
@@ -168,5 +174,14 @@
       "source/bun-civet.civet"
     ]
   },
-  "packageManager": "yarn@1.22.21+sha1.1959a18351b811cdeedbd484a8f86c3cc3bbaf72"
+  "packageManager": "pnpm@10.33.0",
+  "pnpm": {
+    "overrides": {
+      "serialize-javascript": "^7.0.3",
+      "tmp": "^0.2.5",
+      "lodash": "^4.18.0",
+      "esbuild": "^0.27.0",
+      "diff": "^8.0.3"
+    }
+  }
 }