Skip to content

Merge beta into master#10851

Merged
mansona merged 66 commits intomasterfrom
merge-beta-master
Oct 14, 2025
Merged

Merge beta into master#10851
mansona merged 66 commits intomasterfrom
merge-beta-master

Conversation

@mansona
Copy link
Member

@mansona mansona commented Oct 14, 2025

No description provided.

mansona and others added 30 commits September 30, 2025 00:00
update @ember/app-blueprint beta version
fix incorrect ember-cli-update version in tests
move resolution of @ember/app-blueprint to prevent loading latest
[bugfix release] fix app-blueprint being considered a blueprint
[bugfix release] Fix tests using wrong versions
Reflects the state of Vite as default
[bugfix beta] enable `--strict` by default to match new app blueprint
[bugfix beta] bump the @ember/app-blueprint version
Add package license metadata to match repository
kategengler and others added 24 commits October 11, 2025 00:28
Test will need to be preserved for classic if the experiment is cleaned up.
Error when `ember (generate|destroy) (http-proxy|http-mock|server)` is used in a Vite-based project
Further contextualize help output and error when options and commands that are no longer supported in Vite-based projects are used
[beta] update @ember/app-blueprint to latest beta
[beta bugfix] allow build --watch only in EMBROIDER_PREBUILD
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/addon-blueprint/package.json
#	packages/app-blueprint/files/package.json
#	packages/app-blueprint/package.json
#	tests/acceptance/new-test.js
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/addon-blueprint/package.json
#	packages/app-blueprint/files/package.json
#	packages/app-blueprint/package.json
#	pnpm-lock.yaml
@mansona mansona merged commit e07e00b into master Oct 14, 2025
139 of 140 checks passed
@mansona mansona deleted the merge-beta-master branch October 14, 2025 13:39
@mansona mansona mentioned this pull request Oct 14, 2025
@mansona mansona mentioned this pull request Oct 15, 2025
@mansona mansona added the ignore label Oct 15, 2025
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.

3 participants