create-aiot 2.0.5-beta.11 → 2.0.5-beta.14

package/lib/bin.js

@@ -20,7 +20,7 @@ async function main() {
     name: 'create-aiot',
     description: 'create aiot project',
     version: require('../package.json').version,
-    commandList: [await (0, _.getCrerateXtsCommand)(), await (0, _.getUxCreateCommand)()]
+    commandList: [await (0, _.getUxCreateCommand)()]
   };
   _commander.Command.registeProgram(config);
 }

package/lib/index.d.ts

@@ -1,3 +1,2 @@
 import { ICommand } from '@aiot-toolkit/commander';
 export declare function getUxCreateCommand(): Promise<ICommand>;
-export declare function getCrerateXtsCommand(): Promise<ICommand>;

package/lib/index.js

@@ -3,7 +3,6 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getCrerateXtsCommand = getCrerateXtsCommand;
 exports.getUxCreateCommand = getUxCreateCommand;
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _fs = _interopRequireDefault(require("fs"));
@@ -83,47 +82,4 @@ async function getUxCreateCommand() {
       createAction(option, 'ux');
     }
   };
-}
-async function getCrerateXtsCommand() {
-  const templateList = await _TemplateUtil.default.requestTemplateList('xts');
-  return {
-    name: 'xts',
-    description: 'create xts template project',
-    paramList: [{
-      name: 'template',
-      description: 'prject template',
-      type: 'select',
-      enableInquirer: true,
-      choices: templateList.map(item => {
-        return {
-          value: item.name,
-          description: item.description
-        };
-      })
-    }, {
-      name: 'name',
-      description: 'poject name',
-      enableInquirer: true,
-      defaultValue: 'xts-project',
-      type: 'string',
-      validate(value) {
-        return _TemplateUtil.default.validateProjectName(value);
-      }
-    }, {
-      name: 'packageName',
-      description: 'package name',
-      enableInquirer: true,
-      defaultValue: 'xts.app.test',
-      type: 'string'
-    }, {
-      name: 'aspect',
-      type: 'string',
-      defaultValue: 'aspect1',
-      description: 'Do you need to create some aspect, with multiple aspect names separated by commas',
-      enableInquirer: true
-    }],
-    action: option => {
-      createAction(option, 'xts');
-    }
-  };
 }

package/lib/template/template.json

@@ -13,15 +13,5 @@
         "description": "android demo template"
       }
     ]
-  },
-  {
-    "type": "xts",
-    "demoList": [
-      {
-        "name": "xts-demo",
-        "path": "./xts/app-package-name",
-        "description": "xts demo template"
-      }
-    ]
   }
 ]

package/lib/utils/TemplateUtil.js

@@ -9,7 +9,6 @@ var _prompts = require("@inquirer/prompts");
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _path = _interopRequireDefault(require("path"));
 var _Common = _interopRequireDefault(require("./Common"));
-var _XtsTemplateUtil = _interopRequireDefault(require("./xts/XtsTemplateUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const json = require('../template/template.json');
 /**
@@ -62,8 +61,7 @@ class TemplateUtil {
   cwd) {
     const {
       name,
-      template,
-      aspect
+      template
     } = param;
     const usedCwd = cwd || process.cwd();
 
@@ -104,8 +102,6 @@ class TemplateUtil {
       keywords['data']['toolkitVersion'] = require('../../package.json').version;
       _Common.default.performReplace(keywords, projectAbsolutePath);
     }
-    // xts项目-处理aspect内容
-    aspect && _XtsTemplateUtil.default.createAspect(projectAbsolutePath, aspect);
 
     // 执行插件
     if (plugins) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aiot",
-  "version": "2.0.5-beta.11",
+  "version": "2.0.5-beta.14",
   "description": "An easy way to start aiot project",
   "main": "lib/index.js",
   "keywords": [
@@ -23,13 +23,13 @@
     "test": "node ./__tests__/create-aiot.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/commander": "2.0.5-beta.11",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.11",
+    "@aiot-toolkit/commander": "2.0.5-beta.14",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.14",
     "@inquirer/prompts": "^3.0.3",
     "fs-extra": "^11.2.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"
   },
-  "gitHead": "3572914b1508d19f4a7c566cec23f0be70273e59"
+  "gitHead": "63c6564afe9bedd9c034f03e8e457b6cfa6960ae"
 }

package/lib/template/xts/app-package-name/_gitignore

@@ -1,4 +0,0 @@
-/node_modules
-/dist
-/build
-/wasmUnpacked

package/lib/template/xts/app-package-name/app/app.xts

@@ -1,17 +0,0 @@
-app MainApp {
-    onCreate(intent: RouteInfo) {
-        console.log('App onCreate.')
-    }
-
-    onForeground() {
-        console.log('App onForeground.')
-    }
-
-    onBackground() {
-        console.log('App onBackground.')
-    }
-
-    onDestroy() {
-        console.log('App onDestroy.')
-    }
-}

package/lib/template/xts/app-package-name/app/manifest.json

@@ -1,68 +0,0 @@
-{
-  "package": "{{packageName}}",
-  "name": "{{appName}}",
-  "icon": "/$app_resource/icon.png",
-  "versionName": "1.0.0",
-  "versionCode": 1,
-  "minPlatformVersion": 1000,
-  "features": [
-    {
-      "name": "system.shortcut"
-    }
-  ],
-  "config": {
-    "logLevel": "log",
-    "network": {
-      "connectTimeout": 10000,
-      "readTimeout": 10000,
-      "writeTimeout": 10000
-    }
-  },
-  "display": {
-    "backgroundColor": "#ffffff",
-    "fullScreen": false,
-    "titleBar": true,
-    "titleBarBackgroundColor": "#000000",
-    "titleBarTextColor": "#fffff",
-    "statusBarImmersive": false,
-    "statusBarTextStyle": "auto",
-    "statusBarBackgroundColor": "#000000",
-    "themeMode": -1
-  },
-  "trustedSslDomains": ["www.quickapp.cn", "m.quickapp.cn"],
-  "router": {
-    "aspects": {
-      "home": [
-        {
-          "path": "aspect1",
-          "devices": ["phone", "pad"],
-          "autoStart": true
-        }
-      ]
-    }
-  },
-  "rules": {
-    "screenRule1": {
-      "screenWidth": {
-        "operator": "include",
-        "values": ["100", "200"]
-      },
-      "screenShape": {
-        "operator": "include",
-        "values": ["rect"]
-      }
-    },
-    "screenRule2": {
-      "screenWidth": {
-        "operator": "exclude",
-        "values": ["800", "400"]
-      }
-    },
-    "circleRule": {
-      "screenShape": {
-        "operator": "include",
-        "values": ["circle"]
-      }
-    }
-  }
-}

package/lib/template/xts/aspect1/config.json

@@ -1,8 +0,0 @@
-{
-  "name": "{{aspectName}}",
-  "type": "UI",
-  "virtualMachine": "TS",
-  "display": {},
-  "permissions": {},
-  "window": {}
-}

package/lib/template/xts/aspect1/src/aspect.xts

@@ -1,17 +0,0 @@
-vaspect MainAspect {
-    onCreate(intent: RouteInfo) {
-        console.log('MainAspect onCreate.')
-    }
-
-    onShow() {
-        console.log('MainAspect onShow.')
-    }
-
-    onHide() {
-        console.log('MainAspect onHide.')
-    }
-
-    onDestroy() {
-        console.log('MainAspect onDestroy.')
-    }
-}

package/lib/template/xts/aspect1/src/manifest.json

@@ -1,21 +0,0 @@
-{
-  "name": "{{aspectName}}",
-  "versionName": "1.9.1",
-  "versionCode": 10900001,
-  "description": "主模块",
-  "icon": "$file:logo.png",
-  "logLevel": "log",
-  "router": {
-    "entry": "Home",
-    "pages": {
-      "Home": {
-        "path": "pages/Home"
-      }
-    }
-  },
-  "features": [
-    {
-      "name": "system.shortcut"
-    }
-  ]
-}

package/lib/template/xts/aspect1/src/pages/Home.xts

@@ -1,35 +0,0 @@
-@Main
-component Home {
-  @State message: string = 'Hello World'
-
-  onShow() {
-    console.log('home--onShow')
-  }
-
-  render() {
-    Row() {
-      Column() {
-        Text(this.message)
-          .color('#000000')
-          .fontSize('15px')
-          .fontWeight('bold')
-        Button('click')
-          .width('220px')
-          .height('80px') 
-          .marginTop('20px')
-          .onClick((params?: PlainObject) => {
-            this.changeMessage()
-          })
-      }
-      .width('100%')
-      .alignItems('center')
-      .justifyContent('center')
-    }
-    .height('100%')
-  }
-  
-  changeMessage() {
-    this.setState({ message: 'Hello Tomorrow' })
-  }
-
-}

package/lib/utils/xts/XtsTemplateUtil.d.ts

@@ -1,9 +0,0 @@
-declare class XtsTemplateUtil {
-    /**
-     * xts项目-处理aspect内容
-     * @param projectAbsolutePath
-     * @param aspect
-     */
-    static createAspect(projectAbsolutePath: string, aspect: string): void;
-}
-export default XtsTemplateUtil;

package/lib/utils/xts/XtsTemplateUtil.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-var _Common = _interopRequireDefault(require("../Common"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-class XtsTemplateUtil {
-  /**
-   * xts项目-处理aspect内容
-   * @param projectAbsolutePath
-   * @param aspect
-   */
-  static createAspect(projectAbsolutePath, aspect) {
-    // 按照逗号分割字符串，且去掉空格
-    const aspects = aspect.replace(' ', '').split(',');
-    const aspectAbsolutePath = _path.default.join(__dirname, '../../template', 'xts', 'aspect1');
-    // 循环生成自定义aspect
-    aspects.map(aspectItem => {
-      const targetAspectPath = _path.default.join(projectAbsolutePath, aspectItem);
-      _fsExtra.default.copySync(aspectAbsolutePath, targetAspectPath);
-      // 替换关键字
-      _Common.default.performReplace({
-        data: {
-          aspectName: aspectItem
-        },
-        includes: path => {
-          const stats = _fsExtra.default.statSync(path);
-          if (stats.isDirectory()) {
-            return ['src'].includes(_path.default.basename(path));
-          } else {
-            return ['.json', '.ux'].includes(_path.default.extname(path));
-          }
-        }
-      }, targetAspectPath);
-    });
-  }
-}
-var _default = exports.default = XtsTemplateUtil;