Skip to content

Commit 4045241

Browse files
ijlee2ijlee2
authored
Updated blueprints (#88)
* chore: Updated latestVersions * chore: Updated fixtures * feature: Downstreamed changes from @embroider/[email protected] * chore: Updated fixtures --------- Co-authored-by: ijlee2 <[email protected]>
1 parent 023ff36 commit 4045241

File tree

37 files changed

+1185
-533
lines changed

37 files changed

+1185
-533
lines changed

‎src/blueprints/ember-addon/__addonLocation__/.eslintrc.cjs‎

Lines changed: 62 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,83 @@
22

33
module.exports = {
44
root: true,
5-
parser: '<%= options.packages.addon.hasTypeScript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
6-
parserOptions: {
7-
ecmaVersion: 'latest',<% if (!options.packages.addon.hasTypeScript) { %>
8-
sourceType: 'module',
9-
babelOptions: {
10-
root: __dirname,
11-
},<% } %>
12-
},
13-
plugins: ['ember'],
14-
extends: [
15-
'eslint:recommended',
16-
'plugin:ember/recommended',
17-
'plugin:prettier/recommended',
18-
],
19-
env: {
20-
browser: true,
21-
},
22-
rules: {},
5+
// Only use overrides
6+
// https://github.com/ember-cli/eslint-plugin-ember?tab=readme-ov-file#gtsgjs
237
overrides: [
8+
{
9+
files: ['**/*.js'<%= options.packages.addon.hasTypeScript ? ", '**/*.ts'" : '' %>],
10+
env: { browser: true },
11+
parser: '<%= options.packages.addon.hasTypeScript ? '@typescript-eslint/parser' : '@babel/eslint-parser' %>',
12+
parserOptions: {
13+
ecmaVersion: 'latest',<% if (!options.packages.addon.hasTypeScript) { %>
14+
sourceType: 'module',
15+
babelOptions: {
16+
root: __dirname,
17+
},<% } %>
18+
},
19+
plugins: ['ember', 'import'],
20+
extends: [
21+
'eslint:recommended',
22+
'plugin:ember/recommended',
23+
'plugin:prettier/recommended',
24+
],
25+
rules: {
26+
// require relative imports use full extensions
27+
'import/extensions': ['error', 'always', { ignorePackages: true }],
28+
// Add any custom rules here
29+
},
30+
},
2431
<% if (options.packages.addon.hasTypeScript) { %> // ts files
2532
{
26-
files: ['**/*.ts', '**/*.gts'],
33+
files: ['**/*.ts'],
2734
extends: [
35+
'eslint:recommended',
36+
'plugin:ember/recommended',
2837
'plugin:@typescript-eslint/eslint-recommended',
2938
'plugin:@typescript-eslint/recommended',
39+
'plugin:prettier/recommended',
3040
],
3141
rules: {
42+
// require relative imports use full extensions
43+
'import/extensions': ['error', 'always', { ignorePackages: true }],
3244
// Add any custom rules here
3345
},
3446
},
35-
// require relative imports use full extensions
3647
{
37-
files: ['src/**/*.{js,ts,gjs,gts}'],
48+
files: ['**/*.gts'],
49+
parser: 'ember-eslint-parser',
50+
plugins: ['ember', 'import'],
51+
extends: [
52+
'eslint:recommended',
53+
'plugin:@typescript-eslint/eslint-recommended',
54+
'plugin:@typescript-eslint/recommended',
55+
'plugin:ember/recommended',
56+
'plugin:ember/recommended-gts',
57+
'plugin:prettier/recommended',
58+
],
3859
rules: {
60+
// require relative imports use full extensions
3961
'import/extensions': ['error', 'always', { ignorePackages: true }],
62+
// Add any custom rules here
4063
},
4164
},
42-
<% } else { %> // require relative imports use full extensions
43-
{
44-
files: ['src/**/*.{js,gjs}'],
65+
<% } %> {
66+
files: ['**/*.gjs'],
67+
parser: 'ember-eslint-parser',
68+
plugins: ['ember', 'import'],
69+
extends: [
70+
'eslint:recommended',
71+
'plugin:ember/recommended',
72+
'plugin:ember/recommended-gjs',
73+
'plugin:prettier/recommended',
74+
],
4575
rules: {
76+
// require relative imports use full extensions
4677
'import/extensions': ['error', 'always', { ignorePackages: true }],
78+
// Add any custom rules here
4779
},
4880
},
49-
<% } %> // node files
81+
// node files
5082
{
5183
files: [
5284
'./.eslintrc.cjs',
@@ -62,7 +94,11 @@ module.exports = {
6294
node: true,
6395
},
6496
plugins: ['n'],
65-
extends: ['plugin:n/recommended'],
97+
extends: [
98+
'eslint:recommended',
99+
'plugin:n/recommended',
100+
'plugin:prettier/recommended',
101+
],
66102
},
67103
],
68104
};

‎src/utils/blueprints/get-version.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { decideVersion } from '@codemod-utils/blueprints';
33
import type { Options } from '../../types/index.js';
44

55
const latestVersions = new Map([
6-
['@babel/core', '7.24.7'],
7-
['@babel/eslint-parser', '7.24.7'],
8-
['@babel/plugin-transform-typescript', '7.24.7'],
9-
['@babel/runtime', '7.24.7'],
10-
['@embroider/addon-dev', '4.3.1'],
6+
['@babel/core', '7.25.2'],
7+
['@babel/eslint-parser', '7.25.1'],
8+
['@babel/plugin-transform-typescript', '7.25.2'],
9+
['@babel/runtime', '7.25.0'],
10+
['@embroider/addon-dev', '5.0.0'],
1111
['@embroider/addon-shim', '1.8.9'],
1212
['@embroider/test-setup', '4.0.0'],
1313
['@glint/core', '1.4.0'],
@@ -18,25 +18,25 @@ const latestVersions = new Map([
1818
['@types/ember__component', '4.0.22'],
1919
['@types/ember__object', '4.0.12'],
2020
['@types/ember__service', '4.0.9'],
21-
['@typescript-eslint/eslint-plugin', '7.12.0'],
22-
['@typescript-eslint/parser', '7.12.0'],
21+
['@typescript-eslint/eslint-plugin', '8.1.0'],
22+
['@typescript-eslint/parser', '8.1.0'],
2323
['babel-plugin-ember-template-compilation', '2.2.5'],
2424
['concurrently', '8.2.2'],
2525
['decorator-transforms', '2.0.0'],
26-
['ember-auto-import', '2.7.3'],
26+
['ember-auto-import', '2.7.4'],
2727
['ember-cli-babel', '8.1.0'],
2828
['ember-cli-htmlbars', '6.3.0'],
2929
['ember-template-lint', '6.0.0'],
3030
['eslint', '8.57.0'],
3131
['eslint-config-prettier', '9.1.0'],
3232
['eslint-plugin-ember', '12.1.1'],
3333
['eslint-plugin-import', '2.29.1'],
34-
['eslint-plugin-n', '17.8.1'],
35-
['eslint-plugin-prettier', '5.1.3'],
36-
['prettier', '3.3.1'],
37-
['rollup', '4.18.0'],
34+
['eslint-plugin-n', '17.10.2'],
35+
['eslint-plugin-prettier', '5.2.1'],
36+
['prettier', '3.3.3'],
37+
['rollup', '4.20.0'],
3838
['rollup-plugin-copy', '3.5.0'],
39-
['typescript', '5.4.5'],
39+
['typescript', '5.5.4'],
4040
]);
4141

4242
export function getLatestVersion(packageName: string): string {

‎tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/.eslintrc.cjs‎

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,76 @@
22

33
module.exports = {
44
root: true,
5-
parser: '@typescript-eslint/parser',
6-
parserOptions: {
7-
ecmaVersion: 'latest',
8-
},
9-
plugins: ['ember'],
10-
extends: [
11-
'eslint:recommended',
12-
'plugin:ember/recommended',
13-
'plugin:prettier/recommended',
14-
],
15-
env: {
16-
browser: true,
17-
},
18-
rules: {},
5+
// Only use overrides
6+
// https://github.com/ember-cli/eslint-plugin-ember?tab=readme-ov-file#gtsgjs
197
overrides: [
8+
{
9+
files: ['**/*.js', '**/*.ts'],
10+
env: { browser: true },
11+
parser: '@typescript-eslint/parser',
12+
parserOptions: {
13+
ecmaVersion: 'latest',
14+
},
15+
plugins: ['ember', 'import'],
16+
extends: [
17+
'eslint:recommended',
18+
'plugin:ember/recommended',
19+
'plugin:prettier/recommended',
20+
],
21+
rules: {
22+
// require relative imports use full extensions
23+
'import/extensions': ['error', 'always', { ignorePackages: true }],
24+
// Add any custom rules here
25+
},
26+
},
2027
// ts files
2128
{
22-
files: ['**/*.ts', '**/*.gts'],
29+
files: ['**/*.ts'],
2330
extends: [
31+
'eslint:recommended',
32+
'plugin:ember/recommended',
2433
'plugin:@typescript-eslint/eslint-recommended',
2534
'plugin:@typescript-eslint/recommended',
35+
'plugin:prettier/recommended',
2636
],
2737
rules: {
38+
// require relative imports use full extensions
39+
'import/extensions': ['error', 'always', { ignorePackages: true }],
2840
// Add any custom rules here
2941
},
3042
},
31-
// require relative imports use full extensions
3243
{
33-
files: ['src/**/*.{js,ts,gjs,gts}'],
44+
files: ['**/*.gts'],
45+
parser: 'ember-eslint-parser',
46+
plugins: ['ember', 'import'],
47+
extends: [
48+
'eslint:recommended',
49+
'plugin:@typescript-eslint/eslint-recommended',
50+
'plugin:@typescript-eslint/recommended',
51+
'plugin:ember/recommended',
52+
'plugin:ember/recommended-gts',
53+
'plugin:prettier/recommended',
54+
],
3455
rules: {
56+
// require relative imports use full extensions
3557
'import/extensions': ['error', 'always', { ignorePackages: true }],
58+
// Add any custom rules here
59+
},
60+
},
61+
{
62+
files: ['**/*.gjs'],
63+
parser: 'ember-eslint-parser',
64+
plugins: ['ember', 'import'],
65+
extends: [
66+
'eslint:recommended',
67+
'plugin:ember/recommended',
68+
'plugin:ember/recommended-gjs',
69+
'plugin:prettier/recommended',
70+
],
71+
rules: {
72+
// require relative imports use full extensions
73+
'import/extensions': ['error', 'always', { ignorePackages: true }],
74+
// Add any custom rules here
3675
},
3776
},
3877
// node files
@@ -51,7 +90,11 @@ module.exports = {
5190
node: true,
5291
},
5392
plugins: ['n'],
54-
extends: ['plugin:n/recommended'],
93+
extends: [
94+
'eslint:recommended',
95+
'plugin:n/recommended',
96+
'plugin:prettier/recommended',
97+
],
5598
},
5699
],
57100
};

‎tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959
"ember-test-selectors": "^6.0.0"
6060
},
6161
"devDependencies": {
62-
"@babel/core": "^7.24.7",
63-
"@babel/plugin-transform-typescript": "^7.24.7",
64-
"@babel/runtime": "^7.24.7",
65-
"@embroider/addon-dev": "^4.3.1",
62+
"@babel/core": "^7.25.2",
63+
"@babel/plugin-transform-typescript": "^7.25.2",
64+
"@babel/runtime": "^7.25.0",
65+
"@embroider/addon-dev": "^5.0.0",
6666
"@glint/core": "^1.4.0",
6767
"@glint/environment-ember-loose": "^1.4.0",
6868
"@glint/template": "^1.4.0",
@@ -71,21 +71,21 @@
7171
"@types/ember__component": "^4.0.22",
7272
"@types/ember__object": "^4.0.12",
7373
"@types/ember__service": "^4.0.9",
74-
"@typescript-eslint/eslint-plugin": "^7.12.0",
75-
"@typescript-eslint/parser": "^7.12.0",
74+
"@typescript-eslint/eslint-plugin": "^8.1.0",
75+
"@typescript-eslint/parser": "^8.1.0",
7676
"babel-plugin-ember-template-compilation": "^2.2.5",
7777
"concurrently": "^8.2.2",
7878
"ember-template-lint": "^6.0.0",
7979
"eslint": "^8.57.0",
8080
"eslint-config-prettier": "^9.1.0",
8181
"eslint-plugin-ember": "^12.1.1",
8282
"eslint-plugin-import": "^2.29.1",
83-
"eslint-plugin-n": "^17.8.1",
84-
"eslint-plugin-prettier": "^5.1.3",
85-
"prettier": "^3.3.1",
86-
"rollup": "^4.18.0",
83+
"eslint-plugin-n": "^17.10.2",
84+
"eslint-plugin-prettier": "^5.2.1",
85+
"prettier": "^3.3.3",
86+
"rollup": "^4.20.0",
8787
"rollup-plugin-copy": "^3.5.0",
88-
"typescript": "^5.4.5"
88+
"typescript": "^5.5.4"
8989
},
9090
"engines": {
9191
"node": "14.* || 16.* || >= 18"

0 commit comments

Comments
 (0)