open-telemetry
/
opentelemetry-js
mirror of https://github.com/open-telemetry/opentelemetry-js.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(deps): remove unused cpx dependencies and update used ones to cpx2 (#4510) 

* chore(deps): remove unused cpx dependencies and update used ones to cpx2

* fix: sync package-lock, introduce timeout
This commit is contained in:
Marc Pichler 2024-05-28 09:43:24 +02:00 committed by GitHub
parent 7238852445
commit 82b7526b02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 109 additions and 3186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
experimental/packages/exporter-logs-otlp-grpc/package.json
View File

@ -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",

1
experimental/packages/exporter-logs-otlp-http/package.json
View File

@ -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",

1
experimental/packages/exporter-logs-otlp-proto/package.json
View File

@ -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",

1
experimental/packages/exporter-trace-otlp-grpc/package.json
View File

@ -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",

1
experimental/packages/exporter-trace-otlp-http/package.json
View File

@ -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",

1
experimental/packages/exporter-trace-otlp-proto/package.json
View File

@ -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",

1
experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json
View File

@ -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",

1
experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json
View File

@ -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",

1
experimental/packages/opentelemetry-exporter-metrics-otlp-proto/package.json
View File

@ -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",

2
experimental/packages/opentelemetry-instrumentation/package.json
View File

@ -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",

23
experimental/packages/opentelemetry-instrumentation/test/node/RequireInTheMiddleSingleton.test.ts
View File

@ -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);
});
});
});

1
experimental/packages/otlp-grpc-exporter-base/package.json
View File

@ -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",

3260
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff