@ray-js/cli 1.6.0-beta.8 → 1.6.0

package/bin/ray-build.js

@@ -14,19 +14,19 @@ program
   .option('--sourcemap', '启动 sourcemap', true)
   .option('--no-sourcemap', '禁用 sourcemap')
   .option('-t --target <target>', '目标平台')
-  .option('-a --analyze', '开启 analyze 构建分析')
+  .option('-a --analyze', '开启 analyze 分析')
   .option('--drop', '移除 console debugger 等', false)
-  .option('--type <type>', '构建类型 eg: app | component | material', 'app')
+  .option('--type <type>', '构建类型 eg: app | component', 'app')
   .option('--transform-mode <mode>', '组件转换类型 eg: auto | pure', 'pure')
   .option(
     '--bundler <type>',
-    '1.4.x 开始默认使用 esbuild 极速构建(公测阶段), 如需降级设置为 webpack',
+    '默认使用 esbuild 极速构建(公测阶段), 如需降级设置为 webpack',
     'esbuild'
   )
   .option('--debug [debug]', '开启运行时日志', (v) => {
     return JSON.parse(v === '1' || v === 'true')
   })
-  .action(function (cwd = '', options) {
+  .action((cwd = '', options) => {
     log.verbose('cli', options)
     if (options.target === 'tuya') {
       log.verbose('cli', 'change target tuya -> thing')
@@ -50,7 +50,8 @@ program
     })
     cwd = path.resolve(process.cwd(), cwd)
     const devtools = process.env.TUYA_DEVTOOLS !== undefined
+    const analyze = !!process.env.CI_BUILD_ANALYZE || options.analyze
     const mode = process.env.NODE_ENV
-    require('../lib/build').default({ ...options, cwd, mode, devtools })
+    require('../lib/build').default({ ...options, cwd, mode, devtools, analyze })
   })
   .parse(process.argv)

package/bin/ray-start.js

@@ -14,13 +14,13 @@ program
   .option('--sourcemap', '启动 sourcemap', true)
   .option('--no-sourcemap', '禁用 sourcemap')
   .option('-t --target <target>', '目标平台')
-  .option('-a --analyze', '开启 analyze 构建分析')
+  .option('-a --analyze', '开启 analyze 分析')
   .option('--drop', '移除 console debugger 等', false)
-  .option('--type <type>', '构建类型 eg: app | component | material', 'app')
+  .option('--type <type>', '构建类型 eg: app | component', 'app')
   .option('--transform-mode <mode>', '组件转换类型 eg: auto | pure', 'pure')
   .option(
     '--bundler <type>',
-    '1.4.x 开始默认使用 esbuild 极速构建(公测阶段), 如需降级设置为 webpack',
+    '默认使用 esbuild 极速构建(公测阶段), 如需降级设置为 webpack',
     'esbuild'
   )
   .option('--debug [debug]', '开启运行时日志', (v) => {

package/lib/build.js

@@ -11,35 +11,29 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = build;
 const run_builder_1 = require("./run-builder");
 function build(options) {
     const { type = 'app' } = options, restOptions = __rest(options, ["type"]);
-    if (type === 'material') {
-        console.warn('物料暂不支持构建');
-    }
-    else if (type === 'app') {
-        if (restOptions.target === 'thing' && restOptions.bundler === 'esbuild') {
-            // 使用 raypack 进行构建
-            const { build } = require('@ray-js/raypack');
-            const opts = {
-                cwd: restOptions.cwd,
-                watch: false,
-                output: restOptions.output || 'dist/tuya',
-                minify: restOptions.mini,
-                autoCssModules: false,
-                sourcemap: restOptions.sourcemap,
-            };
-            build(Object.assign({ sourceDir: restOptions.source || 'src' }, opts)).catch((error) => {
-                console.log(error);
-                process.exit(101);
-            });
-        }
-        else {
-            (0, run_builder_1.runBuilder)(Object.assign(Object.assign({}, options), { watch: false })).catch((error) => {
-                console.log(error);
-                process.exit(1);
-            });
-        }
+    if (restOptions.target === 'thing' && restOptions.bundler === 'esbuild') {
+        process.chdir(restOptions.cwd);
+        // 使用 raypack 进行构建
+        const { build } = require('@ray-js/raypack');
+        const opts = {
+            cwd: restOptions.cwd,
+            watch: false,
+            sourceDir: restOptions.source || 'src',
+            output: restOptions.output || 'dist/tuya',
+            minify: restOptions.mini,
+            autoCssModules: false,
+            sourcemap: restOptions.sourcemap,
+            drop: restOptions.drop,
+            analyze: restOptions.analyze,
+        };
+        build(opts).catch((error) => {
+            console.log(error);
+            process.exit(101);
+        });
     }
     else if (type === 'component') {
         const { build: buildComponent } = require('@ray-js/builder-component');
@@ -48,5 +42,10 @@ function build(options) {
             process.exit(1);
         });
     }
+    else {
+        (0, run_builder_1.runBuilder)(Object.assign(Object.assign({}, options), { watch: false })).catch((error) => {
+            console.log(error);
+            process.exit(1);
+        });
+    }
 }
-exports.default = build;

package/lib/run-builder.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runBuilder = void 0;
+exports.runBuilder = runBuilder;
 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");
@@ -85,4 +85,3 @@ function runBuilder(options) {
         }
     });
 }
-exports.runBuilder = runBuilder;

package/lib/start.js

@@ -11,14 +11,17 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = start;
 const run_builder_1 = require("./run-builder");
 function start(options) {
     const { type = 'app' } = options, restOptions = __rest(options, ["type"]);
-    if (type === 'material') {
+    if (restOptions.target === 'thing' && restOptions.bundler === 'esbuild') {
+        // 使用 raypack 进行构建
         const { build } = require('@ray-js/raypack');
         const opts = {
             cwd: restOptions.cwd,
             watch: true,
+            sourceDir: restOptions.source || 'src',
             output: restOptions.output || 'dist/tuya',
             minify: restOptions.mini,
             autoCssModules: false,
@@ -26,37 +29,11 @@ function start(options) {
             drop: restOptions.drop,
             analyze: restOptions.analyze,
         };
-        build(Object.assign({ sourceDir: restOptions.source || 'src', type: 'material' }, opts)).catch((error) => {
+        build(opts).catch((error) => {
             console.log(error);
-            process.exit(1011);
+            process.exit(101);
         });
     }
-    else if (type === 'app') {
-        if (restOptions.target === 'thing' && restOptions.bundler === 'esbuild') {
-            // 使用 raypack 进行构建
-            const { build } = require('@ray-js/raypack');
-            const opts = {
-                cwd: restOptions.cwd,
-                watch: true,
-                output: restOptions.output || 'dist/tuya',
-                minify: restOptions.mini,
-                autoCssModules: false,
-                sourcemap: restOptions.sourcemap,
-                drop: restOptions.drop,
-                analyze: restOptions.analyze,
-            };
-            build(Object.assign({ sourceDir: restOptions.source || 'src' }, opts)).catch((error) => {
-                console.log(error);
-                process.exit(101);
-            });
-        }
-        else {
-            (0, run_builder_1.runBuilder)(Object.assign(Object.assign({}, options), { watch: true })).catch((error) => {
-                console.log(error);
-                process.exit(1);
-            });
-        }
-    }
     else if (type === 'component') {
         const { build: buildComponent } = require('@ray-js/builder-component');
         buildComponent(Object.assign(Object.assign({}, restOptions), { watch: true })).catch((error) => {
@@ -64,5 +41,10 @@ function start(options) {
             process.exit(1);
         });
     }
+    else {
+        (0, run_builder_1.runBuilder)(Object.assign(Object.assign({}, options), { watch: true })).catch((error) => {
+            console.log(error);
+            process.exit(1);
+        });
+    }
 }
-exports.default = start;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/cli",
-  "version": "1.6.0-beta.8",
+  "version": "1.6.0",
   "description": "Ray cli",
   "keywords": [
     "ray"
@@ -27,24 +27,24 @@
     "watch": "tsc -p ./tsconfig.build.json --watch"
   },
   "dependencies": {
-    "@ray-js/build-plugin-ray": "^1.6.0-beta.8",
-    "@ray-js/build-plugin-router": "^1.6.0-beta.8",
-    "@ray-js/builder-component": "^1.6.0-beta.8",
-    "@ray-js/builder-mp": "^1.6.0-beta.8",
-    "@ray-js/builder-web": "^1.6.0-beta.8",
-    "@ray-js/raypack": "^1.6.0-beta.8",
-    "@ray-js/shared": "^1.6.0-beta.8",
-    "@ray-js/types": "^1.6.0-beta.8",
+    "@ray-js/build-plugin-ray": "1.6.0",
+    "@ray-js/build-plugin-router": "1.6.0",
+    "@ray-js/builder-component": "1.6.0",
+    "@ray-js/builder-mp": "1.6.0",
+    "@ray-js/builder-web": "1.6.0",
+    "@ray-js/raypack": "1.6.0",
+    "@ray-js/shared": "1.6.0",
+    "@ray-js/types": "1.6.0",
     "colors": "1.4.0",
     "commander": "^8.3.0",
     "webpack-chain": "^6.5.1"
   },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "b1d4118961bba4f3f2a889ec5bb9444d165df0dc",
+  "gitHead": "b5b10947abcec036f88b73320491fb4e0a4cbe52",
   "devDependencies": {
-    "typescript": "^5.4.5"
+    "typescript": "^5.7.2"
   }
 }