Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: onCheckCode hook not working for windows #12730

Merged
merged 13 commits into from
Nov 14, 2024
Merged

fix: onCheckCode hook not working for windows #12730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
371d1df
fix: 处理oncheckcode在window环境下无法触发的问题
sh0ckey1 Oct 8, 2024
2b335b9
dep(@umijs/preset-umi): @umijs/[email protected]
sorrycc Oct 10, 2024
bb8f86d
release: 4.3.25
sorrycc Oct 10, 2024
a60141a
chore: ⬆️ @umijs/bundler-mako 0.9.0
stormslowly Oct 14, 2024
33b5640
release: 4.3.26
stormslowly Oct 14, 2024
a6dd563
dep(@umijs/preset-umi): @umijs/[email protected]
stormslowly Oct 16, 2024
31386df
release: 4.3.27
stormslowly Oct 16, 2024
da937b8
dep(@umijs/preset-umi): @umijs/[email protected]
stormslowly Oct 23, 2024
00379ec
release: 4.0.0-canary.20241023.1
stormslowly Oct 23, 2024
d971a4a
dep(@umijs/preset-umi): @umijs/[email protected]
PeachScript Oct 25, 2024
fe912d8
release: 4.3.28
PeachScript Oct 25, 2024
11e98e8
Merge branch 'umijs:master' into fix/oncheckcode_on_windows
sh0ckey1 Oct 29, 2024
5849bf0
fix: handling windows path matching failures
sh0ckey1 Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/preset-umi/src/features/check/check.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ export default (api: IApi) => {
});

function isAbsolutePath(path: string) {
return path.startsWith('/') || path.startsWith('@fs/');
return (
path.startsWith('/') ||
path.startsWith('@fs/') ||
/^[A-Za-z]:\//.test(path) // fix windows path after transform by winPath method
);
}
};
8 changes: 4 additions & 4 deletions packages/preset-umi/src/features/transform/babelPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ export default function () {
) {
opts.onCheckCode({
args: {
...cache.get(state.opts.filename),
file: state.opts.filename,
isFromTmp: state.opts.filename.startsWith(opts.absTmpPath),
...cache.get(filename),
file: filename,
isFromTmp: filename.startsWith(opts.absTmpPath),
},
});
}
Expand All @@ -48,7 +48,7 @@ export default function () {
enter(path: Babel.NodePath<t.Program>, state: any) {
opts = state.opts;
// @ts-ignore
const file = path?.hub.file.opts.filename;
const file = winPath(path?.hub.file.opts.filename);
// @ts-ignore
const cache = this.cache;
// reset cache
Expand Down
Loading