Skip to content

refactor(blocks): Migrate blocks/colour.js to TypeScript #6901

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.

Sign up for GitHub

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

Merged
cpcallen merged 2 commits into from
Mar 17, 2023
Merged

refactor(blocks): Migrate blocks/colour.js to TypeScript #6901

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f64b178
refactor(blocks): Auto-migration of blocks/colour.js to ts
cpcallen Mar 17, 2023
a8cb59f
fix(blocks): Manually migrate types & fix imports in colour.ts
cpcallen Mar 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions blocks/colour.js → blocks/colour.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,19 @@
/**
* @fileoverview Colour blocks for Blockly.
*/
'use strict';

goog.module('Blockly.libraryBlocks.colour');
import * as goog from '../closure/goog/goog.js';
goog.declareModuleId('Blockly.libraryBlocks.colour');

// const {BlockDefinition} = goog.requireType('Blockly.blocks');
// TODO (6248): Properly import the BlockDefinition type.
/* eslint-disable-next-line no-unused-vars */
const BlockDefinition = Object;
const {createBlockDefinitionsFromJsonArray, defineBlocks} = goog.require('Blockly.common');
/** @suppress {extraRequire} */
goog.require('Blockly.FieldColour');
import type {BlockDefinition} from '../core/blocks.js';
import {createBlockDefinitionsFromJsonArray, defineBlocks} from '../core/common.js';
import '../core/field_colour.js';


/**
* A dictionary of the block definitions provided by this module.
* @type {!Object<string, !BlockDefinition>}
*/
const blocks = createBlockDefinitionsFromJsonArray([
export const blocks = createBlockDefinitionsFromJsonArray([
// Block for colour picker.
{
'type': 'colour_picker',
Expand Down Expand Up @@ -115,7 +110,6 @@ const blocks = createBlockDefinitionsFromJsonArray([
'tooltip': '%{BKY_COLOUR_BLEND_TOOLTIP}',
},
]);
exports.blocks = blocks;

// Register provided blocks.
defineBlocks(blocks);