refactor: webpack array config

nhn · Dec 23, 2017 · 2214a92 · 2214a92
1 parent 2bfc0de
commit 2214a92
Show file tree

Hide file tree

Showing 32 changed files with 694 additions and 1,728 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,9 +12,10 @@
     "babel-loader": "^7.1.2",
     "babel-plugin-istanbul": "^4.1.1",
     "babel-preset-es2015": "^6.24.1",
+    "clean-css": "^4.1.9",
     "copy-webpack-plugin": "^4.0.1",
     "cross-env": "^5.0.1",
-    "css-loader": "^0.28.0",
+    "css-entry-webpack-plugin": "^1.0.0-beta.4",
     "eslint": "^4.13.1",
     "eslint-config-tui": "^1.0.1",
     "eslint-loader": "^1.7.1",
@@ -39,11 +40,10 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webdriver-launcher": "nhnent/karma-webdriver-launcher#v1.1.0",
     "karma-webpack": "^2.0.3",
-    "style-loader": "^0.19.0",
     "tui-jsdoc-template": "^1.2.2",
     "tui-release-notes": "nhnent/tui.release-notes",
-    "webpack": "^2.4.1",
-    "webpack-dev-server": "^2.4.2",
+    "webpack": "^3.10.0",
+    "webpack-dev-server": "^2.9.7",
     "webpack-visualizer-plugin": "^0.1.11"
   },
   "scripts": {

diff --git a/src/css/tui-editor-contents.css b/src/css/tui-editor-contents.css
@@ -216,3 +216,25 @@
     margin: 0;
     padding: 0;
 }
+
+.tui-editor-contents .task-list-item {
+    border: 0;
+    list-style: none;
+    padding-left: 22px;
+    margin-left: -22px;
+    background-repeat: no-repeat;
+    background-size: 16px 16px;
+    background-position: 0 2px;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADdJREFUKBVjvHv37n8GMgALSI+SkhJJWu/du8fARJIOJMWjGpECA505GjjoIYLEB6dVUNojFQAA/1MJUFWet/4AAAAASUVORK5CYII=');
+}
+
+.tui-editor-contents .task-list-item.checked {
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAMpJREFUKBVjjJ/64D8DGYCJDD1gLbTVyM3OxJDiJMzAxcYIdyALnIWDAdJU7i/OICfCxsDMxMgwc88bwk5F1vTs/W+GFUffwY2H+1FBlI2hLliCQYCbGSyJrqlzwwuGj9//YWoMtRBgUBJnZ6gMEGeQFWaFOw9kE7omkG5GWDyCPF7mJ86gIMbO8P//fwZGRkYGXJpAGuFO/fbrP0PXppcMD179JKgJRSOIA9N8/NZXrM4DqYEBjOgAaYYFOUwRNhruVGyS+MTI1ggAx8NTGcUtFVQAAAAASUVORK5CYII=');
+}
+
+.tui-editor-contents .task-list-item input[type='checkbox'],
+.tui-editor-contents .task-list-item .task-list-item-checkbox {
+    margin-left: -17px;
+    margin-right: 3.8px;
+    margin-top: 3px;
+}
diff --git a/src/css/tui-editor.css b/src/css/tui-editor.css
@@ -187,28 +187,6 @@
 }
 
 /* Essential element style */
-.tui-editor-contents .task-list-item {
-    border: 0;
-    list-style: none;
-    padding-left: 22px;
-    margin-left: -22px;
-    background-repeat: no-repeat;
-    background-size: 16px 16px;
-    background-position: 0 2px;
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAADdJREFUKBVjvHv37n8GMgALSI+SkhJJWu/du8fARJIOJMWjGpECA505GjjoIYLEB6dVUNojFQAA/1MJUFWet/4AAAAASUVORK5CYII=');
-}
-
-.tui-editor-contents .task-list-item.checked {
-    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAAAXNSR0IArs4c6QAAAMpJREFUKBVjjJ/64D8DGYCJDD1gLbTVyM3OxJDiJMzAxcYIdyALnIWDAdJU7i/OICfCxsDMxMgwc88bwk5F1vTs/W+GFUffwY2H+1FBlI2hLliCQYCbGSyJrqlzwwuGj9//YWoMtRBgUBJnZ6gMEGeQFWaFOw9kE7omkG5GWDyCPF7mJ86gIMbO8P//fwZGRkYGXJpAGuFO/fbrP0PXppcMD179JKgJRSOIA9N8/NZXrM4DqYEBjOgAaYYFOUwRNhruVGyS+MTI1ggAx8NTGcUtFVQAAAAASUVORK5CYII=');
-}
-
-.tui-editor-contents .task-list-item input[type='checkbox'],
-.tui-editor-contents .task-list-item .task-list-item-checkbox {
-    margin-left: -17px;
-    margin-right: 3.8px;
-    margin-top: 3px;
-}
-
 .tui-editor-contents td.te-cell-selected {
     background-color: #d8dfec;
 }

diff --git a/src/js/editor.js b/src/js/editor.js
@@ -807,4 +807,4 @@ ToastUIEditor.CommandManager = CommandManager;
  */
 ToastUIEditor.markdownitHighlight = Convertor.getMarkdownitHighlightRenderer();
 
-export default ToastUIEditor;
+module.exports = ToastUIEditor;
diff --git a/src/js/extensions/chart/chart.js b/src/js/extensions/chart/chart.js
@@ -31,7 +31,7 @@ import $ from 'jquery';
 import util from 'tui-code-snippet';
 const chart = window.tui.chart;
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import csv from './csv';
 
 const {WwCodeBlockManager, codeBlockManager} = Editor;

diff --git a/src/js/extensions/colorSyntax.js b/src/js/extensions/colorSyntax.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import ColorPicker from 'tui-color-picker';
 
-import Editor from '../editor';
+import Editor from './editorProxy';
 
 const colorSyntaxRx = /\{color:(.+?)}(.*?)\{color}/g;
 const colorHtmlRx = /<span (?:class="colour" )?style="color:(.+?)"(?: class="colour")?>(.*?)/g;

diff --git a/src/js/extensions/editor.js b/src/js/extensions/editor.js
diff --git a/src/js/extensions/editorProxy.js b/src/js/extensions/editorProxy.js
@@ -0,0 +1,15 @@
+/**
+* @fileoverview Editor/Viewer proxy for extensions
+* @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
+*/
+/* eslint global-require: 0 no-empty: 0 */
+
+let Editor;
+try {
+  Editor = require('../editor');
+} catch (e) {}
+try {
+  Editor = require('../viewer');
+} catch (e) {}
+
+export default Editor;
diff --git a/src/js/extensions/mark/mark.js b/src/js/extensions/mark/mark.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import MarkerList from './markerList';
 import MarkerManager from './markerManager';
 import WysiwygMarkerHelper from './wysiwygMarkerHelper';

diff --git a/src/js/extensions/mark/viewerMarkerHelper.js b/src/js/extensions/mark/viewerMarkerHelper.js
@@ -3,7 +3,7 @@
 * @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
 */
 import $ from 'jquery';
-import Editor from '../editor';
+import Editor from '../editorProxy';
 
 const {domUtils} = Editor;
 const FIND_CRLF_RX = /(\n)|(\r\n)|(\r)/g;

diff --git a/src/js/extensions/mark/wysiwygMarkerHelper.js b/src/js/extensions/mark/wysiwygMarkerHelper.js
@@ -3,7 +3,7 @@
 * @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
 */
 import $ from 'jquery';
-import Editor from '../editor';
+import Editor from '../editorProxy';
 
 const {domUtils} = Editor;
 const FIND_ZWB_RX = /\u200B/g;

diff --git a/src/js/extensions/scrollSync/scrollSync.js b/src/js/extensions/scrollSync/scrollSync.js
@@ -3,7 +3,7 @@
 * @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
 */
 import $ from 'jquery';
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import ScrollManager from './scrollManager';
 import SectionManager from './sectionManager';
 

diff --git a/src/js/extensions/table/langs.js b/src/js/extensions/table/langs.js
@@ -2,7 +2,7 @@
 * @fileoverview i18n for table extension
 * @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
 */
-import Editor from '../editor';
+import Editor from '../editorProxy';
 
 const {i18n} = Editor;
 if (i18n) {

diff --git a/src/js/extensions/table/mergeCell.js b/src/js/extensions/table/mergeCell.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/mergedTableAddCol.js b/src/js/extensions/table/mergedTableAddCol.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/mergedTableAddRow.js b/src/js/extensions/table/mergedTableAddRow.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/mergedTableAlignCol.js b/src/js/extensions/table/mergedTableAlignCol.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/mergedTableRemoveCol.js b/src/js/extensions/table/mergedTableRemoveCol.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/mergedTableRemoveRow.js b/src/js/extensions/table/mergedTableRemoveRow.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/mergedTableUI.js b/src/js/extensions/table/mergedTableUI.js
@@ -4,7 +4,7 @@
 */
 import $ from 'jquery';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 const {i18n} = Editor;
 
 /**

diff --git a/src/js/extensions/table/table.js b/src/js/extensions/table/table.js
@@ -4,8 +4,7 @@
 */
 import $ from 'jquery';
 
-import Editor from '../editor';
-
+import Editor from '../editorProxy';
 import './langs';
 import createMergedTable from './mergedTableCreator';
 import prepareTableUnmerge from './tableUnmergePreparer';

diff --git a/src/js/extensions/table/unmergeCell.js b/src/js/extensions/table/unmergeCell.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';

diff --git a/src/js/extensions/table/wwMergedTableManager.js b/src/js/extensions/table/wwMergedTableManager.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import tableDataHandler from './tableDataHandler';
 import tableRenderer from './tableRenderer';
 import tableRangeHandler from './tableRangeHandler';

diff --git a/src/js/extensions/table/wwMergedTableSelectionManager.js b/src/js/extensions/table/wwMergedTableSelectionManager.js
@@ -5,7 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../editor';
+import Editor from '../editorProxy';
 import tableDataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 

diff --git a/src/js/extensions/taskCounter.js b/src/js/extensions/taskCounter.js
@@ -2,7 +2,7 @@
 * @fileoverview Implements Task counter
 * @author NHN Ent. FE Development Lab <dl_javascript@nhnent.com>
 */
-import Editor from '../editor';
+import Editor from './editorProxy';
 
 const FIND_TASK_RX = /^\s*\* \[[xX ]\] [^\n]*/mg;
 const FIND_CHECKED_TASK_RX = /^\s*\* \[[xX]\] [^\n]*/mg;

diff --git a/src/js/extensions/uml.js b/src/js/extensions/uml.js
@@ -4,7 +4,7 @@
 */
 import plantumlEncoder from 'plantuml-encoder';
 
-import Editor from '../editor';
+import Editor from './editorProxy';
 
 const {codeBlockManager} = Editor;
 const DEFAULT_RENDERER_URL = 'http://www.plantuml.com/plantuml/png/';

diff --git a/src/js/index.js b/src/js/index.js
@@ -4,7 +4,7 @@
  */
 import $ from 'jquery';
 
-import Editor from './editor';
+const Editor = require('./editor');
 
 // for jquery
 $.fn.tuiEditor = function(...args) {

diff --git a/src/js/indexViewer.js b/src/js/indexViewer.js
@@ -4,7 +4,7 @@
  */
 import $ from 'jquery';
 
-import Viewer from './viewer';
+const Viewer = require('./viewer');
 
 // for jquery
 $.fn.tuiEditor = function(...args) {

diff --git a/src/js/indexViewerAll.js b/src/js/indexViewerAll.js
@@ -8,7 +8,6 @@ import './extensions/chart/chart';
 import './extensions/mark/mark';
 import './extensions/table/table';
 import './extensions/colorSyntax';
-import './extensions/taskCounter';
 import './extensions/uml';
 
 module.exports = EditorViewer;
diff --git a/src/js/viewer.js b/src/js/viewer.js
@@ -239,4 +239,4 @@ ToastUIEditorViewer.WwTableManager = null;
  */
 ToastUIEditorViewer.WwTableSelectionManager = null;
 
-export default ToastUIEditorViewer;
+module.exports = ToastUIEditorViewer;