-
-
Notifications
You must be signed in to change notification settings - Fork 520
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.
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
feat: Support Yarn PnP #3209
base: main
Are you sure you want to change the base?
feat: Support Yarn PnP #3209
Conversation
39187e4
to
fc38e7f
Compare
fc38e7f
to
ab78f3c
Compare
ab78f3c
to
7641f6f
Compare
packages/api/core/src/api/start.ts
Outdated
@@ -153,6 +153,8 @@ export default async ({ | |||
} as NodeJS.ProcessEnv, | |||
}; | |||
|
|||
delete spawnOpts.env.NODE_OPTIONS; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you explain why this is necessary? I'm a bit weary about what other effects this might have.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See below
@dsanders11 When executing script in package.json, .pnp.cjs is injected through NODE_OPTIONS because the pnp module loader is required. NODE_OPTIONS:
|
7641f6f
to
977f624
Compare
977f624
to
2888d82
Compare
@jclab-joseph @dsanders11 @erickzhao any update? Related #3622 |
@dsanders11 Why PnP loader arguments aren't needed? Currently, I get another error: #3622 (comment) |
@jclab-joseph @dsanders11 @erickzhao what's the problem to merge this PR? |
My diffs, still working with @electron-forge/corediff --git a/dist/api/start.js b/dist/api/start.js
index db36a549af102fd75d23684f5d829fd4c61dbb7b..7d55e2bb26be67b52162b8e571b56e2f023e3bf6 100644
--- a/dist/api/start.js
+++ b/dist/api/start.js
@@ -15,6 +15,13 @@ const hook_1 = require("../util/hook");
const read_package_json_1 = require("../util/read-package-json");
const resolve_dir_1 = __importDefault(require("../util/resolve-dir"));
const d = (0, debug_1.default)('electron-forge:start');
+function removePnpLoaderArguments(input) {
+ if (!input) return input;
+ return input.replace(
+ /((--require\s+[^"].+\.pnp\.cjs)|(--experimental-loader\s+[^"].+\.pnp\.loader\.mjs)|(--require\s+".+\.pnp\.cjs")|(--experimental-loader\s+".+\.pnp\.loader\.mjs")) ?/g,
+ ''
+ );
+}
exports.default = (0, tracer_1.autoTrace)({ name: 'start()', category: '@electron-forge/core' }, async (childTrace, { dir: providedDir = process.cwd(), appPath = '.', interactive = false, enableLogging = false, args = [], runAsNode = false, inspect = false, inspectBrk = false, }) => {
const platform = process.env.npm_config_platform || process.platform;
const arch = process.env.npm_config_arch || process.arch;
@@ -118,6 +125,7 @@ exports.default = (0, tracer_1.autoTrace)({ name: 'start()', category: '@electro
: {}),
},
};
+ spawnOpts.env.NODE_OPTIONS = removePnpLoaderArguments(spawnOpts.env.NODE_OPTIONS);
if (runAsNode) {
spawnOpts.env.ELECTRON_RUN_AS_NODE = 'true';
} @electron-forge/core-utilsdiff --git a/dist/electron-version.js b/dist/electron-version.js
index 55800845e873a05b04603f55b8bcd0639a8489a6..c7beb03fa1ea0507ae735b80fa7265ba5570afe8 100644
--- a/dist/electron-version.js
+++ b/dist/electron-version.js
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.updateElectronDependency = exports.getElectronVersion = exports.getElectronModulePath = exports.PackageNotFoundError = void 0;
const path_1 = __importDefault(require("path"));
const debug_1 = __importDefault(require("debug"));
-const find_up_1 = __importDefault(require("find-up"));
const fs_extra_1 = __importDefault(require("fs-extra"));
const semver_1 = __importDefault(require("semver"));
const yarn_or_npm_1 = require("./yarn-or-npm");
@@ -15,25 +14,6 @@ const electronPackageNames = ['electron-nightly', 'electron'];
function findElectronDep(dep) {
return electronPackageNames.includes(dep);
}
-async function findAncestorNodeModulesPath(dir, packageName) {
- d('Looking for a lock file to indicate the root of the repo');
- const lockPath = await (0, find_up_1.default)(['package-lock.json', 'yarn.lock', 'pnpm-lock.yaml'], { cwd: dir, type: 'file' });
- if (lockPath) {
- d(`Found lock file: ${lockPath}`);
- const nodeModulesPath = path_1.default.join(path_1.default.dirname(lockPath), 'node_modules', packageName);
- if (await fs_extra_1.default.pathExists(nodeModulesPath)) {
- return nodeModulesPath;
- }
- }
- return Promise.resolve(undefined);
-}
-async function determineNodeModulesPath(dir, packageName) {
- const nodeModulesPath = path_1.default.join(dir, 'node_modules', packageName);
- if (await fs_extra_1.default.pathExists(nodeModulesPath)) {
- return nodeModulesPath;
- }
- return findAncestorNodeModulesPath(dir, packageName);
-}
class PackageNotFoundError extends Error {
constructor(packageName, dir) {
super(`Cannot find the package "${packageName}". Perhaps you need to run "${(0, yarn_or_npm_1.safeYarnOrNpm)()} install" in "${dir}"?`);
@@ -53,15 +33,11 @@ function getElectronModuleName(packageJSON) {
return packageName;
}
async function getElectronPackageJSONPath(dir, packageName) {
- const nodeModulesPath = await determineNodeModulesPath(dir, packageName);
- if (!nodeModulesPath) {
+ try {
+ return require.resolve(`${packageName}/package.json`, { paths: [dir] });
+ } catch {
throw new PackageNotFoundError(packageName, dir);
}
- const electronPackageJSONPath = path_1.default.join(nodeModulesPath, 'package.json');
- if (await fs_extra_1.default.pathExists(electronPackageJSONPath)) {
- return electronPackageJSONPath;
- }
- return undefined;
}
async function getElectronModulePath(dir, packageJSON) {
const moduleName = getElectronModuleName(packageJSON); |
FYI @MarshallOfSound |
@erickzhao @dsanders11 please can you review? |
FYI @smallsung @malept |
@VerteDinde please can you review? |
@VerteDinde please can you review? plz! |
Summarize your changes:
Support Yarn PnP
require.resolve