diff --git a/plugins/theme-dark/src/index.js b/plugins/theme-dark/src/index.ts similarity index 89% rename from plugins/theme-dark/src/index.js rename to plugins/theme-dark/src/index.ts index 7b095dce65..f0fdf9fe2c 100644 --- a/plugins/theme-dark/src/index.js +++ b/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', @@ -27,6 +28,5 @@ export default Blockly.Theme.defineTheme('dark', { insertionMarkerOpacity: 0.3, scrollbarOpacity: 0.4, cursorColour: '#d0d0d0', - blackBackground: '#333', }, }); diff --git a/plugins/theme-dark/tsconfig.json b/plugins/theme-dark/tsconfig.json new file mode 100644 index 0000000000..b849232f2b --- /dev/null +++ b/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"] +} diff --git a/plugins/theme-deuteranopia/src/index.js b/plugins/theme-deuteranopia/src/index.ts similarity index 63% rename from plugins/theme-deuteranopia/src/index.js rename to plugins/theme-deuteranopia/src/index.ts index 78afbf3773..eeea417dc2 100644 --- a/plugins/theme-deuteranopia/src/index.js +++ b/plugins/theme-deuteranopia/src/index.ts @@ -11,47 +11,47 @@ import * as Blockly from 'blockly/core'; const defaultBlockStyles = { - colour_blocks: { + colour_blocks: { // eslint-disable-line camelcase colourPrimary: '#f2a72c', colourSecondary: '#f1c172', colourTertiary: '#da921c', }, - list_blocks: { + list_blocks: { // eslint-disable-line camelcase colourPrimary: '#7d65ab', colourSecondary: '#a88be0', colourTertiary: '#66518e', }, - logic_blocks: { + logic_blocks: { // eslint-disable-line camelcase colourPrimary: '#9fd2f1', colourSecondary: '#c0e0f4', colourTertiary: '#74bae5', }, - loop_blocks: { + loop_blocks: { // eslint-disable-line camelcase colourPrimary: '#795a07', colourSecondary: '#ac8726', colourTertiary: '#c4a03f', }, - math_blocks: { + math_blocks: { // eslint-disable-line camelcase colourPrimary: '#e6da39', colourSecondary: '#f3ec8e', colourTertiary: '#f2eeb7', }, - procedure_blocks: { + procedure_blocks: { // eslint-disable-line camelcase colourPrimary: '#590721', colourSecondary: '#8c475d', colourTertiary: '#885464', }, - text_blocks: { + text_blocks: { // eslint-disable-line camelcase colourPrimary: '#058863', colourSecondary: '#5ecfaf', colourTertiary: '#04684c', }, - variable_blocks: { + variable_blocks: { // eslint-disable-line camelcase colourPrimary: '#47025a', colourSecondary: '#820fa1', colourTertiary: '#8e579d', }, - variable_dynamic_blocks: { + variable_dynamic_blocks: { // eslint-disable-line camelcase colourPrimary: '#47025a', colourSecondary: '#820fa1', colourTertiary: '#8e579d', @@ -59,31 +59,31 @@ const defaultBlockStyles = { }; const categoryStyles = { - colour_category: { + colour_category: { // eslint-disable-line camelcase colour: '#f2a72c', }, - list_category: { + list_category: { // eslint-disable-line camelcase colour: '#7d65ab', }, - logic_category: { + logic_category: { // eslint-disable-line camelcase colour: '#9fd2f1', }, - loop_category: { + loop_category: { // eslint-disable-line camelcase colour: '#795a07', }, - math_category: { + math_category: { // eslint-disable-line camelcase colour: '#e6da39', }, - procedure_category: { + procedure_category: { // eslint-disable-line camelcase colour: '#590721', }, - text_category: { + text_category: { // eslint-disable-line camelcase colour: '#058863', }, - variable_category: { + variable_category: { // eslint-disable-line camelcase colour: '#47025a', }, - variable_dynamic_category: { + variable_dynamic_category: { // eslint-disable-line camelcase colour: '#47025a', }, }; @@ -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, }); diff --git a/plugins/theme-deuteranopia/tsconfig.json b/plugins/theme-deuteranopia/tsconfig.json new file mode 100644 index 0000000000..b849232f2b --- /dev/null +++ b/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"] +} diff --git a/plugins/theme-hackermode/src/index.js b/plugins/theme-hackermode/src/index.ts similarity index 64% rename from plugins/theme-hackermode/src/index.js rename to plugins/theme-hackermode/src/index.ts index 54f1252d08..cfaceb0905 100644 --- a/plugins/theme-hackermode/src/index.js +++ b/plugins/theme-hackermode/src/index.ts @@ -12,47 +12,47 @@ import * as Blockly from 'blockly/core'; const defaultBlockStyles = { - colour_blocks: { + colour_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - list_blocks: { + list_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - logic_blocks: { + logic_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - loop_blocks: { + loop_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - math_blocks: { + math_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - procedure_blocks: { + procedure_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - text_blocks: { + text_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - variable_blocks: { + variable_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', }, - variable_dynamic_blocks: { + variable_dynamic_blocks: { // eslint-disable-line camelcase colourPrimary: '#0c0d0d', colourSecondary: '#0c0d0d', colourTertiary: '#edf2f2', @@ -60,42 +60,43 @@ const defaultBlockStyles = { }; const categoryStyles = { - colour_category: { + colour_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - list_category: { + list_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - logic_category: { + logic_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - loop_category: { + loop_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - math_category: { + math_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - procedure_category: { + procedure_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - text_category: { + text_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - variable_category: { + variable_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, - variable_dynamic_category: { + variable_dynamic_category: { // eslint-disable-line camelcase colour: '#0c0d0d', }, }; export default Blockly.Theme.defineTheme('hackermode', { + name: 'hackermode', base: Blockly.Themes.Classic, blockStyles: defaultBlockStyles, categoryStyles: categoryStyles, componentStyles: { workspaceBackgroundColour: '#1e1e1e', - toolboxBackgroundColour: 'blackBackground', + toolboxBackgroundColour: '#333', 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, }); diff --git a/plugins/theme-hackermode/tsconfig.json b/plugins/theme-hackermode/tsconfig.json new file mode 100644 index 0000000000..b849232f2b --- /dev/null +++ b/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"] +} diff --git a/plugins/theme-highcontrast/src/index.js b/plugins/theme-highcontrast/src/index.ts similarity index 53% rename from plugins/theme-highcontrast/src/index.js rename to plugins/theme-highcontrast/src/index.ts index 70a0924c6f..6e1221601e 100644 --- a/plugins/theme-highcontrast/src/index.js +++ b/plugins/theme-highcontrast/src/index.ts @@ -13,52 +13,52 @@ import * as Blockly from 'blockly/core'; const defaultBlockStyles = { - colour_blocks: { + colour_blocks: { // eslint-disable-line camelcase colourPrimary: '#a52714', colourSecondary: '#FB9B8C', colourTertiary: '#FBE1DD', }, - list_blocks: { + list_blocks: { // eslint-disable-line camelcase colourPrimary: '#4a148c', colourSecondary: '#AD7BE9', colourTertiary: '#CDB6E9', }, - logic_blocks: { + logic_blocks: { // eslint-disable-line camelcase colourPrimary: '#01579b', colourSecondary: '#64C7FF', colourTertiary: '#C5EAFF', }, - loop_blocks: { + loop_blocks: { // eslint-disable-line camelcase colourPrimary: '#33691e', colourSecondary: '#9AFF78', colourTertiary: '#E1FFD7', }, - math_blocks: { + math_blocks: { // eslint-disable-line camelcase colourPrimary: '#1a237e', colourSecondary: '#8A9EFF', colourTertiary: '#DCE2FF', }, - procedure_blocks: { + procedure_blocks: { // eslint-disable-line camelcase colourPrimary: '#006064', colourSecondary: '#77E6EE', colourTertiary: '#CFECEE', }, - text_blocks: { + text_blocks: { // eslint-disable-line camelcase colourPrimary: '#004d40', colourSecondary: '#5ae27c', colourTertiary: '#D2FFDD', }, - variable_blocks: { + variable_blocks: { // eslint-disable-line camelcase colourPrimary: '#880e4f', colourSecondary: '#FF73BE', colourTertiary: '#FFD4EB', }, - variable_dynamic_blocks: { + variableDynamic_blocks: { // eslint-disable-line camelcase colourPrimary: '#880e4f', colourSecondary: '#FF73BE', colourTertiary: '#FFD4EB', }, - hat_blocks: { + hat_blocks: { // eslint-disable-line camelcase colourPrimary: '#880e4f', colourSecondary: '#FF73BE', colourTertiary: '#FFD4EB', @@ -67,32 +67,33 @@ const defaultBlockStyles = { }; const categoryStyles = { - colour_category: {colour: '#a52714'}, - list_category: {colour: '#4a148c'}, - logic_category: {colour: '#01579b'}, - loop_category: {colour: '#33691e'}, - math_category: {colour: '#1a237e'}, - procedure_category: {colour: '#006064'}, - text_category: {colour: '#004d40'}, - variable_category: {colour: '#880e4f'}, - variable_dynamic_category: {colour: '#880e4f'}, + colour_category: {colour: '#a52714'}, // eslint-disable-line camelcase + list_category: {colour: '#4a148c'}, // eslint-disable-line camelcase + logic_category: {colour: '#01579b'}, // eslint-disable-line camelcase + loop_category: {colour: '#33691e'}, // eslint-disable-line camelcase + math_category: {colour: '#1a237e'}, // eslint-disable-line camelcase + procedure_category: {colour: '#006064'}, // eslint-disable-line camelcase + text_category: {colour: '#004d40'}, // eslint-disable-line camelcase + variable_category: {colour: '#880e4f'}, // eslint-disable-line camelcase + variable_dynamic_category: {colour: '#880e4f'}, // eslint-disable-line camelcase }; /** * 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, }); diff --git a/plugins/theme-highcontrast/tsconfig.json b/plugins/theme-highcontrast/tsconfig.json new file mode 100644 index 0000000000..b849232f2b --- /dev/null +++ b/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"] +} diff --git a/plugins/theme-modern/src/index.js b/plugins/theme-modern/src/index.ts similarity index 61% rename from plugins/theme-modern/src/index.js rename to plugins/theme-modern/src/index.ts index 40f5a79d70..c8be42757e 100644 --- a/plugins/theme-modern/src/index.js +++ b/plugins/theme-modern/src/index.ts @@ -11,54 +11,55 @@ import * as Blockly from 'blockly/core'; export default Blockly.Theme.defineTheme('modern', { + name: 'modern', base: Blockly.Themes.Classic, blockStyles: { - colour_blocks: { + colour_blocks: { // eslint-disable-line camelcase colourPrimary: '#a5745b', colourSecondary: '#dbc7bd', colourTertiary: '#845d49', }, - list_blocks: { + list_blocks: { // eslint-disable-line camelcase colourPrimary: '#745ba5', colourSecondary: '#c7bddb', colourTertiary: '#5d4984', }, - logic_blocks: { + logic_blocks: { // eslint-disable-line camelcase colourPrimary: '#5b80a5', colourSecondary: '#bdccdb', colourTertiary: '#496684', }, - loop_blocks: { + loop_blocks: { // eslint-disable-line camelcase colourPrimary: '#5ba55b', colourSecondary: '#bddbbd', colourTertiary: '#498449', }, - math_blocks: { + math_blocks: { // eslint-disable-line camelcase colourPrimary: '#5b67a5', colourSecondary: '#bdc2db', colourTertiary: '#495284', }, - procedure_blocks: { + procedure_blocks: { // eslint-disable-line camelcase colourPrimary: '#995ba5', colourSecondary: '#d6bddb', colourTertiary: '#7a4984', }, - text_blocks: { + text_blocks: { // eslint-disable-line camelcase colourPrimary: '#5ba58c', colourSecondary: '#bddbd1', colourTertiary: '#498470', }, - variable_blocks: { + variable_blocks: { // eslint-disable-line camelcase colourPrimary: '#a55b99', colourSecondary: '#dbbdd6', colourTertiary: '#84497a', }, - variable_dynamic_blocks: { + variableDynamic_blocks: { // eslint-disable-line camelcase colourPrimary: '#a55b99', colourSecondary: '#dbbdd6', colourTertiary: '#84497a', }, - hat_blocks: { + hat_blocks: { // eslint-disable-line camelcase colourPrimary: '#a55b99', colourSecondary: '#dbbdd6', colourTertiary: '#84497a', @@ -66,35 +67,35 @@ export default Blockly.Theme.defineTheme('modern', { }, }, categoryStyles: { - colour_category: { + colour_category: { // eslint-disable-line camelcase colour: '#a5745b', }, - list_category: { + list_category: { // eslint-disable-line camelcase colour: '#745ba5', }, - logic_category: { + logic_category: { // eslint-disable-line camelcase colour: '#5b80a5', }, - loop_category: { + loop_category: { // eslint-disable-line camelcase colour: '#5ba55b', }, - math_category: { + math_category: { // eslint-disable-line camelcase colour: '#5b67a5', }, - procedure_category: { + procedure_category: { // eslint-disable-line camelcase colour: '#995ba5', }, - text_category: { + text_category: { // eslint-disable-line camelcase colour: '#5ba58c', }, - variable_category: { + variable_category: { // eslint-disable-line camelcase colour: '#a55b99', }, - variable_dynamic_category: { + variable_dynamic_category: { // eslint-disable-line camelcase colour: '#a55b99', }, }, componentStyles: {}, fontStyle: {}, - startHats: null, + startHats: undefined, }); diff --git a/plugins/theme-modern/tsconfig.json b/plugins/theme-modern/tsconfig.json new file mode 100644 index 0000000000..b849232f2b --- /dev/null +++ b/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"] +} diff --git a/plugins/theme-tritanopia/src/index.js b/plugins/theme-tritanopia/src/index.ts similarity index 62% rename from plugins/theme-tritanopia/src/index.js rename to plugins/theme-tritanopia/src/index.ts index 17c5b25243..733eecfaa2 100644 --- a/plugins/theme-tritanopia/src/index.js +++ b/plugins/theme-tritanopia/src/index.ts @@ -11,47 +11,47 @@ import * as Blockly from 'blockly/core'; const defaultBlockStyles = { - colour_blocks: { + colour_blocks: { // eslint-disable-line camelcase colourPrimary: '#05427f', colourSecondary: '#2974c0', colourTertiary: '#2d74bb', }, - list_blocks: { + list_blocks: { // eslint-disable-line camelcase colourPrimary: '#b69ce8', colourSecondary: '#ccbaef', colourTertiary: '#9176c5', }, - logic_blocks: { + logic_blocks: { // eslint-disable-line camelcase colourPrimary: '#9fd2f1', colourSecondary: '#c0e0f4', colourTertiary: '#74bae5', }, - loop_blocks: { + loop_blocks: { // eslint-disable-line camelcase colourPrimary: '#aa1846', colourSecondary: '#d36185', colourTertiary: '#7c1636', }, - math_blocks: { + math_blocks: { // eslint-disable-line camelcase colourPrimary: '#e6da39', colourSecondary: '#f3ec8e', colourTertiary: '#f2eeb7', }, - procedure_blocks: { + procedure_blocks: { // eslint-disable-line camelcase colourPrimary: '#590721', colourSecondary: '#8c475d', colourTertiary: '#885464', }, - text_blocks: { + text_blocks: { // eslint-disable-line camelcase colourPrimary: '#058863', colourSecondary: '#5ecfaf', colourTertiary: '#04684c', }, - variable_blocks: { + variable_blocks: { // eslint-disable-line camelcase colourPrimary: '#4b2d84', colourSecondary: '#816ea7', colourTertiary: '#83759e', }, - variable_dynamic_blocks: { + variableDynamic_blocks: { // eslint-disable-line camelcase colourPrimary: '#4b2d84', colourSecondary: '#816ea7', colourTertiary: '#83759e', @@ -59,31 +59,31 @@ const defaultBlockStyles = { }; const categoryStyles = { - colour_category: { + colour_category: { // eslint-disable-line camelcase colour: '#05427f', }, - list_category: { + list_category: { // eslint-disable-line camelcase colour: '#b69ce8', }, - logic_category: { + logic_category: { // eslint-disable-line camelcase colour: '#9fd2f1', }, - loop_category: { + loop_category: { // eslint-disable-line camelcase colour: '#aa1846', }, - math_category: { + math_category: { // eslint-disable-line camelcase colour: '#e6da39', }, - procedure_category: { + procedure_category: { // eslint-disable-line camelcase colour: '#590721', }, - text_category: { + text_category: { // eslint-disable-line camelcase colour: '#058863', }, - variable_category: { + variable_category: { // eslint-disable-line camelcase colour: '#4b2d84', }, - variable_dynamic_category: { + variable_dynamic_category: { // eslint-disable-line camelcase colour: '#4b2d84', }, }; @@ -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, }); diff --git a/plugins/theme-tritanopia/tsconfig.json b/plugins/theme-tritanopia/tsconfig.json new file mode 100644 index 0000000000..b849232f2b --- /dev/null +++ b/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"] +}