Skip to content

Commit b3596a6

Browse files
hilljh82hilljh82
committed
chore: update to 4.12
1 parent 9fea8fb commit b3596a6

34 files changed

+399
-281
lines changed

‎.ember-cli

+7-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

‎.eslintignore

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

+33-35
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,55 @@
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
5+
parser: '@babel/eslint-parser',
66
parserOptions: {
7-
ecmaVersion: 2018,
7+
ecmaVersion: 'latest',
88
sourceType: 'module',
9-
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
14+
},
1215
},
13-
plugins: [
14-
'ember'
15-
],
16+
plugins: ['ember'],
1617
extends: [
1718
'eslint:recommended',
18-
'plugin:ember/recommended'
19+
'plugin:ember/recommended',
20+
'plugin:prettier/recommended',
1921
],
2022
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
23+
browser: true,
2524
},
25+
rules: {},
2626
overrides: [
2727
// node files
2828
{
2929
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'index.js',
34-
'testem.js',
35-
'blueprints/*/index.js',
36-
'config/**/*.js',
37-
'tests/dummy/config/**/*.js'
38-
],
39-
excludedFiles: [
40-
'addon/**',
41-
'addon-test-support/**',
42-
'app/**',
43-
'tests/dummy/app/**'
30+
'./.eslintrc.js',
31+
'./.prettierrc.js',
32+
'./.stylelintrc.js',
33+
'./.template-lintrc.js',
34+
'./ember-cli-build.js',
35+
'./index.js',
36+
'./testem.js',
37+
'./blueprints/*/index.js',
38+
'./config/**/*.js',
39+
'./tests/dummy/config/**/*.js',
4440
],
4541
parserOptions: {
46-
sourceType: 'script'
42+
sourceType: 'script',
4743
},
4844
env: {
4945
browser: false,
50-
node: true
46+
node: true,
5147
},
52-
plugins: ['node'],
53-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
54-
// add your custom rules and overrides for node files here
55-
})
56-
}
57-
]
48+
extends: ['plugin:n/recommended'],
49+
},
50+
{
51+
// test files
52+
files: ['tests/**/*-test.{js,ts}'],
53+
extends: ['plugin:qunit/recommended'],
54+
},
55+
],
5856
};

‎.github/workflows/ci.yml

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
test:
16+
name: "Tests"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- name: Install Node
23+
uses: actions/setup-node@v3
24+
with:
25+
node-version: 14.x
26+
cache: npm
27+
- name: Install Dependencies
28+
run: npm ci
29+
- name: Lint
30+
run: npm run lint
31+
- name: Run Tests
32+
run: npm run test:ember
33+
34+
floating:
35+
name: "Floating Dependencies"
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 10
38+
39+
steps:
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-node@v3
42+
with:
43+
node-version: 14.x
44+
cache: npm
45+
- name: Install Dependencies
46+
run: npm install --no-shrinkwrap
47+
- name: Run Tests
48+
run: npm run test:ember
49+
50+
try-scenarios:
51+
name: ${{ matrix.try-scenario }}
52+
runs-on: ubuntu-latest
53+
needs: "test"
54+
timeout-minutes: 10
55+
56+
strategy:
57+
fail-fast: false
58+
matrix:
59+
try-scenario:
60+
- ember-lts-4.4
61+
- ember-lts-4.8
62+
- ember-release
63+
- ember-beta
64+
- ember-canary
65+
- embroider-safe
66+
- embroider-optimized
67+
68+
steps:
69+
- uses: actions/checkout@v3
70+
- name: Install Node
71+
uses: actions/setup-node@v3
72+
with:
73+
node-version: 14.x
74+
cache: npm
75+
- name: Install Dependencies
76+
run: npm ci
77+
- name: Run Tests
78+
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

‎.gitignore

+14-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,21 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log
1819

19-
.idea/
20+
21+
.idea/
22+
23+
# ember-try
24+
/.node_modules.ember-try/
25+
/bower.json.ember-try
26+
/npm-shrinkwrap.json.ember-try
27+
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
31+
# broccoli-debug
32+
/DEBUG/

‎.npmignore

+10-1
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,32 @@
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
21+
/.stylelintignore
22+
/.stylelintrc.js
1723
/.template-lintrc.js
1824
/.travis.yml
1925
/.watchmanconfig
2026
/bower.json
21-
/config/ember-try.js
2227
/CONTRIBUTING.md
2328
/ember-cli-build.js
2429
/testem.js
2530
/tests/
31+
/yarn-error.log
2632
/yarn.lock
2733
.gitkeep
2834

2935
# ember-try
3036
/.node_modules.ember-try/
3137
/bower.json.ember-try
38+
/npm-shrinkwrap.json.ember-try
3239
/package.json.ember-try
40+
/package-lock.json.ember-try
41+
/yarn.lock.ember-try

‎.prettierignore

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
.lint-todo/
18+
19+
# ember-try
20+
/.node_modules.ember-try/
21+
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
23+
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

‎.prettierrc.js

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
'use strict';
2+
3+
module.exports = {
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
12+
};

‎.stylelintignore

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/
6+
7+
# addons
8+
/.node_modules.ember-try/

‎.stylelintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

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

‎.travis.yml

-59
This file was deleted.

‎CONTRIBUTING.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

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

1514
## Running tests
1615

@@ -23,4 +22,4 @@
2322
* `ember serve`
2423
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2524

26-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

0 commit comments

Comments
 (0)