From 872ccbf08523bff12abad7c14a1f7168590f2699 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Sun, 6 Oct 2024 05:44:32 -0400 Subject: [PATCH 1/9] Upgrade rich-text-presence example to Quill 2.0.2 --- examples/rich-text-presence/client.js | 23 +++++++++------- examples/rich-text-presence/package.json | 9 ++++--- examples/rich-text-presence/static/index.html | 1 + examples/rich-text-presence/webpack.config.js | 27 +++++++++++++++++++ 4 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 examples/rich-text-presence/webpack.config.js diff --git a/examples/rich-text-presence/client.js b/examples/rich-text-presence/client.js index efe354423..0c163ed3e 100644 --- a/examples/rich-text-presence/client.js +++ b/examples/rich-text-presence/client.js @@ -1,10 +1,10 @@ -var ReconnectingWebSocket = require('reconnecting-websocket'); -var sharedb = require('sharedb/lib/client'); -var richText = require('rich-text'); -var Quill = require('quill'); -var QuillCursors = require('quill-cursors'); -var tinycolor = require('tinycolor2'); -var ObjectID = require('bson-objectid'); +import ReconnectingWebSocket from 'reconnecting-websocket'; +import sharedb from 'sharedb/lib/client'; +import richText from 'rich-text'; +import Quill from 'quill'; +import QuillCursors from 'quill-cursors'; +import tinycolor from 'tinycolor2'; +import ObjectID from 'bson-objectid'; sharedb.types.register(richText.type); Quill.register('modules/cursors', QuillCursors); @@ -36,9 +36,12 @@ doc.subscribe(function(err) { }); function initialiseQuill(doc) { - var quill = new Quill('#editor', { - theme: 'bubble', - modules: {cursors: true} + var quill = new Quill('#editor', { + theme: 'snow', + modules: { + cursors: true, + toolbar: true, + } }); var cursors = quill.getModule('cursors'); diff --git a/examples/rich-text-presence/package.json b/examples/rich-text-presence/package.json index d06e38021..f89fa95af 100644 --- a/examples/rich-text-presence/package.json +++ b/examples/rich-text-presence/package.json @@ -4,7 +4,7 @@ "description": "An example of presence using ShareDB and Quill", "main": "server.js", "scripts": { - "build": "browserify client.js -o static/dist/bundle.js", + "build": "webpack --mode development", "test": "echo \"Error: no test specified\" && exit 1", "start": "node server.js" }, @@ -18,7 +18,7 @@ "@teamwork/websocket-json-stream": "^2.0.0", "bson-objectid": "^2.0.4", "express": "^4.18.2", - "quill": "^1.3.7", + "quill": "^2.0.2", "quill-cursors": "^4.0.2", "reconnecting-websocket": "^4.4.0", "rich-text": "^4.1.0", @@ -27,6 +27,7 @@ "ws": "^8.12.1" }, "devDependencies": { - "browserify": "^17.0.0" + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4" } -} +} \ No newline at end of file diff --git a/examples/rich-text-presence/static/index.html b/examples/rich-text-presence/static/index.html index 01f27be0f..84497ed38 100644 --- a/examples/rich-text-presence/static/index.html +++ b/examples/rich-text-presence/static/index.html @@ -3,6 +3,7 @@ ShareDB Rich Text +
diff --git a/examples/rich-text-presence/webpack.config.js b/examples/rich-text-presence/webpack.config.js new file mode 100644 index 000000000..90de6863e --- /dev/null +++ b/examples/rich-text-presence/webpack.config.js @@ -0,0 +1,27 @@ +const path = require('path'); + +module.exports = { + entry: './client.js', + output: { + path: path.resolve(__dirname, 'static/dist'), + filename: 'bundle.js' + }, + module: { + rules: [ + { + test: /\.js$/, + exclude: /node_modules/, + use: { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'] + } + } + } + ] + }, + resolve: { + extensions: ['.js'] + }, + mode: 'development' +}; \ No newline at end of file From bf35ca5fa5410fa21fc2e5abd6f5612ff10f8895 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Sun, 6 Oct 2024 06:22:20 -0400 Subject: [PATCH 2/9] Update package.json with babel dev dep --- examples/rich-text-presence/package.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/rich-text-presence/package.json b/examples/rich-text-presence/package.json index f89fa95af..c6239b154 100644 --- a/examples/rich-text-presence/package.json +++ b/examples/rich-text-presence/package.json @@ -27,7 +27,10 @@ "ws": "^8.12.1" }, "devDependencies": { + "@babel/core": "^7.25.7", + "@babel/preset-env": "^7.25.7", + "babel-loader": "^9.2.1", "webpack": "^5.88.2", "webpack-cli": "^5.1.4" } -} \ No newline at end of file +} From 41b986f2e2dd194017f556983d38bcfda48fb7b5 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Sun, 6 Oct 2024 06:25:50 -0400 Subject: [PATCH 3/9] updated rich-text example with Quill 2 --- examples/rich-text/client.js | 8 ++++---- examples/rich-text/package.json | 12 +++++++++--- examples/rich-text/webpack.config.js | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 examples/rich-text/webpack.config.js diff --git a/examples/rich-text/client.js b/examples/rich-text/client.js index 3e989306d..3bc44aa3b 100644 --- a/examples/rich-text/client.js +++ b/examples/rich-text/client.js @@ -1,7 +1,7 @@ -var ReconnectingWebSocket = require('reconnecting-websocket'); -var sharedb = require('sharedb/lib/client'); -var richText = require('rich-text'); -var Quill = require('quill'); +import ReconnectingWebSocket from 'reconnecting-websocket'; +import sharedb from 'sharedb/lib/client'; +import richText from 'rich-text'; +import Quill from 'quill'; sharedb.types.register(richText.type); // Open WebSocket connection to ShareDB server diff --git a/examples/rich-text/package.json b/examples/rich-text/package.json index fe49a5ae5..cf4f818e3 100644 --- a/examples/rich-text/package.json +++ b/examples/rich-text/package.json @@ -4,7 +4,7 @@ "description": "A simple rich-text editor example based on Quill and ShareDB", "main": "server.js", "scripts": { - "build": "browserify client.js -o static/dist/bundle.js", + "build": "webpack --mode development", "test": "echo \"Error: no test specified\" && exit 1", "start": "node server.js" }, @@ -15,14 +15,20 @@ "license": "MIT", "dependencies": { "@teamwork/websocket-json-stream": "^2.0.0", + "bson-objectid": "^2.0.4", "express": "^4.18.2", - "quill": "^1.3.7", + "quill": "^2.0.2", + "quill-cursors": "^4.0.2", "reconnecting-websocket": "^4.4.0", "rich-text": "^4.1.0", "sharedb": "^3.3.0", "ws": "^8.12.1" }, "devDependencies": { - "browserify": "^17.0.0" + "@babel/core": "^7.25.7", + "@babel/preset-env": "^7.25.7", + "babel-loader": "^9.2.1", + "webpack": "^5.88.2", + "webpack-cli": "^5.1.4" } } diff --git a/examples/rich-text/webpack.config.js b/examples/rich-text/webpack.config.js new file mode 100644 index 000000000..90de6863e --- /dev/null +++ b/examples/rich-text/webpack.config.js @@ -0,0 +1,27 @@ +const path = require('path'); + +module.exports = { + entry: './client.js', + output: { + path: path.resolve(__dirname, 'static/dist'), + filename: 'bundle.js' + }, + module: { + rules: [ + { + test: /\.js$/, + exclude: /node_modules/, + use: { + loader: 'babel-loader', + options: { + presets: ['@babel/preset-env'] + } + } + } + ] + }, + resolve: { + extensions: ['.js'] + }, + mode: 'development' +}; \ No newline at end of file From bb56a4a9876a5f074d28a2f1109e624d07bd7299 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Sun, 6 Oct 2024 06:27:06 -0400 Subject: [PATCH 4/9] Update webpack.config.js --- examples/rich-text-presence/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/rich-text-presence/webpack.config.js b/examples/rich-text-presence/webpack.config.js index 90de6863e..ef268e10d 100644 --- a/examples/rich-text-presence/webpack.config.js +++ b/examples/rich-text-presence/webpack.config.js @@ -24,4 +24,4 @@ module.exports = { extensions: ['.js'] }, mode: 'development' -}; \ No newline at end of file +}; From e845f8761d50d5912a0d7bdc81ede1f3c79b1946 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Sun, 6 Oct 2024 06:27:42 -0400 Subject: [PATCH 5/9] Update webpack.config.js --- examples/rich-text/webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/rich-text/webpack.config.js b/examples/rich-text/webpack.config.js index 90de6863e..ef268e10d 100644 --- a/examples/rich-text/webpack.config.js +++ b/examples/rich-text/webpack.config.js @@ -24,4 +24,4 @@ module.exports = { extensions: ['.js'] }, mode: 'development' -}; \ No newline at end of file +}; From 2f39ee7c29d409644ad1db4bef8944eafabd5150 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Wed, 23 Oct 2024 00:12:36 -0400 Subject: [PATCH 6/9] Removed babel dependancy --- examples/rich-text/package.json | 5 ----- examples/rich-text/webpack.config.js | 6 ------ 2 files changed, 11 deletions(-) diff --git a/examples/rich-text/package.json b/examples/rich-text/package.json index cf4f818e3..4bb8ccc57 100644 --- a/examples/rich-text/package.json +++ b/examples/rich-text/package.json @@ -15,19 +15,14 @@ "license": "MIT", "dependencies": { "@teamwork/websocket-json-stream": "^2.0.0", - "bson-objectid": "^2.0.4", "express": "^4.18.2", "quill": "^2.0.2", - "quill-cursors": "^4.0.2", "reconnecting-websocket": "^4.4.0", "rich-text": "^4.1.0", "sharedb": "^3.3.0", "ws": "^8.12.1" }, "devDependencies": { - "@babel/core": "^7.25.7", - "@babel/preset-env": "^7.25.7", - "babel-loader": "^9.2.1", "webpack": "^5.88.2", "webpack-cli": "^5.1.4" } diff --git a/examples/rich-text/webpack.config.js b/examples/rich-text/webpack.config.js index ef268e10d..5a056b09d 100644 --- a/examples/rich-text/webpack.config.js +++ b/examples/rich-text/webpack.config.js @@ -11,12 +11,6 @@ module.exports = { { test: /\.js$/, exclude: /node_modules/, - use: { - loader: 'babel-loader', - options: { - presets: ['@babel/preset-env'] - } - } } ] }, From bbf90af19fb890a126cc885db665744f6ee86baa Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Tue, 19 Nov 2024 23:24:18 -0500 Subject: [PATCH 7/9] Update package.json to remove unnecessary deps --- examples/rich-text-presence/package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/examples/rich-text-presence/package.json b/examples/rich-text-presence/package.json index c6239b154..48ab8bfde 100644 --- a/examples/rich-text-presence/package.json +++ b/examples/rich-text-presence/package.json @@ -27,9 +27,6 @@ "ws": "^8.12.1" }, "devDependencies": { - "@babel/core": "^7.25.7", - "@babel/preset-env": "^7.25.7", - "babel-loader": "^9.2.1", "webpack": "^5.88.2", "webpack-cli": "^5.1.4" } From ac8f1dd1207d112e07ad8ff8f5557b58a094d9f7 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Tue, 19 Nov 2024 23:25:29 -0500 Subject: [PATCH 8/9] Update index.html to remove unnecessary css --- examples/rich-text-presence/static/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/rich-text-presence/static/index.html b/examples/rich-text-presence/static/index.html index 84497ed38..01f27be0f 100644 --- a/examples/rich-text-presence/static/index.html +++ b/examples/rich-text-presence/static/index.html @@ -3,7 +3,6 @@ ShareDB Rich Text -
From 01968497850eefde0f5bd9558fe350d612bd8337 Mon Sep 17 00:00:00 2001 From: Doug Horner Date: Tue, 19 Nov 2024 23:30:34 -0500 Subject: [PATCH 9/9] Update webpack.config.js removed unnecessary config --- examples/rich-text-presence/webpack.config.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/examples/rich-text-presence/webpack.config.js b/examples/rich-text-presence/webpack.config.js index ef268e10d..5a056b09d 100644 --- a/examples/rich-text-presence/webpack.config.js +++ b/examples/rich-text-presence/webpack.config.js @@ -11,12 +11,6 @@ module.exports = { { test: /\.js$/, exclude: /node_modules/, - use: { - loader: 'babel-loader', - options: { - presets: ['@babel/preset-env'] - } - } } ] },