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

Merge pull request #197 from overleaf/jpa-bump-metrics-module

[misc] bump metrics module to 3.4.1
Eric Mc Sween 5 лет назад
Родитель
Сommit
06ad314ca7
4 измененных файлов с 360 добавлено и 539 удалено
  1. 1 1
      services/clsi/app.js
  2. 1 1
      services/clsi/app/js/Metrics.js
  3. 356 534
      services/clsi/package-lock.json
  4. 2 3
      services/clsi/package.json

+ 1 - 1
services/clsi/app.js

@@ -6,7 +6,7 @@
  * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
  */
 const tenMinutes = 10 * 60 * 1000
-const Metrics = require('metrics-sharelatex')
+const Metrics = require('@overleaf/metrics')
 Metrics.initialize('clsi')
 
 const CompileController = require('./app/js/CompileController')

+ 1 - 1
services/clsi/app/js/Metrics.js

@@ -1,3 +1,3 @@
 // TODO: This file was created by bulk-decaffeinate.
 // Sanity-check the conversion and remove this comment.
-module.exports = require('metrics-sharelatex')
+module.exports = require('@overleaf/metrics')

Разница между файлами не показана из-за своего большого размера
+ 356 - 534
services/clsi/package-lock.json


+ 2 - 3
services/clsi/package.json

@@ -10,7 +10,7 @@
     "start": "node $NODE_APP_OPTIONS app.js",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
-    "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
+    "test:unit:_run": "mocha --exit --recursive --reporter spec $@ test/unit/js",
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "nodemon --config nodemon.json",
     "lint": "node_modules/.bin/eslint --max-warnings 0 .",
@@ -19,6 +19,7 @@
   },
   "author": "James Allen <james@sharelatex.com>",
   "dependencies": {
+    "@overleaf/metrics": "^3.4.1",
     "async": "3.2.0",
     "body-parser": "^1.19.0",
     "diskusage": "^1.1.3",
@@ -29,8 +30,6 @@
     "lockfile": "^1.0.4",
     "lodash": "^4.17.20",
     "logger-sharelatex": "^2.2.0",
-    "lynx": "0.2.0",
-    "metrics-sharelatex": "^2.6.0",
     "mysql": "^2.18.1",
     "request": "^2.88.2",
     "sequelize": "^5.21.5",

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