Skip to content

Bump deps #191

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
RobbieTheWagner merged 2 commits into from
Sep 9, 2018
Merged

Bump deps #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
879c2b5
Bump deps
RobbieTheWagner Sep 8, 2018
cf706eb
Reset engine test versions
RobbieTheWagner Sep 8, 2018
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
22 changes: 10 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,19 @@
"test": "npm run-script lint:js && npm run-script node-test"
},
"dependencies": {
"babel-core": "^6.24.1",
"babel-plugin-istanbul": "^4.1.6",
"babel-plugin-istanbul": "^5.0.1",
"babel-plugin-transform-async-to-generator": "^6.24.1",
"body-parser": "^1.15.0",
"body-parser": "^1.18.3",
"co": "^4.6.0",
"ember-cli-babel": "^6.16.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-version-checker": "^2.0.0",
"extend": "^3.0.0",
"ember-cli-babel": "^7.1.0",
"ember-cli-version-checker": "^2.1.2",
"extend": "^3.0.2",
"fs-extra": "^5.0.0",
"istanbul-api": "^2.0.1",
"istanbul-api": "^2.0.6",
"lodash.concat": "^4.5.0",
"node-dir": "^0.1.16",
"rsvp": "^4.8.1",
"walk-sync": "^0.3.2"
"rsvp": "^4.8.3",
"walk-sync": "^0.3.3"
},
"devDependencies": {
"@ember/optional-features": "^0.6.3",
Expand Down Expand Up @@ -70,10 +68,10 @@
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"fixturify": "^0.3.4",
"glob": "^7.1.2",
"glob": "^7.1.3",
"lerna-changelog": "^0.7.0",
"loader.js": "^4.7.0",
"mocha": "^5.0.0",
"mocha": "^5.2.0",
"qunit-dom": "^0.7.1",
"rimraf": "^2.6.2",
"sinon": "^4.2.2"
Expand Down
4 changes: 2 additions & 2 deletions test/integration/app-coverage-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ describe('app coverage generation', function() {
beforeEach(function() {
app = new AddonTestApp();
return app.create('my-app', {
emberVersion: '2.16.0'
emberVersion: '3.4.0'
}).then(() => {
app.editPackageJSON(pkg => {
pkg.devDependencies['ember-exam'] = '0.7.0';
pkg.devDependencies['ember-exam'] = '1.0.0';
// Temporarily remove the addon before install to work around https://github.com/tomdale/ember-cli-addon-tests/issues/176
delete pkg.devDependencies['ember-cli-code-coverage'];
});
Expand Down
4 changes: 2 additions & 2 deletions test/integration/in-repo-addon-coverage-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ describe('in-repo addon coverage generation', function() {
beforeEach(function() {
app = new AddonTestApp();
return app.create('my-app-with-in-repo-addon', {
emberVersion: '2.16.0'
emberVersion: '3.4.0'
}).then(() => {
app.editPackageJSON(pkg => {
pkg.devDependencies['ember-exam'] = '0.7.0';
pkg.devDependencies['ember-exam'] = '1.0.0';
// Temporarily remove the addon before install to work around https://github.com/tomdale/ember-cli-addon-tests/issues/176
delete pkg.devDependencies['ember-cli-code-coverage'];
});
Expand Down
2 changes: 1 addition & 1 deletion test/integration/in-repo-engine-coverage-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('in-repo engine coverage generation', function() {
}).then(() => {
app.editPackageJSON(pkg => {
pkg.devDependencies['ember-engines'] = '0.5.14';
pkg.devDependencies['ember-exam'] = '0.7.0';
pkg.devDependencies['ember-exam'] = '1.0.0';
// Temporarily remove the addon before install to work around https://github.com/tomdale/ember-cli-addon-tests/issues/176
delete pkg.devDependencies['ember-cli-code-coverage'];
});
Expand Down
Loading