From a0b4a214a9802d03fd5e7efe115552ce521bd70f Mon Sep 17 00:00:00 2001
From: Christopher Allen <cpcallen+git@google.com>
Date: Fri, 17 Mar 2023 15:36:44 +0000
Subject: [PATCH] refactor(blocks): Migrate `blocks/colour.js` to TypeScript
 (#6901)

* refactor(blocks): Auto-migration of blocks/colour.js to ts

* fix(blocks): Manually migrate types & fix imports in colour.ts
---
 blocks/{colour.js => colour.ts} | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)
 rename blocks/{colour.js => colour.ts} (82%)

diff --git a/blocks/colour.js b/blocks/colour.ts
similarity index 82%
rename from blocks/colour.js
rename to blocks/colour.ts
index 236b97c5c..b01c047b7 100644
--- a/blocks/colour.js
+++ b/blocks/colour.ts
@@ -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',
@@ -115,7 +110,6 @@ const blocks = createBlockDefinitionsFromJsonArray([
     'tooltip': '%{BKY_COLOUR_BLEND_TOOLTIP}',
   },
 ]);
-exports.blocks = blocks;
 
 // Register provided blocks.
 defineBlocks(blocks);