Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge stable into main #2371

Merged
merged 26 commits into from
Mar 13, 2025
Merged

Merge stable into main #2371

merged 26 commits into from
Mar 13, 2025

Conversation

mansona
Copy link
Member

@mansona mansona commented Mar 13, 2025

This is mostly a no-op because the changes have recently been merged and the recent changes in stable were a backport of features on main 👍

NullVoxPopuli and others added 26 commits March 7, 2025 20:49
Fix addon-dev's declarations plugin when glint fails
fix gitignore for switching between stable and main
move most of the implementation of staticInvokables to core
Because there are some badly behaved packages like ember-cli-fastboot that have subdirs with their own separate package.json that make it hard to identify true package ownership later
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	packages/addon-dev/package.json
#	packages/compat/package.json
#	packages/compat/src/compat-app-builder.ts
#	packages/compat/src/options.ts
#	packages/core/package.json
#	packages/core/src/module-resolver.ts
#	packages/core/src/node-resolve.ts
#	packages/core/src/options.ts
#	packages/vite/package.json
#	tests/scenarios/typescript-app-test.ts
@mansona mansona merged commit 680529e into main Mar 13, 2025
211 checks passed
@mansona mansona deleted the merge-stable-main branch March 13, 2025 11:41
@github-actions github-actions bot mentioned this pull request Mar 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants