Skip to content

Commit 89fd943

Browse files
authored
Update dependencies and addon blueprint (#251)
* Update addon blueprint & add ember 6.4 * Update test-app v6.1.0...v6.4.0
1 parent a239ed3 commit 89fd943

21 files changed

+2320
-2117
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121
- uses: pnpm/action-setup@v4
22-
2322
- uses: actions/setup-node@v4
2423
with:
2524
node-version: 20
@@ -41,7 +40,6 @@ jobs:
4140
steps:
4241
- uses: actions/checkout@v4
4342
- uses: pnpm/action-setup@v4
44-
4543
- uses: actions/setup-node@v4
4644
with:
4745
node-version: 20
@@ -72,6 +70,7 @@ jobs:
7270
- ember-lts-5.8
7371
- ember-lts-5.12
7472
- ember-lts-5.12-with-fa5
73+
- ember-lts-6.4
7574
- ember-release
7675
- ember-beta
7776
- ember-canary
@@ -81,7 +80,6 @@ jobs:
8180
steps:
8281
- uses: actions/checkout@v4
8382
- uses: pnpm/action-setup@v4
84-
8583
- uses: actions/setup-node@v4
8684
with:
8785
node-version: 20

.github/workflows/push-dist.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ on:
1313
jobs:
1414
push-dist:
1515
name: Push dist
16+
permissions:
17+
contents: write
1618
runs-on: ubuntu-latest
1719
timeout-minutes: 10
1820

1921
steps:
2022
- uses: actions/checkout@v4
2123
- uses: pnpm/action-setup@v4
22-
2324
- uses: actions/setup-node@v4
2425
with:
2526
node-version: 20

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": "@embroider/addon-blueprint",
7-
"version": "4.0.0",
7+
"version": "4.1.2",
88
"blueprints": [
99
{
1010
"name": "@embroider/addon-blueprint",

ember-fontawesome/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
"@babel/eslint-parser": "^7.26.5",
7777
"@babel/plugin-transform-typescript": "^7.26.7",
7878
"@babel/runtime": "^7.26.10",
79+
"@ember/library-tsconfig": "^1.1.3",
7980
"@embroider/addon-dev": "^7.1.1",
8081
"@eslint/js": "^9.19.0",
8182
"@fortawesome/fontawesome-svg-core": "^6.7.2",
@@ -85,7 +86,6 @@
8586
"@glint/environment-ember-template-imports": "^1.5.2",
8687
"@glint/template": "^1.5.2",
8788
"@rollup/plugin-babel": "^6.0.4",
88-
"@tsconfig/ember": "^3.0.9",
8989
"babel-plugin-ember-template-compilation": "^2.3.0",
9090
"concurrently": "^9.1.2",
9191
"ember-source": "^6.1.0",

ember-fontawesome/tsconfig.json

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,12 @@
11
{
2-
"extends": "@tsconfig/ember/tsconfig.json",
2+
"extends": "@ember/library-tsconfig",
33
"include": ["src/**/*", "unpublished-development-types/**/*"],
44
"glint": {
55
"environment": ["ember-loose", "ember-template-imports"]
66
},
77
"compilerOptions": {
88
"allowJs": true,
99
"declarationDir": "declarations",
10-
/**
11-
https://www.typescriptlang.org/tsconfig#noEmit
12-
13-
We want to emit declarations, so this option must be set to `false`.
14-
@tsconfig/ember sets this to `true`, which is incompatible with our need to set `emitDeclarationOnly`.
15-
@tsconfig/ember is more optimized for apps, which wouldn't emit anything, only type check.
16-
*/
17-
"noEmit": false,
18-
/**
19-
https://www.typescriptlang.org/tsconfig#emitDeclarationOnly
20-
We want to only emit declarations as we use Rollup to emit JavaScript.
21-
*/
22-
"emitDeclarationOnly": true,
23-
24-
/**
25-
https://www.typescriptlang.org/tsconfig#noEmitOnError
26-
Do not block emit on TS errors.
27-
*/
28-
"noEmitOnError": false,
29-
3010
/**
3111
https://www.typescriptlang.org/tsconfig#rootDir
3212
"Default: The longest common path of all non-declaration input files."
@@ -38,15 +18,6 @@
3818
imports to files on disk
3919
*/
4020
"rootDir": "./src",
41-
42-
/**
43-
https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions
44-
45-
We want our tooling to know how to resolve our custom files so the appropriate plugins
46-
can do the proper transformations on those files.
47-
*/
48-
"allowImportingTsExtensions": true,
49-
5021
"types": ["ember-source/types"]
5122
}
5223
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"test": "pnpm --filter '*' test",
1717
"test:ember": "pnpm --filter '*' test:ember"
1818
},
19-
"packageManager": "pnpm@9.15.4",
19+
"packageManager": "pnpm@10.10.0",
2020
"devDependencies": {
2121
"@glint/core": "^1.5.2",
2222
"concurrently": "^9.1.2",
23-
"prettier": "^3.4.2",
24-
"prettier-plugin-ember-template-tag": "^2.0.4"
23+
"prettier": "^3.5.3",
24+
"prettier-plugin-ember-template-tag": "^2.0.5"
2525
}
26-
}
26+
}

0 commit comments

Comments
 (0)