diff --git a/package.json b/package.json index d855db9c0..9cb6ee431 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tui-image-editor", "author": "NHNEnt FE Development Lab ", - "version": "3.0.0", + "version": "3.0.1", "license": "MIT", "repository": "https://github.com/nhnent/tui.image-editor", "main": "dist/tui-image-editor.js", diff --git a/src/js/component/cropper.js b/src/js/component/cropper.js index 658dff2b4..8efd11d6d 100644 --- a/src/js/component/cropper.js +++ b/src/js/component/cropper.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Image crop module (start cropping, end cropping) */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import Component from '../interface/component'; import Cropzone from '../extension/cropzone'; import {keyCodes, componentNames} from '../consts'; diff --git a/src/js/component/filter.js b/src/js/component/filter.js index 69ed58e2b..1ef59ddd7 100644 --- a/src/js/component/filter.js +++ b/src/js/component/filter.js @@ -4,7 +4,7 @@ */ import {isUndefined, extend, forEach, filter} from 'tui-code-snippet'; import Promise from 'core-js/library/es6/promise'; -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import Component from '../interface/component'; import Mask from '../extension/mask'; import consts from '../consts'; diff --git a/src/js/component/freeDrawing.js b/src/js/component/freeDrawing.js index 635a6e304..6598b4e1f 100644 --- a/src/js/component/freeDrawing.js +++ b/src/js/component/freeDrawing.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Free drawing module, Set brush */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import Component from '../interface/component'; import consts from '../consts'; diff --git a/src/js/component/icon.js b/src/js/component/icon.js index 7271ac7dc..1e2aded3d 100644 --- a/src/js/component/icon.js +++ b/src/js/component/icon.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Add icon module */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import snippet from 'tui-code-snippet'; import Promise from 'core-js/library/es6/promise'; import Component from '../interface/component'; diff --git a/src/js/component/line.js b/src/js/component/line.js index 8d9d6b06b..77be6eaa8 100644 --- a/src/js/component/line.js +++ b/src/js/component/line.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Free drawing module, Set brush */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import Component from '../interface/component'; import consts from '../consts'; diff --git a/src/js/component/rotation.js b/src/js/component/rotation.js index 3df339895..17566deb2 100644 --- a/src/js/component/rotation.js +++ b/src/js/component/rotation.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Image rotation module */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import Promise from 'core-js/library/es6/promise'; import Component from '../interface/component'; import consts from '../consts'; diff --git a/src/js/component/shape.js b/src/js/component/shape.js index 616c90777..95ba7b6db 100644 --- a/src/js/component/shape.js +++ b/src/js/component/shape.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Shape component */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import Promise from 'core-js/library/es6/promise'; import Component from '../interface/component'; import consts from '../consts'; diff --git a/src/js/component/text.js b/src/js/component/text.js index 5143353b0..53309f017 100644 --- a/src/js/component/text.js +++ b/src/js/component/text.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Text module */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import snippet from 'tui-code-snippet'; import Promise from 'core-js/library/es6/promise'; import Component from '../interface/component'; diff --git a/src/js/extension/blur.js b/src/js/extension/blur.js index 74b348736..5f99224b0 100644 --- a/src/js/extension/blur.js +++ b/src/js/extension/blur.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Blur extending fabric.Image.filters.Convolute */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; /** * Blur object diff --git a/src/js/extension/colorFilter.js b/src/js/extension/colorFilter.js index 8ada319a8..441f3216a 100644 --- a/src/js/extension/colorFilter.js +++ b/src/js/extension/colorFilter.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview ColorFilter extending fabric.Image.filters.BaseFilter */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; /** * ColorFilter object diff --git a/src/js/extension/cropzone.js b/src/js/extension/cropzone.js index 7c2b3f8e6..b76774a99 100644 --- a/src/js/extension/cropzone.js +++ b/src/js/extension/cropzone.js @@ -3,7 +3,7 @@ * @fileoverview Cropzone extending fabric.Rect */ import snippet from 'tui-code-snippet'; -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import {clamp} from '../util'; const CORNER_TYPE_TOP_LEFT = 'tl'; diff --git a/src/js/extension/emboss.js b/src/js/extension/emboss.js index b79f9d1fc..294fbaa01 100644 --- a/src/js/extension/emboss.js +++ b/src/js/extension/emboss.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Emboss extending fabric.Image.filters.Convolute */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; /** * Emboss object diff --git a/src/js/extension/mask.js b/src/js/extension/mask.js index 9ca66d402..2db4f47d5 100644 --- a/src/js/extension/mask.js +++ b/src/js/extension/mask.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Mask extending fabric.Image.filters.Mask */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; /** * Mask object diff --git a/src/js/extension/sharpen.js b/src/js/extension/sharpen.js index bc41e28ba..0b1fafe43 100644 --- a/src/js/extension/sharpen.js +++ b/src/js/extension/sharpen.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Sharpen extending fabric.Image.filters.Convolute */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; /** * Sharpen object diff --git a/src/js/graphics.js b/src/js/graphics.js index 4d98945a9..c57cf4fbd 100644 --- a/src/js/graphics.js +++ b/src/js/graphics.js @@ -4,7 +4,7 @@ */ import snippet from 'tui-code-snippet'; import Promise from 'core-js/library/es6/promise'; -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import ImageLoader from './component/imageLoader'; import Cropper from './component/cropper'; import Flip from './component/flip'; diff --git a/test/command.spec.js b/test/command.spec.js index 1b79691bc..4523edeb8 100644 --- a/test/command.spec.js +++ b/test/command.spec.js @@ -4,7 +4,7 @@ */ import snippet from 'tui-code-snippet'; import Promise from 'core-js/library/es6/promise'; -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Invoker from '../src/js/invoker'; import commandFactory from '../src/js/factory/command'; diff --git a/test/cropper.spec.js b/test/cropper.spec.js index ab8d0d438..939e5b278 100644 --- a/test/cropper.spec.js +++ b/test/cropper.spec.js @@ -3,7 +3,7 @@ * @fileoverview Test cases of "src/js/component/cropper.js" */ import snippet from 'tui-code-snippet'; -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Cropper from '../src/js/component/cropper'; import Graphics from '../src/js/graphics'; diff --git a/test/flip.spec.js b/test/flip.spec.js index 8ae8687f4..0e5cce5af 100644 --- a/test/flip.spec.js +++ b/test/flip.spec.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Test cases of "src/js/component/flip.js" */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import Flip from '../src/js/component/flip'; diff --git a/test/graphics.spec.js b/test/graphics.spec.js index a068fc5d4..d8ebc2da6 100644 --- a/test/graphics.spec.js +++ b/test/graphics.spec.js @@ -3,7 +3,7 @@ * @fileoverview Tests command with command-factory */ import snippet from 'tui-code-snippet'; -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import consts from '../src/js/consts'; diff --git a/test/icon.spec.js b/test/icon.spec.js index 96d55af7b..a77e45891 100644 --- a/test/icon.spec.js +++ b/test/icon.spec.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Test cases of "src/js/component/icon.js" */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import Icon from '../src/js/component/icon'; diff --git a/test/line.spec.js b/test/line.spec.js index ffba51e34..dfdfc8ac0 100644 --- a/test/line.spec.js +++ b/test/line.spec.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Test cases of "src/js/component/line.js" */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import Line from '../src/js/component/line'; diff --git a/test/rotation.spec.js b/test/rotation.spec.js index 947673e56..97119d97c 100644 --- a/test/rotation.spec.js +++ b/test/rotation.spec.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Test cases of "src/js/component/rotation.js" */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import Rotation from '../src/js/component/rotation'; diff --git a/test/shape.spec.js b/test/shape.spec.js index 3a2376d14..825f5d2cf 100644 --- a/test/shape.spec.js +++ b/test/shape.spec.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Test cases of "src/js/component/line.js" */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import Shape from '../src/js/component/shape'; diff --git a/test/text.spec.js b/test/text.spec.js index c92fe4efc..8538b4b2b 100644 --- a/test/text.spec.js +++ b/test/text.spec.js @@ -2,7 +2,7 @@ * @author NHN Ent. FE Development Team * @fileoverview Test cases of "src/js/component/text.js" */ -import {fabric} from 'fabric'; +import fabric from 'fabric/dist/fabric.require'; import $ from 'jquery'; import Graphics from '../src/js/graphics'; import Text from '../src/js/component/text'; diff --git a/webpack.config.js b/webpack.config.js index a38802531..2e62d434d 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -36,10 +36,10 @@ module.exports = { 'amd': 'tui-code-snippet', 'root': ['tui', 'util'] }, - 'fabric': { - 'commonjs': 'fabric', - 'commonjs2': 'fabric', - 'amd': 'fabric', + 'fabric/dist/fabric.require': { + 'commonjs': 'fabric/dist/fabric.require', + 'commonjs2': 'fabric/dist/fabric.require', + 'amd': 'fabric/dist/fabric.require', 'root': ['fabric'] } },