Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 20
Expand All @@ -41,7 +40,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 20
Expand Down Expand Up @@ -72,6 +70,7 @@ jobs:
- ember-lts-5.8
- ember-lts-5.12
- ember-lts-5.12-with-fa5
- ember-lts-6.4
- ember-release
- ember-beta
- ember-canary
Expand All @@ -81,7 +80,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 20
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/push-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ on:
jobs:
push-dist:
name: Push dist
permissions:
contents: write
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4

- uses: actions/setup-node@v4
with:
node-version: 20
Expand Down
2 changes: 1 addition & 1 deletion config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"packages": [
{
"name": "@embroider/addon-blueprint",
"version": "4.0.0",
"version": "4.1.2",
"blueprints": [
{
"name": "@embroider/addon-blueprint",
Expand Down
2 changes: 1 addition & 1 deletion ember-fontawesome/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"@babel/eslint-parser": "^7.26.5",
"@babel/plugin-transform-typescript": "^7.26.7",
"@babel/runtime": "^7.26.10",
"@ember/library-tsconfig": "^1.1.3",
"@embroider/addon-dev": "^7.1.1",
"@eslint/js": "^9.19.0",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
Expand All @@ -85,7 +86,6 @@
"@glint/environment-ember-template-imports": "^1.5.2",
"@glint/template": "^1.5.2",
"@rollup/plugin-babel": "^6.0.4",
"@tsconfig/ember": "^3.0.9",
"babel-plugin-ember-template-compilation": "^2.3.0",
"concurrently": "^9.1.2",
"ember-source": "^6.1.0",
Expand Down
31 changes: 1 addition & 30 deletions ember-fontawesome/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,12 @@
{
"extends": "@tsconfig/ember/tsconfig.json",
"extends": "@ember/library-tsconfig",
"include": ["src/**/*", "unpublished-development-types/**/*"],
"glint": {
"environment": ["ember-loose", "ember-template-imports"]
},
"compilerOptions": {
"allowJs": true,
"declarationDir": "declarations",
/**
https://www.typescriptlang.org/tsconfig#noEmit

We want to emit declarations, so this option must be set to `false`.
@tsconfig/ember sets this to `true`, which is incompatible with our need to set `emitDeclarationOnly`.
@tsconfig/ember is more optimized for apps, which wouldn't emit anything, only type check.
*/
"noEmit": false,
/**
https://www.typescriptlang.org/tsconfig#emitDeclarationOnly
We want to only emit declarations as we use Rollup to emit JavaScript.
*/
"emitDeclarationOnly": true,

/**
https://www.typescriptlang.org/tsconfig#noEmitOnError
Do not block emit on TS errors.
*/
"noEmitOnError": false,

/**
https://www.typescriptlang.org/tsconfig#rootDir
"Default: The longest common path of all non-declaration input files."
Expand All @@ -38,15 +18,6 @@
imports to files on disk
*/
"rootDir": "./src",

/**
https://www.typescriptlang.org/tsconfig#allowImportingTsExtensions

We want our tooling to know how to resolve our custom files so the appropriate plugins
can do the proper transformations on those files.
*/
"allowImportingTsExtensions": true,

"types": ["ember-source/types"]
}
}
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"test": "pnpm --filter '*' test",
"test:ember": "pnpm --filter '*' test:ember"
},
"packageManager": "pnpm@9.15.4",
"packageManager": "pnpm@10.10.0",
"devDependencies": {
"@glint/core": "^1.5.2",
"concurrently": "^9.1.2",
"prettier": "^3.4.2",
"prettier-plugin-ember-template-tag": "^2.0.4"
"prettier": "^3.5.3",
"prettier-plugin-ember-template-tag": "^2.0.5"
}
}
}
Loading