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

Fixes yarn run when used on workspaces + pnp #6444

Merged
merged 1 commit into from Sep 28, 2018
Merged

Fixes yarn run when used on workspaces + pnp #6444

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 35 additions & 8 deletions packages/pkg-tests/pkg-tests-specs/sources/workspace.js
View file
Open in desktop
Expand Up @@ -22,8 +22,8 @@ module.exports = (makeTemporaryEnv: PackageDriver) => {
await writeFile(
`${path}/packages/workspace-a/index.js`,
`
module.exports = 42;
`,
module.exports = 42;
`,
);

await run(`install`);
Expand Down Expand Up @@ -56,8 +56,8 @@ module.exports = (makeTemporaryEnv: PackageDriver) => {
await writeFile(
`${path}/packages/workspace-a/index.js`,
`
module.exports = require('workspace-b/package.json');
`,
module.exports = require('workspace-b/package.json');
`,
);

await writeJson(`${path}/packages/workspace-b/package.json`, {
Expand All @@ -71,8 +71,8 @@ module.exports = (makeTemporaryEnv: PackageDriver) => {
await writeFile(
`${path}/packages/workspace-b/index.js`,
`
module.exports = require('workspace-a/package.json');
`,
module.exports = require('workspace-a/package.json');
`,
);

await run(`install`);
Expand Down Expand Up @@ -110,8 +110,8 @@ module.exports = (makeTemporaryEnv: PackageDriver) => {
await writeFile(
`${path}/packages/workspace/index.js`,
`
module.exports = require('no-deps/package.json');
`,
module.exports = require('no-deps/package.json');
`,
);

await writeJson(`${path}/packages/no-deps/package.json`, {
Expand All @@ -128,5 +128,32 @@ module.exports = (makeTemporaryEnv: PackageDriver) => {
},
),
);

test(
`it should allow scripts defined in workspaces to run successfully`,
makeTemporaryEnv(
{
private: true,
workspaces: [`packages/*`],
},
async ({path, run, source}) => {
await writeJson(`${path}/packages/workspace/package.json`, {
name: `workspace`,
version: `1.0.0`,
dependencies: {
[`has-bin-entries`]: `1.0.0`,
},
});

await run(`install`);

await expect(
run(`run`, `has-bin-entries`, `foo`, {
cwd: `${path}/packages/workspace`,
}),
).resolves.toMatchObject({stdout: `foo\n`});
},
),
);
});
};
9 changes: 5 additions & 4 deletions src/cli/commands/run.js
View file
Open in desktop
Expand Up @@ -36,14 +36,15 @@ export async function getBinEntries(config: Config): Promise<Map<string, string>
// Same thing, but for the pnp dependencies, located inside the cache
if (await fs.exists(`${config.lockfileFolder}/${constants.PNP_FILENAME}`)) {
const pnpApi = dynamicRequire(`${config.lockfileFolder}/${constants.PNP_FILENAME}`);
const topLevelInformation = pnpApi.getPackageInformation({name: null, reference: null});

for (const [name, reference] of topLevelInformation.packageDependencies.entries()) {
const packageLocator = pnpApi.findPackageLocator(`${config.cwd}/`);
const packageInformation = pnpApi.getPackageInformation(packageLocator);

for (const [name, reference] of packageInformation.packageDependencies.entries()) {
const dependencyInformation = pnpApi.getPackageInformation({name, reference});

if (dependencyInformation.packageLocation) {
const fullPath = path.resolve(config.lockfileFolder, dependencyInformation.packageLocation);
binFolders.add(`${fullPath}/.bin`);
binFolders.add(`${dependencyInformation.packageLocation}/.bin`);
}
}
}
Expand Down
10 changes: 4 additions & 6 deletions src/util/execute-lifecycle-script.js
View file
Open in desktop
Expand Up @@ -212,15 +212,13 @@ export async function makeEnv(
}
}

// Otherwise, only add the top-level dependencies to the PATH
// Note that this isn't enough when executing scripts from subdependencies, but since dependencies with postinstall
// scripts have other issues that require us to make them fallback to regular node_modules installation (like sharing
// artifacts), we can sit on this one until we fix everything at once.
if (await fs.exists(`${config.lockfileFolder}/${constants.PNP_FILENAME}`)) {
const pnpApi = dynamicRequire(`${config.lockfileFolder}/${constants.PNP_FILENAME}`);
const topLevelInformation = pnpApi.getPackageInformation({name: null, reference: null});

for (const [name, reference] of topLevelInformation.packageDependencies.entries()) {
const packageLocator = pnpApi.findPackageLocator(`${config.cwd}/`);
const packageInformation = pnpApi.getPackageInformation(packageLocator);

for (const [name, reference] of packageInformation.packageDependencies.entries()) {
const dependencyInformation = pnpApi.getPackageInformation({name, reference});

if (!dependencyInformation || !dependencyInformation.packageLocation) {
Expand Down