aiot-toolkit 1.0.20 → 1.0.21-beta.2

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+#### [1.0.20] - 2024-01-02
+
+- 支持 `services` 配置数组格式
+- 支持媒体查询 `designWidth` 字符串值
+- 支持媒体查询 `device-type` 属性
+- 修复合并用户的 `webpack` 配置使用深层合并的问题
+- 修复 `feature` 未定义时报错的问题
+- 修复分包时 `$app_evaluate$` 未执行的问题
+- 优化 `MEDIA` 放到样式的最后以便生效
+- 优化 `app_require` 使用包裹函数的方式
+
 #### [1.0.19] - 2023-10-24
 
 - 支持 `protobuf` 二进制版本 css 添加 `object` 值

package/README.md

@@ -41,6 +41,17 @@ npm run release
 
 ### 版本日志(详情请在 node_modules 中查看 CHANGELOG)
 
+#### [1.0.20] - 2024-01-02
+
+- 支持 `services` 配置数组格式
+- 支持媒体查询 `designWidth` 字符串值
+- 支持媒体查询 `device-type` 属性
+- 修复合并用户的 `webpack` 配置使用深层合并的问题
+- 修复 `feature` 未定义时报错的问题
+- 修复分包时 `$app_evaluate$` 未执行的问题
+- 优化 `MEDIA` 放到样式的最后以便生效
+- 优化 `app_require` 使用包裹函数的方式
+
 #### [1.0.19] - 2023-10-24
 
 - 支持 `protobuf` 二进制版本 css 添加 `object` 值

package/lib/commands/compile.js

@@ -1,136 +1,2 @@
-"use strict";
-
-/*
- * Copyright (C) 2017, hapjs.org. All rights reserved.
- */
-const webpack = require('webpack');
-
-const {
-  setCustomConfig,
-  colorconsole
-} = require('@aiot-toolkit/shared-utils');
-
-const genWebpackConf = require('../../gen-webpack-conf');
-
-const {
-  summaryErrors,
-  summaryWarnings
-} = require('./utils'); // webpack watch 模式返回的watching实例
-
-
-let watching = null;
-
-function showVersion() {
-  const toolkitVer = require('../../package.json').version;
-
-  const babelVer = require('@babel/core/package.json').version;
-
-  const webpackVer = require('webpack/package.json').version;
-
-  colorconsole.info(`aiot-toolkit: ${toolkitVer}; babel: ${babelVer}; webpack: ${webpackVer};`);
-}
-
-showVersion();
-/**
- * 调用 webpack 进行编译
- *
- * @module compile
- * @param {String} platform - 目标平台: native
- * @param {dev|prod} mode - 编译模式: dev、prod
- * @param {Boolean} watch - 是否监听
- * @param {Object} [options={}] - 动态生成 webpack 配置项的参数对象
- * @param {String} [options.cwd] - 工作目录
- * @param {Writable} [options.log] - 日志输出流
- * @param {String} [options.originType] - 打包来源，ide|cmd
- * @param {Function} [options.onerror] - 错误回调函数
- * @param {String} [options.setPreviewPkgPath] - 预览包保存路径，由IDE传入
- * @returns {Promise} - 返回成功与否的信息
- */
-
-module.exports.compile = function compile(platform, mode, watch, options = {}) {
-  const errCb = options.onerror;
-  return new Promise((resolve, reject) => {
-    colorconsole.attach(options.log);
-    setCustomConfig(options.cwd); // IMPORTANT: set env variables before generating webpack config
-
-    process.env.NODE_PLATFORM = platform;
-    process.env.NODE_PHASE = mode;
-
-    function compilationCallback(err, stats) {
-      if (err) {
-        errCb && errCb(err);
-        colorconsole.error(err);
-      }
-
-      if (stats) {
-        if (stats.hasErrors() || stats.hasWarnings()) {
-          const message = summaryErrors(stats);
-          const warningMsg = summaryWarnings(stats);
-          errCb && errCb(message);
-          colorconsole.error(message);
-          colorconsole.warn(warningMsg);
-        }
-
-        if (stats.hasErrors()) {
-          process.exitCode = 1;
-        }
-      }
-    }
-
-    const webpackMode = mode === 'prod' ? 'production' : 'development';
-
-    try {
-      const webpackConfig = genWebpackConf(options, webpackMode);
-
-      if (watch) {
-        const compiler = webpack(webpackConfig);
-        watching = compiler.watch({
-          aggregateTimeout: 300
-        }, (err, stats) => {
-          compilationCallback(err, stats);
-          resolve({
-            compileError: err,
-            stats,
-            watching
-          });
-        });
-      } else {
-        webpack(webpackConfig, (err, stats) => {
-          compilationCallback(err, stats);
-          resolve({
-            compileError: err,
-            stats
-          });
-        });
-      }
-    } catch (err) {
-      reject(err);
-    }
-  });
-};
-/**
- * 停止 webpack watch监听
- *
- * @module stopWatch
- * @returns {Promise} - 返回成功与否的信息
- */
-
-
-module.exports.stopWatch = function () {
-  return new Promise(resolve => {
-    if (watching) {
-      watching.close(() => {
-        watching = null;
-        resolve({
-          stopWatchError: null
-        });
-      });
-      return;
-    }
-
-    resolve({
-      stopWatchError: 'no watching'
-    });
-  });
-};
+"use strict";const webpack=require("webpack"),{setCustomConfig:setCustomConfig,colorconsole:colorconsole}=require("@aiot-toolkit/shared-utils"),genWebpackConf=require("../../gen-webpack-conf"),{summaryErrors:summaryErrors,summaryWarnings:summaryWarnings}=require("./utils");let watching=null;function showVersion(){const o=require("../../package.json").version,r=require("@babel/core/package.json").version,e=require("webpack/package.json").version;colorconsole.info(`aiot-toolkit: ${o}; babel: ${r}; webpack: ${e};`)}showVersion(),module.exports.compile=function(o,r,e,s={}){const n=s.onerror;return new Promise(((c,t)=>{function a(o,r){if(o&&(n&&n(o),colorconsole.error(o)),r){if(r.hasErrors()||r.hasWarnings()){const o=summaryErrors(r),e=summaryWarnings(r);n&&n(o),colorconsole.error(o),colorconsole.warn(e)}r.hasErrors()&&(process.exitCode=1)}}colorconsole.attach(s.log),setCustomConfig(s.cwd),process.env.NODE_PLATFORM=o,process.env.NODE_PHASE=r;const i="prod"===r?"production":"development";try{const o=genWebpackConf(s,i);if(e){const r=webpack(o);watching=r.watch({aggregateTimeout:300},((o,r)=>{a(o,r),c({compileError:o,stats:r,watching:watching})}))}else webpack(o,((o,r)=>{a(o,r),c({compileError:o,stats:r})}))}catch(o){t(o)}}))},module.exports.stopWatch=function(){return new Promise((o=>{watching?watching.close((()=>{watching=null,o({stopWatchError:null})})):o({stopWatchError:"no watching"})}))};
 //# sourceMappingURL=compile.js.map