switch to quill-delta

ivawzh · Oct 9, 2016 · 75acfa6 · 75acfa6
1 parent 7fa48ea
commit 75acfa6
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 40 deletions.
diff --git a/_develop/webpack.config.js b/_develop/webpack.config.js
@@ -32,25 +32,51 @@ module.exports = {
   },
   resolve: {
     alias: {
-      'parchment': path.resolve(__dirname, '..', 'node_modules/parchment/src/parchment')
+      'parchment': path.resolve(__dirname, '../node_modules/parchment')
     },
     extensions: ['', '.js', '.styl', '.ts']
   },
   module: {
-    loaders: [
-      { test: /parchment\/src\/.*\.ts$/, loader: 'ts' },
-      { test: /\.styl$/, loader: ExtractTextPlugin.extract('style', 'css!stylus') },
-      { test: /\.svg$/, loader: 'html?minimize=true' },
-      {
-        test: /\.js$/,
-        exclude: [/node_modules/, /rich-text/],
-        loader: 'babel',
-        query: {
-          presets: ['es2015']
-          // plugins: ['transform-es2015-modules-commonjs']
-        }
+    loaders: [{
+      loader: 'ts',
+      test: /\.ts$/,
+      include: [
+        path.resolve(__dirname, '../node_modules/parchment')
+      ]
+    }, {
+      loader: ExtractTextPlugin.extract('style', 'css!stylus'),
+      test: /\.styl$/,
+      include: [
+        path.resolve(__dirname, '../assets')
+      ]
+    }, {
+      loader: 'html',
+      test: /\.svg$/,
+      include: [
+        path.resolve(__dirname, '../assets/icons')
+      ],
+      query: {
+        minimize: true
       }
-    ],
+    }, {
+      loader: 'babel',
+      test: /\.js$/,
+      include: [
+        path.resolve(__dirname, '../quill.js'),
+        path.resolve(__dirname, '../core.js'),
+        path.resolve(__dirname, '../blots'),
+        path.resolve(__dirname, '../core'),
+        path.resolve(__dirname, '../formats'),
+        path.resolve(__dirname, '../modules'),
+        path.resolve(__dirname, '../test'),
+        path.resolve(__dirname, '../themes'),
+        path.resolve(__dirname, '../ui')
+      ],
+      query: {
+        presets: ['es2015']
+        // plugins: ['transform-es2015-modules-commonjs']
+      }
+    }],
     noParse: [
       /\/node_modules\/clone\/clone\.js$/,
       /\/node_modules\/eventemitter3\/index\.js$/,

diff --git a/blots/block.js b/blots/block.js
@@ -1,5 +1,5 @@
 import extend from 'extend';
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Parchment from 'parchment';
 import Break from './break';
 import Embed from './embed';

diff --git a/core/editor.js b/core/editor.js
@@ -1,5 +1,5 @@
-import Delta from 'rich-text/lib/delta';
-import DeltaOp from 'rich-text/lib/op';
+import Delta from 'quill-delta';
+import DeltaOp from 'quill-delta/lib/op';
 import Emitter from './emitter';
 import Parchment from 'parchment';
 import CodeBlock from '../formats/code';

diff --git a/core/quill.js b/core/quill.js
@@ -1,5 +1,5 @@
 import './polyfill';
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from './editor';
 import Emitter from './emitter';
 import Module from './module';

diff --git a/formats/code.js b/formats/code.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Parchment from 'parchment';
 import Block from '../blots/block';
 import Inline from '../blots/inline';

diff --git a/formats/list.js b/formats/list.js
@@ -1,5 +1,5 @@
 import extend from 'extend';
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Parchment from 'parchment';
 import Block from '../blots/block';
 import Container from '../blots/container';

diff --git a/modules/clipboard.js b/modules/clipboard.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Parchment from 'parchment';
 import Quill from '../core/quill';
 import logger from '../core/logger';

diff --git a/modules/keyboard.js b/modules/keyboard.js
@@ -1,8 +1,8 @@
 import clone from 'clone';
 import equal from 'deep-equal';
 import extend from 'extend';
-import Delta from 'rich-text/lib/delta';
-import DeltaOp from 'rich-text/lib/op';
+import Delta from 'quill-delta';
+import DeltaOp from 'quill-delta/lib/op';
 import Parchment from 'parchment';
 import Quill from '../core/quill';
 import logger from '../core/logger';

diff --git a/modules/toolbar.js b/modules/toolbar.js
@@ -1,5 +1,5 @@
 import extend from 'extend';
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Parchment from 'parchment';
 import Quill from '../core/quill';
 import logger from '../core/logger';

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "eventemitter3": "~2.0.1",
     "extend": "~3.0.0",
     "parchment": "1.0.1",
-    "rich-text": "~3.0.2"
+    "quill-delta": "3.1.0"
   },
   "devDependencies": {
     "babel-core": "^6.16.0",

diff --git a/test/helpers/unit.js b/test/helpers/unit.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../core/editor';
 import Emitter from '../../core/emitter';
 import Selection from '../../core/selection';

diff --git a/test/unit/core/editor.js b/test/unit/core/editor.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 import Emitter from '../../../core/emitter';
 import Selection, { Range } from '../../../core/selection';

diff --git a/test/unit/core/quill.js b/test/unit/core/quill.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Quill, { expandConfig, overload } from '../../../core/quill';
 import Theme from '../../../core/theme';
 import Emitter from '../../../core/emitter';

diff --git a/test/unit/core/selection.js b/test/unit/core/selection.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Selection, { Range } from '../../../core/selection';
 import Cursor from '../../../blots/cursor';
 import Scroll from '../../../blots/scroll';

diff --git a/test/unit/formats/align.js b/test/unit/formats/align.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 
 

diff --git a/test/unit/formats/code.js b/test/unit/formats/code.js
@@ -1,5 +1,5 @@
 import Parchment from 'parchment';
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 import CodeBlock from '../../../formats/code';
 

diff --git a/test/unit/formats/color.js b/test/unit/formats/color.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 
 

diff --git a/test/unit/formats/header.js b/test/unit/formats/header.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 
 

diff --git a/test/unit/formats/indent.js b/test/unit/formats/indent.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 
 

diff --git a/test/unit/formats/link.js b/test/unit/formats/link.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 import Link from '../../../formats/link';
 

diff --git a/test/unit/formats/list.js b/test/unit/formats/list.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 
 

diff --git a/test/unit/formats/script.js b/test/unit/formats/script.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Editor from '../../../core/editor';
 
 

diff --git a/test/unit/modules/clipboard.js b/test/unit/modules/clipboard.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import { Range } from '../../../core/selection';
 import Quill from '../../../core';
 

diff --git a/test/unit/modules/history.js b/test/unit/modules/history.js
@@ -1,4 +1,4 @@
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Quill from '../../../core';
 import { getLastChangeIndex } from '../../../modules/history';
 

diff --git a/themes/base.js b/themes/base.js
@@ -1,5 +1,5 @@
 import extend from 'extend';
-import Delta from 'rich-text/lib/delta';
+import Delta from 'quill-delta';
 import Emitter from '../core/emitter';
 import Keyboard from '../modules/keyboard';
 import Theme from '../core/theme';