Skip to content

fix(pluginutils): optimize createFilter and normalizePath #1750

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

Merged
merged 6 commits into from
Sep 23, 2024
Merged

fix(pluginutils): optimize createFilter and normalizePath #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c5dc1a
perf(pluginutils): optimize `createFilter` and `normalizePath`
kermanx Jul 24, 2024
792f73c
fix
kermanx Jul 24, 2024
0cb9b2c
fix
kermanx Jul 24, 2024
85384e8
fix: use `win32.sep` and `posix.sep`
kermanx Sep 23, 2024
c90ba79
Merge branch 'master' into perf/create-filter
kermanx Sep 23, 2024
023b547
Merge remote-tracking branch 'upstream/master' into perf/create-filter
shellscape Sep 23, 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
5 changes: 4 additions & 1 deletion packages/pluginutils/src/createFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ const createFilter: CreateFilter = function createFilter(include?, exclude?, opt
const includeMatchers = ensureArray(include).map(getMatcher);
const excludeMatchers = ensureArray(exclude).map(getMatcher);

if (!includeMatchers.length && !excludeMatchers.length)
return (id) => typeof id === 'string' && !id.includes('\0');

return function result(id: string | unknown): boolean {
if (typeof id !== 'string') return false;
if (/\0/.test(id)) return false;
if (id.includes('\0')) return false;

const pathId = normalizePath(id);

Expand Down
4 changes: 3 additions & 1 deletion packages/pluginutils/src/normalizePath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { win32, posix } from 'path';

import type { NormalizePath } from '../types';

const normalizePathRegExp = new RegExp(`\\${win32.sep}`, 'g');

const normalizePath: NormalizePath = function normalizePath(filename: string) {
return filename.split(win32.sep).join(posix.sep);
return filename.replace(normalizePathRegExp, posix.sep);
};

export { normalizePath as default };
Loading