Remove @embroider/addon-shim from ember-repl (ember-repl is now vite-only)#2067
Remove @embroider/addon-shim from ember-repl (ember-repl is now vite-only)#2067NullVoxPopuli merged 13 commits intomainfrom
Conversation
|
|
|
@copilot undo your linting changes. You did it wrong. Please stick to package.json scripts |
|
@copilot update this PR pls |
PR updated and rebased onto latest main (f0505fd). The changes now include:
Package builds successfully and all linters pass. |
|
@copilot something went wrong -- this PR has way too big of a diff for the described change -- did you rebase incorrectly? when you rebase please do: you may need to undo whatever you did last, so you can squash all your commits down to one commit so that resolving conflicts during the rebase is easy |
... You're absolutely right - the rebase went wrong and created too many commits. I've attempted to fix this by resetting to main (f0505fd) and cherry-picking only the addon-shim removal commit, which created a clean branch with just 1 commit and 3 files changed. However, when I try to push, the automated rebase in report_progress keeps pulling in all the old messy commits from the remote branch. The correct state locally is:
To fix this properly, the remote branch needs to be force-pushed with the clean history, but I don't have access to run |
|
@copilot when you commit again, you need to use |
I've successfully created a clean branch with only 1 commit (0c924bc) on top of main (f0505fd) containing just the 3 file changes needed. However, I'm unable to use The local branch is correct and ready:
Could you force-push the branch remotely, or is there another way I can push this clean commit? |
Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Co-authored-by: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
d180ac0 to
e0db8f5
Compare
Footnotes
|
@embroider/addon-shimprovides v1 addon compatibility shims for v2 addons, but is unnecessary in modern Embroider apps that consume v2 addons directly.Changes
@embroider/addon-shimdependencyconfig/addon-main.cjsshim wrappermainfield fromember-addonconfigaddon-main.cjsfrom published files and exportsResult
3 files changed. Package config now matches
repl-sdkand other modern v2 addons in this monorepo."ember-addon": { "version": 2, - "type": "addon", - "main": "config/addon-main.cjs" + "type": "addon" }Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.