Skip to content

Commit c22be37

Browse files
author
github-actions[bot]
committed
v6.1.0-beta.0
1 parent 166dca9 commit c22be37

File tree

7 files changed

+160
-98
lines changed

7 files changed

+160
-98
lines changed

‎.eslintignore

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

‎.eslintrc.js

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

‎.npmignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
/.ember-cli
88
/.env*
99
/.eslintcache
10-
/.eslintignore
11-
/.eslintrc.js
1210
/.git/
1311
/.github/
1412
/.gitignore
@@ -21,6 +19,7 @@
2119
/.watchmanconfig
2220
/CONTRIBUTING.md
2321
/ember-cli-build.js
22+
/eslint.config.mjs
2423
/testem.js
2524
/tests/
2625
/tsconfig.declarations.json

‎.prettierrc.js

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

33
module.exports = {
4+
plugins: ['prettier-plugin-ember-template-tag'],
45
overrides: [
56
{
6-
files: '*.{js,ts}',
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
78
options: {
89
singleQuote: true,
910
},
1011
},
12+
{
13+
files: '*.{gjs,gts}',
14+
options: {
15+
singleQuote: true,
16+
templateSingleQuote: false,
17+
},
18+
},
1119
],
1220
};

‎eslint.config.mjs

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
/**
2+
* Debugging:
3+
* https://eslint.org/docs/latest/use/configure/debug
4+
* ----------------------------------------------------
5+
*
6+
* Print a file's calculated configuration
7+
*
8+
* npx eslint --print-config path/to/file.js
9+
*
10+
* Inspecting the config
11+
*
12+
* npx eslint --inspect-config
13+
*
14+
*/
15+
import globals from 'globals';
16+
import js from '@eslint/js';
17+
18+
import ember from 'eslint-plugin-ember/recommended';
19+
import prettier from 'eslint-plugin-prettier/recommended';
20+
import qunit from 'eslint-plugin-qunit';
21+
import n from 'eslint-plugin-n';
22+
23+
import babelParser from '@babel/eslint-parser';
24+
25+
const esmParserOptions = {
26+
ecmaFeatures: { modules: true },
27+
ecmaVersion: 'latest',
28+
requireConfigFile: false,
29+
babelOptions: {
30+
plugins: [
31+
['@babel/plugin-proposal-decorators', { decoratorsBeforeExport: true }],
32+
],
33+
},
34+
};
35+
36+
export default [
37+
js.configs.recommended,
38+
prettier,
39+
ember.configs.base,
40+
ember.configs.gjs,
41+
/**
42+
* Ignores must be in their own object
43+
* https://eslint.org/docs/latest/use/configure/ignore
44+
*/
45+
{
46+
ignores: ['dist/', 'node_modules/', 'coverage/', '!**/.*'],
47+
},
48+
/**
49+
* https://eslint.org/docs/latest/use/configure/configuration-files#configuring-linter-options
50+
*/
51+
{
52+
linterOptions: {
53+
reportUnusedDisableDirectives: 'error',
54+
},
55+
},
56+
{
57+
files: ['**/*.js'],
58+
languageOptions: {
59+
parser: babelParser,
60+
},
61+
},
62+
{
63+
files: ['**/*.{js,gjs}'],
64+
languageOptions: {
65+
parserOptions: esmParserOptions,
66+
globals: {
67+
...globals.browser,
68+
},
69+
},
70+
},
71+
{
72+
files: ['tests/**/*-test.{js,gjs}'],
73+
plugins: {
74+
qunit,
75+
},
76+
},
77+
/**
78+
* CJS node files
79+
*/
80+
{
81+
files: [
82+
'**/*.cjs',
83+
'config/**/*.js',
84+
'testem.js',
85+
'testem*.js',
86+
'.prettierrc.js',
87+
'.stylelintrc.js',
88+
'.template-lintrc.js',
89+
'ember-cli-build.js',
90+
],
91+
plugins: {
92+
n,
93+
},
94+
95+
languageOptions: {
96+
sourceType: 'script',
97+
ecmaVersion: 'latest',
98+
globals: {
99+
...globals.node,
100+
},
101+
},
102+
},
103+
/**
104+
* ESM node files
105+
*/
106+
{
107+
files: ['**/*.mjs'],
108+
plugins: {
109+
n,
110+
},
111+
112+
languageOptions: {
113+
sourceType: 'module',
114+
ecmaVersion: 'latest',
115+
parserOptions: esmParserOptions,
116+
globals: {
117+
...globals.node,
118+
},
119+
},
120+
},
121+
];

‎package.json

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,63 +14,67 @@
1414
},
1515
"scripts": {
1616
"build": "ember build --environment=production",
17-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
17+
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\" --prefixColors auto",
1818
"lint:css": "stylelint \"**/*.css\"",
1919
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
20-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
20+
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\" --prefixColors auto",
2121
"lint:hbs": "ember-template-lint .",
2222
"lint:hbs:fix": "ember-template-lint . --fix",
2323
"lint:js": "eslint . --cache",
2424
"lint:js:fix": "eslint . --fix",
2525
"start": "ember serve",
26-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
26+
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\" --prefixColors auto",
2727
"test:ember": "ember test",
2828
"test:ember-compatibility": "ember try:each"
2929
},
3030
"dependencies": {
31-
"@babel/core": "^7.25.2",
31+
"@babel/core": "^7.26.0",
3232
"ember-cli-babel": "^8.2.0",
33-
"ember-cli-htmlbars": "^6.3.0"
33+
"ember-cli-htmlbars": "^6.3.0",
34+
"ember-template-imports": "^4.2.0"
3435
},
3536
"devDependencies": {
36-
"@babel/eslint-parser": "^7.25.1",
37-
"@babel/plugin-proposal-decorators": "^7.24.7",
38-
"@ember/optional-features": "^2.1.0",
39-
"@ember/test-helpers": "^3.3.1",
37+
"@babel/eslint-parser": "^7.25.9",
38+
"@babel/plugin-proposal-decorators": "^7.25.9",
39+
"@ember/optional-features": "^2.2.0",
40+
"@ember/test-helpers": "^4.0.4",
4041
"@embroider/test-setup": "^4.0.0",
42+
"@eslint/js": "^9.14.0",
4143
"@glimmer/component": "^1.1.2",
4244
"@glimmer/tracking": "^1.1.2",
4345
"broccoli-asset-rev": "^3.0.0",
44-
"concurrently": "^8.2.2",
45-
"ember-auto-import": "^2.8.1",
46-
"ember-cli": "~6.0.0-beta.0",
46+
"concurrently": "^9.1.0",
47+
"ember-auto-import": "^2.10.0",
48+
"ember-cli": "~6.1.0-beta.0",
4749
"ember-cli-clean-css": "^3.0.0",
4850
"ember-cli-dependency-checker": "^3.3.2",
4951
"ember-cli-inject-live-reload": "^2.1.0",
5052
"ember-cli-sri": "^2.1.1",
5153
"ember-cli-terser": "^4.0.2",
52-
"ember-load-initializers": "^2.1.2",
54+
"ember-load-initializers": "^3.0.1",
5355
"ember-page-title": "^8.2.3",
54-
"ember-qunit": "^8.1.0",
55-
"ember-resolver": "^12.0.1",
56-
"ember-source": "~6.0.0-beta.1",
56+
"ember-qunit": "^8.1.1",
57+
"ember-resolver": "^13.0.2",
58+
"ember-source": "~6.1.0-beta.1",
5759
"ember-source-channel-url": "^3.0.0",
5860
"ember-template-lint": "^6.0.0",
5961
"ember-try": "^3.0.0",
60-
"eslint": "^8.57.1",
62+
"eslint": "^9.14.0",
6163
"eslint-config-prettier": "^9.1.0",
62-
"eslint-plugin-ember": "^12.2.1",
63-
"eslint-plugin-n": "^16.6.2",
64+
"eslint-plugin-ember": "^12.3.1",
65+
"eslint-plugin-n": "^17.13.1",
6466
"eslint-plugin-prettier": "^5.2.1",
6567
"eslint-plugin-qunit": "^8.1.2",
68+
"globals": "^15.12.0",
6669
"loader.js": "^4.7.0",
6770
"prettier": "^3.3.3",
71+
"prettier-plugin-ember-template-tag": "^2.0.4",
6872
"qunit": "^2.22.0",
69-
"qunit-dom": "^3.2.1",
70-
"stylelint": "^15.11.0",
71-
"stylelint-config-standard": "^34.0.0",
72-
"stylelint-prettier": "^4.1.0",
73-
"webpack": "^5.95.0"
73+
"qunit-dom": "^3.3.0",
74+
"stylelint": "^16.10.0",
75+
"stylelint-config-standard": "^36.0.1",
76+
"stylelint-prettier": "^5.0.2",
77+
"webpack": "^5.96.1"
7478
},
7579
"peerDependencies": {
7680
"ember-source": ">= 4.0.0"

‎tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "6.0.0-beta.0",
6+
"version": "6.1.0-beta.0",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)