weapp-vite 1.1.0 → 1.1.1

package/dist/chunk-444MQSSG.mjs

@@ -0,0 +1,8 @@
+// src/config.ts
+function defineConfig(config) {
+  return config;
+}
+
+export {
+  defineConfig
+};

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

@@ -1,19 +1,51 @@
-// src/build.ts
+// src/context.ts
 import process2 from "node:process";
-import { defu as defu3 } from "@weapp-core/shared";
-import path6 from "pathe";
+import path5 from "pathe";
+import { build, loadConfigFromFile } from "vite";
 import { watch } from "chokidar";
-import { build } from "vite";
+import { addExtension as addExtension3, defu as defu3, removeExtension as removeExtension3 } from "@weapp-core/shared";
+import tsconfigPaths from "vite-tsconfig-paths";
+import fs4 from "fs-extra";
 
-// src/symbols.ts
-var RootRollupSymbol = Symbol("root-rollup");
-var DevSymbol = Symbol("dev");
+// src/utils/projectConfig.ts
+import path from "pathe";
+import fs from "fs-extra";
+function getProjectConfig(root, options) {
+  const baseJsonPath = path.resolve(root, "project.config.json");
+  const privateJsonPath = path.resolve(root, "project.private.config.json");
+  let baseJson = {};
+  let privateJson = {};
+  if (fs.existsSync(baseJsonPath)) {
+    try {
+      baseJson = fs.readJsonSync(baseJsonPath) || {};
+    } catch {
+      throw new Error(`\u89E3\u6790 json \u683C\u5F0F\u5931\u8D25, project.config.json \u4E3A\u975E\u6CD5\u7684 json \u683C\u5F0F`);
+    }
+  } else {
+    throw new Error(`\u5728 ${root} \u76EE\u5F55\u4E0B\u627E\u4E0D\u5230 project.config.json`);
+  }
+  if (!options?.ignorePrivate) {
+    if (fs.existsSync(privateJsonPath)) {
+      try {
+        privateJson = fs.readJsonSync(privateJsonPath) || {};
+      } catch {
+        throw new Error(`\u89E3\u6790 json \u683C\u5F0F\u5931\u8D25, project.private.config.json \u4E3A\u975E\u6CD5\u7684 json \u683C\u5F0F`);
+      }
+    }
+  }
+  return Object.assign({}, privateJson, baseJson);
+}
 
 // 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";
+var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
+function getWeappWatchOptions() {
+  return {
+    paths: ["**/*.{wxml,json,wxs}", "**/*.{png,jpg,jpeg,gif,svg,webp}", ".env", ".env.*"],
+    ignored: [
+      ...defaultExcluded
+    ]
+  };
+}
 
 // src/plugins/index.ts
 import path4 from "pathe";
@@ -24,8 +56,8 @@ import { isCSSRequest, preprocessCSS } from "vite";
 import fg from "fast-glob";
 
 // src/utils/scan.ts
-import path from "pathe";
-import fs from "fs-extra";
+import path2 from "pathe";
+import fs2 from "fs-extra";
 import { addExtension, defu, isObject, removeExtension } from "@weapp-core/shared";
 function parseJsonUseComponents(json) {
   const deps = [];
@@ -44,12 +76,12 @@ function searchAppEntry(options) {
     formatPath: (x) => x
   });
   const extensions = ["js", "ts"];
-  const appJsonPath = path.resolve(root, "app.json");
-  if (fs.existsSync(appJsonPath)) {
+  const appJsonPath = path2.resolve(root, "app.json");
+  if (fs2.existsSync(appJsonPath)) {
     for (const ext of extensions) {
-      const entryPath = path.resolve(root, addExtension("app", `.${ext}`));
-      if (fs.existsSync(entryPath)) {
-        const appJson = fs.readJSONSync(appJsonPath, { throws: false });
+      const entryPath = path2.resolve(root, addExtension("app", `.${ext}`));
+      if (fs2.existsSync(entryPath)) {
+        const appJson = fs2.readJSONSync(appJsonPath, { throws: false });
         const deps = [];
         if (appJson) {
           if (Array.isArray(appJson.pages)) {
@@ -84,12 +116,12 @@ function searchAppEntry(options) {
   }
 }
 function searchPageEntry(wxmlPath) {
-  if (fs.existsSync(wxmlPath)) {
+  if (fs2.existsSync(wxmlPath)) {
     const extensions = ["js", "ts"];
     const base = removeExtension(wxmlPath);
     for (const ext of extensions) {
       const entryPath = addExtension(base, `.${ext}`);
-      if (fs.existsSync(entryPath)) {
+      if (fs2.existsSync(entryPath)) {
         return entryPath;
       }
     }
@@ -100,8 +132,8 @@ function getWxmlEntry(wxmlPath, formatPath) {
   if (pageEntry) {
     const jsonPath = addExtension(removeExtension(wxmlPath), ".json");
     const finalPath = formatPath(pageEntry);
-    if (fs.existsSync(jsonPath)) {
-      const json = fs.readJsonSync(jsonPath, { throws: false });
+    if (fs2.existsSync(jsonPath)) {
+      const json = fs2.readJsonSync(jsonPath, { throws: false });
       if (json && json.component) {
         return {
           deps: parseJsonUseComponents(json),
@@ -130,35 +162,6 @@ function getWxmlEntry(wxmlPath, formatPath) {
   }
 }
 
-// src/utils/projectConfig.ts
-import path2 from "pathe";
-import fs2 from "fs-extra";
-function getProjectConfig(root, options) {
-  const baseJsonPath = path2.resolve(root, "project.config.json");
-  const privateJsonPath = path2.resolve(root, "project.private.config.json");
-  let baseJson = {};
-  let privateJson = {};
-  if (fs2.existsSync(baseJsonPath)) {
-    try {
-      baseJson = fs2.readJsonSync(baseJsonPath) || {};
-    } catch {
-      throw new Error(`\u89E3\u6790 json \u683C\u5F0F\u5931\u8D25, project.config.json \u4E3A\u975E\u6CD5\u7684 json \u683C\u5F0F`);
-    }
-  } else {
-    throw new Error(`\u5728 ${root} \u76EE\u5F55\u4E0B\u627E\u4E0D\u5230 project.config.json`);
-  }
-  if (!options?.ignorePrivate) {
-    if (fs2.existsSync(privateJsonPath)) {
-      try {
-        privateJson = fs2.readJsonSync(privateJsonPath) || {};
-      } catch {
-        throw new Error(`\u89E3\u6790 json \u683C\u5F0F\u5931\u8D25, project.private.config.json \u4E3A\u975E\u6CD5\u7684 json \u683C\u5F0F`);
-      }
-    }
-  }
-  return Object.assign({}, privateJson, baseJson);
-}
-
 // src/utils/index.ts
 var supportedCssLangs = ["wxss", "scss", "less", "sass", "styl"];
 var supportedCssExtensions = supportedCssLangs.map((x) => `.${x}`);
@@ -339,9 +342,6 @@ function vitePluginWeapp(ctx) {
       // config->configResolved->|watching|options->buildStart
       config(config, env) {
         debug?.(config, env);
-        if (config?.weapp?.srcRoot && !config?.weapp.subPackage && !ctx.srcRootRef.value) {
-          ctx.srcRootRef.value = config.weapp.srcRoot;
-        }
       },
       configResolved(config) {
         debug?.(config);
@@ -372,27 +372,15 @@ function vitePluginWeapp(ctx) {
           const input = getInputOption(paths);
           entriesSet = new Set(paths);
           options.input = input;
-          if (Array.isArray(entries.subPackages) && entries.subPackages.length) {
+          if (weapp?.type === "app" && Array.isArray(entries.subPackages) && entries.subPackages.length) {
             for (const subPackage of entries.subPackages) {
-              if (subPackage.root && subPackage.independent && !ctx.watcherCache.has(subPackage.root)) {
-                if (ctx.isDev) {
-                  runDev(ctx, {
-                    weapp: {
-                      subPackage
-                    }
-                  });
-                } else {
-                  runProd(ctx, {
-                    weapp: {
-                      subPackage
-                    }
-                  });
-                }
+              if (subPackage.root && !ctx.subPackageContextMap.has(subPackage.root)) {
+                ctx.forkSubPackage(subPackage).build();
               }
             }
           }
         } else {
-          throw new Error(`\u5728 ${path4.join(root, weapp?.srcRoot ?? "")} \u76EE\u5F55\u4E0B\u6CA1\u6709\u627E\u5230 \`app.json\`, \u8BF7\u786E\u4FDD\u4F60\u521D\u59CB\u5316\u4E86\u5C0F\u7A0B\u5E8F\u9879\u76EE\uFF0C\u6216\u8005\u5728 \`vite.config.ts\` \u4E2D\u8BBE\u7F6E\u7684\u6B63\u786E\u7684 \`weapp.srcRoot\` \u914D\u7F6E\u8DEF\u5F84  `);
+          throw new Error(`\u5728 ${path4.join(root, ctx.srcRoot ?? "")} \u76EE\u5F55\u4E0B\u6CA1\u6709\u627E\u5230 \`app.json\`, \u8BF7\u786E\u4FDD\u4F60\u521D\u59CB\u5316\u4E86\u5C0F\u7A0B\u5E8F\u9879\u76EE\uFF0C\u6216\u8005\u5728 \`vite.config.ts\` \u4E2D\u8BBE\u7F6E\u7684\u6B63\u786E\u7684 \`weapp.srcRoot\` \u914D\u7F6E\u8DEF\u5F84  `);
         }
       },
       async buildStart() {
@@ -401,12 +389,12 @@ function vitePluginWeapp(ctx) {
         const ignore = [
           ...defaultExcluded
         ];
-        const isSubPackage = Boolean(!appEntry && weapp?.subPackage && weapp.subPackage.root);
+        const isSubPackage = weapp?.type === "subPackage";
         if (isSubPackage) {
-          cwd = path4.join(root, weapp.subPackage.root);
+          cwd = path4.join(root, ctx.subPackage.root);
         } else {
           const ignoreSubPackage = appEntry ? appEntry.deps.filter(
-            (x) => x.type === "subPackage" && x.independent
+            (x) => x.type === "subPackage"
           ).map((x) => {
             return `${x.root}/**`;
           }) : [];
@@ -424,7 +412,7 @@ function vitePluginWeapp(ctx) {
         }
         const files = await fg(
           // 假如去 join root 就是返回 absolute
-          [path4.join(weapp?.srcRoot ?? "", "**/*.{wxml,json,wxs,png,jpg,jpeg,gif,svg,webp}")],
+          [path4.join(ctx.srcRoot ?? "", "**/*.{wxml,json,wxs,png,jpg,jpeg,gif,svg,webp}")],
           {
             cwd,
             ignore,
@@ -432,7 +420,7 @@ function vitePluginWeapp(ctx) {
           }
         );
         const relFiles = files.map((x) => {
-          return isSubPackage ? path4.join(weapp.subPackage.root, x) : x;
+          return isSubPackage ? path4.join(weapp?.subPackage?.root ?? "", x) : x;
         });
         for (const file of relFiles) {
           const filepath = path4.resolve(ctx.cwd, file);
@@ -514,121 +502,226 @@ function vitePluginWeapp(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));
+// src/context.ts
+var CompilerContext = class _CompilerContext {
+  inlineConfig;
+  cwd;
+  isDev;
+  projectConfig;
+  mode;
+  packageJson;
+  subPackage;
+  watcherMap;
+  subPackageContextMap;
+  type;
+  parent;
+  constructor(options) {
+    const { cwd, isDev, inlineConfig, projectConfig, mode, packageJson, subPackage, type } = defu3(options, {
+      cwd: process2.cwd(),
+      isDev: false,
+      projectConfig: {},
+      type: "app",
+      inlineConfig: {},
+      mode: "",
+      packageJson: {}
+    });
+    this.cwd = cwd;
+    this.inlineConfig = inlineConfig;
+    this.isDev = isDev;
+    this.projectConfig = projectConfig;
+    this.mode = mode;
+    this.packageJson = packageJson;
+    this.subPackage = subPackage;
+    this.watcherMap = /* @__PURE__ */ new Map();
+    this.subPackageContextMap = /* @__PURE__ */ new Map();
+    this.type = type;
   }
-  return {
-    mode: ctx.options.mode,
-    build: {
-      rollupOptions: {
-        output: {
-          format: "cjs",
-          strict: false,
-          entryFileNames: (chunkInfo) => {
-            const name = ctx.relativeSrcRoot(chunkInfo.name);
-            if (name.endsWith(".ts")) {
-              const baseFileName = removeExtension3(name);
-              if (baseFileName.endsWith(".wxs")) {
-                return path5.normalize(baseFileName);
-              }
-              return path5.normalize(addExtension3(baseFileName, ".js"));
-            }
-            return path5.normalize(name);
-          }
-        },
-        external
-      },
-      assetsDir: ".",
-      commonjsOptions: {
-        transformMixedEsModules: true,
-        include: void 0
-      }
-    },
-    plugins: [
-      vitePluginWeapp(ctx),
-      tsconfigPaths()
-    ]
-  };
-}
-
-// src/build.ts
-async function runDev(ctx, options) {
-  if (process2.env.NODE_ENV === void 0) {
-    process2.env.NODE_ENV = "development";
+  get srcRoot() {
+    return this.inlineConfig?.weapp?.srcRoot;
   }
-  const inlineConfig = defu3(
-    options,
-    await getDefaultViteConfig(ctx),
-    {
-      mode: "development",
-      build: {
-        watch: {},
-        minify: false,
-        emptyOutDir: false
-      }
+  relativeSrcRoot(p) {
+    if (this.srcRoot) {
+      return path5.relative(this.srcRoot, p);
     }
-  );
-  async function innerDev() {
+    return p;
+  }
+  get mpDistRoot() {
+    return this.projectConfig.miniprogramRoot || this.projectConfig.srcMiniprogramRoot || "";
+  }
+  // get weappConfig() {
+  //   return this.inlineConfig.weapp
+  // }
+  // get inlineSubPackageConfig() {
+  //   return this.weappConfig?.subPackage
+  // }
+  forkSubPackage(subPackage) {
+    const ctx = new _CompilerContext({
+      cwd: this.cwd,
+      isDev: this.isDev,
+      projectConfig: this.projectConfig,
+      inlineConfig: this.inlineConfig,
+      type: "subPackage",
+      mode: this.mode,
+      subPackage
+    });
+    this.subPackageContextMap.set(subPackage.root, ctx);
+    ctx.parent = this;
+    return ctx;
+  }
+  async internalDev(inlineConfig) {
     const rollupWatcher = await build(
       inlineConfig
     );
-    const key = options?.weapp?.subPackage?.root || RootRollupSymbol;
-    const watcher = ctx.watcherCache.get(key);
+    const key = "rollup";
+    const watcher = this.watcherMap.get(key);
     watcher?.close();
-    ctx.watcherCache.set(key, rollupWatcher);
+    this.watcherMap.set(key, rollupWatcher);
     return rollupWatcher;
   }
-  if (options?.weapp?.subPackage) {
-    return await innerDev();
-  } else {
-    const { paths, ...opts } = defu3(inlineConfig.weapp?.watch, {
-      ignored: [
-        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")) {
-        await innerDev();
+  async runDev() {
+    if (process2.env.NODE_ENV === void 0) {
+      process2.env.NODE_ENV = "development";
+    }
+    const inlineConfig = defu3(
+      this.inlineConfig,
+      {
+        root: this.cwd,
+        mode: "development",
+        plugins: [vitePluginWeapp(this)],
+        build: {
+          watch: {},
+          minify: false,
+          emptyOutDir: false
+        },
+        weapp: {
+          type: "app"
+        }
       }
-    }).on("ready", async () => {
-      await innerDev();
-      isReady = true;
-    });
-    return watcher;
+    );
+    const getWatcher = (paths, opts, inlineConfig2) => {
+      const watcher = watch(paths, opts);
+      let isReady = false;
+      watcher.on("all", async (eventName) => {
+        if (isReady && (eventName === "add" || eventName === "change" || eventName === "unlink")) {
+          await this.internalDev(inlineConfig2);
+        }
+      }).on("ready", async () => {
+        await this.internalDev(inlineConfig2);
+        isReady = true;
+      });
+      return watcher;
+    };
+    if (this.type === "subPackage" && this.subPackage) {
+      const subPackageInlineConfig = Object.assign({}, inlineConfig, {
+        weapp: {
+          srcRoot: this.parent?.srcRoot,
+          type: this.type,
+          subPackage: this.subPackage
+        }
+      });
+      const { paths, ...opts } = defu3(
+        subPackageInlineConfig.weapp?.watch,
+        {
+          cwd: path5.join(this.cwd, subPackageInlineConfig.weapp.srcRoot ?? "", this.subPackage.root)
+        },
+        getWeappWatchOptions()
+      );
+      const watcher = getWatcher(paths, opts, subPackageInlineConfig);
+      this.watcherMap.set(this.subPackage.root, watcher);
+      return watcher;
+    } else if (this.type === "app") {
+      const { paths, ...opts } = defu3(
+        inlineConfig.weapp?.watch,
+        {
+          ignored: [
+            path5.join(this.mpDistRoot, "**")
+          ],
+          cwd: this.cwd
+        },
+        getWeappWatchOptions()
+      );
+      const watcher = getWatcher(paths, opts, inlineConfig);
+      this.watcherMap.set("/", watcher);
+      return watcher;
+    }
   }
-}
-async function runProd(ctx, options) {
-  const inlineConfig = defu3(
-    options,
-    await getDefaultViteConfig(ctx),
-    {
-      mode: "production"
+  async runProd() {
+    const inlineConfig = defu3(
+      this.inlineConfig,
+      {
+        root: this.cwd,
+        plugins: [vitePluginWeapp(this)],
+        mode: "production",
+        weapp: {
+          type: "app"
+        }
+      }
+    );
+    const output = await build(
+      inlineConfig
+    );
+    return output;
+  }
+  build() {
+    if (this.isDev) {
+      return this.runDev();
+    } else {
+      return this.runProd();
     }
-  );
-  const output = await build(
-    inlineConfig
-  );
-  return output;
-}
+  }
+  async loadDefaultConfig() {
+    const projectConfig = getProjectConfig(this.cwd);
+    this.projectConfig = projectConfig;
+    const packageJsonPath = path5.resolve(this.cwd, "package.json");
+    const external = [];
+    if (await fs4.exists(packageJsonPath)) {
+      const localPackageJson = await fs4.readJson(packageJsonPath, {
+        throws: false
+      }) || {};
+      this.packageJson = localPackageJson;
+      if (localPackageJson.dependencies) {
+        external.push(...Object.keys(localPackageJson.dependencies));
+      }
+    }
+    const loaded = await loadConfigFromFile({
+      command: this.isDev ? "serve" : "build",
+      mode: this.mode
+    }, void 0, this.cwd);
+    this.inlineConfig = defu3({
+      mode: this.mode,
+      build: {
+        rollupOptions: {
+          output: {
+            format: "cjs",
+            strict: false,
+            entryFileNames: (chunkInfo) => {
+              const name = this.relativeSrcRoot(chunkInfo.name);
+              if (name.endsWith(".ts")) {
+                const baseFileName = removeExtension3(name);
+                if (baseFileName.endsWith(".wxs")) {
+                  return path5.normalize(baseFileName);
+                }
+                return path5.normalize(addExtension3(baseFileName, ".js"));
+              }
+              return path5.normalize(name);
+            }
+          },
+          external
+        },
+        assetsDir: ".",
+        commonjsOptions: {
+          transformMixedEsModules: true,
+          include: void 0
+        }
+      },
+      plugins: [
+        tsconfigPaths()
+      ],
+      configFile: false
+    }, loaded?.config, this.inlineConfig);
+  }
+};
 
 export {
-  getProjectConfig,
-  runDev,
-  runProd
+  CompilerContext
 };