@aiot-toolkit/aiotpack 2.0.2-beta.7 → 2.0.2-beta.9

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -77,10 +77,10 @@ class JavascriptCompiler {
             module: {
                 rules: [
                     {
-                        test: /\.js$/,
+                        test: /\.ux$/,
                         use: [
                             {
-                                loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/splitMap.js')
+                                loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
                             }
                         ]
                     }
@@ -111,7 +111,7 @@ class JavascriptCompiler {
             // 判断devtool类型 inline-source-map时，添加第0列关系映射
             if (devtool === 'inline-source-map') {
                 result.module.rules.unshift({
-                    test: /\.js$/,
+                    test: /\.ux$/,
                     use: [
                         {
                             loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/addColSourceMap.js')

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

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

package/lib/compiler/javascript/vela/utils/webpackLoader/{splitMap.js → extractMapData.js}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-function splitMap(source, map) {
+function extractMapData(source, map) {
     const enterFilePath = this.resourcePath;
     // 获取当前文件夹和文件名
     const dirName = path_1.default.dirname(enterFilePath);
@@ -17,4 +17,4 @@ function splitMap(source, map) {
     }
     this.callback(null, source, map && JSON.parse(map));
 }
-exports.default = splitMap;
+exports.default = extractMapData;

package/lib/utils/ux/UxLoaderUtils.js

@@ -115,16 +115,16 @@ class UxLoaderUtils {
                     ? [
                         `${appImport.join('\n')}`,
                         `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`,
-                        `var $app_script$ = ${UxLoaderUtils.handleScriptContent(false, appScriptTree)}\n`,
-                        `$app_script$({}, $app_exports$, $app_require$);\n\n`,
+                        `var $app_script$ = ${UxLoaderUtils.handleScriptContent(false, appScriptTree)}`,
+                        `$app_script$({}, $app_exports$, $app_require$);`,
                         `$app_exports$.default.style = $app_style$;`,
                         `$app_exports$.default.manifest = ${manifestJson}`
                     ]
                     : [
                         `${appImport.join('\n')}`,
-                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}\n`,
+                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`,
                         `var $app_script$ = ${UxLoaderUtils.handleScriptContent(isPageUx, appScriptTree)}`,
-                        `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}\n`,
+                        `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`,
                         `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`,
                         `$app_script$({}, $app_exports$, $app_require$);`,
                         `$app_exports$.default.template = $app_template$;`,
@@ -147,7 +147,7 @@ class UxLoaderUtils {
                         content: code
                     },
                     {
-                        path: FileUtil_1.default.updatePath(filePath, `${name}.js.map`),
+                        path: FileUtil_1.default.updatePath(filePath, `${name}${ext}.map`),
                         content: sourceMap.toString()
                     },
                     ...ImageResources

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.7",
+  "version": "2.0.2-beta.9",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,13 +19,13 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.7",
-    "@aiot-toolkit/parser": "2.0.2-beta.7",
+    "@aiot-toolkit/generator": "2.0.2-beta.9",
+    "@aiot-toolkit/parser": "2.0.2-beta.9",
     "@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-beta.7",
+    "file-lane": "2.0.2-beta.9",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
@@ -41,5 +41,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "dc37f9f6fbef3895d17b54ad41274c66f154f670"
+  "gitHead": "19f19b20ca63800f2403cc89d9a8edb6a102a765"
 }

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

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