From 75acfa66d4ec180067c83145d91fb9384ce9b338 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Sat, 8 Oct 2016 21:42:49 -0700 Subject: [PATCH] switch to quill-delta --- _develop/webpack.config.js | 54 +++++++++++++++++++++++++--------- blots/block.js | 2 +- core/editor.js | 4 +-- core/quill.js | 2 +- formats/code.js | 2 +- formats/list.js | 2 +- modules/clipboard.js | 2 +- modules/keyboard.js | 4 +-- modules/toolbar.js | 2 +- package.json | 2 +- test/helpers/unit.js | 2 +- test/unit/core/editor.js | 2 +- test/unit/core/quill.js | 2 +- test/unit/core/selection.js | 2 +- test/unit/formats/align.js | 2 +- test/unit/formats/code.js | 2 +- test/unit/formats/color.js | 2 +- test/unit/formats/header.js | 2 +- test/unit/formats/indent.js | 2 +- test/unit/formats/link.js | 2 +- test/unit/formats/list.js | 2 +- test/unit/formats/script.js | 2 +- test/unit/modules/clipboard.js | 2 +- test/unit/modules/history.js | 2 +- themes/base.js | 2 +- 25 files changed, 66 insertions(+), 40 deletions(-) diff --git a/_develop/webpack.config.js b/_develop/webpack.config.js index d7dc9d89c6..65aec471e8 100644 --- 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 index cb34ebc86c..239dc4823e 100644 --- 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 index c5d8a533c6..11659f4e38 100644 --- 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 index 41a2e1e988..0a1d35cc7f 100644 --- 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 index 2465fe908d..659149324d 100644 --- 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 index a2b0e883a0..83c91d375b 100644 --- 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 index d8ef176d6b..46f8806b1d 100644 --- 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 index 601c3f656c..dcd8a72d65 100644 --- 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 index 3e740b4744..5e925cd96a 100644 --- 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 index c8395bd5e0..3dcbbf79a3 100644 --- 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 index 088e1f62b9..5af5592f04 100644 --- 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 index ca506a587f..a5741c8d44 100644 --- 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 index 409036e2a0..a2103c1fae 100644 --- 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 index 40cb8d6be7..6f1d012ee0 100644 --- 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 index 4857e2fb45..ccdb9523e9 100644 --- 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 index e17532a159..330672c062 100644 --- 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 index a4ce5c5cb4..482f438cc0 100644 --- 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 index dea09681f1..eccb9c8b84 100644 --- 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 index 1f00c53c6b..8d1992b162 100644 --- 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 index 0050184f55..7e8fc945c2 100644 --- 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 index 6965d6a345..75686ae88e 100644 --- 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 index 09a36d766c..a8a3e62689 100644 --- 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 index 9e092f16f9..8a96c48e40 100644 --- 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 index d3e1a23dcd..e8eb451e6c 100644 --- 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 index ef692e394c..ddd7e41fe8 100644 --- 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';