aiot-toolkit 1.0.18-aspect-beta.20 → 1.0.18-aspect-beta.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commands/compile.js +1 -1
- package/package.json +9 -9
package/lib/commands/compile.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
"use strict";var _ziputil=require("@aiot-toolkit/packager/lib/common/ziputil"),_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,readJson:readJson}=require("@aiot-toolkit/shared-utils"),genWebpackConf=require("../../gen-webpack-conf"),{summaryErrors:summaryErrors,summaryWarnings:summaryWarnings,getAspectEntries:getAspectEntries,cleanOrCreateDir:cleanOrCreateDir,copyFiles:copyFiles,getProductionTypes:getProductionTypes,isMirtosDevice:isMirtosDevice,deleteCompressedFiles:deleteCompressedFiles,getAndCopyDeviceAspectResource:getAndCopyDeviceAspectResource}=require("./utils"),{validateConfigJson:validateConfigJson}=require("../../gen-webpack-conf/validate"),path=require("path"),fs=require("fs");let appName,watching=null;function showVersion(){const e=require("../../package.json").version,t=require("@babel/core/package.json").version,o=require("webpack/package.json").version;colorconsole.info(`aiot-toolkit: ${e}; babel: ${t}; webpack: ${o};`)}async function aspectProjectCompiler(e,t,o,a={}){let s=getManifest();appName=s.package||"demo";const{entries:i,deviceAspects:r,routerObj:c}=getAspectEntries(_config.default.aspectTemplate.projectPath,s);validateConfigJson(i);const n=_config.default.aspectTemplate.distPath,p=_config.default.aspectTemplate.outputPath;cleanOrCreateDir(p),cleanOrCreateDir(n),_config.default.aspectTemplate.outputPath=path.join(p,appName);const l=_config.default.aspectTemplate.outputPath,f=[];try{for(let s of i){_config.default.sourceRoot="./src",_config.default.aspectTemplate.isApp=!1,a.cwd=path.join(_config.default.aspectTemplate.projectPath,s),_config.default.aspectTemplate.packToVela=!1;let i=path.resolve(a.cwd,_config.default.sourceRoot,"manifest.json");if(!fs.existsSync(i))throw new Error(`the file ${i} cannot be found.`);const r=readJson(i),{deviceTypeList:c}=r;if(c&&Array.isArray(c)){const i=getProductionTypes(c);for(const r of Object.keys(i))if(i[r]){_config.default.aspectTemplate.packToVela="enableMirtos"===r;const i=_config.default.aspectTemplate.packToVela?s+".lite":s;f.push(i),await singleCompiler(e,t,o,a)}}else f.push(s),await singleCompiler(e,t,o,a)}c.all=s.router.aspects,r.all=f;const p=path.join(_config.default.aspectTemplate.projectPath,"app"),u=path.join(p,"manifest.json");let g=JSON.parse(JSON.stringify(s));const{deviceTypeList:m}=s,d=getProductionTypes(m),h=path.join(p,".manifest.json");fs.writeFileSync(h,JSON.stringify(s));for(let s of Object.keys(r)){const i=isMirtosDevice(s);let m="all"===s,h=m?appName:appName+"."+s.trim().replace(" ",".");if(g.router.aspects=c[s],fs.writeFileSync(u,JSON.stringify(g,null,2)),_config.default.sourceRoot="",_config.default.aspectTemplate.isApp=!0,a.cwd=p,m){for(const s of Object.keys(d))if(d[s]){_config.default.aspectTemplate.packToVela="enableMirtos"===s;const i=_config.default.aspectTemplate.packToVela?"app.lite":"app";f.push(i),await singleCompiler(e,t,o,a)}}else _config.default.aspectTemplate.packToVela=i,await singleCompiler(e,t,o,a);let w=[];if(m)for(const e of r[s]){const t="app"===e||"app.lite"===e?e+".base":e+".aspc";w.push({name:e,targetFile:t,otherName:t})}else r[s].unshift("app"),w=getAndCopyDeviceAspectResource(r[s],l,h,i);const y=path.join(n,h+".app");await(0,_ziputil.packFolderToApp)(y,w,l),m&&deleteCompressedFiles(l)}if(fs.unlinkSync(h),a.deploy){
|
|
1
|
+
"use strict";var _ziputil=require("@aiot-toolkit/packager/lib/common/ziputil"),_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,readJson:readJson}=require("@aiot-toolkit/shared-utils"),genWebpackConf=require("../../gen-webpack-conf"),{summaryErrors:summaryErrors,summaryWarnings:summaryWarnings,getAspectEntries:getAspectEntries,cleanOrCreateDir:cleanOrCreateDir,copyFiles:copyFiles,getProductionTypes:getProductionTypes,isMirtosDevice:isMirtosDevice,deleteCompressedFiles:deleteCompressedFiles,getAndCopyDeviceAspectResource:getAndCopyDeviceAspectResource}=require("./utils"),{validateConfigJson:validateConfigJson}=require("../../gen-webpack-conf/validate"),path=require("path"),fs=require("fs");let appName,watching=null;function showVersion(){const e=require("../../package.json").version,t=require("@babel/core/package.json").version,o=require("webpack/package.json").version;colorconsole.info(`aiot-toolkit: ${e}; babel: ${t}; webpack: ${o};`)}async function aspectProjectCompiler(e,t,o,a={}){let s=getManifest();appName=s.package||"demo";const{entries:i,deviceAspects:r,routerObj:c}=getAspectEntries(_config.default.aspectTemplate.projectPath,s);validateConfigJson(i);const n=_config.default.aspectTemplate.distPath,p=_config.default.aspectTemplate.outputPath;cleanOrCreateDir(p),cleanOrCreateDir(n),_config.default.aspectTemplate.outputPath=path.join(p,appName);const l=_config.default.aspectTemplate.outputPath,f=[];try{for(let s of i){_config.default.sourceRoot="./src",_config.default.aspectTemplate.isApp=!1,a.cwd=path.join(_config.default.aspectTemplate.projectPath,s),_config.default.aspectTemplate.packToVela=!1;let i=path.resolve(a.cwd,_config.default.sourceRoot,"manifest.json");if(!fs.existsSync(i))throw new Error(`the file ${i} cannot be found.`);const r=readJson(i),{deviceTypeList:c}=r;if(c&&Array.isArray(c)){const i=getProductionTypes(c);for(const r of Object.keys(i))if(i[r]){_config.default.aspectTemplate.packToVela="enableMirtos"===r;const i=_config.default.aspectTemplate.packToVela?s+".lite":s;f.push(i),await singleCompiler(e,t,o,a)}}else f.push(s),await singleCompiler(e,t,o,a)}c.all=s.router.aspects,r.all=f;const p=path.join(_config.default.aspectTemplate.projectPath,"app"),u=path.join(p,"manifest.json");let g=JSON.parse(JSON.stringify(s));const{deviceTypeList:m}=s,d=getProductionTypes(m),h=path.join(p,".manifest.json");fs.writeFileSync(h,JSON.stringify(s));for(let s of Object.keys(r)){const i=isMirtosDevice(s);let m="all"===s,h=m?appName:appName+"."+s.trim().replace(" ",".");if(g.router.aspects=c[s],fs.writeFileSync(u,JSON.stringify(g,null,2)),_config.default.sourceRoot="",_config.default.aspectTemplate.isApp=!0,a.cwd=p,m){for(const s of Object.keys(d))if(d[s]){_config.default.aspectTemplate.packToVela="enableMirtos"===s;const i=_config.default.aspectTemplate.packToVela?"app.lite":"app";f.push(i),await singleCompiler(e,t,o,a)}}else _config.default.aspectTemplate.packToVela=i,await singleCompiler(e,t,o,a);let w=[];if(m)for(const e of r[s]){const t="app"===e||"app.lite"===e?e+".base":e+".aspc";w.push({name:e,targetFile:t,otherName:t})}else r[s].unshift("app"),w=getAndCopyDeviceAspectResource(r[s],l,h,i);const y=path.join(n,h+".app");await(0,_ziputil.packFolderToApp)(y,w,l),m&&deleteCompressedFiles(l)}if(fs.unlinkSync(h),a.deploy){fs.copyFileSync(u,path.join(n,"manifest.json"));const e=path.join(n,path.basename(_config.default.aspectTemplate.projectPath)+".zip"),t=fs.readdirSync(n).map((e=>({name:e,targetFile:e,otherName:e})));await(0,_ziputil.packFolderToApp)(e,t,n)}return Promise.resolve()}catch(e){console.log(`Distributed project compiler error ${e}`)}}function singleCompiler(e,t,o,a={}){const s=a.onerror;return new Promise(((i,r)=>{function c(e,t){if(e&&(s&&s(e),colorconsole.error(e)),t){if(t.hasErrors()||t.hasWarnings()){const e=summaryErrors(t),o=summaryWarnings(t);s&&s(e),colorconsole.error(e),colorconsole.warn(o)}t.hasErrors()&&(process.exitCode=1)}}colorconsole.attach(a.log),setCustomConfig(a.cwd),process.env.NODE_PLATFORM=e,process.env.NODE_PHASE=t;const n="prod"===t?"production":"development";try{const e=genWebpackConf(a,n);if(o){const t=webpack(e);watching=t.watch({aggregateTimeout:300},((e,t)=>{c(e,t),i({compileError:e,stats:t,watching:watching})}))}else webpack(e,((e,t)=>{c(e,t),i({compileError:e,stats:t})}))}catch(e){console.log(`singleCompiler error ${e}`)}}))}showVersion(),module.exports.compile=async function(e,t,o,a={}){var s;let i;return"distributed"===(null===(s=getProjectJson())||void 0===s?void 0:s.projectType)?(_config.default.aspectTemplate.isAspect=!0,i=await aspectProjectCompiler(e,t,o,a)):i=await singleCompiler(e,t,o,a),i},module.exports.stopWatch=function(){return new Promise((e=>{watching?watching.close((()=>{watching=null,e({stopWatchError:null})})):e({stopWatchError:"no watching"})}))};
|
|
2
2
|
//# sourceMappingURL=compile.js.map
|
package/package.json
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aiot-toolkit",
|
|
3
|
-
"version": "1.0.18-aspect-beta.
|
|
3
|
+
"version": "1.0.18-aspect-beta.21",
|
|
4
4
|
"description": "A command line toolkit for developing Aiot Quick Apps.",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=8.0.0"
|
|
7
7
|
},
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"@aiot-toolkit/compiler": "1.0.18-aspect-beta.
|
|
10
|
-
"@aiot-toolkit/debugger": "1.0.18-aspect-beta.
|
|
11
|
-
"@aiot-toolkit/dsl-vue": "1.0.18-aspect-beta.
|
|
12
|
-
"@aiot-toolkit/dsl-xvm": "1.0.18-aspect-beta.
|
|
13
|
-
"@aiot-toolkit/packager": "1.0.18-aspect-beta.
|
|
14
|
-
"@aiot-toolkit/server": "1.0.18-aspect-beta.
|
|
15
|
-
"@aiot-toolkit/shared-utils": "1.0.18-aspect-beta.
|
|
9
|
+
"@aiot-toolkit/compiler": "1.0.18-aspect-beta.21",
|
|
10
|
+
"@aiot-toolkit/debugger": "1.0.18-aspect-beta.21",
|
|
11
|
+
"@aiot-toolkit/dsl-vue": "1.0.18-aspect-beta.21",
|
|
12
|
+
"@aiot-toolkit/dsl-xvm": "1.0.18-aspect-beta.21",
|
|
13
|
+
"@aiot-toolkit/packager": "1.0.18-aspect-beta.21",
|
|
14
|
+
"@aiot-toolkit/server": "1.0.18-aspect-beta.21",
|
|
15
|
+
"@aiot-toolkit/shared-utils": "1.0.18-aspect-beta.21",
|
|
16
16
|
"@babel/core": "^7.9.6",
|
|
17
17
|
"@babel/plugin-syntax-jsx": "^7.8.3",
|
|
18
18
|
"@babel/preset-env": "^7.9.6",
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"supertest": "^3.3.0",
|
|
52
52
|
"webpack-cli": "^4.3.0"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "0ba95068d95009acdefb2d0a82f98a60cf5f2757"
|
|
55
55
|
}
|