chore: Re-remove core/blockly.js
#6422
Merged
Conversation
This file contains hidden or 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
core/blockly.js was removed from the ts/migration branch in PR RaspberryPiFoundation#6261, but for some reason when ts/migration was merged into develop via a two step process something went wrong: * as expected, blockly.js got renamed to blockly.ts in PR RaspberryPiFoundation#6297, but * for some reason it got re-added under its original name in PR RaspberryPiFoundation#6299. Since the file should not exist, is not used, and has proven to cause confusion (to me at least!), delete it again, hopefully for good this time.
cpcallen
added
component: build process
PR: chore
BeksOmega
approved these changes
Sep 12, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The basics
npm run formatandnpm run lintThe details
Proposed Changes
core/blockly.jswas removed from thets/migrationbranch in PR #6261, but for some reason whents/migrationwas merged intodevelopvia a two step process something went wrong:blockly.jstoblockly.tsas expected, butblockly.jsunder its original name for some reason.Since the file is not used, should not exist, and has proven to cause confusion (to me at least!), delete it. Again. Hopefully for good this time.
Behaviour Before Change
tscignorescore/blockly.jsbecause it prefersblockly.ts.Behaviour After Change
tscignorescore/blockly.jsbecause that file does not exist.Reason for Changes
Correct what appears to be an incorrectly-resolved merge conflict.
Test Coverage
npm testpasses.No changes to manual testing anticipated.