weapp-vite 0.0.2-alpha.0 → 0.0.2-alpha.1

package/dist/cli.cjs

@@ -31,6 +31,7 @@ var import_init = require("@weapp-core/init");
 var import_vite2 = require("vite");
 var import_micromatch = __toESM(require("micromatch"), 1);
 var import_shared3 = require("@weapp-core/shared");
+var import_pathe2 = __toESM(require("pathe"), 1);
 
 // src/utils/scan.ts
 var import_pathe = __toESM(require("pathe"), 1);
@@ -50,13 +51,10 @@ function searchAppEntry(root) {
     }
   }
 }
-function removeFileExtension(path3) {
-  return path3.replace(/\.[^/.]+$/, "");
-}
 function searchPageEntry(wxmlPath) {
   if (import_fs_extra.default.existsSync(wxmlPath)) {
     const extensions = ["js", "ts"];
-    const base = removeFileExtension(wxmlPath);
+    const base = (0, import_shared.removeExtension)(wxmlPath);
     for (const ext of extensions) {
       const entryPath = (0, import_shared.addExtension)(base, `.${ext}`);
       if (import_fs_extra.default.existsSync(entryPath)) {
@@ -68,12 +66,15 @@ function searchPageEntry(wxmlPath) {
 function getWxmlEntry(wxmlPath) {
   const pageEntry = searchPageEntry(wxmlPath);
   if (pageEntry) {
-    const jsonPath = (0, import_shared.addExtension)(removeFileExtension(wxmlPath), ".json");
-    if (import_fs_extra.default.existsSync(jsonPath) && import_fs_extra.default.readJsonSync(jsonPath).component) {
-      return {
-        path: pageEntry,
-        type: "component"
-      };
+    const jsonPath = (0, import_shared.addExtension)((0, import_shared.removeExtension)(wxmlPath), ".json");
+    if (import_fs_extra.default.existsSync(jsonPath)) {
+      const json = import_fs_extra.default.readJsonSync(jsonPath, { throws: false });
+      if (json && json.component) {
+        return {
+          path: pageEntry,
+          type: "component"
+        };
+      }
     }
     return {
       path: pageEntry,
@@ -154,14 +155,14 @@ function vitePluginWeapp(options) {
   const { cwd: cwd2, entries: _entries, src } = (0, import_shared2.defu)(options, {
     src: ""
   });
+  function relative(p) {
+    return import_node_path.default.relative(cwd2, p);
+  }
   const input = _entries.reduce((acc, cur) => {
     acc[relative(cur)] = cur;
     return acc;
   }, {});
   const entries = Array.isArray(_entries) ? new Set(_entries) : _entries;
-  function relative(p) {
-    return import_node_path.default.relative(cwd2, p);
-  }
   const stylesIds = /* @__PURE__ */ new Set();
   let configResolved;
   return [
@@ -170,14 +171,6 @@ function vitePluginWeapp(options) {
       enforce: "pre",
       configResolved(config) {
         config.build.rollupOptions.input = input;
-        config.build.rollupOptions.output = {
-          format: "cjs",
-          entryFileNames: (chunkInfo) => {
-            return chunkInfo.name;
-          }
-        };
-        config.build.assetsDir = ".";
-        config.build.commonjsOptions.transformMixedEsModules = true;
         configResolved = config;
       },
       resolveId(source) {
@@ -192,10 +185,12 @@ function vitePluginWeapp(options) {
           for (const ext of supportedCssExtensions) {
             const mayBeCssPath = (0, import_shared2.addExtension)(base, ext);
             if (import_fs_extra2.default.existsSync(mayBeCssPath)) {
+              this.addWatchFile(mayBeCssPath);
               ms.prepend(`import '${mayBeCssPath}'
 `);
             }
           }
+          this.addWatchFile(id);
           return {
             code: ms.toString()
           };
@@ -240,13 +235,19 @@ function vitePluginWeapp(options) {
           }
         );
         for (const file of files) {
+          const filepath = import_node_path.default.resolve(cwd2, file);
+          this.addWatchFile(filepath);
           this.emitFile({
             type: "asset",
             fileName: file,
-            source: await import_fs_extra2.default.readFile(import_node_path.default.resolve(cwd2, file))
+            source: await import_fs_extra2.default.readFile(filepath)
           });
         }
       }
+      // generateBundle(_options, _bundle) {
+      //   const files = this.getWatchFiles()
+      //   console.log(files)
+      // },
     },
     {
       name: "weapp-vite"
@@ -262,6 +263,8 @@ function vitePluginWeapp(options) {
 function createFilter(include, exclude, options) {
   const opts = (0, import_shared3.defu)(options, {
     ignore: exclude
+    // dot: true,
+    // contains: true,
   });
   return function(id) {
     if (typeof id !== "string") {
@@ -273,37 +276,73 @@ function createFilter(include, exclude, options) {
     return import_micromatch.default.isMatch(id, include, opts);
   };
 }
-async function runDev(cwd2) {
-  const filter = createFilter(["**/*"], [...defaultExcluded, "dist/**"]);
-  const entries = await scanEntries(cwd2, { filter });
+function getEntries(options) {
+  let cwd2;
+  let relative;
+  if (typeof options === "string") {
+    cwd2 = options;
+  } else {
+    cwd2 = options.cwd;
+    relative = options.relative;
+  }
+  const filter = createFilter(["**/*"], [...defaultExcluded, import_pathe2.default.resolve(cwd2, "dist/**")], { cwd: cwd2 });
+  return scanEntries(cwd2, { filter, relative });
+}
+function getDefaultConfig(options) {
+  return {
+    build: {
+      rollupOptions: {
+        output: {
+          format: "cjs",
+          entryFileNames: (chunkInfo) => {
+            return chunkInfo.name;
+          }
+        }
+      },
+      assetsDir: ".",
+      commonjsOptions: {
+        transformMixedEsModules: true,
+        include: void 0
+      }
+    },
+    plugins: [
+      vitePluginWeapp(options)
+    ]
+  };
+}
+async function runDev(cwd2, options) {
+  const entries = await getEntries(cwd2);
   if (entries) {
-    const watcher = await (0, import_vite2.build)({
-      plugins: [
-        vitePluginWeapp({
+    const watcher = await (0, import_vite2.build)(
+      (0, import_shared3.defu)(
+        options,
+        getDefaultConfig({
           cwd: cwd2,
           entries: entries.all
-        })
-      ],
-      build: {
-        watch: {},
-        minify: false
-      }
-    });
+        }),
+        {
+          build: {
+            watch: {},
+            minify: false
+          }
+        }
+      )
+    );
     return watcher;
   }
 }
-async function runProd(cwd2) {
-  const filter = createFilter(["**/*"], [...defaultExcluded, "dist/**"]);
-  const entries = await scanEntries(cwd2, { filter });
+async function runProd(cwd2, options) {
+  const entries = await getEntries(cwd2);
   if (entries) {
-    const output = await (0, import_vite2.build)({
-      plugins: [
-        vitePluginWeapp({
+    const output = await (0, import_vite2.build)(
+      (0, import_shared3.defu)(
+        options,
+        getDefaultConfig({
           cwd: cwd2,
           entries: entries.all
         })
-      ]
-    });
+      )
+    );
     return output;
   }
 }

package/dist/cli.js

@@ -7,12 +7,13 @@ import { initConfig } from "@weapp-core/init";
 import { build } from "vite";
 import mm from "micromatch";
 import { defu as defu2 } from "@weapp-core/shared";
+import path3 from "pathe";
 
 // src/utils/scan.ts
 import path from "pathe";
 import fs from "fs-extra";
 import klaw from "klaw";
-import { addExtension } from "@weapp-core/shared";
+import { addExtension, removeExtension } from "@weapp-core/shared";
 var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
 function searchAppEntry(root) {
   const extensions = ["js", "ts"];
@@ -26,13 +27,10 @@ function searchAppEntry(root) {
     }
   }
 }
-function removeFileExtension(path3) {
-  return path3.replace(/\.[^/.]+$/, "");
-}
 function searchPageEntry(wxmlPath) {
   if (fs.existsSync(wxmlPath)) {
     const extensions = ["js", "ts"];
-    const base = removeFileExtension(wxmlPath);
+    const base = removeExtension(wxmlPath);
     for (const ext of extensions) {
       const entryPath = addExtension(base, `.${ext}`);
       if (fs.existsSync(entryPath)) {
@@ -44,12 +42,15 @@ function searchPageEntry(wxmlPath) {
 function getWxmlEntry(wxmlPath) {
   const pageEntry = searchPageEntry(wxmlPath);
   if (pageEntry) {
-    const jsonPath = addExtension(removeFileExtension(wxmlPath), ".json");
-    if (fs.existsSync(jsonPath) && fs.readJsonSync(jsonPath).component) {
-      return {
-        path: pageEntry,
-        type: "component"
-      };
+    const jsonPath = addExtension(removeExtension(wxmlPath), ".json");
+    if (fs.existsSync(jsonPath)) {
+      const json = fs.readJsonSync(jsonPath, { throws: false });
+      if (json && json.component) {
+        return {
+          path: pageEntry,
+          type: "component"
+        };
+      }
     }
     return {
       path: pageEntry,
@@ -103,7 +104,7 @@ var supportedCssExtensions = supportedCssLangs.map((x) => `.${x}`);
 import path2 from "node:path";
 import fs2 from "fs-extra";
 import MagicString from "magic-string";
-import { addExtension as addExtension2, defu, removeExtension } from "@weapp-core/shared";
+import { addExtension as addExtension2, defu, removeExtension as removeExtension2 } from "@weapp-core/shared";
 import fg from "fast-glob";
 import { isCSSRequest, preprocessCSS } from "vite";
 function parseRequest(id) {
@@ -118,11 +119,11 @@ function parseRequest(id) {
   };
 }
 function normalizeCssPath(id) {
-  return addExtension2(removeExtension(id), ".wxss");
+  return addExtension2(removeExtension2(id), ".wxss");
 }
 function getRealPath(res) {
   if (res.query.wxss) {
-    return addExtension2(removeExtension(res.filename), ".wxss");
+    return addExtension2(removeExtension2(res.filename), ".wxss");
   }
   return res.filename;
 }
@@ -130,14 +131,14 @@ function vitePluginWeapp(options) {
   const { cwd: cwd2, entries: _entries, src } = defu(options, {
     src: ""
   });
+  function relative(p) {
+    return path2.relative(cwd2, p);
+  }
   const input = _entries.reduce((acc, cur) => {
     acc[relative(cur)] = cur;
     return acc;
   }, {});
   const entries = Array.isArray(_entries) ? new Set(_entries) : _entries;
-  function relative(p) {
-    return path2.relative(cwd2, p);
-  }
   const stylesIds = /* @__PURE__ */ new Set();
   let configResolved;
   return [
@@ -146,14 +147,6 @@ function vitePluginWeapp(options) {
       enforce: "pre",
       configResolved(config) {
         config.build.rollupOptions.input = input;
-        config.build.rollupOptions.output = {
-          format: "cjs",
-          entryFileNames: (chunkInfo) => {
-            return chunkInfo.name;
-          }
-        };
-        config.build.assetsDir = ".";
-        config.build.commonjsOptions.transformMixedEsModules = true;
         configResolved = config;
       },
       resolveId(source) {
@@ -163,15 +156,17 @@ function vitePluginWeapp(options) {
       },
       load(id) {
         if (entries.has(id)) {
-          const base = removeExtension(id);
+          const base = removeExtension2(id);
           const ms = new MagicString(fs2.readFileSync(id, "utf8"));
           for (const ext of supportedCssExtensions) {
             const mayBeCssPath = addExtension2(base, ext);
             if (fs2.existsSync(mayBeCssPath)) {
+              this.addWatchFile(mayBeCssPath);
               ms.prepend(`import '${mayBeCssPath}'
 `);
             }
           }
+          this.addWatchFile(id);
           return {
             code: ms.toString()
           };
@@ -216,13 +211,19 @@ function vitePluginWeapp(options) {
           }
         );
         for (const file of files) {
+          const filepath = path2.resolve(cwd2, file);
+          this.addWatchFile(filepath);
           this.emitFile({
             type: "asset",
             fileName: file,
-            source: await fs2.readFile(path2.resolve(cwd2, file))
+            source: await fs2.readFile(filepath)
           });
         }
       }
+      // generateBundle(_options, _bundle) {
+      //   const files = this.getWatchFiles()
+      //   console.log(files)
+      // },
     },
     {
       name: "weapp-vite"
@@ -238,6 +239,8 @@ function vitePluginWeapp(options) {
 function createFilter(include, exclude, options) {
   const opts = defu2(options, {
     ignore: exclude
+    // dot: true,
+    // contains: true,
   });
   return function(id) {
     if (typeof id !== "string") {
@@ -249,37 +252,73 @@ function createFilter(include, exclude, options) {
     return mm.isMatch(id, include, opts);
   };
 }
-async function runDev(cwd2) {
-  const filter = createFilter(["**/*"], [...defaultExcluded, "dist/**"]);
-  const entries = await scanEntries(cwd2, { filter });
+function getEntries(options) {
+  let cwd2;
+  let relative;
+  if (typeof options === "string") {
+    cwd2 = options;
+  } else {
+    cwd2 = options.cwd;
+    relative = options.relative;
+  }
+  const filter = createFilter(["**/*"], [...defaultExcluded, path3.resolve(cwd2, "dist/**")], { cwd: cwd2 });
+  return scanEntries(cwd2, { filter, relative });
+}
+function getDefaultConfig(options) {
+  return {
+    build: {
+      rollupOptions: {
+        output: {
+          format: "cjs",
+          entryFileNames: (chunkInfo) => {
+            return chunkInfo.name;
+          }
+        }
+      },
+      assetsDir: ".",
+      commonjsOptions: {
+        transformMixedEsModules: true,
+        include: void 0
+      }
+    },
+    plugins: [
+      vitePluginWeapp(options)
+    ]
+  };
+}
+async function runDev(cwd2, options) {
+  const entries = await getEntries(cwd2);
   if (entries) {
-    const watcher = await build({
-      plugins: [
-        vitePluginWeapp({
+    const watcher = await build(
+      defu2(
+        options,
+        getDefaultConfig({
           cwd: cwd2,
           entries: entries.all
-        })
-      ],
-      build: {
-        watch: {},
-        minify: false
-      }
-    });
+        }),
+        {
+          build: {
+            watch: {},
+            minify: false
+          }
+        }
+      )
+    );
     return watcher;
   }
 }
-async function runProd(cwd2) {
-  const filter = createFilter(["**/*"], [...defaultExcluded, "dist/**"]);
-  const entries = await scanEntries(cwd2, { filter });
+async function runProd(cwd2, options) {
+  const entries = await getEntries(cwd2);
   if (entries) {
-    const output = await build({
-      plugins: [
-        vitePluginWeapp({
+    const output = await build(
+      defu2(
+        options,
+        getDefaultConfig({
           cwd: cwd2,
           entries: entries.all
         })
-      ]
-    });
+      )
+    );
     return output;
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "weapp-vite",
   "type": "module",
-  "version": "0.0.2-alpha.0",
+  "version": "0.0.2-alpha.1",
   "description": "WIP",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
@@ -38,8 +38,8 @@
     "magic-string": "^0.30.11",
     "micromatch": "^4.0.7",
     "pathe": "^1.1.2",
-    "@weapp-core/init": "^0.0.2-alpha.0",
-    "@weapp-core/shared": "^0.0.2-alpha.0"
+    "@weapp-core/init": "^0.0.2-alpha.1",
+    "@weapp-core/shared": "^0.0.2-alpha.1"
   },
   "publishConfig": {
     "access": "public",