hw-weapp-compiler 1.0.6 → 1.0.8

package/README.md

@@ -17,12 +17,12 @@ npm i weapp-compiler@2.x -D
 ```bash
 # 开发调试
 npm run dev           # 测试环境
-npm run dev -s        # 预发环境
-npm run dev -p        # 生产环境
+npm run dev -- -s     # 预发环境
+npm run dev -- -p     # 生产环境
 
 # 生产发布
-npm run build -d      # 测试环境
-npm run build -s      # 预发环境
+npm run build -- -d   # 测试环境
+npm run build -- -s   # 预发环境
 npm run build         # 生产环境
 ```
 

package/build/config/getEntries.js

@@ -2,7 +2,6 @@ const path = require('path');
 const fse = require('fs-extra');
 const { addNodeModulesUsingComponent } = require('../utils/isNodeModulesUsingComponent');
 const { compatiblePath } = require('../utils/compatiblePath');
-const { traverseDir } = require('../utils/traverseDir');
 const { getAppConfig } = require('./getAppConfig');
 const { PATTERNS, SRC_DIR } = require('./constants');
 const appConfig = getAppConfig();
@@ -10,8 +9,17 @@ const appConfig = getAppConfig();
 const entries = {
   app: path.resolve(SRC_DIR, 'app'),
 };
+const visitedJsonFiles = new Set();
+const entryFiles = [entries.app];
+
+const addEntry = (entryKey, filePath) => {
+  entries[compatiblePath(entryKey)] = filePath;
+  entryFiles.push(filePath);
+};
+
 const addUsingComponents = (components, parent) => {
   Object.keys(components).forEach((key) => {
+    const originalFilePath = components[key];
     let filePath = components[key];
 
     if (!PATTERNS.PLUGIN_PATH.test(filePath)) {
@@ -26,8 +34,9 @@ const addUsingComponents = (components, parent) => {
           filePath = require.resolve(filePath);
           filePath = filePath.replace(PATTERNS.JS_EXT, '');
         } catch (error) {
-          console.error(error);
-          return;
+          throw new Error(
+            `解析 usingComponents "${key}" 的组件路径 "${originalFilePath}" 失败，父级目录：${parent}\n${error.message}`,
+          );
         }
       }
 
@@ -53,35 +62,48 @@ const addUsingComponents = (components, parent) => {
   });
 };
 const readUsingComponents = (file) => {
+  const jsonFile = path.resolve(file);
+
+  if (visitedJsonFiles.has(jsonFile)) {
+    return;
+  }
+
+  visitedJsonFiles.add(jsonFile);
+
   const json = fse.readJSONSync(file);
 
   if (json.usingComponents) {
     addUsingComponents(json.usingComponents, path.parse(file).dir);
   }
 };
+const readEntryUsingComponents = (filePath) => {
+  const jsonFile = `${filePath}.json`;
+
+  if (fse.existsSync(jsonFile)) {
+    readUsingComponents(jsonFile);
+  }
+};
 
 // pages
 (appConfig.pages || []).forEach((page) => {
-  entries[page] = path.resolve(SRC_DIR, page);
+  addEntry(page, path.resolve(SRC_DIR, page));
 });
 
 // tabbar
 if (fse.existsSync(path.resolve(SRC_DIR, 'custom-tab-bar/index.js'))) {
-  entries['custom-tab-bar/index'] = path.resolve(SRC_DIR, 'custom-tab-bar/index');
+  addEntry('custom-tab-bar/index', path.resolve(SRC_DIR, 'custom-tab-bar/index'));
 }
 
 // subpackages
 (appConfig.subpackages || []).forEach((pkg) => {
   (pkg.pages || []).forEach((page) => {
-    entries[compatiblePath(path.join(pkg.root, page))] = path.resolve(SRC_DIR, pkg.root, page);
+    addEntry(path.join(pkg.root, page), path.resolve(SRC_DIR, pkg.root, page));
   });
 });
 
 // usingComponents
-traverseDir(SRC_DIR).forEach((item) => {
-  if (PATTERNS.JSON_EXT.test(item)) {
-    readUsingComponents(item);
-  }
+entryFiles.forEach((filePath) => {
+  readEntryUsingComponents(filePath);
 });
 
 function getEntries() {

package/build/dev.js

@@ -10,7 +10,7 @@ module.exports = (opts) => {
   if (fse.existsSync(DIST_DIR)) {
     const files = fse.readdirSync(DIST_DIR);
     files.forEach((item) => {
-      if (!/project\.config\.json/.test(item)) {
+      if (!/^(project\.config\.json|weapp\.env\.json)$/.test(item)) {
         fse.removeSync(path.resolve(DIST_DIR, item));
       }
     });

package/build/loader/wxml-loader.js

@@ -38,7 +38,7 @@ module.exports = async function loader(source) {
     const result = assetResults[index];
     if (result) {
       const [attr, src] = result;
-      content = content.replace(attr, withPublicPath(src));
+      content = content.split(attr).join(withPublicPath(src));
     }
   }
 

package/build/plugin/index.js

@@ -2,20 +2,16 @@
  * WeappPlugin - 微信小程序 webpack 构建插件
  *
  * 负责在构建产物中注入公共模块引用、runtime 全局暴露、分包公共模块引用，
- * 以及在开发模式下压缩公共模块代码。
+ * 确保小程序运行时能正确加载 webpack 产物。
  */
 const path = require('path');
-const UglifyJS = require('uglify-js');
-const hasha = require('hasha');
 const { RawSource } = require('webpack-sources');
 
-const { isNodeModulesUsingComponent } = require('../utils/isNodeModulesUsingComponent');
 const { addToUploadQueue } = require('../utils/upload');
 const { compatiblePath } = require('../utils/compatiblePath');
-const { ENV, PATTERNS, ASSET_EXT_PATTERN, ASSETS_DIR } = require('../config/constants');
+const { PATTERNS, ASSET_EXT_PATTERN, ASSETS_DIR } = require('../config/constants');
 
 const pluginName = 'WeappCompilerPlugin';
-const contentCache = {};
 
 /**
  * 检测产物中存在哪些公共模块和分包模块
@@ -123,6 +119,15 @@ function injectGlobalModules(content, assetName, flags) {
   return result;
 }
 
+function getRelativeModulePath(from, to) {
+  const relativePath = compatiblePath(path.relative(from, to));
+
+  if (/^(\.\/|\.\.\/)/.test(relativePath)) {
+    return relativePath;
+  }
+  return `./${relativePath}`;
+}
+
 /**
  * 注入分包公共模块引用
  */
@@ -141,18 +146,14 @@ function injectSubpackageRequires(content, assetName, subpackages) {
         PATTERNS.JS_EXT.test(assetName) &&
         !/'subpackage_common\.js'\);/.test(result)
       ) {
-        result = `require('${compatiblePath(
-          path.relative(path.parse(assetName).dir, res.js),
-        )}');\n${result}`;
+        result = `require('${getRelativeModulePath(path.parse(assetName).dir, res.js)}');\n${result}`;
       }
       if (
         res.wxss &&
         PATTERNS.WXSS_EXT.test(assetName) &&
         !/'subpackage_common\.wxss';/.test(result)
       ) {
-        result = `@import '${compatiblePath(
-          path.relative(path.parse(assetName).dir, res.wxss),
-        )}';\n${result}`;
+        result = `@import '${getRelativeModulePath(path.parse(assetName).dir, res.wxss)}';\n${result}`;
       }
     }
   });
@@ -160,43 +161,6 @@ function injectSubpackageRequires(content, assetName, subpackages) {
   return result;
 }
 
-/**
- * 在开发模式下压缩公共模块代码
- */
-function minifyCommonModules(content, assetName, isJs, isDev) {
-  if (!isDev) {
-    return content;
-  }
-
-  const isCommon = assetName === 'commons.js' || assetName === 'vendors.js';
-  const isNodeModule = isNodeModulesUsingComponent(assetName);
-
-  if (!isCommon && !isNodeModule) {
-    return content;
-  }
-
-  if (!isJs) {
-    return content;
-  }
-
-  const hash = hasha(content);
-  if (contentCache[assetName] && contentCache[assetName].hash === hash) {
-    return contentCache[assetName].content;
-  }
-
-  const result = UglifyJS.minify(content, {
-    mangle: false,
-    compress: {
-      drop_console: false,
-      drop_debugger: false,
-    },
-    sourceMap: false,
-  }).code;
-
-  contentCache[assetName] = { hash, content: result };
-  return result;
-}
-
 class WeappPlugin {
   constructor() {}
 
@@ -237,7 +201,6 @@ class WeappPlugin {
           await Promise.all(
             items.map(async (asset) => {
               const assetName = compatiblePath(asset.name);
-              const isJs = PATTERNS.JS_EXT.test(assetName);
               let content = asset.source.source();
 
               if (content.toString) {
@@ -246,7 +209,6 @@ class WeappPlugin {
 
               content = injectGlobalModules(content, assetName, flags);
               content = injectSubpackageRequires(content, assetName, subpackages);
-              content = minifyCommonModules(content, assetName, isJs, compiler.options.mode === ENV.DEV);
 
               compilation.updateAsset(asset.name, new RawSource(content));
             }),

package/build/prod.js

@@ -15,7 +15,7 @@ module.exports = (opts) => {
         devtool: false,
         output: {
           clean: {
-            keep: /project\.config\.json/,
+            keep: /^(project\.config\.json|weapp\.env\.json)$/,
           },
         },
         optimization: {

package/build/utils/createCompilerHandler.js

@@ -4,11 +4,18 @@ const chalk = require('chalk');
  * 创建 webpack 编译结果回调处理器
  * @param {string} label - 构建阶段标签，如 'dev' 或 'build'
  */
-function createCompilerHandler(label) {
+function createCompilerHandler(label, { failOnError = label === 'build' } = {}) {
+  const markFailed = () => {
+    if (failOnError) {
+      process.exitCode = 1;
+    }
+  };
+
   return (err, stats) => {
     if (err) {
       console.error(chalk.red(`${label} failed with fatal error:`));
       console.error(err);
+      markFailed();
       return;
     }
 
@@ -20,6 +27,7 @@ function createCompilerHandler(label) {
         }),
       );
       console.error(chalk.red(`${label} completed with errors`));
+      markFailed();
       return;
     }
 

package/build/utils/getWxmlAssets.js

@@ -1,21 +1,22 @@
-const { createPool, POOL_SIZE } = require('./loadModule');
 const htmlparser2 = require('htmlparser2');
 const path = require('path');
 const fse = require('fs-extra');
 const { ASSET_EXT_PATTERN, PATTERNS, SRC_DIR } = require('../config/constants');
 
-const resolvePool = createPool(POOL_SIZE);
-
 function getWxmlAssets(filePath, content) {
   const resolvePath = (attr, dir) => {
-    return resolvePool(
-      () =>
-        new Promise((resolve) => {
-          this.resolve(SRC_DIR, attr, async (err, result) => {
+    return new Promise((resolve) => {
+      const isAbsolutePath = PATTERNS.ABSOLUTE_PATH.test(attr);
+      const request = isAbsolutePath ? attr.replace(PATTERNS.ABSOLUTE_PATH, '') : attr;
+      const resolveContext = isAbsolutePath ? SRC_DIR : dir;
+
+      this.resolve(resolveContext, request, async (err, result) => {
         let res = result;
         if (err) {
-          if (await fse.pathExists(path.resolve(dir, attr))) {
-            res = path.resolve(dir, attr);
+          const fallbackPath = path.resolve(resolveContext, request);
+
+          if (await fse.pathExists(fallbackPath)) {
+            res = fallbackPath;
             resolve(res);
           } else {
             this.emitError(err);
@@ -25,8 +26,7 @@ function getWxmlAssets(filePath, content) {
           resolve(res);
         }
       });
-        }),
-    );
+    });
   };
   return new Promise((resolve, reject) => {
     let allAttrs = [];
@@ -69,7 +69,7 @@ function getWxmlAssets(filePath, content) {
           .filter((item) => !/\+.*\+/.test(item));
 
         const assets = filteredAttrs.filter((item) => ASSET_EXT_PATTERN.test(item));
-        const wxmls = allAttrs.filter((item) => PATTERNS.WXS_EXT.test(item) || PATTERNS.WXML_EXT.test(item));
+        const wxmls = filteredAttrs.filter((item) => PATTERNS.WXS_EXT.test(item) || PATTERNS.WXML_EXT.test(item));
 
         const assetsImports = [];
         const wxmlsImports = [];

package/build/utils/loadModule.js

@@ -1,55 +1,16 @@
-const POOL_SIZE = 16;
-
-function createPool(limit) {
-  let active = 0;
-  const pending = [];
-  const next = () => {
-    while (pending.length && active < limit) {
-      const { fn, resolve, reject } = pending.shift();
-      active++;
-      Promise.resolve()
-        .then(fn)
-        .then(
-          (v) => {
-            active--;
-            resolve(v);
-            next();
-          },
-          (e) => {
-            active--;
-            reject(e);
-            next();
-          },
-        );
-    }
-  };
-  return (fn) =>
-    new Promise((resolve, reject) => {
-      pending.push({ fn, resolve, reject });
-      next();
-    });
-}
-
-const pool = createPool(POOL_SIZE);
-
 function loadModule(file) {
-  return pool(
-    () =>
-      new Promise((resolve) => {
-        this.addDependency(file);
-        this.loadModule(file, (err, src) => {
-          if (err) {
-            this.emitError(err);
-            resolve(null);
-          } else {
-            resolve(src);
-          }
-        });
-      }),
-  );
+  return new Promise((resolve, reject) => {
+    this.addDependency(file);
+    this.loadModule(file, (err, src) => {
+      if (err) {
+        this.emitError(err);
+        reject(err);
+      } else {
+        resolve(src);
+      }
+    });
+  });
 }
 module.exports = {
   loadModule,
-  createPool,
-  POOL_SIZE,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "基于 webpack5 的小程序构建工具，兼容 Node.js 14~24",
   "main": "index.js",
   "bin": {
@@ -29,7 +29,6 @@
     "esdk-obs-nodejs": "^3.21.3",
     "file-loader": "^6.2.0",
     "fs-extra": "^9.1.0",
-    "hasha": "^5.2.2",
     "htmlparser2": "^6.0.1",
     "less": "^4.1.1",
     "less-loader": "^8.0.0",
@@ -40,7 +39,6 @@
     "progress": "^2.0.3",
     "terser-webpack-plugin": "^5.6.1",
     "throttle-debounce": "^3.0.1",
-    "uglify-js": "^3.14.2",
     "url-loader": "^4.1.1",
     "webpack": "^5.61.0",
     "webpack-bundle-analyzer": "^4.4.0",