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

refactor(blocks): Migrate blocks/logic.js to TypeScript #7003

Merged
merged 7 commits into from
Jun 16, 2023

Conversation

cpcallen
Copy link
Contributor

The basics

  • I branched from develop
  • My pull request is against develop
  • My code follows the style guide
  • I ran npm run format and npm run lint

The details

Resolves

Part of #6828.

Additional Info

Holding off on clang-formatting as it makes some very questionable choices, which I have raised a query about.

blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
blocks/logic.ts Outdated Show resolved Hide resolved
Manual resolutions:

- Delete core/mutator.ts from this branch (the change to this file
  made in 86e7a64 has already been made in develop).
- In blocks/logic.ts, make core/icons/mutator_icon.js a side-effects
  only import (as is the case, albeit with goog.require, in develop)
- Also change one comment referrint to Mutator to refer to MutatorIcon
  instead.
@cpcallen
Copy link
Contributor Author

I believe this is now ready for re-review.

@cpcallen cpcallen merged commit 95dd63b into google:develop Jun 16, 2023
@cpcallen cpcallen deleted the fix/6828/blocks/logic branch June 16, 2023 20:13
@cpcallen cpcallen linked an issue Jun 21, 2023 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update BlockDefinition type import in block definition files
2 participants