Skip to content

Commit 4667af1

Browse files
Upgrade to Ember 3.28 (#448)
1 parent 429efe5 commit 4667af1

33 files changed

+1896
-1989
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,15 @@ module.exports = {
2929
// node files
3030
{
3131
files: [
32-
'.eslintrc.js',
33-
'.prettierrc.js',
34-
'.template-lintrc.js',
35-
'ember-cli-build.js',
36-
'index.js',
37-
'testem.js',
38-
'blueprints/*/index.js',
39-
'config/**/*.js',
40-
'tests/dummy/config/**/*.js',
41-
],
42-
excludedFiles: [
43-
'addon/**',
44-
'addon-test-support/**',
45-
'app/**',
46-
'tests/dummy/app/**',
47-
'tests/dummy/config/scenarios.js',
32+
'./.eslintrc.js',
33+
'./.prettierrc.js',
34+
'./.template-lintrc.js',
35+
'./ember-cli-build.js',
36+
'./index.js',
37+
'./testem.js',
38+
'./blueprints/*/index.js',
39+
'./config/**/*.js',
40+
'./tests/dummy/config/**/*.js',
4841
],
4942
parserOptions: {
5043
sourceType: 'script',
@@ -56,5 +49,10 @@ module.exports = {
5649
plugins: ['node'],
5750
extends: ['plugin:node/recommended'],
5851
},
52+
{
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
5957
],
6058
};

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ jobs:
9999
fail-fast: true
100100
matrix:
101101
ember-try-scenario: [
102-
ember-lts-3.16,
103102
ember-lts-3.20,
103+
ember-lts-3.24,
104104
ember-release,
105105
ember-beta,
106106
ember-default-with-jquery,
107-
ember-classic
107+
ember-classic,
108108
]
109109
allow-failure: [false]
110110
include:

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
/.eslintrc.js
99
/.git/
1010
/.gitignore
11+
/.prettierignore
12+
/.prettierrc.js
1113
/.template-lintrc.js
1214
/.travis.yml
1315
/.watchmanconfig
@@ -17,6 +19,7 @@
1719
/ember-cli-build.js
1820
/testem.js
1921
/tests/
22+
/yarn-error.log
2023
/yarn.lock
2124
.gitkeep
2225

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `yarn lint:hbs`
12-
* `yarn lint:js`
13-
* `yarn lint:js --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

config/deprecation-workflow.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,19 @@ self.deprecationWorkflow.config = {
99
{ handler: 'silence', matchId: 'ember-runtime.deprecate-copy-copyable' },
1010
{ handler: 'silence', matchId: 'array.new-array-wrapper' },
1111
{ handler: 'silence', matchId: 'object.new-constructor' },
12+
{
13+
handler: 'silence',
14+
matchId: 'deprecated-run-loop-and-computed-dot-access',
15+
},
16+
{ handler: 'silence', matchId: 'ember-source.deprecation-without-for' },
17+
{ handler: 'silence', matchId: 'ember-source.deprecation-without-since' },
18+
{ handler: 'silence', matchId: 'deprecate-fetch-ember-data-support' },
19+
{ handler: 'silence', matchId: 'this-property-fallback' },
20+
{ handler: 'silence', matchId: 'implicit-injections' },
21+
{
22+
handler: 'silence',
23+
matchId: 'ember.built-in-components.legacy-arguments',
24+
},
25+
{ handler: 'silence', matchId: 'routing.transition-methods' },
1226
],
1327
};

config/ember-try.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ module.exports = async function () {
77
useYarn: true,
88
scenarios: [
99
{
10-
name: 'ember-lts-3.16',
10+
name: 'ember-lts-3.20',
1111
npm: {
1212
devDependencies: {
13-
'ember-source': '~3.16.0',
13+
'ember-source': '~3.20.5',
1414
},
1515
},
1616
},
1717
{
18-
name: 'ember-lts-3.20',
18+
name: 'ember-lts-3.24',
1919
npm: {
2020
devDependencies: {
21-
'ember-source': '~3.20.5',
21+
'ember-source': '~3.24.3',
2222
},
2323
},
2424
},
@@ -32,6 +32,7 @@ module.exports = async function () {
3232
},
3333
{
3434
name: 'ember-beta',
35+
allowedToFail: true,
3536
npm: {
3637
devDependencies: {
3738
'ember-source': await getChannelURL('beta'),
@@ -40,6 +41,7 @@ module.exports = async function () {
4041
},
4142
{
4243
name: 'ember-canary',
44+
allowedToFail: true,
4345
npm: {
4446
devDependencies: {
4547
'ember-source': await getChannelURL('canary'),

ember-cli-build.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,12 @@ module.exports = function (defaults) {
77
},
88
});
99

10+
/*
11+
This build file specifies the options for the dummy test app of this
12+
addon, located in `/tests/dummy`
13+
This build file does *not* influence how the addon or the app using it
14+
behave. You most likely want to be modifying `./index.js` or app's build file
15+
*/
16+
1017
return app.toTree();
1118
};

package.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"homepage": "https://github.com/adopted-ember-addons/ember-data-factory-guy",
1515
"scripts": {
16-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
16+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
1717
"lint:hbs": "ember-template-lint .",
1818
"lint:js": "eslint .",
1919
"build": "ember build --environment=production",
@@ -22,34 +22,35 @@
2222
"test:ember-compatibility": "ember try:each"
2323
},
2424
"engines": {
25-
"node": "10.* || >= 12"
25+
"node": "12.* || 14.* || >= 16"
2626
},
2727
"license": "MIT",
2828
"dependencies": {
2929
"broccoli-funnel": "^3.0.4",
3030
"broccoli-merge-trees": "^4.2.0",
31-
"ember-auto-import": "^1.11.2",
32-
"ember-cli-babel": "^7.26.3",
31+
"ember-auto-import": "^1.11.3",
32+
"ember-cli-babel": "^7.26.6",
3333
"ember-cli-htmlbars": "^5.7.1",
3434
"pretender": "^3.4.3",
3535
"resolve": "^1.20.0",
3636
"whatwg-fetch": "^3.6.2"
3737
},
3838
"devDependencies": {
3939
"@ember/optional-features": "^2.0.0",
40-
"@ember/test-helpers": "^2.1.4",
41-
"@glimmer/component": "^1.0.3",
42-
"@glimmer/tracking": "^1.0.3",
40+
"@ember/test-helpers": "^2.4.2",
41+
"@embroider/test-setup": "^0.43.5",
42+
"@glimmer/component": "^1.0.4",
43+
"@glimmer/tracking": "^1.0.4",
4344
"active-model-adapter": "^2.2.0",
4445
"babel-eslint": "^10.1.0",
4546
"broccoli-asset-rev": "^3.0.0",
4647
"ember-auto-import": "^1.11.2",
47-
"ember-cli": "~3.24.0",
48+
"ember-cli": "~3.28.0",
4849
"ember-cli-dependency-checker": "^3.2.0",
4950
"ember-cli-deprecation-workflow": "^1.0.1",
50-
"ember-cli-inject-live-reload": "^2.0.2",
51+
"ember-cli-inject-live-reload": "^2.1.0",
5152
"ember-cli-sri": "^2.1.1",
52-
"ember-cli-terser": "^4.0.1",
53+
"ember-cli-terser": "^4.0.2",
5354
"ember-data": "~3.9",
5455
"ember-data-model-fragments": "^4.0.0",
5556
"ember-disable-prototype-extensions": "^1.1.3",
@@ -58,24 +59,25 @@
5859
"ember-inflector": "^4.0.1",
5960
"ember-load-initializers": "^2.1.2",
6061
"ember-maybe-import-regenerator": "^0.1.6",
61-
"ember-page-title": "^6.0.3",
62+
"ember-page-title": "^6.2.2",
6263
"ember-qunit": "^5.1.4",
6364
"ember-resolver": "^8.0.2",
6465
"ember-sinon": "5.0.0",
65-
"ember-source": "~3.24.0",
66+
"ember-source": "~3.28.0",
6667
"ember-source-channel-url": "^3.0.0",
67-
"ember-template-lint": "^2.15.0",
68+
"ember-template-lint": "^3.6.0",
6869
"ember-test-selectors": "^5.0.0",
6970
"ember-try": "^1.4.0",
70-
"eslint": "^7.24.0",
71-
"eslint-config-prettier": "^8.2.0",
72-
"eslint-plugin-ember": "^10.1.1",
71+
"eslint": "^7.32.0",
72+
"eslint-config-prettier": "^8.3.0",
73+
"eslint-plugin-ember": "^10.5.4",
7374
"eslint-plugin-node": "^11.1.0",
74-
"eslint-plugin-prettier": "^3.4.0",
75+
"eslint-plugin-prettier": "^3.4.1",
76+
"eslint-plugin-qunit": "^6.2.0",
7577
"loader.js": "4.7.0",
7678
"npm-run-all": "^4.1.5",
77-
"prettier": "^2.2.1",
78-
"qunit": "^2.13.0",
79+
"prettier": "^2.3.2",
80+
"qunit": "^2.16.0",
7981
"qunit-dom": "^1.6.0"
8082
},
8183
"resolutions": {

tests/.eslintrc.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)