hw-weapp-compiler 1.0.1 → 1.0.2

package/build/dev.js

@@ -1,9 +1,23 @@
+const path = require('path');
+const fse = require('fs-extra');
 const webpack = require('webpack');
-const { ENV } = require('./config/constants');
+const { ENV, DIST_DIR } = require('./config/constants');
 const webpackConfig = require('./webpack.config');
 const { createCompilerHandler } = require('./utils/createCompilerHandler');
 
 module.exports = (opts) => {
+  // 开发模式启动时清理一次 dist 目录
+  if (fse.existsSync(DIST_DIR)) {
+    const files = fse.readdirSync(DIST_DIR);
+    files.forEach((item) => {
+      if (!/project\.config\.json/.test(item)) {
+        fse.removeSync(path.resolve(DIST_DIR, item));
+      }
+    });
+  } else {
+    fse.mkdirSync(DIST_DIR);
+  }
+
   const compiler = webpack(
     webpackConfig(
       {
@@ -14,5 +28,12 @@ module.exports = (opts) => {
     ),
   );
 
-  compiler.watch({}, createCompilerHandler('dev'));
+  compiler.watch(
+    {
+      aggregateTimeout: 300,
+      poll: false,
+      ignored: /node_modules/,
+    },
+    createCompilerHandler('dev'),
+  );
 };

package/build/loader/js-loader.js

@@ -22,19 +22,28 @@ module.exports = async function loader(source) {
 
   if (Object.values(entries).indexOf(path.resolve(fileInfo.dir, fileInfo.name)) !== -1) {
     const exts = ['.less', '.wxss', '.css', '.json', '.wxml'];
-
-    for (let index = 0; index < exts.length; index += 1) {
-      const ext = exts[index];
-      const otherFilePath = path.resolve(fileInfo.dir, fileInfo.name + ext);
-
-      if (await fse.pathExists(otherFilePath)) {
+    const checks = await Promise.all(
+      exts.map(async (ext) => {
+        const otherFilePath = path.resolve(fileInfo.dir, fileInfo.name + ext);
+        const exists = await fse.pathExists(otherFilePath);
+        return { ext, otherFilePath, exists };
+      }),
+    );
+    const existing = checks.filter((r) => r.exists);
+    const loadResults = await Promise.all(
+      existing.map(async ({ ext, otherFilePath }) => {
         if (['.less', '.wxss', '.css'].indexOf(ext) !== -1) {
-          imports.unshift(`import './${fileInfo.name}${ext}'\n`);
-        } else {
-          await loadModule.call(this, otherFilePath);
+          return { type: 'style', ext, path: otherFilePath };
         }
+        await loadModule.call(this, otherFilePath);
+        return { type: 'module', ext, path: otherFilePath };
+      }),
+    );
+    loadResults.forEach((result) => {
+      if (result.type === 'style') {
+        imports.unshift(`import './${fileInfo.name}${result.ext}'\n`);
       }
-    }
+    });
   }
 
   callback(null, imports.join(''));

package/build/loader/wxml-loader.js

@@ -28,22 +28,23 @@ module.exports = async function loader(source) {
 
   const [assets, wxmls] = await getWxmlAssets.call(this, filePath, content);
 
-  // 资源文件
-  for (let index = 0; index < assets.length; index += 1) {
-    const [attr, file] = assets[index];
-    const src = await loadModule.call(this, file);
-
-    if (src) {
-      content = content.replace(attr, withPublicPath(src, publicPath));
+  // 资源文件 - 并行 loadModule
+  const assetResults = await Promise.all(
+    assets.map(async ([attr, file]) => {
+      const src = await loadModule.call(this, file);
+      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.replace(attr, withPublicPath(src));
     }
   }
 
-  // wxml文件
-  for (let index = 0; index < wxmls.length; index += 1) {
-    const [, file] = wxmls[index];
-
-    await loadModule.call(this, file);
-  }
+  // wxml文件 - 并行 loadModule
+  await Promise.all(wxmls.map(([, file]) => loadModule.call(this, file)));
 
   callback(null, content);
 };

package/build/loader/wxs-loader.js

@@ -16,15 +16,15 @@ module.exports = async function loader(source) {
 
   const requires = content.match(/require\(("|').*("|')\)/g) || [];
 
-  for (let index = 0; index < requires.length; index += 1) {
-    const item = requires[index];
-
-    const file = path.resolve(
-      fileInfo.dir,
-      item.replace(/^((require\(')|(require\("))/g, '').replace(/(('\))|("\)))$/g, ''),
-    );
-    await loadModule.bind(this)(file);
-  }
+  await Promise.all(
+    requires.map(async (item) => {
+      const file = path.resolve(
+        fileInfo.dir,
+        item.replace(/^((require\(')|(require\("))/g, '').replace(/(('\))|("\)))$/g, ''),
+      );
+      await loadModule.call(this, file);
+    }),
+  );
 
   callback(null, content);
 };

package/build/plugin/index.js

@@ -234,22 +234,23 @@ class WeappPlugin {
 
           const { flags, subpackages } = detectCommonModules(items);
 
-          for (let index = 0; index < items.length; index += 1) {
-            const asset = items[index];
-            const assetName = compatiblePath(asset.name);
-            const isJs = PATTERNS.JS_EXT.test(assetName);
-            let content = asset.source.source();
-
-            if (content.toString) {
-              content = content.toString();
-            }
-
-            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));
-          }
+          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) {
+                content = content.toString();
+              }
+
+              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

@@ -1,14 +1,39 @@
+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 = (opts) => {
   const compiler = webpack(
     webpackConfig(
       {
         mode: ENV.PROD,
-        devtool: 'cheap-module-source-map',
+        devtool: false,
+        output: {
+          clean: {
+            keep: /project\.config\.json/,
+          },
+        },
+        optimization: {
+          minimizer: [
+            new TerserPlugin({
+              extractComments: false,
+            }),
+            new CssMinimizerPlugin(),
+          ],
+        },
+        cache: {
+          type: 'filesystem',
+          cacheDirectory: path.resolve(process.cwd(), 'node_modules/.cache/webpack'),
+          buildDependencies: {
+            config: [path.resolve(__dirname, 'webpack.config.js')],
+          },
+          name: `${getBuildEnv()}-${process.version.slice(0, 6)}`,
+        },
       },
       opts || {},
     ),

package/build/utils/getWxmlAssets.js

@@ -68,22 +68,26 @@ function getWxmlAssets(filePath, content) {
         const assetsImports = [];
         const wxmlsImports = [];
 
-        for (let index = 0; index < wxmls.length; index += 1) {
-          const attr = wxmls[index];
-          const result = await resolvePath(attr, path.parse(filePath).dir);
-
-          if (result) {
-            wxmlsImports.push([attr, result]);
-          }
+        // 并行解析 wxml 路径
+        const wxmlResults = await Promise.all(
+          wxmls.map(async (attr) => {
+            const result = await resolvePath(attr, path.parse(filePath).dir);
+            return result ? [attr, result] : null;
+          }),
+        );
+        for (let index = 0; index < wxmlResults.length; index += 1) {
+          if (wxmlResults[index]) wxmlsImports.push(wxmlResults[index]);
         }
 
-        for (let index = 0; index < assets.length; index += 1) {
-          const attr = assets[index];
-          const result = await resolvePath(attr, path.parse(filePath).dir);
-
-          if (result) {
-            assetsImports.push([attr, result]);
-          }
+        // 并行解析 asset 路径
+        const assetResults = await Promise.all(
+          assets.map(async (attr) => {
+            const result = await resolvePath(attr, path.parse(filePath).dir);
+            return result ? [attr, result] : null;
+          }),
+        );
+        for (let index = 0; index < assetResults.length; index += 1) {
+          if (assetResults[index]) assetsImports.push(assetResults[index]);
         }
 
         resolve([assetsImports, wxmlsImports]);

package/build/webpack.config.js

@@ -20,26 +20,11 @@ const { ENV, PATTERNS, ASSET_EXT_PATTERN, SRC_DIR, DIST_DIR, ASSETS_DIR } = requ
 
 const defaultCopyFiles = ['project.config.json', 'sitemap.json'];
 
-function cleanOutputDir(output) {
-  if (fse.existsSync(output)) {
-    const files = fse.readdirSync(output);
-    files.forEach((item) => {
-      if (!/project\.config\.json/.test(item)) {
-        fse.removeSync(path.resolve(output, item));
-      }
-    });
-  } else {
-    fse.mkdirSync(output);
-  }
-}
-
 module.exports = (options, { analyzer, quiet } = {}) => {
   const appConfig = getAppConfig();
   const { alias, publicPath = 'auto', copyFiles = [] } = getConfig();
   const entries = getEntries();
 
-  cleanOutputDir(DIST_DIR);
-
   const assetsName = (resourcePath) => {
     if (PATTERNS.NODE_MODULES.test(resourcePath)) {
       return path.relative(path.resolve(process.cwd(), 'node_modules'), resourcePath);
@@ -229,6 +214,7 @@ module.exports = (options, { analyzer, quiet } = {}) => {
       resolve: {
         alias,
         preferRelative: true,
+        symlinks: false,
       },
       module: {
         rules: [
@@ -327,7 +313,7 @@ module.exports = (options, { analyzer, quiet } = {}) => {
                     [
                       '@babel/preset-env',
                       {
-                        targets: 'defaults',
+                        targets: { chrome: 53 },
                         modules: 'commonjs',
                       },
                     ],
@@ -347,11 +333,12 @@ module.exports = (options, { analyzer, quiet } = {}) => {
           name: 'runtime',
         },
         splitChunks: {
-          minSize: 0,
+          minSize: 10 * 1024,
           chunks: 'all',
           cacheGroups,
         },
       },
+      cache: false,
     },
     options,
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "基于 webpack5 的小程序构建工具，兼容 Node.js 14~24",
   "main": "index.js",
   "bin": {
@@ -25,6 +25,7 @@
     "commander": "^7.2.0",
     "copy-webpack-plugin": "^8.1.0",
     "css-loader": "^5.2.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "esdk-obs-nodejs": "^3.21.3",
     "file-loader": "^6.2.0",
     "fs-extra": "^9.1.0",
@@ -37,6 +38,7 @@
     "postcss-loader": "^5.2.0",
     "postcss-preset-env": "^9.6.0",
     "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",