hw-weapp-compiler 1.0.14 → 1.0.16

package/build/prod.js

@@ -1,13 +1,14 @@
-const path = require('path');
 const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const { ENV } = require('./config/constants');
 const webpackConfig = require('./webpack.config');
 const { createCompilerHandler } = require('./utils/createCompilerHandler');
-const { getBuildEnv } = require('./utils/buildEnv');
 
 module.exports = async (opts) => {
+  // 生产环境禁用 filesystem cache，与 dev 同源：output.clean 后复用旧缓存会导致副作用产物漏生成，
+  // 注入逻辑（plugin/index.js 的 PROCESS_ASSETS_STAGE_ADDITIONS）要求每次从干净的 source 重做。
+  // production 单次构建本就是冷构建，命中收益低，移除以换确定性。
   const compiler = webpack(
     await webpackConfig(
       {
@@ -28,23 +29,6 @@ module.exports = async (opts) => {
             }),
           ],
         },
-        cache: {
-          type: 'filesystem',
-          cacheDirectory: path.resolve(process.cwd(), 'node_modules/.cache/webpack'),
-          buildDependencies: {
-            // webpack.config.js 及其 require 的 getEntries.js / loader / plugin 都作为
-            // 缓存依赖，本编译器自身代码改动后即时整体失效，避免复用旧 loader 输出。
-            config: [
-              path.resolve(__dirname, 'webpack.config.js'),
-              path.resolve(__dirname, 'config/getEntries.js'),
-              path.resolve(__dirname, 'plugin/index.js'),
-              path.resolve(__dirname, 'loader/js-loader.js'),
-              path.resolve(__dirname, 'loader/wxs-loader.js'),
-              path.resolve(__dirname, 'loader/wxml-loader.js'),
-            ],
-          },
-          name: `${getBuildEnv()}-${process.version.slice(0, 6)}`,
-        },
       },
       opts || {},
     ),

package/build/utils/isNodeModulesUsingComponent.js

@@ -1,14 +1,52 @@
+const { compatiblePath } = require('./compatiblePath');
+
 const nodeModulesUsingComponent = [];
+const nodeModulesUsingComponentDirs = [];
 
-function isNodeModulesUsingComponent(name) {
-  const key = name.replace(/\.(js|wxml|wxss|json|wxs)$/g, '');
+function normalizeComponentKey(name) {
+  const key = compatiblePath(name).replace(/\.(js|wxml|wxss|json|wxs|less|css)$/gi, '');
   const nmIndex = key.indexOf('node_modules/');
-  const searchKey = nmIndex !== -1 ? key.substring(nmIndex + 'node_modules/'.length) : key;
-  return nodeModulesUsingComponent.indexOf(searchKey) !== -1;
+
+  if (nmIndex !== -1) {
+    return key.substring(nmIndex + 'node_modules/'.length);
+  }
+
+  return key;
+}
+
+function getComponentDir(key) {
+  const segments = key.split('/');
+
+  if ((key.indexOf('@') === 0 && segments.length <= 2) || segments.length <= 1) {
+    return `${key}/`;
+  }
+
+  return `${segments.slice(0, -1).join('/')}/`;
+}
+
+function addUnique(list, item) {
+  if (list.indexOf(item) === -1) {
+    list.push(item);
+  }
+}
+
+function isNodeModulesUsingComponent(name) {
+  const searchKey = normalizeComponentKey(name);
+
+  if (nodeModulesUsingComponent.indexOf(searchKey) !== -1) {
+    return true;
+  }
+
+  return nodeModulesUsingComponentDirs.some((componentDir) => {
+    return searchKey.indexOf(componentDir) === 0;
+  });
 }
 
 function addNodeModulesUsingComponent(item) {
-  nodeModulesUsingComponent.push(item);
+  const key = normalizeComponentKey(item);
+
+  addUnique(nodeModulesUsingComponent, key);
+  addUnique(nodeModulesUsingComponentDirs, getComponentDir(key));
 }
 
 module.exports = {

package/build/webpack.config.js

@@ -13,6 +13,7 @@ const { getBuildEnv } = require('./utils/buildEnv');
 const { getConfig } = require('./config/getConfig');
 const { getEntries } = require('./config/getEntries');
 const { getAppConfig } = require('./config/getAppConfig');
+const { isNodeModulesUsingComponent } = require('./utils/isNodeModulesUsingComponent');
 
 const { isSubpackage } = require('./utils/isSubpackage');
 const { compatiblePath } = require('./utils/compatiblePath');
@@ -20,6 +21,22 @@ const { ENV, PATTERNS, ASSET_EXT_PATTERN, SRC_DIR, DIST_DIR, ASSETS_DIR } = requ
 
 const defaultCopyFiles = ['project.config.json', 'sitemap.json'];
 
+// 按 dev/prod 把 src/project.config.json 的 appidDev/appidProd 写进 dist 的 appid。
+// 仅改 dist 产物，源文件三段保留不动；缺项则回退源 appid；解析失败原样返回不阻断构建。
+function applyAppidByMode(content, mode) {
+  let cfg;
+  try {
+    cfg = JSON.parse(content.toString());
+  } catch (e) {
+    return content;
+  }
+  const pick = mode === ENV.DEV ? 'appidDev' : mode === ENV.PROD ? 'appidProd' : null;
+  if (pick && cfg[pick]) {
+    cfg.appid = cfg[pick];
+  }
+  return Buffer.from(JSON.stringify(cfg, null, 2));
+}
+
 module.exports = async (options, { analyzer, quiet } = {}) => {
   const appConfig = getAppConfig();
   const { alias = {}, publicPath = 'auto', copyFiles = [] } = getConfig();
@@ -56,7 +73,18 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
     return resource;
   };
 
+  const isNodeModulesComponentStyle = (resource) => {
+    return (
+      resource &&
+      PATTERNS.NODE_MODULES.test(resource) &&
+      PATTERNS.STYLE_EXTS.test(resource) &&
+      isNodeModulesUsingComponent(resource)
+    );
+  };
+
   const cacheGroups = {
+    default: false,
+    defaultVendors: false,
     vendors: {
       minChunks: 1,
       test(module) {
@@ -65,7 +93,7 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
         if (resource === false) {
           return true;
         }
-        if (PATTERNS.WXSS_EXT.test(resource)) {
+        if (PATTERNS.STYLE_EXTS.test(resource)) {
           return false;
         }
 
@@ -80,7 +108,23 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
     },
     vendors_wxss: {
       minChunks: 2,
-      test: PATTERNS.NODE_MODULES,
+      test(module) {
+        const resource = getResource(module);
+
+        if (resource === false) {
+          return false;
+        }
+
+        if (!PATTERNS.STYLE_EXTS.test(resource)) {
+          return false;
+        }
+
+        if (isNodeModulesComponentStyle(resource)) {
+          return false;
+        }
+
+        return PATTERNS.NODE_MODULES.test(resource);
+      },
       name: 'vendors_wxss',
       reuseExistingChunk: true,
     },
@@ -176,12 +220,17 @@ module.exports = async (options, { analyzer, quiet } = {}) => {
 
   const patterns = [];
   defaultCopyFiles.forEach((file) => {
-    if (fse.existsSync(path.resolve(SRC_DIR, file))) {
-      patterns.push({
-        from: path.resolve(SRC_DIR, file),
-        to: path.resolve(DIST_DIR, file),
-      });
+    if (!fse.existsSync(path.resolve(SRC_DIR, file))) {
+      return;
+    }
+    const pattern = {
+      from: path.resolve(SRC_DIR, file),
+      to: path.resolve(DIST_DIR, file),
+    };
+    if (file === 'project.config.json') {
+      pattern.transform = (content) => applyAppidByMode(content, getBuildEnv());
     }
+    patterns.push(pattern);
   });
   copyFiles.forEach((file) => {
     patterns.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "基于 webpack5 的小程序构建工具，兼容 Node.js 14~24",
   "main": "index.js",
   "bin": {