aiot-toolkit 1.0.18-aspect-beta.21 → 1.0.18-aspect-beta.23

package/lib/plugins/manifest-watch-plugin.js

@@ -1,2 +1,124 @@
-"use strict";const path=require("path"),{colorconsole:colorconsole,readJson:readJson,logger:logger,mergeJsonFile:mergeJsonFile}=require("@aiot-toolkit/shared-utils"),eventBus=require("@aiot-toolkit/shared-utils/event-bus"),{resolveEntries:resolveEntries}=require("../utils"),fs=require("fs"),{PACKAGER_WATCH_START:PACKAGER_WATCH_START}=eventBus;function sort(t){return t.sort(((t,s)=>t.localeCompare(s)))}module.exports=class{constructor(t){this.appRoot=t.appRoot,this.root=t.root,this.manifestFile=path.resolve(this.root,"manifest.json"),this.isMinaH5=t.isMinaH5;let s={};try{const t=readJson(this.manifestFile);s=resolveEntries(t,this.root,this.appRoot)}catch(t){}this.list=Object.keys(s),this.list=sort(this.list),this.mergeRootManifest()}hasChanged(t){const s=sort(t),e=JSON.stringify(s)!==JSON.stringify(this.list);return e&&(this.list=s),e}apply(t){t.hooks.compilation.tap("compilation",(t=>{const s=this.getRootManifest();this.isMinaH5&&fs.existsSync(s)&&t.fileDependencies.add(s)})),t.hooks.watchRun.tapAsync("watch",((t,s)=>{eventBus.emit(PACKAGER_WATCH_START),logger.clear();try{const s=t.modifiedFiles;if(s){if(s.has(this.manifestFile)){const s=readJson(this.manifestFile),e=resolveEntries(s,this.root,this.appRoot),i=Object.keys(e);this.hasChanged(i)&&(this.list=i,t.options.entry=e)}const e=this.getRootManifest();s.has(e)&&this.mergeRootManifest()}}catch(t){colorconsole.error(t.message),logger.add(t.message)}s()}))}mergeRootManifest(){const t=this.getRootManifest();this.isMinaH5&&fs.existsSync(t)&&fs.existsSync(this.manifestFile)&&mergeJsonFile(t,this.manifestFile)}getRootManifest(){return path.resolve(this.root,"../manifest.json")}};
+"use strict";
+
+const path = require('path');
+
+const {
+  colorconsole,
+  readJson,
+  logger,
+  mergeJsonFile
+} = require('@aiot-toolkit/shared-utils');
+
+const eventBus = require('@aiot-toolkit/shared-utils/event-bus');
+
+const {
+  resolveEntries
+} = require('../utils');
+
+const fs = require('fs');
+
+const {
+  PACKAGER_WATCH_START
+} = eventBus;
+
+function sort(list) {
+  return list.sort((a, b) => a.localeCompare(b));
+}
+
+module.exports = class ManifestWatchPlugin {
+  /**
+   * @param {Object} options - 配置参数
+   * @param {String} options.root - 应用根目录
+   */
+  constructor(options) {
+    this.appRoot = options.appRoot;
+    this.root = options.root;
+    this.manifestFile = path.resolve(this.root, 'manifest.json');
+    this.isMinaH5 = options.isMinaH5;
+    let entries = {};
+
+    try {
+      /** @readonly */
+      const manifest = readJson(this.manifestFile);
+      entries = resolveEntries(manifest, this.root, this.appRoot);
+    } catch (_) {}
+
+    this.list = Object.keys(entries);
+    this.list = sort(this.list);
+    this.mergeRootManifest();
+  }
+
+  hasChanged(newList) {
+    const sorted = sort(newList);
+    const changed = JSON.stringify(sorted) !== JSON.stringify(this.list);
+
+    if (changed) {
+      this.list = sorted;
+    }
+
+    return changed;
+  }
+
+  apply(compiler) {
+    // watch静态资源
+    compiler.hooks.compilation.tap('compilation', compilation => {
+      const rootManifest = this.getRootManifest(); // minh5项目需要监听.src外层的manifest文件变化
+
+      if (this.isMinaH5 && fs.existsSync(rootManifest)) {
+        compilation.fileDependencies.add(rootManifest);
+      }
+    });
+    compiler.hooks.watchRun.tapAsync('watch', (compiler, callback) => {
+      eventBus.emit(PACKAGER_WATCH_START);
+      logger.clear();
+
+      try {
+        const modifiedFiles = compiler.modifiedFiles; // 当发生变化的文件是 app.json，且 list 列表有增/删时，更新入口文件
+        // TODO 页面减少时不会移除 entry
+        // https://stackoverflow.com/a/39401288/1087831
+
+        if (modifiedFiles) {
+          if (modifiedFiles.has(this.manifestFile)) {
+            /** @readonly */
+            const manifest = readJson(this.manifestFile);
+            const entries = resolveEntries(manifest, this.root, this.appRoot);
+            const newList = Object.keys(entries);
+
+            if (this.hasChanged(newList)) {
+              // 增删页面要修改 webpack entries
+              this.list = newList;
+              compiler.options.entry = entries;
+            }
+          } // 当是minah5且根目录的mainfest.json变化时，同步到.src下
+
+
+          const rootManifest = this.getRootManifest();
+
+          if (modifiedFiles.has(rootManifest)) {
+            this.mergeRootManifest();
+          }
+        }
+      } catch (err) {
+        // 需要将错误显示出来，watch时修改才有显示
+        colorconsole.error(err.message);
+        logger.add(err.message);
+      }
+
+      callback();
+    });
+  }
+
+  mergeRootManifest() {
+    const rootManifest = this.getRootManifest(); // 把manifest.json合并到.src/manifest.json
+
+    if (this.isMinaH5 && fs.existsSync(rootManifest) && fs.existsSync(this.manifestFile)) {
+      mergeJsonFile(rootManifest, this.manifestFile);
+    }
+  }
+
+  getRootManifest() {
+    return path.resolve(this.root, '../manifest.json');
+  }
+
+};
 //# sourceMappingURL=manifest-watch-plugin.js.map

package/lib/utils.js

@@ -1,2 +1,111 @@
-"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"),globalConfig=require("@aiot-toolkit/shared-utils/config");exports.resolveEntries=function(e,o,t){if(!e.router)throw Error("No routing configured in manifest.json！");const i={},r=e.router.pages||{},s=e.router.widgets||{},l=[{confs:e.router.floatingWindows||{},type:ENTRY_TYPE.FLOAT},{confs:s,type:ENTRY_TYPE.CARD}];l.unshift({confs:r,type:ENTRY_TYPE.PAGE});let n="app";globalConfig.aspectTemplate.isAspect&&!globalConfig.aspectTemplate.isApp&&(n="aspect");const c=resolveFile(path.join(o,n));c||(colorconsole.error(`${n} file does not exist`),process.exit(1)),i[n]="./"+path.relative(t,c)+`?uxType=${ENTRY_TYPE.APP}`,l.forEach((({confs:e,type:r})=>{Object.keys(e).forEach((s=>{const l=e[s],n=path.join(s,l.component);let c=resolveFile(path.join(o,n));c||colorconsole.throw(`Compilation failed: please confirm that the file path ${n} 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,c);a="./"+a+`?uxType=${r}`,a=a.replace(/\\/g,"/"),i[n]=a}))}));const a=e.workers;a&&a.entries&&a.entries instanceof Array&&a.entries.filter((e=>e.file)).forEach((e=>{i[e.file.replace(/\.js$/,"")]="./src/"+e.file}));const p=e.services;if(!isEmptyObject(p))for(const e in p)Object.hasOwnProperty.call(p,e)&&(i["services/"+e]="./src/"+p[e].path+`?uxType=${ENTRY_TYPE.APP}`);return i};
+"use strict";
+
+const path = require('path');
+
+const {
+  colorconsole
+} = require('@aiot-toolkit/shared-utils');
+
+const {
+  ENTRY_TYPE
+} = require('@aiot-toolkit/packager/lib/common/utils');
+
+const {
+  resolveFile
+} = require('@aiot-toolkit/packager/lib/common/info');
+
+const {
+  isEmptyObject
+} = require('@aiot-toolkit/compiler/lib/utils');
+
+const globalConfig = require('@aiot-toolkit/shared-utils/config');
+/**
+ * 提取其中的应用，页面，worker,services, floatingWindows的脚本文件
+ * @return {Array}
+ * 以 basedir 为基本目录，获取 manifest 的配置的入口页面
+ *
+ * @param {ManifestObject} manifest - manifest
+ * @param {String} basedir - 扫描目录
+ * @param {String} cwd - 工作目录
+ * @returns {Array<Object>}
+ */
+
+
+exports.resolveEntries = function resolveEntries(manifest, basedir, cwd) {
+  if (!manifest.router) {
+    throw Error('No routing configured in manifest.json！');
+  }
+
+  const entries = {};
+  const pagesConf = manifest.router.pages || {};
+  const widgetsConf = manifest.router.widgets || {};
+  const floatingWindowsConf = manifest.router.floatingWindows || {};
+  const confsList = [{
+    confs: floatingWindowsConf,
+    type: ENTRY_TYPE.FLOAT
+  }, {
+    confs: widgetsConf,
+    type: ENTRY_TYPE.CARD
+  }];
+  confsList.unshift({
+    confs: pagesConf,
+    type: ENTRY_TYPE.PAGE
+  });
+  let baseName = 'app';
+
+  if (globalConfig.aspectTemplate.isAspect && !globalConfig.aspectTemplate.isApp) {
+    baseName = 'aspect';
+  }
+
+  const appFile = resolveFile(path.join(basedir, baseName));
+
+  if (!appFile) {
+    colorconsole.error(`${baseName} file does not exist`);
+    process.exit(1);
+  }
+
+  entries[baseName] = './' + path.relative(cwd, appFile) + `?uxType=${ENTRY_TYPE.APP}`;
+  confsList.forEach(({
+    confs,
+    type
+  }) => {
+    Object.keys(confs).forEach(routePath => {
+      const conf = confs[routePath];
+      const entryKey = path.join(routePath, conf.component);
+      let filepath = resolveFile(path.join(basedir, entryKey));
+
+      if (!filepath) {
+        colorconsole.throw(`Compilation failed: please confirm that the file path ${entryKey} configured in manifest.json exists`);
+      }
+
+      if (/^\//.test(routePath)) {
+        colorconsole.throw(`Compilation failed: please confirm that '${routePath}' configured by router.pages in manifest.json is the directory name`);
+      }
+
+      let sourceFile = path.relative(cwd, filepath);
+      sourceFile = './' + sourceFile + `?uxType=${type}`;
+      sourceFile = sourceFile.replace(/\\/g, '/');
+      entries[entryKey] = sourceFile;
+    });
+  });
+  const workers = manifest.workers;
+
+  if (workers && workers.entries && workers.entries instanceof Array) {
+    workers.entries.filter(worker => worker.file).forEach(worker => {
+      entries[worker.file.replace(/\.js$/, '')] = './src/' + worker.file;
+    });
+  }
+
+  const services = manifest.services;
+
+  if (!isEmptyObject(services)) {
+    for (const key in services) {
+      if (Object.hasOwnProperty.call(services, key)) {
+        entries['services/' + key] = './src/' + services[key].path + `?uxType=${ENTRY_TYPE.APP}`;
+      }
+    }
+  }
+
+  return entries;
+};
 //# sourceMappingURL=utils.js.map

package/package.json

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