Skip to content

Commit 6dd9fe8

Browse files
authored
build: update vite version and fix inline-chunk plugin (#2722)
1 parent 269aa65 commit 6dd9fe8

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

internals/cli/package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,13 @@
11
{
22
"name": "internal-cli",
3-
"private": true,
43
"type": "commonjs",
54
"version": "1.0.5-mf.0",
5+
"private": true,
66
"description": "internal-cli",
7-
"devDependencies": {
8-
"@babel/core": "^7.5.5",
9-
"@babel/preset-env": "7.16.7",
10-
"@opentiny-internal/unplugin-virtual-template": "workspace:*",
11-
"@opentiny/vue-vite-template2jsx": "workspace:*",
12-
"@rollup/plugin-babel": "^6.0.3",
13-
"@rollup/plugin-commonjs": "^24.0.1",
14-
"@types/fs-extra": "^11.0.1",
15-
"@vue/tsconfig": "^0.4.0",
16-
"chalk": "2.4.2",
17-
"commander": "^10.0.0",
18-
"esbuild-register": "^3.4.2",
19-
"find-up": "^5.0.0",
20-
"fs-extra": "^11.1.0",
21-
"handlebars": "4.7.7",
22-
"prettier": "^2.7.1",
23-
"rollup": "^3.7.3",
24-
"semver": "^7.3.8",
25-
"tsup": "7.2.0",
26-
"vite": "^4.3.8",
27-
"typescript": "catalog:",
28-
"tailwindcss": "^3.2.4"
29-
},
7+
"main": "./dist/cjs/index.js",
308
"bin": {
319
"cli": "./dist/cjs/index.js"
3210
},
33-
"main": "./dist/cjs/index.js",
3411
"scripts": {
3512
"build": "tsup",
3613
"// -------注意带 # 开头的脚本命令不要直接执行------- ": "",
@@ -56,14 +33,37 @@
5633
"build:chartTheme": "esno src/index.ts build:chartTheme"
5734
},
5835
"dependencies": {
36+
"@opentiny/huicharts": "~1.0.0",
5937
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
6038
"esno": "^4.7.0",
6139
"fast-glob": "^3.2.12",
6240
"rollup-plugin-replace": "^2.2.0",
6341
"rollup-plugin-visualizer": "^5.12.0",
6442
"vite-plugin-dts": "~3.0.0",
6543
"vite-plugin-svgr": "^3.2.0",
66-
"vite-svg-loader": "^3.6.0",
67-
"@opentiny/huicharts": "~1.0.0"
44+
"vite-svg-loader": "^3.6.0"
45+
},
46+
"devDependencies": {
47+
"@babel/core": "^7.5.5",
48+
"@babel/preset-env": "7.16.7",
49+
"@opentiny-internal/unplugin-virtual-template": "workspace:*",
50+
"@opentiny/vue-vite-template2jsx": "workspace:*",
51+
"@rollup/plugin-babel": "^6.0.3",
52+
"@rollup/plugin-commonjs": "^24.0.1",
53+
"@types/fs-extra": "^11.0.1",
54+
"@vue/tsconfig": "^0.4.0",
55+
"chalk": "2.4.2",
56+
"commander": "^10.0.0",
57+
"esbuild-register": "^3.4.2",
58+
"find-up": "^5.0.0",
59+
"fs-extra": "^11.1.0",
60+
"handlebars": "4.7.7",
61+
"prettier": "^2.7.1",
62+
"rollup": "^3.7.3",
63+
"semver": "^7.3.8",
64+
"tailwindcss": "^3.2.4",
65+
"tsup": "7.2.0",
66+
"typescript": "catalog:",
67+
"vite": "catalog:"
6868
}
6969
}

internals/cli/src/commands/build/rollup/inline-chunks.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default function ({ deleteInlinedFiles = true }): Plugin {
2727
if (!jsChunk.code) continue
2828

2929
if (format === 'es') {
30-
const reg = /^import(\s*.+\s*from)?\s+"[./]+(.+-[a-f0-9]{8}.+)".*$/gim
30+
const reg = /^import(\s*.+\s*from)?\s+"[./]+(.+-[A-Za-z0-9_-]{8}\.[mc]?js)".*$/gim
3131
const matchArr = jsChunk.code.match(reg)
3232
if (matchArr) {
3333
const filePath = path.join(dir, jsName)
@@ -40,7 +40,7 @@ export default function ({ deleteInlinedFiles = true }): Plugin {
4040
}
4141

4242
if (format === 'cjs') {
43-
const reg = /require\("[./]+(.+-[a-f0-9]{8}.+)".*$/gim
43+
const reg = /require\("[./]+(.+-[A-Za-z0-9_-]{8}\.[mc]?js)".*$/gim
4444
const matchArr = jsChunk.code.match(reg)
4545
if (matchArr) {
4646
const filePath = path.join(dir, jsName)

0 commit comments

Comments
 (0)