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

Add yarn resolutions #259

Merged
merged 1 commit into from
Mar 2, 2019
Merged

Add yarn resolutions #259

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
4 changes: 4 additions & 0 deletions lib/dependency-manager-adapters/npm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ module.exports = CoreObject.extend({
this._overridePackageJSONDependencies(packageJSON, depSet, 'devDependencies');
this._overridePackageJSONDependencies(packageJSON, depSet, 'peerDependencies');

if (this.useYarnCommand) {
this._overridePackageJSONDependencies(packageJSON, depSet, 'resolutions');
}

return packageJSON;
},
_overridePackageJSONDependencies(packageJSON, depSet, kindOfDependency) {
Expand Down
72 changes: 72 additions & 0 deletions test/dependency-manager-adapters/npm-adapter-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,78 @@ describe('npmAdapter', () => {
expect(resultJSON.dependencies['ember-cli-babel']).to.equal('6.0.0');
});

it('adds a resolution for the specified dependency version', () => {
let npmAdapter = new NpmAdapter({
cwd: tmpdir,
useYarnCommand: true
});
let packageJSON = {
dependencies: { 'ember-cli-babel': '5.0.0' },
};
let depSet = {
dependencies: { 'ember-cli-babel': '6.0.0' },
resolutions: { 'ember-cli-babel': '6.0.0' }
};

let resultJSON = npmAdapter._packageJSONForDependencySet(packageJSON, depSet);

expect(resultJSON.resolutions['ember-cli-babel']).to.equal('6.0.0');
});

it('removes a dependency from resolutions if its version is null', () => {
let npmAdapter = new NpmAdapter({
cwd: tmpdir,
useYarnCommand: true
});
let packageJSON = {
dependencies: { 'ember-cli-babel': '5.0.0' },
resolutions: { 'ember-cli-babel': '5.0.0' },
};
let depSet = {
dependencies: { 'ember-cli-babel': '6.0.0' },
resolutions: { 'ember-cli-babel': null },
};

let resultJSON = npmAdapter._packageJSONForDependencySet(packageJSON, depSet);

expect(resultJSON.resolutions['ember-cli-babel']).to.be.undefined;
});

it('doesnt add resolutions if there are none specified', () => {
let npmAdapter = new NpmAdapter({
cwd: tmpdir,
useYarnCommand: true
});
let packageJSON = {
dependencies: { 'ember-cli-babel': '5.0.0' },
};
let depSet = {
dependencies: { 'ember-cli-babel': '6.0.0' },
};

let resultJSON = npmAdapter._packageJSONForDependencySet(packageJSON, depSet);

expect(resultJSON.resolutions).to.be.undefined;
});

it('doesnt add resolutions when not using yarn', () => {
let npmAdapter = new NpmAdapter({
cwd: tmpdir,
useYarnCommand: false
});
let packageJSON = {
dependencies: { 'ember-cli-babel': '5.0.0' },
};
let depSet = {
dependencies: { 'ember-cli-babel': '6.0.0' },
resolutions: { 'ember-cli-babel': '6.0.0' }
};

let resultJSON = npmAdapter._packageJSONForDependencySet(packageJSON, depSet);

expect(resultJSON.resolutions).to.be.undefined;
});

it('changes specified npm dev dependency versions', () => {
let npmAdapter = new NpmAdapter({ cwd: tmpdir });
let packageJSON = { devDependencies: { 'ember-feature-flags': '1.0.0' }, dependencies: { 'ember-cli-babel': '5.0.0' } };
Expand Down
20 changes: 20 additions & 0 deletions test/dependency-manager-adapters/workspace-adapter-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ describe('workspaceAdapter', () => {
devDependencies: { 'ember-feature-flags': '1.0.0' },
dependencies: { 'ember-cli-babel': '5.0.0' },
peerDependencies: { 'ember-cli-sass': '1.2.3' },
resolutions: { 'ember-data': '3.0.0' },
});

workspaceAdapter = new WorkspaceAdapter({
Expand All @@ -167,6 +168,7 @@ describe('workspaceAdapter', () => {
devDependencies: { 'ember-feature-flags': '1.0.0' },
dependencies: { 'ember-cli-babel': '6.0.0' },
peerDependencies: { 'ember-cli-sass': '1.2.3' },
resolutions: { 'ember-data': '3.0.0' },
});
});
});
Expand All @@ -181,6 +183,7 @@ describe('workspaceAdapter', () => {
devDependencies: { 'ember-feature-flags': '2.0.1' },
dependencies: { 'ember-cli-babel': '5.0.0' },
peerDependencies: { 'ember-cli-sass': '1.2.3' },
resolutions: { 'ember-data': '3.0.0' },
});
});
});
Expand All @@ -195,6 +198,22 @@ describe('workspaceAdapter', () => {
devDependencies: { 'ember-feature-flags': '1.0.0' },
dependencies: { 'ember-cli-babel': '5.0.0' },
peerDependencies: { 'ember-cli-sass': '4.5.6' },
resolutions: { 'ember-data': '3.0.0' },
});
});
});

it('changes specified resolution versions', () => {
return workspaceAdapter.changeToDependencySet({
npm: {
resolutions: { 'ember-data': '3.5.0' },
},
}).then(() => {
assertFileContainsJSON('packages/test/package.json', {
devDependencies: { 'ember-feature-flags': '1.0.0' },
dependencies: { 'ember-cli-babel': '5.0.0' },
peerDependencies: { 'ember-cli-sass': '1.2.3' },
resolutions: { 'ember-data': '3.5.0' },
});
});
});
Expand All @@ -209,6 +228,7 @@ describe('workspaceAdapter', () => {
devDependencies: {},
dependencies: { 'ember-cli-babel': '5.0.0' },
peerDependencies: { 'ember-cli-sass': '1.2.3' },
resolutions: { 'ember-data': '3.0.0' },
});
});
});
Expand Down