diff --git a/package.json b/package.json index 3eadffd0..109f66d7 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,17 @@ "turbo-ignore": "1.10.3", "typescript": "5.0.4" }, + "pnpm": { + "overrides": { + "@opentelemetry/api": "1.4.1", + "@opentelemetry/core": "1.13.0", + "@opentelemetry/exporter-trace-otlp-grpc": "0.39.1", + "@opentelemetry/resources": "1.13.0", + "@opentelemetry/sdk-trace-base": "1.13.0", + "@opentelemetry/sdk-trace-node": "1.13.0", + "@opentelemetry/semantic-conventions": "1.13.0" + } + }, "packageManager": "pnpm@8.6.5", "volta": { "node": "18.14.2" diff --git a/packages/sozluk-content/package.json b/packages/sozluk-content/package.json index 2e6c0e0c..df88d566 100644 --- a/packages/sozluk-content/package.json +++ b/packages/sozluk-content/package.json @@ -17,7 +17,7 @@ "contentlayer": "0.3.3", "mdx-bundler": "9.2.1", "remark-wiki-link-plus": "1.1.1", - "next-contentlayer": "^0.3.4" + "next-contentlayer": "^0.3.3" }, "devDependencies": { "@turbo/gen": "1.10.7" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a9cdb890..d1da3fe1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,15 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + '@opentelemetry/api': 1.4.1 + '@opentelemetry/core': 1.13.0 + '@opentelemetry/exporter-trace-otlp-grpc': 0.39.1 + '@opentelemetry/resources': 1.13.0 + '@opentelemetry/sdk-trace-base': 1.13.0 + '@opentelemetry/sdk-trace-node': 1.13.0 + '@opentelemetry/semantic-conventions': 1.13.0 + importers: .: @@ -412,7 +421,7 @@ importers: specifier: 9.2.1 version: 9.2.1(esbuild@0.18.11) next-contentlayer: - specifier: ^0.3.4 + specifier: ^0.3.3 version: 0.3.4(contentlayer@0.3.3)(esbuild@0.18.11)(next@13.4.4)(react-dom@18.2.0)(react@18.2.0) remark-wiki-link-plus: specifier: 1.1.1 @@ -3070,17 +3079,17 @@ packages: optional: true dependencies: '@effect-ts/core': 0.60.5 - '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0) - '@effect-ts/otel-exporter-trace-otlp-grpc': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/exporter-trace-otlp-grpc@0.39.1)(@opentelemetry/sdk-trace-base@1.15.0) - '@effect-ts/otel-sdk-trace-node': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0)(@opentelemetry/sdk-trace-node@1.15.0) + '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0) + '@effect-ts/otel-exporter-trace-otlp-grpc': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/exporter-trace-otlp-grpc@0.39.1)(@opentelemetry/sdk-trace-base@1.13.0) + '@effect-ts/otel-sdk-trace-node': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0)(@opentelemetry/sdk-trace-node@1.13.0) '@js-temporal/polyfill': 0.4.4 '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) '@opentelemetry/exporter-trace-otlp-grpc': 0.39.1(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-node': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.15.0 + '@opentelemetry/resources': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-node': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.13.0 chokidar: 3.5.3 hash-wasm: 4.9.0 inflection: 2.0.1 @@ -3103,17 +3112,17 @@ packages: optional: true dependencies: '@effect-ts/core': 0.60.5 - '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0) - '@effect-ts/otel-exporter-trace-otlp-grpc': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/exporter-trace-otlp-grpc@0.39.1)(@opentelemetry/sdk-trace-base@1.15.0) - '@effect-ts/otel-sdk-trace-node': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0)(@opentelemetry/sdk-trace-node@1.15.0) + '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0) + '@effect-ts/otel-exporter-trace-otlp-grpc': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/exporter-trace-otlp-grpc@0.39.1)(@opentelemetry/sdk-trace-base@1.13.0) + '@effect-ts/otel-sdk-trace-node': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0)(@opentelemetry/sdk-trace-node@1.13.0) '@js-temporal/polyfill': 0.4.4 '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) '@opentelemetry/exporter-trace-otlp-grpc': 0.39.1(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-node': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.15.0 + '@opentelemetry/resources': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-node': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/semantic-conventions': 1.13.0 chokidar: 3.5.3 hash-wasm: 4.9.0 inflection: 2.0.1 @@ -3149,7 +3158,7 @@ packages: '@effect-ts/system': 0.57.5 dev: false - /@effect-ts/otel-exporter-trace-otlp-grpc@0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/exporter-trace-otlp-grpc@0.39.1)(@opentelemetry/sdk-trace-base@1.15.0): + /@effect-ts/otel-exporter-trace-otlp-grpc@0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/exporter-trace-otlp-grpc@0.39.1)(@opentelemetry/sdk-trace-base@1.13.0): resolution: {integrity: sha512-47gAg0O2pW5Jlo86jfzjdkwL5a7Bzb+Kj5WTmdu4CxYRfWn9ytKjuuYIfsNDW8neuhdKzn+P5wCddgEh0glYyQ==} peerDependencies: '@effect-ts/core': ^0.60.2 @@ -3159,14 +3168,14 @@ packages: '@opentelemetry/sdk-trace-base': ^1.13.0 dependencies: '@effect-ts/core': 0.60.5 - '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0) + '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0) '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) '@opentelemetry/exporter-trace-otlp-grpc': 0.39.1(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) dev: false - /@effect-ts/otel-sdk-trace-node@0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0)(@opentelemetry/sdk-trace-node@1.15.0): + /@effect-ts/otel-sdk-trace-node@0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0)(@opentelemetry/sdk-trace-node@1.13.0): resolution: {integrity: sha512-a2sF0ylmn8xOJs8fNeT/spJ1gUcsksAJCALxo9WOfuTCMtTwMVtVhCKEPEeQoL7wFqU+JgPkVdP91+FJ/Rkeow==} peerDependencies: '@effect-ts/core': ^0.60.2 @@ -3176,14 +3185,14 @@ packages: '@opentelemetry/sdk-trace-node': ^1.13.0 dependencies: '@effect-ts/core': 0.60.5 - '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0) + '@effect-ts/otel': 0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0) '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-node': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-node': 1.13.0(@opentelemetry/api@1.4.1) dev: false - /@effect-ts/otel@0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.15.0)(@opentelemetry/sdk-trace-base@1.15.0): + /@effect-ts/otel@0.15.1(@effect-ts/core@0.60.5)(@opentelemetry/api@1.4.1)(@opentelemetry/core@1.13.0)(@opentelemetry/sdk-trace-base@1.13.0): resolution: {integrity: sha512-AmZJHl7t0+Peh7Yb2+hqn6r9+rd9/UfeA4AMV9h0YGTdOyouyFfD3wzWlxnAUzAQ4Lrod4kC7Noruret4EpqpA==} peerDependencies: '@effect-ts/core': ^0.60.2 @@ -3193,8 +3202,8 @@ packages: dependencies: '@effect-ts/core': 0.60.5 '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) dev: false /@effect-ts/system@0.57.5: @@ -4923,14 +4932,13 @@ packages: engines: {node: '>=8.0.0'} dev: false - /@opentelemetry/context-async-hooks@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-sfxQOyAyV3WsKswGX0Yx3P+e7t3EtxpF/PC+6e4+rqs88oUfTaP3214iz4GQuuzV9yCG8DRWTZ96J6E/iD0qeA==} + /@opentelemetry/context-async-hooks@1.13.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-pS5fU4lrRjOIPZQqA2V1SUM9QUFXbO+8flubAiy6ntLjnAjJJUdRFOUOxK6v86ZHI2p2S8A0vD0BTu95FZYvjA==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.5.0' dependencies: '@opentelemetry/api': 1.4.1 - tslib: 2.6.0 dev: false /@opentelemetry/core@1.13.0(@opentelemetry/api@1.4.1): @@ -4943,17 +4951,6 @@ packages: '@opentelemetry/semantic-conventions': 1.13.0 dev: false - /@opentelemetry/core@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-GGTS6BytfaN8OgbCUOnxg/a9WVsVUj0484zXHZuBzvIXx7V4Tmkb0IHnnhS7Q0cBLNLgjNuvrCpQaP8fIvO4bg==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.5.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/semantic-conventions': 1.15.0 - tslib: 2.6.0 - dev: false - /@opentelemetry/exporter-trace-otlp-grpc@0.39.1(@opentelemetry/api@1.4.1): resolution: {integrity: sha512-l5RhLKx6U+yuLhMrtgavTDthX50E1mZM3/SSySC7OPZiArFHV/b/9x9jxAzrOgIQUDxyj4N0V9aLKSA2t7Qzxg==} engines: {node: '>=14'} @@ -5007,26 +5004,24 @@ packages: '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) dev: false - /@opentelemetry/propagator-b3@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-YafSIITpCmo76VdlJ/GvS5x+uuRWCU5BqCOV9CITi11Tk4aqTxMR3pXlMoPYQWstUUgacQf4dGcdvdS+1rkDWQ==} + /@opentelemetry/propagator-b3@1.13.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-HOo91EI4UbuG8xQVLFziTzrcIn0MJQhy8m9jorh8aonb94jFVFi3CFNIiAnIGOabmnshJLOABxpYXsiPB8Xnzg==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.5.0' dependencies: '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - tslib: 2.6.0 + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) dev: false - /@opentelemetry/propagator-jaeger@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-OU6WNxuqjxNZoRcIBCsmvTBktAPuBUj1bh+DI+oYAvzwP2NXLavSDJWjVMGTJQDgZuR7lFijmx9EfwyAO9x37Q==} + /@opentelemetry/propagator-jaeger@1.13.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-IV9TO+u1Jzm9mUDAD3gyXf89eyvgEJUY1t+GB5QmS4wjVeWrSMUtD0JjH3yG9SNqkrQOqOGJq7YUSSetW+Lf5Q==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.5.0' dependencies: '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - tslib: 2.6.0 + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) dev: false /@opentelemetry/resources@1.13.0(@opentelemetry/api@1.4.1): @@ -5040,18 +5035,6 @@ packages: '@opentelemetry/semantic-conventions': 1.13.0 dev: false - /@opentelemetry/resources@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-Sb8A6ZXHXDlgHv32UNRE3y8McWE3vkb5dsSttYArYa5ZpwjiF5ge0vnnKUUnG7bY0AgF9VBIOORZE8gsrnD2WA==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.5.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.15.0 - tslib: 2.6.0 - dev: false - /@opentelemetry/sdk-logs@0.39.1(@opentelemetry/api-logs@0.39.1)(@opentelemetry/api@1.4.1): resolution: {integrity: sha512-/gmgKfZ1ZVFporKuwsewqIyvaUIGpv76JZ7lBpHQQPb37IMpaXO6pdqFI4ebHAWfNIm3akMyhmdtzivcgF3lgw==} engines: {node: '>=14'} @@ -5089,33 +5072,19 @@ packages: '@opentelemetry/semantic-conventions': 1.13.0 dev: false - /@opentelemetry/sdk-trace-base@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-udt1c9VHipbZwvCPIQR1VLg25Z4AMR/g0X8KmcInbFruGWQ/lptVPkz3yvWAsGSta5yHNQ3uoPwcyCygGnQ6Lg==} - engines: {node: '>=14'} - peerDependencies: - '@opentelemetry/api': '>=1.0.0 <1.5.0' - dependencies: - '@opentelemetry/api': 1.4.1 - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/resources': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/semantic-conventions': 1.15.0 - tslib: 2.6.0 - dev: false - - /@opentelemetry/sdk-trace-node@1.15.0(@opentelemetry/api@1.4.1): - resolution: {integrity: sha512-TKBx9oThZUVKkoGpXhFT/XUgpjq28TWwc6j3JlsL+cJX77DKBnVC+2H+kdVVJHRzyfqDx4LEJJVCwQO3K+cbXA==} + /@opentelemetry/sdk-trace-node@1.13.0(@opentelemetry/api@1.4.1): + resolution: {integrity: sha512-FXA85lXKTsnbOflA/TBuBf2pmhD3c8uDjNjG0YqK+ap8UayfALmfJhf+aG1yBOUHevCY0JXJ4/xtbXExxpsMog==} engines: {node: '>=14'} peerDependencies: '@opentelemetry/api': '>=1.0.0 <1.5.0' dependencies: '@opentelemetry/api': 1.4.1 - '@opentelemetry/context-async-hooks': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/core': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/propagator-b3': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/propagator-jaeger': 1.15.0(@opentelemetry/api@1.4.1) - '@opentelemetry/sdk-trace-base': 1.15.0(@opentelemetry/api@1.4.1) + '@opentelemetry/context-async-hooks': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/core': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/propagator-b3': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/propagator-jaeger': 1.13.0(@opentelemetry/api@1.4.1) + '@opentelemetry/sdk-trace-base': 1.13.0(@opentelemetry/api@1.4.1) semver: 7.5.4 - tslib: 2.6.0 dev: false /@opentelemetry/semantic-conventions@1.13.0: @@ -5123,13 +5092,6 @@ packages: engines: {node: '>=14'} dev: false - /@opentelemetry/semantic-conventions@1.15.0: - resolution: {integrity: sha512-f3wwFrFyCpGrFBrFs7lCUJSCSCGyeKG52c+EKeobs3Dd29M75yO6GYkt6PkYPfDawxSlV5p+4yJPPk8tPObzTQ==} - engines: {node: '>=14'} - dependencies: - tslib: 2.6.0 - dev: false - /@panva/hkdf@1.1.1: resolution: {integrity: sha512-dhPeilub1NuIG0X5Kvhh9lH4iW3ZsHlnzwgwbOlgwQ2wG1IqFzsgHqmKPk3WzsdWAeaxKJxgM0+W433RmN45GA==} dev: false