Skip to content

refactor: use nodeUtils.isBuiltinModule in makeApi.ts #3917

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
arcanis merged 1 commit into from
Jan 3, 2022
Merged

refactor: use nodeUtils.isBuiltinModule in makeApi.ts #3917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions .pnp.cjs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions .yarn/versions/d2700380.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
releases:
"@yarnpkg/cli": patch
"@yarnpkg/plugin-pnp": patch
"@yarnpkg/pnp": patch

declined:
- "@yarnpkg/esbuild-plugin-pnp"
- "@yarnpkg/plugin-compat"
- "@yarnpkg/plugin-constraints"
- "@yarnpkg/plugin-dlx"
- "@yarnpkg/plugin-essentials"
- "@yarnpkg/plugin-init"
- "@yarnpkg/plugin-interactive-tools"
- "@yarnpkg/plugin-nm"
- "@yarnpkg/plugin-npm-cli"
- "@yarnpkg/plugin-pack"
- "@yarnpkg/plugin-patch"
- "@yarnpkg/plugin-pnpm"
- "@yarnpkg/plugin-stage"
- "@yarnpkg/plugin-typescript"
- "@yarnpkg/plugin-version"
- "@yarnpkg/plugin-workspace-tools"
- "@yarnpkg/builder"
- "@yarnpkg/core"
- "@yarnpkg/doctor"
- "@yarnpkg/nm"
- "@yarnpkg/pnpify"
- "@yarnpkg/sdks"
2 changes: 1 addition & 1 deletion packages/yarnpkg-pnp/sources/hook.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions packages/yarnpkg-pnp/sources/loader/makeApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {inspect}
import {PackageInformation, PackageLocator, PnpApi, RuntimeState, PhysicalPackageLocator, DependencyTarget, ResolveToUnqualifiedOptions, ResolveUnqualifiedOptions, ResolveRequestOptions} from '../types';

import {ErrorCode, makeError, getPathForDisplay} from './internalTools';
import * as nodeUtils from './nodeUtils';

export type MakeApiOptions = {
allowDebug?: boolean;
Expand All @@ -19,10 +20,6 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
const alwaysWarnOnFallback = Number(process.env.PNP_ALWAYS_WARN_ON_FALLBACK) > 0;
const debugLevel = Number(process.env.PNP_DEBUG_LEVEL);

// @ts-expect-error
const builtinModules = new Set(Module.builtinModules || Object.keys(process.binding(`natives`)));
const isBuiltinModule = (request: string) => builtinModules.has(request) || request.startsWith(`node:`);

// Splits a require request into its components, or return null if the request is a file path
const pathRegExp = /^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/;

Expand Down Expand Up @@ -531,7 +528,7 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
return npath.toPortablePath(opts.pnpapiResolution);

// Bailout if the request is a native module
if (considerBuiltins && isBuiltinModule(request))
if (considerBuiltins && nodeUtils.isBuiltinModule(request))
return null;

const requestForDisplay = getPathForDisplay(request);
Expand Down Expand Up @@ -700,7 +697,7 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
}
}
} else if (dependencyReference === undefined) {
if (!considerBuiltins && isBuiltinModule(request)) {
if (!considerBuiltins && nodeUtils.isBuiltinModule(request)) {
if (isDependencyTreeRoot(issuerLocator)) {
error = makeError(
ErrorCode.UNDECLARED_DEPENDENCY,
Expand Down Expand Up @@ -856,7 +853,7 @@ export function makeApi(runtimeState: RuntimeState, opts: MakeApiOptions): PnpAp
? isPathIgnored(issuer)
: false;

const remappedPath = (!considerBuiltins || !isBuiltinModule(request)) && !isIssuerIgnored()
const remappedPath = (!considerBuiltins || !nodeUtils.isBuiltinModule(request)) && !isIssuerIgnored()
? resolveUnqualifiedExport(request, unqualifiedPath, conditions)
: unqualifiedPath;

Expand Down