weapp-vite 0.0.2-alpha.3 → 1.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 ice breaker
+Copyright (c) 2024 ice breaker
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -0,0 +1,77 @@
+# weapp-vite
+
+> 给小程序现代化的开发体验
+
+- [x] Vite 支持，带来了 `typescript` / `scss` / `less` 等等所有支持
+- [x] 插件支持，可以使用 `weapp-tailwindcss` 等等插件，也可以自定义编写插件，方便扩展
+
+## 使用方式
+
+在你的小程序目录下，使用 `npm init -y` 创建一个 `package.json`
+
+然后执行：
+
+```sh
+npm i -D weapp-vite
+# 执行初始化命令
+npx weapp-vite init
+```
+
+### 热更新开发命令
+
+```sh
+npm run dev
+```
+
+### 构建命令
+
+```sh
+npm run build
+```
+
+### 构建npm命令
+
+```sh
+npm run build-npm
+```
+
+### 打开微信开发者工具命令
+
+```sh
+npm run open
+```
+
+## 配置项
+
+配置项可以与 `vite` 通用，同时加入了 `weapp-vite` 的扩展:
+
+`vite.config.ts`:
+
+```ts
+import { defineConfig } from 'weapp-vite/config'
+
+export default defineConfig({
+  // 其他的配置同
+  weapp: {
+    // 用来配置监听 app.json 所在的目录
+    // 比如默认情况下 ts 创建的项目，app.json 所在为 './miniprogram'
+    srcRoot: './miniprogram',
+    // weapp-vite options
+  },
+})
+```
+
+## Contribute
+
+我们邀请你来贡献和帮助改进 `weapp-vite` 💚💚💚
+
+以下有几个方式可以参与:
+
+- 报告错误：如果您遇到任何错误或问题，请提`issue`并提供完善的错误信息和复现方式。
+- 建议：有增强 `weapp-vite` 的想法吗？请提 `issue` 来分享您的建议。
+- 文档：如果您对文档有更好的见解或者更棒的修辞方式，欢迎 `pr`。
+- 代码：任何人的代码都不是完美的，我们欢迎你通过 `pr` 给代码提供更好的质量与活力。
+
+## License
+
+[MIT](./LICENSE)

package/dist/{chunk-6FYX6NKW.js → chunk-2AW3T6LK.js}

@@ -1,23 +1,27 @@
 // src/build.ts
 import process2 from "node:process";
 import { build } from "vite";
-import { addExtension as addExtension3, defu as defu2, removeExtension as removeExtension3 } from "@weapp-core/shared";
+import { addExtension as addExtension3, defu as defu3, removeExtension as removeExtension3 } from "@weapp-core/shared";
+import { readPackageJSON } from "pkg-types";
+import path5 from "pathe";
 
 // src/plugins/index.ts
 import path4 from "node:path";
 import fs3 from "fs-extra";
 import MagicString from "magic-string";
 import { addExtension as addExtension2, removeExtension as removeExtension2 } from "@weapp-core/shared";
-import fg from "fast-glob";
 import { isCSSRequest, preprocessCSS } from "vite";
+import fg from "fast-glob";
 
 // src/utils/scan.ts
 import path from "pathe";
 import fs from "fs-extra";
-import klaw from "klaw";
-import { addExtension, isObject, removeExtension } from "@weapp-core/shared";
+import { addExtension, defu, isObject, removeExtension } from "@weapp-core/shared";
 var defaultExcluded = ["**/node_modules/**", "**/miniprogram_npm/**"];
-function searchAppEntry(root, formatPath) {
+function searchAppEntry(options) {
+  const { formatPath, root } = defu(options, {
+    formatPath: (x) => x
+  });
   const extensions = ["js", "ts"];
   const appJsonPath = path.resolve(root, "app.json");
   if (fs.existsSync(appJsonPath)) {
@@ -38,19 +42,19 @@ function searchAppEntry(root, formatPath) {
           if (isObject(appJson.usingComponents)) {
             deps.push(...parseJsonUseComponents(appJson));
           }
-          if (Array.isArray(appJson.subpackages)) {
-            for (const subpackage of appJson.subpackages) {
-              deps.push(...subpackage.map((x) => {
-                return {
-                  type: "subpackage",
-                  ...x
-                };
-              }));
-            }
+          if (Array.isArray(appJson.subPackages)) {
+            deps.push(...appJson.subPackages.map((x) => {
+              return {
+                type: "subPackage",
+                ...x
+              };
+            }));
           }
         }
         return {
-          path: formatPath ? formatPath(entryPath) : entryPath,
+          jsonPath: formatPath(appJsonPath),
+          json: appJson,
+          path: formatPath(entryPath),
           deps,
           type: "app"
         };
@@ -93,13 +97,17 @@ function getWxmlEntry(wxmlPath, formatPath) {
         return {
           deps: parseJsonUseComponents(json),
           path: finalPath,
-          type: "component"
+          type: "component",
+          json,
+          jsonPath: formatPath(jsonPath)
         };
       } else {
         return {
           deps: parseJsonUseComponents(json),
           path: finalPath,
-          type: "page"
+          type: "page",
+          json,
+          jsonPath: formatPath(jsonPath)
         };
       }
     }
@@ -107,45 +115,8 @@ function getWxmlEntry(wxmlPath, formatPath) {
       deps: [],
       path: finalPath,
       type: "page"
-    };
-  }
-}
-async function scanEntries(root, options) {
-  function formatPath(to) {
-    if (options?.relative) {
-      return path.relative(root, to);
-    }
-    return path.normalize(to);
-  }
-  const appEntry = searchAppEntry(root, formatPath);
-  if (appEntry) {
-    const pageEntries = [];
-    const componentEntries = [];
-    for await (const file of klaw(
-      root,
-      {
-        filter: options?.filter
-      }
-    )) {
-      if (file.stats.isFile()) {
-        if (/\.wxml$/.test(file.path)) {
-          const entry = getWxmlEntry(file.path, formatPath);
-          if (entry) {
-            if (entry.type === "component") {
-              componentEntries.push(entry);
-            } else if (entry.type === "page") {
-              pageEntries.push(entry);
-            }
-          }
-        }
-      }
-    }
-    return {
-      app: appEntry,
-      pages: pageEntries,
-      components: componentEntries,
-      subpackages: []
-      // walkPathsSet,
+      // json: undefined,
+      // jsonPath: undefined,
     };
   }
 }
@@ -161,11 +132,13 @@ var supportedCssExtensions = supportedCssLangs.map((x) => `.${x}`);
 // src/entry.ts
 import process from "node:process";
 import mm from "micromatch";
-import { defu } from "@weapp-core/shared";
+import { defu as defu2 } from "@weapp-core/shared";
 import path3 from "pathe";
+import klaw from "klaw";
 function createFilter(include, exclude, options) {
-  const opts = defu(options, {
+  const opts = defu2(options, {
     ignore: exclude
+    // debug: true,
     // dot: true,
     // contains: true,
   });
@@ -179,42 +152,105 @@ function createFilter(include, exclude, options) {
     return mm.isMatch(id, include, opts);
   };
 }
-function getEntries(options) {
-  const { root = process.cwd(), outDir = "dist", relative, srcRoot = "" } = options;
-  const filter = createFilter(
-    [path3.join(srcRoot, "**/*")],
-    [...defaultExcluded, path3.join(root, `${outDir}/**`)],
-    { cwd: root }
-  );
-  return scanEntries(root, { filter, relative });
-}
-
-// src/cache.ts
-function createPluginCache(cache) {
-  return {
-    delete(id) {
-      return delete cache[id];
-    },
-    get(id) {
-      const item = cache[id];
-      if (!item) {
-        return;
+async function getEntries(options) {
+  const { root = process.cwd(), outDir = "dist", relative, srcRoot = "", subPackage } = options;
+  function formatPath(to) {
+    if (relative) {
+      return path3.relative(root, to);
+    }
+    return path3.normalize(to);
+  }
+  if (subPackage) {
+    const subPackageRoot = subPackage.root ?? "";
+    const filter = createFilter(
+      [path3.join(root, srcRoot, subPackageRoot, "**/*")],
+      [
+        ...defaultExcluded
+      ],
+      { cwd: root }
+    );
+    const pageEntries = [];
+    const componentEntries = [];
+    const subPackageEntries = [];
+    if (subPackage.entry) {
+      subPackageEntries.push({
+        deps: [],
+        path: path3.join(root, subPackageRoot, subPackage.entry),
+        type: "subPackageEntry"
+      });
+    }
+    for await (const file of klaw(
+      path3.join(root, subPackageRoot),
+      {
+        filter
       }
-      item[0] = 0;
-      return item[1];
-    },
-    has(id) {
-      const item = cache[id];
-      if (!item) {
-        return false;
+    )) {
+      if (file.stats.isFile()) {
+        if (/\.wxml$/.test(file.path)) {
+          const entry = getWxmlEntry(file.path, formatPath);
+          if (entry) {
+            if (entry.type === "component") {
+              componentEntries.push(entry);
+            } else if (entry.type === "page") {
+              pageEntries.push(entry);
+            }
+          }
+        }
       }
-      item[0] = 0;
-      return true;
-    },
-    set(id, value) {
-      cache[id] = [0, value];
     }
-  };
+    return {
+      pages: pageEntries,
+      components: componentEntries,
+      subPackageEntries
+    };
+  } else {
+    const appEntry = searchAppEntry({
+      root: path3.join(root, srcRoot),
+      formatPath
+    });
+    if (appEntry) {
+      const subPackageDeps = appEntry.deps.filter((x) => x.type === "subPackage");
+      const filter = createFilter(
+        [path3.join(root, srcRoot, "**/*")],
+        [
+          ...defaultExcluded,
+          path3.join(root, `${outDir}/**`),
+          ...subPackageDeps.map((x) => {
+            return path3.join(root, `${x.root}/**`);
+          })
+        ],
+        { cwd: root }
+      );
+      const pageEntries = [];
+      const componentEntries = [];
+      for await (const file of klaw(
+        path3.join(root, srcRoot),
+        {
+          filter
+        }
+      )) {
+        if (file.stats.isFile()) {
+          if (/\.wxml$/.test(file.path)) {
+            const entry = getWxmlEntry(file.path, formatPath);
+            if (entry) {
+              if (entry.type === "component") {
+                componentEntries.push(entry);
+              } else if (entry.type === "page") {
+                pageEntries.push(entry);
+              }
+            }
+          }
+        }
+      }
+      return {
+        app: appEntry,
+        pages: pageEntries,
+        components: componentEntries,
+        subPackages: subPackageDeps
+        // walkPathsSet,
+      };
+    }
+  }
 }
 
 // src/debugger.ts
@@ -250,7 +286,7 @@ function getRealPath(res) {
   }
   return res.filename;
 }
-function vitePluginWeapp() {
+function vitePluginWeapp(ctx) {
   function getInputOption(entries) {
     return entries.reduce((acc, cur) => {
       acc[relative(cur)] = cur;
@@ -263,33 +299,112 @@ function vitePluginWeapp() {
   function relative(p) {
     return path4.relative(configResolved.root, p);
   }
-  const cacheInstance = createPluginCache(/* @__PURE__ */ Object.create(null));
+  let appEntry;
   return [
     {
       name: "weapp-vite:pre",
       enforce: "pre",
+      api: {},
       // 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);
+        configResolved = config;
       },
       async options(options) {
+        const { root, build: build2, weapp } = configResolved;
         const entries = await getEntries({
-          root: configResolved.root,
-          outDir: configResolved.build.outDir,
-          srcRoot: configResolved.weapp?.srcRoot
+          root,
+          outDir: build2.outDir,
+          srcRoot: weapp?.srcRoot,
+          subPackage: weapp?.subPackage
         });
         if (entries) {
-          const paths = [entries.app, ...entries.pages, ...entries.components].map((x) => {
+          const paths = [];
+          if (entries.app) {
+            paths.push(entries.app.path);
+            appEntry = entries.app;
+          }
+          paths.push(...[...entries.pages, ...entries.components].map((x) => {
             return x.path;
-          });
+          }));
+          if (entries.subPackageEntries) {
+            paths.push(...entries.subPackageEntries.map((x) => {
+              return x.path;
+            }));
+          }
           const input = getInputOption(paths);
           entriesSet = new Set(paths);
           options.input = input;
+          if (Array.isArray(entries.subPackages) && entries.subPackages.length) {
+            for (const subPackage of entries.subPackages) {
+              if (subPackage.root && !ctx.watcherCache.has(subPackage.root)) {
+                if (ctx.isDev) {
+                  runDev(ctx, {
+                    weapp: {
+                      subPackage
+                    }
+                  });
+                } else {
+                  runProd(ctx, {
+                    weapp: {
+                      subPackage
+                    }
+                  });
+                }
+              }
+            }
+          }
         }
       },
-      configResolved(config) {
-        debug?.(config);
-        configResolved = config;
+      async buildStart() {
+        const { root, build: build2, weapp } = configResolved;
+        let cwd = root;
+        const ignore = [
+          ...defaultExcluded
+        ];
+        if (!appEntry && weapp?.subPackage && weapp.subPackage.root) {
+          cwd = path4.join(root, weapp.subPackage.root);
+        } else {
+          ignore.push(
+            ...[
+              `${build2.outDir}/**`,
+              ...appEntry.deps.filter(
+                (x) => x.type === "subPackage"
+              ).map((x) => {
+                return `${x.root}/**`;
+              }),
+              "project.config.json",
+              "project.private.config.json",
+              "package.json",
+              "tsconfig.json",
+              "tsconfig.node.json"
+            ]
+          );
+        }
+        const files = await fg(
+          // 假如去 join root 就是返回 absolute
+          [path4.join(weapp?.srcRoot ?? "", "**/*.{wxml,json,wxs,png,jpg,jpeg,gif,svg,webp}")],
+          {
+            cwd,
+            ignore,
+            absolute: false
+          }
+        );
+        for (const file of files) {
+          const filepath = path4.resolve(cwd, file);
+          this.addWatchFile(filepath);
+          this.emitFile({
+            type: "asset",
+            fileName: ctx.relativeSrcRoot(file),
+            source: await fs3.readFile(filepath, "utf8")
+          });
+        }
       },
       resolveId(source) {
         if (/\.wxss$/.test(source)) {
@@ -335,34 +450,10 @@ function vitePluginWeapp() {
         for (const style of Object.entries(styles)) {
           this.emitFile({
             type: "asset",
-            fileName: style[0],
+            fileName: ctx.relativeSrcRoot(style[0]),
             source: style[1]
           });
         }
-        const files = await fg(
-          // 假如去 join root 就是返回 absolute
-          ["**/*.{wxml,json,wxs,png,jpg,jpeg,gif,svg,webp}"],
-          {
-            cwd: configResolved.root,
-            ignore: [
-              ...defaultExcluded,
-              `${configResolved.build.outDir}/**`,
-              "project.config.json",
-              "project.private.config.json",
-              "package.json"
-            ],
-            absolute: false
-          }
-        );
-        for (const file of files) {
-          const filepath = path4.resolve(configResolved.root, file);
-          this.addWatchFile(filepath);
-          this.emitFile({
-            type: "asset",
-            fileName: file,
-            source: await fs3.readFile(filepath, "utf8")
-          });
-        }
       }
       // generateBundle(_options, _bundle) {
       //   const files = this.getWatchFiles()
@@ -379,38 +470,55 @@ function vitePluginWeapp() {
   ];
 }
 
+// src/symbols.ts
+var RootSymbol = Symbol("root");
+var MiscSymbol = Symbol("misc");
+
 // src/build.ts
-function getDefaultConfig() {
+async function getDefaultConfig(ctx) {
+  const localPackageJson = await readPackageJSON();
+  const external = [];
+  if (localPackageJson.dependencies) {
+    external.push(...Object.keys(localPackageJson.dependencies));
+  }
   return {
     build: {
       rollupOptions: {
         output: {
           format: "cjs",
           entryFileNames: (chunkInfo) => {
-            if (chunkInfo.name.endsWith(".ts")) {
-              return addExtension3(removeExtension3(chunkInfo.name), ".js");
+            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 chunkInfo.name;
+            return path5.normalize(name);
           }
-        }
+        },
+        external
       },
       assetsDir: ".",
       commonjsOptions: {
         transformMixedEsModules: true,
         include: void 0
-      }
+      },
+      emptyOutDir: false
     },
     plugins: [
-      vitePluginWeapp()
+      vitePluginWeapp(ctx)
     ]
+    // logLevel: 'silent',
   };
 }
-async function runDev(options) {
+async function runDev(ctx, options) {
   process2.env.NODE_ENV = "development";
   const watcher = await build(
-    defu2(
+    defu3(
       options,
-      getDefaultConfig(),
+      await getDefaultConfig(ctx),
       {
         mode: "development",
         build: {
@@ -420,13 +528,19 @@ async function runDev(options) {
       }
     )
   );
+  ctx.watcherCache.set(options?.weapp?.subPackage?.root || RootSymbol, watcher);
   return watcher;
 }
-async function runProd(options) {
+async function runProd(ctx, options) {
   const output = await build(
-    defu2(
+    defu3(
       options,
-      getDefaultConfig(),
+      // {
+      //   build: {
+      //     emptyOutDir: true,
+      //   },
+      // },
+      await getDefaultConfig(ctx),
       {
         mode: "production"
       }