@ray-js/cli 0.7.1-beta-1 → 0.7.3-beta-1

package/bin/ray-build.js

@@ -15,7 +15,6 @@ program
   .option('--type <type>', '构建类型 eg: app | component', 'app')
   .option('--transform-mode <mode>', '组件转换类型 eg: auto | pure', 'pure')
   .option('--debug', '开启运行时日志', false)
-  .option('--max-workers <workers>', 'RN打包的max-workers')
   .action(function (cwd = '', options) {
     log.verbose('cli', options)
     if (options.target === 'tuya') {
@@ -26,10 +25,11 @@ program
       NODE_ENV: 'production',
       PLATFORM: options.target,
       REMAX_PLATFORM: options.target,
-      REMAX_DEBUG: JSON.stringify(options.debug),
-      TUYA_DEVTOOLS: JSON.stringify('false'),
+      REMAX_DEBUG: options.debug,
     })
-    const finalCwd = path.join(process.cwd(), cwd)
-    require('../lib/build').default({ cwd: finalCwd, ...options, mode: process.env.NODE_ENV })
+    cwd = path.join(process.cwd(), cwd)
+    const devtools = process.env.TUYA_DEVTOOLS !== undefined
+    const mode = process.env.NODE_ENV
+    require('../lib/build').default({ ...options, cwd, mode, devtools })
   })
   .parse(process.argv)

package/bin/ray-start.js

@@ -26,10 +26,11 @@ program
       NODE_ENV: 'development',
       PLATFORM: options.target,
       REMAX_PLATFORM: options.target, // @ray-core/ray/one 依赖此环境变量
-      REMAX_DEBUG: JSON.stringify(options.debug), // ray 运行时日志
-      TUYA_DEVTOOLS: JSON.stringify('false'),
+      REMAX_DEBUG: options.debug, // ray 运行时日志
     })
-    const finalCwd = path.join(process.cwd(), cwd)
-    require('../lib/start').default({ cwd: finalCwd, ...options, mode: process.env.NODE_ENV })
+    cwd = path.join(process.cwd(), cwd)
+    const devtools = process.env.TUYA_DEVTOOLS !== undefined
+    const mode = process.env.NODE_ENV
+    require('../lib/start').default({ ...options, cwd, mode, devtools })
   })
   .parse(process.argv)

package/bin/register-env.js

@@ -1,5 +1,7 @@
 module.exports = function (opts = {}) {
   Object.keys(opts).forEach((key) => {
-    process.env[key] = process.env[key] || opts[key]
+    if (opts[key] !== false) {
+      process.env[key] = process.env[key] || opts[key]
+    }
   })
 }

package/lib/API.d.ts

@@ -1,4 +1,3 @@
-import WebpackChain from 'webpack-chain';
 import { API as IAPI, CliOptions, Plugin, PluginMethods, RayConfig } from '@ray-js/types';
 /**
  * 命令行运行容器上下文
@@ -9,11 +8,6 @@ export default class API implements IAPI {
     options: CliOptions;
     config: RayConfig;
     constructor(options: CliOptions);
-    /**
-     * 将 ray.config 作用于 webpack config
-     * @param config - webpack config
-     */
-    configIntoWebpackConfig(config: WebpackChain): void;
     /**
      * 在当前 cwd 路径下搜索 js ts 文件
      * @param fileName - 文件名不包含后缀
@@ -30,8 +24,7 @@ export default class API implements IAPI {
      * 加载 ray.config.js 文件
      */
     loadConfig(): void;
-    loadBuiltinPlugins(): void;
-    loadPlugin(pkg: string): Plugin;
+    loadPlugin(): void;
     addPlugin(plugin: Plugin): void;
     callPluginMethod(method: PluginMethods, ...args: any[]): void;
 }

package/lib/API.js

@@ -5,6 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const shared_1 = require("@ray-js/shared");
+function requirePlugin(pkg) {
+    const pluginMain = require.resolve(pkg);
+    const plugin = (0, shared_1.requireJSFile)(pluginMain);
+    return plugin;
+}
 /**
  * 命令行运行容器上下文
  * 集成插件流程
@@ -15,17 +20,6 @@ class API {
         this.plugins = [];
         this.config = {};
     }
-    /**
-     * 将 ray.config 作用于 webpack config
-     * @param config - webpack config
-     */
-    configIntoWebpackConfig(config) {
-        if (this.config.resolveAlias) {
-            Object.entries(this.config.resolveAlias).forEach(([key, value]) => {
-                config.resolve.alias.set(key, value);
-            });
-        }
-    }
     /**
      * 在当前 cwd 路径下搜索 js ts 文件
      * @param fileName - 文件名不包含后缀
@@ -60,23 +54,24 @@ class API {
         this.config = (0, shared_1.requireJSFile)(rayConfigFile);
         shared_1.log.verbose('cli:API', 'ray.config', this.config);
     }
-    loadBuiltinPlugins() {
-        ;
-        ['@ray-js/build-plugin-router', '@ray-js/build-plugin-ray'].forEach((pluginName) => {
-            const p = this.loadPlugin(pluginName);
+    loadPlugin() {
+        this.config.plugins
+            .concat(['@ray-js/build-plugin-router', '@ray-js/build-plugin-ray'])
+            .forEach((p) => {
             this.addPlugin(p);
         });
     }
-    loadPlugin(pkg) {
-        const pluginMain = require.resolve(pkg);
-        const plugin = (0, shared_1.requireJSFile)(pluginMain);
-        return plugin;
-    }
     addPlugin(plugin) {
-        const pluginIns = plugin(this);
-        const exist = this.plugins.some((p) => p.name === pluginIns.name);
+        if (typeof plugin === 'string') {
+            plugin = requirePlugin(plugin);
+        }
+        const _plugin = typeof plugin === 'function' ? plugin(this) : plugin;
+        if (!_plugin) {
+            return;
+        }
+        const exist = this.plugins.some((p) => p.name === _plugin.name);
         if (!exist) {
-            this.plugins.push(pluginIns);
+            this.plugins.push(_plugin);
         }
     }
     callPluginMethod(method, ...args) {

package/lib/run-builder.js

@@ -30,10 +30,14 @@ const API_1 = __importDefault(require("./API"));
 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, ["type"]);
+        const { type = 'app' } = options, opts = __rest(options
+        // 加载ray.config.ts 或 ray.config.js
+        , ["type"]);
+        // 加载ray.config.ts 或 ray.config.js
         api.loadConfig();
-        // 加载内置插件
-        api.loadBuiltinPlugins();
+        // 加载插件，插件可以是插件的模块路径
+        api.loadPlugin();
+        // 初始化插件，即执行插件plugin.setup()方法
         api.callPluginMethod('setup');
         const ctx = { api };
         switch (opts.target) {

package/package.json

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