weapp-vite 1.0.6 → 1.1.0

package/bin/weapp-vite-cjs.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../dist/cli.cjs')

package/bin/weapp-vite.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-require('../dist/cli.cjs')
+import '../dist/cli.mjs'

package/dist/{chunk-U2PI5Z6J.mjs → chunk-YEA7RDOR.mjs}

@@ -1,17 +1,21 @@
-import {
-  init_esm_shims
-} from "./chunk-3276ZVN4.mjs";
-
 // src/build.ts
-init_esm_shims();
 import process2 from "node:process";
-import { addExtension as addExtension3, defu as defu3, removeExtension as removeExtension3 } from "@weapp-core/shared";
+import { defu as defu3 } from "@weapp-core/shared";
+import path6 from "pathe";
+import { watch } from "chokidar";
+import { build } from "vite";
+
+// src/symbols.ts
+var RootRollupSymbol = Symbol("root-rollup");
+var DevSymbol = Symbol("dev");
+
+// src/defaults.ts
+import { addExtension as addExtension3, removeExtension as removeExtension3 } from "@weapp-core/shared";
 import { readPackageJSON } from "pkg-types";
 import path5 from "pathe";
 import tsconfigPaths from "vite-tsconfig-paths";
 
 // src/plugins/index.ts
-init_esm_shims();
 import path4 from "pathe";
 import fs3 from "fs-extra";
 import MagicString from "magic-string";
@@ -19,15 +23,22 @@ import { addExtension as addExtension2, removeExtension as removeExtension2 } fr
 import { isCSSRequest, preprocessCSS } from "vite";
 import fg from "fast-glob";
 
-// src/utils/index.ts
-init_esm_shims();
-
 // src/utils/scan.ts
-init_esm_shims();
 import path from "pathe";
 import fs from "fs-extra";
 import { addExtension, defu, isObject, removeExtension } from "@weapp-core/shared";
-var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
+function parseJsonUseComponents(json) {
+  const deps = [];
+  if (isObject(json.usingComponents)) {
+    deps.push(...Object.values(json.usingComponents).map((x) => {
+      return {
+        path: x,
+        type: "component"
+      };
+    }));
+  }
+  return deps;
+}
 function searchAppEntry(options) {
   const { formatPath, root } = defu(options, {
     formatPath: (x) => x
@@ -84,18 +95,6 @@ function searchPageEntry(wxmlPath) {
     }
   }
 }
-function parseJsonUseComponents(json) {
-  const deps = [];
-  if (isObject(json.usingComponents)) {
-    deps.push(...Object.values(json.usingComponents).map((x) => {
-      return {
-        path: x,
-        type: "component"
-      };
-    }));
-  }
-  return deps;
-}
 function getWxmlEntry(wxmlPath, formatPath) {
   const pageEntry = searchPageEntry(wxmlPath);
   if (pageEntry) {
@@ -132,7 +131,6 @@ function getWxmlEntry(wxmlPath, formatPath) {
 }
 
 // src/utils/projectConfig.ts
-init_esm_shims();
 import path2 from "pathe";
 import fs2 from "fs-extra";
 function getProjectConfig(root, options) {
@@ -166,7 +164,6 @@ var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 var supportedCssExtensions = supportedCssLangs.map((x) => `.${x}`);
 
 // src/entry.ts
-init_esm_shims();
 import process from "node:process";
 import mm from "micromatch";
 import { defu as defu2 } from "@weapp-core/shared";
@@ -175,9 +172,6 @@ import klaw from "klaw";
 function createFilter(include, exclude, options) {
   const opts = defu2(options, {
     ignore: exclude
-    // debug: true,
-    // dot: true,
-    // contains: true,
   });
   return function(id) {
     if (typeof id !== "string") {
@@ -291,7 +285,6 @@ async function getEntries(options) {
 }
 
 // src/debugger.ts
-init_esm_shims();
 import createDebug from "debug";
 function createDebugger(namespace) {
   const debug2 = createDebug(namespace);
@@ -301,7 +294,6 @@ function createDebugger(namespace) {
 }
 
 // src/plugins/parse.ts
-init_esm_shims();
 function parseRequest(id) {
   const [filename, rawQuery] = id.split(`?`, 2);
   const query = Object.fromEntries(new URLSearchParams(rawQuery));
@@ -326,18 +318,18 @@ function getRealPath(res) {
   return res.filename;
 }
 function vitePluginWeapp(ctx) {
-  function getInputOption(entries) {
-    return entries.reduce((acc, cur) => {
-      acc[relative(cur)] = cur;
-      return acc;
-    }, {});
-  }
   const stylesIds = /* @__PURE__ */ new Set();
   let configResolved;
   let entriesSet = /* @__PURE__ */ new Set();
   function relative(p) {
     return path4.relative(configResolved.root, p);
   }
+  function getInputOption(entries) {
+    return entries.reduce((acc, cur) => {
+      acc[relative(cur)] = cur;
+      return acc;
+    }, {});
+  }
   let appEntry;
   return [
     {
@@ -356,10 +348,10 @@ function vitePluginWeapp(ctx) {
         configResolved = config;
       },
       async options(options) {
-        const { root, build, weapp } = configResolved;
+        const { root, build: build2, weapp } = configResolved;
         const entries = await getEntries({
           root,
-          outDir: build.outDir,
+          outDir: build2.outDir,
           srcRoot: weapp?.srcRoot,
           subPackage: weapp?.subPackage
         });
@@ -404,7 +396,7 @@ function vitePluginWeapp(ctx) {
         }
       },
       async buildStart() {
-        const { root, build, weapp } = configResolved;
+        const { root, build: build2, weapp } = configResolved;
         let cwd = root;
         const ignore = [
           ...defaultExcluded
@@ -420,7 +412,7 @@ function vitePluginWeapp(ctx) {
           }) : [];
           ignore.push(
             ...[
-              `${build.outDir}/**`,
+              `${build2.outDir}/**`,
               ...ignoreSubPackage,
               "project.config.json",
               "project.private.config.json",
@@ -522,19 +514,24 @@ function vitePluginWeapp(ctx) {
   ];
 }
 
-// src/symbols.ts
-init_esm_shims();
-var RootRollupSymbol = Symbol("root-rollup");
-var DevSymbol = Symbol("dev");
-
-// src/build.ts
-async function getDefaultConfig(ctx) {
+// src/defaults.ts
+var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
+function getWeappWatchOptions() {
+  return {
+    paths: ["**/*.{wxml,json,wxs}", "**/*.{png,jpg,jpeg,gif,svg,webp}", ".env", ".env.*"],
+    ignored: [
+      ...defaultExcluded
+    ]
+  };
+}
+async function getDefaultViteConfig(ctx) {
   const localPackageJson = await readPackageJSON();
   const external = [];
   if (localPackageJson.dependencies) {
     external.push(...Object.keys(localPackageJson.dependencies));
   }
   return {
+    mode: ctx.options.mode,
     build: {
       rollupOptions: {
         output: {
@@ -564,26 +561,29 @@ async function getDefaultConfig(ctx) {
       vitePluginWeapp(ctx),
       tsconfigPaths()
     ]
-    // logLevel: 'silent',
   };
 }
+
+// src/build.ts
 async function runDev(ctx, options) {
-  process2.env.NODE_ENV = "development";
-  const { build } = await import("vite");
+  if (process2.env.NODE_ENV === void 0) {
+    process2.env.NODE_ENV = "development";
+  }
+  const inlineConfig = defu3(
+    options,
+    await getDefaultViteConfig(ctx),
+    {
+      mode: "development",
+      build: {
+        watch: {},
+        minify: false,
+        emptyOutDir: false
+      }
+    }
+  );
   async function innerDev() {
     const rollupWatcher = await build(
-      defu3(
-        options,
-        await getDefaultConfig(ctx),
-        {
-          mode: "development",
-          build: {
-            watch: {},
-            minify: false,
-            emptyOutDir: false
-          }
-        }
-      )
+      inlineConfig
     );
     const key = options?.weapp?.subPackage?.root || RootRollupSymbol;
     const watcher = ctx.watcherCache.get(key);
@@ -594,14 +594,13 @@ async function runDev(ctx, options) {
   if (options?.weapp?.subPackage) {
     return await innerDev();
   } else {
-    const { watch } = await import("./chokidar-D7MR2KRX.mjs");
-    const watcher = watch(["**/*.{wxml,json,wxs}", "**/*.{png,jpg,jpeg,gif,svg,webp}"], {
+    const { paths, ...opts } = defu3(inlineConfig.weapp?.watch, {
       ignored: [
-        ...defaultExcluded,
-        path5.join(ctx.mpRoot, "**")
+        path6.join(ctx.mpRoot, "**")
       ],
       cwd: ctx.cwd
-    });
+    }, getWeappWatchOptions());
+    const watcher = watch(paths, opts);
     let isReady = false;
     watcher.on("all", async (eventName) => {
       if (isReady && (eventName === "add" || eventName === "change" || eventName === "unlink")) {
@@ -615,22 +614,21 @@ async function runDev(ctx, options) {
   }
 }
 async function runProd(ctx, options) {
-  const { build } = await import("vite");
+  const inlineConfig = defu3(
+    options,
+    await getDefaultViteConfig(ctx),
+    {
+      mode: "production"
+    }
+  );
   const output = await build(
-    defu3(
-      options,
-      await getDefaultConfig(ctx),
-      {
-        mode: "production"
-      }
-    )
+    inlineConfig
   );
   return output;
 }
 
 export {
   getProjectConfig,
-  getDefaultConfig,
   runDev,
   runProd
 };