From 4324c4a0897516aeafde3026cd0bc6c7b8958d01 Mon Sep 17 00:00:00 2001 From: Christopher Hoskin Date: Tue, 12 Nov 2024 09:31:49 +0000 Subject: [PATCH] Merge pull request #21554 from overleaf/ae-delete-spelling Remove the spelling service GitOrigin-RevId: ca7c17160e79d84740f32bbe9c73bc74c2714ffc --- develop/dev.env | 1 - develop/docker-compose.yml | 11 ----- package-lock.json | 40 +------------------ package.json | 1 - server-ce/runit/spelling-overleaf/run | 12 ------ server-ce/services.js | 3 -- services/web/config/settings.defaults.js | 4 -- .../config/settings.test.defaults.js | 4 -- 8 files changed, 1 insertion(+), 75 deletions(-) delete mode 100755 server-ce/runit/spelling-overleaf/run diff --git a/develop/dev.env b/develop/dev.env index f817987f8e..d14b5448d0 100644 --- a/develop/dev.env +++ b/develop/dev.env @@ -13,7 +13,6 @@ NOTIFICATIONS_HOST=notifications PROJECT_HISTORY_HOST=project-history REALTIME_HOST=real-time REDIS_HOST=redis -SPELLING_HOST=spelling WEBPACK_HOST=webpack WEB_API_PASSWORD=overleaf WEB_API_USER=overleaf diff --git a/develop/docker-compose.yml b/develop/docker-compose.yml index f9053c21ce..42009262ef 100644 --- a/develop/docker-compose.yml +++ b/develop/docker-compose.yml @@ -8,7 +8,6 @@ volumes: mongo-data: redis-data: sharelatex-data: - spelling-cache: web-data: history-v1-buckets: @@ -124,15 +123,6 @@ services: volumes: - redis-data:/data - spelling: - build: - context: .. - dockerfile: services/spelling/Dockerfile - env_file: - - dev.env - volumes: - - spelling-cache:/overleaf/services/spelling/cache - web: build: context: .. @@ -163,7 +153,6 @@ services: - notifications - project-history - real-time - - spelling webpack: build: diff --git a/package-lock.json b/package-lock.json index dbfce4fffe..567fa58576 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,6 @@ "services/project-history", "services/real-time", "services/references", - "services/spelling", "services/templates", "services/third-party-datastore", "services/third-party-references", @@ -8414,10 +8413,6 @@ "resolved": "libraries/settings", "link": true }, - "node_modules/@overleaf/spelling": { - "resolved": "services/spelling", - "link": true - }, "node_modules/@overleaf/stream-utils": { "resolved": "libraries/stream-utils", "link": true @@ -40929,6 +40924,7 @@ "services/spelling": { "name": "@overleaf/spelling", "version": "0.1.4", + "extraneous": true, "dependencies": { "@overleaf/logger": "*", "@overleaf/metrics": "*", @@ -40951,11 +40947,6 @@ "typescript": "^5.0.4" } }, - "services/spelling/node_modules/underscore": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" - }, "services/templates": { "name": "@overleaf/templates", "dependencies": { @@ -50605,35 +50596,6 @@ "typescript": "^5.0.4" } }, - "@overleaf/spelling": { - "version": "file:services/spelling", - "requires": { - "@overleaf/logger": "*", - "@overleaf/metrics": "*", - "@overleaf/o-error": "*", - "@overleaf/settings": "*", - "async": "^3.2.5", - "body-parser": "^1.20.3", - "bunyan": "^1.8.15", - "chai": "^4.3.6", - "chai-as-promised": "^7.1.1", - "esmock": "^2.6.3", - "express": "^4.21.0", - "lru-cache": "^5.1.1", - "mocha": "^10.2.0", - "request": "^2.88.2", - "sinon": "^9.2.4", - "typescript": "^5.0.4", - "underscore": "1.13.1" - }, - "dependencies": { - "underscore": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", - "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" - } - } - }, "@overleaf/stream-utils": { "version": "file:libraries/stream-utils", "requires": { diff --git a/package.json b/package.json index 911817b882..4877aa0223 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,6 @@ "services/project-history", "services/real-time", "services/references", - "services/spelling", "services/templates", "services/third-party-datastore", "services/third-party-references", diff --git a/server-ce/runit/spelling-overleaf/run b/server-ce/runit/spelling-overleaf/run deleted file mode 100755 index 65ef61cd64..0000000000 --- a/server-ce/runit/spelling-overleaf/run +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -NODE_PARAMS="" -if [ "$DEBUG_NODE" == "true" ]; then - echo "running debug - spelling" - NODE_PARAMS="--inspect=0.0.0.0:30050" -fi - -source /etc/overleaf/env.sh -export LISTEN_ADDRESS=127.0.0.1 - -exec /sbin/setuser www-data /usr/bin/node $NODE_PARAMS /overleaf/services/spelling/app.js >> /var/log/overleaf/spelling.log 2>&1 diff --git a/server-ce/services.js b/server-ce/services.js index e91e252ea9..d0b0a9c076 100644 --- a/server-ce/services.js +++ b/server-ce/services.js @@ -20,9 +20,6 @@ module.exports = [ { name: 'chat', }, - { - name: 'spelling', - }, { name: 'contacts', }, diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js index 718482bf1f..e6012ae7f4 100644 --- a/services/web/config/settings.defaults.js +++ b/services/web/config/settings.defaults.js @@ -225,10 +225,6 @@ module.exports = { '127.0.0.1' }:3003`, }, - spelling: { - url: `http://${process.env.SPELLING_HOST || '127.0.0.1'}:3005`, - host: process.env.SPELLING_HOST, - }, docstore: { url: `http://${process.env.DOCSTORE_HOST || '127.0.0.1'}:3016`, pubUrl: `http://${process.env.DOCSTORE_HOST || '127.0.0.1'}:3016`, diff --git a/services/web/test/acceptance/config/settings.test.defaults.js b/services/web/test/acceptance/config/settings.test.defaults.js index 15cafd7c7f..5df7f7e2bb 100644 --- a/services/web/test/acceptance/config/settings.test.defaults.js +++ b/services/web/test/acceptance/config/settings.test.defaults.js @@ -55,10 +55,6 @@ module.exports = { documentupdater: { url: 'http://127.0.0.1:23003', }, - spelling: { - url: 'http://127.0.0.1:23005', - host: '127.0.0.1', - }, docstore: { url: 'http://127.0.0.1:23016', pubUrl: 'http://127.0.0.1:23016',