From f613c2b68d76df121d3a8c3d72ea4d7d865119ad Mon Sep 17 00:00:00 2001 From: casper Date: Thu, 20 May 2021 04:16:53 +0200 Subject: [PATCH] simplify imports --- package-lock.json | 36 +++++++++---------- package.json | 4 +-- src/actions/index.js | 2 +- src/components/App.js | 2 +- src/components/D2Panel.js | 2 +- src/components/InputText.js | 2 +- src/d2/EraserPointer.js | 2 +- src/d2/EventGroup.js | 4 +-- src/d2/Grid.js | 2 +- src/d2/ImageShape.js | 2 +- src/d2/Shape.js | 2 +- src/d2/TolerancePointer.js | 2 +- src/d2/texts.js | 2 +- src/d2/tools/BaseTool.js | 4 +-- src/d2/tools/BrushTool.js | 2 +- src/d2/tools/CircleTool.js | 2 +- src/d2/tools/PhotoGuideTool.js | 2 +- src/d2/tools/PolygonTool.js | 2 +- src/d2/tools/TransformTool.js | 2 +- src/d3/EventScene.js | 4 +-- src/d3/SelectionBox.js | 2 +- src/d3/transformers/HeightTransformer.js | 2 +- src/d3/transformers/SculptTransformer.js | 2 +- src/reducer/contextReducer.js | 2 +- src/reducer/d2/addImageReducer.js | 2 +- src/reducer/d2/constrainMatrix.js | 2 +- src/reducer/d2/tools/bucketReducer.js | 2 +- src/reducer/d2/tools/eraserReducer.js | 2 +- src/reducer/d2/tools/shapes/circleReducer.js | 2 +- src/reducer/d2/tools/shapes/heartReducer.js | 2 +- .../d2/tools/shapes/polyPointReducer.js | 2 +- src/reducer/d2/tools/shapes/rectReducer.js | 2 +- .../d2/tools/shapes/skewRectReducer.js | 2 +- src/reducer/d2/tools/shapes/starReducer.js | 2 +- .../d2/tools/shapes/triangleReducer.js | 2 +- src/reducer/d2/tools/textReducer.js | 2 +- src/reducer/d2/tools/transformReducer.js | 2 +- src/reducer/d2/wheelZoomReducer.js | 2 +- src/reducer/d3/tools/heightReducer.js | 2 +- src/reducer/d3/tools/twistReducer.js | 2 +- src/reducer/index.js | 2 +- src/reducer/selectionOperationReducer.js | 4 +-- src/reducer/selectionReducer.js | 2 +- src/utils/curveUtils.js | 2 +- src/utils/matrixUtils.js | 2 +- src/utils/pointerUtils.js | 2 +- src/utils/selectionUtils.js | 2 +- src/utils/subtractShapeFromState.js | 4 +-- src/utils/traceUtils.js | 2 +- webpack.config.js | 15 +------- workers/trace.worker.js | 4 +-- 51 files changed, 75 insertions(+), 88 deletions(-) diff --git a/package-lock.json b/package-lock.json index 82ed384..6d88713 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,7 @@ "license": "UNLICENSED", "dependencies": { "@doodle3d/cal": "0.0.8", - "@doodle3d/clipper-js": "^1.0.7", - "@doodle3d/fill-path": "^1.0.7", + "@doodle3d/clipper-js": "^1.0.11", "@doodle3d/potrace-js": "0.0.6", "@doodle3d/threejs-export-obj": "0.0.8", "@doodle3d/threejs-export-stl": "0.0.5", @@ -21,6 +20,7 @@ "blueimp-canvas-to-blob": "^3.14.0", "bowser": "^1.8.1", "file-loader": "^0.11.2", + "fill-path": "^1.0.9", "fit-curve": "^0.1.6", "font-loaded": "^1.0.0", "imports-loader": "^0.7.1", @@ -148,14 +148,6 @@ "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz", "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ==" }, - "node_modules/@doodle3d/fill-path": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@doodle3d/fill-path/-/fill-path-1.0.7.tgz", - "integrity": "sha512-4sdgWQ28JgRsmnyy1OnuKHE+DZ8kDGpluGqFmMASh2/6dlyjp2/oXnNEgNefG4/xiEitV8AtzEij9Bijh6yNRw==", - "dependencies": { - "@doodle3d/clipper-js": "^1.0.3" - } - }, "node_modules/@doodle3d/potrace-js": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@doodle3d/potrace-js/-/potrace-js-0.0.6.tgz", @@ -4986,6 +4978,14 @@ "node": ">= 0.4.0" } }, + "node_modules/fill-path": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/fill-path/-/fill-path-1.0.9.tgz", + "integrity": "sha512-DfVMI9QySK8JrEp9FWE+E+YYCg6W2xkxDpH1kcHTu7ixz1pXQUr9j0eTTvfKS/ziy23dV6KR/FwKwvmANWRBVA==", + "dependencies": { + "@doodle3d/clipper-js": "^1.0.11" + } + }, "node_modules/fill-range": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", @@ -18092,14 +18092,6 @@ "resolved": "https://registry.npmjs.org/@doodle3d/clipper-lib/-/clipper-lib-6.4.2-b.tgz", "integrity": "sha512-glELSijsD9b+/0d9iOdasBwqH3s+xPxD59tJ7aXkBx7klugygGOMXn7PB05AdhVyA1OYMj7GUCegaQa7nvLtmQ==" }, - "@doodle3d/fill-path": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@doodle3d/fill-path/-/fill-path-1.0.7.tgz", - "integrity": "sha512-4sdgWQ28JgRsmnyy1OnuKHE+DZ8kDGpluGqFmMASh2/6dlyjp2/oXnNEgNefG4/xiEitV8AtzEij9Bijh6yNRw==", - "requires": { - "@doodle3d/clipper-js": "^1.0.3" - } - }, "@doodle3d/potrace-js": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@doodle3d/potrace-js/-/potrace-js-0.0.6.tgz", @@ -22335,6 +22327,14 @@ "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==", "dev": true }, + "fill-path": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/fill-path/-/fill-path-1.0.9.tgz", + "integrity": "sha512-DfVMI9QySK8JrEp9FWE+E+YYCg6W2xkxDpH1kcHTu7ixz1pXQUr9j0eTTvfKS/ziy23dV6KR/FwKwvmANWRBVA==", + "requires": { + "@doodle3d/clipper-js": "^1.0.11" + } + }, "fill-range": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", diff --git a/package.json b/package.json index 4addf66..ef8349b 100755 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ }, "dependencies": { "@doodle3d/cal": "0.0.8", - "@doodle3d/clipper-js": "^1.0.7", - "@doodle3d/fill-path": "^1.0.7", + "@doodle3d/clipper-js": "^1.0.11", "@doodle3d/potrace-js": "0.0.6", "@doodle3d/threejs-export-obj": "0.0.8", "@doodle3d/threejs-export-stl": "0.0.5", @@ -29,6 +28,7 @@ "blueimp-canvas-to-blob": "^3.14.0", "bowser": "^1.8.1", "file-loader": "^0.11.2", + "fill-path": "^1.0.9", "fit-curve": "^0.1.6", "font-loaded": "^1.0.0", "imports-loader": "^0.7.1", diff --git a/src/actions/index.js b/src/actions/index.js index 9171431..3c26aea 100644 --- a/src/actions/index.js +++ b/src/actions/index.js @@ -8,7 +8,7 @@ import { createThrottle } from '../utils/async.js'; import { tween } from '../utils/tweenUtils.js'; import { DEFAULT_TRACE_TOLERANCE, MAX_TRACE_TOLERANCE } from '../constants/d2Constants.js'; import * as d2Tools from '../constants/d2Tools.js'; -import { Matrix } from 'cal'; +import { Matrix } from '@doodle3d/cal'; // import createDebug from 'debug'; // const debug = createDebug('d3d:actions'); diff --git a/src/components/App.js b/src/components/App.js index d29a0ee..119f21f 100644 --- a/src/components/App.js +++ b/src/components/App.js @@ -17,7 +17,7 @@ import keycode from 'keycode'; import bowser from 'bowser'; import * as d2Tools from '../constants/d2Tools.js'; import { isLoaded, load } from '../utils/loaded.js'; -import { setConfig } from 'touch-events'; +import { setConfig } from '@doodle3d/touch-events'; setConfig({ DRAG_THRESHOLD: 0 }); diff --git a/src/components/D2Panel.js b/src/components/D2Panel.js index c1d044a..6df1593 100644 --- a/src/components/D2Panel.js +++ b/src/components/D2Panel.js @@ -2,7 +2,7 @@ import React from 'react'; import injectSheet from 'react-jss'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import * as CAL from 'cal'; +import * as CAL from '@doodle3d/cal'; import * as toolNames from '../constants/d2Tools'; import { PIPETTE } from '../constants/contextTools.js'; import { CANVAS_SIZE } from '../constants/d2Constants'; diff --git a/src/components/InputText.js b/src/components/InputText.js index af16385..c7ad98c 100644 --- a/src/components/InputText.js +++ b/src/components/InputText.js @@ -3,7 +3,7 @@ import injectSheet from 'react-jss'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; import * as actions from '../actions/index.js'; -import * as CAL from 'cal'; +import * as CAL from '@doodle3d/cal'; import { TEXT_TOOL_FONT_SIZE } from '../constants/d2Constants.js'; const CONTEXT = document.createElement('canvas').getContext('2d'); diff --git a/src/d2/EraserPointer.js b/src/d2/EraserPointer.js index 5a8176d..92f96d1 100644 --- a/src/d2/EraserPointer.js +++ b/src/d2/EraserPointer.js @@ -1,4 +1,4 @@ -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import transposeEvents from '../utils/transposeEvents.js'; import { PIXEL_RATIO } from '../constants/general.js'; import { convertEvent } from '../utils/pointerUtils.js'; diff --git a/src/d2/EventGroup.js b/src/d2/EventGroup.js index 880ae7d..89fc5e0 100644 --- a/src/d2/EventGroup.js +++ b/src/d2/EventGroup.js @@ -1,5 +1,5 @@ -import { Group, Utils } from 'cal'; -import createListener from 'touch-events'; +import { Group, Utils } from '@doodle3d/cal'; +import createListener from '@doodle3d/touch-events'; import bowser from 'bowser'; import { convertEvent, isMouseEvent } from '../utils/pointerUtils.js'; import normalizeWheel from 'normalize-wheel'; diff --git a/src/d2/Grid.js b/src/d2/Grid.js index 6fb7f9d..fd6ec46 100644 --- a/src/d2/Grid.js +++ b/src/d2/Grid.js @@ -1,4 +1,4 @@ -import { Color, Vector } from 'cal'; +import { Color, Vector } from '@doodle3d/cal'; import { CANVAS_SIZE, GRID_SIZE } from '../constants/d2Constants'; import { PIXEL_RATIO } from '../constants/general.js'; diff --git a/src/d2/ImageShape.js b/src/d2/ImageShape.js index 76aaea2..7863015 100644 --- a/src/d2/ImageShape.js +++ b/src/d2/ImageShape.js @@ -1,5 +1,5 @@ import { IMAGE_GUIDE_TRANSPARENCY, DESELECT_TRANSPARENCY } from '../constants/d2Constants.js'; -import { Surface } from 'cal'; +import { Surface } from '@doodle3d/cal'; export default class ImageShape extends Surface { constructor(shapeData) { diff --git a/src/d2/Shape.js b/src/d2/Shape.js index fe57e42..ff47090 100644 --- a/src/d2/Shape.js +++ b/src/d2/Shape.js @@ -1,6 +1,6 @@ import { shapeToPoints } from '../shape/shapeToPoints.js'; import { shapeChanged } from '../shape/shapeDataUtils.js'; -import { Matrix } from 'cal'; +import { Matrix } from '@doodle3d/cal'; import { LINE_WIDTH } from '../constants/d2Constants.js'; import { hexToStyle } from '../utils/colorUtils.js'; import { DESELECT_TRANSPARENCY, FILL_TRANSPARENCY, LINE_TRANSPARENCY } from '../constants/d2Constants.js'; diff --git a/src/d2/TolerancePointer.js b/src/d2/TolerancePointer.js index 637bceb..49af29c 100644 --- a/src/d2/TolerancePointer.js +++ b/src/d2/TolerancePointer.js @@ -1,4 +1,4 @@ -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import { PIXEL_RATIO } from '../constants/general.js'; export default class TolerancePointer { diff --git a/src/d2/texts.js b/src/d2/texts.js index e30fb82..168776a 100644 --- a/src/d2/texts.js +++ b/src/d2/texts.js @@ -1,4 +1,4 @@ -import { Text, Color } from 'cal'; +import { Text, Color } from '@doodle3d/cal'; export const dimensionsText = new Text({ size: 16, diff --git a/src/d2/tools/BaseTool.js b/src/d2/tools/BaseTool.js index 1fbd6c1..42a275f 100644 --- a/src/d2/tools/BaseTool.js +++ b/src/d2/tools/BaseTool.js @@ -1,14 +1,14 @@ import EventGroup from '../EventGroup.js'; import * as actions from '../../actions/index.js'; import transposeEvents from '../../utils/transposeEvents.js'; -import ClipperShape from 'clipper-js'; +import ClipperShape from '@doodle3d/clipper-js'; import { applyMatrixOnShape } from '../../utils/vectorUtils'; import { getPointsBounds } from '../../shape/shapeDataUtils'; import { shapeToPoints } from '../../shape/shapeToPoints'; import { LINE_COLLISION_MARGIN } from '../../constants/d2Constants'; import { LINE_WIDTH } from '../../constants/d2Constants'; import { PIXEL_RATIO } from '../../constants/general'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; const HIT_ORDER = { RECT: 0, diff --git a/src/d2/tools/BrushTool.js b/src/d2/tools/BrushTool.js index 6473dfd..84bf3ce 100644 --- a/src/d2/tools/BrushTool.js +++ b/src/d2/tools/BrushTool.js @@ -1,5 +1,5 @@ import BaseTool from './BaseTool.js'; -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import { PIXEL_RATIO } from '../../constants/general.js'; import { convertEvent } from '../../utils/pointerUtils.js'; // import createDebug from 'debug'; diff --git a/src/d2/tools/CircleTool.js b/src/d2/tools/CircleTool.js index 423d451..2d3f154 100644 --- a/src/d2/tools/CircleTool.js +++ b/src/d2/tools/CircleTool.js @@ -1,4 +1,4 @@ -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import BaseTool from './BaseTool.js'; import * as humanReadable from '../../utils/humanReadable.js'; import { dimensionsText } from '../texts.js'; diff --git a/src/d2/tools/PhotoGuideTool.js b/src/d2/tools/PhotoGuideTool.js index c31f8c3..2b1b833 100644 --- a/src/d2/tools/PhotoGuideTool.js +++ b/src/d2/tools/PhotoGuideTool.js @@ -1,5 +1,5 @@ import BaseTool from './BaseTool.js'; -import * as CAL from 'cal'; +import * as CAL from '@doodle3d/cal'; import TolerancePointer from '../TolerancePointer.js'; import * as actions from '../../actions/index.js'; import { calculateTolerance } from '../../utils/traceUtils'; diff --git a/src/d2/tools/PolygonTool.js b/src/d2/tools/PolygonTool.js index 1501191..9c57e47 100644 --- a/src/d2/tools/PolygonTool.js +++ b/src/d2/tools/PolygonTool.js @@ -1,5 +1,5 @@ import BaseTool from './BaseTool.js'; -import { Vector, Utils } from 'cal'; +import { Vector, Utils } from '@doodle3d/cal'; import * as humanReadable from '../../utils/humanReadable.js'; import { dimensionsText } from '../texts.js'; // import createDebug from 'debug'; diff --git a/src/d2/tools/TransformTool.js b/src/d2/tools/TransformTool.js index 04836d8..834e65b 100644 --- a/src/d2/tools/TransformTool.js +++ b/src/d2/tools/TransformTool.js @@ -1,4 +1,4 @@ -import { Vector, Matrix, Image } from 'cal'; +import { Vector, Matrix, Image } from '@doodle3d/cal'; import { SELECTION_VIEW_MIN_AXIS_SCALE, SELECTION_VIEW_MIN_SCALE } from '../../constants/d2Constants'; import dottedLineUrl from '../../../img/2d/dotLine01.png'; import rotateHandleUrl from '../../../img/2d/rotateHandle.png'; diff --git a/src/d3/EventScene.js b/src/d3/EventScene.js index 761b184..69a1546 100644 --- a/src/d3/EventScene.js +++ b/src/d3/EventScene.js @@ -1,6 +1,6 @@ import * as THREE from 'three'; -import { Utils } from 'cal'; -import createListener from 'touch-events'; +import { Utils } from '@doodle3d/cal'; +import createListener from '@doodle3d/touch-events'; import bowser from 'bowser'; import { convertEvent, isMouseEvent } from '../utils/pointerUtils.js'; import normalizeWheel from 'normalize-wheel'; diff --git a/src/d3/SelectionBox.js b/src/d3/SelectionBox.js index 02f964d..629c755 100644 --- a/src/d3/SelectionBox.js +++ b/src/d3/SelectionBox.js @@ -1,5 +1,5 @@ import * as THREE from 'three'; -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; // import createDebug from 'debug'; // const debug = createDebug('d3d:preview:selectionBox'); diff --git a/src/d3/transformers/HeightTransformer.js b/src/d3/transformers/HeightTransformer.js index de8b13c..625ef46 100644 --- a/src/d3/transformers/HeightTransformer.js +++ b/src/d3/transformers/HeightTransformer.js @@ -1,4 +1,4 @@ -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import * as THREE from 'three'; import heightHandleURL from '../../../img/3d/heightHandle.png'; import pivitHandleURL from '../../../img/3d/sculptHandle.png'; diff --git a/src/d3/transformers/SculptTransformer.js b/src/d3/transformers/SculptTransformer.js index 755c754..8ed0b13 100644 --- a/src/d3/transformers/SculptTransformer.js +++ b/src/d3/transformers/SculptTransformer.js @@ -1,5 +1,5 @@ import * as THREE from 'three'; -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import { SHAPE_TYPE_PROPERTIES } from '../../constants/shapeTypeProperties.js'; import * as d3Tools from '../../constants/d3Tools'; import handleURL from '../../../img/3d/sculptHandle.png'; diff --git a/src/reducer/contextReducer.js b/src/reducer/contextReducer.js index 087ea76..838bf66 100644 --- a/src/reducer/contextReducer.js +++ b/src/reducer/contextReducer.js @@ -6,7 +6,7 @@ import { SHAPE_TYPE_PROPERTIES } from '../constants/shapeTypeProperties.js'; import * as actions from '../actions/index.js'; import { select } from './menusReducer.js'; import { getSelectedObjectsSelector, getBoundingBox } from '../utils/selectionUtils.js'; -import { Matrix } from 'cal'; +import { Matrix } from '@doodle3d/cal'; import { updateTool as updateTool2d } from './d2/toolReducer.js'; import { updateColor } from './selectionReducer.js'; diff --git a/src/reducer/d2/addImageReducer.js b/src/reducer/d2/addImageReducer.js index 8a915b7..23add89 100644 --- a/src/reducer/d2/addImageReducer.js +++ b/src/reducer/d2/addImageReducer.js @@ -1,5 +1,5 @@ import { CANVAS_SIZE, INITIAL_IMAGE_SCALE } from '../../constants/d2Constants.js'; -import { Matrix } from 'cal'; +import { Matrix } from '@doodle3d/cal'; import { addObject } from '../objectReducers.js'; const IMAGE_SIZE = CANVAS_SIZE * 2 * INITIAL_IMAGE_SCALE; diff --git a/src/reducer/d2/constrainMatrix.js b/src/reducer/d2/constrainMatrix.js index ab4f2f6..83c9116 100644 --- a/src/reducer/d2/constrainMatrix.js +++ b/src/reducer/d2/constrainMatrix.js @@ -1,4 +1,4 @@ -import { Vector, Utils as CALUtils } from 'cal'; +import { Vector, Utils as CALUtils } from '@doodle3d/cal'; import { MIN_ZOOM, MAX_ZOOM, CANVAS_SIZE } from '../../constants/d2Constants.js'; export default function constrainMatrix(matrix) { diff --git a/src/reducer/d2/tools/bucketReducer.js b/src/reducer/d2/tools/bucketReducer.js index 3eb94dd..6d8e974 100644 --- a/src/reducer/d2/tools/bucketReducer.js +++ b/src/reducer/d2/tools/bucketReducer.js @@ -1,6 +1,6 @@ import update from 'react-addons-update'; import fillPath from 'fill-path'; -import ClipperShape from 'clipper-js'; +import ClipperShape from '@doodle3d/clipper-js'; import * as actions from '../../../actions/index.js'; import { SHAPE_TYPE_PROPERTIES } from '../../../constants/shapeTypeProperties.js'; import { LINE_WIDTH, CLIPPER_PRECISION } from '../../../constants/d2Constants.js'; diff --git a/src/reducer/d2/tools/eraserReducer.js b/src/reducer/d2/tools/eraserReducer.js index 0348c9b..416436c 100644 --- a/src/reducer/d2/tools/eraserReducer.js +++ b/src/reducer/d2/tools/eraserReducer.js @@ -1,5 +1,5 @@ import * as actions from '../../../actions/index'; -import ClipperShape from 'clipper-js'; +import ClipperShape from '@doodle3d/clipper-js'; import * as d2Tools from '../../../constants/d2Tools'; import subtractShapeFromState from '../../../utils/subtractShapeFromState'; import { CLIPPER_PRECISION } from '../../../constants/d2Constants.js'; diff --git a/src/reducer/d2/tools/shapes/circleReducer.js b/src/reducer/d2/tools/shapes/circleReducer.js index f64dbf2..50efd55 100644 --- a/src/reducer/d2/tools/shapes/circleReducer.js +++ b/src/reducer/d2/tools/shapes/circleReducer.js @@ -1,5 +1,5 @@ import update from 'react-addons-update'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; import * as actions from '../../../../actions/index.js'; import { addObjectActive2D, addObject, setActive2D } from '../../../objectReducers.js'; import createDebug from 'debug'; diff --git a/src/reducer/d2/tools/shapes/heartReducer.js b/src/reducer/d2/tools/shapes/heartReducer.js index 4ff384b..0c08842 100644 --- a/src/reducer/d2/tools/shapes/heartReducer.js +++ b/src/reducer/d2/tools/shapes/heartReducer.js @@ -1,7 +1,7 @@ import update from 'react-addons-update'; import * as actions from '../../../../actions/index.js'; import { addObjectActive2D, addObject, setActive2D } from '../../../objectReducers.js'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; // import createDebug from 'debug'; // const debug = createDebug('d3d:reducer:star'); diff --git a/src/reducer/d2/tools/shapes/polyPointReducer.js b/src/reducer/d2/tools/shapes/polyPointReducer.js index a6a6961..79a8a67 100644 --- a/src/reducer/d2/tools/shapes/polyPointReducer.js +++ b/src/reducer/d2/tools/shapes/polyPointReducer.js @@ -1,7 +1,7 @@ import update from 'react-addons-update'; import * as actions from '../../../../actions/index.js'; import { addObjectActive2D, addObject, setActive2D } from '../../../objectReducers.js'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; // import createDebug from 'debug'; // const debug = createDebug('d3d:reducer:star'); diff --git a/src/reducer/d2/tools/shapes/rectReducer.js b/src/reducer/d2/tools/shapes/rectReducer.js index f9dd4f8..4dd71bd 100644 --- a/src/reducer/d2/tools/shapes/rectReducer.js +++ b/src/reducer/d2/tools/shapes/rectReducer.js @@ -1,7 +1,7 @@ import update from 'react-addons-update'; import * as actions from '../../../../actions/index.js'; import { addObjectActive2D, addObject, setActive2D } from '../../../objectReducers.js'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; import createDebug from 'debug'; const debug = createDebug('d3d:reducer:rect'); diff --git a/src/reducer/d2/tools/shapes/skewRectReducer.js b/src/reducer/d2/tools/shapes/skewRectReducer.js index 9368125..fa3adad 100644 --- a/src/reducer/d2/tools/shapes/skewRectReducer.js +++ b/src/reducer/d2/tools/shapes/skewRectReducer.js @@ -1,7 +1,7 @@ import update from 'react-addons-update'; import * as actions from '../../../../actions/index.js'; import { removeObject, addObjectActive2D, setActive2D } from '../../../objectReducers.js'; -import { Vector, Matrix } from 'cal'; +import { Vector, Matrix } from '@doodle3d/cal'; import createDebug from 'debug'; const debug = createDebug('d3d:reducer:skewRect'); diff --git a/src/reducer/d2/tools/shapes/starReducer.js b/src/reducer/d2/tools/shapes/starReducer.js index a7a95f7..e279c6b 100644 --- a/src/reducer/d2/tools/shapes/starReducer.js +++ b/src/reducer/d2/tools/shapes/starReducer.js @@ -1,7 +1,7 @@ import update from 'react-addons-update'; import * as actions from '../../../../actions/index.js'; import { addObjectActive2D, addObject, setActive2D } from '../../../objectReducers.js'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; // import createDebug from 'debug'; // const debug = createDebug('d3d:reducer:star'); diff --git a/src/reducer/d2/tools/shapes/triangleReducer.js b/src/reducer/d2/tools/shapes/triangleReducer.js index 9e7b3b3..26d5f62 100644 --- a/src/reducer/d2/tools/shapes/triangleReducer.js +++ b/src/reducer/d2/tools/shapes/triangleReducer.js @@ -1,7 +1,7 @@ import update from 'react-addons-update'; import * as actions from '../../../../actions/index.js'; import { addObjectActive2D, addObject, setActive2D } from '../../../objectReducers.js'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; import createDebug from 'debug'; const debug = createDebug('d3d:reducer:triangle'); diff --git a/src/reducer/d2/tools/textReducer.js b/src/reducer/d2/tools/textReducer.js index d2c1bd2..7ec881c 100644 --- a/src/reducer/d2/tools/textReducer.js +++ b/src/reducer/d2/tools/textReducer.js @@ -1,4 +1,4 @@ -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; import update from 'react-addons-update'; import * as actions from '../../../actions/index.js'; import createDebug from 'debug'; diff --git a/src/reducer/d2/tools/transformReducer.js b/src/reducer/d2/tools/transformReducer.js index 3a41bfb..cd0b83a 100644 --- a/src/reducer/d2/tools/transformReducer.js +++ b/src/reducer/d2/tools/transformReducer.js @@ -1,5 +1,5 @@ import update from 'react-addons-update'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; import { CANVAS_SIZE } from '../../../constants/d2Constants.js'; import * as actions from '../../../actions/index.js'; import { calculateGestureMatrix } from '../../../utils/matrixUtils.js'; diff --git a/src/reducer/d2/wheelZoomReducer.js b/src/reducer/d2/wheelZoomReducer.js index 99a0d4e..2cb2147 100644 --- a/src/reducer/d2/wheelZoomReducer.js +++ b/src/reducer/d2/wheelZoomReducer.js @@ -1,5 +1,5 @@ import update from 'react-addons-update'; -import { Matrix } from 'cal'; +import { Matrix } from '@doodle3d/cal'; import constrainMatrix from './constrainMatrix.js'; import { MAX_ZOOM } from '../../constants/d2Constants.js'; diff --git a/src/reducer/d3/tools/heightReducer.js b/src/reducer/d3/tools/heightReducer.js index 59681b6..086a4dd 100644 --- a/src/reducer/d3/tools/heightReducer.js +++ b/src/reducer/d3/tools/heightReducer.js @@ -1,5 +1,5 @@ import update from 'react-addons-update'; -import { Utils } from 'cal'; +import { Utils } from '@doodle3d/cal'; import * as THREE from 'three'; import { SHAPE_TYPE_PROPERTIES } from '../../../constants/shapeTypeProperties.js'; import * as d3Tools from '../../../constants/d3Tools.js'; diff --git a/src/reducer/d3/tools/twistReducer.js b/src/reducer/d3/tools/twistReducer.js index 9d242c2..b402370 100644 --- a/src/reducer/d3/tools/twistReducer.js +++ b/src/reducer/d3/tools/twistReducer.js @@ -1,5 +1,5 @@ import update from 'react-addons-update'; -import { Utils } from 'cal'; +import { Utils } from '@doodle3d/cal'; import * as actions from '../../../actions/index.js'; import * as d3Tools from '../../../constants/d3Tools'; import { SHAPE_TYPE_PROPERTIES } from '../../../constants/shapeTypeProperties.js'; diff --git a/src/reducer/index.js b/src/reducer/index.js index bf46998..c0a82d4 100644 --- a/src/reducer/index.js +++ b/src/reducer/index.js @@ -18,7 +18,7 @@ import d2PanZoomReducer from './d2/panReducer.js'; import selectionReducer from './selectionReducer.js'; import selectionOperationReducer from './selectionOperationReducer.js'; import contextReducer from './contextReducer.js'; -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; import { setActiveSpace, addSpaceActive, setActive2D, getActive2D, addObject } from './objectReducers.js'; import menusReducer from './menusReducer.js'; // import createDebug from 'debug'; diff --git a/src/reducer/selectionOperationReducer.js b/src/reducer/selectionOperationReducer.js index 3ecae49..825f8fe 100644 --- a/src/reducer/selectionOperationReducer.js +++ b/src/reducer/selectionOperationReducer.js @@ -1,6 +1,6 @@ import update from 'react-addons-update'; -import ClipperShape from 'clipper-js'; -import { Matrix } from 'cal'; +import ClipperShape from '@doodle3d/clipper-js'; +import { Matrix } from '@doodle3d/cal'; import { addObject, removeObject } from './objectReducers.js'; import { recursiveClone } from '../utils/clone.js'; import { shapeToPoints } from '../shape/shapeToPoints.js'; diff --git a/src/reducer/selectionReducer.js b/src/reducer/selectionReducer.js index 1ea7725..74cdf23 100644 --- a/src/reducer/selectionReducer.js +++ b/src/reducer/selectionReducer.js @@ -1,6 +1,6 @@ import update from 'react-addons-update'; import * as actions from '../actions/index.js'; -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import { shapeToPoints } from '../shape/shapeToPoints.js'; import createDebug from 'debug'; const debug = createDebug('d3d:reducer:selection'); diff --git a/src/utils/curveUtils.js b/src/utils/curveUtils.js index 47bebe1..85dc92d 100644 --- a/src/utils/curveUtils.js +++ b/src/utils/curveUtils.js @@ -1,6 +1,6 @@ import fitCurve from 'fit-curve'; import Bezier from 'bezier-js'; -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; const DEFAULT_CURVE_ERROR = 3.0; const DEFAULT_DISTANCE_THRESHOLD = 1.0; diff --git a/src/utils/matrixUtils.js b/src/utils/matrixUtils.js index d9d9efe..7f15fa9 100644 --- a/src/utils/matrixUtils.js +++ b/src/utils/matrixUtils.js @@ -1,4 +1,4 @@ -import { Matrix, Vector } from 'cal'; +import { Matrix, Vector } from '@doodle3d/cal'; export function calculateGestureMatrix(positions, previousPositions, screenMatrix, { rotate, scale, pan }) { const matrix = screenMatrix.inverseMatrix(); diff --git a/src/utils/pointerUtils.js b/src/utils/pointerUtils.js index f414281..8265d30 100644 --- a/src/utils/pointerUtils.js +++ b/src/utils/pointerUtils.js @@ -1,4 +1,4 @@ -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; export function convertEvent(DOMNode, event) { const { left, top } = DOMNode.getBoundingClientRect(); diff --git a/src/utils/selectionUtils.js b/src/utils/selectionUtils.js index 7ad47fc..a2cde7d 100644 --- a/src/utils/selectionUtils.js +++ b/src/utils/selectionUtils.js @@ -1,7 +1,7 @@ import * as THREE from 'three'; import { shapeToPoints } from '../shape/shapeToPoints.js'; import { getPointsBounds } from '../shape/shapeDataUtils.js'; -import { Vector } from 'cal'; +import { Vector } from '@doodle3d/cal'; import arrayMemoizer from './arrayMemoizer.js'; import memoize from 'memoizee'; // import createDebug from 'debug'; diff --git a/src/utils/subtractShapeFromState.js b/src/utils/subtractShapeFromState.js index 50727af..85403cc 100644 --- a/src/utils/subtractShapeFromState.js +++ b/src/utils/subtractShapeFromState.js @@ -1,6 +1,6 @@ import update from 'react-addons-update'; -import { Matrix } from 'cal'; -import ClipperShape from 'clipper-js'; +import { Matrix } from '@doodle3d/cal'; +import ClipperShape from '@doodle3d/clipper-js'; import { recursiveClone } from './clone.js'; import { addObject, removeObject } from '../reducer/objectReducers.js'; import { SHAPE_TYPE_PROPERTIES } from '../constants/shapeTypeProperties.js'; diff --git a/src/utils/traceUtils.js b/src/utils/traceUtils.js index db75fc0..e5592d9 100644 --- a/src/utils/traceUtils.js +++ b/src/utils/traceUtils.js @@ -1,5 +1,5 @@ import { applyMatrixOnPath, pathToVectorPath } from './vectorUtils.js'; -import { Matrix } from 'cal'; +import { Matrix } from '@doodle3d/cal'; import TraceWorker from '../../workers/trace.worker.js'; import { getPixel } from './colorUtils.js'; import memoize from 'memoizee'; diff --git a/webpack.config.js b/webpack.config.js index f734eed..db643ca 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -29,19 +29,6 @@ module.exports = { filename: 'bundle.js', path: path.resolve(__dirname, 'dist') }, - resolve: { - alias: { - 'doodle3d-core': path.resolve(__dirname, devMode ? 'module' : 'lib'), - 'clipper-lib': '@doodle3d/clipper-lib', - 'clipper-js': '@doodle3d/clipper-js', - 'cal': '@doodle3d/cal', - 'touch-events': '@doodle3d/touch-events', - 'potrace-js': '@doodle3d/potrace-js', - 'fill-path': '@doodle3d/fill-path', - 'threejs-export-stl': '@doodle3d/threejs-export-stl', - 'threejs-export-obj': '@doodle3d/threejs-export-obj' - } - }, module: { rules: [ { @@ -69,7 +56,7 @@ module.exports = { } }, { test: /\.(woff)$/, - use: { + use: { loader: 'file-loader' } }, { diff --git a/workers/trace.worker.js b/workers/trace.worker.js index be1351b..79f2e70 100644 --- a/workers/trace.worker.js +++ b/workers/trace.worker.js @@ -1,6 +1,6 @@ import 'babel-polyfill'; -import * as POTRACE from 'potrace-js'; -import { POTRACE_OPTIONS } from 'doodle3d-core/constants/d2Constants.js'; +import * as POTRACE from '@doodle3d/potrace-js'; +import { POTRACE_OPTIONS } from '../src/constants/d2Constants.js'; self.addEventListener('message', (event) => { switch (event.data.msg) {