@moneko/core 3.44.11 → 3.45.0

package/lib/commom/ca.d.mts

@@ -2,10 +2,8 @@ import { type ChildProcess, exec, type ExecException, type PromiseWithChild } fr
 import { join, relative } from 'node:path';
 import { platform } from 'node:process';
 import { promisify } from 'node:util';
-import { fileExists, loadFile, println, saveFile } from '@moneko/utils';
-import { type Certificate, createCA, createCert } from 'mkcert';
+import { type CertificateResult, fileExists, generateCert, loadFile, normalCertificateAuthority, println, saveFile } from '@moneko/utils';
 import log from './log.mjs';
-import { getIPv4 } from './net.mjs';
 import paths from './paths.mjs';
 type ExecPromise = (command: string) => PromiseWithChild<{
     stdout: string;
@@ -15,4 +13,4 @@ declare const execPromise: ExecPromise;
 declare async function isCertificateInstalled(organization: string): Promise<boolean>;
 declare function installCallback(error: ExecException | null, _stdout: string, stderr: string): void;
 export declare function installCA(certPath: string): ChildProcess | void;
-export declare async function setupCert(domain?: string, install?: boolean): Promise<Certificate>;
+export declare async function setupCert(domain?: string, install?: boolean): Promise<CertificateResult>;

package/lib/commom/ca.mjs

@@ -1 +1 @@
-import{exec as t}from"node:child_process";import{join as e,relative as r}from"node:path";import{platform as o}from"node:process";import{promisify as i}from"node:util";import{fileExists as a,loadFile as n,println as l,saveFile as c}from"@moneko/utils";import{createCA as s,createCert as m}from"mkcert";import u from"./log.mjs";import{getIPv4 as d}from"./net.mjs";import p from"./paths.mjs";let f=i(t);async function y(t){try{if("darwin"===o){let{stdout:e}=await f(`security find-certificate -c "${t}" -a`);return e.length>0}if("win32"===o){let{stdout:e}=await f(`certutil -store -user Root | findstr /C:"${t}"`);return e.length>0}}catch(t){u(t)}return!1}function h(t,e,r){if(t&&!r.includes("already exists")){u(t);return}}export function installCA(e){return"darwin"===o?t(`sudo security add-trusted-cert -d -r trustRoot -k "/Library/Keychains/System.keychain" "${e}"`,h):"win32"===o?t(`certutil -addstore -user "Root" "${e}"`,h):void l(`⚠️ 暂不支持自动安装 CA 的平台: ${o}`)}export async function setupCert(t="localhost",o=!0){let i=r(p.programPath,`${p.corePath}/cert/cert.pem`),l=r(p.programPath,`${p.corePath}/cert/key.pem`),u="Local Development CA - DO NOT TRUST",f=!a(i)||!a(l);if(f){let t=await s({organization:u,validity:7300,countryCode:"CN",state:"Hunan",locality:"Changsha"});await Promise.all([c(i,t.cert),c(l,t.key)])}o&&(!await y(u)||f)&&installCA(i);let h=e(p.CA_DIR,`${t}_cert.pem`),w=e(p.CA_DIR,`${t}_key.pem`);if(f||!a(h)||!a(w)){let e=await Promise.all([n(i),n(l)]),r=await m({ca:{cert:e[0],key:e[1]},domains:[...new Set([t,"localhost","127.0.0.1",d()].filter(Boolean))],organization:u,validity:365});await Promise.all([c(h,r.cert),c(w,r.key)])}let C=await Promise.all([n(h),n(w)]);return{cert:C[0],key:C[1]}}
+import{exec as t}from"node:child_process";import{join as e,relative as r}from"node:path";import{platform as o}from"node:process";import{promisify as i}from"node:util";import{fileExists as a,generateCert as n,loadFile as c,normalCertificateAuthority as l,println as s,saveFile as m}from"@moneko/utils";import u from"./log.mjs";import f from"./paths.mjs";let p=i(t);async function d(t){try{if("darwin"===o){let{stdout:e}=await p(`security find-certificate -c "${t}" -a`);return e.length>0}if("win32"===o){let{stdout:e}=await p(`certutil -store -user Root | findstr /C:"${t}"`);return e.length>0}}catch(t){u(t)}return!1}function y(t,e,r){if(t&&!r.includes("already exists")){u(t);return}}export function installCA(e){return"darwin"===o?t(`sudo security add-trusted-cert -d -r trustRoot -k "/Library/Keychains/System.keychain" "${e}"`,y):"win32"===o?t(`certutil -addstore -user "Root" "${e}"`,y):void s(`⚠️ 暂不支持自动安装 CA 的平台: ${o}`)}export async function setupCert(t="localhost",o=!0){let i=r(f.programPath,`${f.corePath}/cert/cert.pem`),s=r(f.programPath,`${f.corePath}/cert/key.pem`),u=!a(i)||!a(s);if(u){let t=l();await Promise.all([m(i,t.cert),m(s,t.key)])}o&&(!await d("Local Root Certificate Authority - Moneko")||u)&&installCA(i);let p=e(f.CA_DIR,`${t}_cert.pem`),y=e(f.CA_DIR,`${t}_key.pem`);if(u||!a(p)||!a(y)){let e=await Promise.all([c(i),c(s)]),r=n(e[0],e[1],t);await Promise.all([m(p,r.cert),m(y,r.key)])}let h=await Promise.all([c(p),c(y)]);return{cert:h[0],key:h[1]}}

package/lib/commom/host.d.mts

@@ -0,0 +1,3 @@
+import { addHost, checkHost, getHostsPath, ink, println } from '@moneko/utils';
+declare function flashDNS();
+export declare function hostHelp(domain: string);

package/lib/commom/host.mjs

@@ -0,0 +1,19 @@
+import{addHost as s,checkHost as t,getHostsPath as e,ink as o,println as l}from"@moneko/utils";export function hostHelp(r){let c="127.0.0.1";t(c,r)||s(c,r),t(c,r)||l(`
+    ${o("🚦 域名解析配置提醒","yellow",{bold:!0})}
+
+    检测到您正在使用本地域名：${o(r,"yellow")}，但系统未找到对应的本地解析记录
+
+    📝 请按以下步骤操作：
+
+    1. 使用文本编辑器【以管理员身份】打开 hosts 文件：
+
+       ${o("hosts 文件地址：","242")} ${o(e(),"208")}
+
+    2. 在文件末尾添加解析规则：
+
+       ${o(c,"39")}    ${o(r,"39")}
+
+    3. 保存文件后，建议刷新DNS缓存：
+
+       ${o(function(){switch(process.platform){case"darwin":return"sudo dscacheutil -flushcache";case"win32":return"ipconfig /flushdns";default:return"sudo systemctl restart systemd-resolved"}}(),"208")}
+    `)}

package/lib/dev/config.d.mts

@@ -1,5 +1,6 @@
 import { ink, println, termClear } from '@moneko/utils';
 import webpack from 'webpack';
+import { hostHelp } from '../commom/host.mjs';
 import { getIPv4, getPort } from '../commom/net.mjs';
 import { CONFIG } from '../config.mjs';
 declare const oldPord: number;

package/lib/dev/config.mjs

@@ -1,3 +1,3 @@
-import{ink as e,println as r,termClear as t}from"@moneko/utils";import{getIPv4 as o,getPort as s}from"../commom/net.mjs";import{CONFIG as n}from"../config.mjs";let i=n.devServer.port||3e3;export const PORT=await s(i);n.devServer.port=PORT;let m="/"===n.basename?"":n.basename,a=i!==PORT&&e(`Port ${e(`${i}`,"yellow")} is in use, trying ${e(`${PORT}`,"green")} instead.
-`,"245");export function getServerAddress(e){return`${n.devServer.https?"https":"http"}://${"local"===e?n.devServer.host:o()}:${PORT}${m}`}let l=e("You application is running here:","245"),g=`${e(" Local   ","231",{bg:"blue"})} ${e(getServerAddress("local"),"75")}
-${e(" Network ","231",{bg:"29"})} ${e(getServerAddress("net"),"green")}`;export function devLog(o,s){t(3);let n=(s?.endTime??0)-(s?.startTime??0);r([l,"",g,"",e(`Compiled successfully in ${e(`${n}ms`,"green")}`,"245"),""].join("\n"),!0),a&&r(a),s&&(s.compilation.warnings.forEach(e=>{r(e.message)}),s.compilation.errors.forEach(e=>{r(e.message)})),o&&r(o.message)}
+import{ink as e,println as r,termClear as o}from"@moneko/utils";import{hostHelp as t}from"../commom/host.mjs";import{getIPv4 as s,getPort as n}from"../commom/net.mjs";import{CONFIG as m}from"../config.mjs";let i=m.devServer.port||3e3;export const PORT=await n(i);m.devServer.port=PORT;let a="/"===m.basename?"":m.basename,l=i!==PORT&&e(`Port ${e(`${i}`,"yellow")} is in use, trying ${e(`${PORT}`,"green")} instead.
+`,"245");export function getServerAddress(e){return`${m.devServer.https?"https":"http"}://${"local"===e?m.devServer.host:s()}:${PORT}${a}`}let p=e("You application is running here:","245"),c=`${e(" Local   ","231",{bg:"blue"})} ${e(getServerAddress("local"),"75")}
+${e(" Network ","231",{bg:"29"})} ${e(getServerAddress("net"),"green")}`;export function devLog(s,n){o(3);let i=(n?.endTime??0)-(n?.startTime??0);r([p,"",c,"",e(`Compiled successfully in ${e(`${i}ms`,"green")}`,"245"),""].join("\n"),!0),l&&r(l),t(m.devServer.host),n&&(n.compilation.warnings.forEach(e=>{r(e.message)}),n.compilation.errors.forEach(e=>{r(e.message)})),s&&r(s.message)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneko/core",
-  "version": "3.44.11",
+  "version": "3.45.0",
   "description": "core",
   "main": "lib/index.mjs",
   "type": "module",
@@ -113,7 +113,7 @@
     "@moneko/raw-import": "0.0.3",
     "@moneko/stylelint": "1.3.0",
     "@moneko/transform-imports": "0.6.1",
-    "@moneko/utils": "0.2.2",
+    "@moneko/utils": "0.3.2",
     "@swc/core": "1.6.13",
     "browserslist": "4.24.5",
     "chokidar": "4.0.3",
@@ -122,11 +122,10 @@
     "husky": "9.1.7",
     "less": "4.3.0",
     "less-loader": "12.3.0",
-    "lightningcss": "1.30.0",
+    "lightningcss": "1.30.1",
     "marked-completed": "1.2.14",
-    "memfs": "4.17.1",
+    "memfs": "4.17.2",
     "mini-css-extract-plugin": "2.9.2",
-    "mkcert": "3.2.0",
     "style-loader": "4.0.0",
     "swc-loader": "0.2.6",
     "typescript": "5.8.3",
@@ -141,7 +140,7 @@
     "@types/stylis": "4.2.7",
     "@types/webpack-bundle-analyzer": "4.7.0",
     "@types/webpack-hot-middleware": "2.25.9",
-    "sass": "1.88.0",
+    "sass": "1.89.0",
     "sass-loader": "16.0.5",
     "solid-refresh": "0.7.5",
     "stylis": "4.3.6",

package/lib/cert/cert.pem

@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDvTCCAqWgAwIBAgIGMTI0NTM5MA0GCSqGSIb3DQEBCwUAMIGMMSwwKgYDVQQD
-EyNMb2NhbCBEZXZlbG9wbWVudCBDQSAtIERPIE5PVCBUUlVTVDELMAkGA1UEBhMC
-Q04xDjAMBgNVBAgTBUh1bmFuMREwDwYDVQQHEwhDaGFuZ3NoYTEsMCoGA1UEChMj
-TG9jYWwgRGV2ZWxvcG1lbnQgQ0EgLSBETyBOT1QgVFJVU1QwHhcNMjUwNDEwMTkw
-NDU3WhcNNDUwNDA1MTkwNDU3WjCBjDEsMCoGA1UEAxMjTG9jYWwgRGV2ZWxvcG1l
-bnQgQ0EgLSBETyBOT1QgVFJVU1QxCzAJBgNVBAYTAkNOMQ4wDAYDVQQIEwVIdW5h
-bjERMA8GA1UEBxMIQ2hhbmdzaGExLDAqBgNVBAoTI0xvY2FsIERldmVsb3BtZW50
-IENBIC0gRE8gTk9UIFRSVVNUMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAwtUviw2bzLe3Jir9v/FiCYIuH4Al1WFDw8fnpIz77FCGmH/5oMZP2fvY9Q7X
-IExeOdEmPXlR5RN3ivd70JZ6Zzcd4jUHa7QYxrOGRSCOEBqH3GOF8QjVomeQEdfv
-NMFHN7RVWc4P7/xlB2eyVQLSG2FXO3rFtpfJYXtENMFF8SfeQHTKZEjnU48Azw9J
-Yi4/FG+MwSnw661gyzYxdBpJfKa37cm0eROLjT9qeXG2M9cRXJpJaNRZniwMmYtv
-XXsVT8bmRe8oVLx3+m2wuDFPk5WRwjKj4eH66sKZqom8j+XXocZUx5IhW9QFYbIu
-uOVBNg/CHWX41+EVIZLjqeAtFQIDAQABoyMwITAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwICBDANBgkqhkiG9w0BAQsFAAOCAQEALbGs5tqopj1kGlMw7u6D
-QqkUzdAFUF5gjFPD7azdu+Lca0IPMBmXPqcJSLwHq73Lop7ijZ0e98IK3sd9RiiI
-nKjCow5+uVtEQi0g9gegPtrQnlgDYMYS+gWinEPpzXaIFWO/Ji6qJrfxkhaHiy9g
-/zkY2JE3ZCWr3T1AI7tQSufCPybQN5yapNcSLeINrxMCzqJysgSZUy/1FKQoZWhW
-p9F1l4Fc9NRmuAObYPqCnpZwB4n+7KqQYpCCGoiIPbRDR+GZyejRGfJpCH0wqTd0
-GQVWD4TTOR1Kv+XtNXWEzhvAoMLd1Cj5p+ZMdTOtiPvJp8asCwUxgwufVvu74b+7
-vw==
------END CERTIFICATE-----

package/lib/cert/key.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAwtUviw2bzLe3Jir9v/FiCYIuH4Al1WFDw8fnpIz77FCGmH/5
-oMZP2fvY9Q7XIExeOdEmPXlR5RN3ivd70JZ6Zzcd4jUHa7QYxrOGRSCOEBqH3GOF
-8QjVomeQEdfvNMFHN7RVWc4P7/xlB2eyVQLSG2FXO3rFtpfJYXtENMFF8SfeQHTK
-ZEjnU48Azw9JYi4/FG+MwSnw661gyzYxdBpJfKa37cm0eROLjT9qeXG2M9cRXJpJ
-aNRZniwMmYtvXXsVT8bmRe8oVLx3+m2wuDFPk5WRwjKj4eH66sKZqom8j+XXocZU
-x5IhW9QFYbIuuOVBNg/CHWX41+EVIZLjqeAtFQIDAQABAoIBABsRpiAFAqxtVJOH
-oub+u8bjwKdnv9nm6un8kCvF2rUjyvoibaWaEpC6nj4N6HL4U+8R0TpL7MY4RNeY
-jX9Bfj1w5ESqvB6JUG1AQVtsASYuSXSj7ywPNNSc3DYJG5bnc47tuHNYXyZ8mUdv
-b3ttf5Dbnqmzjlymt2KaebN1VtOrnty+Ao3Prclgtxo0HddlTSY6zWQxFteaO0za
-z9CSuwbwCBbaLR2XYhvWd/3nnIKsE0DWFn2HxQkv1VWipf29bn0NHi2U/8PZbuy2
-2PjLX3ZUkaJ+YdpNrS2xdcTMiqhga6s5UjyA4f9m1MjzfN5eFMNDJfcK7JUw154v
-4yeJx1ECgYEA7BPfZp1QDz0yfKKthvAdu8eiPPUwgfhA1Aq3sFlQFQJm/xT3edr9
-A3w3lMtUXbBVJYeO13vjZE+XzxfofC+7rjmHdb1MBjZ/0zwCU0s1crsSu16CcgbN
-hppowsVhoq/6oXt3RzPMXkYwJIlZoKG7un3D+84D2G1EPjC6Aun6OvsCgYEA00ZG
-diamy8MIMbHIgrsmsKKcjTELh4XkzVSfIwdzK8VmUuAuEtALXmcVv0ovWL/YbMzM
-HFDH8zff9+0mdykAxh9BfE3Em+PfhbgSXEYP/G/iKxls+HGRE4ooLx0sKjsTeLML
-nCooi6ILOaiKxjGx93GPZ45MnphYLYao7nxuuy8CgYEAmGB3WOd/LmbkuHfUI33G
-41aGzGvCRJG1XmgQil4Lh5QGYOzqk5eaqe46fesD6HkRbGjj9Qg9DJknNn+LCuVQ
-cbMmUQO/F1+EABcCtTqdJBHFlHT7I5hqflAaAGWgkH6f+i0UHzw61DrfhiW1WS4r
-WsMkhdpCtyZH3xBab9kQL5MCgYBiy3vriAt7QQo14sK2jzl6Y6/9Pi/8AZqKgcWg
-pb0vfLFqk7Y3yd1nGaFLwC7/u0ZDKklP/F5j1379+oGAO0ZHXxpKPDtyAk7lwruj
-NogHLXJ/YPZZ/xEuJ+6+iU+7t8BVMrR9JCGtmerR3YR3RYnJAetjK2Gcz/R75Xpd
-ewZ0tQKBgQC0uLAxRhwHa7EMdni1Tf4ygF2oaLC7dX/L8eiMYjmVo5eUsYHG+fda
-Wc2oH1ZuV1nGZE+VkMiNPXGTZXdspLYLzjNPLUsO2NMOzm4ZZbEKFzd/A9gif6lI
-M0yeg8oeosuHZXbeqw8UcK99m9yCAUH//tiInA1yAjg9tl29iwG/Dw==
------END RSA PRIVATE KEY-----