Skip to content

Commit 63487ee

Browse files
authored
Merge pull request #370 from ember-learn/upgrade
[BREAKING] Upgrade to latest Ember and make 3.16 the lowest supported version
2 parents 9b1c612 + 032ffa1 commit 63487ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+33290
-26452
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+
.eslintcache
1617

1718
# ember-try
1819
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,49 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
20+
browser: true,
2521
},
22+
rules: {},
2623
overrides: [
2724
// node files
2825
{
2926
files: [
3027
'.eslintrc.js',
3128
'.stylelintrc.js',
29+
'.prettierrc.js',
3230
'.template-lintrc.js',
3331
'ember-cli-build.js',
3432
'index.js',
3533
'testem.js',
3634
'blueprints/*/index.js',
3735
'config/**/*.js',
38-
'tests/dummy/config/**/*.js'
36+
'tests/dummy/config/**/*.js',
3937
],
4038
excludedFiles: [
4139
'addon/**',
4240
'addon-test-support/**',
4341
'app/**',
44-
'tests/dummy/app/**'
42+
'tests/dummy/app/**',
4543
],
4644
parserOptions: {
47-
sourceType: 'script'
45+
sourceType: 'script',
4846
},
4947
env: {
5048
browser: false,
51-
node: true
49+
node: true,
5250
},
5351
plugins: ['node'],
54-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
55-
// add your custom rules and overrides for node files here
56-
})
57-
}
58-
]
52+
extends: ['plugin:node/recommended'],
53+
},
54+
],
5955
};

.github/workflows/ci.yml

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
- website-redesign-rfc
87
tags:
98
- v[0-9]+.[0-9]+.[0-9]+
109
pull_request:
@@ -16,7 +15,7 @@ env:
1615

1716
jobs:
1817
lint:
19-
name: Lint files
18+
name: Lint and Test
2019
runs-on: ubuntu-latest
2120
timeout-minutes: 3
2221
steps:
@@ -45,6 +44,15 @@ jobs:
4544
- name: Lint
4645
run: npm run lint
4746

47+
- name: Test
48+
uses: percy/[email protected]
49+
with:
50+
custom-command: npm run test:ember
51+
env:
52+
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
53+
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
54+
PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
55+
4856

4957
test-addon-floating:
5058
name: Test addon (floating dependencies)
@@ -65,53 +73,13 @@ jobs:
6573
- name: Test
6674
run: npm run test:ember
6775

68-
69-
test-addon-locked:
70-
name: Test addon (locked dependencies)
71-
runs-on: ubuntu-latest
72-
timeout-minutes: 5
73-
steps:
74-
- name: Check out a copy of the repo
75-
uses: actions/checkout@v2
76-
77-
- name: Use Node.js ${{ env.NODE_VERSION }}
78-
uses: actions/setup-node@v2-beta
79-
with:
80-
node-version: ${{ env.NODE_VERSION }}
81-
82-
- name: Cache npm cache and node_modules
83-
id: cache-dependencies
84-
uses: actions/cache@v2
85-
with:
86-
path: |
87-
~/.npm
88-
node_modules
89-
key: ${{ runner.os }}-${{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
90-
restore-keys: ${{ runner.os }}-${{ env.NODE_VERSION }}-
91-
92-
- name: Install dependencies
93-
run: npm install
94-
if: steps.cache-dependencies.outputs.cache-hit != 'true'
95-
96-
- name: Test
97-
uses: percy/[email protected]
98-
with:
99-
custom-command: npm run test:ember
100-
env:
101-
PERCY_PARALLEL_NONCE: ${{ env.PERCY_PARALLEL_NONCE }}
102-
PERCY_PARALLEL_TOTAL: ${{ env.PERCY_PARALLEL_TOTAL }}
103-
PERCY_TOKEN: ee0a9d5c1122d6a21852edf19b5b309aaec18077fb3900c98995c90bc48ed240
104-
105-
10676
test-compatibility:
10777
name: Test compatibility
10878
runs-on: ubuntu-latest
10979
strategy:
11080
fail-fast: true
11181
matrix:
11282
scenario:
113-
- 'ember-lts-3.8'
114-
- 'ember-lts-3.12'
11583
- 'ember-lts-3.16'
11684
- 'ember-lts-3.20'
11785
- 'ember-release'
@@ -144,4 +112,4 @@ jobs:
144112
if: steps.cache-dependencies.outputs.cache-hit != 'true'
145113

146114
- name: Test
147-
run: npm run test:ember-compatibility ${{ matrix.scenario }}
115+
run: npx ember try:one $EMBER_TRY_SCENARIO ${{ matrix.scenario }}

.github/workflows/gh-pages.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: github pages
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-18.04
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: actions/setup-node@v2
14+
with:
15+
node-version: '14'
16+
- run: npm install -g npm@7
17+
- run: npm install
18+
- run: npx lint-to-the-future output -o lttfOutput --rootUrl ember-styleguide --previous-results https://ember-learn.github.io/ember-styleguide/data.json
19+
- name: Deploy
20+
uses: peaceiris/actions-gh-pages@v3
21+
with:
22+
github_token: ${{ secrets.GITHUB_TOKEN }}
23+
publish_dir: ./lttfOutput

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/

.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

.stylelintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable prettier/prettier */
12
module.exports = {
23
extends: 'stylelint-config-standard',
34
plugins: [

.template-lintrc.js

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

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

0 commit comments

Comments
 (0)