@danielx/civet 0.11.1 → 0.11.2

package/dist/types.d.ts

@@ -53,6 +53,10 @@ declare module "@danielx/civet" {
      * in sourcemaps and error messages.
      */
     filename?: string
+    /**
+     * Output (transpiled) filename to record in inline source maps.
+     */
+    outputFilename?: string
     /**
      * Whether to return a source map in addition to transpiled code.
      * If false (the default), `compile` just returns transpiled code.

package/dist/unplugin/unplugin.js

@@ -56,6 +56,7 @@ var postfixRE = /[?#].*$/s;
 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) => {
@@ -127,6 +128,7 @@ var rawPlugin = (options = {}, meta) => {
   let esbuildOptions;
   let configErrors;
   let configFileNames;
+  let skipWorker = false;
   let ref;
   if (transformTS || ts === "tsc") {
     ref = import("typescript").then(($1) => $1.default);
@@ -415,13 +417,14 @@ var rawPlugin = (options = {}, meta) => {
       return resolved + outExt + postfix;
     },
     loadInclude(id) {
-      return extractCivetFilename(id, outExt).filename.endsWith(civetSuffix);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      if (skipWorker && workerRE.test(postfix)) {
+        return false;
+      }
+      return filename.endsWith(civetSuffix);
     },
     async load(id) {
       let { filename } = extractCivetFilename(id, outExt);
-      if (!filename.endsWith(civetSuffix)) {
-        return null;
-      }
       filename = import_path.default.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
@@ -563,6 +566,9 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
+        if (this?.meta?.viteVersion && 7 <= Number(this.meta.viteVersion.split(".")[0])) {
+          skipWorker = true;
+        }
         rootDir = import_path.default.resolve(process.cwd(), config.root ?? "");
         if (implicitExtension) {
           config.resolve ??= {};
@@ -592,10 +598,11 @@ var rawPlugin = (options = {}, meta) => {
           return;
         }
         const resolvedId = slash(import_path.default.resolve(file) + outExt);
-        const module2 = server.moduleGraph.getModuleById(resolvedId);
-        if (module2) {
+        let ref4;
+        if (ref4 = server.moduleGraph.getModulesByFile(resolvedId)) {
+          const fileModules = ref4;
           server.moduleGraph.onFileChange(resolvedId);
-          return [...modules, module2];
+          return [...modules, ...fileModules];
         }
         return modules;
       }
@@ -618,9 +625,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref4;
-        for (const key in ref4 = compiler.options.resolve.alias) {
-          const value = ref4[key];
+        let ref5;
+        for (const key in ref5 = compiler.options.resolve.alias) {
+          const value = ref5[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/dist/unplugin/unplugin.mjs

@@ -24,6 +24,7 @@ var postfixRE = /[?#].*$/s;
 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) => {
@@ -95,6 +96,7 @@ var rawPlugin = (options = {}, meta) => {
   let esbuildOptions;
   let configErrors;
   let configFileNames;
+  let skipWorker = false;
   let ref;
   if (transformTS || ts === "tsc") {
     ref = import("typescript").then(($1) => $1.default);
@@ -383,13 +385,14 @@ var rawPlugin = (options = {}, meta) => {
       return resolved + outExt + postfix;
     },
     loadInclude(id) {
-      return extractCivetFilename(id, outExt).filename.endsWith(civetSuffix);
+      const { filename, postfix } = extractCivetFilename(id, outExt);
+      if (skipWorker && workerRE.test(postfix)) {
+        return false;
+      }
+      return filename.endsWith(civetSuffix);
     },
     async load(id) {
       let { filename } = extractCivetFilename(id, outExt);
-      if (!filename.endsWith(civetSuffix)) {
-        return null;
-      }
       filename = path.resolve(rootDir, filename);
       this.addWatchFile(filename);
       let mtime, cached, resolve;
@@ -531,6 +534,9 @@ var rawPlugin = (options = {}, meta) => {
     },
     vite: {
       config(config) {
+        if (this?.meta?.viteVersion && 7 <= Number(this.meta.viteVersion.split(".")[0])) {
+          skipWorker = true;
+        }
         rootDir = path.resolve(process.cwd(), config.root ?? "");
         if (implicitExtension) {
           config.resolve ??= {};
@@ -560,10 +566,11 @@ var rawPlugin = (options = {}, meta) => {
           return;
         }
         const resolvedId = slash(path.resolve(file) + outExt);
-        const module = server.moduleGraph.getModuleById(resolvedId);
-        if (module) {
+        let ref4;
+        if (ref4 = server.moduleGraph.getModulesByFile(resolvedId)) {
+          const fileModules = ref4;
           server.moduleGraph.onFileChange(resolvedId);
-          return [...modules, module];
+          return [...modules, ...fileModules];
         }
         return modules;
       }
@@ -586,9 +593,9 @@ var rawPlugin = (options = {}, meta) => {
         compiler.options.resolve.extensions.unshift(".civet");
       }
       return aliasResolver = (id) => {
-        let ref4;
-        for (const key in ref4 = compiler.options.resolve.alias) {
-          const value = ref4[key];
+        let ref5;
+        for (const key in ref5 = compiler.options.resolve.alias) {
+          const value = ref5[key];
           if (key.endsWith("$")) {
             if (id === key.slice(0, -1)) {
               return typeof value === "string" ? value : "\0";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danielx/civet",
   "type": "commonjs",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "CoffeeScript style syntax for TypeScript",
   "main": "dist/main.js",
   "module": "dist/main.mjs",