From 614f334935d81b7bb86beeb2b011e2a564796915 Mon Sep 17 00:00:00 2001 From: Muffin Date: Tue, 16 Jul 2024 17:59:29 -0500 Subject: [PATCH] Replace @scratch/paper with @turbowarp/paper --- package-lock.json | 18 +++++++++--------- package.json | 2 +- src/components/paint-editor/paint-editor.jsx | 2 +- src/containers/bit-oval-mode.jsx | 2 +- src/containers/bit-rect-mode.jsx | 2 +- src/containers/bit-select-mode.jsx | 2 +- src/containers/color-picker.jsx | 2 +- src/containers/font-dropdown.jsx | 2 +- src/containers/line-mode.jsx | 2 +- src/containers/mode-tools.jsx | 2 +- src/containers/oval-mode.jsx | 2 +- src/containers/paint-editor.jsx | 2 +- src/containers/paper-canvas.jsx | 2 +- src/containers/rect-mode.jsx | 2 +- src/containers/scrollable-canvas.jsx | 2 +- src/containers/select-mode.jsx | 2 +- src/containers/text-mode.jsx | 2 +- src/helper/bit-tools/brush-tool.js | 2 +- src/helper/bit-tools/fill-tool.js | 2 +- src/helper/bit-tools/line-tool.js | 2 +- src/helper/bit-tools/oval-tool.js | 2 +- src/helper/bit-tools/rect-tool.js | 2 +- src/helper/bit-tools/select-tool.js | 2 +- src/helper/bitmap.js | 2 +- src/helper/blob-tools/blob.js | 2 +- src/helper/blob-tools/broad-brush-helper.js | 2 +- src/helper/blob-tools/segment-brush-helper.js | 2 +- src/helper/group.js | 2 +- src/helper/guides.js | 2 +- src/helper/hover.js | 2 +- src/helper/item.js | 2 +- src/helper/layer.js | 2 +- src/helper/math.js | 2 +- .../selection-tools/bounding-box-tool.js | 2 +- src/helper/selection-tools/move-tool.js | 2 +- src/helper/selection-tools/nudge-tool.js | 2 +- src/helper/selection-tools/reshape-tool.js | 2 +- src/helper/selection-tools/rotate-tool.js | 2 +- src/helper/selection-tools/scale-tool.js | 2 +- src/helper/selection-tools/select-tool.js | 2 +- .../selection-tools/selection-box-tool.js | 2 +- src/helper/selection.js | 2 +- src/helper/snapping.js | 2 +- src/helper/style-path.js | 2 +- src/helper/tools/eye-dropper.js | 2 +- src/helper/tools/fill-tool.js | 2 +- src/helper/tools/oval-tool.js | 2 +- src/helper/tools/rect-tool.js | 2 +- src/helper/tools/rounded-rect-tool.js | 2 +- src/helper/tools/text-tool.js | 2 +- src/helper/undo.js | 2 +- src/helper/view.js | 2 +- src/hocs/copy-paste-hoc.jsx | 2 +- src/hocs/selection-hoc.jsx | 2 +- src/hocs/update-image-hoc.jsx | 2 +- src/reducers/fill-bitmap-shapes.js | 2 +- src/reducers/view-bounds.js | 2 +- src/reducers/zoom-levels.js | 2 +- 58 files changed, 66 insertions(+), 66 deletions(-) diff --git a/package-lock.json b/package-lock.json index 100428c854..f6b2759b89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "2.1.61", "license": "GPL-3.0", "dependencies": { - "@scratch/paper": "0.11.20221201200345", "@turbowarp/nanolog": "^0.2.0", + "@turbowarp/paper": "^0.12.202407161743", "classnames": "2.2.5", "keymirror": "0.1.1", "lodash.bindall": "4.4.0", @@ -3885,14 +3885,6 @@ "node": ">= 8" } }, - "node_modules/@scratch/paper": { - "version": "0.11.20221201200345", - "resolved": "https://registry.npmjs.org/@scratch/paper/-/paper-0.11.20221201200345.tgz", - "integrity": "sha512-I3BZNrHeaQJt2H6TD7HGsuBKJPDDF/BIDOaRvnN7Gj/QBRvpSaRK8JAmzcrRHZ+AqNtKrG50eOkS/acMjTw3rw==", - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -3984,6 +3976,14 @@ "resolved": "https://registry.npmjs.org/@turbowarp/nanolog/-/nanolog-0.2.0.tgz", "integrity": "sha512-texcM9oxfEsADVlVDR5UhLkYclPKsV9mytJh+9pHHonNcUrxRVGF6FkJTzWO/Hl5NafU1crSdw737nqKE3atSA==" }, + "node_modules/@turbowarp/paper": { + "version": "0.12.202407161743", + "resolved": "https://registry.npmjs.org/@turbowarp/paper/-/paper-0.12.202407161743.tgz", + "integrity": "sha512-1RRB5t3majOxkftiSr15P+aYaCDdW6vfpKAofgEz/o7b46teChqGeTC8ZQKvXmfldfomUX9jowid33xafszJnA==", + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", diff --git a/package.json b/package.json index 1a3bd8baf9..e8b218c1f0 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "url": "https://github.com/LLK/scratch-paint.git" }, "dependencies": { - "@scratch/paper": "0.11.20221201200345", "@turbowarp/nanolog": "^0.2.0", + "@turbowarp/paper": "^0.12.202407161743", "classnames": "2.2.5", "keymirror": "0.1.1", "lodash.bindall": "4.4.0", diff --git a/src/components/paint-editor/paint-editor.jsx b/src/components/paint-editor/paint-editor.jsx index bc196260b2..7cc83083ac 100644 --- a/src/components/paint-editor/paint-editor.jsx +++ b/src/components/paint-editor/paint-editor.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import classNames from 'classnames'; import {defineMessages, injectIntl, intlShape} from 'react-intl'; import React from 'react'; diff --git a/src/containers/bit-oval-mode.jsx b/src/containers/bit-oval-mode.jsx index bf3ae380c1..639c2f3b40 100644 --- a/src/containers/bit-oval-mode.jsx +++ b/src/containers/bit-oval-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/bit-rect-mode.jsx b/src/containers/bit-rect-mode.jsx index 6263953a6b..0604a07e5c 100644 --- a/src/containers/bit-rect-mode.jsx +++ b/src/containers/bit-rect-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/bit-select-mode.jsx b/src/containers/bit-select-mode.jsx index 7f049b1416..277aca540b 100644 --- a/src/containers/bit-select-mode.jsx +++ b/src/containers/bit-select-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/color-picker.jsx b/src/containers/color-picker.jsx index 1ea4774462..444c950599 100644 --- a/src/containers/color-picker.jsx +++ b/src/containers/color-picker.jsx @@ -1,6 +1,6 @@ import bindAll from 'lodash.bindall'; import {connect} from 'react-redux'; -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import parseColor from 'parse-color'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/containers/font-dropdown.jsx b/src/containers/font-dropdown.jsx index b36a9b5c1d..5557c19aab 100644 --- a/src/containers/font-dropdown.jsx +++ b/src/containers/font-dropdown.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {connect} from 'react-redux'; import bindAll from 'lodash.bindall'; import PropTypes from 'prop-types'; diff --git a/src/containers/line-mode.jsx b/src/containers/line-mode.jsx index db4f09766e..023a4c1cc3 100644 --- a/src/containers/line-mode.jsx +++ b/src/containers/line-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/mode-tools.jsx b/src/containers/mode-tools.jsx index da3d8cda17..874fc95af4 100644 --- a/src/containers/mode-tools.jsx +++ b/src/containers/mode-tools.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import React from 'react'; import PropTypes from 'prop-types'; import {connect} from 'react-redux'; diff --git a/src/containers/oval-mode.jsx b/src/containers/oval-mode.jsx index da8d441550..860743b0ec 100644 --- a/src/containers/oval-mode.jsx +++ b/src/containers/oval-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/paint-editor.jsx b/src/containers/paint-editor.jsx index 07287d1c19..03d976a067 100644 --- a/src/containers/paint-editor.jsx +++ b/src/containers/paint-editor.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import log from '../log/log'; import React from 'react'; diff --git a/src/containers/paper-canvas.jsx b/src/containers/paper-canvas.jsx index 233285a447..b6ffbb53fd 100644 --- a/src/containers/paper-canvas.jsx +++ b/src/containers/paper-canvas.jsx @@ -2,7 +2,7 @@ import bindAll from 'lodash.bindall'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Formats from '../lib/format'; import log from '../log/log'; diff --git a/src/containers/rect-mode.jsx b/src/containers/rect-mode.jsx index 887f32f2f0..872316b17e 100644 --- a/src/containers/rect-mode.jsx +++ b/src/containers/rect-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/scrollable-canvas.jsx b/src/containers/scrollable-canvas.jsx index 9d34feb2d5..198676609f 100644 --- a/src/containers/scrollable-canvas.jsx +++ b/src/containers/scrollable-canvas.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/containers/select-mode.jsx b/src/containers/select-mode.jsx index 1f9726bf09..99c38b3093 100644 --- a/src/containers/select-mode.jsx +++ b/src/containers/select-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/containers/text-mode.jsx b/src/containers/text-mode.jsx index 38e51a1ea7..5a67cd4813 100644 --- a/src/containers/text-mode.jsx +++ b/src/containers/text-mode.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/helper/bit-tools/brush-tool.js b/src/helper/bit-tools/brush-tool.js index ed6229cfbe..eebdca3f50 100644 --- a/src/helper/bit-tools/brush-tool.js +++ b/src/helper/bit-tools/brush-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getRaster, getGuideLayer, createCanvas} from '../layer'; import {doesColorRequireMask, forEachLinePoint, getBrushMark} from '../bitmap'; diff --git a/src/helper/bit-tools/fill-tool.js b/src/helper/bit-tools/fill-tool.js index 4320e2ef6b..05aed28105 100644 --- a/src/helper/bit-tools/fill-tool.js +++ b/src/helper/bit-tools/fill-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {floodFill, floodFillAll, getHitBounds} from '../bitmap'; import {createGradientObject} from '../style-path'; import {createCanvas, getRaster} from '../layer'; diff --git a/src/helper/bit-tools/line-tool.js b/src/helper/bit-tools/line-tool.js index ba3cacbf7b..cb01e5a8b9 100644 --- a/src/helper/bit-tools/line-tool.js +++ b/src/helper/bit-tools/line-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getRaster, createCanvas, getGuideLayer} from '../layer'; import {createMaskingCanvas, forEachLinePoint, getBrushMark} from '../bitmap'; import {ART_BOARD_WIDTH, ART_BOARD_HEIGHT} from '../view'; diff --git a/src/helper/bit-tools/oval-tool.js b/src/helper/bit-tools/oval-tool.js index f13f595b69..e35932acc1 100644 --- a/src/helper/bit-tools/oval-tool.js +++ b/src/helper/bit-tools/oval-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../../lib/modes'; import {styleShape} from '../style-path'; import {commitOvalToBitmap} from '../bitmap'; diff --git a/src/helper/bit-tools/rect-tool.js b/src/helper/bit-tools/rect-tool.js index e31aeedbaa..5cffab9d75 100644 --- a/src/helper/bit-tools/rect-tool.js +++ b/src/helper/bit-tools/rect-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../../lib/modes'; import {styleShape} from '../../helper/style-path'; import {commitRectToBitmap} from '../bitmap'; diff --git a/src/helper/bit-tools/select-tool.js b/src/helper/bit-tools/select-tool.js index b9ec8151ce..d7b17af2ee 100644 --- a/src/helper/bit-tools/select-tool.js +++ b/src/helper/bit-tools/select-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../../lib/modes'; import {getRaster} from '../layer'; diff --git a/src/helper/bitmap.js b/src/helper/bitmap.js index 29a741ffc7..056f4b96b2 100644 --- a/src/helper/bitmap.js +++ b/src/helper/bitmap.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {createCanvas, clearRaster, getRaster, hideGuideLayers, showGuideLayers} from './layer'; import {getGuideColor} from './guides'; import {clearSelection} from './selection'; diff --git a/src/helper/blob-tools/blob.js b/src/helper/blob-tools/blob.js index d6ad99a7df..9df8940336 100644 --- a/src/helper/blob-tools/blob.js +++ b/src/helper/blob-tools/blob.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import log from '../../log/log'; import BroadBrushHelper from './broad-brush-helper'; import SegmentBrushHelper from './segment-brush-helper'; diff --git a/src/helper/blob-tools/broad-brush-helper.js b/src/helper/blob-tools/broad-brush-helper.js index be69cb6e15..e58d1aa7a0 100644 --- a/src/helper/blob-tools/broad-brush-helper.js +++ b/src/helper/blob-tools/broad-brush-helper.js @@ -1,5 +1,5 @@ // Broadbrush based on http://paperjs.org/tutorials/interaction/working-with-mouse-vectors/ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {styleBlob} from '../../helper/style-path'; import log from '../../log/log'; diff --git a/src/helper/blob-tools/segment-brush-helper.js b/src/helper/blob-tools/segment-brush-helper.js index 54b64a6b30..14fc01576d 100644 --- a/src/helper/blob-tools/segment-brush-helper.js +++ b/src/helper/blob-tools/segment-brush-helper.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {styleBlob} from '../../helper/style-path'; /** diff --git a/src/helper/group.js b/src/helper/group.js index a5379fa57a..c7a8e715f8 100644 --- a/src/helper/group.js +++ b/src/helper/group.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getRootItem, isGroupItem} from './item'; import {clearSelection, getSelectedRootItems, setItemSelection} from './selection'; diff --git a/src/helper/guides.js b/src/helper/guides.js index e91e25b596..0d3fba65d8 100644 --- a/src/helper/guides.js +++ b/src/helper/guides.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getGuideLayer} from './layer'; import {getAllRootItems} from './selection'; diff --git a/src/helper/hover.js b/src/helper/hover.js index 60b97aeaa3..9dae1bf36b 100644 --- a/src/helper/hover.js +++ b/src/helper/hover.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {isBoundsItem, getRootItem} from './item'; import {hoverBounds, hoverItem} from './guides'; import {isGroupChild} from './group'; diff --git a/src/helper/item.js b/src/helper/item.js index 51e8e5bfcf..93af77acf9 100644 --- a/src/helper/item.js +++ b/src/helper/item.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; const getRootItem = function (item) { if (item.parent.className === 'Layer') { diff --git a/src/helper/layer.js b/src/helper/layer.js index ace6494695..13d891f2f5 100644 --- a/src/helper/layer.js +++ b/src/helper/layer.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import log from '../log/log'; import {ART_BOARD_BOUNDS, ART_BOARD_WIDTH, ART_BOARD_HEIGHT, CENTER, MAX_WORKSPACE_BOUNDS} from './view'; import {isGroupItem} from './item'; diff --git a/src/helper/math.js b/src/helper/math.js index 41f8d66887..c45de218a5 100644 --- a/src/helper/math.js +++ b/src/helper/math.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; /** The ratio of the curve length to use for the handle length to convert squares into approximately circles. */ const HANDLE_RATIO = 0.3902628565; diff --git a/src/helper/selection-tools/bounding-box-tool.js b/src/helper/selection-tools/bounding-box-tool.js index 6922b74f46..387216f854 100644 --- a/src/helper/selection-tools/bounding-box-tool.js +++ b/src/helper/selection-tools/bounding-box-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import keyMirror from 'keymirror'; import {getSelectedRootItems} from '../selection'; diff --git a/src/helper/selection-tools/move-tool.js b/src/helper/selection-tools/move-tool.js index f9f5004854..27f9bf65dc 100644 --- a/src/helper/selection-tools/move-tool.js +++ b/src/helper/selection-tools/move-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes, {BitmapModes} from '../../lib/modes'; import {isGroup} from '../group'; import {isCompoundPathItem, getRootItem} from '../item'; diff --git a/src/helper/selection-tools/nudge-tool.js b/src/helper/selection-tools/nudge-tool.js index 8705971476..e6cba768ec 100644 --- a/src/helper/selection-tools/nudge-tool.js +++ b/src/helper/selection-tools/nudge-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getSelectedRootItems} from '../selection'; import {getActionBounds} from '../view'; import {BitmapModes} from '../../lib/modes'; diff --git a/src/helper/selection-tools/reshape-tool.js b/src/helper/selection-tools/reshape-tool.js index f8ead41c15..b8b23650e1 100644 --- a/src/helper/selection-tools/reshape-tool.js +++ b/src/helper/selection-tools/reshape-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import log from '../../log/log'; import keyMirror from 'keymirror'; diff --git a/src/helper/selection-tools/rotate-tool.js b/src/helper/selection-tools/rotate-tool.js index 6308d05e33..38fb6fa87c 100644 --- a/src/helper/selection-tools/rotate-tool.js +++ b/src/helper/selection-tools/rotate-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; /** * Tool to handle rotation when dragging the rotation handle in the bounding box tool. diff --git a/src/helper/selection-tools/scale-tool.js b/src/helper/selection-tools/scale-tool.js index 1b27eaeb67..bfa190bad0 100644 --- a/src/helper/selection-tools/scale-tool.js +++ b/src/helper/selection-tools/scale-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getItems} from '../selection'; import {getActionBounds} from '../view'; import {BitmapModes} from '../../lib/modes'; diff --git a/src/helper/selection-tools/select-tool.js b/src/helper/selection-tools/select-tool.js index 5bce77d7a4..e475cdc2ac 100644 --- a/src/helper/selection-tools/select-tool.js +++ b/src/helper/selection-tools/select-tool.js @@ -5,7 +5,7 @@ import {selectRootItem} from '../selection'; import BoundingBoxTool from './bounding-box-tool'; import NudgeTool from './nudge-tool'; import SelectionBoxTool from './selection-box-tool'; -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; /** * paper.Tool that handles select mode. This is made up of 2 subtools. diff --git a/src/helper/selection-tools/selection-box-tool.js b/src/helper/selection-tools/selection-box-tool.js index 00361df041..39de8bdc5a 100644 --- a/src/helper/selection-tools/selection-box-tool.js +++ b/src/helper/selection-tools/selection-box-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {rectSelect} from '../guides'; import {clearSelection, processRectangularSelection} from '../selection'; import {getRaster} from '../layer'; diff --git a/src/helper/selection.js b/src/helper/selection.js index 6b34954b08..7f02cec925 100644 --- a/src/helper/selection.js +++ b/src/helper/selection.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../lib/modes'; import {getItemsGroup, isGroup} from './group'; diff --git a/src/helper/snapping.js b/src/helper/snapping.js index 95d004016f..2a4a3e9bd3 100644 --- a/src/helper/snapping.js +++ b/src/helper/snapping.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getItems} from './selection'; /** diff --git a/src/helper/style-path.js b/src/helper/style-path.js index 6ba286a61e..e05aabc17a 100644 --- a/src/helper/style-path.js +++ b/src/helper/style-path.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getSelectedLeafItems, getItems} from './selection'; import {isPointTextItem} from './item'; import {isGroup} from './group'; diff --git a/src/helper/tools/eye-dropper.js b/src/helper/tools/eye-dropper.js index 3bb465e68f..e96e77acb5 100644 --- a/src/helper/tools/eye-dropper.js +++ b/src/helper/tools/eye-dropper.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {createCanvas, getRaster, getBackgroundGuideLayer} from '../layer'; const LOUPE_RADIUS = 20; diff --git a/src/helper/tools/fill-tool.js b/src/helper/tools/fill-tool.js index 65eae0fd47..db3f7a7107 100644 --- a/src/helper/tools/fill-tool.js +++ b/src/helper/tools/fill-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {getHoveredItem} from '../hover'; import {expandBy} from '../math'; import {createGradientObject} from '../style-path'; diff --git a/src/helper/tools/oval-tool.js b/src/helper/tools/oval-tool.js index f1d3208a49..9926a75eb1 100644 --- a/src/helper/tools/oval-tool.js +++ b/src/helper/tools/oval-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../../lib/modes'; import {styleShape} from '../style-path'; import {clearSelection} from '../selection'; diff --git a/src/helper/tools/rect-tool.js b/src/helper/tools/rect-tool.js index 3ac9f9fa40..3bd84a0a25 100644 --- a/src/helper/tools/rect-tool.js +++ b/src/helper/tools/rect-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../../lib/modes'; import {styleShape} from '../style-path'; import {clearSelection} from '../selection'; diff --git a/src/helper/tools/rounded-rect-tool.js b/src/helper/tools/rounded-rect-tool.js index edea7daf33..25ada6bb68 100644 --- a/src/helper/tools/rounded-rect-tool.js +++ b/src/helper/tools/rounded-rect-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import log from '../../log/log'; /** diff --git a/src/helper/tools/text-tool.js b/src/helper/tools/text-tool.js index e42f745d2c..0cb920d5ea 100644 --- a/src/helper/tools/text-tool.js +++ b/src/helper/tools/text-tool.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import Modes from '../../lib/modes'; import {clearSelection, getSelectedLeafItems} from '../selection'; import BoundingBoxTool from '../selection-tools/bounding-box-tool'; diff --git a/src/helper/undo.js b/src/helper/undo.js index 97c7b63022..bca328e6dd 100644 --- a/src/helper/undo.js +++ b/src/helper/undo.js @@ -1,6 +1,6 @@ // undo functionality // modifed from https://github.com/memononen/stylii -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {hideGuideLayers, showGuideLayers, getRaster} from '../helper/layer'; import {getSelectedLeafItems} from '../helper/selection'; import Formats, {isVector, isBitmap} from '../lib/format'; diff --git a/src/helper/view.js b/src/helper/view.js index e9c303d64b..25a2e9e0d4 100644 --- a/src/helper/view.js +++ b/src/helper/view.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {CROSSHAIR_SIZE, getBackgroundGuideLayer, getDragCrosshairLayer, getRaster} from './layer'; import {getAllRootItems, getSelectedRootItems} from './selection'; import {getHitBounds} from './bitmap'; diff --git a/src/hocs/copy-paste-hoc.jsx b/src/hocs/copy-paste-hoc.jsx index d9a364c594..aeebbdaf60 100644 --- a/src/hocs/copy-paste-hoc.jsx +++ b/src/hocs/copy-paste-hoc.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import bindAll from 'lodash.bindall'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/hocs/selection-hoc.jsx b/src/hocs/selection-hoc.jsx index 4aa3ab8e10..6dce3ddfdb 100644 --- a/src/hocs/selection-hoc.jsx +++ b/src/hocs/selection-hoc.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import React from 'react'; diff --git a/src/hocs/update-image-hoc.jsx b/src/hocs/update-image-hoc.jsx index bbf2b83907..8411f8e1f7 100644 --- a/src/hocs/update-image-hoc.jsx +++ b/src/hocs/update-image-hoc.jsx @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import PropTypes from 'prop-types'; import log from '../log/log'; import bindAll from 'lodash.bindall'; diff --git a/src/reducers/fill-bitmap-shapes.js b/src/reducers/fill-bitmap-shapes.js index da901e5290..a0d9a4037c 100644 --- a/src/reducers/fill-bitmap-shapes.js +++ b/src/reducers/fill-bitmap-shapes.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import {CHANGE_SELECTED_ITEMS} from './selected-items'; const SET_FILLED = 'scratch-paint/fill-bitmap-shapes/SET_FILLED'; diff --git a/src/reducers/view-bounds.js b/src/reducers/view-bounds.js index 1fc0c6b575..cb25fcbcdc 100644 --- a/src/reducers/view-bounds.js +++ b/src/reducers/view-bounds.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import log from '../log/log'; const UPDATE_VIEW_BOUNDS = 'scratch-paint/view/UPDATE_VIEW_BOUNDS'; diff --git a/src/reducers/zoom-levels.js b/src/reducers/zoom-levels.js index 7d21bf9c25..44018572af 100644 --- a/src/reducers/zoom-levels.js +++ b/src/reducers/zoom-levels.js @@ -1,4 +1,4 @@ -import paper from '@scratch/paper'; +import paper from '@turbowarp/paper'; import log from '../log/log'; const SAVE_ZOOM_LEVEL = 'scratch-paint/zoom-levels/SAVE_ZOOM_LEVEL';