Fix blocks upgrades with tilemaps #7339
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
riknoll
approved these changes
Jul 21, 2020
webapp/src/compiler.ts
Outdated
| }) | ||
| .then(() => { | ||
| const compiledFiles = project.getAllFiles(); | ||
| const generatedFileNames = Object.keys(compiledFiles).filter(el => /\.g\.ts/.test(el)); |
There was a problem hiding this comment.
why not just copy over all non-main.ts files?
There was a problem hiding this comment.
No particular reason, these were just the ones that were breaking things.
I'll switch it so it hopefully avoids the issue in the future~
|
I think the way to make this less tilemappy would be to refactor so that there is only one codepath that compiles projects, but it's outside the scope of this change. |
abchatra
pushed a commit
that referenced
this pull request
Jul 22, 2020
* fix blocks upgrade rules when tilemaps are present (needs cleanup) * don't hardcode tilemap.g.ts / generalize a tiny bit * just patch over all but main.* files to hopefully avoid similar issues in future
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
re: microsoft/pxt-arcade#2197, this fixes blocks upgrades when there's a tilemap.
The issue was that the blocks compile was generating
main.tsas iftilemap.g.tsexists, so it didn't have the namespace at the top. This adds on to the blocks patch logic to copy over the generated files to the patch when we're validating that it creates an okay program.This feels like potentially a bit too much tilemap specific logic in the upgrade logic, but not sure where a better fix would be.