Просмотр исходного кода

Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3

Csh issue 1118 node 10.15.3

GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
Christopher Hoskin 7 лет назад
Родитель
Сommit
8aa8840db0

+ 1 - 1
services/web/.nvmrc

@@ -1 +1 @@
-6.15.1
+10.15.3

+ 2 - 2
services/web/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:6.15.1 as app
+FROM node:10.15.3 as app
 
 WORKDIR /app
 
@@ -12,7 +12,7 @@ COPY . /app
 
 RUN make compile_full
 
-FROM node:6.15.1
+FROM node:10.15.3
 
 COPY --from=app /app /app
 

+ 1 - 1
services/web/Dockerfile.frontend

@@ -1,4 +1,4 @@
-FROM node:8.9.4
+FROM node:10.15.3
 
 # Install Google Chrome
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -

+ 1 - 1
services/web/app/coffee/infrastructure/Server.coffee

@@ -165,7 +165,7 @@ webRouter.use (req, res, next) ->
 		frameguard: false
 	})(req, res, next)
 
-profiler = require "v8-profiler"
+profiler = require "v8-profiler-node8"
 privateApiRouter.get "/profile", (req, res) ->
 	time = parseInt(req.query.time || "1000")
 	profiler.startProfiling("test")

+ 2 - 2
services/web/docker-compose.yml

@@ -6,7 +6,7 @@ volumes:
 services:
 
   test_unit:
-    image: node:6.15.1
+    image: node:10.15.3
     volumes:
       - .:/app
     working_dir: /app
@@ -16,7 +16,7 @@ services:
     user: node
 
   test_acceptance:
-    image: node:6.15.1
+    image: node:10.15.3
     volumes:
       - .:/app
     working_dir: /app

Разница между файлами не показана из-за своего большого размера
+ 2298 - 920
services/web/npm-shrinkwrap.json


+ 1 - 1
services/web/package.json

@@ -106,7 +106,7 @@
     "temp": "^0.8.3",
     "underscore": "1.6.0",
     "uuid": "^3.0.1",
-    "v8-profiler": "^5.2.3",
+    "v8-profiler-node8": "^6.0.1",
     "valid-url": "^1.0.9",
     "xml2js": "0.2.0",
     "xregexp": "^4.2.4",

Некоторые файлы не были показаны из-за большого количества измененных файлов