weapp-vite 1.1.3 → 1.1.4

package/dist/{chunk-VXEA2S4N.mjs → chunk-NPLMSNBG.mjs}

@@ -24,7 +24,7 @@ import fg from "fast-glob";
 import fs3 from "fs-extra";
 import MagicString from "magic-string";
 import path4 from "pathe";
-import { isCSSRequest, preprocessCSS } from "vite";
+import { isCSSRequest } from "vite";
 
 // src/debugger.ts
 import createDebug from "debug";
@@ -323,7 +323,6 @@ function getRealPath(res) {
   return res.filename;
 }
 function vitePluginWeapp(ctx) {
-  const stylesIds = /* @__PURE__ */ new Set();
   let configResolved;
   let entriesSet = /* @__PURE__ */ new Set();
   function relative(p) {
@@ -440,7 +439,7 @@ function vitePluginWeapp(ctx) {
           return source.replace(/\.wxss$/, ".css?wxss");
         }
       },
-      load(id) {
+      async load(id) {
         if (entriesSet.has(id)) {
           const base = removeExtension2(id);
           const ms = new MagicString(fs3.readFileSync(id, "utf8"));
@@ -457,41 +456,33 @@ function vitePluginWeapp(ctx) {
             code: ms.toString()
           };
         } else if (isCSSRequest(id)) {
-          stylesIds.add(id);
-          return {
-            code: ""
-          };
-        }
-      },
-      async buildEnd() {
-        const styles = {};
-        for (const stylesId of stylesIds) {
-          const parsed = parseRequest(stylesId);
+          const parsed = parseRequest(id);
           const realPath = getRealPath(parsed);
           if (await fs3.exists(realPath)) {
             const css = await fs3.readFile(realPath, "utf8");
-            const res = await preprocessCSS(css, stylesId, configResolved);
-            const fileName = relative(normalizeCssPath(stylesId));
-            if (styles[fileName]) {
-              styles[fileName] += res.code;
-            } else {
-              styles[fileName] = res.code;
-            }
-          } else {
-            stylesIds.delete(stylesId);
+            return {
+              code: css
+            };
           }
         }
-        for (const style of Object.entries(styles)) {
-          this.emitFile({
-            type: "asset",
-            fileName: ctx.relativeSrcRoot(style[0]),
-            source: style[1]
-          });
+      },
+      generateBundle(_options, bundle) {
+        const bundleKeys = Object.keys(bundle);
+        for (const bundleKey of bundleKeys) {
+          const asset = bundle[bundleKey];
+          if (bundleKey.endsWith(".css") && asset.type === "asset" && asset.originalFileName?.endsWith(".js")) {
+            const newFileName = normalizeCssPath(asset.originalFileName);
+            this.emitFile({
+              type: "asset",
+              fileName: newFileName,
+              source: asset.source
+            });
+            delete bundle[bundleKey];
+          }
         }
       }
-      // generateBundle(_options, _bundle) {
-      //   const files = this.getWatchFiles()
-      //   console.log(files)
+      // writeBundle(options, bundle) {
+      //   console.log(options, bundle)
       // },
     },
     {

package/dist/cli.cjs

@@ -29,7 +29,7 @@ var import_cac = require("cac");
 var import_weapp_ide_cli = require("weapp-ide-cli");
 
 // package.json
-var version = "1.1.3";
+var version = "1.1.4";
 
 // src/constants.ts
 var VERSION = version;
@@ -359,7 +359,6 @@ function getRealPath(res) {
   return res.filename;
 }
 function vitePluginWeapp(ctx) {
-  const stylesIds = /* @__PURE__ */ new Set();
   let configResolved;
   let entriesSet = /* @__PURE__ */ new Set();
   function relative(p) {
@@ -476,7 +475,7 @@ function vitePluginWeapp(ctx) {
           return source.replace(/\.wxss$/, ".css?wxss");
         }
       },
-      load(id) {
+      async load(id) {
         if (entriesSet.has(id)) {
           const base = (0, import_shared3.removeExtension)(id);
           const ms = new import_magic_string.default(import_fs_extra3.default.readFileSync(id, "utf8"));
@@ -493,41 +492,33 @@ function vitePluginWeapp(ctx) {
             code: ms.toString()
           };
         } else if ((0, import_vite.isCSSRequest)(id)) {
-          stylesIds.add(id);
-          return {
-            code: ""
-          };
-        }
-      },
-      async buildEnd() {
-        const styles = {};
-        for (const stylesId of stylesIds) {
-          const parsed = parseRequest(stylesId);
+          const parsed = parseRequest(id);
           const realPath = getRealPath(parsed);
           if (await import_fs_extra3.default.exists(realPath)) {
             const css = await import_fs_extra3.default.readFile(realPath, "utf8");
-            const res = await (0, import_vite.preprocessCSS)(css, stylesId, configResolved);
-            const fileName = relative(normalizeCssPath(stylesId));
-            if (styles[fileName]) {
-              styles[fileName] += res.code;
-            } else {
-              styles[fileName] = res.code;
-            }
-          } else {
-            stylesIds.delete(stylesId);
+            return {
+              code: css
+            };
           }
         }
-        for (const style of Object.entries(styles)) {
-          this.emitFile({
-            type: "asset",
-            fileName: ctx.relativeSrcRoot(style[0]),
-            source: style[1]
-          });
+      },
+      generateBundle(_options, bundle) {
+        const bundleKeys = Object.keys(bundle);
+        for (const bundleKey of bundleKeys) {
+          const asset = bundle[bundleKey];
+          if (bundleKey.endsWith(".css") && asset.type === "asset" && asset.originalFileName?.endsWith(".js")) {
+            const newFileName = normalizeCssPath(asset.originalFileName);
+            this.emitFile({
+              type: "asset",
+              fileName: newFileName,
+              source: asset.source
+            });
+            delete bundle[bundleKey];
+          }
         }
       }
-      // generateBundle(_options, _bundle) {
-      //   const files = this.getWatchFiles()
-      //   console.log(files)
+      // writeBundle(options, bundle) {
+      //   console.log(options, bundle)
       // },
     },
     {

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import {
   CompilerContext
-} from "./chunk-VXEA2S4N.mjs";
+} from "./chunk-NPLMSNBG.mjs";
 import "./chunk-444MQSSG.mjs";
 
 // src/cli.ts
@@ -10,7 +10,7 @@ import { cac } from "cac";
 import { parse } from "weapp-ide-cli";
 
 // package.json
-var version = "1.1.3";
+var version = "1.1.4";
 
 // src/constants.ts
 var VERSION = version;

package/dist/index.cjs

@@ -359,7 +359,6 @@ function getRealPath(res) {
   return res.filename;
 }
 function vitePluginWeapp(ctx) {
-  const stylesIds = /* @__PURE__ */ new Set();
   let configResolved;
   let entriesSet = /* @__PURE__ */ new Set();
   function relative(p) {
@@ -476,7 +475,7 @@ function vitePluginWeapp(ctx) {
           return source.replace(/\.wxss$/, ".css?wxss");
         }
       },
-      load(id) {
+      async load(id) {
         if (entriesSet.has(id)) {
           const base = (0, import_shared3.removeExtension)(id);
           const ms = new import_magic_string.default(import_fs_extra3.default.readFileSync(id, "utf8"));
@@ -493,41 +492,33 @@ function vitePluginWeapp(ctx) {
             code: ms.toString()
           };
         } else if ((0, import_vite.isCSSRequest)(id)) {
-          stylesIds.add(id);
-          return {
-            code: ""
-          };
-        }
-      },
-      async buildEnd() {
-        const styles = {};
-        for (const stylesId of stylesIds) {
-          const parsed = parseRequest(stylesId);
+          const parsed = parseRequest(id);
           const realPath = getRealPath(parsed);
           if (await import_fs_extra3.default.exists(realPath)) {
             const css = await import_fs_extra3.default.readFile(realPath, "utf8");
-            const res = await (0, import_vite.preprocessCSS)(css, stylesId, configResolved);
-            const fileName = relative(normalizeCssPath(stylesId));
-            if (styles[fileName]) {
-              styles[fileName] += res.code;
-            } else {
-              styles[fileName] = res.code;
-            }
-          } else {
-            stylesIds.delete(stylesId);
+            return {
+              code: css
+            };
           }
         }
-        for (const style of Object.entries(styles)) {
-          this.emitFile({
-            type: "asset",
-            fileName: ctx.relativeSrcRoot(style[0]),
-            source: style[1]
-          });
+      },
+      generateBundle(_options, bundle) {
+        const bundleKeys = Object.keys(bundle);
+        for (const bundleKey of bundleKeys) {
+          const asset = bundle[bundleKey];
+          if (bundleKey.endsWith(".css") && asset.type === "asset" && asset.originalFileName?.endsWith(".js")) {
+            const newFileName = normalizeCssPath(asset.originalFileName);
+            this.emitFile({
+              type: "asset",
+              fileName: newFileName,
+              source: asset.source
+            });
+            delete bundle[bundleKey];
+          }
         }
       }
-      // generateBundle(_options, _bundle) {
-      //   const files = this.getWatchFiles()
-      //   console.log(files)
+      // writeBundle(options, bundle) {
+      //   console.log(options, bundle)
       // },
     },
     {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import {
   CompilerContext
-} from "./chunk-VXEA2S4N.mjs";
+} from "./chunk-NPLMSNBG.mjs";
 import "./chunk-444MQSSG.mjs";
 export {
   CompilerContext

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "weapp-vite 一个现代化的小程序打包工具",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -64,9 +64,9 @@
     "pkg-types": "^1.2.0",
     "vite-tsconfig-paths": "^5.0.1",
     "@weapp-core/init": "^1.0.4",
+    "weapp-ide-cli": "^2.0.5",
     "@weapp-core/logger": "^1.0.1",
-    "@weapp-core/shared": "^1.0.1",
-    "weapp-ide-cli": "^2.0.5"
+    "@weapp-core/shared": "^1.0.1"
   },
   "publishConfig": {
     "access": "public",