Skip to content

Commit 8448e38

Browse files
林全昌林全昌
authored andcommitted
chore: 修复部分问题
1 parent c4c081a commit 8448e38

File tree

16 files changed

+154
-746
lines changed

16 files changed

+154
-746
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
.DS_Store
22
.idea
33
.history
4+
45
.cache
6+
.turbo
7+
58
.temp
69
.hound
710
.fes

eslint.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export default await antfu({
66
indent: 4,
77
quotes: 'single',
88
semi: 'always',
9+
ignores: ['*.yaml'],
910
},
1011
typescript: true,
1112
vue: true,

jest.config.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"scripts": {
2121
"bootstrap": "pnpm i",
2222
"dev": "node scripts/build.mjs --watch",
23-
"build": "node scripts/build.mjs",
23+
"build": "turbo run build",
2424
"release": "node scripts/release.mjs",
2525
"clean": "rm -rf ./node_modules & rm -rf packages/**/node_modules & rm -rf packages/**/.cache",
2626
"docs:dev": "vitepress dev docs",
@@ -38,7 +38,8 @@
3838
"execa": "^6.1.0",
3939
"minimist": "^1.2.6",
4040
"semver": "^7.3.6",
41-
"tsup": "^8.5.0"
41+
"tsup": "^8.5.0",
42+
"turbo": "^2.5.6"
4243
},
4344
"devDependencies": {
4445
"@antfu/eslint-config": "^5.2.2",

packages/builder-vite/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"ejs": "^3.1.6",
5151
"fast-glob": "^3.2.11",
5252
"fs-extra": "^11.3.1",
53-
"html-minifier-terser": "^6.1.0",
53+
"html-minifier-terser": "^7.2.0",
5454
"less": "^4.2.0",
5555
"node-html-parser": "^5.3.3",
5656
"pathe": "^0.2.0",

packages/builder-webpack/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
},
3636
"dependencies": {
3737
"@babel/core": "^7.28.3",
38-
"@babel/plugin-proposal-do-expressions": "^7.22.5",
39-
"@babel/plugin-proposal-export-default-from": "^7.22.17",
40-
"@babel/plugin-proposal-function-bind": "^7.22.5",
41-
"@babel/plugin-proposal-pipeline-operator": "^7.22.15",
38+
"@babel/plugin-proposal-do-expressions": "^7.28.3",
39+
"@babel/plugin-proposal-export-default-from": "^7.27.1",
40+
"@babel/plugin-proposal-function-bind": "^7.27.1",
41+
"@babel/plugin-proposal-pipeline-operator": "^7.27.1",
4242
"@babel/plugin-transform-runtime": "^7.28.3",
4343
"@babel/preset-env": "^7.28.3",
4444
"@babel/preset-typescript": "^7.27.1",

packages/builder-webpack/src/plugins/common/webpackConfig/define.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default function createDefineWebpackConfig({ config, publicPath, webpackC
1515
const define = stringifyObjValue({
1616
__VUE_OPTIONS_API__: true,
1717
__VUE_PROD_DEVTOOLS__: false,
18+
__VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false,
1819
...(config as any).define,
1920
});
2021

packages/compiler/src/service/index.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ export default class Service extends EventEmitter {
279279
this.setStage(ServiceStage.initPlugins);
280280
this._extraPlugins.push(...this.initialPlugins);
281281
while (this._extraPlugins.length) {
282-
await this.initPlugin(this._extraPlugins.shift()!);
282+
const plugin = this._extraPlugins.shift();
283+
await this.initPlugin(plugin!);
283284
}
284285
}
285286

@@ -393,13 +394,6 @@ export default class Service extends EventEmitter {
393394
..._plugins,
394395
);
395396
}
396-
397-
// 深度优先
398-
const extraPlugins = lodash.clone(this._extraPlugins);
399-
this._extraPlugins = [];
400-
while (extraPlugins.length) {
401-
await this.initPlugin(extraPlugins.shift()!);
402-
}
403397
}
404398

405399
async initPlugin(plugin: Plugin): Promise<void> {

packages/plugin-qiankun/examples/webpack-main/src/pages/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>hello wrold</div>
33
<FTabs v-model="activeKey">
44
<FTabPane name="webpack子应用首页" value="1">
5-
<MicroAppWithMemoHistory key="1" name="webpack-micro" url="/webpack" />
5+
<!-- <MicroAppWithMemoHistory key="1" name="webpack-micro" url="/webpack" /> -->
66
</FTabPane>
77
<FTabPane name="webpack子应用测试页" value="2">
88
<MicroAppWithMemoHistory key="2" name="webpack-micro" url="/webpack/test" />

packages/plugin-qiankun/examples/webpack-micro/package.json

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,6 @@
1010
"bugs": {
1111
"url": "https://github.com/WeBankFinTech/fes.js/issues"
1212
},
13-
"keywords": [
14-
"管理端",
15-
"fes",
16-
"fast",
17-
"easy",
18-
"strong"
19-
],
20-
"files": [
21-
".eslintrc.js",
22-
".fes.js",
23-
".fes.prod.js",
24-
".gitignore",
25-
"/config",
26-
"/src",
27-
"README.md",
28-
"mock.js",
29-
"package.json",
30-
"tsconfig.json"
31-
],
3213
"scripts": {
3314
"build": "fes build",
3415
"prod": "FES_ENV=prod fes build",

0 commit comments

Comments
 (0)