Skip to content

Conditional dependencies #3575

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 19 commits into from
Oct 17, 2021
Merged

Conditional dependencies #3575

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
c2b775c
feat: Implement native dependency pruning
arcanis Oct 15, 2021
32de556
Restricts pruning to optionalDependencies
arcanis Oct 15, 2021
7b435c3
Removes debug
arcanis Oct 15, 2021
2348ba0
Feedback
arcanis Oct 15, 2021
efd6fc5
Versions
arcanis Oct 15, 2021
23a87a5
Fixes tests
arcanis Oct 15, 2021
db3b586
Fixes the exec resolver
arcanis Oct 15, 2021
427409f
Makes the supported architectures explicit
arcanis Oct 15, 2021
22a33f8
Tests
arcanis Oct 15, 2021
06d8178
Apply suggestions from code review
arcanis Oct 15, 2021
0811b2b
Update .yarnrc.yml
arcanis Oct 15, 2021
a0304d8
Another place to switch to win32
arcanis Oct 15, 2021
8d641e7
fix(core): never mark resolution dependencies as optional
paul-soporan Oct 16, 2021
1a2bd31
refactor: shorten that code a bit
paul-soporan Oct 16, 2021
8c367cc
chore: run an install
paul-soporan Oct 16, 2021
fecc76d
Apply suggestions from code review
arcanis Oct 16, 2021
3b7cc98
Feedback
arcanis Oct 16, 2021
bb14a1d
Update PnpLinker.ts
arcanis Oct 17, 2021
173d79d
Fixes typo
arcanis Oct 17, 2021
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
Prev Previous commit
Next Next commit
Fixes tests
  • Loading branch information
@arcanis
arcanis committed Oct 15, 2021
commit 23a87a5e8d421d70641cdba9f98eafc860efb0c8
4 changes: 2 additions & 2 deletions ...tests/pkg-tests-specs/sources/features/__snapshots__/mergeConflictResolution.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`Features Merge Conflict Resolution it should properly fix merge conflic
# Manual changes might be lost - proceed with caution!

__metadata:
version: 4
version: 5
cacheKey: 0

\\"no-deps@npm:*\\":
Expand Down Expand Up @@ -54,7 +54,7 @@ exports[`Features Merge Conflict Resolution it should properly fix merge conflic
# Manual changes might be lost - proceed with caution!

__metadata:
version: 4
version: 5
cacheKey: 0

<<<<<<< HEAD
Expand Down
2 changes: 1 addition & 1 deletion packages/acceptance-tests/pkg-tests-specs/sources/node-modules.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ describe(`Node_Modules`, () => {
const stdout = (await run(`install`)).stdout;

expect(stdout).not.toContain(`Shall not be run`);
expect(stdout).toMatch(new RegExp(`dep@file:./dep.*The platform ${process.platform} is incompatible with this module, link skipped.`));
expect(stdout).toMatch(new RegExp(`dep@file:./dep.*The ${process.platform}-${process.arch} architecture is incompatible with this module, link skipped.`));

await expect(source(`require('dep')`)).rejects.toMatchObject({
externalException: {
Expand Down
2 changes: 1 addition & 1 deletion packages/acceptance-tests/pkg-tests-specs/sources/pnp.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,7 @@ describe(`Plug'n'Play`, () => {
const stdout = (await run(`install`)).stdout;

expect(stdout).not.toContain(`Shall not be run`);
expect(stdout).toMatch(new RegExp(`dep@file:./dep.*The platform ${process.platform} is incompatible with this module, build skipped.`));
expect(stdout).toMatch(new RegExp(`dep@file:./dep.*The ${process.platform}-${process.arch} architecture is incompatible with this module, build skipped.`));

await expect(source(`require('dep')`)).resolves.toMatchObject({
name: `dep`,
Expand Down