vite-plugin-qingkuai 1.0.16 → 1.0.18

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var vite = require('vite');
 var nodePath = require('node:path');
 var nodeCrypto = require('node:crypto');
 var compiler = require('qingkuai/compiler');
@@ -8,9 +9,37 @@ var linesAndColumns = require('lines-and-columns');
 var sourcemapCodec = require('@jridgewell/sourcemap-codec');
 var postcss = require('postcss');
 var selectorParser = require('postcss-selector-parser');
-var vite = require('vite');
 var sourceMapJs = require('source-map-js');
 
+function _interopNamespaceDefault(e) {
+    var n = Object.create(null);
+    if (e) {
+        Object.keys(e).forEach(function (k) {
+            if (k !== 'default') {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    }
+    n.default = e;
+    return Object.freeze(n);
+}
+
+var vite__namespace = /*#__PURE__*/_interopNamespaceDefault(vite);
+
+const globalStyle = "\n" + compiler.util.formatSourceCode(
+  `
+            /* Injected by vite-plugin-qingkuai */
+
+            *[hidden] {
+                display: none !important;
+            }
+        `
+).replace(/^/gm, "    ") + "\n";
+
 function isUndefined(v) {
   return void 0 === v;
 }
@@ -123,20 +152,20 @@ function qingkuai() {
         cssSourcemap = true;
         sourcemap = config.build.sourcemap !== false;
       }
-      const optimizeDeps = config.optimizeDeps;
-      if (!optimizeDeps) {
-        Object.assign(config, {
-          optimizeDeps: {
-            exclude: ["qingkuai"]
-          }
-        });
-      } else if (!optimizeDeps.exclude) {
-        optimizeDeps.exclude = ["qingkuai"];
-      } else {
-        optimizeDeps.exclude.push("qingkuai");
-      }
       loadAllQingkuaiConfigurations(config.root);
     },
+    transformIndexHtml(html) {
+      return {
+        html,
+        tags: [
+          {
+            tag: "style",
+            injectTo: "head",
+            children: globalStyle
+          }
+        ]
+      };
+    },
     resolveId(id, importer) {
       if (styleIdRE.test(id)) {
         return id;
@@ -166,7 +195,7 @@ function qingkuai() {
             break;
           }
         }
-        const preprocessRes = await vite.preprocessCSS(style.code, virtualFileName, {
+        const preprocessRes = await vite__namespace.preprocessCSS(style.code, virtualFileName, {
           ...viteConfig,
           css: {
             ...viteConfig.css,
@@ -266,7 +295,15 @@ function qingkuai() {
             })
           };
         }
-        const esBuildCompileRes = await vite.transformWithEsbuild(
+        const inputMap = sourcemap ? {
+          version: 3,
+          sources: [id],
+          sourcesContent: [src],
+          mappings: compileRes.mappings
+        } : void 0;
+        const transformWithEsbuild = vite__namespace.transformWithEsbuild;
+        const transformWithOxc = vite__namespace.transformWithOxc;
+        const tsCompileRes = transformWithEsbuild ? await transformWithEsbuild(
           compiledCode,
           id,
           {
@@ -274,24 +311,37 @@ function qingkuai() {
             loader: "ts",
             target: "esnext"
           },
-          sourcemap ? {
-            version: 3,
-            sources: [id],
-            sourcesContent: [src],
-            mappings: compileRes.mappings
-          } : void 0
-        );
+          inputMap
+        ) : transformWithOxc ? await transformWithOxc(
+          compiledCode,
+          id,
+          {
+            sourcemap,
+            target: "esnext"
+          },
+          inputMap
+        ) : null;
+        if (!tsCompileRes) {
+          this.error("Current Vite runtime does not provide TypeScript transform APIs.");
+        }
         if (!sourcemap) {
-          return esBuildCompileRes.code;
+          return tsCompileRes.code;
         }
+        const transformedMap = typeof tsCompileRes.map === "string" ? JSON.parse(tsCompileRes.map) : tsCompileRes.map;
         return {
-          code: esBuildCompileRes.code,
+          code: tsCompileRes.code,
           map: Object.assign(baseMap, {
-            mappings: esBuildCompileRes.map.mappings
+            mappings: transformedMap?.mappings || compileRes.mappings
           })
         };
       } catch (err) {
-        err.pos = err.loc.start.index, this.error(err);
+        if (err.loc.start && "index" in err.loc.start) {
+          err.pos = err.loc.start.index, this.error(err);
+        } else {
+          this.error(
+            "Qingkuai compile result is invalid. Please report this at https://github.com/qingkuai-js/qingkuai/issues and include your .qk source for reproduction."
+          );
+        }
       }
     }
   };
@@ -315,10 +365,25 @@ function qingkuai() {
     return config;
   }
   function createQingkuaiConfigurationWatcher(server) {
-    const watcher = server.watcher.add([".qingkuairc", "!**/node_modules/**"]);
-    watcher.on("unlink", (p) => qingkuaiConfigurations.delete(nodePath.dirname(p)));
-    watcher.on("change", recordQingkuaiConfiguration);
-    watcher.on("add", recordQingkuaiConfiguration);
+    const watcher = server.watcher;
+    const isQingkuaiConfig = (filePath) => {
+      return nodePath.basename(filePath) === ".qingkuairc" && !filePath.includes(`${nodePath.sep}node_modules${nodePath.sep}`);
+    };
+    watcher.on("unlink", (filePath) => {
+      if (isQingkuaiConfig(filePath)) {
+        qingkuaiConfigurations.delete(nodePath.dirname(filePath));
+      }
+    });
+    watcher.on("change", (filePath) => {
+      if (isQingkuaiConfig(filePath)) {
+        recordQingkuaiConfiguration(filePath);
+      }
+    });
+    watcher.on("add", (filePath) => {
+      if (isQingkuaiConfig(filePath)) {
+        recordQingkuaiConfiguration(filePath);
+      }
+    });
   }
   function loadAllQingkuaiConfigurations(workspaceDir) {
     findFilesByName(workspaceDir, ".qingkuairc", /* @__PURE__ */ new Set(["node_modules"])).forEach((fileName) => {

package/dist/index.js

@@ -1,14 +1,24 @@
+import * as vite from 'vite';
 import nodePath from 'node:path';
 import nodeCrypto from 'node:crypto';
-import { compile } from 'qingkuai/compiler';
+import { util, compile } from 'qingkuai/compiler';
 import nodeFs, { existsSync, readFileSync } from 'node:fs';
 import { LinesAndColumns } from 'lines-and-columns';
 import { decode, encode } from '@jridgewell/sourcemap-codec';
 import postcss from 'postcss';
 import selectorParser from 'postcss-selector-parser';
-import { transformWithEsbuild, preprocessCSS } from 'vite';
 import { SourceMapConsumer } from 'source-map-js';
 
+const globalStyle = "\n" + util.formatSourceCode(
+  `
+            /* Injected by vite-plugin-qingkuai */
+
+            *[hidden] {
+                display: none !important;
+            }
+        `
+).replace(/^/gm, "    ") + "\n";
+
 function isUndefined(v) {
   return void 0 === v;
 }
@@ -121,20 +131,20 @@ function qingkuai() {
         cssSourcemap = true;
         sourcemap = config.build.sourcemap !== false;
       }
-      const optimizeDeps = config.optimizeDeps;
-      if (!optimizeDeps) {
-        Object.assign(config, {
-          optimizeDeps: {
-            exclude: ["qingkuai"]
-          }
-        });
-      } else if (!optimizeDeps.exclude) {
-        optimizeDeps.exclude = ["qingkuai"];
-      } else {
-        optimizeDeps.exclude.push("qingkuai");
-      }
       loadAllQingkuaiConfigurations(config.root);
     },
+    transformIndexHtml(html) {
+      return {
+        html,
+        tags: [
+          {
+            tag: "style",
+            injectTo: "head",
+            children: globalStyle
+          }
+        ]
+      };
+    },
     resolveId(id, importer) {
       if (styleIdRE.test(id)) {
         return id;
@@ -164,7 +174,7 @@ function qingkuai() {
             break;
           }
         }
-        const preprocessRes = await preprocessCSS(style.code, virtualFileName, {
+        const preprocessRes = await vite.preprocessCSS(style.code, virtualFileName, {
           ...viteConfig,
           css: {
             ...viteConfig.css,
@@ -264,7 +274,15 @@ function qingkuai() {
             })
           };
         }
-        const esBuildCompileRes = await transformWithEsbuild(
+        const inputMap = sourcemap ? {
+          version: 3,
+          sources: [id],
+          sourcesContent: [src],
+          mappings: compileRes.mappings
+        } : void 0;
+        const transformWithEsbuild = vite.transformWithEsbuild;
+        const transformWithOxc = vite.transformWithOxc;
+        const tsCompileRes = transformWithEsbuild ? await transformWithEsbuild(
           compiledCode,
           id,
           {
@@ -272,24 +290,37 @@ function qingkuai() {
             loader: "ts",
             target: "esnext"
           },
-          sourcemap ? {
-            version: 3,
-            sources: [id],
-            sourcesContent: [src],
-            mappings: compileRes.mappings
-          } : void 0
-        );
+          inputMap
+        ) : transformWithOxc ? await transformWithOxc(
+          compiledCode,
+          id,
+          {
+            sourcemap,
+            target: "esnext"
+          },
+          inputMap
+        ) : null;
+        if (!tsCompileRes) {
+          this.error("Current Vite runtime does not provide TypeScript transform APIs.");
+        }
         if (!sourcemap) {
-          return esBuildCompileRes.code;
+          return tsCompileRes.code;
         }
+        const transformedMap = typeof tsCompileRes.map === "string" ? JSON.parse(tsCompileRes.map) : tsCompileRes.map;
         return {
-          code: esBuildCompileRes.code,
+          code: tsCompileRes.code,
           map: Object.assign(baseMap, {
-            mappings: esBuildCompileRes.map.mappings
+            mappings: transformedMap?.mappings || compileRes.mappings
           })
         };
       } catch (err) {
-        err.pos = err.loc.start.index, this.error(err);
+        if (err.loc.start && "index" in err.loc.start) {
+          err.pos = err.loc.start.index, this.error(err);
+        } else {
+          this.error(
+            "Qingkuai compile result is invalid. Please report this at https://github.com/qingkuai-js/qingkuai/issues and include your .qk source for reproduction."
+          );
+        }
       }
     }
   };
@@ -313,10 +344,25 @@ function qingkuai() {
     return config;
   }
   function createQingkuaiConfigurationWatcher(server) {
-    const watcher = server.watcher.add([".qingkuairc", "!**/node_modules/**"]);
-    watcher.on("unlink", (p) => qingkuaiConfigurations.delete(nodePath.dirname(p)));
-    watcher.on("change", recordQingkuaiConfiguration);
-    watcher.on("add", recordQingkuaiConfiguration);
+    const watcher = server.watcher;
+    const isQingkuaiConfig = (filePath) => {
+      return nodePath.basename(filePath) === ".qingkuairc" && !filePath.includes(`${nodePath.sep}node_modules${nodePath.sep}`);
+    };
+    watcher.on("unlink", (filePath) => {
+      if (isQingkuaiConfig(filePath)) {
+        qingkuaiConfigurations.delete(nodePath.dirname(filePath));
+      }
+    });
+    watcher.on("change", (filePath) => {
+      if (isQingkuaiConfig(filePath)) {
+        recordQingkuaiConfiguration(filePath);
+      }
+    });
+    watcher.on("add", (filePath) => {
+      if (isQingkuaiConfig(filePath)) {
+        recordQingkuaiConfiguration(filePath);
+      }
+    });
   }
   function loadAllQingkuaiConfigurations(workspaceDir) {
     findFilesByName(workspaceDir, ".qingkuairc", /* @__PURE__ */ new Set(["node_modules"])).forEach((fileName) => {

package/package.json

@@ -2,7 +2,7 @@
     "name": "vite-plugin-qingkuai",
     "author": "mlgq",
     "license": "MIT",
-    "version": "1.0.16",
+    "version": "1.0.18",
     "type": "module",
     "keywords": [
         "vite",
@@ -30,11 +30,11 @@
         "rollup": "^4.38.0",
         "rollup-plugin-dts": "^6.2.1",
         "rollup-plugin-esbuild": "^6.2.1",
-        "vite": "6.2.4"
+        "vite": "8.0.0"
     },
     "peerDependencies": {
         "qingkuai": ">=1.0.50",
-        "vite": ">=6.2.4"
+        "vite": ">=6.2.4 <9"
     },
     "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",