Skip to content

Commit

Permalink
fix: Change fabric import method named to default & correct webpack e…
Browse files Browse the repository at this point in the history 
…xternal config (fix #129, #219)
  • Loading branch information
@junghwan-park
junghwan-park committed Aug 2, 2019
1 parent 2c03da4 commit d90e2eb
Show file tree
Hide file tree
Showing 31 changed files with 36 additions and 31 deletions.
2 changes: 1 addition & 1 deletion examples/example01-includeUi.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<body>

<div id="tui-image-editor-container"></div>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/2.7.0/fabric.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/3.3.2/fabric.js"></script>
<script type="text/javascript" src="https://uicdn.toast.com/tui.code-snippet/v1.5.0/tui-code-snippet.min.js"></script>
<script type="text/javascript" src="https://uicdn.toast.com/tui-color-picker/v2.2.3/tui-color-picker.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/FileSaver.js/1.3.3/FileSaver.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/example02-useApiDirect.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
</div>
<div class="tui-image-editor"></div>
</div>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/1.7.22/fabric.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/3.3.2/fabric.js"></script>
<script type="text/javascript" src="https://uicdn.toast.com/tui.code-snippet/v1.5.0/tui-code-snippet.min.js"></script>
<script type="text/javascript" src="https://uicdn.toast.com/tui-color-picker/v2.2.3/tui-color-picker.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion examples/example03-mobile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
</ul>
<p class="msg">Menu Scrolling <b>Left ⇔ Right</b></p>
</div>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/1.7.22/fabric.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fabric.js/3.3.2/fabric.js"></script>
<script type="text/javascript" src="https://uicdn.toast.com/tui.code-snippet/v1.5.0/tui-code-snippet.min.js"></script>
<script type="text/javascript" src="https://uicdn.toast.com/tui-color-picker/v2.2.3/tui-color-picker.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"doc:dev": "tuidoc --dev",
"doc": "tuidoc",
"tslint": "tslint index.d.ts",
"postinstall": "npm install --no-save --no-optional fabric@^2.7.0"
"postinstall": "npm install --no-save --no-optional fabric@^3.3.2"
},
"dependencies": {
"core-js": "2.4.1",
Expand Down
2 changes: 1 addition & 1 deletion src/js/component/cropper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @fileoverview Image crop module (start cropping, end cropping)
*/
import snippet from 'tui-code-snippet';
import {fabric} from 'fabric';
import fabric from 'fabric';
import Component from '../interface/component';
import Cropzone from '../extension/cropzone';
import {keyCodes, componentNames} from '../consts';
Expand Down
2 changes: 1 addition & 1 deletion src/js/component/filter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
import Component from '../interface/component';
import Mask from '../extension/mask';
import consts from '../consts';
Expand Down
2 changes: 1 addition & 1 deletion src/js/component/freeDrawing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Free drawing module, Set brush
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import Component from '../interface/component';
import consts from '../consts';

Expand Down
2 changes: 1 addition & 1 deletion src/js/component/icon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Add icon module
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import snippet from 'tui-code-snippet';
import Promise from 'core-js/library/es6/promise';
import Component from '../interface/component';
Expand Down
2 changes: 1 addition & 1 deletion src/js/component/line.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Free drawing module, Set brush
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import Component from '../interface/component';
import consts from '../consts';

Expand Down
2 changes: 1 addition & 1 deletion src/js/component/rotation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Image rotation module
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import Promise from 'core-js/library/es6/promise';
import Component from '../interface/component';
import consts from '../consts';
Expand Down
2 changes: 1 addition & 1 deletion src/js/component/shape.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Shape component
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import Promise from 'core-js/library/es6/promise';
import Component from '../interface/component';
import consts from '../consts';
Expand Down
2 changes: 1 addition & 1 deletion src/js/component/text.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Text module
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import snippet from 'tui-code-snippet';
import Promise from 'core-js/library/es6/promise';
import Component from '../interface/component';
Expand Down
2 changes: 1 addition & 1 deletion src/js/extension/blur.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Blur extending fabric.Image.filters.Convolute
*/
import {fabric} from 'fabric';
import fabric from 'fabric';

/**
* Blur object
Expand Down
2 changes: 1 addition & 1 deletion src/js/extension/colorFilter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview ColorFilter extending fabric.Image.filters.BaseFilter
*/
import {fabric} from 'fabric';
import fabric from 'fabric';

/**
* ColorFilter object
Expand Down
2 changes: 1 addition & 1 deletion src/js/extension/cropzone.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @fileoverview Cropzone extending fabric.Rect
*/
import snippet from 'tui-code-snippet';
import {fabric} from 'fabric';
import fabric from 'fabric';
import {clamp} from '../util';

const CORNER_TYPE_TOP_LEFT = 'tl';
Expand Down
2 changes: 1 addition & 1 deletion src/js/extension/emboss.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Emboss extending fabric.Image.filters.Convolute
*/
import {fabric} from 'fabric';
import fabric from 'fabric';

/**
* Emboss object
Expand Down
2 changes: 1 addition & 1 deletion src/js/extension/mask.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Mask extending fabric.Image.filters.Mask
*/
import {fabric} from 'fabric';
import fabric from 'fabric';

/**
* Mask object
Expand Down
2 changes: 1 addition & 1 deletion src/js/extension/sharpen.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Sharpen extending fabric.Image.filters.Convolute
*/
import {fabric} from 'fabric';
import fabric from 'fabric';

/**
* Sharpen object
Expand Down
2 changes: 1 addition & 1 deletion src/js/graphics.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
import ImageLoader from './component/imageLoader';
import Cropper from './component/cropper';
import Flip from './component/flip';
Expand Down
2 changes: 1 addition & 1 deletion test/command.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
import Invoker from '../src/js/invoker';
import commandFactory from '../src/js/factory/command';
import Graphics from '../src/js/graphics';
Expand Down
2 changes: 1 addition & 1 deletion test/cropper.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
import $ from 'jquery';
import Cropper from '../src/js/component/cropper';
import Graphics from '../src/js/graphics';
Expand Down
2 changes: 1 addition & 1 deletion test/cropzone.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/extension/cropzone.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import Cropzone from '../src/js/extension/cropzone';

describe('Cropzone', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/flip.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/component/flip.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import $ from 'jquery';
import Graphics from '../src/js/graphics';
import Flip from '../src/js/component/flip';
Expand Down
2 changes: 1 addition & 1 deletion test/graphics.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @fileoverview Tests command with command-factory
*/
import snippet from 'tui-code-snippet';
import {fabric} from 'fabric';
import fabric from 'fabric';
import Graphics from '../src/js/graphics';
import consts from '../src/js/consts';

Expand Down
2 changes: 1 addition & 1 deletion test/icon.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/component/icon.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import $ from 'jquery';
import Graphics from '../src/js/graphics';
import Icon from '../src/js/component/icon';
Expand Down
2 changes: 1 addition & 1 deletion test/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @author NHN Ent. FE Development Lab <[email protected]>
*/
import '../src';
import {fabric} from 'fabric';
import fabric from 'fabric';

fabric.Object.prototype.objectCaching = false;

Expand Down
2 changes: 1 addition & 1 deletion test/line.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/component/line.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import $ from 'jquery';
import Graphics from '../src/js/graphics';
import Line from '../src/js/component/line';
Expand Down
2 changes: 1 addition & 1 deletion test/rotation.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/component/rotation.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import $ from 'jquery';
import Graphics from '../src/js/graphics';
import Rotation from '../src/js/component/rotation';
Expand Down
2 changes: 1 addition & 1 deletion test/shape.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/component/line.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import $ from 'jquery';
import Graphics from '../src/js/graphics';
import Shape from '../src/js/component/shape';
Expand Down
2 changes: 1 addition & 1 deletion test/text.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @author NHN Ent. FE Development Team <[email protected]>
* @fileoverview Test cases of "src/js/component/text.js"
*/
import {fabric} from 'fabric';
import fabric from 'fabric';
import $ from 'jquery';
import Graphics from '../src/js/graphics';
import Text from '../src/js/component/text';
Expand Down
7 changes: 6 additions & 1 deletion webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ module.exports = {
filename: `${FILENAME}.js`
},
externals: {
'fabric.fabric': 'fabric',
'tui-code-snippet': {
'commonjs': 'tui-code-snippet',
'commonjs2': 'tui-code-snippet',
Expand All @@ -42,6 +41,12 @@ module.exports = {
'commonjs2': 'tui-color-picker',
'amd': 'tui-color-picker',
'root': ['tui', 'colorPicker']
},
'fabric': {
'commonjs': ['fabric', 'fabric'],
'commonjs2': ['fabric', 'fabric'],
'amd': 'fabric',
'root': 'fabric'
}
},
module: {
Expand Down

0 comments on commit d90e2eb

Please sign in to comment.