@das-fed/cli 6.4.0-test.2 → 6.4.0-test.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/cli",
-  "version": "6.4.0-test.2",
+  "version": "6.4.0-test.3",
   "description": "",
   "type": "module",
   "main": "src/index.js",

package/src/commands/build/index.js

@@ -1 +1 @@
-import{initPublicConfig}from"../dev-helper/init-public-config.js";import{initWatchers}from"../dev-helper/watchers/index.js";import{execSync}from"child_process";import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import minimist from"minimist";import fs from"fs-extra";import{extra}from"./extra/index.js";import{getWindowConfig}from"../../utils/get-window-config/index.js";import{getCliConfig}from"../../utils/get-cli-config/index.js";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename);export default{handle:async i=>{var[,...e]=i,i=minimist(i),t=process.cwd(),o={cwd:t,isDev:!1,isBuild:!0,...await getCliConfig(),...i};if(!(o.isLib??!1)){await initPublicConfig(o),await initWatchers(o);let i=await getWindowConfig(resolve(t,"public/config.js"));try{var r,a=resolve(t,"config.js");await fs.exists(a)&&(r=(await import(relative(resolve(__dirname),a))).default,""===i.microAppName&&delete i.microAppName,i={...r,...i})}catch(i){console.log("get rootConfig error",i)}try{await extra()}catch(i){console.log("提取i18n、theme、auth数据时发生错误",i)}}(e||[]).join(" ");let n="";i.c&&(n+="-c "+i.c),execSync("npx vite build "+n,{cwd:t,stdio:"inherit"})}};
+import{initPublicConfig}from"../dev-helper/init-public-config.js";import{initWatchers}from"../dev-helper/watchers/index.js";import{extra}from"../extra/index.js";import{execSync}from"child_process";import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import minimist from"minimist";import fs from"fs-extra";import{getWindowConfig}from"../../utils/get-window-config/index.js";import{getCliConfig}from"../../utils/get-cli-config/index.js";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename);export default{handle:async i=>{var[,...e]=i,i=minimist(i),t=process.cwd(),o={cwd:t,isDev:!1,isBuild:!0,...await getCliConfig(),...i};if(!(o.isLib??!1)){await initPublicConfig(o),await initWatchers(o);let i=await getWindowConfig(resolve(t,"public/config.js"));try{var r,a=resolve(t,"config.js");await fs.exists(a)&&(r=(await import(relative(resolve(__dirname),a))).default,""===i.microAppName&&delete i.microAppName,i={...r,...i})}catch(i){console.log("get rootConfig error",i)}try{await extra()}catch(i){console.log("提取i18n、theme、auth数据时发生错误",i)}}(e||[]).join(" ");let n="";i.c&&(n+="-c "+i.c),execSync("npx vite build "+n,{cwd:t,stdio:"inherit"})}};

package/src/commands/extra/auth/index.js

@@ -0,0 +1 @@
+let extraAuth=async()=>{};export{extraAuth};

package/src/commands/extra/i18n/index.js

@@ -0,0 +1,2 @@
+import{resolve,relative,dirname}from"path";import{fileURLToPath}from"url";import fs from"fs-extra";import{build}from"vite";import prettier from"prettier";import glob from"fast-glob";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename),extractWrappedChinese=e=>{var i,e=(i=e.replace(/<!--[\s\S]*?-->/g,"").replace(/\/\/.*$/gm,"").replace(/\/\*[\s\S]*?\*\//g,"").replace(/^\s*console\..*$/gm,"")).replace(/(\bi18n\b|\bt\b)\s*\(([^)]*)$/gm,(e,t,a,r)=>{var s=i.indexOf(")",r);return-1!==s?e+i.slice(r+e.length,s+1).replace(/\n\s*/g,""):e});let s=/[\u4e00-\u9fa5]+/g,o=/(?:i18n|t)\s*\(\s*(['"`])/,p=[];return e.split("\n").forEach(e=>{for(;null!==(a=s.exec(e));){var[t]=a,a=a.index,r=a+t.length,a=e.slice(0,a).trim(),r=e.slice(r).trim();o.test(a)&&r.includes(")")&&p.push(t)}}),p},extraI18n=async e=>{var{cwd:t=process.cwd(),type:e="app"}=e||{},a=resolve(t,"i18n-colletion.local.ts"),r=(!await fs.exists(a)&&(await fs.ensureFile(a),r={app:"export default import.meta.glob(['./src/**/**/i18n/*.ts','!./src/**/**/i18n/useI18n.ts'], { eager: true, import: 'default' })",dasui:"export default import.meta.glob(['./packages/business-components/**/**/i18n/*.ts','./packages/components/**/**/i18n/*.ts',], { eager: true, import: 'default' })",dasweb:"export default import.meta.glob(['./packages/main-app-framework/**/**/i18n/*.ts'], { eager: true, import: 'default' })",dasutils:"export default import.meta.glob(['./api-services/**/**/i18n/*.ts','./create-api-service/**/**/i18n/*.ts'], { eager: true, import: 'default' })",daswebcomponents:"export default import.meta.glob(['./components/**/**/i18n/*.ts'], { eager: true, import: 'default' })"}[e])&&await fs.writeFile(a,r),resolve(__dirname,"./.temp"));await fs.ensureDir(r);let s=`index.${(new Date).getTime()}.cjs`;await build({configFile:resolve(__dirname,"./vite.config.ts"),build:{emptyOutDir:!0,outDir:r,lib:{entry:a,fileName:()=>s,formats:["cjs"]}}});var i,o=(await import("./.temp/"+s)).default;let p={};for(i in o)Object.assign(p,o[i]);var n;for(n of await glob({app:["src/**/**/*.vue","src/**/**/*.ts","!src/**/**/i18n/*.ts"],dasui:["packages/business-components/**/**/*.vue","packages/business-components/**/**/*.ts","packages/components/**/**/*.vue","packages/components/**/**/*.ts","!packages/**/**/i18n/*.ts"],dasweb:["packages/main-app-framework/**/**/*.vue","packages/main-app-framework/**/**/*.ts","!packages/**/**/i18n/*.ts"],dasutils:["api-services/**/**/*.ts","create-api-service/**/**/*.ts","!api-services/**/**/i18n/*.ts","!create-api-service/**/**/i18n/*.ts"],daswebcomponents:["components/**/**/*.vue","components/**/**/*.ts","!components/**/**/i18n/*.ts"]}[e],{cwd:t,onlyFiles:!0})){var l=resolve(t,n),l=(await fs.readFile(l)).toString(),l=extractWrappedChinese(l);0<l.length&&l.map(e=>p[e]="")}var c=resolve(t,"app"===e?"public/i18n-collection":"dist/i18n-collection");await fs.ensureDir(c),await fs.emptyDir(c);for(let s of["zh-CN","en"]){let r="export default {";Object.keys(p).map(e=>{var t=p[e];let a=t[s]||"";"zh-CN"===s&&(a=t[s]||t["zh-cn"]||t),r+=`'${e}': "${a}",\r
+`}),r+="}";var m=resolve(c,s+".js");await fs.ensureFile(m),await fs.writeFile(m,await prettier.format(r,{parser:"typescript"}))}};export{extraI18n};

package/src/commands/extra/i18n/vite.config.ts

@@ -0,0 +1 @@
+export default {}

package/src/commands/extra/index.js

@@ -0,0 +1 @@
+import{extraI18n}from"./i18n/index.js";import{extraTheme}from"./theme/index.js";import{extraAuth}from"./auth/index.js";import minimist from"minimist";let extra=async e=>{await Promise.all([extraI18n(e),extraTheme(e),extraAuth(e)])};export default{handle:async e=>{console.log("das-cli extra running!");e=minimist(e),e={cwd:process.cwd(),isDev:!0,type:"app",...e};extra(e)}};export{extra};

package/src/commands/extra/theme/index.js

@@ -0,0 +1 @@
+let extraTheme=async()=>{};export{extraTheme};

package/src/commands/init/index.js

@@ -1 +1 @@
-import inquirer from"inquirer";import glob from"fast-glob";import{dirname,resolve}from"path";import{fileURLToPath}from"url";import fs from"fs-extra";import{consola}from"consola";import{execSync}from"child_process";import semver from"semver";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename),getPackageJson=()=>{var e=resolve(__dirname,"../../../package.json");return fs.existsSync(e)?fs.readJSONSync(e):{}};export default{alias:["create","create-app","-c"],handle:async e=>{var r=getPackageJson(),a=(consola.box(`Using ${r.name} v`+r.version),consola.info("create app for @das-fed"),consola.warn("必须使用 pnpm 作为依赖安装工具"),await inquirer.prompt([{name:"inputName",type:"input",message:"请输入应用名称(一般为英文缩写)"}])).inputName,[i]=(a||(consola.error("应用名称必填！"),process.exit()),a.split("/").slice(-1)),o="enterpriseadmin/"+i,a=(consola.success(`子应用名称为: ${o} (enterpriseadmin为默认加入的前缀)`),await inquirer.prompt([{name:"overwrite",type:"confirm",message:"初始化项目将覆盖当前目录的文件及文件夹，是否继续?"}])).overwrite;if(!a)return process.exit();var s,t=process.cwd(),n=resolve(__dirname,"./template");for(s of await glob(["**/**"],{cwd:n,dot:!0})){var p,c=resolve(t,s);await fs.copy(resolve(n,s),c,{overwrite:!0}),-1<s.indexOf("config.js")&&(p=(await fs.readFile(c)).toString(),await fs.writeFile(c,p.replaceAll("%microAppName%",o))),-1<s.indexOf("package.json")&&(p=(await fs.readFile(c)).toString(),await fs.writeFile(c,p.replaceAll("%packageName%",i)))}var a=["vue","vue-router"],m=["@vitejs/plugin-vue","typescript","vite","vue-tsc"];let l=["@das-fed/web","@das-fed/ui","@das-fed/utils"],d=["@das-fed/cli"],f=semver.parse(r.version).prerelease[0];f&&(l=l.map(e=>e+"@"+f),d=d.map(e=>e+"@"+f)),a.push(...l),m.push(...d),execSync("pnpm add "+a.join(" "),{cwd:t,stdio:"inherit"}),execSync("pnpm add -D "+m.join(" "),{cwd:t,stdio:"inherit"}),console.log(""),consola.success("项目初始化完成！"),consola.box("run: pnpm run dev")}};
+import inquirer from"inquirer";import glob from"fast-glob";import{dirname,resolve}from"path";import{fileURLToPath}from"url";import fs from"fs-extra";import{consola}from"consola";import{execSync}from"child_process";import semver from"semver";let __filename=fileURLToPath(import.meta.url),__dirname=dirname(__filename),getPackageJson=()=>{var e=resolve(__dirname,"../../../package.json");return fs.existsSync(e)?fs.readJSONSync(e):{}};export default{alias:["create","create-app","-c"],handle:async e=>{var r=getPackageJson(),a=(consola.box(`Using ${r.name} v`+r.version),consola.info("create app for @das-fed"),consola.warn("必须使用 pnpm 作为依赖安装工具"),await inquirer.prompt([{name:"inputName",type:"input",message:"请输入应用名称(一般为英文缩写)"}])).inputName,[i]=(a||(consola.error("应用名称必填！"),process.exit()),a.split("/").slice(-1)),o="enterpriseadmin/"+i,a=(consola.success(`子应用名称为: ${o} (enterpriseadmin为默认加入的前缀)`),await inquirer.prompt([{name:"overwrite",type:"confirm",message:"初始化项目将覆盖当前目录的文件及文件夹，是否继续?"}])).overwrite;if(!a)return process.exit();var s,t=process.cwd(),n=resolve(__dirname,"./template");for(s of await glob(["**/**"],{cwd:n,dot:!0})){var p,c=resolve(t,s);await fs.copy(resolve(n,s),c,{overwrite:!0}),-1<s.indexOf("config.js")&&(p=(await fs.readFile(c)).toString(),await fs.writeFile(c,p.replaceAll("%microAppName%",o))),-1<s.indexOf("package.json")&&(p=(await fs.readFile(c)).toString(),await fs.writeFile(c,p.replaceAll("%packageName%",i)))}var a=["vue","vue-router","pinia-plugin-persistedstate"],m=["@vitejs/plugin-vue","typescript","vite","vue-tsc"];let l=["@das-fed/web","@das-fed/ui","@das-fed/utils"],d=["@das-fed/cli"],f=semver.parse(r.version).prerelease[0];f&&(l=l.map(e=>e+"@"+f),d=d.map(e=>e+"@"+f)),a.push(...l),m.push(...d),execSync("pnpm add "+a.join(" "),{cwd:t,stdio:"inherit"}),execSync("pnpm add -D "+m.join(" "),{cwd:t,stdio:"inherit"}),console.log(""),consola.success("项目初始化完成！"),consola.box("run: pnpm run dev")}};

package/src/commands/init/template/README.md

@@ -17,3 +17,13 @@ pnpm run dev
 ```
 pnpm run build
 ```
+
+## config配置
+
+### 如需本地开发开启sso登录
+
+public/config.js,public/config.local.js中设置配置【sso: true, baseURL: 'http://ssoServer.com'】，其中baseURL为某个支持sso登录的环境地址
+
+
+### 如本地需要登录失效后重定向到登录页面
+public/config.js,public/config.local.js中设置配置【noRedireLogin: false】

package/src/commands/init/template/public/config.js

@@ -1 +1,4 @@
-window.config = {}
+window.config = {
+  sso: false,
+  noRedireLogin: true,
+}

package/src/commands/init/template/src/das-web-app.ts

@@ -0,0 +1,9 @@
+export default () => {
+  return {
+    microAppName: __MICRO_APPNAME__,
+    router: { glob: import.meta.glob('@/views/**/router.ts', { eager: true, import: 'default' }) },
+    plugins: { glob: import.meta.glob('@/plugins/*/index.ts', { eager: true, import: 'default' }) },
+    theme: { glob: import.meta.glob('@/**/theme/*.ts', { eager: true, import: 'default' }) },
+    i18n: { glob: import.meta.glob('@/**/i18n/*.ts', { eager: true, import: 'default' }) },
+  }
+}

package/src/commands/init/template/vite.config.ts

@@ -1,14 +1,11 @@
 import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
 import { dasFeWebVitePlugin } from '@das-fed/cli'
 import config from './config.js'
 
 // https://vitejs.dev/config/
 export default defineConfig(({ command }) => {
-  const isBuild = command === 'build'
   return {
     define: { __MICRO_APPNAME__: JSON.stringify(config.microAppName) },
-    base: isBuild ? `/${config.microAppName}` : '/',
-    plugins: [vue(), dasFeWebVitePlugin()],
+    plugins: [dasFeWebVitePlugin()],
   }
 })