Skip to content

Commit d407954

Browse files
simonihmigsimonihmig
authored
Merge pull request #41 from kaliber5/update
Update to Ember 4.2, drop support for Ember < 3.24, node 10, ember-changeset < 4
2 parents d11f9cf + fb0fd5c commit d407954

30 files changed

+3875
-5918
lines changed

‎.eslintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/
1921
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2023
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎.eslintrc.js

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,53 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
35
parser: 'babel-eslint',
46
parserOptions: {
57
ecmaVersion: 2018,
68
sourceType: 'module',
79
ecmaFeatures: {
8-
legacyDecorators: true
9-
}
10+
legacyDecorators: true,
11+
},
1012
},
11-
plugins: [
12-
'ember'
13-
],
13+
plugins: ['ember'],
1414
extends: [
1515
'eslint:recommended',
16-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1718
],
1819
env: {
19-
browser: true
20-
},
21-
rules: {
22-
'ember/no-jquery': 'error'
20+
browser: true,
2321
},
22+
rules: {},
2423
overrides: [
2524
// node files
2625
{
2726
files: [
28-
'.eslintrc.js',
29-
'.template-lintrc.js',
30-
'ember-cli-build.js',
31-
'index.js',
32-
'testem.js',
33-
'blueprints/*/index.js',
34-
'config/**/*.js',
35-
'tests/dummy/config/**/*.js'
36-
],
37-
excludedFiles: [
38-
'addon/**',
39-
'addon-test-support/**',
40-
'app/**',
41-
'tests/dummy/app/**'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
4236
],
4337
parserOptions: {
44-
sourceType: 'script'
38+
sourceType: 'script',
4539
},
4640
env: {
4741
browser: false,
48-
node: true
42+
node: true,
4943
},
5044
plugins: ['node'],
51-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
52-
// add your custom rules and overrides for node files here
53-
})
54-
}
55-
]
45+
extends: ['plugin:node/recommended'],
46+
},
47+
{
48+
// test files
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
52+
],
5653
};

‎.github/workflows/ci.yml

Lines changed: 54 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -3,188 +3,74 @@ name: CI
33
on:
44
push:
55
branches:
6+
- main
67
- master
7-
pull_request:
8+
pull_request: {}
89

9-
jobs:
10-
lint:
11-
name: Lint
12-
runs-on: ubuntu-latest
13-
steps:
14-
- uses: actions/checkout@v2
15-
with:
16-
fetch-depth: 1
17-
- uses: actions/setup-node@v2-beta
18-
with:
19-
node-version: '10.x'
20-
- name: Get package manager's global cache path
21-
id: global-cache-dir-path
22-
run: echo "::set-output name=dir::$(yarn cache dir)"
23-
- name: Cache package manager's global cache
24-
id: cache-global-package-manager-cache
25-
uses: actions/cache@v1
26-
with:
27-
path: ${{ steps.global-cache-dir-path.outputs.dir }}
28-
key: ${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-${{ hashFiles('**/yarn.lock') }}
29-
restore-keys: |
30-
${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-
31-
- name: Cache node_modules
32-
id: cache-node-modules
33-
uses: actions/cache@v1
34-
with:
35-
path: node_modules
36-
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
37-
restore-keys: |
38-
${{ runner.os }}-${{ matrix.node-version }}-nodemodules-
39-
- name: Install Dependencies
40-
run: yarn install --frozen-lockfile
41-
if: |
42-
steps.cache-global-package-manager-cache.outputs.cache-hit != 'true' ||
43-
steps.cache-node-modules.outputs.cache-hit != 'true'
44-
- name: Lint
45-
run: yarn lint
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
4613

14+
jobs:
4715
test:
48-
name: Tests
49-
runs-on: ${{ matrix.os }}
50-
needs: lint
51-
52-
strategy:
53-
matrix:
54-
os: [ubuntu-latest]
55-
browser: [chrome]
16+
name: "Tests"
17+
runs-on: ubuntu-latest
5618

5719
steps:
58-
- uses: actions/checkout@v2
59-
with:
60-
fetch-depth: 1
61-
- uses: actions/setup-node@v2-beta
62-
with:
63-
node-version: '10.x'
64-
- name: Get package manager's global cache path
65-
id: global-cache-dir-path
66-
run: echo "::set-output name=dir::$(yarn cache dir)"
67-
- name: Cache package manager's global cache
68-
id: cache-global-package-manager-cache
69-
uses: actions/cache@v1
70-
with:
71-
path: ${{ steps.global-cache-dir-path.outputs.dir }}
72-
key: ${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-${{ hashFiles('**/yarn.lock') }}
73-
restore-keys: |
74-
${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-
75-
- name: Cache node_modules
76-
id: cache-node-modules
77-
uses: actions/cache@v1
78-
with:
79-
path: node_modules
80-
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
81-
restore-keys: |
82-
${{ runner.os }}-${{ matrix.node-version }}-nodemodules-
83-
- name: Install Dependencies
84-
run: yarn install --frozen-lockfile
85-
if: |
86-
steps.cache-global-package-manager-cache.outputs.cache-hit != 'true' ||
87-
steps.cache-node-modules.outputs.cache-hit != 'true'
88-
- name: Test
89-
run: yarn test:ember --launch ${{ matrix.browser }}
90-
91-
floating-dependencies:
92-
name: Floating Dependencies
93-
runs-on: ${{ matrix.os }}
94-
needs: lint
20+
- uses: actions/checkout@v2
21+
- name: Install Node
22+
uses: actions/setup-node@v2
23+
with:
24+
node-version: 12.x
25+
cache: yarn
26+
- name: Install Dependencies
27+
run: yarn install --frozen-lockfile
28+
- name: Lint
29+
run: yarn lint
30+
- name: Run Tests
31+
run: yarn test:ember
9532

96-
strategy:
97-
matrix:
98-
os: [ubuntu-latest]
99-
browser: [chrome]
33+
floating:
34+
name: "Floating Dependencies"
35+
runs-on: ubuntu-latest
10036

10137
steps:
102-
- uses: actions/checkout@v2
103-
with:
104-
fetch-depth: 1
105-
- uses: actions/setup-node@v2-beta
106-
with:
107-
node-version: '10.x'
108-
- name: Get package manager's global cache path
109-
id: global-cache-dir-path
110-
run: echo "::set-output name=dir::$(yarn cache dir)"
111-
- name: Cache package manager's global cache
112-
id: cache-global-package-manager-cache
113-
uses: actions/cache@v1
114-
with:
115-
path: ${{ steps.global-cache-dir-path.outputs.dir }}
116-
key: ${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-${{ hashFiles('**/yarn.lock') }}
117-
restore-keys: |
118-
${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-
119-
- name: Cache node_modules
120-
id: cache-node-modules
121-
uses: actions/cache@v1
122-
with:
123-
path: node_modules
124-
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
125-
restore-keys: |
126-
${{ runner.os }}-${{ matrix.node-version }}-nodemodules-
127-
- name: Install Dependencies
128-
run: yarn install --frozen-lockfile
129-
if: |
130-
steps.cache-global-package-manager-cache.outputs.cache-hit != 'true' ||
131-
steps.cache-node-modules.outputs.cache-hit != 'true'
132-
- name: Test
133-
run: yarn test:ember --launch ${{ matrix.browser }}
38+
- uses: actions/checkout@v2
39+
- uses: actions/setup-node@v2
40+
with:
41+
node-version: 12.x
42+
cache: yarn
43+
- name: Install Dependencies
44+
run: yarn install --no-lockfile
45+
- name: Run Tests
46+
run: yarn test:ember
13447

13548
try-scenarios:
136-
name: Tests - ${{ matrix.ember-try-scenario }}
49+
name: ${{ matrix.try-scenario }}
13750
runs-on: ubuntu-latest
138-
continue-on-error: ${{ matrix.allow-failure }}
139-
needs: test
51+
needs: 'test'
14052

14153
strategy:
142-
fail-fast: true
54+
fail-fast: false
14355
matrix:
144-
ember-try-scenario: [
145-
ember-lts-3.16,
146-
ember-release,
147-
ember-beta,
148-
ember-default-with-jquery,
149-
ember-classic
150-
]
151-
allow-failure: [false]
152-
include:
153-
- ember-try-scenario: ember-canary
154-
allow-failure: true
56+
try-scenario:
57+
- ember-lts-3.24
58+
- ember-lts-3.28
59+
- ember-release
60+
- ember-beta
61+
- ember-canary
62+
- ember-classic
63+
- embroider-safe
64+
- embroider-optimized
15565

15666
steps:
157-
- uses: actions/checkout@v2
158-
with:
159-
fetch-depth: 1
160-
- uses: actions/setup-node@v2-beta
161-
with:
162-
node-version: '10.x'
163-
- name: Get package manager's global cache path
164-
id: global-cache-dir-path
165-
run: echo "::set-output name=dir::$(yarn cache dir)"
166-
- name: Cache package manager's global cache
167-
id: cache-global-package-manager-cache
168-
uses: actions/cache@v1
169-
with:
170-
path: ${{ steps.global-cache-dir-path.outputs.dir }}
171-
key: ${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-${{ hashFiles('**/yarn.lock') }}
172-
restore-keys: |
173-
${{ runner.os }}-${{ matrix.node-version }}-yarn.lock-
174-
- name: Cache node_modules
175-
id: cache-node-modules
176-
uses: actions/cache@v1
177-
with:
178-
path: node_modules
179-
key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
180-
restore-keys: |
181-
${{ runner.os }}-${{ matrix.node-version }}-nodemodules-
182-
- name: Install Dependencies
183-
run: yarn install --frozen-lockfile
184-
if: |
185-
steps.cache-global-package-manager-cache.outputs.cache-hit != 'true' ||
186-
steps.cache-node-modules.outputs.cache-hit != 'true'
187-
- name: Test
188-
env:
189-
EMBER_TRY_SCENARIO: ${{ matrix.ember-try-scenario }}
190-
run: node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
67+
- uses: actions/checkout@v2
68+
- name: Install Node
69+
uses: actions/setup-node@v2
70+
with:
71+
node-version: 12.x
72+
cache: yarn
73+
- name: Install Dependencies
74+
run: yarn install --frozen-lockfile
75+
- name: Run Tests
76+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

‎.gitignore

Lines changed: 4 additions & 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
@@ -22,4 +23,7 @@
2223
# ember-try
2324
/.node_modules.ember-try/
2425
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
2527
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try

‎.npmignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
17+
/.github/
1618
/.gitignore
19+
/.prettierignore
20+
/.prettierrc.js
1721
/.template-lintrc.js
1822
/.travis.yml
1923
/.watchmanconfig
@@ -23,10 +27,14 @@
2327
/ember-cli-build.js
2428
/testem.js
2529
/tests/
30+
/yarn-error.log
2631
/yarn.lock
2732
.gitkeep
2833

2934
# ember-try
3035
/.node_modules.ember-try/
3136
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3238
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try

0 commit comments

Comments
 (0)