Skip to content

Commit 2db9991

Browse files
committed
Sync with vite based addon blueprint (v0.11.1)
1 parent 16dcf0f commit 2db9991

File tree

11 files changed

+373
-451
lines changed

11 files changed

+373
-451
lines changed

.github/workflows/Nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ jobs:
55
ts-next:
66
name: typescript@next
77
runs-on: ubuntu-latest
8+
timeout-minutes: 10
9+
810
steps:
911
- uses: actions/checkout@v4
1012
- uses: pnpm/action-setup@v4

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: pnpm/action-setup@v4
2323
- uses: actions/setup-node@v4
2424
with:
25-
node-version: 20
25+
node-version: 22
2626
cache: pnpm
2727

2828
- name: Install Dependencies
@@ -43,7 +43,7 @@ jobs:
4343
- uses: pnpm/action-setup@v4
4444
- uses: actions/setup-node@v4
4545
with:
46-
node-version: 20
46+
node-version: 22
4747
cache: pnpm
4848

4949
- name: Install Dependencies
@@ -67,7 +67,7 @@ jobs:
6767
- uses: pnpm/action-setup@v4
6868
- uses: actions/setup-node@v4
6969
with:
70-
node-version: 20
70+
node-version: 22
7171
cache: pnpm
7272

7373
- name: Install Dependencies
@@ -90,7 +90,7 @@ jobs:
9090
- uses: pnpm/action-setup@v4
9191
- uses: actions/setup-node@v4
9292
with:
93-
node-version: 20
93+
node-version: 22
9494
cache: pnpm
9595

9696
- name: Apply Scenario

.github/workflows/push-dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: pnpm/action-setup@v4
2525
- uses: actions/setup-node@v4
2626
with:
27-
node-version: 20
27+
node-version: 22
2828
cache: pnpm
2929
- name: Install Dependencies
3030
run: pnpm install --frozen-lockfile

.try.mjs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -98,34 +98,34 @@ export default {
9898
files: compatFiles,
9999
},
100100
{
101-
name: `ember-lts-6.4`,
101+
name: 'ember-lts-6.4',
102102
npm: {
103103
devDependencies: {
104-
'ember-source': `npm:ember-source@~6.4.0`,
104+
'ember-source': 'npm:ember-source@~6.4.0',
105105
},
106106
},
107107
},
108108
{
109-
name: `ember-latest`,
109+
name: 'ember-latest',
110110
npm: {
111111
devDependencies: {
112-
'ember-source': `npm:ember-source@latest`,
112+
'ember-source': 'npm:ember-source@latest',
113113
},
114114
},
115115
},
116116
{
117-
name: `ember-beta`,
117+
name: 'ember-beta',
118118
npm: {
119119
devDependencies: {
120-
'ember-source': `npm:ember-source@beta`,
120+
'ember-source': 'npm:ember-source@beta',
121121
},
122122
},
123123
},
124124
{
125-
name: `ember-alpha`,
125+
name: 'ember-alpha',
126126
npm: {
127127
devDependencies: {
128-
'ember-source': `npm:ember-source@alpha`,
128+
'ember-source': 'npm:ember-source@alpha',
129129
},
130130
},
131131
},

config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"packages": [
55
{
66
"name": "@ember/addon-blueprint",
7-
"version": "0.9.1",
7+
"version": "0.11.1",
88
"blueprints": [
99
{
1010
"name": "@ember/addon-blueprint",

package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"lint:hbs:fix": "ember-template-lint . --fix --no-error-on-unmatched-pattern",
5050
"lint:js": "eslint . --cache",
5151
"lint:js:fix": "eslint . --fix",
52-
"lint:types": "glint",
52+
"lint:types": "ember-tsc --noEmit",
5353
"prepack": "rollup --config",
5454
"start": "vite dev",
5555
"test": "vite build --mode=development --out-dir dist-tests && testem --file testem.cjs ci --port 0"
@@ -74,11 +74,9 @@
7474
"@embroider/vite": "^1.1.5",
7575
"@eslint/js": "^9.21.0",
7676
"@glimmer/component": "^2.0.0",
77-
"@glint/core": "^2.0.0-alpha.2",
78-
"@glint/environment-ember-loose": "^2.0.0-alpha.2",
79-
"@glint/environment-ember-template-imports": "^2.0.0-alpha.2",
80-
"@glint/template": "^1.6.0-alpha.1",
81-
"@glint/tsserver-plugin": "^2.0.0-alpha.2",
77+
"@glint/ember-tsc": "^1.0.3",
78+
"@glint/template": "^1.6.1",
79+
"@glint/tsserver-plugin": "^2.0.3",
8280
"@rollup/plugin-babel": "^6.0.4",
8381
"@types/qunit": "^2.19.12",
8482
"babel-plugin-ember-template-compilation": "^3.0.1",
@@ -103,7 +101,7 @@
103101
"testem": "^3.15.1",
104102
"typescript": "~5.9.2",
105103
"typescript-eslint": "^8.25.0",
106-
"vite": "^6.2.4"
104+
"vite": "^6.3.6"
107105
},
108106
"packageManager": "[email protected]",
109107
"volta": {

0 commit comments

Comments
 (0)