Merge branch 'master' into production

nhn · Aug 31, 2017 · 1e896e2 · 1e896e2
2 parents c0b681e + 5c61192
commit 1e896e2
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tui-image-editor",
   "author": "NHNEnt FE Development Lab <dl_javascript@nhnent.com>",
-  "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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -2,7 +2,7 @@
  * @author NHN Ent. FE Development Team <dl_javascript@nhnent.com>
  * @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
@@ -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']
         }
     },