hw-weapp-compiler 1.0.0 → 1.0.2

package/build/utils/traverseDir.js

@@ -18,4 +18,6 @@ function traverseDir(dir) {
   return result;
 }
 
-module.exports = traverseDir;
+module.exports = {
+  traverseDir,
+};

package/build/utils/upload.js

@@ -1,15 +1,19 @@
+/**
+ * upload - 构建产物上传工具
+ *
+ * 支持将构建产物上传到华为云 OBS 或阿里云 OSS，
+ * 通过增量检测避免重复上传，并展示上传进度。
+ */
 const path = require('path');
 const OBSClient = require('esdk-obs-nodejs');
 const OSSClient = require('ali-oss');
-// const chalk = require('chalk');
 const Progress = require('progress');
-const getConfig = require('../config/getConfig');
+const { getConfig } = require('../config/getConfig');
 
 const { getStorage, setStorage } = require('./storage');
-const compatiblePath = require('./compatiblePath');
-const getOutput = require('../config/getOutput');
+const { compatiblePath } = require('./compatiblePath');
+const { DIST_DIR } = require('../config/constants');
 
-const output = getOutput();
 const { obsConfig, ossConfig } = getConfig();
 
 let obsClient;
@@ -37,13 +41,13 @@ function getOssClient() {
 
 function doOssUpload(file) {
   return getOssClient().put(
-    compatiblePath(path.join(ossConfig.dir, path.relative(output, file))),
+    compatiblePath(path.join(ossConfig.dir, path.relative(DIST_DIR, file))),
     file,
   );
 }
 
 function getOssStat(file) {
-  return getOssClient().head(compatiblePath(path.join(ossConfig.dir, path.relative(output, file))));
+  return getOssClient().head(compatiblePath(path.join(ossConfig.dir, path.relative(DIST_DIR, file))));
 }
 
 function doObsUpload(file) {
@@ -51,19 +55,16 @@ function doObsUpload(file) {
     getObsClient().putObject(
       {
         Bucket: obsConfig.bucket,
-        Key: compatiblePath(path.join(obsConfig.dir, path.relative(output, file))),
+        Key: compatiblePath(path.join(obsConfig.dir, path.relative(DIST_DIR, file))),
         SourceFile: file,
       },
       (err, result) => {
         if (err) {
           reject(err);
-          // console.log(chalk.red("上传失败"), file);
         } else if (result.CommonMsg.Status >= 300) {
           reject(new Error(`OBS upload failed with status ${result.CommonMsg.Status}`));
-          // console.log(chalk.red("上传失败"), file);
         } else {
           resolve(result);
-          // console.log(chalk.green("上传成功"), file);
         }
       },
     );
@@ -74,7 +75,7 @@ async function getObsStat(file) {
     getObsClient().getObjectMetadata(
       {
         Bucket: obsConfig.bucket,
-        Key: compatiblePath(path.join(obsConfig.dir, path.relative(output, file))),
+        Key: compatiblePath(path.join(obsConfig.dir, path.relative(DIST_DIR, file))),
       },
       (err, result) => {
         if (err) {
@@ -130,9 +131,6 @@ function updateProgress() {
     });
     progress = null;
     uploadQueue = {};
-    // setTimeout(() => {
-    //   console.log(chalk.green('assets upload completed'));
-    // }, 0);
   }
 
   return `[${completed}/${total}]`;
@@ -151,9 +149,6 @@ async function checkUpload() {
           await getStat(file[0]);
           setStorage(file[0], true);
           updateProgress();
-          // console.log(
-          //   chalk.blue(`${publicPath}${path.relative(output, file[0])} ${updateProgress()}`),
-          // );
         } catch (error) {
           try {
             await doUpload(file[0]);
@@ -162,9 +157,6 @@ async function checkUpload() {
             console.error(`Failed to upload ${file[0]}:`, uploadError);
           }
           updateProgress();
-          // console.log(
-          //   chalk.green(`${publicPath}${path.relative(output, file[0])} ${updateProgress()}`),
-          // );
         }
         uploadQueue[file[0]] = 'completed';
       }),
@@ -181,7 +173,7 @@ function addToUploadQueue(assets) {
   }
 
   assets.forEach((asset) => {
-    const file = path.resolve(output, asset);
+    const file = path.resolve(DIST_DIR, asset);
     if (uploadQueue[file] === undefined) {
       uploadQueue[file] = false;
     }

package/build/webpack.config.js

@@ -9,56 +9,32 @@ const autoprefixer = require('autoprefixer');
 const postcssPresetEnv = require('postcss-preset-env');
 
 const WeappPlugin = require('./plugin');
-const getResourceAccept = require('./config/getResourceAccept');
 const { getBuildEnv } = require('./utils/buildEnv');
-const getContext = require('./config/getContext');
-const getConfig = require('./config/getConfig');
-const getOutput = require('./config/getOutput');
-const getEntrys = require('./config/getEntrys');
-const getAssets = require('./config/getAssets');
-const getAppConfig = require('./config/getAppConfig');
+const { getConfig } = require('./config/getConfig');
+const { getEntries } = require('./config/getEntries');
+const { getAppConfig } = require('./config/getAppConfig');
 
-const isSubpackage = require('./utils/isSubpackage');
-const compatiblePath = require('./utils/compatiblePath');
-const ENV = require('./config/env');
-
-const appConfig = getAppConfig();
-const assets = getAssets();
-const context = getContext();
-const { alias, publicPath = 'auto', copyFiles = [] } = getConfig();
-const output = getOutput();
-const entrys = getEntrys();
+const { isSubpackage } = require('./utils/isSubpackage');
+const { compatiblePath } = require('./utils/compatiblePath');
+const { ENV, PATTERNS, ASSET_EXT_PATTERN, SRC_DIR, DIST_DIR, ASSETS_DIR } = require('./config/constants');
 
 const defaultCopyFiles = ['project.config.json', 'sitemap.json'];
 
-// 删除output目录文件
-if (fse.existsSync(output)) {
-  const files = fse.readdirSync(output);
-
-  files.forEach((item) => {
-    if (!/project\.config\.json/g.test(item)) {
-      fse.removeSync(path.resolve(output, item));
-    }
-  });
-} else {
-  fse.mkdirSync(output);
-}
-
 module.exports = (options, { analyzer, quiet } = {}) => {
-  // eslint-disable-next-line
-  const assetsName = (resourcePath, resourceQuery) => {
-    if (/node_modules/g.test(resourcePath)) {
+  const appConfig = getAppConfig();
+  const { alias, publicPath = 'auto', copyFiles = [] } = getConfig();
+  const entries = getEntries();
+
+  const assetsName = (resourcePath) => {
+    if (PATTERNS.NODE_MODULES.test(resourcePath)) {
       return path.relative(path.resolve(process.cwd(), 'node_modules'), resourcePath);
     }
     return '[path][name].[ext]';
   };
+
   const plugins = [
     new MiniCssExtractPlugin({
       filename: '[name].wxss',
-      // filename(asset) {
-      //   console.log(asset.chunk.name);
-      //   return '[name].wxss';
-      // },
     }),
     new webpack.DefinePlugin({
       'process.env.BUILD_ENV': JSON.stringify(getBuildEnv()),
@@ -67,7 +43,6 @@ module.exports = (options, { analyzer, quiet } = {}) => {
   ];
 
   const getResource = (module) => {
-    // eslint-disable-next-line
     let resource = module.resource || module._identifier;
 
     if (!resource) {
@@ -80,22 +55,20 @@ module.exports = (options, { analyzer, quiet } = {}) => {
     return resource;
   };
 
-  // chunk
   const cacheGroups = {
     vendors: {
       minChunks: 1,
-      // test: /\/node_modules\//,
       test(module) {
         const resource = getResource(module);
 
         if (resource === false) {
           return true;
         }
-        if (/\.wxss/g.test(resource)) {
+        if (PATTERNS.WXSS_EXT.test(resource)) {
           return false;
         }
 
-        if (/node_modules/.test(resource)) {
+        if (PATTERNS.NODE_MODULES.test(resource)) {
           return true;
         }
 
@@ -106,24 +79,23 @@ module.exports = (options, { analyzer, quiet } = {}) => {
     },
     vendors_wxss: {
       minChunks: 2,
-      test: /node_modules/,
+      test: PATTERNS.NODE_MODULES,
       name: 'vendors_wxss',
       reuseExistingChunk: true,
     },
     commons: {
       minChunks: 2,
-      // test: /^((?!.*(\/node_modules\/)).)*$/,
       test(module) {
         const resource = getResource(module);
 
         if (resource === false) {
           return false;
         }
-        if (/node_modules/.test(resource)) {
+        if (PATTERNS.NODE_MODULES.test(resource)) {
           return false;
         }
 
-        if (isSubpackage(path.relative(context, resource))) {
+        if (isSubpackage(path.relative(SRC_DIR, resource))) {
           return false;
         }
         return true;
@@ -143,14 +115,14 @@ module.exports = (options, { analyzer, quiet } = {}) => {
         if (resource === false) {
           return false;
         }
-        if (!/\/$/g.test(root)) {
+        if (!/\/$/.test(root)) {
           root = `${root}/`;
         }
 
-        if (/node_modules/.test(resource)) {
+        if (PATTERNS.NODE_MODULES.test(resource)) {
           return false;
         }
-        return compatiblePath(path.relative(context, resource)).indexOf(root) === 0;
+        return compatiblePath(path.relative(SRC_DIR, resource)).indexOf(root) === 0;
       },
       minChunks: 2,
       reuseExistingChunk: true,
@@ -174,12 +146,7 @@ module.exports = (options, { analyzer, quiet } = {}) => {
           postcssOptions: {
             plugins: [
               autoprefixer,
-              [
-                postcssPresetEnv,
-                {
-                  // Options
-                },
-              ],
+              postcssPresetEnv,
             ],
           },
         },
@@ -196,9 +163,6 @@ module.exports = (options, { analyzer, quiet } = {}) => {
       new webpack.ProgressPlugin({
         activeModules: false,
         entries: true,
-        // handler(percentage, message, ...args) {
-        //   // custom logic
-        // },
         modules: true,
         modulesCount: 5000,
         profile: false,
@@ -208,20 +172,20 @@ module.exports = (options, { analyzer, quiet } = {}) => {
       }),
     );
   }
-  // 配置copy plugin
+
   const patterns = [];
   defaultCopyFiles.forEach((file) => {
-    if (fse.existsSync(path.resolve(context, file))) {
+    if (fse.existsSync(path.resolve(SRC_DIR, file))) {
       patterns.push({
-        from: path.resolve(context, file),
-        to: path.resolve(output, file),
+        from: path.resolve(SRC_DIR, file),
+        to: path.resolve(DIST_DIR, file),
       });
     }
   });
   copyFiles.forEach((file) => {
     patterns.push({
-      from: path.resolve(context, file.from),
-      to: path.resolve(output, file.to),
+      from: path.resolve(SRC_DIR, file.from),
+      to: path.resolve(DIST_DIR, file.to),
     });
   });
 
@@ -237,35 +201,35 @@ module.exports = (options, { analyzer, quiet } = {}) => {
   return merge(
     {
       mode: ENV.PROD,
-      entry: entrys,
-      context,
+      entry: entries,
+      context: SRC_DIR,
       stats: {
         errorDetails: true,
       },
       output: {
-        path: output,
+        path: DIST_DIR,
         publicPath,
       },
       plugins,
       resolve: {
         alias,
         preferRelative: true,
+        symlinks: false,
       },
       module: {
         rules: [
           {
-            test: getResourceAccept(),
+            test: ASSET_EXT_PATTERN,
             use: [
               {
                 loader: 'url-loader',
                 options: {
                   limit: 0,
-                  // true 需要 .default, false 不需要 .defualt
                   esModule: false,
                   fallback: {
                     loader: 'file-loader',
                     options: {
-                      name: `${assets}/[name].[hash].[ext]`,
+                      name: `${ASSETS_DIR}/[name].[hash].[ext]`,
                     },
                   },
                 },
@@ -274,22 +238,21 @@ module.exports = (options, { analyzer, quiet } = {}) => {
           },
           {
             test: /\.(wxss|css)$/i,
-            include: /node_modules/,
+            include: PATTERNS.NODE_MODULES,
             use: [...getCssLoader()],
           },
           {
-            // test: /\.less$/i,
             test: /\.(less|wxss|css)$/i,
-            exclude: /node_modules/,
+            exclude: PATTERNS.NODE_MODULES,
             use: [
               ...getCssLoader({
                 use: [
                   {
-                    loader: 'less-loader', // compiles Less to CSS
+                    loader: 'less-loader',
                     options: {
                       lessOptions() {
                         return {
-                          paths: [context],
+                          paths: [SRC_DIR],
                         };
                       },
                     },
@@ -350,7 +313,7 @@ module.exports = (options, { analyzer, quiet } = {}) => {
                     [
                       '@babel/preset-env',
                       {
-                        targets: 'defaults',
+                        targets: { chrome: 53 },
                         modules: 'commonjs',
                       },
                     ],
@@ -370,12 +333,13 @@ module.exports = (options, { analyzer, quiet } = {}) => {
           name: 'runtime',
         },
         splitChunks: {
-          minSize: 0,
+          minSize: 10 * 1024,
           chunks: 'all',
           cacheGroups,
         },
       },
+      cache: false,
     },
     options,
   );
-};
+};

package/index.js

@@ -12,7 +12,7 @@ const fs = require('fs');
 const dev = require('./build/dev');
 const prod = require('./build/prod');
 const { setBuildEnv } = require('./build/utils/buildEnv');
-const ENV = require('./build/config/env');
+const { ENV } = require('./build/config/constants');
 
 const { version } = JSON.parse(
   fs.readFileSync(path.resolve(__dirname, './package.json')).toString(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hw-weapp-compiler",
-  "version": "1.0.0",
+  "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,11 +38,10 @@
     "postcss-loader": "^5.2.0",
     "postcss-preset-env": "^9.6.0",
     "progress": "^2.0.3",
-    "style-loader": "^2.0.0",
+    "terser-webpack-plugin": "^5.6.1",
     "throttle-debounce": "^3.0.1",
     "uglify-js": "^3.14.2",
     "url-loader": "^4.1.1",
-    "weapp-compiler-hw": "^0.0.1",
     "webpack": "^5.61.0",
     "webpack-bundle-analyzer": "^4.4.0",
     "webpack-merge": "^5.7.3",

package/build/config/env.js

@@ -1,7 +0,0 @@
-const ENV = {
-  DEV: 'development',
-  PROD: 'production',
-  SIMULATION: 'simulation',
-  UNKOWN: 'unkown',
-};
-module.exports = ENV;

package/build/config/getAssets.js

@@ -1 +0,0 @@
-module.exports = () => 'assets';

package/build/config/getContext.js

@@ -1,5 +0,0 @@
-const path = require('path');
-
-const context = path.resolve(process.cwd(), 'src');
-
-module.exports = () => context;

package/build/config/getEnv.js

@@ -1,5 +0,0 @@
-module.exports = () => ({
-  DEV: 'development',
-  PROD: 'production',
-  SIMULATION: 'simulation',
-});

package/build/config/getOutput.js

@@ -1,7 +0,0 @@
-const path = require('path');
-
-function getOutput() {
-  return path.resolve(process.cwd(), 'dist');
-}
-
-module.exports = getOutput;

package/build/config/getResourceAccept.js

@@ -1 +0,0 @@
-module.exports = () => /\.(png|jpg|gif|jpeg|svg|ttf|woff|eot|woff2|otf|mp3|mp4|wav|json|html)$/i;

package/build/utils/recordEnv.js

@@ -1,11 +0,0 @@
-const fs = require('fs-extra');
-const path = require('path');
-const getOutput = require('../config/getOutput');
-const ENV = require('../config/env');
-
-module.exports = (config) => {
-  fs.writeJSONSync(path.join(getOutput(), 'weapp.env.json'), {
-    env: ENV.DEV,
-    ...config,
-  });
-};