@doracli/dora 0.0.12 → 0.0.17

package/bin/entry-fun.mjs

@@ -1,4 +1,2 @@
 #! /usr/bin/env node
-import{createProgram as r,dealOptions as t}from"@doracli/commander";import{HtmlAssetManager as e,configCtxWorkflow as n,ConfigCtx as o,collectBaseConfigMw as i,collectPackageJsonMw as a,collectTsconfigJsonMw as c,collectDoraConfigMw as u,collectCdnConfigMw as s,wholeDoraConfigMw as f,wholeDoraInoutMw as l,clearMw as p,cLog as m,createEnvParams as v,picocolors as d}from"@doracli/helper";import{getServerMutipleCtxList as y,childCommands as b}from"@doracli/webpack-react";import h from"@dorabag/open-browser";import{portGetter as g}from"@dorabag/srv-tool";import{conditionalBodyParser as w,proxyMiddleware as j,fileServerMiddleware as O,createServer as P,loggerMiddleware as S}from"@doracli/express";import{ServerWorkflow as C,getServerCtx as k}from"@doracli/express-server";import{join as D}from"path";import{htmlRouteGeneratorMw as x,collectAssetUrls as A,Compiler as E}from"@doracli/webpack";function T(r,t){(null==t||t>r.length)&&(t=r.length);for(var e=0,n=Array(t);e<t;e++)n[e]=r[e];return n}function R(r,t,e,n,o,i,a){try{var c=r[i](a),u=c.value}catch(r){return void e(r)}c.done?t(u):Promise.resolve(u).then(n,o)}function G(r){return function(){var t=this,e=arguments;return new Promise(function(n,o){var i=r.apply(t,e);function a(r){R(i,n,o,a,c,"next",r)}function c(r){R(i,n,o,a,c,"throw",r)}a(void 0)})}}function _(r,t,e){return(t=function(r){var t=function(r,t){if("object"!=typeof r||!r)return r;var e=r[Symbol.toPrimitive];if(void 0!==e){var n=e.call(r,t);if("object"!=typeof n)return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(r)}(r,"string");return"symbol"==typeof t?t:t+""}(t))in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}function I(r,t){var e=Object.keys(r);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(r);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(r,t).enumerable})),e.push.apply(e,n)}return e}function N(r){for(var t=1;t<arguments.length;t++){var e=null!=arguments[t]?arguments[t]:{};t%2?I(Object(e),!0).forEach(function(t){_(r,t,e[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(e)):I(Object(e)).forEach(function(t){Object.defineProperty(r,t,Object.getOwnPropertyDescriptor(e,t))})}return r}function F(){
-/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
-var r,t,e="function"==typeof Symbol?Symbol:{},n=e.iterator||"@@iterator",o=e.toStringTag||"@@toStringTag";function i(e,n,o,i){var u=n&&n.prototype instanceof c?n:c,s=Object.create(u.prototype);return M(s,"_invoke",function(e,n,o){var i,c,u,s=0,f=o||[],l=!1,p={p:0,n:0,v:r,a:m,f:m.bind(r,4),d:function(t,e){return i=t,c=0,u=r,p.n=e,a}};function m(e,n){for(c=e,u=n,t=0;!l&&s&&!o&&t<f.length;t++){var o,i=f[t],m=p.p,v=i[2];e>3?(o=v===n)&&(u=i[(c=i[4])?5:(c=3,3)],i[4]=i[5]=r):i[0]<=m&&((o=e<2&&m<i[1])?(c=0,p.v=n,p.n=i[1]):m<v&&(o=e<3||i[0]>n||n>v)&&(i[4]=e,i[5]=n,p.n=v,c=0))}if(o||e>1)return a;throw l=!0,n}return function(o,f,v){if(s>1)throw TypeError("Generator is already running");for(l&&1===f&&m(f,v),c=f,u=v;(t=c<2?r:u)||!l;){i||(c?c<3?(c>1&&(p.n=-1),m(c,u)):p.n=u:p.v=u);try{if(s=2,i){if(c||(o="next"),t=i[o]){if(!(t=t.call(i,u)))throw TypeError("iterator result is not an object");if(!t.done)return t;u=t.value,c<2&&(c=0)}else 1===c&&(t=i.return)&&t.call(i),c<2&&(u=TypeError("The iterator does not provide a '"+o+"' method"),c=1);i=r}else if((t=(l=p.n<0)?u:e.call(n,p))!==a)break}catch(t){i=r,c=1,u=t}finally{s=1}}return{value:t,done:l}}}(e,o,i),!0),s}var a={};function c(){}function u(){}function s(){}t=Object.getPrototypeOf;var f=[][n]?t(t([][n]())):(M(t={},n,function(){return this}),t),l=s.prototype=c.prototype=Object.create(f);function p(r){return Object.setPrototypeOf?Object.setPrototypeOf(r,s):(r.__proto__=s,M(r,o,"GeneratorFunction")),r.prototype=Object.create(l),r}return u.prototype=s,M(l,"constructor",s),M(s,"constructor",u),u.displayName="GeneratorFunction",M(s,o,"GeneratorFunction"),M(l),M(l,o,"Generator"),M(l,n,function(){return this}),M(l,"toString",function(){return"[object Generator]"}),(F=function(){return{w:i,m:p}})()}function M(r,t,e,n){var o=Object.defineProperty;try{o({},"",{})}catch(r){o=0}M=function(r,t,e,n){function i(t,e){M(r,t,function(r){return this._invoke(t,e,r)})}t?o?o(r,t,{value:e,enumerable:!n,configurable:!n,writable:!n}):r[t]=e:(i("next",0),i("throw",1),i("return",2))},M(r,t,e,n)}function B(r,t){return function(r){if(Array.isArray(r))return r}(r)||function(r,t){var e=null==r?null:"undefined"!=typeof Symbol&&r[Symbol.iterator]||r["@@iterator"];if(null!=e){var n,o,i,a,c=[],u=!0,s=!1;try{if(i=(e=e.call(r)).next,0===t);else for(;!(u=(n=i.call(e)).done)&&(c.push(n.value),c.length!==t);u=!0);}catch(r){s=!0,o=r}finally{try{if(!u&&null!=e.return&&(a=e.return(),Object(a)!==a))return}finally{if(s)throw o}}return c}}(r,t)||L(r,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function L(r,t){if(r){if("string"==typeof r)return T(r,t);var e={}.toString.call(r).slice(8,-1);return"Object"===e&&r.constructor&&(e=r.constructor.name),"Map"===e||"Set"===e?Array.from(r):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?T(r,t):void 0}}var z,H=function(){var r=G(F().m(function r(t,e,n){var o,i;return F().w(function(r){for(;;)switch(r.n){case 0:return r.n=1,k(t,e,n);case 1:return o=r.v,e.use(w(o.serverConfig.proxy)),e.use(j(o)),i=new C(o),r.n=2,i.scan();case 2:i.listen();case 3:return r.a(2)}},r)}));return function(t,e,n){return r.apply(this,arguments)}}(),U=function(){var r=G(F().m(function r(t,e){var n,o;return F().w(function(r){for(;;)switch(r.n){case 0:n=t.getDoraConfig().serviceConfig||{},o=n.static,Object.entries(o||{}).forEach(function(r){var n=B(r,2),o=n[0],i=n[1];e.use(O(i,D(t.getWorkRoot(),o)))});case 1:return r.a(2)}},r)}));return function(t,e){return r.apply(this,arguments)}}(),V=function(){var r=G(F().m(function r(t,n,o,i){var a,c,u,s,f,l,p;return F().w(function(r){for(;;)switch(r.n){case 0:return a=i.startPort,c=g(a),u=t.getDoraConfig().serviceConfig,s=u.publicPath,f=new e(s),r.n=1,y(t,N(N({},o),{},{action:"server"}));case 1:return(l=r.v).forEach(function(r){f.updateAssetList((r.getDoraConfig().multiple||[]).map(function(r){return r.name}))}),r.n=2,Promise.all(l.map(function(){var r=G(F().m(function r(t){var e,n,o,i;return F().w(function(r){for(;;)switch(r.n){case 0:return r.n=1,c();case 1:return e=r.v,t.updateDevServerConfig({port:e,open:!1}),r.n=2,new E(t.webpackConfig).context({});case 2:return n=r.v,o=n.compiler,i=n.server,A(o,function(r){f.updateAssetMap(r)},{hostname:t.devServerConfig.host,port:t.devServerConfig.port}),r.n=3,i(t.devServerConfig);case 3:return r.a(2)}},r)}));return function(t){return r.apply(this,arguments)}}()));case 2:return p=n,r.n=3,x(f,t);case 3:p.use.call(p,r.v);case 4:return r.a(2)}},r)}));return function(t,e,n,o){return r.apply(this,arguments)}}(),W=function(){var r=G(F().m(function r(t,e,m){var v;return F().w(function(r){for(;;)switch(r.n){case 0:return(v=n(new o)).use(i(t.workRootDir,e)),v.use(a()),v.use(c()),v.use(u("build"===t.action?"production":"development")),v.use(s("build"===t.action?"production":"development")),v.use(f(m)),v.use(l()),v.use(p()),r.n=1,v.getResult();case 1:return r.a(2,r.v)}},r)}));return function(t,e,n){return r.apply(this,arguments)}}(),$={output:{path:"./dist"},formatList:["cjs"],alias:{},externals:[],internals:[],copy:[],dts:{},clear:!1,minimize:!1,webpackConfig:{},serviceConfig:{host:"localhost",publicPath:"/pages",openBrowser:!0,port:7777,scan:"server",pathRouteMap:{}}},q=function(){var r=G(F().m(function r(t){var e,n,o,i,a,c,u,s,f,l,p;return F().w(function(r){for(;;)switch(r.n){case 0:return n=v({workRootDir:null==t?void 0:t.workRootDir,action:"server"}),r.n=1,W(n,t,$);case 1:return o=r.v,(i=P({})).use(S),a=g((null===(e=o.getDoraConfig().serviceConfig)||void 0===e?void 0:e.port)||3e3),r.n=2,a();case 2:return c=r.v,r.n=3,H(o,i,n);case 3:return u=V,s=o,f=i,l=n,r.n=4,a();case 4:return p=r.v,r.n=5,u(s,f,l,{startPort:p});case 5:return r.n=6,U(o,i);case 6:i.route("/").get(function(r,t){t.send("Hello, @doracli/express-server!")}),i.listen(c,function(){var r=o.getDoraConfig().serviceConfig||{},t=r.publicPath,e=r.openBrowser;m.info("ser","started","http://localhost:".concat(c).concat(t)),e&&h("http://localhost:".concat(c).concat(t))});case 7:return r.a(2)}},r)}));return function(t){return r.apply(this,arguments)}}(),J=b.filter(function(r){return["build","dev"].includes(r.command)}),K={name:"magic",usage:"magic <command> [option]",version:"0.0.8",childCommands:[{command:"server",description:"run a project by dev",options:[{name:"format",simpleName:"f",type:"['amd','cjs','es','iife','system','umd','commonjs','esm','module','systemjs']",description:"set output module type"},{name:"workRootDir",simpleName:"r",type:"[string]",description:"set work root path",defaultValue:"./"}],action:function(r){q(r)}}].concat(function(r){if(Array.isArray(r))return T(r)}(z=J)||function(r){if("undefined"!=typeof Symbol&&null!=r[Symbol.iterator]||null!=r["@@iterator"])return Array.from(r)}(z)||L(z)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}())},Q=r();t(K)(Q),Q.on("--help",function(){console.log(),console.log("Run ".concat(d.cyan("dora <command> --help")," for detailed usage of given command.")),console.log()});var X=function(){Q.parse(process.argv)};export{X as default};
+import{createProgram as o,dealOptions as e}from"@doracli/commander";import{HtmlAssetManager as t,configCtxWorkflow as a,ConfigCtx as r,collectBaseConfigMw as s,collectPackageJsonMw as i,collectTsconfigJsonMw as n,collectDoraConfigMw as c,collectCdnConfigMw as p,wholeDoraConfigMw as m,wholeDoraInoutMw as l,clearMw as d,createEnvParams as u,cLog as f,picocolors as g}from"@doracli/helper";import{getServerMutipleCtxList as w,childCommands as v}from"@doracli/webpack-react";import h from"@dorabag/open-browser";import{portGetter as C}from"@dorabag/srv-tool";import{conditionalBodyParser as b,proxyMiddleware as y,fileServerMiddleware as k,createServer as D,loggerMiddleware as P,corsMiddleware as R}from"@doracli/express";import{getServerCtx as x,ServerWorkflow as $}from"@doracli/express-server";import{join as j}from"path";import{Compiler as S,collectAssetUrls as A,htmlRouteGeneratorMw as B}from"@doracli/webpack";const E={output:{path:"./dist"},formatList:["cjs"],alias:{},externals:[],internals:[],copy:[],dts:{},clear:!1,minimize:!1,webpackConfig:{},serviceConfig:{host:"localhost",publicPath:"/pages",openBrowser:!0,port:7777,scan:"server",pathRouteMap:{}}},H=async o=>{const e=u({workRootDir:o?.workRootDir,action:"server"}),g=await(async(o,e,t)=>{const u=a(new r);return u.use(s(o.workRootDir,e)),u.use(i()),u.use(n()),u.use(c("build"===o.action?"production":"development")),u.use(p("build"===o.action?"production":"development")),u.use(m(t)),u.use(l()),u.use(d()),await u.getResult()})(e,o,E),v=D({});v.use(P),v.use(R);const H=C(g.getDoraConfig().serviceConfig?.port||3e3),I=await H();await(async(o,e,t)=>{const a=await x(o,e,t);e.use(b(a.serverConfig.proxy)),e.use(y(a));const r=new $(a);await r.scan(),r.listen()})(g,v,e),await(async(o,e,a,r)=>{const{startPort:s}=r,i=C(s),{publicPath:n}=o.getDoraConfig().serviceConfig,c=new t(n),p=await w(o,{...a,action:"server"});p.forEach(o=>{c.updateAssetList((o.getDoraConfig().multiple||[]).map(o=>o.name))}),await Promise.all(p.map(async o=>{const e=await i();o.updateDevServerConfig({port:e,open:!1,host:"0.0.0.0",allowedHosts:"all"});const{compiler:t,server:a}=await new S(o.webpackConfig).context({});A(t,o=>{c.updateAssetMap(o)},{hostname:"localhost",port:o.devServerConfig.port}),await a(o.devServerConfig)})),e.use(await B(c,o))})(g,v,e,{startPort:await H()}),await(async(o,e)=>{const{static:t}=o.getDoraConfig().serviceConfig||{};Object.entries(t||{}).forEach(([t,a])=>{e.use(k(a,j(o.getWorkRoot(),t)))})})(g,v),v.route("/").get((o,e)=>{e.send("Hello, @doracli/express-server!")}),v.listen(I,"0.0.0.0",()=>{const{publicPath:o,openBrowser:e}=g.getDoraConfig().serviceConfig||{};f.info("ser","started",`http://localhost:${I}${o}`),f.info("ser","lan",`局域网请用本机 IP 访问，例如 http://<局域网IP>:${I}${o}`),e&&h(`http://localhost:${I}${o}`)})},I={name:"magic",usage:"magic <command> [option]",version:"0.0.13",childCommands:[{command:"server",description:"run a project by dev",options:[{name:"format",simpleName:"f",type:"['amd','cjs','es','iife','system','umd','commonjs','esm','module','systemjs']",description:"set output module type"},{name:"workRootDir",simpleName:"r",type:"[string]",description:"set work root path",defaultValue:"./"}],action:o=>{H(o)}},...v.filter(o=>["build","dev"].includes(o.command))]},L=o();e(I)(L),L.on("--help",function(){console.log(),console.log(`Run ${g.cyan("dora <command> --help")} for detailed usage of given command.`),console.log()});var M=()=>{L.parse(process.argv)};export{M as default};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doracli/dora",
-  "version": "0.0.12",
+  "version": "0.0.17",
   "description": "哆啦 （ dora ），用于开发react项目，基于webpack构建，集成热更新服务功能",
   "author": "cclr <18843152354@163.com>",
   "homepage": "",
@@ -29,29 +29,30 @@
   "scripts": {
     "test": "vitest",
     "g:test": "vitest run",
-    "build": "drr build",
-    "g:build": "drr build"
+    "build": "drn build",
+    "g:build": "drn build",
+    "g:build:webpack": "npm run build"
   },
   "dependencies": {
-    "@cclr/lang": "^0.1.55",
-    "@cclr/utils": "^0.1.55",
+    "@cclr/lang": "^0.1.62",
+    "@cclr/utils": "^0.1.62",
     "@dorabag/file-pro": "^1.0.18",
     "@dorabag/open-browser": "^1.0.26",
     "@dorabag/srv-tool": "^1.0.26",
-    "@doracli/commander": "^0.0.12",
-    "@doracli/express": "^0.0.12",
-    "@doracli/express-server": "^0.0.12",
-    "@doracli/helper": "^0.0.12",
-    "@doracli/type": "^0.0.12",
-    "@doracli/webpack": "^0.0.12",
-    "@doracli/webpack-react": "^0.0.12",
+    "@doracli/commander": "^0.0.17",
+    "@doracli/express": "^0.0.17",
+    "@doracli/express-server": "^0.0.17",
+    "@doracli/helper": "^0.0.17",
+    "@doracli/type": "^0.0.17",
+    "@doracli/webpack": "^0.0.17",
+    "@doracli/webpack-react": "^0.0.17",
     "webpack-dev-middleware": "^7.4.5",
     "webpack-hot-middleware": "^2.26.1",
-    "ws": "^8.21.0"
+    "ws": "^8.21.1"
   },
-  "gitHead": "40184094063c80cfb7341843ddfa1fea35d06157",
+  "gitHead": "261979ba5cf43594881763b8448a8bfb3e71c07e",
   "devDependencies": {
-    "webpack": "^5.107.2",
-    "webpack-dev-server": "^5.2.4"
+    "webpack": "^5.108.4",
+    "webpack-dev-server": "^5.2.6"
   }
 }