aiot-toolkit 1.0.17-version-beta.1 → 1.0.18-aspect-beta.1

package/gen-webpack-conf/helpers.js

@@ -45,14 +45,16 @@ exports.cleanup = function cleanup(BUILD_DIR, DIST_DIR) {
  * 使用 node 原生模块给予警告
  */
 exports.checkBuiltinModules = function checkBuiltinModules({ request }, callback) {
-  const packageJson = require(path.join(globalConfig.projectPath, 'package.json'))
   // 提取 package.json 中的依赖
   let projectDependencies = []
-  if (packageJson.devDependencies) {
-    projectDependencies = Object.keys(packageJson.devDependencies)
-  }
-  if (packageJson.dependencies) {
-    projectDependencies = projectDependencies.concat(Object.keys(packageJson.dependencies))
+  if (!globalConfig.aspectTemplate.isAspect) {
+    const packageJson = require(path.join(globalConfig.projectPath, 'package.json'))
+    if (packageJson.devDependencies) {
+      projectDependencies = Object.keys(packageJson.devDependencies)
+    }
+    if (packageJson.dependencies) {
+      projectDependencies = projectDependencies.concat(Object.keys(packageJson.dependencies))
+    }
   }
 
   // 枚举 node 原生模块
@@ -107,7 +109,12 @@ exports.checkBuiltinModules = function checkBuiltinModules({ request }, callback
  * @param {boolean} disableScriptV8V65
  */
 exports.setAdaptForV8Version = function setAdaptForV8Version(disableScriptV8V65, manifest, cwd) {
-  const packageJsonFile = path.resolve(cwd, 'package.json')
+  let packageJsonFile
+  if (globalConfig.aspectTemplate.isAspect) {
+    packageJsonFile = path.resolve(globalConfig.aspectTemplate.projectPath, 'package.json')
+  } else {
+    packageJsonFile = path.resolve(cwd, 'package.json')
+  }
   const packageJson = readJson(packageJsonFile)
   const minPlatformVersion = parseInt(manifest.minPlatformVersion)
   if (fs.existsSync(packageJsonFile)) {

package/gen-webpack-conf/index.js

@@ -100,7 +100,7 @@ module.exports = function genWebpackConf(launchOptions, mode) {
   // 是否需要设置全局的打包模式为mina-h5
   const manifestFileTemp = path.resolve(cwd, 'manifest.json')
   let isMinaH5 = false
-  if (fs.existsSync(manifestFileTemp)) {
+  if (fs.existsSync(manifestFileTemp) && !globalConfig.aspectTemplate.isAspect) {
     const manifestTemp = readJson(manifestFileTemp)
     const { deviceTypeList } = manifestTemp
     const minaH5Type = ['tv', 'tv-h5']
@@ -133,18 +133,32 @@ module.exports = function genWebpackConf(launchOptions, mode) {
   // 清理 BUILD_DIR DIST_DIR
   cleanup(BUILD_DIR, DIST_DIR)
 
+  // 将aspect文件夹的config.json文件复制到build文件夹
+  if (globalConfig.aspectTemplate.isAspect && !globalConfig.aspectTemplate.isApp) {
+    const configJSON = path.join(cwd, 'config.json')
+    if (fs.existsSync(configJSON)) {
+      const sourceStream = fs.createReadStream(configJSON)
+      const targetStream = fs.createWriteStream(path.join(BUILD_DIR, path.basename(configJSON)))
+
+      sourceStream.pipe(targetStream)
+    } else {
+      colorconsole.log(`The path of project ,${configJSON} not exist`)
+    }
+  }
+
   let manifest
   try {
     manifest = readJson(manifestFile)
   } catch (e) {
     throw new KnownError('manifest.json parsing failed！')
   }
+  if (!globalConfig.aspectTemplate.isApp) {
+    validateManifest(SRC_DIR, manifest, compileOptionsObject)
 
-  validateManifest(SRC_DIR, manifest, compileOptionsObject)
+    valiedateSitemap(SRC_DIR, manifest)
 
-  valiedateSitemap(SRC_DIR, manifest)
-
-  valiedateSkeleton(SRC_DIR, manifest)
+    valiedateSkeleton(SRC_DIR, manifest)
+  }
 
   // 是否需要设置全局的打包模式为Mirtos
   const { deviceTypeList } = manifest
@@ -381,15 +395,11 @@ module.exports = function genWebpackConf(launchOptions, mode) {
       path: pathMap[dslName]
     })
 
-    const {
-      package: appPackageName,
-      icon: appIcon,
-      versionName,
-      versionCode,
-      subpackages,
-      workers,
-      banner = ''
-    } = manifest
+    const { icon: appIcon, versionName, versionCode, subpackages, workers, banner = '' } = manifest
+    let appPackageName = manifest.package
+    if (globalConfig.aspectTemplate.isAspect) {
+      appPackageName = manifest.name
+    }
     for (let i = 0, len = moduleList.length; i < len; i++) {
       const fileConf = moduleList[i].path
       if (fs.existsSync(fileConf)) {

package/gen-webpack-conf/validate.js

@@ -3,9 +3,10 @@ const path = require('path')
 const Ajv = require('ajv')
 const AjvErrors = require('ajv-errors')
 const manifestSchema = require('./manifest-schema')
-const { colorconsole, KnownError } = require('@aiot-toolkit/shared-utils')
+const { colorconsole, KnownError, readJson } = require('@aiot-toolkit/shared-utils')
 const { compileOptionsMeta } = require('@aiot-toolkit/shared-utils/compilation-config')
 const { getSkeletonConfig } = require('@aiot-toolkit/packager/lib/common/info')
+const globalConfig = require('@aiot-toolkit/shared-utils/config')
 
 // 主包保留名
 const MAIN_PKG_NAME = compileOptionsMeta.MAIN_PKG_NAME
@@ -282,3 +283,31 @@ exports.valiedateSkeleton = function valiedateSkeleton(src, manifest) {
     })
   }
 }
+/**
+ * 校验aspect项目config.json
+ * @param {string} dirs 文件夹列表
+ */
+exports.validateConfigJson = function(dirs) {
+  dirs.forEach(async dir => {
+    const configPath = path.join(globalConfig.aspectTemplate.projectPath, dir, 'config.json')
+    if (dir !== 'app') {
+      const isExistConfig = fs.existsSync(configPath)
+      if (isExistConfig) {
+        const configJson = await readJson(configPath)
+        if (!configJson.name) {
+          colorconsole.error(`Configure file ${configPath} error: name is not exist, please check`)
+        }
+        if (!configJson.type) {
+          colorconsole.error(`Configure file ${configPath} error: type is not exist, please check`)
+        }
+        if (!configJson.virtualMachine) {
+          colorconsole.error(
+            `Configure file ${configPath} error: virtualMachine is not exist, please check`
+          )
+        }
+      } else {
+        colorconsole.error(`Configure file error: ${configPath} is not exist, please check`)
+      }
+    }
+  })
+}

package/lib/commands/compile.js

@@ -1,2 +1,2 @@
-"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"})}))};
+"use strict";var _config=_interopRequireDefault(require("@aiot-toolkit/shared-utils/config"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const webpack=require("webpack"),{setCustomConfig:setCustomConfig,colorconsole:colorconsole,getProjectJson:getProjectJson,getManifest:getManifest}=require("@aiot-toolkit/shared-utils"),genWebpackConf=require("../../gen-webpack-conf"),{summaryErrors:summaryErrors,summaryWarnings:summaryWarnings,getAspectEntries:getAspectEntries,cleanOrCreateDir:cleanOrCreateDir}=require("./utils"),{copyBuildToNewBuild:copyBuildToNewBuild}=require("../utils"),{validateConfigJson:validateConfigJson}=require("../../gen-webpack-conf/validate"),path=require("path");let appName,watching=null,entries=[];function showVersion(){const e=require("../../package.json").version,o=require("@babel/core/package.json").version,t=require("webpack/package.json").version;colorconsole.info(`aiot-toolkit: ${e}; babel: ${o}; webpack: ${t};`)}function aspectProjectCompiler(e,o,t,r={}){let a=getManifest();appName=a.package||"demo",entries=getAspectEntries(_config.default.aspectTemplate.projectPath,a),validateConfigJson(entries);let i,n=_config.default.aspectTemplate.outputPath,s=_config.default.aspectTemplate.distPath;cleanOrCreateDir(n),cleanOrCreateDir(s);const c=[];return entries.forEach((a=>{_config.default.sourceRoot="./src",_config.default.aspectTemplate.isApp="app"===a,_config.default.aspectTemplate.isApp&&(_config.default.sourceRoot=""),r.cwd=path.join(_config.default.aspectTemplate.projectPath,a),i=singleCompiler(e,o,t,r),c.push(i)})),Promise.all(c)}function singleCompiler(e,o,t,r={}){const a=r.onerror;return new Promise(((i,n)=>{function s(e,o){if(e&&(a&&a(e),colorconsole.error(e)),o){if(o.hasErrors()||o.hasWarnings()){const e=summaryErrors(o),t=summaryWarnings(o);a&&a(e),colorconsole.error(e),colorconsole.warn(t)}o.hasErrors()&&(process.exitCode=1)}}colorconsole.attach(r.log),setCustomConfig(r.cwd),process.env.NODE_PLATFORM=e,process.env.NODE_PHASE=o;const c="prod"===o?"production":"development";try{const e=genWebpackConf(r,c);if(t){const o=webpack(e);watching=o.watch({aggregateTimeout:300},((e,o)=>{s(e,o),i({compileError:e,stats:o,watching:watching})}))}else webpack(e,((e,o)=>{s(e,o),i({compileError:e,stats:o})}))}catch(e){n(e)}}))}showVersion(),module.exports.compile=async function(e,o,t,r={}){var a;let i;return"distributed"===(null===(a=getProjectJson())||void 0===a?void 0:a.projectType)?(_config.default.aspectTemplate.isAspect=!0,i=await aspectProjectCompiler(e,o,t,r),await copyBuildToNewBuild(entries,appName)):i=await singleCompiler(e,o,t,r),i},module.exports.stopWatch=function(){return new Promise((e=>{watching?watching.close((()=>{watching=null,e({stopWatchError:null})})):e({stopWatchError:"no watching"})}))};
 //# sourceMappingURL=compile.js.map

package/lib/commands/utils.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formatDate=formatDate,exports.summaryErrors=summaryErrors,exports.summaryWarnings=summaryWarnings,exports.getQuickappDebuggerUrl=getQuickappDebuggerUrl,exports.getQuickappPreviewUrl=getQuickappPreviewUrl,exports.downloadFile=downloadFile,exports.sendReq=sendReq,exports.getClients=getClients,exports.checkQuickappDir=checkQuickappDir,exports.getCardContent=getCardContent;var _fsExtra=_interopRequireDefault(require("fs-extra")),_path=_interopRequireDefault(require("path")),_request=_interopRequireDefault(require("request")),_http=_interopRequireDefault(require("http")),_recordClient=require("@aiot-toolkit/shared-utils/lib/record-client"),_config=require("@aiot-toolkit/shared-utils/config"),_sharedUtils=require("@aiot-toolkit/shared-utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function formatDate(e,t){let r,o,s,n,i,a,l=e;return(e.indexOf("yyyy")>=0||e.indexOf("YYYYY")>=0)&&(r=t.getFullYear(),l=l.replace(/[yY]{4}/g,r)),e.indexOf("MM")>=0&&(o=t.getMonth()+1,l=l.replace(/MM/g,String(o).length<2?"0"+o:o)),e.indexOf("dd")>=0&&(s=t.getDate(),l=l.replace(/dd/g,String(s).length<2?"0"+s:s)),(e.indexOf("hh")>=0||e.indexOf("HH")>=0)&&(n=t.getHours(),l=l.replace(/[hH]{2}/g,String(n).length<2?"0"+n:n)),e.indexOf("mm")>=0&&(i=t.getMinutes(),l=l.replace(/mm/g,String(i).length<2?"0"+i:i)),(e.indexOf("ss")>=0||e.indexOf("SS")>=0)&&(a=t.getSeconds(),l=l.replace(/[sS]{2}/g,String(a).length<2?"0"+a:a)),l}function summaryErrors(e){const t=[];return e.compilation.errors.forEach((e=>{const r=e.message,o=/Can't resolve '(sass-loader|less-loader|stylus-loader)'/.exec(r);if("ModuleNotFoundError"===e.name&&o){let t=o[1];"less-loader"===t?t=`less ${t}`:"sass-loader"===t?t=`node-sass ${t}`:"stylus-loader"===t&&(t=`stylus ${t}`),e.message=` Missing dependency: ${t}, Please execute npm install -D ${t} to install the corresponding dependencies `}const s=e.module?e.module.resource:"";t.push(`${s}\r\n${e.message}`)})),t.join("\n\n")}function summaryWarnings(e){return e.compilation.warnings.map((e=>e.message)).join("\n\n")}const quickapp_url="https://statres.quickapp.cn/quickapp/quickapptool/release/platform/";function getQuickappDebuggerUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_debugger_${t}.apk`}function getQuickappPreviewUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_platform_preview_release_${t}.apk`}function downloadFile(e,t){return _sharedUtils.colorconsole.log(`Start downloading file：${t}, address：${e}`),new Promise((function(r,o){(0,_request.default)(e,(function(s,n,i){if(s||200!==n.statusCode)o(s||new Error(`Download failed, status code：${n.statusCode}`));else{const s=_path.default.join(__dirname,"./apk");_fsExtra.default.ensureDirSync(s);let n=_fsExtra.default.createWriteStream(_path.default.join(s,t));(0,_request.default)(e).pipe(n).on("close",(e=>{e?o(e):r(`Download file ${t} successfully`)}))}}))}))}async function sendReq(e,t,r){return new Promise((o=>{const s=`http://${e.ip}:${e.port}${t}`;let n={host:e.ip,port:e.port,path:t,timeout:3e3};r&&(n=Object.assign({},n,{headers:r}));const i=_http.default.request(n,(e=>{e.on("data",(e=>{_sharedUtils.colorconsole.log(`### App Server ### Request ${s} succeeded`),o(e.toString())}))})).on("error",(e=>{_sharedUtils.colorconsole.error(`### App Server ### Request ${s} error message: ${e.message}`)})).on("timeout",(function(){_sharedUtils.colorconsole.log(`### App Server ### Request ${s} timed out, please try again`),i.abort()}));i.end()}))}async function getClients(){return new Promise((e=>{if(_fsExtra.default.existsSync(_config.clientRecordPath)){const t=(0,_recordClient.getRecords)(_config.clientRecordPath),r=(0,_recordClient.getProjectClients)(t);r.length>0&&e(r)}e(null)}))}function checkQuickappDir(e,t="src"){const r=_path.default.join(e,t,"manifest.json");_fsExtra.default.existsSync(r)||(_sharedUtils.colorconsole.error("Please execute this command under the Quickapp project"),process.exit())}function getCardContent(e){const t=_path.default.join(e,"src","manifest.json"),r=(0,_sharedUtils.readJson)(t).router.widgets||null;return r||_sharedUtils.colorconsole.error("No card configuration in manifest.json"),r}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.formatDate=formatDate,exports.summaryErrors=summaryErrors,exports.summaryWarnings=summaryWarnings,exports.getQuickappDebuggerUrl=getQuickappDebuggerUrl,exports.getQuickappPreviewUrl=getQuickappPreviewUrl,exports.downloadFile=downloadFile,exports.sendReq=sendReq,exports.getClients=getClients,exports.checkQuickappDir=checkQuickappDir,exports.getCardContent=getCardContent,exports.cleanOrCreateDir=cleanOrCreateDir,exports.getAspectEntries=getAspectEntries;var _fsExtra=_interopRequireDefault(require("fs-extra")),_path=_interopRequireDefault(require("path")),_request=_interopRequireDefault(require("request")),_http=_interopRequireDefault(require("http")),_recordClient=require("@aiot-toolkit/shared-utils/lib/record-client"),_config=require("@aiot-toolkit/shared-utils/config"),_sharedUtils=require("@aiot-toolkit/shared-utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const fsExtra=require("fs-extra");function formatDate(e,t){let r,o,s,n,a,i,l=e;return(e.indexOf("yyyy")>=0||e.indexOf("YYYYY")>=0)&&(r=t.getFullYear(),l=l.replace(/[yY]{4}/g,r)),e.indexOf("MM")>=0&&(o=t.getMonth()+1,l=l.replace(/MM/g,String(o).length<2?"0"+o:o)),e.indexOf("dd")>=0&&(s=t.getDate(),l=l.replace(/dd/g,String(s).length<2?"0"+s:s)),(e.indexOf("hh")>=0||e.indexOf("HH")>=0)&&(n=t.getHours(),l=l.replace(/[hH]{2}/g,String(n).length<2?"0"+n:n)),e.indexOf("mm")>=0&&(a=t.getMinutes(),l=l.replace(/mm/g,String(a).length<2?"0"+a:a)),(e.indexOf("ss")>=0||e.indexOf("SS")>=0)&&(i=t.getSeconds(),l=l.replace(/[sS]{2}/g,String(i).length<2?"0"+i:i)),l}function summaryErrors(e){const t=[];return e.compilation.errors.forEach((e=>{const r=e.message,o=/Can't resolve '(sass-loader|less-loader|stylus-loader)'/.exec(r);if("ModuleNotFoundError"===e.name&&o){let t=o[1];"less-loader"===t?t=`less ${t}`:"sass-loader"===t?t=`node-sass ${t}`:"stylus-loader"===t&&(t=`stylus ${t}`),e.message=` Missing dependency: ${t}, Please execute npm install -D ${t} to install the corresponding dependencies `}const s=e.module?e.module.resource:"";t.push(`${s}\r\n${e.message}`)})),t.join("\n\n")}function summaryWarnings(e){return e.compilation.warnings.map((e=>e.message)).join("\n\n")}const quickapp_url="https://statres.quickapp.cn/quickapp/quickapptool/release/platform/";function getQuickappDebuggerUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_debugger_${t}.apk`}function getQuickappPreviewUrl(e){let t=e||"v1080";return _sharedUtils.colorconsole.log(`The version of the Quickapp debugger that started to download is： ${t}`),`${quickapp_url}quickapp_platform_preview_release_${t}.apk`}function downloadFile(e,t){return _sharedUtils.colorconsole.log(`Start downloading file：${t}, address：${e}`),new Promise((function(r,o){(0,_request.default)(e,(function(s,n,a){if(s||200!==n.statusCode)o(s||new Error(`Download failed, status code：${n.statusCode}`));else{const s=_path.default.join(__dirname,"./apk");_fsExtra.default.ensureDirSync(s);let n=_fsExtra.default.createWriteStream(_path.default.join(s,t));(0,_request.default)(e).pipe(n).on("close",(e=>{e?o(e):r(`Download file ${t} successfully`)}))}}))}))}async function sendReq(e,t,r){return new Promise((o=>{const s=`http://${e.ip}:${e.port}${t}`;let n={host:e.ip,port:e.port,path:t,timeout:3e3};r&&(n=Object.assign({},n,{headers:r}));const a=_http.default.request(n,(e=>{e.on("data",(e=>{_sharedUtils.colorconsole.log(`### App Server ### Request ${s} succeeded`),o(e.toString())}))})).on("error",(e=>{_sharedUtils.colorconsole.error(`### App Server ### Request ${s} error message: ${e.message}`)})).on("timeout",(function(){_sharedUtils.colorconsole.log(`### App Server ### Request ${s} timed out, please try again`),a.abort()}));a.end()}))}async function getClients(){return new Promise((e=>{if(_fsExtra.default.existsSync(_config.clientRecordPath)){const t=(0,_recordClient.getRecords)(_config.clientRecordPath),r=(0,_recordClient.getProjectClients)(t);r.length>0&&e(r)}e(null)}))}function checkQuickappDir(e,t="src"){const r=_path.default.join(e,t,"manifest.json");_fsExtra.default.existsSync(r)||(_sharedUtils.colorconsole.error("Please execute this command under the Quickapp project"),process.exit())}function getCardContent(e){const t=_path.default.join(e,"src","manifest.json"),r=(0,_sharedUtils.readJson)(t).router.widgets||null;return r||_sharedUtils.colorconsole.error("No card configuration in manifest.json"),r}function cleanOrCreateDir(e){try{_fsExtra.default.accessSync(e,_fsExtra.default.constants.F_OK),fsExtra.emptyDirSync(e)}catch(t){_fsExtra.default.mkdirSync(e,{recursive:!0})}}function getAspectEntries(e,t){let r=["app"],o=_fsExtra.default.readdirSync(e,{encoding:"utf8",withFileTypes:!0}).map((e=>e.name));const s=_path.default.join(e,"app","manifest.json");t.router||_sharedUtils.colorconsole.error(`Configuration file ${s} error: router is not exsist, please check`);const n=t.router.aspects||null;if(n){Object.keys(n).forEach((e=>{n[e].forEach((e=>{o.includes(e.path)?r.push(e.path):_sharedUtils.colorconsole.throw(`Configuration file ${s} error: ${e.path} is not exist in root directory`)}))}))}else _sharedUtils.colorconsole.error(`Configuration file ${s} error: router.aspect is null, please check`);return r}
 //# sourceMappingURL=utils.js.map

package/lib/utils.js

@@ -1,2 +1,2 @@
-"use strict";const path=require("path"),{colorconsole:colorconsole}=require("@aiot-toolkit/shared-utils"),{ENTRY_TYPE:ENTRY_TYPE}=require("@aiot-toolkit/packager/lib/common/utils"),{resolveFile:resolveFile}=require("@aiot-toolkit/packager/lib/common/info"),{isEmptyObject:isEmptyObject}=require("@aiot-toolkit/compiler/lib/utils");exports.resolveEntries=function(e,o,t){if(!e.router)throw Error("No routing configured in manifest.json！");const r={},i=e.router.pages||{},s=[{confs:e.router.widgets||{},type:ENTRY_TYPE.CARD}];s.unshift({confs:i,type:ENTRY_TYPE.PAGE});const n=resolveFile(path.join(o,"app"));n||(colorconsole.error("app file does not exist"),process.exit(1)),r.app="./"+path.relative(t,n)+`?uxType=${ENTRY_TYPE.APP}`,s.forEach((({confs:e,type:i})=>{Object.keys(e).forEach((s=>{const n=e[s],c=path.join(s,n.component),l=resolveFile(path.join(o,c));l||colorconsole.throw(`Compilation failed: please confirm that the file path ${c} configured in manifest.json exists`),/^\//.test(s)&&colorconsole.throw(`Compilation failed: please confirm that '${s}' configured by router.pages in manifest.json is the directory name`);let a=path.relative(t,l);a="./"+a+`?uxType=${i}`,a=a.replace(/\\/g,"/"),r[c]=a}))}));const c=e.workers;c&&c.entries&&c.entries instanceof Array&&c.entries.filter((e=>e.file)).forEach((e=>{r[e.file.replace(/\.js$/,"")]="./src/"+e.file}));const l=e.services;if(!isEmptyObject(l))for(const e in l)Object.hasOwnProperty.call(l,e)&&(r["services/"+e]="./src/"+l[e].path+`?uxType=${ENTRY_TYPE.APP}`);return r};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.copyBuildToNewBuild=copyBuildToNewBuild;var _fs=_interopRequireDefault(require("fs"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const path=require("path"),{colorconsole:colorconsole}=require("@aiot-toolkit/shared-utils"),{ENTRY_TYPE:ENTRY_TYPE,copyFiles:copyFiles,packFolderToApp:packFolderToApp}=require("@aiot-toolkit/packager/lib/common/utils"),{resolveFile:resolveFile}=require("@aiot-toolkit/packager/lib/common/info"),{isEmptyObject:isEmptyObject}=require("@aiot-toolkit/compiler/lib/utils"),globalConfig=require("@aiot-toolkit/shared-utils/config");async function copyBuildToNewBuild(e,o){const t=globalConfig.aspectTemplate.projectPath,i=globalConfig.aspectTemplate.outputPath,r=globalConfig.aspectTemplate.distPath;e.forEach((e=>{let o=path.join(t,e,"build"),s=path.join(i,e);_fs.default.existsSync(s)||_fs.default.mkdirSync(s),copyFiles(o,s);let l=path.join(t,e,"dist");copyFiles(l,r)})),await packFolderToApp(r,o)}exports.resolveEntries=function(e,o,t){if(!e.router)throw Error("No routing configured in manifest.json！");const i={},r=e.router.pages||{},s=[{confs:e.router.widgets||{},type:ENTRY_TYPE.CARD}];s.unshift({confs:r,type:ENTRY_TYPE.PAGE});let l="app";globalConfig.aspectTemplate.isAspect&&!globalConfig.aspectTemplate.isApp&&(l="aspect");const a=resolveFile(path.join(o,l));a||(colorconsole.error(`${l} file does not exist`),process.exit(1)),i[l]="./"+path.relative(t,a)+`?uxType=${ENTRY_TYPE.APP}`,s.forEach((({confs:e,type:r})=>{Object.keys(e).forEach((s=>{const l=e[s],a=path.join(s,l.component),c=resolveFile(path.join(o,a));c||colorconsole.throw(`Compilation failed: please confirm that the file path ${a} configured in manifest.json exists`),/^\//.test(s)&&colorconsole.throw(`Compilation failed: please confirm that '${s}' configured by router.pages in manifest.json is the directory name`);let n=path.relative(t,c);n="./"+n+`?uxType=${r}`,n=n.replace(/\\/g,"/"),i[a]=n}))}));const c=e.workers;c&&c.entries&&c.entries instanceof Array&&c.entries.filter((e=>e.file)).forEach((e=>{i[e.file.replace(/\.js$/,"")]="./src/"+e.file}));const n=e.services;if(!isEmptyObject(n))for(const e in n)Object.hasOwnProperty.call(n,e)&&(i["services/"+e]="./src/"+n[e].path+`?uxType=${ENTRY_TYPE.APP}`);return i};
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "aiot-toolkit",
-  "version": "1.0.17-version-beta.1",
+  "version": "1.0.18-aspect-beta.1",
   "description": "A command line toolkit for developing Aiot Quick Apps.",
   "engines": {
     "node": ">=8.0.0"
   },
   "dependencies": {
-    "@aiot-toolkit/compiler": "1.0.17-version-beta.1",
-    "@aiot-toolkit/debugger": "1.0.17-version-beta.1",
-    "@aiot-toolkit/dsl-vue": "1.0.17-version-beta.1",
-    "@aiot-toolkit/dsl-xvm": "1.0.17-version-beta.1",
-    "@aiot-toolkit/packager": "1.0.17-version-beta.1",
-    "@aiot-toolkit/server": "1.0.17-version-beta.1",
-    "@aiot-toolkit/shared-utils": "1.0.17-version-beta.1",
+    "@aiot-toolkit/compiler": "1.0.18-aspect-beta.1",
+    "@aiot-toolkit/debugger": "1.0.18-aspect-beta.1",
+    "@aiot-toolkit/dsl-vue": "1.0.18-aspect-beta.1",
+    "@aiot-toolkit/dsl-xvm": "1.0.18-aspect-beta.1",
+    "@aiot-toolkit/packager": "1.0.18-aspect-beta.1",
+    "@aiot-toolkit/server": "1.0.18-aspect-beta.1",
+    "@aiot-toolkit/shared-utils": "1.0.18-aspect-beta.1",
     "@babel/core": "^7.9.6",
     "@babel/plugin-syntax-jsx": "^7.8.3",
     "@babel/preset-env": "^7.9.6",
@@ -52,5 +52,5 @@
     "supertest": "^3.3.0",
     "webpack-cli": "^4.3.0"
   },
-  "gitHead": "f4d11e2229187eaeb204a0a91428b06e8874cad3"
+  "gitHead": "14e2beab1e171bcd38efcb519ade86b0e6718b25"
 }