From 53cb72d5272ababc813635da116f167f0d9eaf25 Mon Sep 17 00:00:00 2001 From: DD Liu Date: Tue, 13 Oct 2020 20:59:07 -0400 Subject: [PATCH 01/45] Remove dependency on svg renderer --- package.json | 2 +- src/containers/paint-editor.jsx | 3 ++- src/helper/bitmap.js | 10 +++++++--- src/playground/playground.jsx | 3 +++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f5b9716e..26937893 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "minilog": "3.1.0", "parse-color": "1.0.0", "prop-types": "^15.5.10", - "scratch-svg-renderer": "0.2.0-prerelease.20200610220938" + "scratch-render-fonts": "latest" }, "peerDependencies": { "react": "^16", diff --git a/src/containers/paint-editor.jsx b/src/containers/paint-editor.jsx index 23658563..1e2d3ac0 100644 --- a/src/containers/paint-editor.jsx +++ b/src/containers/paint-editor.jsx @@ -129,7 +129,7 @@ class PaintEditor extends React.Component { if (this.props.format === Formats.VECTOR && isBitmap(prevProps.format)) { convertToVector(this.props.clearSelectedItems, this.props.onUpdateImage); } else if (isVector(prevProps.format) && this.props.format === Formats.BITMAP) { - convertToBitmap(this.props.clearSelectedItems, this.props.onUpdateImage); + convertToBitmap(this.props.clearSelectedItems, this.props.onUpdateImage, this.props.fontInlineFn); } } componentWillUnmount () { @@ -344,6 +344,7 @@ PaintEditor.propTypes = { changeMode: PropTypes.func.isRequired, clearSelectedItems: PropTypes.func.isRequired, format: PropTypes.oneOf(Object.keys(Formats)), // Internal, up-to-date data format + fontInlineFn: PropTypes.func, handleSwitchToBitmap: PropTypes.func.isRequired, handleSwitchToVector: PropTypes.func.isRequired, image: PropTypes.oneOfType([ diff --git a/src/helper/bitmap.js b/src/helper/bitmap.js index b070e2a2..bb9d78ab 100644 --- a/src/helper/bitmap.js +++ b/src/helper/bitmap.js @@ -3,8 +3,8 @@ import {createCanvas, clearRaster, getRaster, hideGuideLayers, showGuideLayers} import {getGuideColor} from './guides'; import {clearSelection} from './selection'; import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT, CENTER, MAX_WORKSPACE_BOUNDS} from './view'; -import {inlineSvgFonts} from 'scratch-svg-renderer'; import Formats from '../lib/format'; +import log from '../log/log'; const forEachLinePoint = function (point1, point2, callback) { // Bresenham line algorithm @@ -404,7 +404,7 @@ const getTrimmedRaster = function (shouldInsert) { return trimmedRaster; }; -const convertToBitmap = function (clearSelectedItems, onUpdateImage) { +const convertToBitmap = function (clearSelectedItems, onUpdateImage, optFontInlineFn) { // @todo if the active layer contains only rasters, drawing them directly to the raster layer // would be more efficient. @@ -424,7 +424,11 @@ const convertToBitmap = function (clearSelectedItems, onUpdateImage) { svg.setAttribute('shape-rendering', 'crispEdges'); let svgString = (new XMLSerializer()).serializeToString(svg); - svgString = inlineSvgFonts(svgString); + if (optFontInlineFn) { + svgString = optFontInlineFn(svgString); + } else { + log.error('Fonts may be converted to bitmap incorrectly if fontInlineFn prop is not set on PaintEditor.'); + } // Put anti-aliased SVG into image, and dump image back into canvas const img = new Image(); diff --git a/src/playground/playground.jsx b/src/playground/playground.jsx index 963ed980..88efe019 100644 --- a/src/playground/playground.jsx +++ b/src/playground/playground.jsx @@ -7,6 +7,9 @@ import {createStore} from 'redux'; import reducer from './reducers/combine-reducers'; import {intlInitialState, IntlProvider} from './reducers/intl.js'; import styles from './playground.css'; +// scratch-render-fonts is a playground-only dep. Fonts are expected to be imported +// as a peer dependency, otherwise there will be two copies of them. +import {FONTS} from 'scratch-render-fonts'; const appTarget = document.createElement('div'); appTarget.setAttribute('class', styles.playgroundContainer); From c58b18e52782e730fb701e078ed78cde1dbb5d0d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 00:06:13 +0000 Subject: [PATCH 02/45] Bump scratch-l10n from 3.1.20181129221712 to 3.10.20210114031436 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.1.20181129221712 to 3.10.20210114031436. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/commits/3.10.20210114031436) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0b448e7d..487f67f2 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.1.20181129221712", + "scratch-l10n": "3.10.20210114031436", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 886bb0d611b6d77583a5b244f1ce91d64f32de5d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 15 Jan 2021 03:25:43 +0000 Subject: [PATCH 03/45] Bump scratch-l10n from 3.10.20210114031436 to 3.10.20210115031552 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210114031436 to 3.10.20210115031552. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210114031436...3.10.20210115031552) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 487f67f2..73f5ee1f 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210114031436", + "scratch-l10n": "3.10.20210115031552", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 7b809a45f852474c3f3771799efb25d36c631b20 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 16 Jan 2021 03:19:48 +0000 Subject: [PATCH 04/45] Bump scratch-l10n from 3.10.20210115031552 to 3.10.20210116031507 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210115031552 to 3.10.20210116031507. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210115031552...3.10.20210116031507) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 73f5ee1f..f7bb2024 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210115031552", + "scratch-l10n": "3.10.20210116031507", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 8eb7b1619c513c66d9c8f025dd6cc6da100ba799 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 Jan 2021 03:20:30 +0000 Subject: [PATCH 05/45] Bump scratch-l10n from 3.10.20210116031507 to 3.10.20210117031557 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210116031507 to 3.10.20210117031557. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210116031507...3.10.20210117031557) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7bb2024..2faf8346 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210116031507", + "scratch-l10n": "3.10.20210117031557", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 016de8ed68976d7782259e22958f4755b59fb4a4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 03:53:36 +0000 Subject: [PATCH 06/45] Bump scratch-l10n from 3.10.20210117031557 to 3.10.20210118031657 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210117031557 to 3.10.20210118031657. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210117031557...3.10.20210118031657) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2faf8346..a0d2fec9 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210117031557", + "scratch-l10n": "3.10.20210118031657", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From c27cf9c02355a978344e068728c8e13b78b8e98b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 19 Jan 2021 03:37:22 +0000 Subject: [PATCH 07/45] Bump scratch-l10n from 3.10.20210118031657 to 3.10.20210119031507 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210118031657 to 3.10.20210119031507. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210118031657...3.10.20210119031507) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0d2fec9..c9ccf740 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210118031657", + "scratch-l10n": "3.10.20210119031507", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From a0e6a06453df8484e84ad488a836367dbf8f4e62 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 20 Jan 2021 03:27:28 +0000 Subject: [PATCH 08/45] Bump scratch-l10n from 3.10.20210119031507 to 3.10.20210120031458 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210119031507 to 3.10.20210120031458. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210119031507...3.10.20210120031458) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c9ccf740..d623266e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210119031507", + "scratch-l10n": "3.10.20210120031458", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 66b6b60d9872ed8131109bc3ea090bd37a499f05 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 21 Jan 2021 03:37:10 +0000 Subject: [PATCH 09/45] Bump scratch-l10n from 3.10.20210120031458 to 3.10.20210121031534 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210120031458 to 3.10.20210121031534. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210120031458...3.10.20210121031534) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d623266e..0a433241 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210120031458", + "scratch-l10n": "3.10.20210121031534", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 7bab4d04483d8ce733cd3041565e7f19eee0c315 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 22 Jan 2021 13:27:38 +0000 Subject: [PATCH 10/45] Bump scratch-l10n from 3.10.20210121031534 to 3.10.20210122132044 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210121031534 to 3.10.20210122132044. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210121031534...3.10.20210122132044) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0a433241..3f59750e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210121031534", + "scratch-l10n": "3.10.20210122132044", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 32330ebf0bcdf6084a33a7c94ef39c0a31be14a9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 24 Jan 2021 03:19:32 +0000 Subject: [PATCH 11/45] Bump scratch-l10n from 3.10.20210122132044 to 3.10.20210124031505 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210122132044 to 3.10.20210124031505. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210122132044...3.10.20210124031505) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f59750e..f940bf99 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210122132044", + "scratch-l10n": "3.10.20210124031505", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From c2595a0137bf81fc0a8694a9d34639450a4cf78e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 Jan 2021 03:46:21 +0000 Subject: [PATCH 12/45] Bump scratch-l10n from 3.10.20210124031505 to 3.10.20210125031522 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210124031505 to 3.10.20210125031522. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210124031505...3.10.20210125031522) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f940bf99..54248643 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210124031505", + "scratch-l10n": "3.10.20210125031522", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From f7fed4bd6f8a89414733529c3823030ead31ede2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 03:26:34 +0000 Subject: [PATCH 13/45] Bump scratch-l10n from 3.10.20210125031522 to 3.10.20210126031644 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210125031522 to 3.10.20210126031644. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210125031522...3.10.20210126031644) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54248643..e9d4886a 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210125031522", + "scratch-l10n": "3.10.20210126031644", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 80f786a5bbba714ab433d5680ba09158c895016e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 31 Jan 2021 03:22:28 +0000 Subject: [PATCH 14/45] Bump scratch-l10n from 3.10.20210126031644 to 3.11.20210131031530 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.10.20210126031644 to 3.11.20210131031530. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.10.20210126031644...3.11.20210131031530) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9d4886a..f1e83076 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.10.20210126031644", + "scratch-l10n": "3.11.20210131031530", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From d0a8a221add6f4b561c88bd205bf266da9a05f15 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 03:44:57 +0000 Subject: [PATCH 15/45] Bump scratch-l10n from 3.11.20210131031530 to 3.11.20210201031532 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210131031530 to 3.11.20210201031532. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210131031530...3.11.20210201031532) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f1e83076..1be3f190 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210131031530", + "scratch-l10n": "3.11.20210201031532", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 0312c90dc2597e502e62fe6f661c64598e2ce9fe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 03:25:37 +0000 Subject: [PATCH 16/45] Bump scratch-l10n from 3.11.20210201031532 to 3.11.20210202031504 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210201031532 to 3.11.20210202031504. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210201031532...3.11.20210202031504) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1be3f190..90ecfabb 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210201031532", + "scratch-l10n": "3.11.20210202031504", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From b368d01d3fcbc633c3c2ef4c45c4d2f48cd146b4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 13:59:20 +0000 Subject: [PATCH 17/45] Bump scratch-l10n from 3.11.20210202031504 to 3.11.20210203031454 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210202031504 to 3.11.20210203031454. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210202031504...3.11.20210203031454) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 90ecfabb..d2a78ddc 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210202031504", + "scratch-l10n": "3.11.20210203031454", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 2bda99b4e9a0d637414a4d4408383984023164b5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 4 Feb 2021 03:44:39 +0000 Subject: [PATCH 18/45] Bump scratch-l10n from 3.11.20210203031454 to 3.11.20210204031607 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210203031454 to 3.11.20210204031607. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210203031454...3.11.20210204031607) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d2a78ddc..073c4206 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210203031454", + "scratch-l10n": "3.11.20210204031607", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 119984fd3ca189f1742d4f243ebcf9ae99af3215 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Feb 2021 03:34:13 +0000 Subject: [PATCH 19/45] Bump scratch-l10n from 3.11.20210204031607 to 3.11.20210205031546 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210204031607 to 3.11.20210205031546. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210204031607...3.11.20210205031546) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 073c4206..e6e5c84d 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210204031607", + "scratch-l10n": "3.11.20210205031546", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 5dd2d48d07eab4def2ed3b24a9478142defe322d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 6 Feb 2021 03:20:33 +0000 Subject: [PATCH 20/45] Bump scratch-l10n from 3.11.20210205031546 to 3.11.20210206031558 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210205031546 to 3.11.20210206031558. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210205031546...3.11.20210206031558) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6e5c84d..74b76c23 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210205031546", + "scratch-l10n": "3.11.20210206031558", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 2caca77ae4161ce62a1d5701ca2080ee98c7af7b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 7 Feb 2021 03:23:18 +0000 Subject: [PATCH 21/45] Bump scratch-l10n from 3.11.20210206031558 to 3.11.20210207031837 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210206031558 to 3.11.20210207031837. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210206031558...3.11.20210207031837) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 74b76c23..6faa9d25 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210206031558", + "scratch-l10n": "3.11.20210207031837", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 0c0b8550271b1701f6ac54584d1a738971ac4015 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 03:48:10 +0000 Subject: [PATCH 22/45] Bump scratch-l10n from 3.11.20210207031837 to 3.11.20210208031546 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210207031837 to 3.11.20210208031546. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210207031837...3.11.20210208031546) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6faa9d25..c0d6b370 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210207031837", + "scratch-l10n": "3.11.20210208031546", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 394592dccd19fb4b919b78ddcadcba2c1aa808bd Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 9 Feb 2021 03:22:45 +0000 Subject: [PATCH 23/45] Bump scratch-l10n from 3.11.20210208031546 to 3.11.20210209031515 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210208031546 to 3.11.20210209031515. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210208031546...3.11.20210209031515) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0d6b370..45bda35c 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210208031546", + "scratch-l10n": "3.11.20210209031515", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 7ab106ee279f1109f1a12dbe118c715c85943172 Mon Sep 17 00:00:00 2001 From: Paul Kaplan Date: Tue, 9 Feb 2021 12:14:00 -0500 Subject: [PATCH 24/45] Update eslint and fix duplicate import errors --- package.json | 4 ++-- src/components/fixed-tools/fixed-tools.jsx | 3 +-- src/components/mode-tools/mode-tools.jsx | 3 +-- src/components/paint-editor/paint-editor.jsx | 3 +-- src/containers/color-indicator.jsx | 3 +-- src/containers/fixed-tools.jsx | 3 +-- src/containers/line-mode.jsx | 3 +-- src/containers/mode-tools.jsx | 3 +-- src/containers/paint-editor.jsx | 6 ++---- src/containers/paper-canvas.jsx | 6 ++++-- src/containers/stroke-color-indicator.jsx | 3 +-- src/containers/stroke-width-indicator.jsx | 3 +-- src/helper/bit-tools/brush-tool.js | 3 +-- src/helper/bit-tools/line-tool.js | 3 +-- src/helper/selection-tools/move-tool.js | 3 +-- src/helper/style-path.js | 3 +-- src/helper/undo.js | 3 +-- src/hocs/copy-paste-hoc.jsx | 3 +-- src/hocs/keyboard-shortcuts-hoc.jsx | 3 +-- src/hocs/undo-hoc.jsx | 7 ++++--- src/hocs/update-image-hoc.jsx | 12 ++++++------ test/unit/blob-mode-reducer.test.js | 6 ++---- test/unit/clipboard-reducer.test.js | 5 +++-- test/unit/format-reducer.test.js | 3 +-- test/unit/hover-reducer.test.js | 3 +-- test/unit/modes-reducer.test.js | 3 +-- test/unit/selected-items-reducer.test.js | 5 +++-- test/unit/stroke-width-reducer.test.js | 5 +++-- test/unit/undo-reducer.test.js | 5 +++-- 29 files changed, 51 insertions(+), 67 deletions(-) diff --git a/package.json b/package.json index 45bda35c..2a48197f 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,9 @@ "css-loader": "3.4.0", "enzyme": "^3.6.0", "enzyme-adapter-react-16": "^1.5.0", - "eslint": "^4.4.1", + "eslint": "^5.7.0", "eslint-config-import": "^0.13.0", - "eslint-config-scratch": "^5.0.0", + "eslint-config-scratch": "^6.0.0", "eslint-plugin-import": "^2.18.2", "eslint-plugin-react": "7.20.3", "gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder", diff --git a/src/components/fixed-tools/fixed-tools.jsx b/src/components/fixed-tools/fixed-tools.jsx index 0a808549..b1d325fa 100644 --- a/src/components/fixed-tools/fixed-tools.jsx +++ b/src/components/fixed-tools/fixed-tools.jsx @@ -12,12 +12,11 @@ import Button from '../button/button.jsx'; import ButtonGroup from '../button-group/button-group.jsx'; import Dropdown from '../dropdown/dropdown.jsx'; import {defineMessages, injectIntl, intlShape} from 'react-intl'; -import Formats from '../../lib/format'; +import Formats, {isVector} from '../../lib/format'; import Input from '../forms/input.jsx'; import InputGroup from '../input-group/input-group.jsx'; import Label from '../forms/label.jsx'; import LabeledIconButton from '../labeled-icon-button/labeled-icon-button.jsx'; -import {isVector} from '../../lib/format'; import layout from '../../lib/layout-constants'; import {hideLabel} from '../../lib/hide-label'; import styles from './fixed-tools.css'; diff --git a/src/components/mode-tools/mode-tools.jsx b/src/components/mode-tools/mode-tools.jsx index 408a6bb4..78771edb 100644 --- a/src/components/mode-tools/mode-tools.jsx +++ b/src/components/mode-tools/mode-tools.jsx @@ -17,8 +17,7 @@ import Input from '../forms/input.jsx'; import InputGroup from '../input-group/input-group.jsx'; import LabeledIconButton from '../labeled-icon-button/labeled-icon-button.jsx'; import Modes from '../../lib/modes'; -import Formats from '../../lib/format'; -import {isBitmap, isVector} from '../../lib/format'; +import Formats, {isBitmap, isVector} from '../../lib/format'; import {hideLabel} from '../../lib/hide-label'; import styles from './mode-tools.css'; diff --git a/src/components/paint-editor/paint-editor.jsx b/src/components/paint-editor/paint-editor.jsx index b4a2844d..c94d3585 100644 --- a/src/components/paint-editor/paint-editor.jsx +++ b/src/components/paint-editor/paint-editor.jsx @@ -34,8 +34,7 @@ import StrokeColorIndicatorComponent from '../../containers/stroke-color-indicat import StrokeWidthIndicatorComponent from '../../containers/stroke-width-indicator.jsx'; import TextMode from '../../containers/text-mode.jsx'; -import Formats from '../../lib/format'; -import {isBitmap, isVector} from '../../lib/format'; +import Formats, {isBitmap, isVector} from '../../lib/format'; import styles from './paint-editor.css'; import bitmapIcon from './icons/bitmap.svg'; diff --git a/src/containers/color-indicator.jsx b/src/containers/color-indicator.jsx index bd119408..10b5faf0 100644 --- a/src/containers/color-indicator.jsx +++ b/src/containers/color-indicator.jsx @@ -5,8 +5,7 @@ import parseColor from 'parse-color'; import {injectIntl, intlShape} from 'react-intl'; import {getSelectedLeafItems} from '../helper/selection'; -import Formats from '../lib/format'; -import {isBitmap} from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; import GradientTypes from '../lib/gradient-types'; import ColorIndicatorComponent from '../components/color-indicator.jsx'; diff --git a/src/containers/fixed-tools.jsx b/src/containers/fixed-tools.jsx index fb5aeb40..8bbaf155 100644 --- a/src/containers/fixed-tools.jsx +++ b/src/containers/fixed-tools.jsx @@ -15,8 +15,7 @@ import {getSelectedLeafItems} from '../helper/selection'; import {bringToFront, sendBackward, sendToBack, bringForward} from '../helper/order'; import {groupSelection, ungroupSelection} from '../helper/group'; -import Formats from '../lib/format'; -import {isBitmap} from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; import bindAll from 'lodash.bindall'; class FixedTools extends React.Component { diff --git a/src/containers/line-mode.jsx b/src/containers/line-mode.jsx index f9043ad4..db4f0976 100644 --- a/src/containers/line-mode.jsx +++ b/src/containers/line-mode.jsx @@ -8,12 +8,11 @@ import ColorStyleProptype from '../lib/color-style-proptype'; import {clearSelection} from '../helper/selection'; import {endPointHit, touching} from '../helper/snapping'; import {drawHitPoint, removeHitPoint} from '../helper/guides'; -import {styleShape} from '../helper/style-path'; +import {styleShape, MIXED} from '../helper/style-path'; import {changeStrokeColor, clearStrokeGradient} from '../reducers/stroke-style'; import {changeStrokeWidth} from '../reducers/stroke-width'; import {changeMode} from '../reducers/modes'; import {clearSelectedItems} from '../reducers/selected-items'; -import {MIXED} from '../helper/style-path'; import {snapDeltaToAngle} from '../helper/math'; import LineModeComponent from '../components/line-mode/line-mode.jsx'; diff --git a/src/containers/mode-tools.jsx b/src/containers/mode-tools.jsx index b3f77c08..95f85229 100644 --- a/src/containers/mode-tools.jsx +++ b/src/containers/mode-tools.jsx @@ -18,8 +18,7 @@ import { import {HANDLE_RATIO, ensureClockwise} from '../helper/math'; import {getRaster} from '../helper/layer'; import {flipBitmapHorizontal, flipBitmapVertical, selectAllBitmap} from '../helper/bitmap'; -import {isBitmap} from '../lib/format'; -import Formats from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; import Modes from '../lib/modes'; class ModeTools extends React.Component { diff --git a/src/containers/paint-editor.jsx b/src/containers/paint-editor.jsx index 1e2d3ac0..cd3d944c 100644 --- a/src/containers/paint-editor.jsx +++ b/src/containers/paint-editor.jsx @@ -23,10 +23,8 @@ import {convertToBitmap, convertToVector} from '../helper/bitmap'; import {resetZoom, zoomOnSelection, OUTERMOST_ZOOM_LEVEL} from '../helper/view'; import EyeDropperTool from '../helper/tools/eye-dropper'; -import Modes from '../lib/modes'; -import {BitmapModes, VectorModes} from '../lib/modes'; -import Formats from '../lib/format'; -import {isBitmap, isVector} from '../lib/format'; +import Modes, {BitmapModes, VectorModes} from '../lib/modes'; +import Formats, {isBitmap, isVector} from '../lib/format'; import bindAll from 'lodash.bindall'; /** diff --git a/src/containers/paper-canvas.jsx b/src/containers/paper-canvas.jsx index 256f864b..2f9de52f 100644 --- a/src/containers/paper-canvas.jsx +++ b/src/containers/paper-canvas.jsx @@ -11,8 +11,10 @@ import {undoSnapshot, clearUndoState} from '../reducers/undo'; import {isGroup, ungroupItems} from '../helper/group'; import {clearRaster, convertBackgroundGuideLayer, getRaster, setupLayers} from '../helper/layer'; import {clearSelectedItems} from '../reducers/selected-items'; -import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT, CENTER, MAX_WORKSPACE_BOUNDS} from '../helper/view'; -import {clampViewBounds, resetZoom, setWorkspaceBounds, zoomToFit, resizeCrosshair} from '../helper/view'; +import { + ART_BOARD_WIDTH, ART_BOARD_HEIGHT, CENTER, MAX_WORKSPACE_BOUNDS, + clampViewBounds, resetZoom, setWorkspaceBounds, zoomToFit, resizeCrosshair +} from '../helper/view'; import {ensureClockwise, scaleWithStrokes} from '../helper/math'; import {clearHoveredItem} from '../reducers/hover'; import {clearPasteOffset} from '../reducers/clipboard'; diff --git a/src/containers/stroke-color-indicator.jsx b/src/containers/stroke-color-indicator.jsx index b912bcc3..eb33393a 100644 --- a/src/containers/stroke-color-indicator.jsx +++ b/src/containers/stroke-color-indicator.jsx @@ -2,9 +2,8 @@ import {connect} from 'react-redux'; import {defineMessages} from 'react-intl'; import {changeColorIndex} from '../reducers/color-index'; -import {changeStrokeColor, changeStrokeColor2} from '../reducers/stroke-style'; +import {changeStrokeColor, changeStrokeColor2, changeStrokeGradientType} from '../reducers/stroke-style'; import {changeStrokeWidth} from '../reducers/stroke-width'; -import {changeStrokeGradientType} from '../reducers/stroke-style'; import {openStrokeColor, closeStrokeColor} from '../reducers/modals'; import {getSelectedLeafItems} from '../helper/selection'; import {setSelectedItems} from '../reducers/selected-items'; diff --git a/src/containers/stroke-width-indicator.jsx b/src/containers/stroke-width-indicator.jsx index ed27ff96..201dedf9 100644 --- a/src/containers/stroke-width-indicator.jsx +++ b/src/containers/stroke-width-indicator.jsx @@ -11,8 +11,7 @@ import {applyColorToSelection, applyStrokeWidthToSelection, getColorsFromSelecti from '../helper/style-path'; import GradientTypes from '../lib/gradient-types'; import Modes from '../lib/modes'; -import Formats from '../lib/format'; -import {isBitmap} from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; class StrokeWidthIndicator extends React.Component { constructor (props) { diff --git a/src/helper/bit-tools/brush-tool.js b/src/helper/bit-tools/brush-tool.js index 495edc06..bca883d9 100644 --- a/src/helper/bit-tools/brush-tool.js +++ b/src/helper/bit-tools/brush-tool.js @@ -1,7 +1,6 @@ import paper from '@scratch/paper'; -import {getRaster} from '../layer'; +import {getRaster, getGuideLayer} from '../layer'; import {forEachLinePoint, getBrushMark} from '../bitmap'; -import {getGuideLayer} from '../layer'; /** * Tool for drawing with the bitmap brush and eraser diff --git a/src/helper/bit-tools/line-tool.js b/src/helper/bit-tools/line-tool.js index 3a2f42d2..1efbce81 100644 --- a/src/helper/bit-tools/line-tool.js +++ b/src/helper/bit-tools/line-tool.js @@ -1,7 +1,6 @@ import paper from '@scratch/paper'; -import {getRaster} from '../layer'; +import {getRaster, createCanvas, getGuideLayer} from '../layer'; import {forEachLinePoint, getBrushMark} from '../bitmap'; -import {createCanvas, getGuideLayer} from '../layer'; import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT} from '../view'; /** diff --git a/src/helper/selection-tools/move-tool.js b/src/helper/selection-tools/move-tool.js index fa62b8b9..97967539 100644 --- a/src/helper/selection-tools/move-tool.js +++ b/src/helper/selection-tools/move-tool.js @@ -1,6 +1,5 @@ import paper from '@scratch/paper'; -import Modes from '../../lib/modes'; -import {BitmapModes} from '../../lib/modes'; +import Modes, {BitmapModes} from '../../lib/modes'; import {isGroup} from '../group'; import {isCompoundPathItem, getRootItem} from '../item'; import {checkPointsClose, snapDeltaToAngle} from '../math'; diff --git a/src/helper/style-path.js b/src/helper/style-path.js index 839a5a07..a9bbce8f 100644 --- a/src/helper/style-path.js +++ b/src/helper/style-path.js @@ -1,8 +1,7 @@ import paper from '@scratch/paper'; -import {getSelectedLeafItems} from './selection'; +import {getSelectedLeafItems, getItems} from './selection'; import {isPointTextItem} from './item'; import {isGroup} from './group'; -import {getItems} from './selection'; import GradientTypes from '../lib/gradient-types'; import {DEFAULT_COLOR} from '../reducers/fill-style'; import {isCompoundPathChild} from '../helper/compound-path'; diff --git a/src/helper/undo.js b/src/helper/undo.js index 9961a16e..97c7b630 100644 --- a/src/helper/undo.js +++ b/src/helper/undo.js @@ -3,8 +3,7 @@ import paper from '@scratch/paper'; import {hideGuideLayers, showGuideLayers, getRaster} from '../helper/layer'; import {getSelectedLeafItems} from '../helper/selection'; -import Formats from '../lib/format'; -import {isVector, isBitmap} from '../lib/format'; +import Formats, {isVector, isBitmap} from '../lib/format'; import log from '../log/log'; /** diff --git a/src/hocs/copy-paste-hoc.jsx b/src/hocs/copy-paste-hoc.jsx index 75f9f3bd..d9a364c5 100644 --- a/src/hocs/copy-paste-hoc.jsx +++ b/src/hocs/copy-paste-hoc.jsx @@ -12,8 +12,7 @@ import { getSelectedRootItems } from '../helper/selection'; import {getTrimmedRaster} from '../helper/bitmap'; -import {isBitmap} from '../lib/format'; -import Formats from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; import Modes from '../lib/modes'; import {clearSelectedItems, setSelectedItems} from '../reducers/selected-items'; diff --git a/src/hocs/keyboard-shortcuts-hoc.jsx b/src/hocs/keyboard-shortcuts-hoc.jsx index deb2449a..c9cc788f 100644 --- a/src/hocs/keyboard-shortcuts-hoc.jsx +++ b/src/hocs/keyboard-shortcuts-hoc.jsx @@ -13,8 +13,7 @@ import {groupSelection, shouldShowGroup, ungroupSelection, shouldShowUngroup} fr import {clearSelectedItems, setSelectedItems} from '../reducers/selected-items'; import {changeMode} from '../reducers/modes'; -import {isBitmap} from '../lib/format'; -import Formats from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; import Modes from '../lib/modes'; const KeyboardShortcutsHOC = function (WrappedComponent) { diff --git a/src/hocs/undo-hoc.jsx b/src/hocs/undo-hoc.jsx index 294d7ea9..e7114437 100644 --- a/src/hocs/undo-hoc.jsx +++ b/src/hocs/undo-hoc.jsx @@ -6,11 +6,12 @@ import {connect} from 'react-redux'; import {getSelectedLeafItems} from '../helper/selection'; import {setSelectedItems} from '../reducers/selected-items'; -import {performUndo, performRedo, shouldShowUndo, shouldShowRedo} from '../helper/undo'; +import { + performUndo, performRedo, shouldShowUndo, shouldShowRedo +} from '../helper/undo'; import {undo, redo} from '../reducers/undo'; -import {isBitmap} from '../lib/format'; -import Formats from '../lib/format'; +import Formats, {isBitmap} from '../lib/format'; const UndoHOC = function (WrappedComponent) { class UndoWrapper extends React.Component { diff --git a/src/hocs/update-image-hoc.jsx b/src/hocs/update-image-hoc.jsx index 0286c827..dae756d2 100644 --- a/src/hocs/update-image-hoc.jsx +++ b/src/hocs/update-image-hoc.jsx @@ -16,13 +16,13 @@ import {commitRectToBitmap, commitOvalToBitmap, commitSelectionToBitmap, getHitB import {performSnapshot} from '../helper/undo'; import {scaleWithStrokes} from '../helper/math'; -import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT, SVG_ART_BOARD_WIDTH, SVG_ART_BOARD_HEIGHT} from '../helper/view'; -import {setWorkspaceBounds} from '../helper/view'; +import { + ART_BOARD_WIDTH, ART_BOARD_HEIGHT, SVG_ART_BOARD_WIDTH, SVG_ART_BOARD_HEIGHT, + setWorkspaceBounds +} from '../helper/view'; -import Modes from '../lib/modes'; -import {BitmapModes} from '../lib/modes'; -import Formats from '../lib/format'; -import {isBitmap, isVector} from '../lib/format'; +import Modes, {BitmapModes} from '../lib/modes'; +import Formats, {isBitmap, isVector} from '../lib/format'; const UpdateImageHOC = function (WrappedComponent) { class UpdateImageWrapper extends React.Component { diff --git a/test/unit/blob-mode-reducer.test.js b/test/unit/blob-mode-reducer.test.js index 845b9111..ab297fd9 100644 --- a/test/unit/blob-mode-reducer.test.js +++ b/test/unit/blob-mode-reducer.test.js @@ -1,8 +1,6 @@ /* eslint-env jest */ -import brushReducer from '../../src/reducers/brush-mode'; -import {changeBrushSize} from '../../src/reducers/brush-mode'; -import eraserReducer from '../../src/reducers/eraser-mode'; -import {changeBrushSize as changeEraserSize} from '../../src/reducers/eraser-mode'; +import brushReducer, {changeBrushSize} from '../../src/reducers/brush-mode'; +import eraserReducer, {changeBrushSize as changeEraserSize} from '../../src/reducers/eraser-mode'; test('initialState', () => { let defaultState; diff --git a/test/unit/clipboard-reducer.test.js b/test/unit/clipboard-reducer.test.js index bb8e060b..efcc9467 100644 --- a/test/unit/clipboard-reducer.test.js +++ b/test/unit/clipboard-reducer.test.js @@ -1,6 +1,7 @@ /* eslint-env jest */ -import clipboardReducer from '../../src/reducers/clipboard'; -import {clearPasteOffset, incrementPasteOffset, setClipboardItems} from '../../src/reducers/clipboard'; +import clipboardReducer, { + clearPasteOffset, incrementPasteOffset, setClipboardItems +} from '../../src/reducers/clipboard'; test('initialState', () => { let defaultState; diff --git a/test/unit/format-reducer.test.js b/test/unit/format-reducer.test.js index 3c1c99c3..9ab955c0 100644 --- a/test/unit/format-reducer.test.js +++ b/test/unit/format-reducer.test.js @@ -1,7 +1,6 @@ /* eslint-env jest */ import Formats from '../../src/lib/format'; -import reducer from '../../src/reducers/format'; -import {changeFormat} from '../../src/reducers/format'; +import reducer, {changeFormat} from '../../src/reducers/format'; import {undo, redo} from '../../src/reducers/undo'; test('initialState', () => { diff --git a/test/unit/hover-reducer.test.js b/test/unit/hover-reducer.test.js index 58f469b8..98a60ec9 100644 --- a/test/unit/hover-reducer.test.js +++ b/test/unit/hover-reducer.test.js @@ -1,6 +1,5 @@ /* eslint-env jest */ -import reducer from '../../src/reducers/hover'; -import {clearHoveredItem, setHoveredItem} from '../../src/reducers/hover'; +import reducer, {clearHoveredItem, setHoveredItem} from '../../src/reducers/hover'; test('initialState', () => { let defaultState; diff --git a/test/unit/modes-reducer.test.js b/test/unit/modes-reducer.test.js index 88d0177e..adee5c89 100644 --- a/test/unit/modes-reducer.test.js +++ b/test/unit/modes-reducer.test.js @@ -1,7 +1,6 @@ /* eslint-env jest */ import Modes from '../../src/lib/modes'; -import reducer from '../../src/reducers/modes'; -import {changeMode} from '../../src/reducers/modes'; +import reducer, {changeMode} from '../../src/reducers/modes'; test('initialState', () => { let defaultState; diff --git a/test/unit/selected-items-reducer.test.js b/test/unit/selected-items-reducer.test.js index d4a30ba8..c3645eb7 100644 --- a/test/unit/selected-items-reducer.test.js +++ b/test/unit/selected-items-reducer.test.js @@ -1,6 +1,7 @@ /* eslint-env jest */ -import selectedItemsReducer from '../../src/reducers/selected-items'; -import {setSelectedItems, clearSelectedItems} from '../../src/reducers/selected-items'; +import selectedItemsReducer, { + setSelectedItems, clearSelectedItems +} from '../../src/reducers/selected-items'; test('initialState', () => { let defaultState; diff --git a/test/unit/stroke-width-reducer.test.js b/test/unit/stroke-width-reducer.test.js index 3218a4bf..601b5723 100644 --- a/test/unit/stroke-width-reducer.test.js +++ b/test/unit/stroke-width-reducer.test.js @@ -1,6 +1,7 @@ /* eslint-env jest */ -import strokeWidthReducer from '../../src/reducers/stroke-width'; -import {MAX_STROKE_WIDTH, changeStrokeWidth} from '../../src/reducers/stroke-width'; +import strokeWidthReducer, { + MAX_STROKE_WIDTH, changeStrokeWidth +} from '../../src/reducers/stroke-width'; import {setSelectedItems} from '../../src/reducers/selected-items'; import {mockPaperRootItem} from '../__mocks__/paperMocks'; diff --git a/test/unit/undo-reducer.test.js b/test/unit/undo-reducer.test.js index e5332e38..2701075f 100644 --- a/test/unit/undo-reducer.test.js +++ b/test/unit/undo-reducer.test.js @@ -1,6 +1,7 @@ /* eslint-env jest */ -import undoReducer from '../../src/reducers/undo'; -import {undoSnapshot, undo, redo, clearUndoState, MAX_STACK_SIZE} from '../../src/reducers/undo'; +import undoReducer, { + undoSnapshot, undo, redo, clearUndoState, MAX_STACK_SIZE +} from '../../src/reducers/undo'; test('initialState', () => { let defaultState; From fc5355b294bbeccf1b759a30cecd8f99d689c7b1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 10 Feb 2021 03:26:30 +0000 Subject: [PATCH 25/45] Bump scratch-l10n from 3.11.20210209031515 to 3.11.20210210031517 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210209031515 to 3.11.20210210031517. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210209031515...3.11.20210210031517) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 45bda35c..08f437a6 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210209031515", + "scratch-l10n": "3.11.20210210031517", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 82006d870c10119216d899891d0d4d49b0157804 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 11 Feb 2021 03:25:14 +0000 Subject: [PATCH 26/45] Bump scratch-l10n from 3.11.20210210031517 to 3.11.20210211031450 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210210031517 to 3.11.20210211031450. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210210031517...3.11.20210211031450) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c041b4b4..6edd16bc 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210210031517", + "scratch-l10n": "3.11.20210211031450", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 67a8be7745b7ecec2211b368914f82411f353b66 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 12 Feb 2021 03:38:16 +0000 Subject: [PATCH 27/45] Bump scratch-l10n from 3.11.20210211031450 to 3.11.20210212031452 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210211031450 to 3.11.20210212031452. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210211031450...3.11.20210212031452) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6edd16bc..aabaa111 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210211031450", + "scratch-l10n": "3.11.20210212031452", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 612b3e32b77634d64bda50fabbb204cea74d846d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 13 Feb 2021 03:20:04 +0000 Subject: [PATCH 28/45] Bump scratch-l10n from 3.11.20210212031452 to 3.11.20210213031518 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210212031452 to 3.11.20210213031518. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210212031452...3.11.20210213031518) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aabaa111..bec0bbb0 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210212031452", + "scratch-l10n": "3.11.20210213031518", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 1307ca87242d41666a74f7cb5fc2ccda416c5a45 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 14 Feb 2021 03:19:17 +0000 Subject: [PATCH 29/45] Bump scratch-l10n from 3.11.20210213031518 to 3.11.20210214031439 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210213031518 to 3.11.20210214031439. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210213031518...3.11.20210214031439) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bec0bbb0..8c4c747e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210213031518", + "scratch-l10n": "3.11.20210214031439", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 0ae8931ccfac01ab8fc58cf86adbcf1bbeca257a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 15 Feb 2021 03:47:15 +0000 Subject: [PATCH 30/45] Bump scratch-l10n from 3.11.20210214031439 to 3.11.20210215031459 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210214031439 to 3.11.20210215031459. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210214031439...3.11.20210215031459) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c4c747e..661b3ce2 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210214031439", + "scratch-l10n": "3.11.20210215031459", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 879acca6758c6acbd0c13249772ba56dcee40cd4 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 16 Feb 2021 03:28:36 +0000 Subject: [PATCH 31/45] Bump scratch-l10n from 3.11.20210215031459 to 3.11.20210216031500 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210215031459 to 3.11.20210216031500. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210215031459...3.11.20210216031500) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 661b3ce2..49c974dd 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210215031459", + "scratch-l10n": "3.11.20210216031500", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From c9282d2efab5642f12d315408bc552ebb1c6a659 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 17 Feb 2021 03:34:33 +0000 Subject: [PATCH 32/45] Bump scratch-l10n from 3.11.20210216031500 to 3.11.20210217031507 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210216031500 to 3.11.20210217031507. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210216031500...3.11.20210217031507) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49c974dd..84a81cfc 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210216031500", + "scratch-l10n": "3.11.20210217031507", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From b70c1e699f3b35f90f2c6a8e5a918e024f3d6d0e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 20 Feb 2021 03:19:35 +0000 Subject: [PATCH 33/45] Bump scratch-l10n from 3.11.20210217031507 to 3.11.20210220031503 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210217031507 to 3.11.20210220031503. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210217031507...3.11.20210220031503) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 84a81cfc..6bc9bb11 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210217031507", + "scratch-l10n": "3.11.20210220031503", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 178a681cc108a9e9168a4df3727cfd8e5d2e4150 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 21 Feb 2021 03:19:01 +0000 Subject: [PATCH 34/45] Bump scratch-l10n from 3.11.20210220031503 to 3.11.20210221031425 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210220031503 to 3.11.20210221031425. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210220031503...3.11.20210221031425) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6bc9bb11..2eaeae61 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210220031503", + "scratch-l10n": "3.11.20210221031425", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 932055f0f4a5d2cbe435a3a18b32de7964a81f52 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 24 Feb 2021 03:25:35 +0000 Subject: [PATCH 35/45] Bump scratch-l10n from 3.11.20210221031425 to 3.11.20210224031506 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210221031425 to 3.11.20210224031506. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210221031425...3.11.20210224031506) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2eaeae61..ee3e50ce 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210221031425", + "scratch-l10n": "3.11.20210224031506", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 22d6ff58ea2e8b39333a93b8036d99ae9bb6b26c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 25 Feb 2021 03:42:13 +0000 Subject: [PATCH 36/45] Bump scratch-l10n from 3.11.20210224031506 to 3.11.20210225031524 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210224031506 to 3.11.20210225031524. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210224031506...3.11.20210225031524) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee3e50ce..e8a01bec 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210224031506", + "scratch-l10n": "3.11.20210225031524", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 333e174fe94816fde904a41797fe7563f6368788 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 26 Feb 2021 03:40:32 +0000 Subject: [PATCH 37/45] Bump scratch-l10n from 3.11.20210225031524 to 3.11.20210226031520 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210225031524 to 3.11.20210226031520. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210225031524...3.11.20210226031520) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e8a01bec..cdb79414 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210225031524", + "scratch-l10n": "3.11.20210226031520", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 866f51023b49ce1bb6290353ee5a6ab4fd46dddc Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 27 Feb 2021 03:18:48 +0000 Subject: [PATCH 38/45] Bump scratch-l10n from 3.11.20210226031520 to 3.11.20210227031502 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210226031520 to 3.11.20210227031502. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210226031520...3.11.20210227031502) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cdb79414..6aa58842 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210226031520", + "scratch-l10n": "3.11.20210227031502", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 04c8fc70516e35c4eeb7c8986272388d95caa19a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 03:47:12 +0000 Subject: [PATCH 39/45] Bump scratch-l10n from 3.11.20210227031502 to 3.11.20210301031451 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210227031502 to 3.11.20210301031451. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210227031502...3.11.20210301031451) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6aa58842..e23cbbfc 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210227031502", + "scratch-l10n": "3.11.20210301031451", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From af102fc6f9950febe6ee9ef483772542d9ff2223 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 3 Mar 2021 03:29:16 +0000 Subject: [PATCH 40/45] Bump scratch-l10n from 3.11.20210301031451 to 3.11.20210303031534 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210301031451 to 3.11.20210303031534. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210301031451...3.11.20210303031534) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e23cbbfc..e9cc3b5e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210301031451", + "scratch-l10n": "3.11.20210303031534", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From d89ee19c31033386b5f2ddd66158e29c10c4ace2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 4 Mar 2021 03:24:46 +0000 Subject: [PATCH 41/45] Bump scratch-l10n from 3.11.20210303031534 to 3.11.20210304031526 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210303031534 to 3.11.20210304031526. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210303031534...3.11.20210304031526) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9cc3b5e..7f3ab14d 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210303031534", + "scratch-l10n": "3.11.20210304031526", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From c853dbb7705fc71c129f249d51c4255f7eb76c81 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 5 Mar 2021 03:29:44 +0000 Subject: [PATCH 42/45] Bump scratch-l10n from 3.11.20210304031526 to 3.11.20210305031531 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210304031526 to 3.11.20210305031531. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210304031526...3.11.20210305031531) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7f3ab14d..9b72de8b 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210304031526", + "scratch-l10n": "3.11.20210305031531", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 072df967c593cc6f1b685bd94cd09d0b2a0de87b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 6 Mar 2021 03:18:29 +0000 Subject: [PATCH 43/45] Bump scratch-l10n from 3.11.20210305031531 to 3.11.20210306031505 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210305031531 to 3.11.20210306031505. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210305031531...3.11.20210306031505) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9b72de8b..8b3d17bf 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210305031531", + "scratch-l10n": "3.11.20210306031505", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From 6f9bbc09d964d546c4051d0f7655742a57c49c94 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 7 Mar 2021 03:18:33 +0000 Subject: [PATCH 44/45] Bump scratch-l10n from 3.11.20210306031505 to 3.11.20210307031517 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210306031505 to 3.11.20210307031517. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210306031505...3.11.20210307031517) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b3d17bf..79b1d8ac 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210306031505", + "scratch-l10n": "3.11.20210307031517", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3", From d475585c125e6f11c795116219aae646ddd353e1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 8 Mar 2021 03:42:19 +0000 Subject: [PATCH 45/45] Bump scratch-l10n from 3.11.20210307031517 to 3.11.20210308031514 Bumps [scratch-l10n](https://github.com/LLK/scratch-l10n) from 3.11.20210307031517 to 3.11.20210308031514. - [Release notes](https://github.com/LLK/scratch-l10n/releases) - [Commits](https://github.com/LLK/scratch-l10n/compare/3.11.20210307031517...3.11.20210308031514) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 79b1d8ac..1774af93 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "redux-throttle": "0.1.1", "regenerator-runtime": "^0.13.3", "rimraf": "^2.6.1", - "scratch-l10n": "3.11.20210307031517", + "scratch-l10n": "3.11.20210308031514", "style-loader": "^1.0.0", "svg-url-loader": "^3.0.0", "tap": "^14.4.3",