Skip to content

Commit 00dd24b

Browse files
ijlee2ijlee2
authored
Updated blueprints (#92)
* chore: Updated latestVersions * chore: Updated test fixtures * feature: Improved Glint support * chore: Updated test fixtures --------- Co-authored-by: ijlee2 <[email protected]>
1 parent 3b097d1 commit 00dd24b

File tree

35 files changed

+433
-441
lines changed

35 files changed

+433
-441
lines changed

‎src/blueprints/ember-addon/__addonLocation__/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
]<% if (options.packages.addon.hasGlint) { %>,
1616
"glint": {
1717
"environment": [
18-
"ember-loose"
18+
"ember-loose",
19+
"ember-template-imports"
1920
]
2021
}<% } %>
2122
}

‎src/blueprints/ember-addon/__addonLocation__/unpublished-development-types/index.d.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
33
<% if (options.packages.addon.hasGlint) { %>
44
import '@glint/environment-ember-loose';
5+
import '@glint/environment-ember-template-imports';
6+
import 'ember-source/types';
57

6-
declare module '@glint/environment-ember-loose/registry' {
7-
// Remove this once entries have been added! 👇
8-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
9-
export default interface Registry {
10-
// Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
11-
// See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
12-
}
13-
}
8+
// Uncomment if you need to support consuming projects in loose mode
9+
//
10+
// declare module '@glint/environment-ember-loose/registry' {
11+
// export default interface Registry {
12+
// // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
13+
// // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
14+
// }
15+
// }
1416
<% } %>

‎src/steps/update-addon-package-json/update-dev-dependencies.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ export function updateDevDependencies(
4141
packagesToInstall.delete('@babel/eslint-parser');
4242
packagesToInstall.add('@babel/plugin-transform-typescript');
4343
packagesToInstall.add('@tsconfig/ember');
44-
packagesToInstall.add('@types/ember__component');
45-
packagesToInstall.add('@types/ember__object');
46-
packagesToInstall.add('@types/ember__service');
4744
packagesToInstall.add('@typescript-eslint/eslint-plugin');
4845
packagesToInstall.add('@typescript-eslint/parser');
4946
packagesToInstall.add('typescript');
@@ -52,7 +49,9 @@ export function updateDevDependencies(
5249
if (packages.addon.hasGlint) {
5350
packagesToInstall.add('@glint/core');
5451
packagesToInstall.add('@glint/environment-ember-loose');
52+
packagesToInstall.add('@glint/environment-ember-template-imports');
5553
packagesToInstall.add('@glint/template');
54+
packagesToInstall.add('ember-source');
5655
}
5756

5857
Array.from(packagesToInstall).forEach((packageName) => {

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

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

55
const latestVersions = new Map([
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'],
11-
['@embroider/addon-shim', '1.8.9'],
6+
['@babel/core', '7.26.0'],
7+
['@babel/eslint-parser', '7.25.9'],
8+
['@babel/plugin-transform-typescript', '7.26.3'],
9+
['@babel/runtime', '7.26.0'],
10+
['@embroider/addon-dev', '7.1.1'],
11+
['@embroider/addon-shim', '1.9.0'],
1212
['@embroider/test-setup', '4.0.0'],
13-
['@glint/core', '1.4.0'],
14-
['@glint/environment-ember-loose', '1.4.0'],
15-
['@glint/template', '1.4.0'],
13+
['@glint/core', '1.5.0'],
14+
['@glint/environment-ember-loose', '1.5.0'],
15+
['@glint/environment-ember-template-imports', '1.5.0'],
16+
['@glint/template', '1.5.0'],
1617
['@rollup/plugin-babel', '6.0.4'],
1718
['@tsconfig/ember', '3.0.8'],
18-
['@types/ember__component', '4.0.22'],
19-
['@types/ember__object', '4.0.12'],
20-
['@types/ember__service', '4.0.9'],
21-
['@typescript-eslint/eslint-plugin', '8.1.0'],
22-
['@typescript-eslint/parser', '8.1.0'],
23-
['babel-plugin-ember-template-compilation', '2.2.5'],
24-
['concurrently', '8.2.2'],
25-
['decorator-transforms', '2.0.0'],
26-
['ember-auto-import', '2.7.4'],
27-
['ember-cli-babel', '8.1.0'],
19+
['@typescript-eslint/eslint-plugin', '8.18.2'],
20+
['@typescript-eslint/parser', '8.18.2'],
21+
['babel-plugin-ember-template-compilation', '2.3.0'],
22+
['concurrently', '9.1.0'],
23+
['decorator-transforms', '2.3.0'],
24+
['ember-auto-import', '2.10.0'],
25+
['ember-cli-babel', '8.2.0'],
2826
['ember-cli-htmlbars', '6.3.0'],
27+
['ember-source', '6.1.0'],
2928
['ember-template-lint', '6.0.0'],
30-
['eslint', '8.57.0'],
29+
['eslint', '8.57.1'],
3130
['eslint-config-prettier', '9.1.0'],
32-
['eslint-plugin-ember', '12.1.1'],
33-
['eslint-plugin-import', '2.29.1'],
34-
['eslint-plugin-n', '17.10.2'],
31+
['eslint-plugin-ember', '12.3.3'],
32+
['eslint-plugin-import', '2.31.0'],
33+
['eslint-plugin-n', '17.15.1'],
3534
['eslint-plugin-prettier', '5.2.1'],
36-
['prettier', '3.3.3'],
37-
['rollup', '4.20.0'],
35+
['prettier', '3.4.2'],
36+
['rollup', '4.29.1'],
3837
['rollup-plugin-copy', '3.5.0'],
39-
['typescript', '5.5.4'],
38+
['typescript', '5.7.2'],
4039
]);
4140

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

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,40 @@
5151
}
5252
},
5353
"dependencies": {
54-
"@embroider/addon-shim": "^1.8.9",
55-
"decorator-transforms": "^2.0.0",
54+
"@embroider/addon-shim": "^1.9.0",
55+
"decorator-transforms": "^2.3.0",
5656
"ember-element-helper": "^0.6.1",
5757
"ember-modifier": "^3.2.7",
5858
"ember-resize-observer-service": "^1.1.0",
5959
"ember-test-selectors": "^6.0.0"
6060
},
6161
"devDependencies": {
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",
66-
"@glint/core": "^1.4.0",
67-
"@glint/environment-ember-loose": "^1.4.0",
68-
"@glint/template": "^1.4.0",
62+
"@babel/core": "^7.26.0",
63+
"@babel/plugin-transform-typescript": "^7.26.3",
64+
"@babel/runtime": "^7.26.0",
65+
"@embroider/addon-dev": "^7.1.1",
66+
"@glint/core": "^1.5.0",
67+
"@glint/environment-ember-loose": "^1.5.0",
68+
"@glint/environment-ember-template-imports": "^1.5.0",
69+
"@glint/template": "^1.5.0",
6970
"@rollup/plugin-babel": "^6.0.4",
7071
"@tsconfig/ember": "^3.0.8",
71-
"@types/ember__component": "^4.0.22",
72-
"@types/ember__object": "^4.0.12",
73-
"@types/ember__service": "^4.0.9",
74-
"@typescript-eslint/eslint-plugin": "^8.1.0",
75-
"@typescript-eslint/parser": "^8.1.0",
76-
"babel-plugin-ember-template-compilation": "^2.2.5",
77-
"concurrently": "^8.2.2",
72+
"@typescript-eslint/eslint-plugin": "^8.18.2",
73+
"@typescript-eslint/parser": "^8.18.2",
74+
"babel-plugin-ember-template-compilation": "^2.3.0",
75+
"concurrently": "^9.1.0",
76+
"ember-source": "^6.1.0",
7877
"ember-template-lint": "^6.0.0",
79-
"eslint": "^8.57.0",
78+
"eslint": "^8.57.1",
8079
"eslint-config-prettier": "^9.1.0",
81-
"eslint-plugin-ember": "^12.1.1",
82-
"eslint-plugin-import": "^2.29.1",
83-
"eslint-plugin-n": "^17.10.2",
80+
"eslint-plugin-ember": "^12.3.3",
81+
"eslint-plugin-import": "^2.31.0",
82+
"eslint-plugin-n": "^17.15.1",
8483
"eslint-plugin-prettier": "^5.2.1",
85-
"prettier": "^3.3.3",
86-
"rollup": "^4.20.0",
84+
"prettier": "^3.4.2",
85+
"rollup": "^4.29.1",
8786
"rollup-plugin-copy": "^3.5.0",
88-
"typescript": "^5.5.4"
87+
"typescript": "^5.7.2"
8988
},
9089
"engines": {
9190
"node": "14.* || 16.* || >= 18"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
],
1616
"glint": {
1717
"environment": [
18-
"ember-loose"
18+
"ember-loose",
19+
"ember-template-imports"
1920
]
2021
}
2122
}

‎tests/fixtures/ember-container-query-customizations/output/packages/ember-container-query/unpublished-development-types/index.d.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
33

44
import '@glint/environment-ember-loose';
5+
import '@glint/environment-ember-template-imports';
6+
import 'ember-source/types';
57

6-
declare module '@glint/environment-ember-loose/registry' {
7-
// Remove this once entries have been added! 👇
8-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
9-
export default interface Registry {
10-
// Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
11-
// See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
12-
}
13-
}
8+
// Uncomment if you need to support consuming projects in loose mode
9+
//
10+
// declare module '@glint/environment-ember-loose/registry' {
11+
// export default interface Registry {
12+
// // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
13+
// // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
14+
// }
15+
// }

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,41 +51,40 @@
5151
}
5252
},
5353
"dependencies": {
54-
"@embroider/addon-shim": "^1.8.9",
55-
"decorator-transforms": "^2.0.0",
54+
"@embroider/addon-shim": "^1.9.0",
55+
"decorator-transforms": "^2.3.0",
5656
"ember-element-helper": "^0.6.1",
5757
"ember-modifier": "^3.2.7",
5858
"ember-resize-observer-service": "^1.1.0",
5959
"ember-test-selectors": "^6.0.0"
6060
},
6161
"devDependencies": {
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",
66-
"@glint/core": "^1.4.0",
67-
"@glint/environment-ember-loose": "^1.4.0",
68-
"@glint/template": "^1.4.0",
62+
"@babel/core": "^7.26.0",
63+
"@babel/plugin-transform-typescript": "^7.26.3",
64+
"@babel/runtime": "^7.26.0",
65+
"@embroider/addon-dev": "^7.1.1",
66+
"@glint/core": "^1.5.0",
67+
"@glint/environment-ember-loose": "^1.5.0",
68+
"@glint/environment-ember-template-imports": "^1.5.0",
69+
"@glint/template": "^1.5.0",
6970
"@rollup/plugin-babel": "^6.0.4",
7071
"@tsconfig/ember": "^3.0.8",
71-
"@types/ember__component": "^4.0.22",
72-
"@types/ember__object": "^4.0.12",
73-
"@types/ember__service": "^4.0.9",
74-
"@typescript-eslint/eslint-plugin": "^8.1.0",
75-
"@typescript-eslint/parser": "^8.1.0",
76-
"babel-plugin-ember-template-compilation": "^2.2.5",
77-
"concurrently": "^8.2.2",
72+
"@typescript-eslint/eslint-plugin": "^8.18.2",
73+
"@typescript-eslint/parser": "^8.18.2",
74+
"babel-plugin-ember-template-compilation": "^2.3.0",
75+
"concurrently": "^9.1.0",
76+
"ember-source": "^6.1.0",
7877
"ember-template-lint": "^6.0.0",
79-
"eslint": "^8.57.0",
78+
"eslint": "^8.57.1",
8079
"eslint-config-prettier": "^9.1.0",
81-
"eslint-plugin-ember": "^12.1.1",
82-
"eslint-plugin-import": "^2.29.1",
83-
"eslint-plugin-n": "^17.10.2",
80+
"eslint-plugin-ember": "^12.3.3",
81+
"eslint-plugin-import": "^2.31.0",
82+
"eslint-plugin-n": "^17.15.1",
8483
"eslint-plugin-prettier": "^5.2.1",
85-
"prettier": "^3.3.3",
86-
"rollup": "^4.20.0",
84+
"prettier": "^3.4.2",
85+
"rollup": "^4.29.1",
8786
"rollup-plugin-copy": "^3.5.0",
88-
"typescript": "^5.5.4"
87+
"typescript": "^5.7.2"
8988
},
9089
"engines": {
9190
"node": "14.* || 16.* || >= 18"

‎tests/fixtures/ember-container-query-glint/output/ember-container-query/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
],
1616
"glint": {
1717
"environment": [
18-
"ember-loose"
18+
"ember-loose",
19+
"ember-template-imports"
1920
]
2021
}
2122
}

‎tests/fixtures/ember-container-query-glint/output/ember-container-query/unpublished-development-types/index.d.ts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
// These will *not* be published as part of your addon, so be careful that your published code does not rely on them!
33

44
import '@glint/environment-ember-loose';
5+
import '@glint/environment-ember-template-imports';
6+
import 'ember-source/types';
57

6-
declare module '@glint/environment-ember-loose/registry' {
7-
// Remove this once entries have been added! 👇
8-
// eslint-disable-next-line @typescript-eslint/no-empty-interface
9-
export default interface Registry {
10-
// Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
11-
// See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
12-
}
13-
}
8+
// Uncomment if you need to support consuming projects in loose mode
9+
//
10+
// declare module '@glint/environment-ember-loose/registry' {
11+
// export default interface Registry {
12+
// // Add any registry entries from other addons here that your addon itself uses (in non-strict mode templates)
13+
// // See https://typed-ember.gitbook.io/glint/using-glint/ember/using-addons
14+
// }
15+
// }

0 commit comments

Comments
 (0)