hw-weapp-compiler 1.0.5 → 1.0.7

package/build/loader/js-loader.js

@@ -13,7 +13,6 @@ const entries = getEntries();
 
 module.exports = async function loader(source) {
   this.cacheable(true);
-  const callback = this.async();
   const filePath = this.resourcePath;
   const fileInfo = path.parse(filePath);
   const sourceStr = source.toString();
@@ -46,7 +45,7 @@ module.exports = async function loader(source) {
     });
   }
 
-  callback(null, imports.join(''));
+  return imports.join('');
 };
 
 module.exports.raw = true;

package/build/loader/wxml-loader.js

@@ -9,7 +9,6 @@ const { loadModule } = require('../utils/loadModule');
 
 module.exports = async function loader(source) {
   this.cacheable(true);
-  const callback = this.async();
   const filePath = this.resourcePath;
   let content = source.toString();
   const {
@@ -46,6 +45,6 @@ module.exports = async function loader(source) {
   // wxml文件 - 并行 loadModule
   await Promise.all(wxmls.map(([, file]) => loadModule.call(this, file)));
 
-  callback(null, content);
+  return content;
 };
 module.exports.raw = true;

package/build/loader/wxs-loader.js

@@ -9,7 +9,6 @@ const { loadModule } = require('../utils/loadModule');
 
 module.exports = async function loader(source) {
   this.cacheable(true);
-  const callback = this.async();
   const filePath = this.resourcePath;
   const content = source.toString();
   const fileInfo = path.parse(filePath);
@@ -26,6 +25,6 @@ module.exports = async function loader(source) {
     }),
   );
 
-  callback(null, content);
+  return content;
 };
 module.exports.raw = true;

package/build/plugin/index.js

@@ -222,7 +222,7 @@ class WeappPlugin {
         },
       );
 
-      compilation.hooks.processAssets.tap(
+      compilation.hooks.processAssets.tapPromise(
         {
           name: pluginName,
           stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,

package/build/utils/createCompilerHandler.js

@@ -7,17 +7,31 @@ const chalk = require('chalk');
 function createCompilerHandler(label) {
   return (err, stats) => {
     if (err) {
+      console.error(chalk.red(`${label} failed with fatal error:`));
       console.error(err);
       return;
     }
 
     if (stats.hasErrors()) {
-      console.log(
+      console.error(
         stats.toString({
           chunks: false,
           colors: true,
         }),
       );
+      console.error(chalk.red(`${label} completed with errors`));
+      return;
+    }
+
+    if (stats.hasWarnings()) {
+      console.warn(
+        stats.toString({
+          chunks: false,
+          colors: true,
+          warnings: true,
+          errors: false,
+        }),
+      );
     }
 
     console.log(chalk.green(`${label} completed in ${(stats.endTime - stats.startTime) / 1000} seconds`));

package/build/utils/getWxmlAssets.js

@@ -1,17 +1,12 @@
-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) => {
+      this.resolve(SRC_DIR, attr, async (err, result) => {
         let res = result;
         if (err) {
           if (await fse.pathExists(path.resolve(dir, attr))) {
@@ -25,8 +20,7 @@ function getWxmlAssets(filePath, content) {
           resolve(res);
         }
       });
-        }),
-    );
+    });
   };
   return new Promise((resolve, reject) => {
     let allAttrs = [];

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) => {
+    this.addDependency(file);
+    this.loadModule(file, (err, src) => {
+      if (err) {
+        this.emitError(err);
+        resolve(null);
+      } else {
+        resolve(src);
+      }
+    });
+  });
 }
 module.exports = {
   loadModule,
-  createPool,
-  POOL_SIZE,
 };

package/package.json

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