Skip to content

Commit fa54cfe

Browse files
committed
update to v4.12 with ember-cli-update
1 parent a4a1296 commit fa54cfe

15 files changed

Lines changed: 486 additions & 415 deletions

File tree

.ember-cli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"disableAnalytics": false,
99

1010
/**
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.
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.
1313
*/
1414
"isTypeScriptProject": false
1515
}

.eslintrc.js

Lines changed: 9 additions & 6 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'],
@@ -26,6 +29,7 @@ module.exports = {
2629
files: [
2730
'./.eslintrc.js',
2831
'./.prettierrc.js',
32+
'./.stylelintrc.js',
2933
'./.template-lintrc.js',
3034
'./ember-cli-build.js',
3135
'./index.js',
@@ -41,8 +45,7 @@ module.exports = {
4145
browser: false,
4246
node: true,
4347
},
44-
plugins: ['node'],
45-
extends: ['plugin:node/recommended'],
48+
extends: ['plugin:n/recommended'],
4649
},
4750
{
4851
// test files

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
- ember-lts-3.24
6969
- ember-lts-3.28
7070
- ember-lts-4.4
71+
- ember-lts-4.8
7172
- ember-release
7273
- ember-beta
7374
- ember-canary

.npmignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
/.gitignore
1919
/.prettierignore
2020
/.prettierrc.js
21+
/.stylelintignore
22+
/.stylelintrc.js
2123
/.template-lintrc.js
2224
/.travis.yml
2325
/.watchmanconfig
2426
/bower.json
25-
/config/ember-try.js
2627
/CONTRIBUTING.md
2728
/ember-cli-build.js
2829
/testem.js

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

config/environment.js

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

package.json

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,58 +20,59 @@
2020
},
2121
"scripts": {
2222
"build": "ember build --environment=production",
23-
"lint": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
24-
"lint:fix": "npm-run-all --print-name --aggregate-output --continue-on-error --parallel \"lint:*:fix\"",
23+
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
24+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
2525
"lint:hbs": "ember-template-lint .",
2626
"lint:hbs:fix": "ember-template-lint . --fix",
2727
"lint:js": "eslint . --cache",
2828
"lint:js:fix": "eslint . --fix",
2929
"start": "ember serve",
30-
"test": "npm-run-all --print-name \"lint\" \"test:*\"",
30+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
3131
"test:ember": "ember test",
3232
"ember-compatibility-tests": "ember try:each"
3333
},
3434
"dependencies": {
3535
"ember-cli-babel": "^7.26.11",
36-
"ember-cli-htmlbars": "^6.1.1",
36+
"ember-cli-htmlbars": "^6.2.0",
3737
"ember-in-element-polyfill": "^1.0.0"
3838
},
3939
"devDependencies": {
40+
"@babel/eslint-parser": "^7.21.3",
41+
"@babel/plugin-proposal-decorators": "^7.21.0",
4042
"@ember/optional-features": "^2.0.0",
41-
"@ember/test-helpers": "^2.8.1",
42-
"@embroider/test-setup": "^1.8.3",
43+
"@ember/string": "^3.0.1",
44+
"@ember/test-helpers": "^2.9.3",
45+
"@embroider/test-setup": "^2.1.1",
4346
"@glimmer/component": "^1.1.2",
4447
"@glimmer/tracking": "^1.1.2",
45-
"babel-eslint": "^10.1.0",
4648
"broccoli-asset-rev": "^3.0.0",
4749
"chai": "^4.2.0",
50+
"concurrently": "^8.0.1",
4851
"ember-auto-import": "^2.6.3",
49-
"ember-cli": "~4.8.0",
52+
"ember-cli": "~4.12.1",
5053
"ember-cli-dependency-checker": "^3.3.1",
5154
"ember-cli-fastboot": "^4.1.1",
5255
"ember-cli-fastboot-testing": "^0.5.0",
5356
"ember-cli-inject-live-reload": "^2.1.0",
5457
"ember-cli-sri": "^2.1.1",
5558
"ember-cli-terser": "^4.0.2",
56-
"ember-disable-prototype-extensions": "^1.1.3",
5759
"ember-load-initializers": "^2.1.2",
5860
"ember-page-title": "^7.0.0",
59-
"ember-qunit": "^6.0.0",
60-
"ember-resolver": "^8.0.3",
61-
"ember-source": "~4.8.0",
61+
"ember-qunit": "^6.2.0",
62+
"ember-resolver": "^10.0.0",
63+
"ember-source": "~4.12.0",
6264
"ember-source-channel-url": "^3.0.0",
63-
"ember-template-lint": "^4.16.1",
65+
"ember-template-lint": "^5.7.2",
6466
"ember-try": "^3.0.0",
65-
"eslint": "^7.32.0",
66-
"eslint-config-prettier": "^8.5.0",
67-
"eslint-plugin-ember": "^11.1.0",
68-
"eslint-plugin-node": "^11.1.0",
67+
"eslint": "^8.37.0",
68+
"eslint-config-prettier": "^8.8.0",
69+
"eslint-plugin-ember": "^11.5.0",
70+
"eslint-plugin-n": "^15.7.0",
6971
"eslint-plugin-prettier": "^4.2.1",
70-
"eslint-plugin-qunit": "^7.3.1",
72+
"eslint-plugin-qunit": "^7.3.4",
7173
"loader.js": "^4.7.0",
72-
"npm-run-all": "^4.1.5",
73-
"prettier": "^2.7.1",
74-
"qunit": "^2.19.2",
74+
"prettier": "^2.8.7",
75+
"qunit": "^2.19.4",
7576
"qunit-dom": "^2.0.0",
7677
"release-plan": "^0.5.1",
7778
"webpack": "^5.85.0"

0 commit comments

Comments
 (0)