Skip to content

Commit d850ccc

Browse files
authored
Merge branch 'master' into blueprint-style
2 parents 3dc897b + f381ef9 commit d850ccc

File tree

2 files changed

+478
-190
lines changed

2 files changed

+478
-190
lines changed

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"@typed-ember/renovate-config": "1.2.1",
5959
"@types/chai": "4.2.3",
6060
"@types/chai-as-promised": "7.1.2",
61-
"@types/console-ui": "2.2.2",
61+
"@types/console-ui": "2.2.3",
6262
"@types/core-object": "3.0.1",
6363
"@types/debug": "4.1.5",
6464
"@types/ember": "3.1.0",
@@ -73,24 +73,24 @@
7373
"@types/resolve": "0.0.8",
7474
"@types/semver": "6.0.2",
7575
"@types/tmp": "0.1.0",
76-
"@typescript-eslint/eslint-plugin": "2.3.0",
77-
"@typescript-eslint/parser": "2.3.0",
76+
"@typescript-eslint/eslint-plugin": "2.3.1",
77+
"@typescript-eslint/parser": "2.3.1",
7878
"broccoli-asset-rev": "3.0.0",
7979
"co": "4.6.0",
8080
"commitlint-azure-pipelines-cli": "1.0.2",
8181
"conventional-changelog-cli": "2.0.23",
82-
"ember-cli": "3.12.0",
82+
"ember-cli": "3.13.0",
8383
"ember-cli-addon-docs": "0.6.14",
8484
"ember-cli-addon-docs-esdoc": "0.2.3",
8585
"ember-cli-app-version": "3.2.0",
86-
"ember-cli-babel": "7.11.0",
86+
"ember-cli-babel": "7.12.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",
9090
"ember-cli-deploy-build": "2.0.0",
9191
"ember-cli-deploy-git": "1.3.4",
9292
"ember-cli-deploy-git-ci": "1.0.1",
93-
"ember-cli-htmlbars": "3.1.0",
93+
"ember-cli-htmlbars": "4.0.1",
9494
"ember-cli-htmlbars-inline-precompile": "3.0.0",
9595
"ember-cli-inject-live-reload": "2.0.1",
9696
"ember-cli-release": "0.2.9",
@@ -103,18 +103,18 @@
103103
"ember-load-initializers": "2.1.0",
104104
"ember-maybe-import-regenerator": "0.1.6",
105105
"ember-qunit": "4.5.1",
106-
"ember-resolver": "5.2.1",
107-
"ember-source": "3.13.0",
106+
"ember-resolver": "5.3.0",
107+
"ember-source": "3.13.2",
108108
"ember-try": "1.2.1",
109-
"eslint": "6.4.0",
109+
"eslint": "6.5.0",
110110
"eslint-plugin-ember": "7.1.0",
111111
"eslint-plugin-node": "10.0.0",
112112
"eslint-plugin-prettier": "3.1.1",
113113
"esprima": "4.0.1",
114114
"fixturify": "1.2.0",
115115
"got": "8.3.2",
116-
"handlebars": "4.2.1",
117-
"husky": "3.0.5",
116+
"handlebars": "4.4.1",
117+
"husky": "3.0.8",
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",
@@ -167,7 +167,7 @@
167167
"proseWrap": "never"
168168
},
169169
"volta": {
170-
"node": "10.15.3",
171-
"yarn": "1.15.2"
170+
"node": "10.16.3",
171+
"yarn": "1.17.3"
172172
}
173173
}

0 commit comments

Comments
 (0)