@ray-js/cli 1.6.26 → 1.6.27

package/bin/ray-build.js

@@ -54,6 +54,6 @@ program
     const analyze = !!process.env.CI_BUILD_ANALYZE || options.analyze
     const mode = process.env.NODE_ENV
     process.chdir(cwd)
-    require('../lib').build({ ...options, cwd, mode, devtools, analyze })
+    require('../lib/build').default({ ...options, cwd, mode, devtools, analyze })
   })
   .parse(process.argv)

package/bin/ray-start.js

@@ -53,6 +53,6 @@ program
     const devtools = process.env.TUYA_DEVTOOLS !== undefined
     const mode = process.env.NODE_ENV
     process.chdir(cwd)
-    require('../lib').start({ ...options, cwd, mode, devtools })
+    require('../lib/start').default({ ...options, cwd, mode, devtools })
   })
   .parse(process.argv)

package/lib/build.js

@@ -0,0 +1 @@
+var F=Object.create;var p=Object.defineProperty,B=Object.defineProperties,D=Object.getOwnPropertyDescriptor,S=Object.getOwnPropertyDescriptors,q=Object.getOwnPropertyNames,g=Object.getOwnPropertySymbols,J=Object.getPrototypeOf,y=Object.prototype.hasOwnProperty,P=Object.prototype.propertyIsEnumerable;var w=(s,i,t)=>i in s?p(s,i,{enumerable:!0,configurable:!0,writable:!0,value:t}):s[i]=t,h=(s,i)=>{for(var t in i||(i={}))y.call(i,t)&&w(s,t,i[t]);if(g)for(var t of g(i))P.call(i,t)&&w(s,t,i[t]);return s},m=(s,i)=>B(s,S(i));var C=(s,i)=>{var t={};for(var e in s)y.call(s,e)&&i.indexOf(e)<0&&(t[e]=s[e]);if(s!=null&&g)for(var e of g(s))i.indexOf(e)<0&&P.call(s,e)&&(t[e]=s[e]);return t};var U=(s,i)=>{for(var t in i)p(s,t,{get:i[t],enumerable:!0})},O=(s,i,t,e)=>{if(i&&typeof i=="object"||typeof i=="function")for(let o of q(i))!y.call(s,o)&&o!==t&&p(s,o,{get:()=>i[o],enumerable:!(e=D(i,o))||e.enumerable});return s};var v=(s,i,t)=>(t=s!=null?F(J(s)):{},O(i||!s||!s.__esModule?p(t,"default",{value:s,enumerable:!0}):t,s)),_=s=>O(p({},"__esModule",{value:!0}),s);var j=(s,i,t)=>new Promise((e,o)=>{var a=r=>{try{c(t.next(r))}catch(u){o(u)}},l=r=>{try{c(t.throw(r))}catch(u){o(u)}},c=r=>r.done?e(r.value):Promise.resolve(r.value).then(a,l);c((t=t.apply(s,i)).next())});var Y={};U(Y,{default:()=>R});module.exports=_(Y);var A=require("@ray-js/builder-mp"),M=require("@ray-js/builder-web"),d=require("@ray-js/shared"),E=v(require("colors"));var x=v(require("path")),n=require("@ray-js/shared");function k(s){let i=require.resolve(s);return(0,n.requireJSFile)(i)}var f=class{constructor(i){this.options=i,this.plugins=[],this.config={}}searchJSFile(i){return(0,n.searchJSFile)(i,{cwd:this.options.cwd,extensions:[".tsx",".ts",".jsx",".js"]})}requireJSFile(i,t){return(0,n.requireJSFile)(i,t)}writeFile(i,t){let e=x.default.join(this.options.cwd,i);(0,n.writeFileSync)(e,t)}loadConfig(){let i=this.searchJSFile("ray.config");if(!i)throw n.log.error("cli","Missing ray config file."),new Error("Must has ray config.");this.config=(0,n.requireJSFile)(i),(!this.config.plugins||!Array.isArray(this.config.plugins))&&(this.config.plugins=[]),n.log.verbose("cli:API","ray.config",this.config)}loadPlugin(){this.config.plugins.concat(["@ray-js/build-plugin-router","@ray-js/build-plugin-ray","@ray-js/ray/plugins/i18n-plugin"]).forEach(i=>{this.addPlugin(i)})}addPlugin(i){typeof i=="string"&&(i.startsWith("ray")&&(i=`@ray-js/${i}`),i=k(i));let t=typeof i=="function"?i(this):i;if(!t)return;this.plugins.some(o=>o.name&&t.name&&o.name===t.name)||this.plugins.push(t)}callPluginMethod(i,...t){n.log.verbose("cli:api","callPluginMethod:",i),this.plugins.forEach(e=>{typeof e[i]=="function"&&e[i].apply(e,t)})}};E.default.enable();var G={cwd:process.cwd(),source:"src",mode:"development",watch:!1,target:"thing",mini:!1,analyze:!1,devtools:!1,debug:!1,output:"dist"};function I(s){return j(this,null,function*(){let i=new f(s);i.loadConfig();let t=Object.assign({},G,i.config,s),e=process.env.RAY_DEBUG===void 0;s.debug===void 0&&(e?typeof i.config.debug=="boolean"&&(process.env.RAY_DEBUG=JSON.stringify(i.config.debug),process.env.REMAX_DEBUG=process.env.RAY_DEBUG):t.debug=process.env.RAY_DEBUG==="true");let{cwd:o,target:a,output:l,onTargetDir:c}=t,r=a==="thing"?"tuya":a,u=(0,d.resolvePath)(typeof c=="function"?[c(l,r)]:[l,r],{cwd:o});t.output=u,i.options=t,d.log.verbose("ray-builder","final options:",t),i.loadPlugin(),i.callPluginMethod("setup");let b={api:i};switch(t.target){case"tuya":case"wechat":case"thing":yield(0,A.build)(t,b);break;case"web":yield(0,M.build)(t,b);break;default:throw new Error(`Target '${t.target}' is not supported.'`)}})}function R(s){let e=s,{type:i="app"}=e,t=C(e,["type"]);if(t.target==="thing"&&t.bundler==="esbuild"){process.chdir(t.cwd);let{build:o}=require("@ray-js/raypack"),a={cwd:t.cwd,watch:!1,sourceDir:t.source||"src",output:t.output||"dist/tuya",minify:t.mini,autoCssModules:!1,sourcemap:t.sourcemap,drop:t.drop,analyze:t.analyze};o(a).catch(l=>{console.log(l),process.exit(101)})}else if(i==="component"){let{build:o}=require("@ray-js/builder-component");o(m(h({},t),{watch:!1})).catch(a=>{console.log(a),process.exit(1)})}else I(m(h({},s),{watch:!1})).catch(o=>{console.log(o),process.exit(1)})}

package/lib/start.js

@@ -0,0 +1 @@
+var F=Object.create;var p=Object.defineProperty,B=Object.defineProperties,D=Object.getOwnPropertyDescriptor,S=Object.getOwnPropertyDescriptors,q=Object.getOwnPropertyNames,g=Object.getOwnPropertySymbols,J=Object.getPrototypeOf,h=Object.prototype.hasOwnProperty,P=Object.prototype.propertyIsEnumerable;var w=(s,i,t)=>i in s?p(s,i,{enumerable:!0,configurable:!0,writable:!0,value:t}):s[i]=t,y=(s,i)=>{for(var t in i||(i={}))h.call(i,t)&&w(s,t,i[t]);if(g)for(var t of g(i))P.call(i,t)&&w(s,t,i[t]);return s},m=(s,i)=>B(s,S(i));var C=(s,i)=>{var t={};for(var o in s)h.call(s,o)&&i.indexOf(o)<0&&(t[o]=s[o]);if(s!=null&&g)for(var o of g(s))i.indexOf(o)<0&&P.call(s,o)&&(t[o]=s[o]);return t};var U=(s,i)=>{for(var t in i)p(s,t,{get:i[t],enumerable:!0})},O=(s,i,t,o)=>{if(i&&typeof i=="object"||typeof i=="function")for(let e of q(i))!h.call(s,e)&&e!==t&&p(s,e,{get:()=>i[e],enumerable:!(o=D(i,e))||o.enumerable});return s};var v=(s,i,t)=>(t=s!=null?F(J(s)):{},O(i||!s||!s.__esModule?p(t,"default",{value:s,enumerable:!0}):t,s)),_=s=>O(p({},"__esModule",{value:!0}),s);var x=(s,i,t)=>new Promise((o,e)=>{var a=r=>{try{l(t.next(r))}catch(u){e(u)}},c=r=>{try{l(t.throw(r))}catch(u){e(u)}},l=r=>r.done?o(r.value):Promise.resolve(r.value).then(a,c);l((t=t.apply(s,i)).next())});var Y={};U(Y,{default:()=>R});module.exports=_(Y);var A=require("@ray-js/builder-mp"),M=require("@ray-js/builder-web"),d=require("@ray-js/shared"),E=v(require("colors"));var j=v(require("path")),n=require("@ray-js/shared");function k(s){let i=require.resolve(s);return(0,n.requireJSFile)(i)}var f=class{constructor(i){this.options=i,this.plugins=[],this.config={}}searchJSFile(i){return(0,n.searchJSFile)(i,{cwd:this.options.cwd,extensions:[".tsx",".ts",".jsx",".js"]})}requireJSFile(i,t){return(0,n.requireJSFile)(i,t)}writeFile(i,t){let o=j.default.join(this.options.cwd,i);(0,n.writeFileSync)(o,t)}loadConfig(){let i=this.searchJSFile("ray.config");if(!i)throw n.log.error("cli","Missing ray config file."),new Error("Must has ray config.");this.config=(0,n.requireJSFile)(i),(!this.config.plugins||!Array.isArray(this.config.plugins))&&(this.config.plugins=[]),n.log.verbose("cli:API","ray.config",this.config)}loadPlugin(){this.config.plugins.concat(["@ray-js/build-plugin-router","@ray-js/build-plugin-ray","@ray-js/ray/plugins/i18n-plugin"]).forEach(i=>{this.addPlugin(i)})}addPlugin(i){typeof i=="string"&&(i.startsWith("ray")&&(i=`@ray-js/${i}`),i=k(i));let t=typeof i=="function"?i(this):i;if(!t)return;this.plugins.some(e=>e.name&&t.name&&e.name===t.name)||this.plugins.push(t)}callPluginMethod(i,...t){n.log.verbose("cli:api","callPluginMethod:",i),this.plugins.forEach(o=>{typeof o[i]=="function"&&o[i].apply(o,t)})}};E.default.enable();var G={cwd:process.cwd(),source:"src",mode:"development",watch:!1,target:"thing",mini:!1,analyze:!1,devtools:!1,debug:!1,output:"dist"};function I(s){return x(this,null,function*(){let i=new f(s);i.loadConfig();let t=Object.assign({},G,i.config,s),o=process.env.RAY_DEBUG===void 0;s.debug===void 0&&(o?typeof i.config.debug=="boolean"&&(process.env.RAY_DEBUG=JSON.stringify(i.config.debug),process.env.REMAX_DEBUG=process.env.RAY_DEBUG):t.debug=process.env.RAY_DEBUG==="true");let{cwd:e,target:a,output:c,onTargetDir:l}=t,r=a==="thing"?"tuya":a,u=(0,d.resolvePath)(typeof l=="function"?[l(c,r)]:[c,r],{cwd:e});t.output=u,i.options=t,d.log.verbose("ray-builder","final options:",t),i.loadPlugin(),i.callPluginMethod("setup");let b={api:i};switch(t.target){case"tuya":case"wechat":case"thing":yield(0,A.build)(t,b);break;case"web":yield(0,M.build)(t,b);break;default:throw new Error(`Target '${t.target}' is not supported.'`)}})}function R(s){let o=s,{type:i="app"}=o,t=C(o,["type"]);if(t.target==="thing"&&t.bundler==="esbuild"){let{build:e}=require("@ray-js/raypack"),a={cwd:t.cwd,watch:!0,sourceDir:t.source||"src",output:t.output||"dist/tuya",minify:t.mini,autoCssModules:!1,sourcemap:t.sourcemap,drop:t.drop,analyze:t.analyze};e(a).catch(c=>{console.log(c),process.exit(101)})}else if(i==="component"){let{build:e}=require("@ray-js/builder-component");e(m(y({},t),{watch:!0})).catch(a=>{console.log(a),process.exit(1)})}else I(m(y({},s),{watch:!0})).catch(e=>{console.log(e),process.exit(1)})}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/cli",
-  "version": "1.6.26",
+  "version": "1.6.27",
   "description": "Ray cli",
   "keywords": [
     "ray"
@@ -23,19 +23,19 @@
     "bin"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --minify --dts --format cjs --out-dir lib --tsconfig tsconfig.build.json",
+    "build": "tsup src/build.ts src/start.ts  --minify --format cjs --out-dir lib --tsconfig tsconfig.build.json",
     "clean": "rm -rf lib",
     "watch": "npm run build -- --watch"
   },
   "dependencies": {
-    "@ray-js/build-plugin-ray": "1.6.26",
-    "@ray-js/build-plugin-router": "1.6.26",
-    "@ray-js/builder-component": "1.6.26",
-    "@ray-js/builder-mp": "1.6.26",
-    "@ray-js/builder-web": "1.6.26",
-    "@ray-js/raypack": "1.6.26",
-    "@ray-js/shared": "1.6.26",
-    "@ray-js/types": "1.6.26",
+    "@ray-js/build-plugin-ray": "1.6.27",
+    "@ray-js/build-plugin-router": "1.6.27",
+    "@ray-js/builder-component": "1.6.27",
+    "@ray-js/builder-mp": "1.6.27",
+    "@ray-js/builder-web": "1.6.27",
+    "@ray-js/raypack": "1.6.27",
+    "@ray-js/shared": "1.6.27",
+    "@ray-js/types": "1.6.27",
     "colors": "1.4.0",
     "commander": "^8.3.0",
     "webpack-chain": "^6.5.1"
@@ -44,7 +44,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "d842231dd15303495069483a809a71dbc640ebaf",
+  "gitHead": "b18090b1c4c2db59972453985c9265ef56236eb2",
   "devDependencies": {
     "@swc/cli": "^0.6.0",
     "@swc/core": "^1.11.11",

package/lib/index.d.ts

@@ -1,37 +0,0 @@
-import { API as API$1, CliOptions, RayConfig, Plugin, PluginMethods } from '@ray-js/types';
-
-/**
- * 命令行运行容器上下文
- * 集成插件流程
- */
-declare class API implements API$1 {
-    private plugins;
-    options: CliOptions;
-    config: RayConfig;
-    constructor(options: CliOptions);
-    /**
-     * 在当前 cwd 路径下搜索 js ts 文件
-     * @param fileName - 文件名不包含后缀
-     */
-    searchJSFile(fileName: string): string;
-    requireJSFile(file: string, specifier: string): any;
-    /**
-     * 在当前 cwd 路径下写入文件
-     * @param fileBase - 文件地址
-     * @param context - 文件内容
-     */
-    writeFile(fileBase: string, context: string): void;
-    /**
-     * 加载 ray.config.js 文件
-     */
-    loadConfig(): void;
-    loadPlugin(): void;
-    addPlugin(plugin: Plugin): void;
-    callPluginMethod(method: PluginMethods, ...args: any[]): void;
-}
-
-declare function build(options: CliOptions): void;
-
-declare function start(options: CliOptions): void;
-
-export { API, build, start };

package/lib/index.js

@@ -1 +0,0 @@
-var q=Object.create;var d=Object.defineProperty,B=Object.defineProperties,D=Object.getOwnPropertyDescriptor,F=Object.getOwnPropertyDescriptors,S=Object.getOwnPropertyNames,y=Object.getOwnPropertySymbols,J=Object.getPrototypeOf,w=Object.prototype.hasOwnProperty,j=Object.prototype.propertyIsEnumerable;var O=(o,i,t)=>i in o?d(o,i,{enumerable:!0,configurable:!0,writable:!0,value:t}):o[i]=t,p=(o,i)=>{for(var t in i||(i={}))w.call(i,t)&&O(o,t,i[t]);if(y)for(var t of y(i))j.call(i,t)&&O(o,t,i[t]);return o},f=(o,i)=>B(o,F(i));var m=(o,i)=>{var t={};for(var s in o)w.call(o,s)&&i.indexOf(s)<0&&(t[s]=o[s]);if(o!=null&&y)for(var s of y(o))i.indexOf(s)<0&&j.call(o,s)&&(t[s]=o[s]);return t};var U=(o,i)=>{for(var t in i)d(o,t,{get:i[t],enumerable:!0})},v=(o,i,t,s)=>{if(i&&typeof i=="object"||typeof i=="function")for(let e of S(i))!w.call(o,e)&&e!==t&&d(o,e,{get:()=>i[e],enumerable:!(s=D(i,e))||s.enumerable});return o};var A=(o,i,t)=>(t=o!=null?q(J(o)):{},v(i||!o||!o.__esModule?d(t,"default",{value:o,enumerable:!0}):t,o)),_=o=>v(d({},"__esModule",{value:!0}),o);var M=(o,i,t)=>new Promise((s,e)=>{var r=a=>{try{u(t.next(a))}catch(g){e(g)}},c=a=>{try{u(t.throw(a))}catch(g){e(g)}},u=a=>a.done?s(a.value):Promise.resolve(a.value).then(r,c);u((t=t.apply(o,i)).next())});var Y={};U(Y,{API:()=>l,build:()=>P,start:()=>C});module.exports=_(Y);var I=A(require("path")),n=require("@ray-js/shared");function z(o){let i=require.resolve(o);return(0,n.requireJSFile)(i)}var l=class{constructor(i){this.options=i,this.plugins=[],this.config={}}searchJSFile(i){return(0,n.searchJSFile)(i,{cwd:this.options.cwd,extensions:[".tsx",".ts",".jsx",".js"]})}requireJSFile(i,t){return(0,n.requireJSFile)(i,t)}writeFile(i,t){let s=I.default.join(this.options.cwd,i);(0,n.writeFileSync)(s,t)}loadConfig(){let i=this.searchJSFile("ray.config");if(!i)throw n.log.error("cli","Missing ray config file."),new Error("Must has ray config.");this.config=(0,n.requireJSFile)(i),(!this.config.plugins||!Array.isArray(this.config.plugins))&&(this.config.plugins=[]),n.log.verbose("cli:API","ray.config",this.config)}loadPlugin(){this.config.plugins.concat(["@ray-js/build-plugin-router","@ray-js/build-plugin-ray","@ray-js/ray/plugins/i18n-plugin"]).forEach(i=>{this.addPlugin(i)})}addPlugin(i){typeof i=="string"&&(i.startsWith("ray")&&(i=`@ray-js/${i}`),i=z(i));let t=typeof i=="function"?i(this):i;if(!t)return;this.plugins.some(e=>e.name&&t.name&&e.name===t.name)||this.plugins.push(t)}callPluginMethod(i,...t){n.log.verbose("cli:api","callPluginMethod:",i),this.plugins.forEach(s=>{typeof s[i]=="function"&&s[i].apply(s,t)})}};var R=require("@ray-js/builder-mp"),E=require("@ray-js/builder-web"),h=require("@ray-js/shared"),k=A(require("colors"));k.default.enable();var G={cwd:process.cwd(),source:"src",mode:"development",watch:!1,target:"thing",mini:!1,analyze:!1,devtools:!1,debug:!1,output:"dist"};function b(o){return M(this,null,function*(){let i=new l(o);i.loadConfig();let t=Object.assign({},G,i.config,o),s=process.env.RAY_DEBUG===void 0;o.debug===void 0&&(s?typeof i.config.debug=="boolean"&&(process.env.RAY_DEBUG=JSON.stringify(i.config.debug),process.env.REMAX_DEBUG=process.env.RAY_DEBUG):t.debug=process.env.RAY_DEBUG==="true");let{cwd:e,target:r,output:c,onTargetDir:u}=t,a=r==="thing"?"tuya":r,g=(0,h.resolvePath)(typeof u=="function"?[u(c,a)]:[c,a],{cwd:e});t.output=g,i.options=t,h.log.verbose("ray-builder","final options:",t),i.loadPlugin(),i.callPluginMethod("setup");let x={api:i};switch(t.target){case"tuya":case"wechat":case"thing":yield(0,R.build)(t,x);break;case"web":yield(0,E.build)(t,x);break;default:throw new Error(`Target '${t.target}' is not supported.'`)}})}function P(o){let s=o,{type:i="app"}=s,t=m(s,["type"]);if(t.target==="thing"&&t.bundler==="esbuild"){process.chdir(t.cwd);let{build:e}=require("@ray-js/raypack"),r={cwd:t.cwd,watch:!1,sourceDir:t.source||"src",output:t.output||"dist/tuya",minify:t.mini,autoCssModules:!1,sourcemap:t.sourcemap,drop:t.drop,analyze:t.analyze};e(r).catch(c=>{console.log(c),process.exit(101)})}else if(i==="component"){let{build:e}=require("@ray-js/builder-component");e(f(p({},t),{watch:!1})).catch(r=>{console.log(r),process.exit(1)})}else b(f(p({},o),{watch:!1})).catch(e=>{console.log(e),process.exit(1)})}function C(o){let s=o,{type:i="app"}=s,t=m(s,["type"]);if(t.target==="thing"&&t.bundler==="esbuild"){let{build:e}=require("@ray-js/raypack"),r={cwd:t.cwd,watch:!0,sourceDir:t.source||"src",output:t.output||"dist/tuya",minify:t.mini,autoCssModules:!1,sourcemap:t.sourcemap,drop:t.drop,analyze:t.analyze};e(r).catch(c=>{console.log(c),process.exit(101)})}else if(i==="component"){let{build:e}=require("@ray-js/builder-component");e(f(p({},t),{watch:!0})).catch(r=>{console.log(r),process.exit(1)})}else b(f(p({},o),{watch:!0})).catch(e=>{console.log(e),process.exit(1)})}0&&(module.exports={API,build,start});