agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-12 13:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7556 from overleaf/em-finish-node-16

Browse Source 
Finish Node 16 upgrade

GitOrigin-RevId: 03e5a54e4b17f43142ff78f5b4cca4d0dbefe6eb
This commit is contained in:
Eric Mc Sween
2022-04-14 08:03:17 +00:00
committed by Copybot
parent 90303f2f8c
commit eb4764e777
28 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/contacts/.nvmrc
+1 -1
View File
@@ -1 +1 @@
14.18.3 16.14.2
services/contacts/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
FROM gcr.io/overleaf-ops/node:14.18.3 as base FROM node:16.14.2 as base
WORKDIR /overleaf/services/contacts WORKDIR /overleaf/services/contacts
services/contacts/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/node:14.18.3 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/contacts/buildscript.txt
+1 -2
View File
@@ -3,7 +3,6 @@ contacts
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-image=gcr.io/overleaf-ops/node --node-version=16.14.2
--node-version=14.18.3
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0
services/contacts/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/contacts - .:/overleaf/services/contacts
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/contacts - .:/overleaf/services/contacts
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
services/notifications/.nvmrc
+1 -1
View File
@@ -1 +1 @@
14.18.3 16.14.2
services/notifications/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
FROM gcr.io/overleaf-ops/node:14.18.3 as base FROM node:16.14.2 as base
WORKDIR /overleaf/services/notifications WORKDIR /overleaf/services/notifications
services/notifications/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/node:14.18.3 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/notifications/buildscript.txt
+1 -2
View File
@@ -3,7 +3,6 @@ notifications
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-image=gcr.io/overleaf-ops/node --node-version=16.14.2
--node-version=14.18.3
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0
services/notifications/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/notifications - .:/overleaf/services/notifications
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/notifications - .:/overleaf/services/notifications
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
services/real-time/.nvmrc
+1 -1
View File
@@ -1 +1 @@
14.18.3 16.14.2
services/real-time/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
FROM gcr.io/overleaf-ops/node:14.18.3 as base FROM node:16.14.2 as base
WORKDIR /overleaf/services/real-time WORKDIR /overleaf/services/real-time
services/real-time/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/node:14.18.3 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/real-time/buildscript.txt
+1 -2
View File
@@ -3,7 +3,6 @@ real-time
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-image=gcr.io/overleaf-ops/node --node-version=16.14.2
--node-version=14.18.3
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0
services/real-time/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/real-time - .:/overleaf/services/real-time
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/real-time - .:/overleaf/services/real-time
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
services/spelling/.nvmrc
+1 -1
View File
@@ -1 +1 @@
14.18.3 16.14.2
services/spelling/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
FROM gcr.io/overleaf-ops/node:14.18.3 as base FROM node:16.14.2 as base
WORKDIR /overleaf/services/spelling WORKDIR /overleaf/services/spelling
COPY services/spelling/install_deps.sh /overleaf/services/spelling/ COPY services/spelling/install_deps.sh /overleaf/services/spelling/
services/spelling/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/node:14.18.3 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/spelling/buildscript.txt
+1 -2
View File
@@ -4,7 +4,6 @@ spelling
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add= --env-add=
--env-pass-through= --env-pass-through=
--node-image=gcr.io/overleaf-ops/node --node-version=16.14.2
--node-version=14.18.3
--public-repo=False --public-repo=False
--script-version=4.1.0 --script-version=4.1.0
services/spelling/install_deps.sh
+1 -9
View File
@@ -2,19 +2,11 @@
set -ex set -ex
echo 'APT::Default-Release "stretch";' >/etc/apt/apt.conf.d/default-release
# The following aspell packages exist in Ubuntu but not Debian: # The following aspell packages exist in Ubuntu but not Debian:
# aspell-af, aspell-id, aspell-nr, aspell-ns, aspell-st, aspell-tn, aspell-ts, aspell-xhu # aspell-af, aspell-id, aspell-nr, aspell-ns, aspell-st, aspell-tn, aspell-ts, aspell-xhu
echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main universe" > /etc/apt/sources.list.d/focal-amd.list echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main universe" > /etc/apt/sources.list.d/focal-amd.list
echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main universe" > /etc/apt/sources.list.d/focal-ports-arm.list echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main universe" > /etc/apt/sources.list.d/focal-ports-arm.list
apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 apt-key adv --no-tty --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32
# Need to install aspell-no from testing (buster) as broken in stable (stretch).
echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable.list
apt-get update apt-get update
apt-get install -y aspell aspell-en aspell-af aspell-ar aspell-ar-large aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-alt aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-hr aspell-hsb aspell-id aspell-it aspell-kk aspell-ku aspell-lt aspell-lv aspell-nl aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-xh apt-get install -y aspell aspell-en aspell-af aspell-ar aspell-ar-large aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-de-1901 aspell-el aspell-eo aspell-es aspell-et aspell-eu-es aspell-fa aspell-fo aspell-fr aspell-ga aspell-gl-minimos aspell-hr aspell-hsb aspell-id aspell-it aspell-kk aspell-ku aspell-lt aspell-lv aspell-nl aspell-no aspell-nr aspell-ns aspell-pa aspell-pl aspell-pt aspell-pt-br aspell-ro aspell-ru aspell-sk aspell-sl aspell-st aspell-sv aspell-tl aspell-tn aspell-ts aspell-xh
printf 'Package: aspell-*\nPin: release a=unstable\nPin-Priority: 1337\n' \
> /etc/apt/preferences.d/aspell-from-unstable
apt-get install aspell-no
services/spelling/test/acceptance/js/CheckTest.js
+20 -1
View File
@@ -27,7 +27,26 @@ describe('checking words', function () {
it('should return the list of misspellings', async function () { it('should return the list of misspellings', async function () {
const body = JSON.parse(response.body) const body = JSON.parse(response.body)
expect(body).to.deep.equal({ expect(body).to.deep.equal({
misspellings: [{ index: 0, suggestions: ['anther', 'another'] }], misspellings: [
{
index: 0,
suggestions: [
'anther',
'another',
'anthers',
'panther',
'anathema',
'anthem',
'nether',
"anther's",
'ante',
'neither',
'norther',
'ether',
'other',
],
},
],
}) })
}) })
}) })
services/track-changes/.nvmrc
+1 -1
View File
@@ -1 +1 @@
14.18.3 16.14.2
services/track-changes/Dockerfile
+1 -1
View File
@@ -2,7 +2,7 @@
# Instead run bin/update_build_scripts from # Instead run bin/update_build_scripts from
# https://github.com/sharelatex/sharelatex-dev-environment # https://github.com/sharelatex/sharelatex-dev-environment
FROM gcr.io/overleaf-ops/node:14.18.3 as base FROM node:16.14.2 as base
WORKDIR /overleaf/services/track-changes WORKDIR /overleaf/services/track-changes
services/track-changes/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ HERE=$(shell pwd)
MONOREPO=$(shell cd ../../ && pwd) MONOREPO=$(shell cd ../../ && pwd)
# Run the linting commands in the scope of the monorepo. # Run the linting commands in the scope of the monorepo.
# Eslint and prettier (plus some configs) are on the root. # Eslint and prettier (plus some configs) are on the root.
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) gcr.io/overleaf-ops/node:14.18.3 npm run --silent RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:16.14.2 npm run --silent
format: format:
$(RUN_LINTING) format $(RUN_LINTING) format
services/track-changes/app/js/HttpController.js
+1 -1
View File
@@ -238,7 +238,7 @@ module.exports = HttpController = {
UpdatesManager.exportProject( UpdatesManager.exportProject(
project_id, project_id,
function (err, { updates, userIds }, confirmWrite) { function (err, { updates, userIds }, confirmWrite) {
const abortStreaming = req.aborted || res.finished || res.destroyed const abortStreaming = req.destroyed || res.finished || res.destroyed
if (abortStreaming) { if (abortStreaming) {
// Tell the producer to stop emitting data // Tell the producer to stop emitting data
if (confirmWrite) confirmWrite(new Error('stop')) if (confirmWrite) confirmWrite(new Error('stop'))
services/track-changes/app/js/ZipManager.js
+1 -1
View File
@@ -162,7 +162,7 @@ async function makeTempDirectory() {
* Clean up a temporary directory made with makeTempDirectory() * Clean up a temporary directory made with makeTempDirectory()
*/ */
function cleanupTempDirectory(tmpdir) { function cleanupTempDirectory(tmpdir) {
fs.promises.rmdir(tmpdir, { recursive: true }).catch(err => { fs.promises.rm(tmpdir, { recursive: true, force: true }).catch(err => {
if (err) { if (err) {
logger.warn({ err, tmpdir }, 'Failed to clean up temp directory') logger.warn({ err, tmpdir }, 'Failed to clean up temp directory')
} }
services/track-changes/buildscript.txt
+1 -2
View File
@@ -3,7 +3,6 @@ track-changes
--docker-repos=gcr.io/overleaf-ops --docker-repos=gcr.io/overleaf-ops
--env-add=AWS_BUCKET=bucket --env-add=AWS_BUCKET=bucket
--env-pass-through= --env-pass-through=
--node-image=gcr.io/overleaf-ops/node --node-version=16.14.2
--node-version=14.18.3
--public-repo=True --public-repo=True
--script-version=4.1.0 --script-version=4.1.0
services/track-changes/docker-compose.yml
+2 -2
View File
@@ -6,7 +6,7 @@ version: "2.3"
services: services:
test_unit: test_unit:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/track-changes - .:/overleaf/services/track-changes
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules
@@ -20,7 +20,7 @@ services:
user: node user: node
test_acceptance: test_acceptance:
image: gcr.io/overleaf-ops/node:14.18.3 image: node:16.14.2
volumes: volumes:
- .:/overleaf/services/track-changes - .:/overleaf/services/track-changes
- ../../node_modules:/overleaf/node_modules - ../../node_modules:/overleaf/node_modules