From aed1703e9eb1834ef7dcbda0607e170fb4ecd6bf Mon Sep 17 00:00:00 2001
From: Gimmy <975402925@qq.com>
Date: Thu, 2 Jan 2025 10:53:19 +0800
Subject: [PATCH] build: update vite version and fix inline-chunk plugin

---
 internals/cli/package.json                    | 54 +++++++++----------
 .../commands/build/rollup/inline-chunks.ts    |  4 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/internals/cli/package.json b/internals/cli/package.json
index 06ae60ff31..38ed2e2ad2 100644
--- a/internals/cli/package.json
+++ b/internals/cli/package.json
@@ -1,36 +1,13 @@
 {
   "name": "internal-cli",
-  "private": true,
   "type": "commonjs",
   "version": "1.0.5-mf.0",
+  "private": true,
   "description": "internal-cli",
-  "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "7.16.7",
-    "@opentiny-internal/unplugin-virtual-template": "workspace:*",
-    "@opentiny/vue-vite-template2jsx": "workspace:*",
-    "@rollup/plugin-babel": "^6.0.3",
-    "@rollup/plugin-commonjs": "^24.0.1",
-    "@types/fs-extra": "^11.0.1",
-    "@vue/tsconfig": "^0.4.0",
-    "chalk": "2.4.2",
-    "commander": "^10.0.0",
-    "esbuild-register": "^3.4.2",
-    "find-up": "^5.0.0",
-    "fs-extra": "^11.1.0",
-    "handlebars": "4.7.7",
-    "prettier": "^2.7.1",
-    "rollup": "^3.7.3",
-    "semver": "^7.3.8",
-    "tsup": "7.2.0",
-    "vite": "^4.3.8",
-    "typescript": "catalog:",
-    "tailwindcss": "^3.2.4"
-  },
+  "main": "./dist/cjs/index.js",
   "bin": {
     "cli": "./dist/cjs/index.js"
   },
-  "main": "./dist/cjs/index.js",
   "scripts": {
     "build": "tsup",
     "// -------注意带 # 开头的脚本命令不要直接执行------- ": "",
@@ -56,6 +33,7 @@
     "build:chartTheme": "esno src/index.ts build:chartTheme"
   },
   "dependencies": {
+    "@opentiny/huicharts": "~1.0.0",
     "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
     "esno": "^4.7.0",
     "fast-glob": "^3.2.12",
@@ -63,7 +41,29 @@
     "rollup-plugin-visualizer": "^5.12.0",
     "vite-plugin-dts": "~3.0.0",
     "vite-plugin-svgr": "^3.2.0",
-    "vite-svg-loader": "^3.6.0",
-    "@opentiny/huicharts": "~1.0.0"
+    "vite-svg-loader": "^3.6.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "7.16.7",
+    "@opentiny-internal/unplugin-virtual-template": "workspace:*",
+    "@opentiny/vue-vite-template2jsx": "workspace:*",
+    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-commonjs": "^24.0.1",
+    "@types/fs-extra": "^11.0.1",
+    "@vue/tsconfig": "^0.4.0",
+    "chalk": "2.4.2",
+    "commander": "^10.0.0",
+    "esbuild-register": "^3.4.2",
+    "find-up": "^5.0.0",
+    "fs-extra": "^11.1.0",
+    "handlebars": "4.7.7",
+    "prettier": "^2.7.1",
+    "rollup": "^3.7.3",
+    "semver": "^7.3.8",
+    "tailwindcss": "^3.2.4",
+    "tsup": "7.2.0",
+    "typescript": "catalog:",
+    "vite": "catalog:"
   }
 }
diff --git a/internals/cli/src/commands/build/rollup/inline-chunks.ts b/internals/cli/src/commands/build/rollup/inline-chunks.ts
index 5e455ad57b..9cc0b9f9ef 100644
--- a/internals/cli/src/commands/build/rollup/inline-chunks.ts
+++ b/internals/cli/src/commands/build/rollup/inline-chunks.ts
@@ -27,7 +27,7 @@ export default function ({ deleteInlinedFiles = true }): Plugin {
         if (!jsChunk.code) continue
 
         if (format === 'es') {
-          const reg = /^import(\s*.+\s*from)?\s+"[./]+(.+-[a-f0-9]{8}.+)".*$/gim
+          const reg = /^import(\s*.+\s*from)?\s+"[./]+(.+-[A-Za-z0-9_-]{8}\.[mc]?js)".*$/gim
           const matchArr = jsChunk.code.match(reg)
           if (matchArr) {
             const filePath = path.join(dir, jsName)
@@ -40,7 +40,7 @@ export default function ({ deleteInlinedFiles = true }): Plugin {
         }
 
         if (format === 'cjs') {
-          const reg = /require\("[./]+(.+-[a-f0-9]{8}.+)".*$/gim
+          const reg = /require\("[./]+(.+-[A-Za-z0-9_-]{8}\.[mc]?js)".*$/gim
           const matchArr = jsChunk.code.match(reg)
           if (matchArr) {
             const filePath = path.join(dir, jsName)