Prepare 7.2 alpha by mansona · Pull Request #11032 · ember-cli/ember-cli · GitHub
Skip to content

Prepare 7.2 alpha#11032

Open
mansona wants to merge 31 commits into
masterfrom
merge-beta
Open

Prepare 7.2 alpha#11032
mansona wants to merge 31 commits into
masterfrom
merge-beta

Conversation

@mansona

@mansona mansona commented May 29, 2026

Copy link
Copy Markdown
Member

No description provided.

mansona and others added 25 commits May 15, 2026 12:35
# 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.
Promote Beta and update all dependencies for 7.0 release
# 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.
# Conflicts:
#	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/nested-project/actual-project/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/with-blueprint-override-lint-fail/package.json
#	tests/fixtures/app/yarn/package.json
[BUGFIX release] fix require(esm) of blueprint indexes
# Conflicts:
#	packages/blueprint-model/package.json
#	pnpm-lock.yaml
@mansona

mansona commented May 29, 2026

Copy link
Copy Markdown
Member Author

@void-mAlex void-mAlex self-requested a review May 29, 2026 16:51
@void-mAlex

Copy link
Copy Markdown

mansona and others added 5 commits May 29, 2026 17:53
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/app-blueprint/files/package.json
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/app-blueprint/files/package.json
@mansona

mansona commented May 30, 2026

Copy link
Copy Markdown
Member Author

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