Skip to content

Commit 4183a3a

Browse files
authored
Merge branch 'master' into blueprint-style
2 parents d850ccc + 0dc8077 commit 4183a3a

File tree

3 files changed

+298
-335
lines changed

3 files changed

+298
-335
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@
1111
- [Documentation](#documentation)
1212
- [Usage](#usage)
1313
- [Installation and Setup](#installation-and-setup)
14-
- [In apps](#in-apps)
15-
- [In addons](#in-addons)
1614
- [Upgrading from 1.x](#upgrading-from-1x)
1715
- [Update ember-cli-babel](#update-ember-cli-babel)
1816
- [Update ember-decorators](#update-ember-decorators)
1917
- [Update ember-cli-typescript](#update-ember-cli-typescript)
20-
- [In apps](#in-apps-1)
21-
- [In addons](#in-addons-1)
2218
- [Account for addon build pipeline changes](#account-for-addon-build-pipeline-changes)
2319
- [Account for TS → Babel issues](#account-for-ts--babel-issues)
2420
- [Getting Help](#getting-help)

package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,33 +54,33 @@
5454
"devDependencies": {
5555
"@commitlint/cli": "8.2.0",
5656
"@commitlint/config-conventional": "8.2.0",
57-
"@ember/optional-features": "1.0.0",
57+
"@ember/optional-features": "1.1.0",
5858
"@typed-ember/renovate-config": "1.2.1",
59-
"@types/chai": "4.2.3",
59+
"@types/chai": "4.2.4",
6060
"@types/chai-as-promised": "7.1.2",
6161
"@types/console-ui": "2.2.3",
6262
"@types/core-object": "3.0.1",
6363
"@types/debug": "4.1.5",
64-
"@types/ember": "3.1.0",
65-
"@types/ember-qunit": "3.4.6",
64+
"@types/ember": "3.1.1",
65+
"@types/ember-qunit": "3.4.7",
6666
"@types/esprima": "4.0.2",
6767
"@types/express": "4.17.1",
68-
"@types/fs-extra": "8.0.0",
68+
"@types/fs-extra": "8.0.1",
6969
"@types/got": "8.3.5",
7070
"@types/mocha": "5.2.7",
71-
"@types/node": "9.6.52",
71+
"@types/node": "9.6.53",
7272
"@types/qunit": "2.9.0",
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.1",
77-
"@typescript-eslint/parser": "2.3.1",
76+
"@typescript-eslint/eslint-plugin": "2.5.0",
77+
"@typescript-eslint/parser": "2.5.0",
7878
"broccoli-asset-rev": "3.0.0",
7979
"co": "4.6.0",
8080
"commitlint-azure-pipelines-cli": "1.0.2",
81-
"conventional-changelog-cli": "2.0.23",
82-
"ember-cli": "3.13.0",
83-
"ember-cli-addon-docs": "0.6.14",
81+
"conventional-changelog-cli": "2.0.25",
82+
"ember-cli": "3.13.1",
83+
"ember-cli-addon-docs": "0.6.15",
8484
"ember-cli-addon-docs-esdoc": "0.2.3",
8585
"ember-cli-app-version": "3.2.0",
8686
"ember-cli-babel": "7.12.0",
@@ -90,44 +90,44 @@
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": "4.0.1",
94-
"ember-cli-htmlbars-inline-precompile": "3.0.0",
95-
"ember-cli-inject-live-reload": "2.0.1",
93+
"ember-cli-htmlbars": "4.0.8",
94+
"ember-cli-htmlbars-inline-precompile": "3.0.1",
95+
"ember-cli-inject-live-reload": "2.0.2",
9696
"ember-cli-release": "0.2.9",
9797
"ember-cli-sri": "2.1.1",
9898
"ember-cli-typescript-blueprints": "3.0.0",
9999
"ember-cli-uglify": "3.0.0",
100-
"ember-cli-update": "0.43.3",
100+
"ember-cli-update": "0.43.7",
101101
"ember-disable-prototype-extensions": "1.1.3",
102102
"ember-export-application-global": "2.0.0",
103103
"ember-load-initializers": "2.1.0",
104104
"ember-maybe-import-regenerator": "0.1.6",
105105
"ember-qunit": "4.5.1",
106106
"ember-resolver": "5.3.0",
107-
"ember-source": "3.13.2",
107+
"ember-source": "3.13.3",
108108
"ember-try": "1.2.1",
109-
"eslint": "6.5.0",
109+
"eslint": "6.5.1",
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.4.1",
117-
"husky": "3.0.8",
116+
"handlebars": "4.4.5",
117+
"husky": "3.0.9",
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",
121-
"mocha": "6.2.0",
121+
"mocha": "6.2.2",
122122
"prettier": "1.18.2",
123123
"qunit-dom": "0.9.0",
124124
"testdouble": "3.12.4",
125125
"tmp": "0.1.0",
126126
"ts-node": "8.4.1",
127-
"typescript": "3.6.3"
127+
"typescript": "3.6.4"
128128
},
129129
"resolutions": {
130-
"@types/ember": "3.1.0",
130+
"@types/ember": "3.1.1",
131131
"@types/ember__string": "3.0.6",
132132
"hawk": "7"
133133
},
@@ -167,7 +167,7 @@
167167
"proseWrap": "never"
168168
},
169169
"volta": {
170-
"node": "10.16.3",
171-
"yarn": "1.17.3"
170+
"node": "10.17.0",
171+
"yarn": "1.19.1"
172172
}
173173
}

0 commit comments

Comments
 (0)