wip: suppoer vite2 -- import.meta.glob

vben
1 parent daf2b1e0
Showing 7 changed files with 44 additions and 71 deletions
build/script/hackXlsx.ts
build/utils.ts
package.json
src/locales/getMessage.ts
src/router/menus/index.ts
src/router/routes/index.ts
yarn.lock
-import fs from 'fs';
+import fs from 'fs-extra';
 import path from 'path';
@@ -11,39 +11,6 @@ export const isFunction = (arg: unknown): arg is (...args: any[]) =&gt; any =&gt;
 export const isRegExp = (arg: unknown): arg is RegExp =>
   Object.prototype.toString.call(arg) === '[object RegExp]';
-/*
- * Read all files in the specified folder, filter through regular rules, and return file path array
- * @param root Specify the folder path
- * [@param] reg Regular expression for filtering files, optional parameters
- * Note: It can also be deformed to check whether the file path conforms to regular rules. The path can be a folder or a file. The path that does not exist is also fault-tolerant.
- */
-export function readAllFile(root: string, reg: RegExp) {
-  let resultArr: string[] = [];
-  try {
-    if (fs.existsSync(root)) {
-      const stat = fs.lstatSync(root);
-      if (stat.isDirectory()) {
-        // dir
-        const files = fs.readdirSync(root);
-        files.forEach(function (file) {
-          const t = readAllFile(root + '/' + file, reg);
-          resultArr = resultArr.concat(t);
-        });
-      } else {
-        if (reg !== undefined) {
-          if (isFunction(reg.test) && reg.test(root)) {
-            resultArr.push(root);
-          }
-        } else {
-          resultArr.push(root);
-        }
-      }
-    }
-  } catch (error) {}
-
-  return resultArr;
-}
-
 /**
  * get client ip address
  */
@@ -183,6 +150,3 @@ export function warnConsole(message: any) {
 export function getCwdPath(...dir: string[]) {
   return path.resolve(process.cwd(), ...dir);
 }
-
-// export const run = (bin: string, args: any, opts = {}) =>
-//   execa(bin, args, { stdio: 'inherit', ...opts });
@@ -3,9 +3,9 @@
   "version": "2.0.0-rc.16",
   "scripts": {
     "bootstrap": "yarn install",
-    "serve": "cross-env  vite ",
-    "build": "cross-env  vite build && esno ./build/script/postBuild.ts",
-    "build:no-cache": "yarn  clean:cache && npm run build",
+    "serve": "vite",
+    "build": "vite build && esno ./build/script/postBuild.ts",
+    "build:no-cache": "yarn clean:cache && npm run build",
     "report": "cross-env REPORT=true npm run build ",
     "preview": "npm run build && esno ./build/script/preview.ts",
     "preview:dist": "esno ./build/script/preview.ts",
@@ -47,7 +47,7 @@
   "devDependencies": {
     "@commitlint/cli": "^11.0.0",
     "@commitlint/config-conventional": "^11.0.0",
-    "@iconify/json": "^1.1.283",
+    "@iconify/json": "^1.1.284",
     "@ls-lint/ls-lint": "^1.9.2",
     "@purge-icons/generated": "^0.5.0",
     "@types/echarts": "^4.9.3",
@@ -84,7 +84,7 @@
     "fs-extra": "^9.0.1",
     "husky": "^4.3.7",
     "koa-static": "^5.0.0",
-    "less": "^4.0.0",
+    "less": "^4.1.0",
     "lint-staged": "^10.5.3",
     "portfinder": "^1.0.28",
     "postcss-import": "^14.0.0",
@@ -98,12 +98,12 @@
     "stylelint-order": "^4.1.0",
     "ts-node": "^9.1.0",
     "typescript": "^4.1.3",
-    "vite": "^2.0.0-beta.16",
+    "vite": "^2.0.0-beta.19",
     "vite-plugin-html": "^2.0.0-beta.5",
     "vite-plugin-import-context": "^1.0.0-rc.1",
     "vite-plugin-mock": "^2.0.0-beta.1",
     "vite-plugin-purge-icons": "^0.5.0",
-    "vite-plugin-pwa": "^0.3.2",
+    "vite-plugin-pwa": "^0.3.3",
     "vue-eslint-parser": "^7.3.0",
     "yargs": "^16.2.0"
   },
 import { genMessage } from './helper';
-import modules from 'glob:./lang/**/*.ts';
+const modules = import.meta.globEager('./lang/**/*.ts');
 export default genMessage(modules);
@@ -9,7 +9,7 @@ import router from &#39;/@/router&#39;;
 import { PermissionModeEnum } from '/@/enums/appEnum';
 import { pathToRegexp } from 'path-to-regexp';
-import modules from 'glob:./modules/**/*.ts';
+const modules = import.meta.globEager('./modules/**/*.ts');
 const menuModules: MenuModule[] = [];
@@ -6,7 +6,7 @@ import { mainOutRoutes } from &#39;./mainOut&#39;;
 import { PageEnum } from '/@/enums/pageEnum';
 import { t } from '/@/hooks/web/useI18n';
-import modules from 'glob:./modules/**/*.ts';
+const modules = import.meta.globEager('./modules/**/*.ts');
 const routeModuleList: AppRouteModule[] = [];
@@ -1182,10 +1182,10 @@
   resolved "https://registry.npmjs.org/@iconify/iconify/-/iconify-2.0.0-rc.5.tgz#ac725a2ea40a0626d02dfb31482050751a0e6d84"
   integrity sha512-A65cga+dug1Z5Y6T7euq1Fnk5Wc7Qu6yn6mVBAfo2SnPndekl9JC+eBe2M3RdTJIdIi10p7OUs7ntKKQLK1j5w==
-"@iconify/json@^1.1.283":
-  version "1.1.283"
-  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.283.tgz#d82d1cce28b1e80db983d7308414f62f87b6ea18"
-  integrity sha512-N15g8BMH7Q7xRA65f7H2Exp2oeYh3iuWBrNeC471WxHC6O5oQgyOBzST7FHJMOD3Ik++fSre2utjI+o0IrzCzw==
+"@iconify/json@^1.1.284":
+  version "1.1.284"
+  resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.284.tgz#d8a70ed9cfc76a03bbc00fabdca19cc0a9134760"
+  integrity sha512-NjTud7YfBbZrsib5AB35Qp5fgy2FKv4suRRetqXFZxuFdTcxEje8CiMQVdB8rFLMrx96lfY0dX4VDSB7luYwVw==
 "@intlify/core-base@9.0.0-beta.16":
   version "9.0.0-beta.16"
@@ -3196,7 +3196,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
-debug@^3.1.0, debug@^3.1.1:
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   version "3.2.7"
   resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4428,7 +4428,7 @@ husky@^4.3.7:
     slash "^3.0.0"
     which-pm-runs "^1.0.0"
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4979,10 +4979,10 @@ koa-static@^5.0.0:
     debug "^3.1.0"
     koa-send "^5.0.0"
-less@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/less/-/less-4.0.0.tgz#d238cc25576c1f722794dbca4ac82e5e3c7e9e65"
-  integrity sha512-av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw==
+less@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/less/-/less-4.1.0.tgz#a12708d1951239db1c9d7eaa405f1ebac9a75b8d"
+  integrity sha512-w1Ag/f34g7LwtQ/sMVSGWIyZx+gG9ZOAEtyxeX1fG75is6BMyC2lD5kG+1RueX7PkAvlQBm2Lf2aN2j0JbVr2A==
   dependencies:
     copy-anything "^2.0.1"
     parse-node-version "^1.0.1"
@@ -4993,7 +4993,7 @@ less@^4.0.0:
     image-size "~0.5.0"
     make-dir "^2.1.0"
     mime "^1.4.1"
-    native-request "^1.0.5"
+    needle "^2.5.2"
     source-map "~0.6.0"
 levn@^0.4.1:
@@ -5556,16 +5556,20 @@ nanopop@^2.1.0:
   resolved "https://registry.npmjs.org/nanopop/-/nanopop-2.1.0.tgz#23476513cee2405888afd2e8a4b54066b70b9e60"
   integrity sha512-jGTwpFRexSH+fxappnGQtN9dspgE2ipa1aOjtR24igG0pv6JCxImIAmrLRHX+zUF5+1wtsFVbKyfP51kIGAVNw==
-native-request@^1.0.5:
-  version "1.0.8"
-  resolved "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb"
-  integrity sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+needle@^2.5.2:
+  version "2.6.0"
+  resolved "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe"
+  integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 neo-async@^2.6.0:
   version "2.6.2"
   resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -6742,6 +6746,11 @@ safe-regex@^1.1.0:
   resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+sax@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 scroll-into-view-if-needed@^2.2.25:
   version "2.2.26"
   resolved "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz#e4917da0c820135ff65ad6f7e4b7d7af568c4f13"
@@ -7826,20 +7835,20 @@ vite-plugin-purge-icons@^0.5.0:
     "@purge-icons/generated" "^0.5.0"
     rollup-plugin-purge-icons "^0.5.0"
-vite-plugin-pwa@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.3.2.tgz#002ecee5ab8fa2384e5fa3cf0cb3fb1b22f5e3a9"
-  integrity sha512-NxoueGlURbMvW4A6tBt26LQ8kw7p7QeLnGdVvfzttSeQnTHYsV1KIzhe10jRY1/91UODs4pmIPqTvRwuaatXow==
+vite-plugin-pwa@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.3.3.tgz#00ece9b7b558153a4afa3fbbac2913c5b3ff6fa8"
+  integrity sha512-aojgEk9u1Aaoo80zT8AdhGlPUrWHmV9fdJhbj/9vvEyj02DJQCvu7rr5gEJJRjtUSS+xtzIWzy2Rc3P+x4gD5A==
   dependencies:
     debug "^4.3.2"
     fast-glob "^3.2.4"
     pretty-bytes "^5.5.0"
     workbox-build "^6.0.2"
-vite@^2.0.0-beta.16:
-  version "2.0.0-beta.16"
-  resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.16.tgz#ad1c01b82072370cfe8440327adc47669e11496b"
-  integrity sha512-+4XGgMpY+MuDoDi+kB2bq1W2dgqE5pJ1wU8HZ2VdJy8qVyYF/bo7IOP56ZbWMpij4b71Bat5SetyE+r6wrETbg==
+vite@^2.0.0-beta.19:
+  version "2.0.0-beta.19"
+  resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.19.tgz#9e1a3ff4843d8e72fc2b771691c43124ceeacd21"
+  integrity sha512-6EJAPypH8m9lCK2pB1UfU+qBw65wCHFoMITtFotDAd03m5hz2d9cPXfPgaCk0PhQPgtGcgn5xeAfLIdZ5e6cPA==
   dependencies:
     esbuild "^0.8.26"
     postcss "^8.2.1"