Skip to content

Commit c58a7d3

Browse files
elwayman02elwayman02
authored
Merge pull request #403 from elwayman02/ember-3.27
Ember 3.27 Blueprint Updates (Drop Ember 3.16 Support)
2 parents 0c6a22b + d4c6b46 commit c58a7d3

13 files changed

+92
-20
lines changed

‎.eslintignore

+1
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

+5
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,10 @@ module.exports = {
5050
plugins: ['node'],
5151
extends: ['plugin:node/recommended'],
5252
},
53+
{
54+
// Test files:
55+
files: ['tests/**/*-test.{js,ts}'],
56+
extends: ['plugin:qunit/recommended'],
57+
},
5358
],
5459
};

‎.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: volta-cli/action@v1
2020
with:
2121
node-version: 12.x
22-
yarn-version: 1.22.5
22+
yarn-version: 1.22.10
2323

2424
- run: yarn install --frozen-lockfile
2525
- run: yarn lint
@@ -34,7 +34,7 @@ jobs:
3434
- uses: volta-cli/action@v1
3535
with:
3636
node-version: 12.x
37-
yarn-version: 1.22.5
37+
yarn-version: 1.22.10
3838

3939
- run: yarn install --no-lockfile
4040
- run: yarn test:ember
@@ -49,8 +49,8 @@ jobs:
4949
fail-fast: true
5050
matrix:
5151
ember-try-scenario:
52-
- ember-lts-3.16
5352
- ember-lts-3.20
53+
- ember-lts-3.24
5454
- ember-release
5555
- ember-default-with-jquery
5656
- ember-classic
@@ -66,7 +66,7 @@ jobs:
6666
- uses: volta-cli/action@v1
6767
with:
6868
node-version: 12.x
69-
yarn-version: 1.22.5
69+
yarn-version: 1.22.10
7070

7171
- run: yarn install --frozen-lockfile
7272

‎.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
/ember-cli-build.js
2727
/testem.js
2828
/tests/
29+
/yarn-error.log
2930
/yarn.lock
3031
.gitkeep
3132

‎.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ We adhere to the [Ember Community Guidelines](https://emberjs.com/guidelines/) f
1313
Compatibility
1414
------------------------------------------------------------------------------
1515

16-
* Ember.js v3.8 or above
17-
* Ember CLI v2.13 or above
16+
* Ember.js v3.20 or above
17+
* Ember CLI v3.20 or above
1818
* Node.js v10 or above
1919
* [All N-1 Browsers except IE](https://caniuse.com/#feat=intersectionobserver)
2020

‎config/ember-try.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ module.exports = async function () {
88
useYarn: true,
99
scenarios: [
1010
{
11-
name: 'ember-lts-3.16',
11+
name: 'ember-lts-3.20',
1212
npm: {
1313
devDependencies: {
14-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.20.5',
1515
},
1616
},
1717
},
1818
{
19-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.24',
2020
npm: {
2121
devDependencies: {
22-
'ember-source': '~3.20.5',
22+
'ember-source': '~3.24.3',
2323
},
2424
},
2525
},

‎package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
},
1818
"scripts": {
1919
"build": "ember build --environment=production",
20-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
20+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
2121
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
2222
"lint:hbs": "ember-template-lint .",
2323
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -48,6 +48,7 @@
4848
"ember-cli-addon-docs": "^3.0.0",
4949
"ember-cli-addon-docs-yuidoc": "^1.0.0",
5050
"ember-cli-dependency-checker": "^3.2.0",
51+
"ember-cli-deprecation-workflow": "^1.0.1",
5152
"ember-cli-deploy": "^1.0.2",
5253
"ember-cli-deploy-build": "^2.0.0",
5354
"ember-cli-deploy-git": "^1.3.4",
@@ -74,6 +75,7 @@
7475
"eslint-plugin-ember": "^10.5.1",
7576
"eslint-plugin-node": "^11.1.0",
7677
"eslint-plugin-prettier": "^3.4.0",
78+
"eslint-plugin-qunit": "^6.1.1",
7779
"loader.js": "^4.7.0",
7880
"npm-run-all": "^4.1.5",
7981
"prettier": "^2.3.2",

‎tests/dummy/config/deprecation-workflow.js

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* eslint-disable no-undef */
2+
3+
/**
4+
* This config leverages https://github.com/mixonic/ember-cli-deprecation-workflow
5+
* This addon intercepts Ember deprecation warnings and provides an easy way to address the errors.
6+
*/
7+
8+
window.deprecationWorkflow = window.deprecationWorkflow || {};
9+
window.deprecationWorkflow.config = {
10+
// If we uncomment the line below, any unhandled error i.e a new error introduced would fail the tests.
11+
// throwOnUnhandled: true,
12+
workflow: [
13+
// If we want tests to fail, we need to modify the handler to 'throw'
14+
{
15+
handler: 'silence',
16+
matchId: 'deprecated-run-loop-and-computed-dot-access',
17+
},
18+
{ handler: 'silence', matchId: 'ember.built-in-components.import' },
19+
{
20+
handler: 'silence',
21+
matchId: 'ember.built-in-components.legacy-arguments',
22+
},
23+
{ handler: 'silence', matchId: 'ember.built-in-components.reopen' },
24+
{
25+
handler: 'silence',
26+
matchId: 'ember-glimmer.link-to.positional-arguments',
27+
},
28+
{ handler: 'silence', matchId: 'ember-keyboard.first-responder-inputs' },
29+
{ handler: 'silence', matchId: 'manager-capabilities.modifiers-3-13' },
30+
{ handler: 'silence', matchId: 'this-property-fallback' },
31+
],
32+
};

‎tests/dummy/config/ember-cli-update.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.26.1",
6+
"version": "3.27.0",
77
"blueprints": [
88
{
99
"name": "addon",

‎tests/dummy/config/targets.js

+14-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,20 @@ const browsers = [
66
'last 2 Safari versions',
77
];
88

9-
const isCI = Boolean(process.env.CI);
10-
const isProduction = process.env.EMBER_ENV === 'production';
11-
12-
if (isCI || isProduction) {
13-
browsers.push('ie 11');
14-
}
9+
// Ember's browser support policy is changing, and IE11 support will end in
10+
// v4.0 onwards.
11+
//
12+
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
13+
//
14+
// If you need IE11 support on a version of Ember that still offers support
15+
// for it, uncomment the code block below.
16+
//
17+
// const isCI = Boolean(process.env.CI);
18+
// const isProduction = process.env.EMBER_ENV === 'production';
19+
//
20+
// if (isCI || isProduction) {
21+
// browsers.push('ie 11');
22+
// }
1523

1624
module.exports = {
1725
browsers,

‎tests/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</div>
2929
</div>
3030

31-
<script src="/testem.js" integrity=""></script>
31+
<script src="/testem.js" integrity="" data-embroider-ignore></script>
3232
<script src="{{rootURL}}assets/vendor.js"></script>
3333
<script src="{{rootURL}}assets/test-support.js"></script>
3434
<script src="{{rootURL}}assets/dummy.js"></script>

‎yarn.lock

+23
Original file line numberDiff line numberDiff line change
@@ -6547,6 +6547,16 @@ ember-cli-deploy@^1.0.2:
65476547
rsvp "^3.3.3"
65486548
silent-error "^1.0.0"
65496549

6550+
ember-cli-deprecation-workflow@^1.0.1:
6551+
version "1.0.1"
6552+
resolved "https://registry.yarnpkg.com/ember-cli-deprecation-workflow/-/ember-cli-deprecation-workflow-1.0.1.tgz#3305a6879af7f074216a54963d92491c411ce7e0"
6553+
integrity sha512-tns8l4FLz8zmhmNRH7ywihs4XNTTuQysl+POYTpiyjb4zPNKv0cUJBCT/MklYFWBCo/5DcVzabhLODJZcScUfg==
6554+
dependencies:
6555+
broccoli-funnel "^2.0.1"
6556+
broccoli-merge-trees "^3.0.1"
6557+
broccoli-plugin "^1.3.1"
6558+
ember-debug-handlers-polyfill "^1.1.1"
6559+
65506560
ember-cli-get-component-path-option@^1.0.0:
65516561
version "1.0.0"
65526562
resolved "https://registry.yarnpkg.com/ember-cli-get-component-path-option/-/ember-cli-get-component-path-option-1.0.0.tgz#0d7b595559e2f9050abed804f1d8eff1b08bc771"
@@ -6976,6 +6986,11 @@ ember-data@^3.27.1:
69766986
ember-cli-typescript "^4.1.0"
69776987
ember-inflector "^4.0.1"
69786988

6989+
ember-debug-handlers-polyfill@^1.1.1:
6990+
version "1.1.1"
6991+
resolved "https://registry.yarnpkg.com/ember-debug-handlers-polyfill/-/ember-debug-handlers-polyfill-1.1.1.tgz#e9ae0a720271a834221179202367421b580002ef"
6992+
integrity sha512-lO7FBAqJjzbL+IjnWhVfQITypPOJmXdZngZR/Vdn513W4g/Q6Sjicao/mDzeDCb48Y70C4Facwk0LjdIpSZkRg==
6993+
69796994
ember-decorators-polyfill@^1.1.5:
69806995
version "1.1.5"
69816996
resolved "https://registry.yarnpkg.com/ember-decorators-polyfill/-/ember-decorators-polyfill-1.1.5.tgz#49203c302ea4486618ba4866923ec657cf2c9f3d"
@@ -7641,6 +7656,14 @@ eslint-plugin-prettier@^3.4.0:
76417656
dependencies:
76427657
prettier-linter-helpers "^1.0.0"
76437658

7659+
eslint-plugin-qunit@^6.1.1:
7660+
version "6.2.0"
7661+
resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d"
7662+
integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==
7663+
dependencies:
7664+
eslint-utils "^3.0.0"
7665+
requireindex "^1.2.0"
7666+
76447667
eslint-scope@^4.0.3:
76457668
version "4.0.3"
76467669
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"

0 commit comments

Comments
 (0)