@aiot-toolkit/aiotpack 2.0.2-dev.2 → 2.0.2-dev.4

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -61,20 +61,31 @@ class JavascriptCompiler {
         if (configurator.create) {
             return configurator.create();
         }
-        const { projectPath, mode, devtool, outputPath, sourceRoot } = param;
+        const { projectPath, mode, devtool, outputPath } = param;
         const buildPath = path_1.default.resolve(projectPath, outputPath);
         const quickAppConfig = CommonUtil_1.default.requireModule(path_1.default.join(param.projectPath, this.QUICKAPP_CONFIG));
         const result = {
             context: projectPath,
             mode,
-            devtool,
+            devtool: 'source-map',
             output: {
                 globalObject: 'window',
                 filename: '[name].js',
                 publicPath: './',
                 path: buildPath
             },
-            module: {},
+            module: {
+                rules: [
+                    {
+                        test: /\.js$/,
+                        use: [
+                            {
+                                loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/splitMap.js')
+                            }
+                        ]
+                    }
+                ]
+            },
             stats: {
                 builtAt: false,
                 entrypoints: false,
@@ -91,7 +102,12 @@ class JavascriptCompiler {
             result.entry = configurator.createEntry();
         }
         if (configurator.createRules && result.module) {
-            result.module.rules = configurator.createRules();
+            const readyRules = result.module.rules;
+            const configuratorRules = configurator.createRules();
+            result.module.rules =
+                Array.isArray(readyRules) && readyRules.length > 0
+                    ? [...configuratorRules, ...readyRules]
+                    : configuratorRules;
         }
         if (configurator.createPlugins) {
             result.plugins = configurator.createPlugins();

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.d.ts

@@ -1,4 +1,4 @@
-import { Configuration, EntryObject, RuleSetRule, WebpackPluginInstance } from 'webpack';
+import { EntryObject, RuleSetRule, WebpackPluginInstance } from 'webpack';
 import ICompileParam from '../../interface/ICompileParam';
 import IJavascriptCompileOption from '../interface/IJavascriptCompileOption';
 import IWebpackConfigurator from '../interface/IWebpackConfigurator';
@@ -11,6 +11,5 @@ declare class VelaWebpackConfigurator implements IWebpackConfigurator {
      */
     createEntry(): string | EntryObject | string[];
     createRules(): RuleSetRule[];
-    hook(config: Configuration): void;
 }
 export default VelaWebpackConfigurator;

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.js

@@ -65,8 +65,5 @@ class VelaWebpackConfigurator {
             }
         ];
     }
-    hook(config) {
-        // todo 合并用户配置
-    }
 }
 exports.default = VelaWebpackConfigurator;

package/lib/compiler/javascript/vela/interface/IManifest.d.ts

@@ -6,6 +6,7 @@ export default interface IManifest {
     package: string;
     name?: string;
     versionName?: string;
+    versionCode?: number;
     minPlatformVersion?: number;
     deviceId?: string;
     deviceTypeList?: string[];
@@ -22,6 +23,7 @@ export default interface IManifest {
     };
     minAPILevel?: number;
     packageInfo?: Dictionary<string | number>;
+    icon: string;
 }
 export interface IFeatures {
     name: string;

package/lib/compiler/javascript/vela/plugin/WrapPlugin.d.ts

@@ -2,6 +2,5 @@ import { Compiler } from 'webpack';
 declare class WrapPlugin {
     apply(compiler: Compiler): void;
     private wrap;
-    private wrapFunction;
 }
 export default WrapPlugin;

package/lib/compiler/javascript/vela/plugin/WrapPlugin.js

@@ -20,30 +20,27 @@ class WrapPlugin {
         // 从chunk找到所有入口文件，添加包裹函数
         entrys.forEach((entry) => {
             if (compilation.assets[entry]) {
-                const content = compilation.assets[entry].source().toString();
-                compilation.assets[entry] = new webpack_sources_1.ConcatSource(this.wrapFunction(content));
+                const source = compilation.assets[entry];
+                compilation.assets[entry] = new webpack_sources_1.ConcatSource(`
+        export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
+          var org_app_require = $app_require$;
+        
+          (function(global, globalThis, window, $app_exports$, $app_evaluate$){
+            var setTimeout = global.setTimeout;
+            var setInterval = global.setInterval;
+            var clearTimeout = global.clearTimeout;
+            var clearInterval = global.clearInterval;
+            var $app_require$ = global.$app_require$ || org_app_require
+        
+            var createPageHandler = function() {
+              return `, source, `
+            }
+        
+            return createPageHandler();
+          })(global, globalThis, window, $app_exports$, $app_evaluate$)
+        }`);
             }
         });
     }
-    wrapFunction(code) {
-        return `
-export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
-  var org_app_require = $app_require$;
-
-  (function(global, globalThis, window, $app_exports$, $app_evaluate$){
-    var setTimeout = global.setTimeout;
-    var setInterval = global.setInterval;
-    var clearTimeout = global.clearTimeout;
-    var clearInterval = global.clearInterval;
-    var $app_require$ = global.$app_require$ || org_app_require
-
-    var createPageHandler = function() {
-      return ${code}
-    }
-
-    return createPageHandler();
-  })(global, globalThis, window, $app_exports$, $app_evaluate$)
-}`;
-    }
 }
 exports.default = WrapPlugin;

package/lib/compiler/javascript/vela/utils/webpackLoader/splitMap.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from 'webpack';
+declare function splitMap(this: LoaderContext<any>, source: string, map: any): void;
+export default splitMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/splitMap.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+function splitMap(source, map) {
+    const enterFilePath = this.resourcePath;
+    // 获取当前文件夹和文件名
+    const dirName = path_1.default.dirname(enterFilePath);
+    const fileName = path_1.default.basename(enterFilePath);
+    // 取到对应的map文件内容
+    const mapFilePath = path_1.default.join(dirName, fileName + '.map');
+    if (fs_1.default.existsSync(mapFilePath)) {
+        map = fs_1.default.readFileSync(mapFilePath, { encoding: 'utf-8' });
+    }
+    this.callback(null, source, map && JSON.parse(map));
+}
+exports.default = splitMap;

package/lib/config/UxConfig.d.ts

@@ -1,7 +1,6 @@
 import { IFileLaneConfig } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
 import AppUxLoader from '../loader/ux/AppUxLoader';
-import ImageCompressLoader from '../loader/ux/ImageCompressLoader';
 import JsLoader from '../loader/ux/JsLoader';
 import UxLoader from '../loader/ux/UxLoader';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
@@ -22,10 +21,6 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             test: RegExp[];
             loader: (typeof JsLoader)[];
             exclude?: undefined;
-        } | {
-            test: RegExp[];
-            loader: (typeof ImageCompressLoader)[];
-            exclude: RegExp[];
         })[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];

package/lib/config/UxConfig.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const AppUxLoader_1 = __importDefault(require("../loader/ux/AppUxLoader"));
-const ImageCompressLoader_1 = __importDefault(require("../loader/ux/ImageCompressLoader"));
 const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
 const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
 const UxLoader_1 = __importDefault(require("../loader/ux/UxLoader"));
@@ -34,11 +33,6 @@ class UxConfig {
                 {
                     test: [/.+\.9.png/],
                     loader: [PngLoader_1.default]
-                },
-                {
-                    test: [/.+\.(png|jpg|jpeg|gif)/],
-                    loader: [ImageCompressLoader_1.default],
-                    exclude: [/.+\.9.png/]
                 }
             ]
         };

package/lib/utils/ux/UxFollowWorks.js

@@ -132,7 +132,8 @@ UxFollowWorks.copyResource = (context, config, compilerOption) => __awaiter(void
             'md',
             'ux',
             'mix',
-            'DS_Store'
+            'DS_Store',
+            'map'
         ];
         const excludeReg = `\.(${excludeExtList.join('|')})$`;
         FileUtil_1.default.copyFiles(path_1.default.join(projectPath, sourceRoot), path_1.default.join(projectPath, outputPath), new RegExp(excludeReg));

package/lib/utils/ux/UxLoaderUtils.js

@@ -90,6 +90,7 @@ class UxLoaderUtils {
             // 区分页面组件和子组件
             const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
+                // script代码放在第三个位置不能变化，影响更新source map
                 return isAppUx
                     ? [
                         `${appImport.join('\n')}`,
@@ -111,8 +112,8 @@ class UxLoaderUtils {
                         `}`
                     ];
             };
-            const { targetTree, mapList } = new UxToTypescript_1.default(options, project, integrateFunction, compilerOption).translate(parserResult.ast, []);
-            const { code, sourcemap } = new generator_1.TypescriptGenerator().generate({
+            const { targetTree, mapList, sourceMap } = yield new UxToTypescript_1.default(options, project, integrateFunction, compilerOption).translate(parserResult.ast, []);
+            const { code } = new generator_1.TypescriptGenerator().generate({
                 sourceFilePath: fullName,
                 targetFilePath: newFileName,
                 ast: targetTree,
@@ -126,8 +127,8 @@ class UxLoaderUtils {
                         content: code
                     },
                     {
-                        path: FileUtil_1.default.updatePath(filePath, `${name}.map.js`),
-                        content: sourcemap
+                        path: FileUtil_1.default.updatePath(filePath, `${name}.js.map`),
+                        content: sourceMap.toString()
                     }
                 ],
                 logs
@@ -292,7 +293,7 @@ class UxLoaderUtils {
             // 页面组件添加ViewModel处理代码
             appScriptTree.addStatements(UxLoaderUtils.contenAccess);
         }
-        return `function __scriptModule__(module, exports, $app_require$) {\t${appScriptTree.getFullText()}}`;
+        return `function __scriptModule__(module, exports, $app_require$) {\t${appScriptTree.getFullText()}\n}`;
     }
     static getReturnType(isPageUx) {
         return isPageUx ? `$app_exports$['entry'] =` : 'module.exports = ';

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-dev.2",
+  "version": "2.0.2-dev.4",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
   ],
-  "author": "徐俊杰 <xujunjie1@xiaomi.com>",
   "homepage": "",
   "license": "ISC",
   "main": "lib/index.js",
@@ -16,26 +15,21 @@
   "files": [
     "lib"
   ],
-  "repository": {
-    "type": "git",
-    "url": "ssh://xujunjie1@git.mioffice.cn:29418/vela/aiot-toolkit"
-  },
   "scripts": {
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-dev.2",
-    "@aiot-toolkit/parser": "2.0.2-dev.2",
+    "@aiot-toolkit/generator": "2.0.2-dev.4",
+    "@aiot-toolkit/parser": "2.0.2-dev.4",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "babel-loader": "^9.1.3",
     "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-dev.2",
+    "file-lane": "2.0.2-dev.4",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
     "jszip": "^3.10.1",
-    "sharp": "^0.33.2",
     "url-loader": "^4.1.1",
     "webpack": "^5.89.0",
     "webpack-sources": "^3.2.3"
@@ -44,5 +38,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "4979839c27a3477f7e72f1f1ed167200bc1d48b5"
+  "gitHead": "534fdc7c6f018623c05499bf9add8db813ef8660"
 }

package/lib/loader/ux/ImageCompressLoader.d.ts

@@ -1,9 +0,0 @@
-import { IFileParam, ILoader } from 'file-lane';
-/**
- * 图片压缩
- */
-declare class ImageCompressLoader implements ILoader {
-    parser(files: IFileParam<any>[]): Promise<IFileParam<any>[]>;
-    private compressImages;
-}
-export default ImageCompressLoader;

package/lib/loader/ux/ImageCompressLoader.js

@@ -1,74 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const sharp_1 = __importDefault(require("sharp"));
-/**
- * 图片压缩
- */
-class ImageCompressLoader {
-    parser(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = [];
-            for (const file of files) {
-                const { path, content } = file;
-                if (content instanceof Buffer) {
-                    const newContent = yield this.compressImages(path, content);
-                    result.push({
-                        path,
-                        content: newContent
-                    });
-                }
-            }
-            return result;
-        });
-    }
-    compressImages(path, content, minSize = 1024 * 10) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (content.length < minSize) {
-                return content;
-            }
-            let result = null;
-            const quality = 80;
-            const ext = path_1.default.parse(path).ext;
-            switch (ext) {
-                case '.png':
-                    result = yield (0, sharp_1.default)(content).png({ quality }).toBuffer();
-                    break;
-                case '.jpg':
-                case '.jpeg':
-                    result = yield (0, sharp_1.default)(content).jpeg({ quality }).toBuffer();
-                    break;
-                case '.gif':
-                    result = yield (0, sharp_1.default)(content, { animated: true }).gif({ interFrameMaxError: 8 }).toBuffer();
-                    break;
-                case '.webp':
-                    const metadata = yield (0, sharp_1.default)(content).metadata();
-                    result = yield (0, sharp_1.default)(content, metadata.pages ? { animated: true } : undefined)
-                        .webp({ quality })
-                        .toBuffer();
-                    break;
-                default:
-                    return content;
-            }
-            if (result && result.length < content.length) {
-                return result;
-            }
-            return content;
-        });
-    }
-}
-;
-ImageCompressLoader.raw = true;
-exports.default = ImageCompressLoader;