chore(deps): remove unused cpx dependencies and update used ones to c…

…px2 (#4510) * chore(deps): remove unused cpx dependencies and update used ones to cpx2 * fix: sync package-lock, introduce timeout
open-telemetry · May 28, 2024 · 82b7526 · 82b7526
1 parent 7238852
commit 82b7526
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 3,186 deletions.
diff --git a/experimental/packages/exporter-logs-otlp-grpc/package.json b/experimental/packages/exporter-logs-otlp-grpc/package.json
@@ -58,7 +58,6 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "10.2.0",

diff --git a/experimental/packages/exporter-logs-otlp-http/package.json b/experimental/packages/exporter-logs-otlp-http/package.json
@@ -83,7 +83,6 @@
     "babel-loader": "8.3.0",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.1.0",

diff --git a/experimental/packages/exporter-logs-otlp-proto/package.json b/experimental/packages/exporter-logs-otlp-proto/package.json
@@ -72,7 +72,6 @@
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.1.0",

diff --git a/experimental/packages/exporter-trace-otlp-grpc/package.json b/experimental/packages/exporter-trace-otlp-grpc/package.json
@@ -55,7 +55,6 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "10.2.0",

diff --git a/experimental/packages/exporter-trace-otlp-http/package.json b/experimental/packages/exporter-trace-otlp-http/package.json
@@ -74,7 +74,6 @@
     "babel-loader": "8.3.0",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.1.0",

diff --git a/experimental/packages/exporter-trace-otlp-proto/package.json b/experimental/packages/exporter-trace-otlp-proto/package.json
@@ -71,7 +71,6 @@
     "@types/sinon": "17.0.3",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.1.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
@@ -54,7 +54,6 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "10.2.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
@@ -74,7 +74,6 @@
     "babel-loader": "8.3.0",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.1.0",

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
@@ -61,7 +61,6 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "10.2.0",

diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json
@@ -95,7 +95,7 @@
     "babel-loader": "8.3.0",
     "babel-plugin-istanbul": "6.1.1",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
+    "cpx2": "2.0.0",
     "cross-var": "1.1.0",
     "karma": "6.4.3",
     "karma-chrome-launcher": "3.1.0",

diff --git a/...ntal/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts b/...ntal/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts
@@ -39,8 +39,8 @@ describe('RequireInTheMiddleSingleton', () => {
     const onRequireFsPromisesStub = makeOnRequiresStub('fs-promises');
     const onRequireCodecovStub = makeOnRequiresStub('codecov');
     const onRequireCodecovLibStub = makeOnRequiresStub('codecov-lib');
-    const onRequireCpxStub = makeOnRequiresStub('cpx');
-    const onRequireCpxLibStub = makeOnRequiresStub('cpx-lib');
+    const onRequireCpxStub = makeOnRequiresStub('cpx2');
+    const onRequireCpxLibStub = makeOnRequiresStub('cpx2-lib');
 
     before(() => {
       requireInTheMiddleSingleton.register('fs', onRequireFsStub);
@@ -53,9 +53,9 @@ describe('RequireInTheMiddleSingleton', () => {
         'codecov/lib/codecov.js',
         onRequireCodecovLibStub
       );
-      requireInTheMiddleSingleton.register('cpx', onRequireCpxStub);
+      requireInTheMiddleSingleton.register('cpx2', onRequireCpxStub);
       requireInTheMiddleSingleton.register(
-        'cpx/lib/copy-sync.js',
+        'cpx2/lib/copy-sync.js',
         onRequireCpxLibStub
       );
     });
@@ -150,16 +150,19 @@ describe('RequireInTheMiddleSingleton', () => {
     describe('non-core module with sub-path', () => {
       describe('AND module name matches', () => {
         const baseDir = path.resolve(
-          path.dirname(require.resolve('cpx')),
+          path.dirname(require.resolve('cpx2')),
           '..'
         );
-        const modulePath = path.join('cpx', 'lib', 'copy-sync.js');
+        const modulePath = path.join('cpx2', 'lib', 'copy-sync.js');
         it('should call `onRequire`', () => {
-          const exports = require('cpx/lib/copy-sync');
-          assert.deepStrictEqual(exports.__ritmOnRequires, ['cpx', 'cpx-lib']);
+          const exports = require('cpx2/lib/copy-sync');
+          assert.deepStrictEqual(exports.__ritmOnRequires, [
+            'cpx2',
+            'cpx2-lib',
+          ]);
           sinon.assert.calledWithMatch(
             onRequireCpxStub,
-            { __ritmOnRequires: ['cpx', 'cpx-lib'] },
+            { __ritmOnRequires: ['cpx2', 'cpx2-lib'] },
             modulePath,
             baseDir
           );
@@ -175,7 +178,7 @@ describe('RequireInTheMiddleSingleton', () => {
             modulePath,
             baseDir
           );
-        });
+        }).timeout(30000);
       });
     });
   });

diff --git a/experimental/packages/otlp-grpc-exporter-base/package.json b/experimental/packages/otlp-grpc-exporter-base/package.json
@@ -54,7 +54,6 @@
     "@types/node": "18.6.5",
     "@types/sinon": "17.0.3",
     "codecov": "3.8.3",
-    "cpx": "1.5.0",
     "cross-var": "1.1.0",
     "lerna": "6.6.2",
     "mocha": "10.2.0",