Skip to content

Commit ce0a92d

Browse files
authored
Merge branch 'master' into warn-on-js-ts-collision
2 parents 0fc2a0b + 6554a80 commit ce0a92d

File tree

3 files changed

+1131
-329
lines changed

3 files changed

+1131
-329
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install Node
4141
uses: actions/setup-node@v1
4242
with:
43-
node-version: '^8.12'
43+
node-version: '^10'
4444
# https://github.com/expo/expo-github-action/issues/20#issuecomment-541676895
4545
- name: Raise Watched File Limit
4646
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install Node
6565
uses: actions/setup-node@v1
6666
with:
67-
node-version: '^8.12'
67+
node-version: '^10'
6868
- name: Install Dependencies
6969
run: yarn install --frozen-lockfile
7070
- name: Prepare CI Environment
@@ -84,7 +84,7 @@ jobs:
8484
- name: Install Node
8585
uses: actions/setup-node@v1
8686
with:
87-
node-version: '^8.12'
87+
node-version: '^10'
8888
- name: Raise Watched File Limit
8989
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
9090
- name: Install Dependencies
@@ -113,7 +113,7 @@ jobs:
113113
- name: Install Node
114114
uses: actions/setup-node@v1
115115
with:
116-
node-version: '^8.12'
116+
node-version: '^10'
117117
- name: Raise Watched File Limit
118118
run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
119119
- name: Install Dependencies

package.json

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"dependencies": {
4242
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
4343
"@babel/plugin-proposal-optional-chaining": "^7.6.0",
44-
"@babel/plugin-transform-typescript": "~7.7.0",
44+
"@babel/plugin-transform-typescript": "~7.8.0",
4545
"ansi-to-html": "^0.6.6",
4646
"broccoli-stew": "^3.0.0",
4747
"debug": "^4.0.0",
@@ -55,9 +55,9 @@
5555
"walk-sync": "^2.0.0"
5656
},
5757
"devDependencies": {
58-
"@commitlint/cli": "8.2.0",
59-
"@commitlint/config-conventional": "8.2.0",
60-
"@ember/optional-features": "1.2.0",
58+
"@commitlint/cli": "8.3.5",
59+
"@commitlint/config-conventional": "8.3.4",
60+
"@ember/optional-features": "1.3.0",
6161
"@typed-ember/renovate-config": "1.2.1",
6262
"@types/capture-console": "1.0.0",
6363
"@types/chai": "4.2.7",
@@ -77,16 +77,16 @@
7777
"@types/resolve": "0.0.8",
7878
"@types/semver": "6.2.0",
7979
"@types/tmp": "0.1.0",
80-
"@typescript-eslint/eslint-plugin": "2.12.0",
81-
"@typescript-eslint/parser": "2.12.0",
80+
"@typescript-eslint/eslint-plugin": "2.17.0",
81+
"@typescript-eslint/parser": "2.17.0",
8282
"broccoli-asset-rev": "3.0.0",
8383
"broccoli-node-api": "^1.7.0",
8484
"broccoli-plugin": "^4.0.1",
8585
"capture-console": "1.0.1",
8686
"co": "4.6.0",
87-
"commitlint-azure-pipelines-cli": "1.0.2",
87+
"commitlint-azure-pipelines-cli": "1.0.3",
8888
"conventional-changelog-cli": "2.0.31",
89-
"ember-cli": "3.14.0",
89+
"ember-cli": "3.15.1",
9090
"ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#4f5bfd11",
9191
"ember-cli-addon-docs-esdoc": "0.2.3",
9292
"ember-cli-app-version": "3.2.0",
@@ -97,40 +97,42 @@
9797
"ember-cli-deploy-build": "2.0.0",
9898
"ember-cli-deploy-git": "1.3.4",
9999
"ember-cli-deploy-git-ci": "1.0.1",
100-
"ember-cli-htmlbars": "4.2.0",
100+
"ember-cli-htmlbars": "4.2.2",
101101
"ember-cli-inject-live-reload": "2.0.2",
102102
"ember-cli-release": "0.2.9",
103103
"ember-cli-sri": "2.1.1",
104104
"ember-cli-typescript-blueprints": "3.0.0",
105105
"ember-cli-uglify": "3.0.0",
106-
"ember-cli-update": "0.47.2",
106+
"ember-cli-update": "0.52.1",
107107
"ember-disable-prototype-extensions": "1.1.3",
108108
"ember-export-application-global": "2.0.1",
109109
"ember-load-initializers": "2.1.1",
110110
"ember-maybe-import-regenerator": "0.1.6",
111111
"ember-qunit": "4.6.0",
112-
"ember-resolver": "6.0.0",
113-
"ember-source": "3.15.0",
112+
"ember-resolver": "6.0.2",
113+
"ember-source": "3.16.0",
114114
"ember-try": "1.4.0",
115-
"eslint": "6.7.2",
115+
"eslint": "6.8.0",
116+
"eslint-config-prettier": "6.9.0",
116117
"eslint-plugin-ember": "7.7.2",
117118
"eslint-plugin-node": "10.0.0",
118119
"eslint-plugin-prettier": "3.1.2",
119120
"esprima": "4.0.1",
120121
"fixturify": "1.2.0",
121122
"got": "8.3.2",
122-
"handlebars": "4.5.3",
123+
"handlebars": "4.7.2",
123124
"husky": "3.1.0",
124125
"in-repo-a": "link:tests/dummy/lib/in-repo-a",
125126
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
126127
"loader.js": "4.7.0",
127128
"mocha": "6.2.2",
128129
"prettier": "1.18.2",
130+
"prettier-eslint": "9.0.1",
129131
"qunit-dom": "0.9.2",
130-
"testdouble": "3.12.4",
132+
"testdouble": "3.12.5",
131133
"tmp": "0.1.0",
132-
"ts-node": "8.5.4",
133-
"typescript": "3.7.3"
134+
"ts-node": "8.6.2",
135+
"typescript": "3.7.5"
134136
},
135137
"resolutions": {
136138
"@types/ember": "3.1.1",
@@ -161,7 +163,7 @@
161163
"proseWrap": "never"
162164
},
163165
"volta": {
164-
"node": "10.17.0",
166+
"node": "10.18.1",
165167
"yarn": "1.21.1"
166168
}
167169
}

0 commit comments

Comments
 (0)