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 #1825

Merged
merged 25 commits into from
Feb 28, 2024
Merged

Merge stable into main #1825

merged 25 commits into from
Feb 28, 2024

Conversation

mansona
Copy link
Member

@mansona mansona commented Feb 28, 2024

No description provided.

krasnoukhov and others added 25 commits February 1, 2024 14:58
Backport #1642 to stable:  Allow for more flexible addon-dev appReexports
Backport #1760 to stable: Add exclude option to appReexports and publicEntrypoints rollup plugins
Bump content-tag and add inline_source_map option for rollup and vite
Fix source map option not being passed to plugin
[stable] Pin ember-data to fix issue in CI
# Conflicts:
#	packages/addon-dev/src/rollup-gjs-plugin.ts
#	packages/vite/src/template-tag.ts
#	pnpm-lock.yaml
#	tests/scenarios/package.json
@NullVoxPopuli
Copy link
Collaborator

woah, looks like we were behind a bit 😅

@mansona
Copy link
Member Author

mansona commented Feb 28, 2024

@NullVoxPopuli yea I guess we need to get into the habit of merging stable into main after every release 👍

@mansona mansona merged commit 8c7b24d into main Feb 28, 2024
95 checks passed
@mansona mansona deleted the merge-stable branch February 28, 2024 17:03
@github-actions github-actions bot mentioned this pull request Feb 29, 2024
@github-actions github-actions bot mentioned this pull request Apr 4, 2024
@github-actions github-actions bot mentioned this pull request Apr 15, 2024
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.

5 participants