Fix: Migrating every theme to TypeScript.

plugins/theme-dark/src/index.js → plugins/theme-dark/src/index.ts

@@ -14,10 +14,11 @@ import * as Blockly from 'blockly/core';
  * Dark theme.
  */
 export default Blockly.Theme.defineTheme('dark', {
+  name: 'dark',
   base: Blockly.Themes.Classic,
   componentStyles: {
     workspaceBackgroundColour: '#1e1e1e',
-    toolboxBackgroundColour: 'blackBackground',
+    toolboxBackgroundColour: '#333',
     toolboxForegroundColour: '#fff',
     flyoutBackgroundColour: '#252526',
     flyoutForegroundColour: '#ccc',
@@ -26,7 +27,6 @@ export default Blockly.Theme.defineTheme('dark', {
     insertionMarkerColour: '#fff',
     insertionMarkerOpacity: 0.3,
     scrollbarOpacity: 0.4,
-    cursorColour: '#d0d0d0',
-    blackBackground: '#333',
-  },
+    cursorColour: '#d0d0d0'
+  }
 });

plugins/theme-dark/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "module": "es2015",
+    "moduleResolution": "bundler",
+    "target": "es6",
+    "strict": true
+  },
+  // NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
+  // Only src matters for production builds.
+  "include": ["src"]
+}

plugins/theme-deuteranopia/src/index.js → plugins/theme-deuteranopia/src/index.ts

@@ -95,10 +95,11 @@ const categoryStyles = {
  * inability to perceive red light).
  */
 export default Blockly.Theme.defineTheme('deuteranopia', {
+  name: 'deuteranopia',
   base: Blockly.Themes.Classic,
   blockStyles: defaultBlockStyles,
   categoryStyles: categoryStyles,
   componentStyles: {},
   fontStyle: {},
-  startHats: null,
+  startHats: undefined,
 });

plugins/theme-deuteranopia/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "module": "es2015",
+    "moduleResolution": "bundler",
+    "target": "es6",
+    "strict": true
+  },
+  // NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
+  // Only src matters for production builds.
+  "include": ["src"]
+}

plugins/theme-hackermode/src/index.js → plugins/theme-hackermode/src/index.ts

@@ -90,12 +90,13 @@ const categoryStyles = {
 };
 
 export default Blockly.Theme.defineTheme('hackermode', {
+  name: 'hackermode',
   base: Blockly.Themes.Classic,
   blockStyles: defaultBlockStyles,
   categoryStyles: categoryStyles,
   componentStyles: {
     workspaceBackgroundColour: '#1e1e1e',
-    toolboxBackgroundColour: 'blackBackground',
+    toolboxBackgroundColour: '#33',
     toolboxForegroundColour: '#73ed58',
     flyoutBackgroundColour: '#252526',
     flyoutForegroundColour: '#73ed58',
@@ -105,12 +106,11 @@ export default Blockly.Theme.defineTheme('hackermode', {
     insertionMarkerOpacity: 0.3,
     scrollbarOpacity: 0.4,
     cursorColour: '#d0d0d0',
-    blackBackground: '#333',
   },
   fontStyle: {
     family: 'monospace',
-    weight: null,
-    size: null,
+    weight: undefined,
+    size: undefined,
   },
-  startHats: null,
+  startHats: undefined,
 });

plugins/theme-hackermode/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "module": "es2015",
+    "moduleResolution": "bundler",
+    "target": "es6",
+    "strict": true
+  },
+  // NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
+  // Only src matters for production builds.
+  "include": ["src"]
+}

plugins/theme-highcontrast/src/index.js → plugins/theme-highcontrast/src/index.ts

@@ -82,17 +82,18 @@ const categoryStyles = {
  * High contrast theme.
  */
 export default Blockly.Theme.defineTheme('highcontrast', {
+  name: 'highcontrast',
   blockStyles: defaultBlockStyles,
   categoryStyles: categoryStyles,
   componentStyles: {
     selectedGlowColour: '#000000',
-    selectedGlowSize: 1,
+    // selectedGlowSize: 1,
     replacementGlowColour: '#000000',
   },
   fontStyle: {
-    family: null, // Use default font-family.
-    weight: null, // Use default font-weight.
+    family: undefined, // Use default font-family.
+    weight: undefined, // Use default font-weight.
     size: 16,
   },
-  startHats: null,
+  startHats: undefined,
 });

plugins/theme-highcontrast/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "module": "es2015",
+    "moduleResolution": "bundler",
+    "target": "es6",
+    "strict": true
+  },
+  // NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
+  // Only src matters for production builds.
+  "include": ["src"]
+}

plugins/theme-modern/src/index.js → plugins/theme-modern/src/index.ts

@@ -11,6 +11,7 @@
 import * as Blockly from 'blockly/core';
 
 export default Blockly.Theme.defineTheme('modern', {
+  name: 'modern',
   base: Blockly.Themes.Classic,
   blockStyles: {
     colour_blocks: {
@@ -96,5 +97,5 @@ export default Blockly.Theme.defineTheme('modern', {
   },
   componentStyles: {},
   fontStyle: {},
-  startHats: null,
+  startHats: undefined,
 });

plugins/theme-modern/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "module": "es2015",
+    "moduleResolution": "bundler",
+    "target": "es6",
+    "strict": true
+  },
+  // NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
+  // Only src matters for production builds.
+  "include": ["src"]
+}

plugins/theme-tritanopia/src/index.js → plugins/theme-tritanopia/src/index.ts

@@ -94,9 +94,10 @@ const categoryStyles = {
  * blue light).
  */
 export default Blockly.Theme.defineTheme('tritanopia', {
+  name: 'tritanopia',
   blockStyles: defaultBlockStyles,
   categoryStyles: categoryStyles,
   componentStyles: {},
   fontStyle: {},
-  startHats: null,
+  startHats: undefined,
 });

plugins/theme-tritanopia/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "dist",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "module": "es2015",
+    "moduleResolution": "bundler",
+    "target": "es6",
+    "strict": true
+  },
+  // NOTE: `test/**/*` is automatically included in `blockly-scripts start`.
+  // Only src matters for production builds.
+  "include": ["src"]
+}