@das-fed/cli 6.4.0-dev.3 → 6.4.0-dev.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/cli",
-  "version": "6.4.0-dev.3",
+  "version": "6.4.0-dev.31",
   "description": "",
   "type": "module",
   "main": "src/index.js",
@@ -30,9 +30,7 @@
     "ora": "^8.0.1",
     "prettier": "^3.2.5",
     "strip-comments": "^2.0.1",
-    "ts-morph": "^21.0.1"
-  },
-  "devDependencies": {
+    "ts-morph": "^21.0.1",
     "@vitejs/plugin-vue": "^5.1.1",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "diff": "^5.2.0",
@@ -47,6 +45,7 @@
     "vite-plugin-style-import": "^2.0.0"
   },
   "peerDependencies": {
+    "@vitejs/plugin-vue": ">=5.1.1",
     "@vitejs/plugin-vue-jsx": ">=3.1.0",
     "rollup-plugin-visualizer": ">=5.12.0",
     "unplugin-auto-import": ">=0.17.6",

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

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

package/src/commands/build/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 s,e=(s=e.replace(/<!--[\s\S]*?-->/g,"").replace(/\/\/.*$/gm,"").replace(/\/\*[\s\S]*?\*\//g,"").replace(/^\s*console\..*$/gm,"")).replace(/(\bi18n\b|\bt\b)\s*\(([^)]*)$/gm,(e,r,t,i)=>{var a=s.indexOf(")",i);return-1!==a?e+s.slice(i+e.length,a+1).replace(/\n\s*/g,""):e});let a=/[\u4e00-\u9fa5]+/g,l=/(?:i18n|t)\s*\(\s*(['"`])/,o=[];return e.split("\n").forEach(e=>{for(;null!==(t=a.exec(e));){var[r]=t,t=t.index,i=t+r.length,t=e.slice(0,t).trim(),i=e.slice(i).trim();l.test(t)&&i.includes(")")&&o.push(r)}}),o},extraI18n=async e=>{var{cwd:r=process.cwd()}=e||{},e=resolve(r,"i18n-colletion.local.ts"),t=(await fs.exists(e)||(await fs.ensureFile(e),await fs.writeFile(e,"export default import.meta.glob(['./src/**/**/i18n/*.ts','!./src/**/**/i18n/useI18n.ts'], { eager: true, import: 'default' })")),resolve(__dirname,"./.temp"));await fs.ensureDir(t);let i=`index.${(new Date).getTime()}.cjs`;await build({configFile:resolve(__dirname,"./vite.config.ts"),build:{emptyOutDir:!0,outDir:t,lib:{entry:e,fileName:()=>i,formats:["cjs"]}}});var a,s,l=(await import("./.temp/"+i)).default;let o={};for(a in l)Object.assign(o,l[a]);for(s of await glob(["src/**/**/*.vue","src/**/**/*.ts","!src/**/**/i18n/*.ts"],{cwd:r,onlyFiles:!0})){var n=resolve(r,s),n=(await fs.readFile(n)).toString(),n=extractWrappedChinese(n);0<n.length&&n.map(e=>o[e]="")}var f=resolve(r,"public/i18n-collection");await fs.ensureDir(f),await fs.emptyDir(f);for(let a of["zh-CN","en"]){let i="export default {";Object.keys(o).map(e=>{var r=o[e];let t=r[a]||"";"zh-CN"===a&&(t=r[a]||r["zh-cn"]||r),i+=`'${e}': "${t}",\r
+`}),i+="}";var m=resolve(f,a+".js");await fs.ensureFile(m),await fs.writeFile(m,await prettier.format(i,{parser:"typescript"}))}};export{extraI18n};

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

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

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

@@ -0,0 +1 @@
+import{extraI18n}from"./i18n/index.js";import{extraTheme}from"./theme/index.js";import{extraAuth}from"./auth/index.js";let extra=async e=>{await Promise.all([extraI18n(e),extraTheme(e),extraAuth(e)])};export{extra};

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

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

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{generateNginx}from"./generate-nginx.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,n=resolve(t,"config.js");await fs.exists(n)&&(r=(await import(relative(resolve(__dirname),n))).default,""===i.microAppName&&delete i.microAppName,i={...r,...i})}catch(i){console.log("get rootConfig error",i)}}(e||[]).join(" ");let a="";i.c&&(a+="-c "+i.c),execSync("npx vite build "+a,{cwd:t,stdio:"inherit"})}};
+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"})}};

package/src/commands/build/nginx.main.conf

@@ -1,55 +1,55 @@
-worker_processes 8;
-worker_rlimit_nofile 6000;
-events {
-    worker_connections  1000;
-}
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    # 使用gzip压缩
-    gzip  on;
-    gzip_proxied any;
-    gzip_http_version 1.0;
-    gzip_min_length 1100;
-    gzip_buffers    4 16k;
-    gzip_comp_level 1;
-    gzip_vary on;
-    gzip_types  text/plain application/x-javascript text/css application/xml text/javascript application/json application/javascript image/x-icon;
-    gzip_disable "MSIE [1-6]\.";
-
-    # proxy配置
-    proxy_http_version 1.1;
-    proxy_connect_timeout 86400s;
-    proxy_read_timeout 86400s;
-    proxy_send_timeout 86400s;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Frame-Options SAMEORIGIN;
-
-
-
-    sendfile        on;
-    keepalive_timeout  65;
-    client_max_body_size   500m;
-    server_tokens off;
-    server {
-        listen       80;
-        etag         on;
-        location / {
-            root   /usr/share/nginx/html;
-            index  index.html index.htm;
-            try_files $uri $uri/ /index.html;
-            expires 0;
-        }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
+worker_processes 8;
+worker_rlimit_nofile 6000;
+events {
+    worker_connections  1000;
+}
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    # 使用gzip压缩
+    gzip  on;
+    gzip_proxied any;
+    gzip_http_version 1.0;
+    gzip_min_length 1100;
+    gzip_buffers    4 16k;
+    gzip_comp_level 1;
+    gzip_vary on;
+    gzip_types  text/plain application/x-javascript text/css application/xml text/javascript application/json application/javascript image/x-icon;
+    gzip_disable "MSIE [1-6]\.";
+
+    # proxy配置
+    proxy_http_version 1.1;
+    proxy_connect_timeout 86400s;
+    proxy_read_timeout 86400s;
+    proxy_send_timeout 86400s;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Frame-Options SAMEORIGIN;
+
+
+
+    sendfile        on;
+    keepalive_timeout  65;
+    client_max_body_size   500m;
+    server_tokens off;
+    server {
+        listen       80;
+        etag         on;
+        location / {
+            root   /usr/share/nginx/html;
+            index  index.html index.htm;
+            try_files $uri $uri/ /index.html;
+            expires 0;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
 }

package/src/commands/build/nginx.micro.conf

@@ -1,62 +1,62 @@
-worker_processes 8;
-worker_rlimit_nofile 2000;
-events {
-    worker_connections  1000;
-}
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-    # 使用gzip压缩
-    gzip  on;
-    gzip_proxied any;
-    gzip_http_version 1.0;
-    gzip_min_length 1100;
-    gzip_buffers    4 16k;
-    gzip_comp_level 1;
-    gzip_vary on;
-    gzip_types  text/plain application/x-javascript text/css application/xml text/javascript application/json application/javascript image/x-icon;
-    gzip_disable "MSIE [1-6]\.";
-
-    # proxy配置
-    proxy_http_version 1.1;
-    proxy_connect_timeout 86400s;
-    proxy_read_timeout 86400s;
-    proxy_send_timeout 86400s;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_set_header X-Frame-Options SAMEORIGIN;
-
-
-    sendfile        on;
-    keepalive_timeout  65;
-    client_max_body_size   500m;
-    server_tokens off;
-    server {
-        listen       80;
-        etag         on;
-        location / {
-            root  /usr/share/nginx/html;
-            try_files $uri $uri/ /index.html;
-            expires 0;
-        }
-
-        location ~ ^/(api|oss)/ {
-            proxy_pass http://gateway;
-        }
-
-        location {url} {
-            alias  /usr/share/nginx/html;
-            try_files $uri $uri/ {url}/index.html;
-            expires 0;
-        }
-
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-    }
+worker_processes 8;
+worker_rlimit_nofile 2000;
+events {
+    worker_connections  1000;
+}
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    # 使用gzip压缩
+    gzip  on;
+    gzip_proxied any;
+    gzip_http_version 1.0;
+    gzip_min_length 1100;
+    gzip_buffers    4 16k;
+    gzip_comp_level 1;
+    gzip_vary on;
+    gzip_types  text/plain application/x-javascript text/css application/xml text/javascript application/json application/javascript image/x-icon;
+    gzip_disable "MSIE [1-6]\.";
+
+    # proxy配置
+    proxy_http_version 1.1;
+    proxy_connect_timeout 86400s;
+    proxy_read_timeout 86400s;
+    proxy_send_timeout 86400s;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Frame-Options SAMEORIGIN;
+
+
+    sendfile        on;
+    keepalive_timeout  65;
+    client_max_body_size   500m;
+    server_tokens off;
+    server {
+        listen       80;
+        etag         on;
+        location / {
+            root  /usr/share/nginx/html;
+            try_files $uri $uri/ /index.html;
+            expires 0;
+        }
+
+        location ~ ^/(api|oss)/ {
+            proxy_pass http://gateway;
+        }
+
+        location {url} {
+            alias  /usr/share/nginx/html;
+            try_files $uri $uri/ {url}/index.html;
+            expires 0;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
 }

package/src/commands/init/template/.prettierignore

@@ -1,21 +1,21 @@
-## OS
-.DS_Store
-.idea
-.editorconfig
-pnpm-lock.yaml
-.npmrc
-
-# Ignored suffix
-*.log
-*.md
-*.svg
-*.png
-*.ico
-*ignore
-
-## Local
-.husky
-
-## Built-files
-.cache
-dist
+## OS
+.DS_Store
+.idea
+.editorconfig
+pnpm-lock.yaml
+.npmrc
+
+# Ignored suffix
+*.log
+*.md
+*.svg
+*.png
+*.ico
+*ignore
+
+## Local
+.husky
+
+## Built-files
+.cache
+dist

package/src/commands/init/template/.prettierrc

@@ -1,8 +1,8 @@
-{
-  "singleQuote": true,
-  "tabWidth": 2,
-  "printWidth": 120,
-  "semi": false,
-  "trailingComma": "all",
-  "bracketSpacing": true
-}
+{
+  "singleQuote": true,
+  "tabWidth": 2,
+  "printWidth": 120,
+  "semi": false,
+  "trailingComma": "all",
+  "bracketSpacing": true
+}

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

@@ -1,19 +1,19 @@
-# pnpm-workspace app for @das-fed
-
-## install
-
-```
-pnpm i
-```
-
-## dev
-
-```
-pnpm run dev
-```
-
-## build
-
-```
-pnpm run build
-```
+# pnpm-workspace app for @das-fed
+
+## install
+
+```
+pnpm i
+```
+
+## dev
+
+```
+pnpm run dev
+```
+
+## build
+
+```
+pnpm run build
+```

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

@@ -1,3 +1,3 @@
-export default {
-  microAppName: '%microAppName%',
-}
+export default {
+  microAppName: '%microAppName%',
+}

package/src/commands/init/template/index.html

@@ -1,12 +1,12 @@
-<!doctype html>
-<html lang="zh-CN">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title></title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>
+<!doctype html>
+<html lang="zh-CN">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title></title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>

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

@@ -1,12 +1,12 @@
-{
-  "name": "@das-fed-apps/%packageName%",
-  "description": "pnpm-workspace app for @das-fed",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "das-cli dev",
-    "build": "das-cli build",
-    "preview": "vite preview"
-  }
-}
+{
+  "name": "@das-fed-apps/%packageName%",
+  "description": "pnpm-workspace app for @das-fed",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "das-cli dev",
+    "build": "das-cli build",
+    "preview": "vite preview"
+  }
+}

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

@@ -1 +1 @@
-window.config = {}
+window.config = {}

package/src/commands/init/template/src/main.ts

@@ -1,9 +1,9 @@
-import { createDasWebApp } from '@das-fed/web'
-import '@das-fed/web/packages/style'
-
-createDasWebApp({
-  // @ts-ignore
-  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' }) },
-})
+import { createDasWebApp } from '@das-fed/web'
+import '@das-fed/web/packages/style'
+
+createDasWebApp({
+  // @ts-ignore
+  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' }) },
+})

package/src/commands/init/template/src/micro-app.ts

@@ -1,8 +1,8 @@
-import { createDasWebApp } from '@das-fed/web'
-
-createDasWebApp({
-  // @ts-ignore
-  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' }) },
-})
+import { createDasWebApp } from '@das-fed/web'
+
+createDasWebApp({
+  // @ts-ignore
+  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' }) },
+})

package/src/commands/init/template/src/views/demo/app.vue

@@ -1,61 +1,61 @@
-<template>
-  <div class="demo-container">
-    <h2>
-      {{ t('demo-msg') }}
-    </h2>
-
-    <a href="http://aiot-ui.rd.chn-das.com/das-ui" target="_blank">
-      <p class="read-the-docs">{{ t('demo-doc-tip') }}</p>
-    </a>
-
-    <div>{{ t('demo-component-msg') }}</div>
-    <div class="alert-container">
-      <div v-for="item in ['info', 'success', 'warning', 'error']" :key="item" class="alert-item">
-        <DasAlert show-icon :message="`${item} Text`" :type="item" />
-      </div>
-    </div>
-
-    <div>@das-fed/ui组件库中DasIcon使用案例</div>
-    <DasIconAdd />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { t } from '@das-fed/web'
-import { DasAlert, DasIconAdd } from '@das-fed/ui'
-</script>
-
-<style>
-.demo-container {
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-  height: 100%;
-  background: var(--hello-bg);
-  color: var(--hello-color);
-}
-.demo-container h2 {
-  color: var(--hello-color);
-}
-.alert-container {
-  background: var(--demo-alert-bg);
-  color: var(--demo-alert-color);
-  padding: 20px;
-  margin: 10px 0;
-  border-radius: 10px;
-  box-sizing: border-box;
-  height: auto;
-  min-width: 600px;
-}
-.alert-item {
-  margin-top: 20px;
-}
-.alert-item:first-child {
-  margin-top: 0;
-}
-.read-the-docs {
-  cursor: pointer;
-  font-size: 14px;
-  font-weight: 400;
-}
-</style>
+<template>
+  <div class="demo-container">
+    <h2>
+      {{ t('demo-msg') }}
+    </h2>
+
+    <a href="http://aiot-ui.rd.chn-das.com/das-ui" target="_blank">
+      <p class="read-the-docs">{{ t('demo-doc-tip') }}</p>
+    </a>
+
+    <div>{{ t('demo-component-msg') }}</div>
+    <div class="alert-container">
+      <div v-for="item in ['info', 'success', 'warning', 'error']" :key="item" class="alert-item">
+        <DasAlert show-icon :message="`${item} Text`" :type="item" />
+      </div>
+    </div>
+
+    <div>@das-fed/ui组件库中DasIcon使用案例</div>
+    <DasIconAdd />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { t } from '@das-fed/web'
+import { DasAlert, DasIconAdd } from '@das-fed/ui'
+</script>
+
+<style>
+.demo-container {
+  margin: 0 auto;
+  padding: 2rem;
+  text-align: center;
+  height: 100%;
+  background: var(--hello-bg);
+  color: var(--hello-color);
+}
+.demo-container h2 {
+  color: var(--hello-color);
+}
+.alert-container {
+  background: var(--demo-alert-bg);
+  color: var(--demo-alert-color);
+  padding: 20px;
+  margin: 10px 0;
+  border-radius: 10px;
+  box-sizing: border-box;
+  height: auto;
+  min-width: 600px;
+}
+.alert-item {
+  margin-top: 20px;
+}
+.alert-item:first-child {
+  margin-top: 0;
+}
+.read-the-docs {
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: 400;
+}
+</style>

package/src/commands/init/template/src/views/demo/i18n/index.ts

@@ -1,14 +1,14 @@
-export default {
-  'demo-msg': {
-    'zh-CN': '这是第一个示例路由页面',
-    en: 'This is Demo Page',
-  },
-  'demo-doc-tip': {
-    'zh-CN': '查看完整组件库文档',
-    en: 'read the components doc',
-  },
-  'demo-component-msg': {
-    'zh-CN': '@das-fed/ui组件库中DasAlert使用案例',
-    en: 'the DasAlert example of @das-fed/ui',
-  },
-}
+export default {
+  'demo-msg': {
+    'zh-CN': '这是第一个示例路由页面',
+    en: 'This is Demo Page',
+  },
+  'demo-doc-tip': {
+    'zh-CN': '查看完整组件库文档',
+    en: 'read the components doc',
+  },
+  'demo-component-msg': {
+    'zh-CN': '@das-fed/ui组件库中DasAlert使用案例',
+    en: 'the DasAlert example of @das-fed/ui',
+  },
+}