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

Merge pull request #31794 from overleaf/ar-prefer-dedupe-when-installing-npm-modules

[monorepo] use prefer-dedupe when installing npm modules

GitOrigin-RevId: de814fa1e91e37a20cb4024f8aa0454e5e86f0a6
Andrew Rumble 5 месяцев назад
Родитель
Сommit
d8f9a643cd
5 измененных файлов с 2083 добавлено и 851 удалено
  1. 7 7
      libraries/metrics/package.json
  2. 1 1
      libraries/o-error/package.json
  3. 2072 841
      package-lock.json
  4. 2 1
      package.json
  5. 1 1
      services/real-time/package.json

+ 7 - 7
libraries/metrics/package.json

@@ -8,14 +8,14 @@
   },
   },
   "main": "index.js",
   "main": "index.js",
   "dependencies": {
   "dependencies": {
-    "@google-cloud/opentelemetry-cloud-trace-exporter": "^2.1.0",
+    "@google-cloud/opentelemetry-cloud-trace-exporter": "^2.4.1",
     "@google-cloud/profiler": "^6.0.3",
     "@google-cloud/profiler": "^6.0.3",
-    "@opentelemetry/api": "^1.4.1",
-    "@opentelemetry/auto-instrumentations-node": "^0.39.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.41.2",
-    "@opentelemetry/resources": "^1.15.2",
-    "@opentelemetry/sdk-node": "^0.41.2",
-    "@opentelemetry/semantic-conventions": "^1.15.2",
+    "@opentelemetry/api": "1.9.0",
+    "@opentelemetry/auto-instrumentations-node": "^0.70.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.212.0",
+    "@opentelemetry/resources": "^1.30.1",
+    "@opentelemetry/sdk-node": "^0.212.0",
+    "@opentelemetry/semantic-conventions": "^1.39.0",
     "compression": "^1.7.4",
     "compression": "^1.7.4",
     "prom-client": "^14.1.1",
     "prom-client": "^14.1.1",
     "yn": "^3.1.1"
     "yn": "^3.1.1"

+ 1 - 1
libraries/o-error/package.json

@@ -30,7 +30,7 @@
   "repository": "github:overleaf/o-error",
   "repository": "github:overleaf/o-error",
   "devDependencies": {
   "devDependencies": {
     "@types/chai": "^4.3.0",
     "@types/chai": "^4.3.0",
-    "@types/node": "^18.19.123",
+    "@types/node": "^24.5.2",
     "chai": "^4.3.6",
     "chai": "^4.3.6",
     "mocha": "^11.1.0",
     "mocha": "^11.1.0",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-junit-reporter": "^2.2.1",

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


+ 2 - 1
package.json

@@ -41,7 +41,8 @@
       "@cypress/request@3.0.9": {
       "@cypress/request@3.0.9": {
         "qs": "6.14.1"
         "qs": "6.14.1"
       }
       }
-    }
+    },
+    "@opentelemetry/api": "1.9.0"
   },
   },
   "scripts": {
   "scripts": {
     "format": "prettier --cache --cache-location ./node_modules/.cache/prettier/.prettier-cache --check",
     "format": "prettier --cache --cache-location ./node_modules/.cache/prettier/.prettier-cache --check",

+ 1 - 1
services/real-time/package.json

@@ -46,7 +46,7 @@
     "mocha-junit-reporter": "^2.2.1",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "mocha-multi-reporters": "^1.5.1",
     "sinon": "^9.2.4",
     "sinon": "^9.2.4",
-    "sinon-chai": "4.0.1",
+    "sinon-chai": "^3.7.0",
     "timekeeper": "0.0.4",
     "timekeeper": "0.0.4",
     "typescript": "^5.0.4",
     "typescript": "^5.0.4",
     "uid-safe": "^2.1.5",
     "uid-safe": "^2.1.5",

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