Skip to content

Commit 0eb3a1f

Browse files
authored
Merge pull request #32 from empress/upgrade
breaking: Drop support for Ember < 3.12 and update to 3.28 using ember-cli-update
2 parents 17644a9 + 3b0347b commit 0eb3a1f

Some content is hidden

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

45 files changed

+36933
-4382
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintignore

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

1719
# ember-try
1820
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,53 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
47
ecmaVersion: 2018,
5-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
plugins: [
8-
'ember'
9-
],
13+
plugins: ['ember'],
1014
extends: [
1115
'eslint:recommended',
12-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1318
],
1419
env: {
15-
browser: true
16-
},
17-
rules: {
20+
browser: true,
1821
},
22+
rules: {},
1923
overrides: [
2024
// node files
2125
{
2226
files: [
23-
'.eslintrc.js',
24-
'.template-lintrc.js',
25-
'ember-cli-build.js',
26-
'index.js',
27-
'testem.js',
28-
'blueprints/*/index.js',
29-
'config/**/*.js',
30-
'tests/dummy/config/**/*.js'
31-
],
32-
excludedFiles: [
33-
'addon/**',
34-
'addon-test-support/**',
35-
'app/**',
36-
'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',
3736
],
3837
parserOptions: {
3938
sourceType: 'script',
40-
ecmaVersion: 2015
4139
},
4240
env: {
4341
browser: false,
44-
node: true
42+
node: true,
4543
},
4644
plugins: ['node'],
47-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48-
// add your custom rules and overrides for node files here
49-
})
50-
}
51-
]
45+
extends: ['plugin:node/recommended'],
46+
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
52+
],
5253
};

.github/workflows/ci.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- main
8+
- "v*"
9+
pull_request:
10+
11+
env:
12+
NODE_VERSION: 10
13+
FORCE_COLOR: 1
14+
15+
jobs:
16+
lint:
17+
name: Linting
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: actions/setup-node@v2
23+
with:
24+
node-version: ${{ env.NODE_VERSION }}
25+
- run: npm i -g npm@7
26+
- run: npm ci
27+
- run: npm run lint:hbs
28+
- run: npm run lint:js
29+
30+
test:
31+
name: Tests
32+
runs-on: ubuntu-latest
33+
34+
steps:
35+
- uses: actions/checkout@v2
36+
- uses: actions/setup-node@v2
37+
with:
38+
node-version: ${{ env.NODE_VERSION }}
39+
- uses: mansona/npm-lockfile-version@v1
40+
- run: npm i -g npm@7
41+
- run: npm ci
42+
- run: npm run test:ember
43+
44+
floating-dependencies:
45+
name: Floating Dependencies
46+
runs-on: ubuntu-latest
47+
48+
steps:
49+
- uses: actions/checkout@v2
50+
- uses: actions/setup-node@v2
51+
with:
52+
node-version: ${{ env.NODE_VERSION }}
53+
- run: npm i -g npm@7
54+
- run: npm install --no-package-lock
55+
- run: npm run test:ember
56+
57+
try-scenarios:
58+
name: "ember-try: ${{ matrix.ember-try-scenario }}"
59+
runs-on: ubuntu-latest
60+
timeout-minutes: 7
61+
needs: test
62+
63+
strategy:
64+
fail-fast: false
65+
matrix:
66+
ember-try-scenario:
67+
- ember-lts-3.12
68+
- ember-lts-3.16
69+
- ember-lts-3.20
70+
- ember-lts-3.24
71+
- ember-release
72+
- ember-beta
73+
- ember-canary
74+
- ember-default-with-jquery
75+
- ember-classic
76+
- embroider-safe
77+
- embroider-optimized
78+
- no-deprecations
79+
- ember-release-no-deprecations
80+
81+
steps:
82+
- uses: actions/checkout@v2
83+
- uses: actions/setup-node@v2
84+
with:
85+
node-version: ${{ env.NODE_VERSION }}
86+
- run: npm i -g npm@7
87+
- run: npm ci
88+
- name: test
89+
run: node_modules/.bin/ember try:one ${{ matrix.ember-try-scenario }} --skip-cleanup

.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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
16+
/.git/
1517
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1620
/.template-lintrc.js
1721
/.travis.yml
1822
/.watchmanconfig
@@ -22,6 +26,7 @@
2226
/ember-cli-build.js
2327
/testem.js
2428
/tests/
29+
/yarn-error.log
2530
/yarn.lock
2631
.gitkeep
2732

.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+
};

.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: 'recommended'
4+
extends: 'recommended',
55
};

.travis.yml

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

0 commit comments

Comments
 (0)