Skip to content

Commit 1f46073

Browse files
committed
Merge branch 'master' into v4
2 parents fad7b57 + 6b97fbd commit 1f46073

File tree

27 files changed

+3329
-2594
lines changed

27 files changed

+3329
-2594
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

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
2222
[#1017]: https://github.com/typed-ember/ember-cli-typescript/pull/1017
2323
[#1018]: https://github.com/typed-ember/ember-cli-typescript/pull/1018
2424

25+
## [3.1.4] - 2020-05-29
26+
27+
### Fixed 🔧
28+
29+
- Use temp dir in project for precompile ([#1153])
30+
31+
### Under the hood 🚗
32+
33+
- Bumped [52 dependency versions][3.1.4-deps-bumps]
34+
35+
[#1153]: https://github.com/typed-ember/ember-cli-typescript/pull/1153
36+
[3.1.4-deps-bumps]: https://github.com/typed-ember/ember-cli-typescript/pulls?q=is%3Apr+is%3Amerged+base%3Amaster+merged%3A2020-01-22T13%3A00%3A00-0600..2020-05-29T11%3A00%3A00-0500+chore%28deps%29+in%3Atitle+
37+
2538
## [3.1.3] - 2020-01-22
2639

2740
### Fixed 🔧
@@ -639,7 +652,12 @@ We now use Babel 7's support for TypeScript to build apps and addons. Most of th
639652

640653
[ember-cli-typify]: https://github.com/winding-lines/ember-cli-typify
641654
[unreleased]: https://github.com/typed-ember/ember-cli-typescript/compare/v4.0.0-alpha.1...HEAD
655+
<!--
656+
This is correctly compared against v3.1.3 because it was released on a branch
657+
before v3.1.4 was released.
658+
-->
642659
[4.0.0-alpha.1]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.3...v4.0.0-alpha.1
660+
[3.1.4]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.3...v3.1.4
643661
[3.1.3]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.2...v3.1.3
644662
[3.1.2]: https://github.com/typed-ember/ember-cli-typescript/compare/v3.1.1...v3.1.2
645663
<!--

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: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -43,96 +43,94 @@
4343
"broccoli-stew": "^3.0.0",
4444
"debug": "^4.0.0",
4545
"execa": "^3.0.0",
46-
"fs-extra": "^8.0.0",
46+
"fs-extra": "^9.0.1",
4747
"resolve": "^1.5.0",
4848
"rsvp": "^4.8.1",
49-
"semver": "^7.0.0",
49+
"semver": "^7.3.2",
5050
"stagehand": "^1.0.0",
51-
"walk-sync": "^2.0.0"
51+
"walk-sync": "^2.2.0"
5252
},
5353
"devDependencies": {
54-
"@commitlint/cli": "8.3.5",
55-
"@commitlint/config-conventional": "8.3.4",
54+
"@commitlint/cli": "9.0.1",
55+
"@commitlint/config-conventional": "9.0.1",
5656
"@ember/optional-features": "1.3.0",
5757
"@typed-ember/renovate-config": "1.2.1",
5858
"@types/capture-console": "1.0.0",
59-
"@types/chai": "4.2.8",
59+
"@types/chai": "4.2.11",
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.1",
65-
"@types/ember-qunit": "3.4.7",
64+
"@types/ember": "3.16.0",
65+
"@types/ember-qunit": "3.4.9",
6666
"@types/esprima": "4.0.2",
67-
"@types/express": "4.17.2",
68-
"@types/fs-extra": "8.0.1",
69-
"@types/got": "8.3.5",
70-
"@types/mocha": "7.0.1",
71-
"@types/node": "9.6.55",
72-
"@types/qunit": "2.9.0",
73-
"@types/resolve": "1.14.0",
74-
"@types/semver": "6.2.1",
75-
"@types/tmp": "0.1.0",
76-
"@typescript-eslint/eslint-plugin": "2.19.0",
77-
"@typescript-eslint/parser": "2.19.0",
67+
"@types/express": "4.17.6",
68+
"@types/fs-extra": "9.0.1",
69+
"@types/got": "9.6.11",
70+
"@types/mocha": "7.0.2",
71+
"@types/node": "14.0.14",
72+
"@types/qunit": "2.9.1",
73+
"@types/resolve": "1.17.1",
74+
"@types/semver": "7.3.1",
75+
"@typescript-eslint/eslint-plugin": "3.5.0",
76+
"@typescript-eslint/parser": "3.5.0",
7877
"broccoli-asset-rev": "3.0.0",
7978
"broccoli-node-api": "1.7.0",
80-
"broccoli-plugin": "4.0.1",
79+
"broccoli-plugin": "4.0.3",
8180
"capture-console": "1.0.1",
8281
"co": "4.6.0",
8382
"commitlint-azure-pipelines-cli": "1.0.3",
84-
"conventional-changelog-cli": "2.0.31",
85-
"ember-cli": "3.15.2",
83+
"conventional-changelog-cli": "2.0.34",
84+
"ember-cli": "3.19.0",
8685
"ember-cli-addon-docs": "ember-learn/ember-cli-addon-docs#4f5bfd11",
8786
"ember-cli-addon-docs-esdoc": "0.2.3",
8887
"ember-cli-app-version": "3.2.0",
89-
"ember-cli-babel": "7.17.0",
88+
"ember-cli-babel": "7.21.0",
9089
"ember-cli-blueprint-test-helpers": "0.19.2",
9190
"ember-cli-dependency-checker": "3.2.0",
9291
"ember-cli-deploy": "1.0.2",
9392
"ember-cli-deploy-build": "2.0.0",
9493
"ember-cli-deploy-git": "1.3.4",
9594
"ember-cli-deploy-git-ci": "1.0.1",
96-
"ember-cli-htmlbars": "4.2.2",
95+
"ember-cli-htmlbars": "5.2.0",
9796
"ember-cli-inject-live-reload": "2.0.2",
98-
"ember-cli-release": "0.2.9",
9997
"ember-cli-sri": "2.1.1",
10098
"ember-cli-typescript-blueprints": "3.0.0",
10199
"ember-cli-uglify": "3.0.0",
102-
"ember-cli-update": "0.52.1",
100+
"ember-cli-update": "0.54.6",
103101
"ember-disable-prototype-extensions": "1.1.3",
104102
"ember-export-application-global": "2.0.1",
105103
"ember-load-initializers": "2.1.1",
106104
"ember-maybe-import-regenerator": "0.1.6",
107105
"ember-qunit": "4.6.0",
108-
"ember-resolver": "7.0.0",
109-
"ember-source": "3.16.1",
106+
"ember-resolver": "8.0.0",
107+
"ember-source": "3.19.0",
110108
"ember-try": "1.4.0",
111-
"eslint": "6.8.0",
112-
"eslint-config-prettier": "6.10.0",
113-
"eslint-plugin-ember": "7.7.2",
114-
"eslint-plugin-node": "11.0.0",
115-
"eslint-plugin-prettier": "3.1.2",
109+
"eslint": "7.3.1",
110+
"eslint-config-prettier": "6.11.0",
111+
"eslint-plugin-ember": "8.9.0",
112+
"eslint-plugin-node": "11.1.0",
113+
"eslint-plugin-prettier": "3.1.4",
116114
"esprima": "4.0.1",
117-
"fixturify": "1.2.0",
118-
"got": "10.4.0",
119-
"handlebars": "4.7.3",
120-
"husky": "4.2.1",
115+
"fixturify": "2.1.0",
116+
"got": "11.3.0",
117+
"handlebars": "4.7.6",
118+
"husky": "4.2.5",
121119
"in-repo-a": "link:tests/dummy/lib/in-repo-a",
122120
"in-repo-b": "link:tests/dummy/lib/in-repo-b",
123121
"loader.js": "4.7.0",
124-
"mocha": "7.0.1",
125-
"prettier": "1.19.1",
126-
"prettier-eslint": "9.0.1",
127-
"qunit-dom": "1.0.0",
128-
"testdouble": "3.12.5",
129-
"tmp": "0.1.0",
130-
"ts-node": "8.6.2",
122+
"mocha": "8.0.1",
123+
"prettier": "2.0.5",
124+
"prettier-eslint": "11.0.0",
125+
"qunit-dom": "1.2.0",
126+
"rimraf": "^3.0.2",
127+
"testdouble": "3.16.0",
128+
"ts-node": "8.10.2",
131129
"typescript": "3.7.5"
132130
},
133131
"resolutions": {
134-
"@types/ember": "3.1.1",
135-
"@types/ember__string": "3.0.6",
132+
"@types/ember": "3.1.2",
133+
"@types/ember__string": "3.0.8",
136134
"hawk": "7"
137135
},
138136
"engines": {
@@ -158,7 +156,7 @@
158156
"proseWrap": "never"
159157
},
160158
"volta": {
161-
"node": "10.18.1",
162-
"yarn": "1.21.1"
159+
"node": "10.19.0",
160+
"yarn": "1.22.4"
163161
}
164162
}

rfcs/0000-template.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
- Start Date: (fill me in with today's date, YYYY-MM-DD)
2+
- Relevant Team(s): (fill this in with the [team(s)](README.md#relevant-teams) to which this RFC applies)
3+
- RFC PR: (after opening the RFC PR, update this with a link to it and update the file name)
4+
- Tracking: (leave this empty)
5+
6+
# <RFC title>
7+
8+
## Summary
9+
10+
> One paragraph explanation of the feature.
11+
12+
## Motivation
13+
14+
> Why are we doing this? What use cases does it support? What is the expected
15+
outcome?
16+
17+
## Detailed design
18+
19+
> This is the bulk of the RFC.
20+
21+
> Explain the design in enough detail for somebody
22+
familiar with the framework to understand, and for somebody familiar with the
23+
implementation to implement. This should get into specifics and corner-cases,
24+
and include examples of how the feature is used. Any new terminology should be
25+
defined here.
26+
27+
## How we teach this
28+
29+
> What names and terminology work best for these concepts and why? How is this
30+
idea best presented? As a continuation of existing Ember patterns, or as a
31+
wholly new one?
32+
33+
> Would the acceptance of this proposal mean the Ember guides must be
34+
re-organized or altered? Does it change how Ember is taught to new users
35+
at any level?
36+
37+
> How should this feature be introduced and taught to existing Ember
38+
users?
39+
40+
## Drawbacks
41+
42+
> Why should we *not* do this? Please consider the impact on teaching Ember,
43+
on the integration of this feature with other existing and planned features,
44+
on the impact of the API churn on existing apps, etc.
45+
46+
> There are tradeoffs to choosing any path, please attempt to identify them here.
47+
48+
## Alternatives
49+
50+
> What other designs have been considered? What is the impact of not doing this?
51+
52+
> This section could also include prior art, that is, how other frameworks in the same domain have solved this problem.
53+
54+
## Unresolved questions
55+
56+
> Optional, but suggested for first drafts. What parts of the design are still
57+
TBD?

0 commit comments

Comments
 (0)