Skip to content

Normalizes dependencies #4305

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 9 commits into from
Mar 31, 2022
Merged

Normalizes dependencies #4305

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6c45b2d
Normalizes descriptors
arcanis Mar 31, 2022
4a47bcd
Removes the ProtocolResolver
arcanis Mar 31, 2022
2e85b9a
Fixes tests
arcanis Mar 31, 2022
5298d0a
Fixes tests
arcanis Mar 31, 2022
05b894d
Fixes tests
arcanis Mar 31, 2022
4d137da
Merge branch 'master' into mael/protocol-normalization
arcanis Mar 31, 2022
0d78785
Fixes tests
arcanis Mar 31, 2022
68aa165
Fixes linting
arcanis Mar 31, 2022
22bf181
Fixes snapshot
arcanis Mar 31, 2022
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 Mar 31, 2022
commit 05b894df1bd42f89995f4f9f388a900ff30f836e
2 changes: 1 addition & 1 deletion packages/acceptance-tests/pkg-tests-specs/sources/commands/add.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ describe(`Commands`, () => {
expect(lock).toMatchObject({
[`inject-node-gyp@npm:^1.0.0`]: {
dependencies: {
[`node-gyp`]: `latest`,
[`node-gyp`]: `npm:latest`,
},
},
});
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-essentials/sources/suggestUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ export async function getSuggestedDescriptors(request: Descriptor, {project, wor
reason: formatUtils.pretty(project.configuration, `(unavailable because enableNetwork is toggled off)`, `grey`),
});
} else {
let latest = await fetchDescriptorFrom(request, `latest`, {project, cache, workspace, preserveModifier: false});
let latest = await fetchDescriptorFrom(request, `${project.configuration.get(`defaultProtocol`)}latest`, {project, cache, workspace, preserveModifier: false});

if (latest) {
latest = applyModifier(latest, modifier);
Expand Down
2 changes: 1 addition & 1 deletion packages/yarnpkg-core/tests/Project.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ describe(`Project`, () => {
const zzz = project.storedPackages.get(zzzResolution)!;

const ident = structUtils.makeIdent(null, `yyy`);
const expectedDescriptor = structUtils.makeDescriptor(ident, `^1.0.0`);
const expectedDescriptor = structUtils.makeDescriptor(ident, `npm:^1.0.0`);

// This one is a sanity check
expect(xxx.dependencies.get(ident.identHash)).toEqual(expectedDescriptor);
Expand Down