@das-fed/cli 6.3.0-beta.10 → 6.3.0-beta.12

package/src/commands/init/template/tsconfig.app.json

@@ -1,28 +1,28 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "target": "ES2020",
-    "useDefineForClassFields": true,
-    "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-    "jsx": "preserve",
-    "jsxImportSource": "vue", // vue 3.4+ 需要显示指定jsx导出为vue
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"]
-}
+{
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "moduleDetection": "force",
+    "noEmit": true,
+    "jsx": "preserve",
+    "jsxImportSource": "vue", // vue 3.4+ 需要显示指定jsx导出为vue
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"]
+}

package/src/commands/init/template/tsconfig.json

@@ -1,11 +1,11 @@
-{
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.node.json"
-    }
-  ]
-}
+{
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}

package/src/commands/init/template/tsconfig.node.json

@@ -1,13 +1,13 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
-    "skipLibCheck": true,
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "noEmit": true
-  },
-  "include": ["vite.config.ts"]
-}
+{
+  "compilerOptions": {
+    "composite": true,
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
+    "noEmit": true
+  },
+  "include": ["vite.config.ts"]
+}

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

@@ -1,14 +1,14 @@
-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()],
-  }
-})
+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()],
+  }
+})

package/src/index.js

@@ -1 +1 @@
-export{dasFeWebVitePlugin}from"./vite-plugins/index.js";
+export{dasFeWebVitePlugin}from"./vite-plugins/index.js";export{default as dasFeWebResolveVitePlugin}from"./vite-plugins/das-fe-resolve/index.js";

package/src/utils/diff/file/index.js

@@ -0,0 +1 @@
+import fs from"fs-extra";import{diffLines}from"diff";let diffWriteFile=async(i,e)=>{var f,r;if(await fs.exists(i))return(f=(await fs.readFile(i)).toString())?(r=diffLines(f,e).map(i=>i.value).join(";\r\n"),void fs.writeFile(i,""+f+r)):fs.writeFile(i,e);await fs.ensureFile(i),await fs.writeFile(i,e)};export{diffWriteFile};

package/src/utils/diff/index.js

@@ -0,0 +1 @@
+export*from"./file/index.js";export*from"./json/index.js";

package/src/utils/diff/json/index.js

@@ -0,0 +1 @@
+import fs from"fs-extra";import isEqual from"lodash-es/isEqual.js";function updateArray(r,a){let t=r.filter(e=>!a.some(r=>isEqual(e,r)));var e=a.filter(e=>!r.some(r=>isEqual(r,e)));let s=r.filter(e=>!t.some(r=>isEqual(e,r)));return e.forEach(r=>s.push(r)),s}function updateObject(e,a){let t={...e};return Object.keys(e).forEach(r=>{a.hasOwnProperty(r)||delete t[r]}),Object.keys(a).forEach(r=>{e.hasOwnProperty(r)||(t[r]=a[r])}),t}let diffWriteJson=async(e,a,t={})=>{if(await fs.exists(e)){var s=await fs.readJSON(e);if(0===Object.keys(s).length)return fs.writeJSON(e,a,{spaces:2,...t});let r=s;Array.isArray(s)&&Array.isArray(a)&&(r=updateArray(s,a)),Array.isArray(s)||Array.isArray(a)||(r=updateObject(s,a)),await fs.writeJSON(e,r,{spaces:2,...t})}else await fs.ensureFile(e),await fs.writeJSON(e,a)};export{diffWriteJson};

package/src/utils/get-window-config/index.js

@@ -0,0 +1 @@
+import stripComments from"strip-comments";import fs from"fs-extra";import vm from"vm";let getWindowConfig=async t=>{var o,e;return await fs.exists(t)?(t=(await fs.readFile(t)).toString(),o={exports:{},module:{exports:{}}},t=new vm.Script(`const window = {};${t};module.exports={ window }`),e=vm.createContext(o),t.runInContext(e),(o.module.exports.window||{}).config):{}};export{getWindowConfig};

package/src/vite-plugins/das-fe-resolve/index.js

@@ -0,0 +1 @@
+import{resolve,extname}from"path";import dayjs from"dayjs";import fs from"fs-extra";import{parse as lexerParse}from"es-module-lexer";import MagicString from"magic-string";import{parseImportCode}from"../../utils/parse-import-code.js";let dasFeExternal=e=>{var r=process.cwd();resolve(r,"node_modules");let n=["@das-fed/web","@das-fed/ui","@das-fed/utils"];return{name:"das-fe-web-app-external",enforce:"pre",apply:"build",async transform(e,r){if(!(-1<r.indexOf("?"))&&[".vue",".ts",".js",".jsx",".tsx"].includes(extname(r))){if([".ts",".js"].includes(extname(r))&&r.indexOf("node_modules")<0){var s,[r,,]=lexerParse(e),a=new MagicString(e);for(s of r){var t=e.slice(s.s,s.e);!t.startsWith("@das-fed/")||t.endsWith(".js")||(t.endsWith("/index")?a.overwrite(s.s,s.e,t+".js"):a.overwrite(s.s,s.e,t+"/index.js"))}e=a.toString()}var i,r=parseImportCode(e);if(r)for(i of r.filter(e=>e.name.startsWith("@das-fed/")).filter(e=>!n.includes(e.name)))i.name.endsWith(".js")||(e=i.name.endsWith("/index")?e.replaceAll(`'${i.name}'`,`'${i.name}.js'`):e.replaceAll(`'${i.name}'`,`'${i.name}/index.js'`));return e}}}};export default e=>[dasFeExternal()];

package/src/vite-plugins/das-fe-ui/index.js

@@ -1 +1 @@
-import{resolve,extname}from"path";import fs from"fs-extra";import MagicString from"magic-string";import stripComments from"strip-comments";import kebabCase from"lodash-es/kebabCase.js";import{parseImportCode}from"../../utils/parse-import-code.js";let cwd=process.cwd(),nodeModulesDir=resolve(cwd,"node_modules"),nodeModulesDasUIDir=resolve(cwd,"node_modules/@das-fed/ui"),dasFeUIEsmMapPath=resolve(nodeModulesDasUIDir,"esm-map.json"),dasFeUIEsmMapPathPathExits=fs.existsSync(dasFeUIEsmMapPath),esmMap=dasFeUIEsmMapPathPathExits?fs.readJSONSync(dasFeUIEsmMapPath):{},iconComponentName="DasIcon",getEsmPath=e=>{let s=esmMap[e];return s=s.endsWith("/index")?s.slice(0,-6):s},DasFeUIEsm=e=>({name:"das-fed-ui-esm",enforce:"pre",async transform(e,s){if(!(-1<s.indexOf("?"))&&!(-1<s.indexOf("@das-fed/ui/packages/icon"))&&[".vue",".ts",".js",".jsx",".tsx"].includes(extname(s))){s=parseImportCode(e,"@das-fed/ui");if(s){var t,o=new MagicString(e);for(t of s){let a="";for(var r of t.members){var d=r.name,i=getEsmPath(d);if(i){a+=`import { ${r.code} } from '@das-fed/ui${i}';`;let e=resolve(nodeModulesDir,`@das-fed/ui${i}/style.css`),s=`import '@das-fed/ui${i}/style.css';`;d.startsWith(iconComponentName)&&(r=getEsmPath(iconComponentName),e=resolve(nodeModulesDir,`@das-fed/ui${r}/style.css`),s=`import '@das-fed/ui${r}/style.css';`);i=await fs.exists(e);i&&(a+=s)}}a&&o.overwrite(t.start,t.end,a)}return o.toString()}}}});export default(e={})=>[DasFeUIEsm(e)];
+import{resolve,extname}from"path";import fs from"fs-extra";import MagicString from"magic-string";import stripComments from"strip-comments";import kebabCase from"lodash-es/kebabCase.js";import{parseImportCode}from"../../utils/parse-import-code.js";let cwd=process.cwd(),nodeModulesDir=resolve(cwd,"node_modules"),nodeModulesDasUIDir=resolve(cwd,"node_modules/@das-fed/ui"),dasFeUIEsmMapPath=resolve(nodeModulesDasUIDir,"esm-map.json"),dasFeUIEsmMapPathPathExits=fs.existsSync(dasFeUIEsmMapPath),esmMap=dasFeUIEsmMapPathPathExits?fs.readJSONSync(dasFeUIEsmMapPath):{},iconComponentName="DasIcon",getEsmPath=e=>{let s=esmMap[e];if(s)return s=s.endsWith("/index")?s.slice(0,-6):s},DasFeUIEsm=e=>({name:"das-fed-ui-esm",enforce:"pre",async transform(e,s){if(!(-1<s.indexOf("?"))&&!(-1<s.indexOf("@das-fed/ui/packages/icon"))&&[".vue",".ts",".js",".jsx",".tsx"].includes(extname(s))){s=parseImportCode(e,"@das-fed/ui");if(s){var t,o=new MagicString(e);for(t of s){let a="";for(var r of t.members){var i=r.name,d=getEsmPath(i);if(d){a+=`import { ${r.code} } from '@das-fed/ui${d}';`;let e=resolve(nodeModulesDir,`@das-fed/ui${d}/style.css`),s=`import '@das-fed/ui${d}/style.css';`;i.startsWith(iconComponentName)&&(r=getEsmPath(iconComponentName),e=resolve(nodeModulesDir,`@das-fed/ui${r}/style.css`),s=`import '@das-fed/ui${r}/style.css';`);d=await fs.exists(e);d&&(a+=s)}}a&&o.overwrite(t.start,t.end,a)}return o.toString()}}}});export default(e={})=>[DasFeUIEsm(e)];

package/src/vite-plugins/das-fe-web/index.js

@@ -1 +1 @@
-import{resolve,extname}from"path";import fs from"fs-extra";import{createStyleImportPlugin}from"vite-plugin-style-import";import MagicString from"magic-string";import{parseImportCode}from"../../utils/parse-import-code.js";let cwd=process.cwd(),dasFeWebStylePath=resolve(cwd,"node_modules","@das-fed/web/style.css"),dasFeWebStylePathExits=fs.existsSync(dasFeWebStylePath),dasFeWeb=e=>{let t;return{name:"das-fe-web",config:(e,{})=>({resolve:{alias:{"@":resolve(process.cwd(),"src")}},build:{rollupOptions:{output:{}}}}),configResolved(e){t=e},buildStart:async()=>{t.cwd=resolve(process.cwd())},transformIndexHtml:{order:"post",handler:()=>{var e=t.base||"/";let s="development"===t.mode?e+"config.local.js":e+"config.js";return[{tag:"script",attrs:{src:s}}]}}}},WebStyleResolve=()=>({libraryName:"@das-fed/web",base:dasFeWebStylePathExits?"@das-fed/web/style.css":void 0}),styleImport=(e={})=>e.styleResolve?createStyleImportPlugin({resolves:[WebStyleResolve()]}):null,dasFeWebEsmMapPath=resolve(cwd,"node_modules","@das-fed/web/esm-map.json"),dasFeWebEsmMapPathExits=fs.existsSync(dasFeWebEsmMapPath),esmMap=dasFeWebEsmMapPathExits?fs.readJSONSync(dasFeWebEsmMapPath):{},dasFeWebEsm=async e=>({name:"das-fed-web-esm",enforce:"pre",transform(e,t){if(dasFeWebEsmMapPathExits&&!(-1<t.indexOf("?"))&&[".vue",".ts",".js",".jsx",".tsx"].includes(extname(t))){t=parseImportCode(e,"@das-fed/web");if(t){let s=new MagicString(e);return t.map(e=>{let t="";e.members.map(e=>{var s=e.name,s=esmMap[s];s&&(t+=`import { ${e.code} } from '@das-fed/web${s}';`)}),s.overwrite(e.start,e.end,t)}),s.toString()}}}});export default e=>[dasFeWeb(e),styleImport(e),dasFeWebEsm(e)];export{styleImport};
+import{resolve,extname}from"path";import fs from"fs-extra";import MagicString from"magic-string";import{parseImportCode}from"../../utils/parse-import-code.js";let cwd=process.cwd(),dasFeWeb=e=>{let a;return{name:"das-fe-web",config:(e,{})=>({resolve:{alias:{"@":resolve(process.cwd(),"src")}}}),configResolved(e){a=e},buildStart:async()=>{a.cwd=resolve(process.cwd())},transformIndexHtml:{order:"post",handler:()=>{var e=a.base||"./";let s="development"===a.mode?e+"config.local.js":e+"config.js";return[{tag:"script",attrs:{src:s}}]}}}},dasFeWebEsmMapPath=resolve(cwd,"node_modules","@das-fed/web/esm-map.json"),dasFeWebEsmMapPathExits=fs.existsSync(dasFeWebEsmMapPath),esmMap=dasFeWebEsmMapPathExits?fs.readJSONSync(dasFeWebEsmMapPath):{},dasFeWebEsm=async e=>({name:"das-fed-web-esm",enforce:"pre",transform(e,a){if(dasFeWebEsmMapPathExits&&!(-1<a.indexOf("?"))&&[".vue",".ts",".js",".jsx",".tsx"].includes(extname(a))){a=parseImportCode(e,"@das-fed/web");if(a){let s=new MagicString(e);return a.map(e=>{let a="";e.members.map(e=>{var s=e.name,s=esmMap[s];s&&(a+=`import { ${e.code} } from '@das-fed/web${s}';`)}),s.overwrite(e.start,e.end,a)}),s.toString()}}}});export default e=>[dasFeWeb(e),dasFeWebEsm(e)];

package/src/vite-plugins/das-fe-web-app/index.js

@@ -0,0 +1 @@
+import{resolve,extname}from"path";import dayjs from"dayjs";import fs from"fs-extra";import{parse as lexerParse}from"es-module-lexer";import MagicString from"magic-string";import{parseImportCode}from"../../utils/parse-import-code.js";let pureOpt=e=>{process.cwd();let{base:s="./",apply:r="build",type:a="singleApp",external:t=["vue","vue-router",/^@das-fed\//],entry:p="src/das-web-app.ts",outputDir:i="dist",...n}=e||{};return{base:s,apply:r,type:a,external:t,entry:p,outputDir:i,isSingleApp:"singleApp"===a,isDasMainApp:"mainApp"===a,isDasMicroApp:"microApp"===a,...n}},dasFeWebApp=e=>{let r=process.cwd(),{base:a,apply:s,external:t,entry:p,isSingleApp:i}=pureOpt(e);if(i)return{};let n;return{name:"das-fe-web-app",apply:s,config:(e,{})=>{let s=e?.build?.assetsDir??"assets";(s=s||"")&&!s.endsWith("/")&&(s+="/");e=dayjs().format("YYYY-MM-DD-HH-mm-ss-SSS");return{base:a,build:{lib:{entry:resolve(r,p),name:"index",fileName:"index",formats:["es"]},rollupOptions:{external:t,output:{chunkFileNames:`[name]-[hash]-${e}.js`}}}}},configResolved(e){n=e}}},dasWebAppExternal=e=>{e=pureOpt(e).isSingleApp;if(e)return{};e=process.cwd();resolve(e,"node_modules");let i=["@das-fed/web","@das-fed/ui","@das-fed/utils"];return{name:"das-fe-web-app-external",enforce:"pre",apply:"build",async transform(e,s){if(!(-1<s.indexOf("?"))&&[".vue",".ts",".js",".jsx",".tsx"].includes(extname(s))){if(e=e.replace("import '@das-fed/web/packages/style'",""),[".ts",".js"].includes(extname(s))&&s.indexOf("node_modules")<0){var r,[s,,]=lexerParse(e),a=new MagicString(e);for(r of s){var t=e.slice(r.s,r.e);!t.startsWith("@das-fed/")||t.endsWith(".js")||(t.endsWith("/index")?a.overwrite(r.s,r.e,t+".js"):a.overwrite(r.s,r.e,t+"/index.js"))}e=a.toString()}var p,s=parseImportCode(e);if(s)for(p of s.filter(e=>e.name.startsWith("@das-fed/")).filter(e=>!i.includes(e.name)))p.name.endsWith(".js")||(e=p.name.endsWith("/index")?e.replaceAll(`'${p.name}'`,`'${p.name}.js'`):e.replaceAll(`'${p.name}'`,`'${p.name}/index.js'`));return e}}}};export default e=>[dasFeWebApp(e),dasWebAppExternal(e)];

package/src/vite-plugins/dynamic-entry/index.js

@@ -0,0 +1 @@
+import{resolve}from"path";import fs from"fs-extra";export default(s="/src/main.ts")=>{let a=process.cwd();return{name:"das-fe-dynamic-entry",apply:"serve",transformIndexHtml:{order:"pre",handler:async r=>{var e="/src/main.dev.ts";return await fs.exists(resolve(a,"."+e))?r.replace(s,e):r}}}};

package/src/vite-plugins/index.js

@@ -1 +1 @@
-import vueJsx from"@vitejs/plugin-vue-jsx";import AutoImportPlugin from"unplugin-auto-import/vite";import ComponentsPlugin from"unplugin-vue-components/vite";import{ElementPlusResolver,AntDesignVueResolver}from"unplugin-vue-components/resolvers";import viteCompression from"vite-plugin-compression";import dasFeWeb from"./das-fe-web/index.js";import dasFeUI from"./das-fe-ui/index.js";import dasFeUtils from"./das-fe-utils/index.js";import dasFePretty from"./das-fe-pretty/index.js";import visualizerPlugin from"./visualizer/index.js";let dasFeWebVitePlugin=async(e={})=>{var{dasWeb:e={styleResolve:!0},dasUI:s={},dasUtils:o={},compression:i={},visualizer:t=null,autoImport:r={},components:n={},pretty:l={}}=e||{},e=[vueJsx(),dasFeWeb(e),dasFeUI(s),dasFeUtils(o),viteCompression(i),visualizerPlugin(t),dasFePretty(l)];return r.disabled||e.push(AutoImportPlugin({resolvers:[ElementPlusResolver(),AntDesignVueResolver()],dts:"./src/das-fe-local-runtime/auto-imports.d.ts",...r})),n.disabled||e.push(ComponentsPlugin({resolvers:[ElementPlusResolver(),AntDesignVueResolver()],dts:"./src/das-fe-local-runtime/components.d.ts",...n})),e};export{dasFeWebVitePlugin};
+import vueJsx from"@vitejs/plugin-vue-jsx";import AutoImportPlugin from"unplugin-auto-import/vite";import ComponentsPlugin from"unplugin-vue-components/vite";import{ElementPlusResolver,AntDesignVueResolver}from"unplugin-vue-components/resolvers";import viteCompression from"vite-plugin-compression";import dasFeWeb from"./das-fe-web/index.js";import dasFeUI from"./das-fe-ui/index.js";import dasFeUtils from"./das-fe-utils/index.js";import dasFePretty from"./das-fe-pretty/index.js";import dasFeWebApp from"./das-fe-web-app/index.js";import visualizerPlugin from"./visualizer/index.js";import dynamicEntry from"./dynamic-entry/index.js";let dasFeWebVitePlugin=async(e={})=>{var{entry:e="/src/main.ts",dasWeb:s={styleResolve:!0},dasUI:i={},dasUtils:t={},compression:o={},visualizer:r=null,autoImport:n={},components:m={},pretty:l={},dasWebApp:p={}}=e||{},s=[vueJsx(),dasFeWeb(s),dasFeUI(i),dasFeUtils(t),viteCompression(o),visualizerPlugin(r),dasFePretty(l),dasFeWebApp(p),dynamicEntry(e)];return n.disabled||s.push(AutoImportPlugin({resolvers:[ElementPlusResolver(),AntDesignVueResolver()],dts:"./src/das-fe-local-runtime/auto-imports.d.ts",...n})),m.disabled||s.push(ComponentsPlugin({resolvers:[ElementPlusResolver(),AntDesignVueResolver()],dts:"./src/das-fe-local-runtime/components.d.ts",...m})),s};export{dasFeWebVitePlugin};

package/src/commands/build/get-window-config.js

@@ -1 +0,0 @@
-import fs from"fs-extra";import prettier from"prettier";import strip from"strip-comments";import json5 from"json5";let getWindowConfig=async r=>{r=(await fs.readFile(r)).toString(),r=(await prettier.format(strip(r),{parser:"typescript"})).split(";").find(r=>r.match("window.config")).replace(/\s/g,"").replace("window.config=","");return json5.parse(r)};export{getWindowConfig};