Skip to content

Commit 25c0808

Browse files
committed
Run ember-cli-update to 4.12.2
1 parent 84599c7 commit 25c0808

19 files changed

+32092
-29202
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
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,
9+
requireConfigFile: false,
10+
babelOptions: {
11+
plugins: [
12+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
13+
],
1114
},
1215
},
1316
plugins: ['ember'],
@@ -30,6 +33,7 @@ module.exports = {
3033
files: [
3134
'./.eslintrc.js',
3235
'./.prettierrc.js',
36+
'./.stylelintrc.js',
3337
'./.template-lintrc.js',
3438
'./ember-cli-build.js',
3539
'./testem.js',
@@ -45,16 +49,10 @@ module.exports = {
4549
browser: false,
4650
node: true,
4751
},
48-
plugins: ['node'],
49-
extends: ['plugin:node/recommended'],
50-
rules: {
51-
// this can be removed once the following is fixed
52-
// https://github.com/mysticatea/eslint-plugin-node/issues/77
53-
'node/no-unpublished-require': 'off',
54-
},
52+
extends: ['plugin:n/recommended'],
5553
},
5654
{
57-
// Test files:
55+
// test files
5856
files: ['tests/**/*-test.{js,ts}'],
5957
extends: ['plugin:qunit/recommended'],
6058
rules: {

.github/workflows/ci.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ on:
44
push:
55
branches:
66
- main
7-
pull_request:
7+
pull_request: {}
8+
9+
concurrency:
10+
group: ci-${{ github.head_ref || github.ref }}
11+
cancel-in-progress: true
812

913
env:
1014
NODE_VERSION: 20
@@ -18,14 +22,14 @@ jobs:
1822
timeout-minutes: 3
1923
steps:
2024
- name: Check out a copy of the repo
21-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3
2226

2327
- uses: mansona/npm-lockfile-version@v1
2428

2529
- name: Use Node.js ${{ env.NODE_VERSION }}
26-
uses: actions/setup-node@v2
30+
uses: actions/setup-node@v3
2731
with:
28-
cache: 'npm'
32+
cache: "npm"
2933
node-version: ${{ env.NODE_VERSION }}
3034

3135
- name: Install dependencies
@@ -40,12 +44,12 @@ jobs:
4044
timeout-minutes: 5
4145
steps:
4246
- name: Check out a copy of the repo
43-
uses: actions/checkout@v2
47+
uses: actions/checkout@v3
4448

4549
- name: Use Node.js ${{ env.NODE_VERSION }}
46-
uses: actions/setup-node@v2
50+
uses: actions/setup-node@v3
4751
with:
48-
cache: 'npm'
52+
cache: "npm"
4953
node-version: ${{ env.NODE_VERSION }}
5054

5155
- name: Install dependencies
@@ -64,14 +68,14 @@ jobs:
6468
timeout-minutes: 5
6569
steps:
6670
- name: Check out a copy of the repo
67-
uses: actions/checkout@v2
71+
uses: actions/checkout@v3
6872
with:
6973
ref: ${{ github.event.pull_request.head.sha }}
7074

7175
- name: Use Node.js ${{ env.NODE_VERSION }}
72-
uses: actions/setup-node@v2
76+
uses: actions/setup-node@v3
7377
with:
74-
cache: 'npm'
78+
cache: "npm"
7579
node-version: ${{ env.NODE_VERSION }}
7680

7781
- name: Install dependencies

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jsconfig.json
2626
# ember-try
2727
/.node_modules.ember-try/
2828
/bower.json.ember-try
29+
/npm-shrinkwrap.json.ember-try
2930
/package.json.ember-try
3031

3132
/.lighthouseci/

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.prettierrc.js

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

33
module.exports = {
4-
singleQuote: true,
4+
overrides: [
5+
{
6+
files: '*.{js,ts}',
7+
options: {
8+
singleQuote: true,
9+
},
10+
},
11+
],
512
};

.stylelintignore

Lines changed: 8 additions & 0 deletions
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

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+
extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
5+
};

README.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,52 @@ Components come from [ember-styleguide](https://github.com/ember-learn/ember-sty
1010

1111
You will need the following things properly installed on your computer.
1212

13-
* [Git](https://git-scm.com/)
14-
* [Node.js](https://nodejs.org/)
15-
* [Ember CLI](https://ember-cli.com/)
16-
* [Google Chrome](https://google.com/chrome/)
13+
- [Git](https://git-scm.com/)
14+
- [Node.js](https://nodejs.org/) (with npm)
15+
- [Ember CLI](https://cli.emberjs.com/release/)
16+
- [Google Chrome](https://google.com/chrome/)
1717

1818
## Installation
1919

20-
* `git clone <repository-url>` this repository
21-
* `cd ember-website`
22-
* `npm install`
20+
- `git clone <repository-url>` this repository
21+
- `cd ember-website`
22+
- `npm install`
2323

2424
## Running / Development
2525

26-
* `npm start`
27-
* Visit your app at [http://localhost:4200](http://localhost:4200).
28-
* Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
26+
- `npm start`
27+
- Visit your app at [http://localhost:4200](http://localhost:4200).
28+
- Visit your tests at [http://localhost:4200/tests](http://localhost:4200/tests).
2929

3030
### Code Generators
3131

3232
Make use of the many generators for code, try `ember help generate` for more details
3333

3434
### Running Tests
3535

36-
* `npm test`
37-
* `npm test --server`
36+
- `npm test`
37+
- `npm test --server`
3838

3939
### Linting
4040

41-
* `npm run lint`
42-
* `npm run lint:fix`
41+
- `npm run lint`
42+
- `npm run lint:fix`
4343

4444
### Building
4545

46-
* `npm run build` (production)
46+
- `npm run build` (production)
4747

4848
### Deploying
4949

5050
The app is continuously deployed to Netlify when a pull request is merged and passes continuous integration.
5151

5252
## Further Reading / Useful Links
5353

54-
* [ember.js](https://emberjs.com/)
55-
* [ember-cli](https://ember-cli.com/)
56-
* Development Browser Extensions
57-
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
58-
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
54+
- [ember.js](https://emberjs.com/)
55+
- [ember-cli](https://cli.emberjs.com/release/)
56+
- Development Browser Extensions
57+
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
58+
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
5959

6060
## Sponsors
6161

0 commit comments

Comments
 (0)