Skip to content

Commit 8f030d5

Browse files
ef4ef4
committed
Merge remote-tracking branch 'origin/main' into template-compiler-deprecation
2 parents e1575a0 + ca6bcbb commit 8f030d5

File tree

28 files changed

+2083
-487
lines changed

28 files changed

+2083
-487
lines changed

‎.github/workflows/plan-release.yml‎

Lines changed: 15 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -15,75 +15,44 @@ concurrency:
1515
cancel-in-progress: true
1616

1717
jobs:
18-
is-this-a-release:
19-
name: "Is this a release?"
18+
should-run-release-plan-prepare:
19+
name: Should we run release-plan prepare?
2020
runs-on: ubuntu-latest
2121
outputs:
22-
command: ${{ steps.check-release.outputs.command }}
23-
22+
should-prepare: ${{ steps.should-prepare.outputs.should-prepare }}
2423
steps:
25-
- uses: actions/checkout@v4
24+
- uses: release-plan/actions/should-prepare-release@v1
2625
with:
27-
fetch-depth: 2
2826
ref: 'main'
29-
# This will only cause the `is-this-a-release` job to have a "command" of `release`
30-
# when the .release-plan.json file was changed on the last commit.
31-
- id: check-release
32-
run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
27+
id: should-prepare
3328

3429
create-prepare-release-pr:
3530
name: Create Prepare Release PR
3631
runs-on: ubuntu-latest
3732
timeout-minutes: 5
38-
needs: is-this-a-release
33+
needs: should-run-release-plan-prepare
3934
permissions:
4035
contents: write
4136
issues: read
4237
pull-requests: write
43-
# only run on push event or workflow dispatch if plan wasn't updated (don't create a release plan when we're releasing)
44-
# only run on labeled event if the PR has already been merged
45-
if: ((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && needs.is-this-a-release.outputs.command != 'release') || (github.event_name == 'pull_request_target' && github.event.pull_request.merged == true)
46-
38+
if: needs.should-run-release-plan-prepare.outputs.should-prepare == 'true'
4739
steps:
48-
- uses: actions/checkout@v4
49-
# We need to download lots of history so that
50-
# github-changelog can discover what's changed since the last release
40+
- uses: release-plan/actions/prepare@v1
41+
name: Run release-plan prepare
5142
with:
52-
fetch-depth: 0
5343
ref: 'main'
54-
- uses: ./.github/actions/setup
55-
with:
56-
use_pinned_node: true
57-
58-
- name: "Generate Explanation and Prep Changelogs"
59-
id: explanation
60-
run: |
61-
set +e
62-
pnpm release-plan prepare 2> >(tee -a release-plan-stderr.txt >&2)
63-
64-
if [ $? -ne 0 ]; then
65-
release_plan_output=$(cat release-plan-stderr.txt)
66-
else
67-
release_plan_output=$(jq .description .release-plan.json -r)
68-
rm release-plan-stderr.txt
69-
70-
if [ $(jq '.solution | length' .release-plan.json) -eq 1 ]; then
71-
new_version=$(jq -r '.solution[].newVersion' .release-plan.json)
72-
echo "new_version=v$new_version" >> $GITHUB_OUTPUT
73-
fi
74-
fi
75-
echo 'text<<EOF' >> $GITHUB_OUTPUT
76-
echo "$release_plan_output" >> $GITHUB_OUTPUT
77-
echo 'EOF' >> $GITHUB_OUTPUT
7844
env:
7945
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
46+
id: explanation
8047

81-
- uses: peter-evans/create-pull-request@v7
48+
- uses: peter-evans/create-pull-request@v8
49+
name: Create Prepare Release PR
8250
with:
83-
commit-message: "Prepare Release ${{ steps.explanation.outputs.new_version}} using 'release-plan'"
51+
commit-message: "Prepare Release ${{ steps.explanation.outputs.new-version}} using 'release-plan'"
8452
labels: "internal"
53+
sign-commits: true
8554
branch: release-preview
86-
title: Prepare Release ${{ steps.explanation.outputs.new_version }}
55+
title: Prepare Release ${{ steps.explanation.outputs.new-version }}
8756
body: |
8857
This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
8958

‎.github/workflows/publish.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,20 @@ jobs:
2222
runs-on: ubuntu-latest
2323
permissions:
2424
contents: write
25-
pull-requests: write
2625
id-token: write
2726
attestations: write
2827

2928
steps:
30-
- uses: actions/checkout@v4
31-
- uses: ./.github/actions/setup
29+
- uses: actions/checkout@v6
30+
- uses: pnpm/action-setup@v4
31+
- uses: actions/setup-node@v6
3232
with:
33-
use_pinned_node: "true"
34-
- uses: actions/setup-node@v4
35-
with:
36-
# This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
33+
node-version: 22
3734
registry-url: 'https://registry.npmjs.org'
35+
cache: pnpm
36+
- run: npm install -g npm@latest # ensure that the globally installed npm is new enough to support OIDC
37+
- run: pnpm install --frozen-lockfile
3838
- name: Publish to NPM
3939
run: NPM_CONFIG_PROVENANCE=true pnpm release-plan publish
4040
env:
4141
GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
42-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.release-plan.json‎

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
{
22
"solution": {
33
"@embroider/addon-dev": {
4-
"impact": "minor",
5-
"oldVersion": "8.1.2",
6-
"newVersion": "8.2.0",
7-
"tagName": "latest",
8-
"constraints": [
9-
{
10-
"impact": "minor",
11-
"reason": "Appears in changelog section :rocket: Enhancement"
12-
}
13-
],
14-
"pkgJSONPath": "./packages/addon-dev/package.json"
4+
"oldVersion": "8.3.0"
155
},
166
"@embroider/addon-shim": {
177
"oldVersion": "1.10.2"
@@ -24,8 +14,8 @@
2414
},
2515
"@embroider/compat": {
2616
"impact": "patch",
27-
"oldVersion": "4.1.11",
28-
"newVersion": "4.1.12",
17+
"oldVersion": "4.1.14",
18+
"newVersion": "4.1.15",
2919
"tagName": "latest",
3020
"constraints": [
3121
{
@@ -40,14 +30,10 @@
4030
},
4131
"@embroider/core": {
4232
"impact": "patch",
43-
"oldVersion": "4.4.1",
44-
"newVersion": "4.4.2",
33+
"oldVersion": "4.4.4",
34+
"newVersion": "4.4.5",
4535
"tagName": "latest",
4636
"constraints": [
47-
{
48-
"impact": "patch",
49-
"reason": "Has dependency `workspace:*` on @embroider/shared-internals"
50-
},
5137
{
5238
"impact": "patch",
5339
"reason": "Has dependency `workspace:*` on @embroider/macros"
@@ -63,13 +49,13 @@
6349
},
6450
"@embroider/macros": {
6551
"impact": "patch",
66-
"oldVersion": "1.19.5",
67-
"newVersion": "1.19.6",
52+
"oldVersion": "1.20.0",
53+
"newVersion": "1.20.1",
6854
"tagName": "latest",
6955
"constraints": [
7056
{
7157
"impact": "patch",
72-
"reason": "Has dependency `workspace:*` on @embroider/shared-internals"
58+
"reason": "Appears in changelog section :bug: Bug Fix"
7359
}
7460
],
7561
"pkgJSONPath": "./packages/macros/package.json"
@@ -81,31 +67,17 @@
8167
"oldVersion": "3.0.6"
8268
},
8369
"@embroider/shared-internals": {
84-
"impact": "patch",
85-
"oldVersion": "3.0.1",
86-
"newVersion": "3.0.2",
87-
"tagName": "latest",
88-
"constraints": [
89-
{
90-
"impact": "patch",
91-
"reason": "Appears in changelog section :bug: Bug Fix"
92-
}
93-
],
94-
"pkgJSONPath": "./packages/shared-internals/package.json"
70+
"oldVersion": "3.0.2"
9571
},
9672
"@embroider/template-tag-codemod": {
97-
"oldVersion": "1.3.4"
73+
"oldVersion": "1.3.5"
9874
},
9975
"@embroider/vite": {
100-
"impact": "minor",
101-
"oldVersion": "1.4.4",
102-
"newVersion": "1.5.0",
76+
"impact": "patch",
77+
"oldVersion": "1.6.0",
78+
"newVersion": "1.6.1",
10379
"tagName": "latest",
10480
"constraints": [
105-
{
106-
"impact": "minor",
107-
"reason": "Appears in changelog section :rocket: Enhancement"
108-
},
10981
{
11082
"impact": "patch",
11183
"reason": "Has dependency `workspace:*` on @embroider/macros"
@@ -114,5 +86,5 @@
11486
"pkgJSONPath": "./packages/vite/package.json"
11587
}
11688
},
117-
"description": "## Release (2025-12-23)\n\n* @embroider/addon-dev 8.2.0 (minor)\n* @embroider/compat 4.1.12 (patch)\n* @embroider/core 4.4.2 (patch)\n* @embroider/macros 1.19.6 (patch)\n* @embroider/shared-internals 3.0.2 (patch)\n* @embroider/vite 1.5.0 (minor)\n\n#### :rocket: Enhancement\n* `@embroider/addon-dev`, `@embroider/vite`\n * [#2650](https://github.com/embroider-build/embroider/pull/2650) Update content-tag to 4.1.0 ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### :bug: Bug Fix\n* `@embroider/shared-internals`\n * [#2648](https://github.com/embroider-build/embroider/pull/2648) Fix dependency-aware macros in dummy apps ([@ef4](https://github.com/ef4))\n\n#### Committers: 2\n- Edward Faulkner ([@ef4](https://github.com/ef4))\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
89+
"description": "## Release (2026-03-04)\n\n* @embroider/compat 4.1.15 (patch)\n* @embroider/core 4.4.5 (patch)\n* @embroider/macros 1.20.1 (patch)\n* @embroider/vite 1.6.1 (patch)\n\n#### :bug: Bug Fix\n* `@embroider/macros`\n * [#2680](https://github.com/embroider-build/embroider/pull/2680) Fix types for setTesting ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
11890
}

‎CHANGELOG.md‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,79 @@
11
# Embroider Changelog
22

3+
## Release (2026-03-04)
4+
5+
* @embroider/compat 4.1.15 (patch)
6+
* @embroider/core 4.4.5 (patch)
7+
* @embroider/macros 1.20.1 (patch)
8+
* @embroider/vite 1.6.1 (patch)
9+
10+
#### :bug: Bug Fix
11+
* `@embroider/macros`
12+
* [#2680](https://github.com/embroider-build/embroider/pull/2680) Fix types for setTesting ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
13+
14+
#### Committers: 1
15+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
16+
17+
## Release (2026-02-24)
18+
19+
* @embroider/compat 4.1.14 (patch)
20+
* @embroider/core 4.4.4 (patch)
21+
* @embroider/macros 1.20.0 (minor)
22+
* @embroider/vite 1.6.0 (minor)
23+
24+
#### :rocket: Enhancement
25+
* `@embroider/macros`
26+
* [#2662](https://github.com/embroider-build/embroider/pull/2662) `setTesting()` from `@embroider/macros` ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
27+
* `@embroider/vite`
28+
* [#2668](https://github.com/embroider-build/embroider/pull/2668) Rolldown + Rollup :: better filtering ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
29+
30+
#### Committers: 1
31+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
32+
33+
## Release (2026-02-07)
34+
35+
* @embroider/vite 1.5.2 (patch)
36+
37+
#### :bug: Bug Fix
38+
* `@embroider/vite`
39+
* [#2667](https://github.com/embroider-build/embroider/pull/2667) Fix the hbs filter ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
40+
41+
#### Committers: 1
42+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
43+
44+
## Release (2026-02-04)
45+
46+
* @embroider/addon-dev 8.3.0 (minor)
47+
* @embroider/compat 4.1.13 (patch)
48+
* @embroider/core 4.4.3 (patch)
49+
* @embroider/macros 1.19.7 (patch)
50+
* @embroider/template-tag-codemod 1.3.5 (patch)
51+
* @embroider/vite 1.5.1 (patch)
52+
53+
#### :rocket: Enhancement
54+
* `@embroider/addon-dev`
55+
* [#2651](https://github.com/embroider-build/embroider/pull/2651) Update addon-dev to support glint 1 and glint 2 and choose between them based on your available dependencies ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
56+
57+
#### :bug: Bug Fix
58+
* `@embroider/compat`, `@embroider/template-tag-codemod`
59+
* [#2656](https://github.com/embroider-build/embroider/pull/2656) Upgrade broccoli to ^4.0.0 and align Node requirements to >= 20.19.* ([@Copilot](https://github.com/apps/copilot-swe-agent))
60+
* `@embroider/vite`
61+
* [#2664](https://github.com/embroider-build/embroider/pull/2664) Narrow gjsFilter to not include files that happen to have .gjs in their file name ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
62+
* `@embroider/macros`
63+
* [#2665](https://github.com/embroider-build/embroider/pull/2665) widen the ember-cli-babel dependency range for macros ([@mansona](https://github.com/mansona))
64+
65+
#### :house: Internal
66+
* Other
67+
* [#2666](https://github.com/embroider-build/embroider/pull/2666) upgrade release-plan ([@mansona](https://github.com/mansona))
68+
* [#2653](https://github.com/embroider-build/embroider/pull/2653) Fix CI - content-tag whitespace ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
69+
* `@embroider/addon-dev`
70+
* [#2652](https://github.com/embroider-build/embroider/pull/2652) Switch addon-dev to vitest ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
71+
72+
#### Committers: 3
73+
- Chris Manson ([@mansona](https://github.com/mansona))
74+
- Copilot [Bot] ([@copilot-swe-agent](https://github.com/apps/copilot-swe-agent))
75+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
76+
377
## Release (2025-12-23)
478

579
* @embroider/addon-dev 8.2.0 (minor)

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"eslint-plugin-prettier": "^4.2.1",
4242
"jest": "^29.2.1",
4343
"prettier": "^2.3.1",
44-
"release-plan": "^0.16.0",
44+
"release-plan": "^0.17.4",
4545
"typescript": "^5.5.2"
4646
},
4747
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
@@ -50,11 +50,11 @@
5050
},
5151
"pnpm": {
5252
"overrides": {
53+
"@embroider/addon-shim": "workspace:*",
5354
"@types/eslint": "^8.37.0",
5455
"babel-plugin-module-resolver@5.0.1": "5.0.0",
5556
"browserslist": "^4.14.0",
56-
"graceful-fs": "^4.0.0",
57-
"@embroider/addon-shim": "workspace:*"
57+
"graceful-fs": "^4.0.0"
5858
}
5959
},
6060
"changelog": {

‎packages/addon-dev/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@embroider/addon-dev",
3-
"version": "8.2.0",
3+
"version": "8.3.0",
44
"description": "Utilities for addon authors",
55
"repository": {
66
"type": "git",

‎packages/compat/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@embroider/compat",
3-
"version": "4.1.12",
3+
"version": "4.1.15",
44
"private": false,
55
"description": "Backward compatibility layer for the Embroider build system.",
66
"repository": {
@@ -43,7 +43,7 @@
4343
"babel-plugin-syntax-dynamic-import": "^6.18.0",
4444
"babylon": "^6.18.0",
4545
"bind-decorator": "^1.0.11",
46-
"broccoli": "^3.5.2",
46+
"broccoli": "^4.0.0",
4747
"broccoli-concat": "^4.2.5",
4848
"broccoli-file-creator": "^2.1.1",
4949
"broccoli-funnel": "^3.0.7",
@@ -99,6 +99,6 @@
9999
"@embroider/core": "workspace:^"
100100
},
101101
"engines": {
102-
"node": "12.* || 14.* || >= 16"
102+
"node": ">= 20.19.*"
103103
}
104104
}

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@embroider/core",
3-
"version": "4.4.2",
3+
"version": "4.4.5",
44
"private": false,
55
"description": "A build system for EmberJS applications.",
66
"repository": {

‎packages/core/src/virtual-entrypoint.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ export function getAppFiles(appRoot: string): Set<string> {
319319
const files: string[] = walkSync(appRoot, {
320320
ignore: [
321321
'_babel_filter_.js',
322-
...resolvableExtensions().map(ext => `app.${ext}`),
323-
...resolvableExtensions().map(ext => `engine.${ext}`),
322+
...resolvableExtensions().map(ext => `app${ext}`),
323+
...resolvableExtensions().map(ext => `engine${ext}`),
324324
'assets',
325-
...resolvableExtensions().map(ext => `testem.${ext}`),
325+
...resolvableExtensions().map(ext => `testem${ext}`),
326326
'node_modules',
327327
],
328328
});

0 commit comments

Comments
 (0)