Skip to content

Commit 73d27b0

Browse files
zhangyuangzhangyuang
committed
fix: set vue-loader dependencies of webpack to 4.0
1 parent 55f9df1 commit 73d27b0

File tree

10 files changed

+280
-392
lines changed

10 files changed

+280
-392
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 54 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ jobs:
2727
with:
2828
path: |
2929
~/Library/pnpm/store
30-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
31-
restore-keys: |
32-
${{ runner.os }}-v1.0.0-
30+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
31+
3332

3433
- name: Install pnpm
3534
uses: pnpm/action-setup@v4
@@ -90,9 +89,8 @@ jobs:
9089
/home/runner/.cache/Cypress
9190
/home/runner/setup-pnpm/node_modules/.bin/store/v10
9291
93-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
94-
restore-keys: |
95-
${{ runner.os }}-v1.0.0-
92+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
93+
9694

9795
- name: Install pnpm
9896
uses: pnpm/action-setup@v4
@@ -140,9 +138,8 @@ jobs:
140138
/home/runner/.cache/Cypress
141139
/home/runner/setup-pnpm/node_modules/.bin/store/v10
142140
143-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
144-
restore-keys: |
145-
${{ runner.os }}-v1.0.0-
141+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
142+
146143

147144
- name: Install pnpm
148145
uses: pnpm/action-setup@v4
@@ -189,9 +186,8 @@ jobs:
189186
/home/runner/.cache/Cypress
190187
/home/runner/setup-pnpm/node_modules/.bin/store/v10
191188
192-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
193-
restore-keys: |
194-
${{ runner.os }}-v1.0.0-
189+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
190+
195191

196192
- name: Install pnpm
197193
uses: pnpm/action-setup@v4
@@ -239,9 +235,8 @@ jobs:
239235
/home/runner/.cache/Cypress
240236
/home/runner/setup-pnpm/node_modules/.bin/store/v10
241237
242-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
243-
restore-keys: |
244-
${{ runner.os }}-v1.0.0-
238+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
239+
245240

246241
- name: Install pnpm
247242
uses: pnpm/action-setup@v4
@@ -290,9 +285,8 @@ jobs:
290285
/home/runner/.cache/Cypress
291286
/home/runner/setup-pnpm/node_modules/.bin/store/v10
292287
293-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
294-
restore-keys: |
295-
${{ runner.os }}-v1.0.0-
288+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
289+
296290

297291
- name: Install pnpm
298292
uses: pnpm/action-setup@v4
@@ -341,9 +335,8 @@ jobs:
341335
/home/runner/.cache/Cypress
342336
/home/runner/setup-pnpm/node_modules/.bin/store/v10
343337
344-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
345-
restore-keys: |
346-
${{ runner.os }}-v1.0.0-
338+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
339+
347340

348341
- name: Install pnpm
349342
uses: pnpm/action-setup@v4
@@ -391,9 +384,8 @@ jobs:
391384
/home/runner/.cache/Cypress
392385
/home/runner/setup-pnpm/node_modules/.bin/store/v10
393386
394-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
395-
restore-keys: |
396-
${{ runner.os }}-v1.0.0-
387+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
388+
397389

398390
- name: Install pnpm
399391
uses: pnpm/action-setup@v4
@@ -441,9 +433,8 @@ jobs:
441433
/home/runner/.cache/Cypress
442434
/home/runner/setup-pnpm/node_modules/.bin/store/v10
443435
444-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
445-
restore-keys: |
446-
${{ runner.os }}-v1.0.0-
436+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
437+
447438

448439
- name: Install pnpm
449440
uses: pnpm/action-setup@v4
@@ -490,9 +481,8 @@ jobs:
490481
/home/runner/.cache/Cypress
491482
/home/runner/setup-pnpm/node_modules/.bin/store/v10
492483
493-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
494-
restore-keys: |
495-
${{ runner.os }}-v1.0.0-
484+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
485+
496486

497487
- name: Install pnpm
498488
uses: pnpm/action-setup@v4
@@ -541,9 +531,8 @@ jobs:
541531
/home/runner/.cache/Cypress
542532
/home/runner/setup-pnpm/node_modules/.bin/store/v10
543533
544-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
545-
restore-keys: |
546-
${{ runner.os }}-v1.0.0-
534+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
535+
547536

548537
- name: Install pnpm
549538
uses: pnpm/action-setup@v4
@@ -591,9 +580,8 @@ jobs:
591580
/home/runner/.cache/Cypress
592581
/home/runner/setup-pnpm/node_modules/.bin/store/v10
593582
594-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
595-
restore-keys: |
596-
${{ runner.os }}-v1.0.0-
583+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
584+
597585

598586
- name: Install pnpm
599587
uses: pnpm/action-setup@v4
@@ -640,9 +628,8 @@ jobs:
640628
/home/runner/.cache/Cypress
641629
/home/runner/setup-pnpm/node_modules/.bin/store/v10
642630
643-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
644-
restore-keys: |
645-
${{ runner.os }}-v1.0.0-
631+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
632+
646633

647634
- name: Install pnpm
648635
uses: pnpm/action-setup@v4
@@ -690,9 +677,8 @@ jobs:
690677
/home/runner/.cache/Cypress
691678
/home/runner/setup-pnpm/node_modules/.bin/store/v10
692679
693-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
694-
restore-keys: |
695-
${{ runner.os }}-v1.0.0-
680+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
681+
696682

697683
- name: Install pnpm
698684
uses: pnpm/action-setup@v4
@@ -740,9 +726,8 @@ jobs:
740726
/home/runner/.cache/Cypress
741727
/home/runner/setup-pnpm/node_modules/.bin/store/v10
742728
743-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
744-
restore-keys: |
745-
${{ runner.os }}-v1.0.0-
729+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
730+
746731

747732
- name: Install pnpm
748733
uses: pnpm/action-setup@v4
@@ -788,9 +773,8 @@ jobs:
788773
/home/runner/.cache/Cypress
789774
/home/runner/setup-pnpm/node_modules/.bin/store/v10
790775
791-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
792-
restore-keys: |
793-
${{ runner.os }}-v1.0.0-
776+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
777+
794778

795779
- name: Install pnpm
796780
uses: pnpm/action-setup@v4
@@ -836,9 +820,8 @@ jobs:
836820
/home/runner/.cache/Cypress
837821
/home/runner/setup-pnpm/node_modules/.bin/store/v10
838822
839-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
840-
restore-keys: |
841-
${{ runner.os }}-v1.0.0-
823+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
824+
842825

843826
- name: Install pnpm
844827
uses: pnpm/action-setup@v4
@@ -882,9 +865,8 @@ jobs:
882865
path: |
883866
/home/runner/.cache/Cypress
884867
/home/runner/setup-pnpm/node_modules/.bin/store/v10
885-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
886-
restore-keys: |
887-
${{ runner.os }}-v1.0.0-
868+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
869+
888870

889871
- name: Install pnpm
890872
uses: pnpm/action-setup@v4
@@ -931,9 +913,8 @@ jobs:
931913
/home/runner/.cache/Cypress
932914
/home/runner/setup-pnpm/node_modules/.bin/store/v10
933915
934-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
935-
restore-keys: |
936-
${{ runner.os }}-v1.0.0-
916+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
917+
937918

938919
- name: Install pnpm
939920
uses: pnpm/action-setup@v4
@@ -979,9 +960,8 @@ jobs:
979960
/home/runner/.cache/Cypress
980961
/home/runner/setup-pnpm/node_modules/.bin/store/v10
981962
982-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
983-
restore-keys: |
984-
${{ runner.os }}-v1.0.0-
963+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
964+
985965

986966
- name: Install pnpm
987967
uses: pnpm/action-setup@v4
@@ -1031,9 +1011,8 @@ jobs:
10311011
/home/runner/.cache/Cypress
10321012
/home/runner/setup-pnpm/node_modules/.bin/store/v10
10331013
1034-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1035-
restore-keys: |
1036-
${{ runner.os }}-v1.0.0-
1014+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1015+
10371016

10381017
- name: Install pnpm
10391018
uses: pnpm/action-setup@v4
@@ -1081,9 +1060,8 @@ jobs:
10811060
/home/runner/.cache/Cypress
10821061
/home/runner/setup-pnpm/node_modules/.bin/store/v10
10831062
1084-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1085-
restore-keys: |
1086-
${{ runner.os }}-v1.0.0-
1063+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1064+
10871065

10881066
- name: Install pnpm
10891067
uses: pnpm/action-setup@v4
@@ -1131,9 +1109,8 @@ jobs:
11311109
/home/runner/.cache/Cypress
11321110
/home/runner/setup-pnpm/node_modules/.bin/store/v10
11331111
1134-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1135-
restore-keys: |
1136-
${{ runner.os }}-v1.0.0-
1112+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1113+
11371114

11381115
- name: Install pnpm
11391116
uses: pnpm/action-setup@v4
@@ -1180,9 +1157,8 @@ jobs:
11801157
/home/runner/.cache/Cypress
11811158
/home/runner/setup-pnpm/node_modules/.bin/store/v10
11821159
1183-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1184-
restore-keys: |
1185-
${{ runner.os }}-v1.0.0-
1160+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1161+
11861162

11871163
- name: Install pnpm
11881164
uses: pnpm/action-setup@v4
@@ -1229,9 +1205,8 @@ jobs:
12291205
/home/runner/.cache/Cypress
12301206
/home/runner/setup-pnpm/node_modules/.bin/store/v10
12311207
1232-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1233-
restore-keys: |
1234-
${{ runner.os }}-v1.0.0-
1208+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1209+
12351210

12361211
- name: Install pnpm
12371212
uses: pnpm/action-setup@v4
@@ -1278,9 +1253,8 @@ jobs:
12781253
/home/runner/.cache/Cypress
12791254
/home/runner/setup-pnpm/node_modules/.bin/store/v10
12801255
1281-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1282-
restore-keys: |
1283-
${{ runner.os }}-v1.0.0-
1256+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1257+
12841258

12851259
- name: Install pnpm
12861260
uses: pnpm/action-setup@v4
@@ -1353,9 +1327,8 @@ jobs:
13531327
/home/runner/.cache/Cypress
13541328
/home/runner/setup-pnpm/node_modules/.bin/store/v10
13551329
1356-
key: ${{ runner.os }}-v1.1.2-${{ hashFiles('**/pnpm-lock.yaml') }}
1357-
restore-keys: |
1358-
${{ runner.os }}-v1.0.0-
1330+
key: ${{ runner.os }}-v1.1.2-${{ github.job }}-${{ hashFiles('**/pnpm-lock.yaml') }}
1331+
13591332

13601333
- name: Install pnpm
13611334
uses: pnpm/action-setup@v4

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,7 @@ e2e/screenshots
110110
e2e/videos
111111

112112

113-
.turbo
113+
.turbo
114+
115+
**/auto-imports.d.ts
116+
**/components.d.ts

‎.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ public-hoist-pattern[]=@vitejs/plugin-react-oxc
2323
public-hoist-pattern[]=rolldown
2424
public-hoist-pattern[]=*@rspack*
2525
public-hoist-pattern[]=rspack-chain
26+

‎.pnpmfile.cjs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@ function readPackage(pkg, context) {
22
if (pkg.name.includes('@vitejs')) {
33
pkg.peerDependencies.vite = 'npm:rolldown-vite@latest'
44
}
5-
6-
if (pkg.name === 'vue-loader') {
7-
if (pkg.version.startsWith('17')) {
8-
pkg.peerDependencies.webpack = '^5.0.0'
9-
pkg.dependencies.webpack = '^5.0.0'
10-
} else {
11-
pkg.peerDependencies.webpack = '^4.0.0'
12-
pkg.dependencies.webpack = '^4.0.0'
13-
}
5+
const vuePkgs = ['vue-loader', 'ssr-plugin-vue3', 'ssr-plugin-vue', 'ssr-plugin-react']
6+
if (vuePkgs.includes(pkg.name) && process.env.GITHUB_JOB) {
7+
const webpackVersion = process.env.GITHUB_JOB.includes('rspack') ? '^5.0.0' : '^4.0.0'
8+
pkg.dependencies.webpack = webpackVersion
9+
pkg.peerDependencies.webpack = webpackVersion
1410
}
1511
if (pkg.dependencies?.vite) {
1612
pkg.dependencies.vite = 'npm:rolldown-vite@latest'

‎package.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,6 @@
119119
"vue": "^3.0.0"
120120
}
121121
},
122-
"vue-loader@^17": {
123-
"peerDependencies": {
124-
"webpack": "^5.0.0"
125-
}
126-
},
127-
"vue-loader@^15": {
128-
"peerDependencies": {
129-
"webpack": "^4.0.0"
130-
}
131-
},
132122
"swiper@6": {
133123
"dependencies": {
134124
"vue": "^3.0.0"

‎packages/plugin-react/package.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@
4242
"react": ">=17.0.1",
4343
"react-dom": ">=17.0.0",
4444
"react-router": "^5.1.8",
45-
"react-router-dom": "^5.0.0",
46-
"webpack": "^4.0.0"
45+
"react-router-dom": "^5.0.0"
4746
},
4847
"devDependencies": {
4948
"@types/react18": "npm:@types/react@^18.0.0",
@@ -56,10 +55,5 @@
5655
"ssr-types": "workspace:*",
5756
"ssr-webpack": "workspace:*",
5857
"ssr-vite": "workspace:*"
59-
},
60-
"peerDependenciesMeta": {
61-
"webpack": {
62-
"optional": true
63-
}
6458
}
6559
}

0 commit comments

Comments
 (0)