@ray-js/cli 1.3.0-beta.2-beta-2 → 1.3.0-beta.3

package/lib/API.js

@@ -59,13 +59,20 @@ class API {
     }
     loadPlugin() {
         this.config.plugins
-            .concat(['@ray-js/build-plugin-router', '@ray-js/build-plugin-ray'])
+            .concat([
+            '@ray-js/build-plugin-router',
+            '@ray-js/build-plugin-ray',
+            '@ray-js/ray/plugins/i18n-plugin',
+        ])
             .forEach((p) => {
             this.addPlugin(p);
         });
     }
     addPlugin(plugin) {
         if (typeof plugin === 'string') {
+            if (plugin.startsWith('ray')) {
+                plugin = `@ray-js/${plugin}`;
+            }
             plugin = requirePlugin(plugin);
         }
         const _p = typeof plugin === 'function' ? plugin(this) : plugin;

package/lib/run-builder.js

@@ -8,17 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -26,32 +15,66 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runBuilder = void 0;
 const builder_mp_1 = require("@ray-js/builder-mp");
 const builder_web_1 = require("@ray-js/builder-web");
+const shared_1 = require("@ray-js/shared");
+const colors_1 = __importDefault(require("colors"));
 const API_1 = __importDefault(require("./API"));
+colors_1.default.enable();
+const defaultCompileOptions = {
+    cwd: process.cwd(),
+    source: 'src',
+    mode: 'development',
+    watch: false,
+    target: 'wechat',
+    mini: false,
+    analyze: false,
+    devtools: false,
+    debug: false,
+    output: 'dist',
+};
 function runBuilder(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const api = new API_1.default(options);
-        const { type = 'app' } = options, opts = __rest(options
-        // 加载ray.config.ts 或 ray.config.js
-        , ["type"]);
         // 加载ray.config.ts 或 ray.config.js
         api.loadConfig();
+        const finalOpts = Object.assign({}, defaultCompileOptions, api.config, options);
+        // 从配置文件中注入运行时参数
+        if (finalOpts.debug) {
+            process.env.REMAX_DEBUG = JSON.stringify(true);
+        }
+        else {
+            delete process.env.REMAX_DEBUG;
+        }
+        const { cwd, target, output, onTargetDir } = finalOpts;
+        /**
+         * 又是历史原因
+         * 因老项目生成的产物目录是tuya，所以就干脆是tuya，不然会出现既 tuya 又 thing 的目录
+         * 将开发整懵逼
+         */
+        const dist = target === 'thing' ? 'tuya' : target;
+        // 默认产物会编译到目录${output}/${target}下
+        // 某些情况下需要直接编译到 ${output}/下
+        // onTargetDir 提供一个修改 output 的方法
+        const outputPath = (0, shared_1.resolvePath)(typeof onTargetDir === 'function' ? [onTargetDir(output, dist)] : [output, dist], { cwd });
+        finalOpts.output = outputPath;
+        api.options = finalOpts;
+        shared_1.log.verbose('ray-builder', `final options:`, finalOpts);
         // 加载插件，插件可以是插件的模块路径
         api.loadPlugin();
         // 初始化插件，即执行插件plugin.setup()方法
         api.callPluginMethod('setup');
         const ctx = { api };
-        switch (opts.target) {
+        switch (finalOpts.target) {
             // @ts-ignore
             case 'tuya':
             case 'wechat':
             case 'thing':
-                yield (0, builder_mp_1.build)(opts, ctx);
+                yield (0, builder_mp_1.build)(finalOpts, ctx);
                 break;
             case 'web':
-                yield (0, builder_web_1.build)(opts, ctx);
+                yield (0, builder_web_1.build)(finalOpts, ctx);
                 break;
             default:
-                throw new Error(`Target '${opts.target}' is not supported.'`);
+                throw new Error(`Target '${finalOpts.target}' is not supported.'`);
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/cli",
-  "version": "1.3.0-beta.2-beta-2",
+  "version": "1.3.0-beta.3",
   "description": "Ray cli",
   "bin": {
     "ray": "./bin/ray"
@@ -24,13 +24,13 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/build-plugin-ray": "^1.3.0-beta.2-beta-2",
-    "@ray-js/build-plugin-router": "^1.3.0-beta.2-beta-2",
-    "@ray-js/builder-component": "^1.3.0-beta.2-beta-2",
-    "@ray-js/builder-mp": "^1.3.0-beta.2-beta-2",
-    "@ray-js/builder-web": "^1.3.0-beta.2-beta-2",
-    "@ray-js/shared": "^1.3.0-beta.2-beta-2",
-    "@ray-js/types": "^1.3.0-beta.2-beta-2",
+    "@ray-js/build-plugin-ray": "^1.3.0-beta.3",
+    "@ray-js/build-plugin-router": "^1.3.0-beta.3",
+    "@ray-js/builder-component": "^1.3.0-beta.3",
+    "@ray-js/builder-mp": "^1.3.0-beta.3",
+    "@ray-js/builder-web": "^1.3.0-beta.3",
+    "@ray-js/shared": "^1.3.0-beta.3",
+    "@ray-js/types": "^1.3.0-beta.3",
     "colors": "1.4.0",
     "commander": "^8.2.0",
     "webpack-chain": "^6.5.1"
@@ -41,6 +41,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "067ce2e382196cd995ebc4774fc5e977ac21115c",
+  "gitHead": "be72a5dad6214ebf9c6653df02956374c735c98e",
   "repository": {}
 }