Skip to content

Commit 2f8d23c

Browse files
authored
Merge branch 'master' into deps-for-addon
2 parents 9dca3cd + 03134c3 commit 2f8d23c

File tree

2 files changed

+877
-345
lines changed

2 files changed

+877
-345
lines changed

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
"@types/ember": "3.1.0",
6565
"@types/ember-qunit": "3.4.6",
6666
"@types/esprima": "4.0.2",
67-
"@types/express": "4.17.0",
67+
"@types/express": "4.17.1",
6868
"@types/fs-extra": "8.0.0",
6969
"@types/got": "8.3.5",
7070
"@types/mocha": "5.2.7",
71-
"@types/node": "9.6.50",
71+
"@types/node": "9.6.51",
7272
"@types/qunit": "2.9.0",
7373
"@types/resolve": "0.0.8",
7474
"@types/semver": "6.0.1",
@@ -80,10 +80,10 @@
8080
"commitlint-azure-pipelines-cli": "1.0.2",
8181
"conventional-changelog-cli": "2.0.23",
8282
"ember-cli": "3.12.0",
83-
"ember-cli-addon-docs": "0.6.13",
83+
"ember-cli-addon-docs": "0.6.14",
8484
"ember-cli-addon-docs-esdoc": "0.2.2",
8585
"ember-cli-app-version": "3.2.0",
86-
"ember-cli-babel": "7.9.0",
86+
"ember-cli-babel": "7.10.0",
8787
"ember-cli-blueprint-test-helpers": "0.19.2",
8888
"ember-cli-dependency-checker": "3.2.0",
8989
"ember-cli-deploy": "1.0.2",
@@ -97,31 +97,31 @@
9797
"ember-cli-sri": "2.1.1",
9898
"ember-cli-typescript-blueprints": "2.0.0",
9999
"ember-cli-uglify": "3.0.0",
100-
"ember-cli-update": "0.37.3",
100+
"ember-cli-update": "0.41.0",
101101
"ember-disable-prototype-extensions": "1.1.3",
102102
"ember-export-application-global": "2.0.0",
103-
"ember-load-initializers": "2.0.0",
103+
"ember-load-initializers": "2.1.0",
104104
"ember-maybe-import-regenerator": "0.1.6",
105105
"ember-qunit": "4.5.1",
106106
"ember-resolver": "5.2.1",
107107
"ember-source": "3.12.0",
108108
"ember-try": "1.2.1",
109-
"eslint": "6.1.0",
110-
"eslint-plugin-ember": "6.9.1",
109+
"eslint": "6.2.2",
110+
"eslint-plugin-ember": "7.0.0",
111111
"eslint-plugin-node": "9.1.0",
112112
"eslint-plugin-prettier": "3.1.0",
113113
"esprima": "4.0.1",
114114
"fixturify": "1.2.0",
115115
"got": "8.3.2",
116116
"handlebars": "4.1.2",
117-
"husky": "3.0.3",
117+
"husky": "3.0.4",
118118
"in-repo-a": "link:tests/dummy/lib/in-repo-a",
119119
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
120120
"loader.js": "4.7.0",
121121
"mocha": "6.2.0",
122122
"prettier": "1.18.2",
123123
"qunit-dom": "0.9.0",
124-
"testdouble": "3.12.3",
124+
"testdouble": "3.12.4",
125125
"tmp": "0.1.0",
126126
"ts-node": "8.3.0",
127127
"typescript": "3.5.3"

0 commit comments

Comments
 (0)