Skip to content

Commit 53f2b51

Browse files
authored
Merge pull request #1191 from typed-ember/mass-updates
2 parents 82657a2 + fcd8bcd commit 53f2b51

File tree

24 files changed

+1130
-1021
lines changed

24 files changed

+1130
-1021
lines changed

.eslintrc.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-env node */
12
module.exports = {
23
root: true,
34
parser: '@typescript-eslint/parser',
@@ -11,7 +12,7 @@ module.exports = {
1112
browser: true,
1213
},
1314
rules: {
14-
"prettier/prettier": "error"
15+
'prettier/prettier': 'error',
1516
},
1617
settings: {
1718
node: {
@@ -43,14 +44,10 @@ module.exports = {
4344
node: true,
4445
},
4546
plugins: ['node'],
46-
rules: Object.assign(
47-
{},
48-
require('eslint-plugin-node').configs.recommended.rules,
49-
{
50-
// add your custom rules and overrides for node files here
51-
'ember/avoid-leaking-state-in-ember-objects': 'off',
52-
}
53-
),
47+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48+
// add your custom rules and overrides for node files here
49+
'ember/avoid-leaking-state-in-ember-objects': 'off',
50+
}),
5451
},
5552

5653
// test files

config/deploy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node */
22
'use strict';
33

4-
module.exports = function(deployTarget) {
4+
module.exports = function (deployTarget) {
55
let ENV = {
66
build: {},
77
// include other plugin configuration that applies to all deploy targets here

config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

3-
module.exports = function(/* environment, appConfig */) {
3+
module.exports = function (/* environment, appConfig */) {
44
return {};
55
};

ember-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
'ember-cli-babel': {
88
throwUnlessParallelizable: true,

package.json

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@
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.8.0",
44+
"@babel/plugin-transform-typescript": "~7.10.4",
4545
"ansi-to-html": "^0.6.6",
4646
"broccoli-stew": "^3.0.0",
4747
"debug": "^4.0.0",
4848
"ember-cli-babel-plugin-helpers": "^1.0.0",
4949
"execa": "^3.0.0",
50-
"fs-extra": "^8.0.0",
50+
"fs-extra": "^9.0.1",
5151
"resolve": "^1.5.0",
5252
"rsvp": "^4.8.1",
53-
"semver": "^6.3.0",
53+
"semver": "^7.3.2",
5454
"stagehand": "^1.0.0",
55-
"walk-sync": "^2.0.0"
55+
"walk-sync": "^2.2.0"
5656
},
5757
"devDependencies": {
58-
"@commitlint/cli": "8.3.5",
59-
"@commitlint/config-conventional": "8.3.4",
58+
"@commitlint/cli": "9.0.1",
59+
"@commitlint/config-conventional": "9.0.1",
6060
"@ember/optional-features": "1.3.0",
6161
"@typed-ember/renovate-config": "1.2.1",
6262
"@types/capture-console": "1.0.0",
@@ -65,28 +65,27 @@
6565
"@types/console-ui": "2.2.3",
6666
"@types/core-object": "3.0.1",
6767
"@types/debug": "4.1.5",
68-
"@types/ember": "3.1.2",
68+
"@types/ember": "3.16.0",
6969
"@types/ember-qunit": "3.4.9",
7070
"@types/esprima": "4.0.2",
7171
"@types/express": "4.17.6",
72-
"@types/fs-extra": "8.1.1",
73-
"@types/got": "8.3.5",
72+
"@types/fs-extra": "9.0.1",
73+
"@types/got": "9.6.11",
7474
"@types/mocha": "7.0.2",
75-
"@types/node": "9.6.56",
75+
"@types/node": "14.0.14",
7676
"@types/qunit": "2.9.1",
7777
"@types/resolve": "1.17.1",
78-
"@types/semver": "6.2.1",
79-
"@types/tmp": "0.1.0",
80-
"@typescript-eslint/eslint-plugin": "2.22.0",
81-
"@typescript-eslint/parser": "2.22.0",
78+
"@types/semver": "7.3.1",
79+
"@typescript-eslint/eslint-plugin": "3.5.0",
80+
"@typescript-eslint/parser": "3.5.0",
8281
"broccoli-asset-rev": "3.0.0",
8382
"broccoli-node-api": "1.7.0",
8483
"broccoli-plugin": "4.0.3",
8584
"capture-console": "1.0.1",
8685
"co": "4.6.0",
8786
"commitlint-azure-pipelines-cli": "1.0.3",
8887
"conventional-changelog-cli": "2.0.34",
89-
"ember-cli": "3.16.2",
88+
"ember-cli": "3.19.0",
9089
"ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#4f5bfd11",
9190
"ember-cli-addon-docs-esdoc": "0.2.3",
9291
"ember-cli-app-version": "3.2.0",
@@ -97,9 +96,8 @@
9796
"ember-cli-deploy-build": "2.0.0",
9897
"ember-cli-deploy-git": "1.3.4",
9998
"ember-cli-deploy-git-ci": "1.0.1",
100-
"ember-cli-htmlbars": "4.2.3",
99+
"ember-cli-htmlbars": "5.2.0",
101100
"ember-cli-inject-live-reload": "2.0.2",
102-
"ember-cli-release": "0.2.9",
103101
"ember-cli-sri": "2.1.1",
104102
"ember-cli-typescript-blueprints": "3.0.0",
105103
"ember-cli-uglify": "3.0.0",
@@ -109,29 +107,29 @@
109107
"ember-load-initializers": "2.1.1",
110108
"ember-maybe-import-regenerator": "0.1.6",
111109
"ember-qunit": "4.6.0",
112-
"ember-resolver": "7.0.0",
113-
"ember-source": "3.17.3",
110+
"ember-resolver": "8.0.0",
111+
"ember-source": "3.19.0",
114112
"ember-try": "1.4.0",
115-
"eslint": "6.8.0",
113+
"eslint": "7.3.1",
116114
"eslint-config-prettier": "6.11.0",
117-
"eslint-plugin-ember": "7.10.1",
118-
"eslint-plugin-node": "11.0.0",
115+
"eslint-plugin-ember": "8.9.0",
116+
"eslint-plugin-node": "11.1.0",
119117
"eslint-plugin-prettier": "3.1.4",
120118
"esprima": "4.0.1",
121-
"fixturify": "1.3.0",
122-
"got": "10.7.0",
119+
"fixturify": "2.1.0",
120+
"got": "11.3.0",
123121
"handlebars": "4.7.6",
124122
"husky": "4.2.5",
125123
"in-repo-a": "link:tests/dummy/lib/in-repo-a",
126124
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
127125
"loader.js": "4.7.0",
128-
"mocha": "7.2.0",
129-
"prettier": "1.18.2",
130-
"prettier-eslint": "9.0.2",
131-
"qunit-dom": "1.1.0",
132-
"testdouble": "3.13.1",
133-
"tmp": "0.1.0",
134-
"ts-node": "8.6.2",
126+
"mocha": "8.0.1",
127+
"prettier": "2.0.5",
128+
"prettier-eslint": "11.0.0",
129+
"qunit-dom": "1.2.0",
130+
"rimraf": "^3.0.2",
131+
"testdouble": "3.16.0",
132+
"ts-node": "8.10.2",
135133
"typescript": "3.7.5"
136134
},
137135
"resolutions": {

tests/dummy/app/router.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ const Router = AddonDocsRouter.extend({
66
rootURL: config.rootURL,
77
});
88

9-
Router.map(function() {
10-
docsRoute(this, function() {
9+
Router.map(function () {
10+
docsRoute(this, function () {
1111
this.route('upgrade-notes');
1212
this.route('configuration');
13-
this.route('ts-guide', function() {
13+
this.route('ts-guide', function () {
1414
this.route('with-addons');
1515
this.route('using-ts-effectively');
1616
this.route('current-limitations');
1717
});
18-
this.route('troubleshooting', function() {
18+
this.route('troubleshooting', function () {
1919
this.route('conflicting-types');
2020
});
21-
this.route('type-defs', function() {
21+
this.route('type-defs', function () {
2222
this.route('package-names');
2323
});
2424
});

tests/dummy/config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
module.exports = function(environment) {
3+
module.exports = function (environment) {
44
let ENV = {
55
modulePrefix: 'dummy',
66
environment,

tests/integration/components/js-importing-ts-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
44
import hbs from 'htmlbars-inline-precompile';
55

6-
module('Integration | Component | js importing ts', function(hooks) {
6+
module('Integration | Component | js importing ts', function (hooks) {
77
setupRenderingTest(hooks);
88

9-
test('it renders', async function(assert) {
9+
test('it renders', async function (assert) {
1010
// Set any properties with this.set('myProperty', 'value');
1111
// Handle any actions with this.on('myAction', function(val) { ... });
1212

tests/integration/components/ts-component-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
33
import { render } from '@ember/test-helpers';
44
import hbs from 'htmlbars-inline-precompile';
55

6-
module('Integration | Component | ts component', function(hooks) {
6+
module('Integration | Component | ts component', function (hooks) {
77
setupRenderingTest(hooks);
88

9-
test('it renders', async function(assert) {
9+
test('it renders', async function (assert) {
1010
// Set any properties with this.set('myProperty', 'value');
1111
// Handle any actions with this.on('myAction', function(val) { ... });
1212

tests/unit/build-test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@ import fileB from 'dummy/b';
77
import { description as fromAts } from 'in-repo-a/test-support/from-ats';
88
import { description as fromTs } from 'dummy/tests/from-ts';
99

10-
module('Unit | Build', function() {
11-
test("in-repo addons' addon trees wind up in the right place", function(assert) {
10+
module('Unit | Build', function () {
11+
test("in-repo addons' addon trees wind up in the right place", function (assert) {
1212
assert.equal(addonFileA, 'in-repo-a/test-file');
1313
assert.equal(addonFileB, 'in-repo-b/test-file');
1414
});
1515

16-
test("in-repo addons' app trees wind up in the right place", function(assert) {
16+
test("in-repo addons' app trees wind up in the right place", function (assert) {
1717
assert.equal(fileA, 'dummy/a');
1818
assert.equal(fileB, 'dummy/b');
1919
});
2020

21-
test("addon's addon-test-support files end up in <addon-name>/test-support/*", function(assert) {
21+
test("addon's addon-test-support files end up in <addon-name>/test-support/*", function (assert) {
2222
assert.ok(fromAts);
2323
assert.equal(fromAts, 'From addon-test-support');
2424
});
2525

26-
test("addon's test-support files end up in dummy/tests/*", function(assert) {
26+
test("addon's test-support files end up in dummy/tests/*", function (assert) {
2727
assert.ok(fromTs);
2828
assert.equal(fromTs, 'From test-support');
2929
});
3030

31-
test('property initialization occurs in the right order', function(assert) {
31+
test('property initialization occurs in the right order', function (assert) {
3232
class TestClass {
3333
// we shouldn't encourage folks to write code like this, but tsc ensures
3434
// that constructor param fields are set before field initializers run

0 commit comments

Comments
 (0)