@das-fed/cli 6.4.0-hot.20 → 6.4.0-hot.22

package/package.json

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

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

@@ -0,0 +1 @@
+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};

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/helper/modules/gen-auth/gen/dist/config.js

@@ -0,0 +1 @@
+window.config={};

package/src/commands/helper/modules/gen-auth/gen/dist/config.local.js

@@ -0,0 +1 @@
+window.config={};

package/src/commands/helper/modules/gen-auth/gen/dist/index.js

@@ -0,0 +1 @@
+let m={path:"/demo",component:()=>"virtual:module",meta:{keepAlive:!0}},l=(e,p)=>{var t=(s,e)=>async e=>{let t="string"==typeof e?e:"",a=("object"==typeof e&&(t=e.value),{method:s,url:t,headers:{}});return"get"!==a.method&&(a.params={...a.params,timestamp:(new Date).getTime()}),(a=p?await p(a):a).baseURL&&a.urlPrefix&&(a.baseURL=a.baseURL+a.urlPrefix),a};return{get:t("get"),post:t("post"),put:t("put"),patch:t("patch"),delete:t("delete")}},f=(t,e)=>l(null,async e=>(e.urlPrefix=t,e)),a=f("/test"),h=a.get("/user"),r=a.post("/user"),i=a.put("/user"),c=a.delete("/user"),p=Object.freeze(Object.defineProperty({__proto__:null,addUser:r,deleteUser:c,editUser:i,getUser:h},Symbol.toStringTag,{value:"Module"})),_={name:"示例",code:"demo",path:m.path,apis:p,btns:{add:{name:"新增按钮",apis:[r]},edit:{name:"编辑按钮",apis:[i]},delete:{name:"删除按钮",apis:[c]}}},g={path:"/",component:()=>"virtual:module"},b={name:"公告列表",code:"notice",path:g.path,apis:p,btns:{add:{name:"新增按钮",apis:[r]},edit:{name:"编辑按钮",apis:[i]},delete:{name:"删除按钮",apis:[c]}}},v=Object.assign({"./demo/index.ts":_,"./hello/index.ts":b}),U={code:"cms",name:"内容运营",modules:v};export{U as default};

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,29 @@
-# 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
+```
+
+## 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/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,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/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',
+  },
+}

package/src/commands/init/template/src/views/demo/router.ts

@@ -1,13 +1,13 @@
-import type { RouteRecordRaw } from 'vue-router'
-import { setI18nRule, setThemeRule } from '@das-fed/web'
-import i18n from './i18n'
-import theme from './theme'
-
-setI18nRule(i18n)
-setThemeRule(theme)
-
-export default {
-  path: '/demo',
-  component: () => import('./app.vue'),
-  meta: { keepAlive: true },
-} as RouteRecordRaw
+import type { RouteRecordRaw } from 'vue-router'
+import { setI18nRule, setThemeRule } from '@das-fed/web'
+import i18n from './i18n'
+import theme from './theme'
+
+setI18nRule(i18n)
+setThemeRule(theme)
+
+export default {
+  path: '/demo',
+  component: () => import('./app.vue'),
+  meta: { keepAlive: true },
+} as RouteRecordRaw