hw-weapp-compiler 1.0.20 → 1.0.22

package/build/dev.js

@@ -1,4 +1,5 @@
 const webpack = require('webpack');
+const chalk = require('chalk');
 const { ENV } = require('./config/constants');
 const webpackConfig = require('./webpack.config');
 const { createCompilerHandler } = require('./utils/createCompilerHandler');
@@ -20,7 +21,7 @@ module.exports = async (opts) => {
     ),
   );
 
-  compiler.watch(
+  const watching = compiler.watch(
     {
       aggregateTimeout: 300,
       poll: false,
@@ -28,4 +29,9 @@ module.exports = async (opts) => {
     },
     createCompilerHandler('dev'),
   );
+
+  if (!opts || opts.quiet !== true) {
+    console.log(chalk.cyan('dev 正在监听文件变化'));
+  }
+  return watching;
 };

package/build/loader/wxml-loader.js

@@ -34,12 +34,14 @@ module.exports = async function loader(source) {
       return src ? [attr, src] : null;
     }),
   );
-  for (let index = 0; index < assetResults.length; index += 1) {
-    const result = assetResults[index];
-    if (result) {
-      const [attr, src] = result;
-      content = content.split(attr).join(withPublicPath(src));
-    }
+  // 路径可能互为后缀（如 a.png 与 icons/a.png），必须先替换较长路径，
+  // 否则短路径会破坏尚未处理的长路径。
+  const resolvedAssets = assetResults
+    .filter(Boolean)
+    .sort(([left], [right]) => right.length - left.length);
+  for (let index = 0; index < resolvedAssets.length; index += 1) {
+    const [attr, src] = resolvedAssets[index];
+    content = content.split(attr).join(withPublicPath(src));
   }
 
   // wxml文件 - 并行 loadModule

package/build/plugin/index.js

@@ -116,13 +116,13 @@ function injectGlobalModules(content, assetName, flags) {
       'Function("r", "regeneratorRuntime = r")(runtime);',
       'global.regeneratorRuntime = runtime',
     );
-    if (!/require('\.\/commons\.js')/.test(result) && flags.hasCommonJs) {
+    if (!result.includes("require('./commons.js');") && flags.hasCommonJs) {
       result = `require('./commons.js');\n${result}`;
     }
-    if (!/require('\.\/vendors\.js')/.test(result) && flags.hasVendorJs) {
+    if (!result.includes("require('./vendors.js');") && flags.hasVendorJs) {
       result = `require('./vendors.js');\n${result}`;
     }
-    if (!/require('\.\/runtime\.js')/.test(result) && flags.hasRuntimeJs) {
+    if (!result.includes("require('./runtime.js');") && flags.hasRuntimeJs) {
       result = `require('./runtime.js');\n${result}`;
     }
   }

package/build/prod.js

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

package/build/utils/cleanDistForDev.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fse = require('fs-extra');
 const { DIST_DIR } = require('../config/constants');
 
-const KEEP_FILES = new Set(['project.config.json', 'weapp.env.json']);
+const KEEP_FILES = new Set(['weapp.env.json']);
 
 /**
  * 开发模式启动时清理 dist 旧产物。

package/build/utils/getWxmlAssets.js

@@ -69,7 +69,9 @@ function getWxmlAssets(filePath, content) {
           const filteredAttrs = allAttrs
             .filter((item) => !!item)
             .map((item) => item.split('?')[0])
-            .filter((item) => !/^(?:https?:)?\/\//i.test(item))
+            // http(s)、cloud、wxfile、data 等带协议资源均由小程序运行时处理，
+            // 只有本地相对路径、根路径和 webpack alias 才进入 resolver。
+            .filter((item) => !/^(?:[a-z][a-z\d+.-]*:|\/\/)/i.test(item))
             .filter((item) => !/{{.*}}/.test(item))
             .filter((item) => !/\+.*\+/.test(item));
 

package/build/utils/storage.js

@@ -4,18 +4,40 @@ const { debounce } = require('throttle-debounce');
 
 const tempDir = path.resolve(process.cwd(), '.temp');
 const uploadJsonDir = path.join(tempDir, 'upload.json');
+const uploadJsonTempDir = `${uploadJsonDir}.${process.pid}.tmp`;
 let uploadJson = {};
-const writeUploadJsonDebounce = debounce(300, () => {
-  fs.writeJSONSync(uploadJsonDir, uploadJson);
-});
 
-if (!fs.existsSync(tempDir)) {
-  fs.mkdirSync(tempDir);
+function writeUploadJson() {
+  try {
+    fs.writeJSONSync(uploadJsonTempDir, uploadJson);
+    fs.renameSync(uploadJsonTempDir, uploadJsonDir);
+  } catch (error) {
+    try {
+      fs.removeSync(uploadJsonTempDir);
+    } catch (cleanupError) {
+      console.warn('清理上传缓存临时文件失败：', cleanupError);
+    }
+    console.warn('写入上传缓存失败，本次构建将继续：', error);
+  }
 }
+
+const writeUploadJsonDebounce = debounce(300, writeUploadJson);
+
+fs.ensureDirSync(tempDir);
 if (!fs.existsSync(uploadJsonDir)) {
-  fs.writeJSONSync(uploadJsonDir, uploadJson);
+  writeUploadJson();
 } else {
-  uploadJson = fs.readJSONSync(uploadJsonDir);
+  try {
+    const stored = fs.readJSONSync(uploadJsonDir);
+    if (!stored || Array.isArray(stored) || typeof stored !== 'object') {
+      throw new TypeError('上传缓存必须是 JSON 对象');
+    }
+    uploadJson = stored;
+  } catch (error) {
+    console.warn('上传缓存已损坏，将重建缓存：', error);
+    uploadJson = {};
+    writeUploadJson();
+  }
 }
 
 module.exports = {

package/build/utils/upload.js

@@ -16,7 +16,7 @@ const { DIST_DIR } = require('../config/constants');
 
 const { obsConfig, ossConfig } = getConfig();
 
-let obsClient;
+let obsClientPromise;
 let ossClient;
 
 function getObsResponseError(action, result) {
@@ -60,13 +60,26 @@ function createObsCallback(action, resolve, reject) {
   };
 }
 
+async function initializeObsClient(Client = OBSClient, config = obsConfig) {
+  const client = new Client({ ...config });
+
+  // esdk-obs-nodejs 3.26.x 的构造函数不会等待异步 initFactory()。
+  // 静态 AK/SK 初始化会在下一个微任务完成，立即调用 API 时 signatureContext 仍为 null。
+  await Promise.resolve();
+  if (!client.util || !client.util.signatureContext) {
+    throw new Error('OBS client initialization failed');
+  }
+  return client;
+}
+
 function getObsClient() {
-  if (!obsClient) {
-    obsClient = new OBSClient({
-      ...obsConfig,
+  if (!obsClientPromise) {
+    obsClientPromise = initializeObsClient().catch((error) => {
+      obsClientPromise = undefined;
+      throw error;
     });
   }
-  return obsClient;
+  return obsClientPromise;
 }
 
 function getOssClient() {
@@ -89,9 +102,10 @@ function getOssStat(file) {
   return getOssClient().head(compatiblePath(path.join(ossConfig.dir, path.relative(DIST_DIR, file))));
 }
 
-function doObsUpload(file) {
+async function doObsUpload(file) {
+  const client = await getObsClient();
   return new Promise((resolve, reject) => {
-    getObsClient().putObject(
+    client.putObject(
       {
         Bucket: obsConfig.bucket,
         Key: compatiblePath(path.join(obsConfig.dir, path.relative(DIST_DIR, file))),
@@ -102,8 +116,9 @@ function doObsUpload(file) {
   });
 }
 async function getObsStat(file) {
+  const client = await getObsClient();
   return new Promise((resolve, reject) => {
-    getObsClient().getObjectMetadata(
+    client.getObjectMetadata(
       {
         Bucket: obsConfig.bucket,
         Key: compatiblePath(path.join(obsConfig.dir, path.relative(DIST_DIR, file))),
@@ -189,6 +204,7 @@ module.exports = {
   _internals: {
     createObsCallback,
     getObsResponseError,
+    initializeObsClient,
     uploadFile,
     uploadFiles,
   },

package/package.json

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