@aiot-toolkit/aiotpack 2.0.5-beta.16 → 2.0.5-beta.18

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -62,5 +62,9 @@ declare class UxAfterCompile {
      * @param params
      */
     static resourceCheck: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 写入.gitignore文件, 忽略临时目录
+     */
+    static writeGitIgnore: FollowWork<IJavascriptCompileOption>;
 }
 export default UxAfterCompile;

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -29,9 +29,10 @@ class UxAfterCompile {
   static compileJavascript = async params => {
     const {
       context,
-      compilerOption
+      compilerOption,
+      onLog
     } = params;
-    return new _JavascriptCompiler.default().compile({
+    return new _JavascriptCompiler.default(context, onLog).compile({
       projectPath: _path.default.join(context.projectPath, context.output),
       mode: _CompileMode.default.DEVELOPMENT,
       devtool: false,
@@ -320,8 +321,8 @@ class UxAfterCompile {
       const diffFileName = `.diff.rpk`;
       const diffPath = _path.default.join(distFold, diffFileName);
       await _ZipFileUtil.default.createZipFile(diffPath, diffList.map(item => ({
-        filePath: _path.default.join(buildFold, item.path),
-        zipFilePath: item.path
+        filePath: _path.default.join(buildFold, item),
+        zipFilePath: item
       })));
       compalition.info.diffList = diffList;
       compalition.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);
@@ -493,5 +494,20 @@ class UxAfterCompile {
       onLog?.(logs);
     }
   };
+
+  /**
+   * 写入.gitignore文件, 忽略临时目录
+   */
+  static writeGitIgnore = async params => {
+    const {
+      context
+    } = params;
+    const {
+      output,
+      projectPath
+    } = context;
+    const gitIgnorePath = _path.default.join(projectPath, output, '.gitignore');
+    _fsExtra.default.writeFileSync(gitIgnorePath, '*');
+  };
 }
 var _default = exports.default = UxAfterCompile;

package/lib/compiler/javascript/JavascriptCompiler.d.ts

@@ -1,8 +1,13 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
+import { IFileLaneContext } from 'file-lane';
 import ICompileParam from '../interface/ICompileParam';
 import ICompiler from '../interface/ICompiler';
 import IJavascriptCompileOption from './interface/IJavascriptCompileOption';
 declare class JavascriptCompiler implements ICompiler {
+    private readonly context;
+    private readonly onLog?;
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    constructor(context: IFileLaneContext, onLog?: ((log: ILog[]) => void) | undefined);
     compile(param: IJavascriptCompileOption): Promise<void>;
     /**
      * 压缩插件

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -8,13 +8,17 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _core = require("@rspack/core");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
+var _CompileMode = _interopRequireDefault(require("../enum/CompileMode"));
 var _AndroidWebpackConfigurator = _interopRequireDefault(require("./android/AndroidWebpackConfigurator"));
 var _VelaWebpackConfigurator = _interopRequireDefault(require("./vela/VelaWebpackConfigurator"));
 var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"));
-var _CompileMode = _interopRequireDefault(require("../enum/CompileMode"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class JavascriptCompiler {
   QUICKAPP_CONFIG = 'quickapp.config.js';
+  constructor(context, onLog) {
+    this.context = context;
+    this.onLog = onLog;
+  }
   async compile(param) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -142,9 +146,34 @@ class JavascriptCompiler {
         rules: [{
           test: /\.ux$/,
           // 匹配以 .ux 结尾的文件
+          exclude: /node_modules/,
           use: [{
             loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
           }]
+        },
+        // node_modules下的ux文件
+        {
+          test: /\.ux$/,
+          include: /node_modules/,
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/WebpackUxLoader'),
+            options: {
+              compileParam: param,
+              context: this.context,
+              onLog: this.onLog
+            }
+          }]
+        }, {
+          test: /\.js$/,
+          include: /node_modules/,
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/WebpackJsLoader'),
+            options: {
+              compileParam: param,
+              context: this.context,
+              onLog: this.onLog
+            }
+          }]
         }]
       },
       optimization: {

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -1,6 +1,6 @@
 import ICompileParam from '../../interface/ICompileParam';
 import BuildNameFormatType from '../vela/enum/BuildNameFormatType';
-export default interface IJavascriptCompileOption extends ICompileParam {
+interface IJavascriptCompileOption extends ICompileParam {
     devtool?: string | false;
     /**
      * 源码路径(相对项目根目录)
@@ -85,3 +85,4 @@ export default interface IJavascriptCompileOption extends ICompileParam {
         certificate: Buffer;
     }>;
 }
+export default IJavascriptCompileOption;

package/lib/compiler/javascript/interface/IJavascriptCompileOption.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

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

@@ -33,8 +33,7 @@ class WrapPlugin {
         const source = compilation.assets[entry];
         const isApp = entry === 'app.js';
         const createFuncnName = isApp ? 'createAppHandler' : 'createPageHandler';
-        compilation.assets[entry] = new _webpackSources.ConcatSource(`
-        export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
+        compilation.assets[entry] = new _webpackSources.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$){

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

@@ -0,0 +1,11 @@
+import { IFileLaneContext } from 'file-lane';
+import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
+import { ILog } from '@aiot-toolkit/shared-utils';
+/**
+ * IWebpackLoaderOption
+ */
+export default interface IWebpackLoaderOption {
+    compileParam: IJavascriptCompileOption;
+    context: IFileLaneContext;
+    onLog: (log: ILog[]) => void;
+}

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

@@ -0,0 +1 @@
+"use strict";

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

@@ -0,0 +1,2 @@
+import { LoaderContext } from '@rspack/core';
+export default function (this: LoaderContext<any>, source: string): Promise<void>;

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+async function _default(source) {
+  const callback = this.async();
+  const options = this.getOptions();
+  const {
+    context,
+    onLog,
+    compileParam
+  } = options;
+  const result = await new _parser.ScriptToTypescript({
+    filePath: this.resourcePath,
+    content: source,
+    projectPath: this.rootContext,
+    onLog: log => onLog?.([log]),
+    projectType: _sharedUtils.ProjectType.VELA_UX
+  }, compileParam, context).translate({
+    content: source
+  }, []);
+  callback(null, result.targetTree.getFullText());
+}

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

@@ -0,0 +1,2 @@
+import { LoaderContext } from '@rspack/core';
+export default function (this: LoaderContext<any>, source: string): Promise<void>;

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

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _UxLoaderUtils = _interopRequireDefault(require("../../../../../utils/ux/UxLoaderUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+async function _default(source) {
+  const options = this.getOptions();
+  const {
+    onLog,
+    compileParam,
+    context
+  } = options;
+  const callback = this.async();
+  const {
+    files: compiledFiles,
+    logs
+  } = await _UxLoaderUtils.default.compileUxToJavascript({
+    path: this.resourcePath,
+    content: source
+  }, context, false, compileParam);
+  onLog?.(logs);
+  callback(null, compiledFiles[0].content, compiledFiles[1].content);
+}

package/lib/config/UxConfig.d.ts

@@ -26,10 +26,13 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     get output(): string;
     beforeWorks: (typeof UxBeforeWorks.cleanOutput)[];
     beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
-    afterCompile: {
+    afterCompile: ({
+        worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
+        workerDescribe?: undefined;
+    } | {
         worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
         workerDescribe: string;
-    }[];
+    })[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];
     watchIgnores: RegExp[];
     /**

package/lib/config/UxConfig.js

@@ -75,6 +75,8 @@ class UxConfig {
   beforeWorks = (() => [_UxBeforeWorks.default.cleanOutput])();
   beforeCompile = (() => [_UxBeforeCompile.default.validateManifest, _UxBeforeCompile.default.validateSitemap, _BeforeCompileUtils.default.clean, _BeforeCompileUtils.default.getEntries, _BeforeCompileUtils.default.getGlobalVar])();
   afterCompile = (() => [{
+    worker: _UxAfterCompile.default.writeGitIgnore
+  }, {
     worker: _UxAfterCompile.default.symlinkNodeModule,
     workerDescribe: 'Create a soft link to the node_modules folder'
   }, {

package/lib/utils/ux/ManifestSchema.js

@@ -9,13 +9,16 @@ const ManifestSchema = {
   required: ['package', 'name', 'icon', 'versionCode', 'config', 'router'],
   properties: {
     package: {
-      type: 'string'
+      type: 'string',
+      minLength: 1
     },
     name: {
-      type: 'string'
+      type: 'string',
+      minLength: 1
     },
     icon: {
-      type: 'string'
+      type: 'string',
+      minLength: 1
     },
     banner: {
       type: 'string'

package/lib/utils/ux/UxFileUtils.d.ts

@@ -48,9 +48,6 @@ export declare class UxFileUtils {
      * @param newFileList 新文件列表
      * @returns
      */
-    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): {
-        path: string;
-        content: Buffer;
-    }[];
+    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): string[];
 }
 export default UxFileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -135,22 +135,16 @@ class UxFileUtils {
       if (index !== -1) {
         // 1.2
         const oldContent = oldFileList[i].content?.toString('utf-8');
-        const newContent = _fsExtra.default.readFileSync(_path.default.join(buildPath, newFileList[index]));
-        if (oldContent !== newContent.toString()) {
-          diffList.push({
-            path: newFileList[index],
-            content: newContent
-          });
+        const newContent = _fsExtra.default.readFileSync(_path.default.join(buildPath, newFileList[index]), 'utf-8');
+        if (oldContent !== newContent) {
+          diffList.push(newFileList[index]);
         }
         // 从newFileList中移除该项
         newFileList.splice(index, 1);
       }
     }
     // 2.
-    newFileList.length > 0 && newFileList.forEach(file => diffList.push({
-      path: file,
-      content: _fsExtra.default.readFileSync(_path.default.join(buildPath, file))
-    }));
+    newFileList.length > 0 && newFileList.forEach(file => diffList.push(file));
     return diffList;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.16",
+  "version": "2.0.5-beta.18",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.16",
-    "@aiot-toolkit/parser": "2.0.5-beta.16",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.16",
+    "@aiot-toolkit/generator": "2.0.5-beta.18",
+    "@aiot-toolkit/parser": "2.0.5-beta.18",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.18",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.5-beta.16",
+    "file-lane": "2.0.5-beta.18",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "hap-toolkit": "^2.0.0",
@@ -43,5 +43,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "66255b9d69f9b15db10283d662f94f3d1f2486c3"
+  "gitHead": "cdcbff776773be9854039419016d04fa11bc7186"
 }