Skip to content

Prepare 6.12-beta#10991

Merged
mansona merged 82 commits intobetafrom
merge-release
Apr 4, 2026
Merged

Prepare 6.12-beta#10991
mansona merged 82 commits intobetafrom
merge-release

Conversation

@mansona
Copy link
Copy Markdown
Member

@mansona mansona commented Apr 4, 2026

No description provided.

mansona and others added 30 commits January 25, 2026 16:33
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
just updating the notes after doing another release 👍
NullVoxPopuli and others added 21 commits March 28, 2026 14:29
Support ember-source (ESM) -- without addon vendor paths
…release

Backport: Remove tracked-built-ins (it comes built in with ember-source 6.8+)
…release

Backport: Update ember-cli-htmlbars to ^7.0.0 in app-blueprint
…ures-json

Enable `use-ember-modules` in blueprint optional-features.json
…release

Backport: Enable use-ember-modules in blueprint optional-features.json
bump node on publish.yml and stop updating npm
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
mansona added 3 commits April 4, 2026 22:49
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/app-blueprint/files/package.json
#	pnpm-lock.yaml
#	tests/fixtures/addon/defaults/package.json
#	tests/fixtures/addon/pnpm/package.json
#	tests/fixtures/addon/typescript/package.json
#	tests/fixtures/addon/yarn/package.json
#	tests/fixtures/app/defaults/package.json
#	tests/fixtures/app/embroider-no-ember-data/package.json
#	tests/fixtures/app/embroider-no-welcome/package.json
#	tests/fixtures/app/embroider-pnpm/package.json
#	tests/fixtures/app/embroider-yarn/package.json
#	tests/fixtures/app/embroider/package.json
#	tests/fixtures/app/no-ember-data/package.json
#	tests/fixtures/app/npm/package.json
#	tests/fixtures/app/pnpm/package.json
#	tests/fixtures/app/typescript-embroider-no-ember-data/package.json
#	tests/fixtures/app/typescript-embroider/package.json
#	tests/fixtures/app/typescript-no-ember-data/package.json
#	tests/fixtures/app/typescript/package.json
#	tests/fixtures/app/yarn/package.json
@mansona mansona merged commit 1a5d3b6 into beta Apr 4, 2026
70 checks passed
@mansona mansona deleted the merge-release branch April 4, 2026 22:24
@mansona mansona mentioned this pull request Apr 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants