diff --git a/.gitmodules b/.gitmodules index f7b239b9..4d70bcf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "examples/next-contentlayer-example"] path = examples/next-contentlayer-example - url = git@github.com:contentlayerdev/next-contentlayer-example.git + url = git@github.com:timlrx/next-contentlayer2-example.git diff --git a/examples/next-contentlayer-example b/examples/next-contentlayer-example index 88da0859..572b7d4c 160000 --- a/examples/next-contentlayer-example +++ b/examples/next-contentlayer-example @@ -1 +1 @@ -Subproject commit 88da08590d6a19c9d1678007c0f2a40513d12981 +Subproject commit 572b7d4ced884a67800383693bf48b43846c071e diff --git a/package.json b/package.json index ce89630b..550767e3 100644 --- a/package.json +++ b/package.json @@ -28,15 +28,14 @@ "devDependencies": { "@changesets/cli": "2.19.0-temp.0", "@effect-ts/tracing-plugin": "^0.20.0", - "@types/prettier": "^2.7.3", - "@typescript-eslint/eslint-plugin": "^5.60.1", - "@typescript-eslint/parser": "^5.60.1", - "eslint": "^8.43.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-import": "^2.27.5", + "@typescript-eslint/eslint-plugin": "^7.7.1", + "@typescript-eslint/parser": "^7.7.1", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", + "eslint-plugin-import": "^2.29.1", "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-simple-import-sort": "^10.0.0", - "prettier": "^2.8.8", + "eslint-plugin-simple-import-sort": "^12.1.0", + "prettier": "^3.2.5", "ts-patch": "^2.1.0", "typescript": "^5.1.6" }, diff --git a/packages/@contentlayer/client/src/guards.ts b/packages/@contentlayer/client/src/guards.ts index d2dfde32..aaf81e26 100644 --- a/packages/@contentlayer/client/src/guards.ts +++ b/packages/@contentlayer/client/src/guards.ts @@ -23,8 +23,8 @@ type TypeNameOneOrMany = GetDocumentTypeNamesGen | GetDocumentTypeNamesGen[] type TypeForTypeNameOneOrMany = N extends GetDocumentTypeNamesGen ? GetDocumentTypeMapGen[N] : N extends GetDocumentTypeNamesGen[] - ? GetDocumentTypeMapGen[N[number]] - : never + ? GetDocumentTypeMapGen[N[number]] + : never function is(typeName: N, _: any): _ is TypeForTypeNameOneOrMany function is(typeName: N): (_: any) => _ is TypeForTypeNameOneOrMany diff --git a/packages/@contentlayer/core/src/_ArtifactsDir.ts b/packages/@contentlayer/core/src/_ArtifactsDir.ts index eb535a30..f5bdb647 100644 --- a/packages/@contentlayer/core/src/_ArtifactsDir.ts +++ b/packages/@contentlayer/core/src/_ArtifactsDir.ts @@ -12,16 +12,15 @@ import { getCwd } from './cwd.js' export const getDirPath = ({ cwd }: { cwd: AbsolutePosixFilePath }): AbsolutePosixFilePath => filePathJoin(cwd, '.contentlayer' as AbsolutePosixFilePath) -export const mkdir: T.Effect = T.gen(function* ( - $, -) { - const cwd = yield* $(getCwd) - const dirPath = getDirPath({ cwd }) +export const mkdir: T.Effect = T.gen( + function* ($) { + const cwd = yield* $(getCwd) + const dirPath = getDirPath({ cwd }) + yield* $(fs.mkdirp(dirPath)) - yield* $(fs.mkdirp(dirPath)) - - return dirPath -}) + return dirPath + }, +) export const getCacheDirPath: T.Effect< OT.HasTracer & HasCwd & fs.HasFs, diff --git a/packages/@contentlayer/experimental-source-files-stackbit/vitest.config.ts b/packages/@contentlayer/experimental-source-files-stackbit/vitest.config.ts index 8005d8da..1705bd9c 100644 --- a/packages/@contentlayer/experimental-source-files-stackbit/vitest.config.ts +++ b/packages/@contentlayer/experimental-source-files-stackbit/vitest.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from 'vitest/config' import path from 'path' +import { defineConfig } from 'vitest/config' export default defineConfig({ test: { diff --git a/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts b/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts index b961f280..6400ab4f 100644 --- a/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts +++ b/packages/@contentlayer/source-files/src/fetchData/mapping/field-image.ts @@ -58,7 +58,6 @@ const getImageFieldData = ({ const filePath = utils.filePathJoin(documentDirPath, imagePath) const absoluteFilePath = utils.filePathJoin(contentDirPath, documentDirPath, imagePath) const relativeFilePath = utils.relative(utils.filePathJoin(contentDirPath, documentDirPath), absoluteFilePath) - const fileBuffer = yield* $(fs.readFileBuffer(absoluteFilePath)) const { resizedData, height, width, format } = yield* $(processImage(fileBuffer)) diff --git a/packages/@contentlayer/source-files/vitest.config.ts b/packages/@contentlayer/source-files/vitest.config.ts index 8005d8da..1705bd9c 100644 --- a/packages/@contentlayer/source-files/vitest.config.ts +++ b/packages/@contentlayer/source-files/vitest.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from 'vitest/config' import path from 'path' +import { defineConfig } from 'vitest/config' export default defineConfig({ test: { diff --git a/packages/@contentlayer/utils/package.json b/packages/@contentlayer/utils/package.json index 992b3c71..849dedb1 100644 --- a/packages/@contentlayer/utils/package.json +++ b/packages/@contentlayer/utils/package.json @@ -62,9 +62,9 @@ "@effect-ts/otel-exporter-trace-otlp-grpc": "^0.15.1", "@effect-ts/otel-sdk-trace-node": "^0.15.1", "@js-temporal/polyfill": "^0.4.4", - "@opentelemetry/api": "^1.7.0", - "@opentelemetry/core": "^1.21.0", - "@opentelemetry/exporter-trace-otlp-grpc": "^0.48.0", + "@opentelemetry/api": "^1.8.0", + "@opentelemetry/core": "^1.24.0", + "@opentelemetry/exporter-trace-otlp-grpc": "^0.51.0", "@opentelemetry/resources": "^1.21.0", "@opentelemetry/sdk-trace-base": "^1.21.0", "@opentelemetry/sdk-trace-node": "^1.21.0", diff --git a/packages/@contentlayer/utils/src/node/fs-watcher.ts b/packages/@contentlayer/utils/src/node/fs-watcher.ts index f367f8ce..1096c565 100644 --- a/packages/@contentlayer/utils/src/node/fs-watcher.ts +++ b/packages/@contentlayer/utils/src/node/fs-watcher.ts @@ -19,31 +19,46 @@ import { unknownFilePath } from '../file-paths.js' export class FileAdded { readonly _tag = 'FileAdded' - constructor(public path: UnknownFilePath, public stats: O.Option) {} + constructor( + public path: UnknownFilePath, + public stats: O.Option, + ) {} } export class FileRemoved { readonly _tag = 'FileRemoved' - constructor(public path: UnknownFilePath, public stats: O.Option) {} + constructor( + public path: UnknownFilePath, + public stats: O.Option, + ) {} } export class FileChanged { readonly _tag = 'FileChanged' - constructor(public path: UnknownFilePath, public stats: O.Option) {} + constructor( + public path: UnknownFilePath, + public stats: O.Option, + ) {} } export class DirectoryAdded { readonly _tag = 'DirectoryAdded' - constructor(public path: UnknownFilePath, public stats: O.Option) {} + constructor( + public path: UnknownFilePath, + public stats: O.Option, + ) {} } export class DirectoryRemoved { readonly _tag = 'DirectoryRemoved' - constructor(public path: UnknownFilePath, public stats: O.Option) {} + constructor( + public path: UnknownFilePath, + public stats: O.Option, + ) {} } export type FileSystemEvent = FileAdded | FileRemoved | FileChanged | DirectoryAdded | DirectoryRemoved diff --git a/packages/contentlayer-stackbit-yaml-generator/vitest.config.ts b/packages/contentlayer-stackbit-yaml-generator/vitest.config.ts index 1ded6e4c..55cc11c7 100644 --- a/packages/contentlayer-stackbit-yaml-generator/vitest.config.ts +++ b/packages/contentlayer-stackbit-yaml-generator/vitest.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from 'vitest/config' import path from 'path' +import { defineConfig } from 'vitest/config' export default defineConfig({ test: { diff --git a/packages/integration-tests/src/mdx-remark-images/index.test.ts b/packages/integration-tests/src/mdx-remark-images/index.test.ts index 9de2dddb..aa641965 100644 --- a/packages/integration-tests/src/mdx-remark-images/index.test.ts +++ b/packages/integration-tests/src/mdx-remark-images/index.test.ts @@ -31,7 +31,6 @@ test('mdx - resolveCwd - contentDirPath', async () => { documentTypes: [Post], mdx: { resolveCwd: 'contentDirPath', - // @ts-ignore - remarkMdxImages has not been updated to the new unified js types remarkPlugins: [remarkMdxImages], esbuildOptions: (options) => { options.platform = 'node' @@ -78,7 +77,6 @@ test('mdx - resolveCwd - relative', async () => { documentTypes: [Post], mdx: { resolveCwd: 'relative', - // @ts-ignore - remarkMdxImages has not been updated to the new unified js types remarkPlugins: [remarkMdxImages], esbuildOptions: (options) => { options.platform = 'node' diff --git a/packages/integration-tests/vitest.config.ts b/packages/integration-tests/vitest.config.ts index 1ded6e4c..55cc11c7 100644 --- a/packages/integration-tests/vitest.config.ts +++ b/packages/integration-tests/vitest.config.ts @@ -1,5 +1,5 @@ -import { defineConfig } from 'vitest/config' import path from 'path' +import { defineConfig } from 'vitest/config' export default defineConfig({ test: { diff --git a/yarn.lock b/yarn.lock index 2a5631fc..d26c6b96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -441,9 +441,9 @@ __metadata: "@effect-ts/otel-exporter-trace-otlp-grpc": ^0.15.1 "@effect-ts/otel-sdk-trace-node": ^0.15.1 "@js-temporal/polyfill": ^0.4.4 - "@opentelemetry/api": ^1.7.0 - "@opentelemetry/core": ^1.21.0 - "@opentelemetry/exporter-trace-otlp-grpc": ^0.48.0 + "@opentelemetry/api": ^1.8.0 + "@opentelemetry/core": ^1.24.0 + "@opentelemetry/exporter-trace-otlp-grpc": ^0.51.0 "@opentelemetry/resources": ^1.21.0 "@opentelemetry/sdk-trace-base": ^1.21.0 "@opentelemetry/sdk-trace-node": ^1.21.0 @@ -717,7 +717,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -728,7 +728,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1": +"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1": version: 4.10.0 resolution: "@eslint-community/regexpp@npm:4.10.0" checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b @@ -1520,16 +1520,16 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api-logs@npm:0.48.0": - version: 0.48.0 - resolution: "@opentelemetry/api-logs@npm:0.48.0" +"@opentelemetry/api-logs@npm:0.51.0": + version: 0.51.0 + resolution: "@opentelemetry/api-logs@npm:0.51.0" dependencies: "@opentelemetry/api": ^1.0.0 - checksum: 2224d0da74cb65219bf802f234051b3b6fe3deba599151e46f490b0194719eb0b989f5f335842bcf2709c9aa15c6edb2b9bd4d477b78a3a3be43bce20f563299 + checksum: 3cf11263eedf95300240036ed98e55a62c51d6d889faa4ca589401ca445da096f465b14f2fa16a64969c85e5c743212a288aac6ada9226f5ae7676844bf9f83a languageName: node linkType: hard -"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.7.0": +"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.8.0": version: 1.8.0 resolution: "@opentelemetry/api@npm:1.8.0" checksum: 0e32079975f05bee6de2ad8ade097f0afdc63f462c76550150fce2444c73ab92aaf851ac85e638b6e3b269da6640ac7e63f33913a0fd7df9f9beec2e100759df @@ -1545,82 +1545,82 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/core@npm:1.21.0": - version: 1.21.0 - resolution: "@opentelemetry/core@npm:1.21.0" +"@opentelemetry/core@npm:1.23.0": + version: 1.23.0 + resolution: "@opentelemetry/core@npm:1.23.0" dependencies: - "@opentelemetry/semantic-conventions": 1.21.0 + "@opentelemetry/semantic-conventions": 1.23.0 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.8.0" - checksum: 857eb667732edd1ad20107446935f1860b67602ab78493c2d0fc1711fdff0d8d1b63afcf1ea28468d62605e1237a38feb641ed9a154c3af87adb21b54101ba65 + "@opentelemetry/api": ">=1.0.0 <1.9.0" + checksum: 88aa733364c42f90a61a6efc8b5138dcfed4763f3a0692d957d506a6fe49db943169a0631ad762ac7569723faf5eaca092d6590eca1ad8ff77583fb10512a06b languageName: node linkType: hard -"@opentelemetry/core@npm:1.23.0, @opentelemetry/core@npm:^1.21.0": - version: 1.23.0 - resolution: "@opentelemetry/core@npm:1.23.0" +"@opentelemetry/core@npm:1.24.0, @opentelemetry/core@npm:^1.24.0": + version: 1.24.0 + resolution: "@opentelemetry/core@npm:1.24.0" dependencies: - "@opentelemetry/semantic-conventions": 1.23.0 + "@opentelemetry/semantic-conventions": 1.24.0 peerDependencies: "@opentelemetry/api": ">=1.0.0 <1.9.0" - checksum: 88aa733364c42f90a61a6efc8b5138dcfed4763f3a0692d957d506a6fe49db943169a0631ad762ac7569723faf5eaca092d6590eca1ad8ff77583fb10512a06b + checksum: b1af2641cd3af62fae772c97701434e45fbb2bbd53403aa640a589548f852759279598134b4338ed48bcde6099e273b2f34686cbf1e817d566282e3b846397b7 languageName: node linkType: hard -"@opentelemetry/exporter-trace-otlp-grpc@npm:^0.48.0": - version: 0.48.0 - resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.48.0" +"@opentelemetry/exporter-trace-otlp-grpc@npm:^0.51.0": + version: 0.51.0 + resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.51.0" dependencies: "@grpc/grpc-js": ^1.7.1 - "@opentelemetry/core": 1.21.0 - "@opentelemetry/otlp-grpc-exporter-base": 0.48.0 - "@opentelemetry/otlp-transformer": 0.48.0 - "@opentelemetry/resources": 1.21.0 - "@opentelemetry/sdk-trace-base": 1.21.0 + "@opentelemetry/core": 1.24.0 + "@opentelemetry/otlp-grpc-exporter-base": 0.51.0 + "@opentelemetry/otlp-transformer": 0.51.0 + "@opentelemetry/resources": 1.24.0 + "@opentelemetry/sdk-trace-base": 1.24.0 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: ce345c0a872af36a946d7287ec516f55c88bd3a95dfac78a6e72bbb5c3b431b201727206880b75c522f9cfadd8691207a6f91004c1263793042313958321bf60 + checksum: 5109421b87d67dd41850372b8a00f60bfe6a93813d7a323568184a93551fe4770387b160c3c43db51e36f17ea308af09c41f8416fd7f7847906f27399fc2f4f9 languageName: node linkType: hard -"@opentelemetry/otlp-exporter-base@npm:0.48.0": - version: 0.48.0 - resolution: "@opentelemetry/otlp-exporter-base@npm:0.48.0" +"@opentelemetry/otlp-exporter-base@npm:0.51.0": + version: 0.51.0 + resolution: "@opentelemetry/otlp-exporter-base@npm:0.51.0" dependencies: - "@opentelemetry/core": 1.21.0 + "@opentelemetry/core": 1.24.0 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: 9b6b163842588b5074ea82a796b773914a2bc94706c4fd2dc7962b693e4802c01441cb441dbc2cf134b23ca481b2fab463121f938527abb9a04790f67119101e + checksum: 82c7bee193de6dff1dbff5d56111605f9ae692ee9078c8c6c5636a05bb81de2d088b3be36338cfcef6f4ff8e03f14823849fff7ccb8bb0af27420195b0d92668 languageName: node linkType: hard -"@opentelemetry/otlp-grpc-exporter-base@npm:0.48.0": - version: 0.48.0 - resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.48.0" +"@opentelemetry/otlp-grpc-exporter-base@npm:0.51.0": + version: 0.51.0 + resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.51.0" dependencies: "@grpc/grpc-js": ^1.7.1 - "@opentelemetry/core": 1.21.0 - "@opentelemetry/otlp-exporter-base": 0.48.0 + "@opentelemetry/core": 1.24.0 + "@opentelemetry/otlp-exporter-base": 0.51.0 protobufjs: ^7.2.3 peerDependencies: "@opentelemetry/api": ^1.0.0 - checksum: 32994224240efe30ca6ec5de579d503904a4b3ec60581386133a6f15a7d965ba8b320b7b2a6930fefda9765d7af4e0284c06eb73a7d0a6b7f4928ed4a1d85acb + checksum: 41c70490a6fdc0eb5b72b8db52010c82724183c87c3385b43ab3e69e1053aa96c5e4514a98f8577230fa8c780563f5ef7daf88f2a4861c91a623ffb8c9a25f80 languageName: node linkType: hard -"@opentelemetry/otlp-transformer@npm:0.48.0": - version: 0.48.0 - resolution: "@opentelemetry/otlp-transformer@npm:0.48.0" +"@opentelemetry/otlp-transformer@npm:0.51.0": + version: 0.51.0 + resolution: "@opentelemetry/otlp-transformer@npm:0.51.0" dependencies: - "@opentelemetry/api-logs": 0.48.0 - "@opentelemetry/core": 1.21.0 - "@opentelemetry/resources": 1.21.0 - "@opentelemetry/sdk-logs": 0.48.0 - "@opentelemetry/sdk-metrics": 1.21.0 - "@opentelemetry/sdk-trace-base": 1.21.0 + "@opentelemetry/api-logs": 0.51.0 + "@opentelemetry/core": 1.24.0 + "@opentelemetry/resources": 1.24.0 + "@opentelemetry/sdk-logs": 0.51.0 + "@opentelemetry/sdk-metrics": 1.24.0 + "@opentelemetry/sdk-trace-base": 1.24.0 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.8.0" - checksum: eee9dd629f750a629e5ce3ea8c254e804d125e6d8b716d5083c494ea0c62554067ef5753b85877182ed3f529aa117fcd2dfea7b05a3306db69fcb146dfed00d9 + "@opentelemetry/api": ">=1.3.0 <1.9.0" + checksum: bf469c5d834fc14bbeb2744a94b6cbdba78914d1f6874ce1baa3f400ff3e3e5dae0117bc3159396a9a2eb0223e8147e26ca89f17f4ff6a63617c2cd2b7cbd93e languageName: node linkType: hard @@ -1646,18 +1646,6 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/resources@npm:1.21.0": - version: 1.21.0 - resolution: "@opentelemetry/resources@npm:1.21.0" - dependencies: - "@opentelemetry/core": 1.21.0 - "@opentelemetry/semantic-conventions": 1.21.0 - peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.8.0" - checksum: 79866dd673aa0b3cc4c2bbe614af48b7fa15e09661875c160eb00667832a83f531ea7c4bea8f1d3d97ee01ab5107152125ddc85837bf984c441471707417cacb - languageName: node - linkType: hard - "@opentelemetry/resources@npm:1.23.0, @opentelemetry/resources@npm:^1.21.0": version: 1.23.0 resolution: "@opentelemetry/resources@npm:1.23.0" @@ -1670,42 +1658,41 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/sdk-logs@npm:0.48.0": - version: 0.48.0 - resolution: "@opentelemetry/sdk-logs@npm:0.48.0" +"@opentelemetry/resources@npm:1.24.0": + version: 1.24.0 + resolution: "@opentelemetry/resources@npm:1.24.0" dependencies: - "@opentelemetry/core": 1.21.0 - "@opentelemetry/resources": 1.21.0 + "@opentelemetry/core": 1.24.0 + "@opentelemetry/semantic-conventions": 1.24.0 peerDependencies: - "@opentelemetry/api": ">=1.4.0 <1.8.0" - "@opentelemetry/api-logs": ">=0.39.1" - checksum: 2bac3ed3b87bdd0d6dbf00edbd7be78e94c9276a9cf1ecaa31d320272aa455cc5c5784b97f339f93237d80eecbdb6b8148cc1cfdcae1364ee60c4a0651b1a922 + "@opentelemetry/api": ">=1.0.0 <1.9.0" + checksum: b9a59d4267388aaec8d4adc1d708220209bdba1f60ef80fdf1436a23a4e1e04d0c05c33bf1cd08bec7ab75d1b7d2311d25bbe62253bd1d6efbb64102a7018958 languageName: node linkType: hard -"@opentelemetry/sdk-metrics@npm:1.21.0": - version: 1.21.0 - resolution: "@opentelemetry/sdk-metrics@npm:1.21.0" +"@opentelemetry/sdk-logs@npm:0.51.0": + version: 0.51.0 + resolution: "@opentelemetry/sdk-logs@npm:0.51.0" dependencies: - "@opentelemetry/core": 1.21.0 - "@opentelemetry/resources": 1.21.0 - lodash.merge: ^4.6.2 + "@opentelemetry/core": 1.24.0 + "@opentelemetry/resources": 1.24.0 peerDependencies: - "@opentelemetry/api": ">=1.3.0 <1.8.0" - checksum: 393d01c15ab000bb2b05c95233e58d9e8341b0e1e2e437b7257291bf6e1edfec2971aaf76f5bc974a2291c4678dfcaed699676223e18a5f33018d3e4825b479b + "@opentelemetry/api": ">=1.4.0 <1.9.0" + "@opentelemetry/api-logs": ">=0.39.1" + checksum: 784da587b62c2e1191aa28bf4e470a7bd9d799cac4e59ab2dac26b417e99f2472064707387e7d1991ae7a340d05d66600f74aa6ada3c23aba5ce290b0ba0cc8c languageName: node linkType: hard -"@opentelemetry/sdk-trace-base@npm:1.21.0": - version: 1.21.0 - resolution: "@opentelemetry/sdk-trace-base@npm:1.21.0" +"@opentelemetry/sdk-metrics@npm:1.24.0": + version: 1.24.0 + resolution: "@opentelemetry/sdk-metrics@npm:1.24.0" dependencies: - "@opentelemetry/core": 1.21.0 - "@opentelemetry/resources": 1.21.0 - "@opentelemetry/semantic-conventions": 1.21.0 + "@opentelemetry/core": 1.24.0 + "@opentelemetry/resources": 1.24.0 + lodash.merge: ^4.6.2 peerDependencies: - "@opentelemetry/api": ">=1.0.0 <1.8.0" - checksum: b3c35d4b001ad4c098d01ecc363b0d7289de95243db50e914af1450b3e7387c62e058074a654f3dc5d868cf18c011590f4a9902cb5b83aeb1850bcec67d9d89c + "@opentelemetry/api": ">=1.3.0 <1.9.0" + checksum: 4468302b048685fa06c03c434754a37a671c4b1ae9a0409ad53132742eac7c982a65712bee4614f2d46e1fd361ec012afc55f693f00316808573f5c427cb68b9 languageName: node linkType: hard @@ -1722,6 +1709,19 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/sdk-trace-base@npm:1.24.0": + version: 1.24.0 + resolution: "@opentelemetry/sdk-trace-base@npm:1.24.0" + dependencies: + "@opentelemetry/core": 1.24.0 + "@opentelemetry/resources": 1.24.0 + "@opentelemetry/semantic-conventions": 1.24.0 + peerDependencies: + "@opentelemetry/api": ">=1.0.0 <1.9.0" + checksum: e6384139e2fca9271434af23486ffca3eb7a01597814fe2edc393dbc1ea8966ceacc7be1de7996736ce117dbb291e5a56ef1a59d7d0424fde89a2a319c045fc6 + languageName: node + linkType: hard + "@opentelemetry/sdk-trace-node@npm:^1.21.0": version: 1.23.0 resolution: "@opentelemetry/sdk-trace-node@npm:1.23.0" @@ -1738,13 +1738,6 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/semantic-conventions@npm:1.21.0": - version: 1.21.0 - resolution: "@opentelemetry/semantic-conventions@npm:1.21.0" - checksum: 8bd477ddabecf87499985de773265b35a09142071b14e1e427237181e90c4e0f5b1959d009acfb81b80319debbcb453f137e6686c63b60af9656aa611f607b77 - languageName: node - linkType: hard - "@opentelemetry/semantic-conventions@npm:1.23.0, @opentelemetry/semantic-conventions@npm:^1.21.0": version: 1.23.0 resolution: "@opentelemetry/semantic-conventions@npm:1.23.0" @@ -1752,6 +1745,13 @@ __metadata: languageName: node linkType: hard +"@opentelemetry/semantic-conventions@npm:1.24.0": + version: 1.24.0 + resolution: "@opentelemetry/semantic-conventions@npm:1.24.0" + checksum: ba7c71602f3eddc3f015457cf1183bd24f0300b2636b57cafe2e5196ae233daf05e573e3a7b954818e8f2d9543a44282a0406f327b9c066ae948eea5f4a91d27 + languageName: node + linkType: hard + "@pkgjs/parseargs@npm:^0.11.0": version: 0.11.0 resolution: "@pkgjs/parseargs@npm:0.11.0" @@ -2153,7 +2153,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.8": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98 @@ -2229,13 +2229,6 @@ __metadata: languageName: node linkType: hard -"@types/prettier@npm:^2.7.3": - version: 2.7.3 - resolution: "@types/prettier@npm:2.7.3" - checksum: 705384209cea6d1433ff6c187c80dcc0b95d99d5c5ce21a46a9a58060c527973506822e428789d842761e0280d25e3359300f017fbe77b9755bc772ab3dc2f83 - languageName: node - linkType: hard - "@types/prop-types@npm:*": version: 15.7.12 resolution: "@types/prop-types@npm:15.7.12" @@ -2294,7 +2287,7 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.3.12": +"@types/semver@npm:^7.5.8": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663 @@ -2342,124 +2335,126 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.60.1": - version: 5.62.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0" +"@typescript-eslint/eslint-plugin@npm:^7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/eslint-plugin@npm:7.7.1" dependencies: - "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/type-utils": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@eslint-community/regexpp": ^4.10.0 + "@typescript-eslint/scope-manager": 7.7.1 + "@typescript-eslint/type-utils": 7.7.1 + "@typescript-eslint/utils": 7.7.1 + "@typescript-eslint/visitor-keys": 7.7.1 debug: ^4.3.4 graphemer: ^1.4.0 - ignore: ^5.2.0 - natural-compare-lite: ^1.4.0 - semver: ^7.3.7 - tsutils: ^3.21.0 + ignore: ^5.3.1 + natural-compare: ^1.4.0 + semver: ^7.6.0 + ts-api-utils: ^1.3.0 peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: fc104b389c768f9fa7d45a48c86d5c1ad522c1d0512943e782a56b1e3096b2cbcc1eea3fcc590647bf0658eef61aac35120a9c6daf979bf629ad2956deb516a1 + checksum: 17de1806e083cb575ed5b8b7126cbe4341a369a0eb271dcffb5820962a3c9e46e2392628146125d39985b46cfa80b12cebe02e6c2e4043f88cc4884cc308cc21 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.60.1": - version: 5.62.0 - resolution: "@typescript-eslint/parser@npm:5.62.0" +"@typescript-eslint/parser@npm:^7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/parser@npm:7.7.1" dependencies: - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 + "@typescript-eslint/scope-manager": 7.7.1 + "@typescript-eslint/types": 7.7.1 + "@typescript-eslint/typescript-estree": 7.7.1 + "@typescript-eslint/visitor-keys": 7.7.1 debug: ^4.3.4 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752 + checksum: 737035f259120533ffede288a7a9b4f6261e41558ccf333f0422cadc8fe2bf7dee91e64369003b623cc972c0f7149822250c1b2afdd05b94383252a68d8dca97 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/scope-manager@npm:5.62.0" +"@typescript-eslint/scope-manager@npm:7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/scope-manager@npm:7.7.1" dependencies: - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/visitor-keys": 5.62.0 - checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573 + "@typescript-eslint/types": 7.7.1 + "@typescript-eslint/visitor-keys": 7.7.1 + checksum: 9f9c78bcbf32e65ad0cbd1c5c08e9cf7442d330e4e466ea6e13074241a44b80e8f9f99a9f4b6dbf97db415dbb1e538a9818e9553129c0e4fff005743ae89b6e7 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/type-utils@npm:5.62.0" +"@typescript-eslint/type-utils@npm:7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/type-utils@npm:7.7.1" dependencies: - "@typescript-eslint/typescript-estree": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@typescript-eslint/typescript-estree": 7.7.1 + "@typescript-eslint/utils": 7.7.1 debug: ^4.3.4 - tsutils: ^3.21.0 + ts-api-utils: ^1.3.0 peerDependencies: - eslint: "*" + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: fc41eece5f315dfda14320be0da78d3a971d650ea41300be7196934b9715f3fe1120a80207551eb71d39568275dbbcf359bde540d1ca1439d8be15e9885d2739 + checksum: ac8a4f1ad22dd5b414374673e612f40185ba5ac0ade796ddd959c228bb44d270f9004a09fb4ad83d940257ab37c358112e5b535fe45a5a159f68a156051db2d2 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/types@npm:5.62.0" - checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670 +"@typescript-eslint/types@npm:7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/types@npm:7.7.1" + checksum: b30a861b641ea8f9e882647344674893ec4b751ddc9f5431998b1a96ef01b80fd7267d9da719ee8e1b2249de4cfc32d7ef7877589502b412d30f19854987cd80 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" +"@typescript-eslint/typescript-estree@npm:7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/typescript-estree@npm:7.7.1" dependencies: - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/visitor-keys": 5.62.0 + "@typescript-eslint/types": 7.7.1 + "@typescript-eslint/visitor-keys": 7.7.1 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 + minimatch: ^9.0.4 + semver: ^7.6.0 + ts-api-utils: ^1.3.0 peerDependenciesMeta: typescript: optional: true - checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52 + checksum: 3b33075eb82b98922644a11500ee9c4b6474e8879882c953408b3f33d36d591d4e74a52606106a911801f60dd7d054d6bc6b6e0a547570470ffa7a84aded08a1 languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/utils@npm:5.62.0" +"@typescript-eslint/utils@npm:7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/utils@npm:7.7.1" dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 - eslint-scope: ^5.1.1 - semver: ^7.3.7 + "@eslint-community/eslint-utils": ^4.4.0 + "@types/json-schema": ^7.0.15 + "@types/semver": ^7.5.8 + "@typescript-eslint/scope-manager": 7.7.1 + "@typescript-eslint/types": 7.7.1 + "@typescript-eslint/typescript-estree": 7.7.1 + semver: ^7.6.0 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931 + eslint: ^8.56.0 + checksum: 9ef631a29177826105fa8f05bb2f59c2c3ac2f65c155b58dc80df27146499da3590eef26b9e1319ed1d50c58314a889645f7e7ded656507c57b5c4ee0a4bd473 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" +"@typescript-eslint/visitor-keys@npm:7.7.1": + version: 7.7.1 + resolution: "@typescript-eslint/visitor-keys@npm:7.7.1" dependencies: - "@typescript-eslint/types": 5.62.0 - eslint-visitor-keys: ^3.3.0 - checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35 + "@typescript-eslint/types": 7.7.1 + eslint-visitor-keys: ^3.4.3 + checksum: cd2897cfc45589cb6d81e7ae92b2765711aa71d2a4e06a3cb766098855a922e1475513288e86cc87a352bfa90e5cf106db043d5f2f76f534fe723f6cf5f14618 languageName: node linkType: hard @@ -3883,15 +3878,14 @@ __metadata: dependencies: "@changesets/cli": 2.19.0-temp.0 "@effect-ts/tracing-plugin": ^0.20.0 - "@types/prettier": ^2.7.3 - "@typescript-eslint/eslint-plugin": ^5.60.1 - "@typescript-eslint/parser": ^5.60.1 - eslint: ^8.43.0 - eslint-config-prettier: ^8.8.0 - eslint-plugin-import: ^2.27.5 + "@typescript-eslint/eslint-plugin": ^7.7.1 + "@typescript-eslint/parser": ^7.7.1 + eslint: ^8.57.0 + eslint-config-prettier: ^9.1.0 + eslint-plugin-import: ^2.29.1 eslint-plugin-react-hooks: ^4.6.0 - eslint-plugin-simple-import-sort: ^10.0.0 - prettier: ^2.8.8 + eslint-plugin-simple-import-sort: ^12.1.0 + prettier: ^3.2.5 ts-patch: ^2.1.0 typescript: ^5.1.6 languageName: unknown @@ -4578,14 +4572,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.8.0": - version: 8.10.0 - resolution: "eslint-config-prettier@npm:8.10.0" +"eslint-config-prettier@npm:^9.1.0": + version: 9.1.0 + resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 153266badd477e49b0759816246b2132f1dbdb6c7f313ca60a9af5822fd1071c2bc5684a3720d78b725452bbac04bb130878b2513aea5e72b1b792de5a69fec8 + checksum: 9229b768c879f500ee54ca05925f31b0c0bafff3d9f5521f98ff05127356de78c81deb9365c86a5ec4efa990cb72b74df8612ae15965b14136044c73e1f6a907 languageName: node linkType: hard @@ -4612,7 +4606,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.27.5": +"eslint-plugin-import@npm:^2.29.1": version: 2.29.1 resolution: "eslint-plugin-import@npm:2.29.1" dependencies: @@ -4648,16 +4642,16 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-simple-import-sort@npm:^10.0.0": - version: 10.0.0 - resolution: "eslint-plugin-simple-import-sort@npm:10.0.0" +"eslint-plugin-simple-import-sort@npm:^12.1.0": + version: 12.1.0 + resolution: "eslint-plugin-simple-import-sort@npm:12.1.0" peerDependencies: eslint: ">=5.0.0" - checksum: 23221ff63f80f9c52da807d388ee8a51bc36a3b73345f60ec886e7973c28d75eb1d1e47f7f2916a7c1f94a1b5037b1450356a64a8fbd58096fd6bee57c6e3e48 + checksum: 8ba651c8d86359107130e99d11a839fe2b66647731c9582b74657fcfab2ea61fdf85621651f26aab5f8cbfe7516ea0c5d4d8fdcd68c3f9b7115d292f16ed3dde languageName: node linkType: hard -"eslint-scope@npm:5.1.1, eslint-scope@npm:^5.1.1": +"eslint-scope@npm:5.1.1": version: 5.1.1 resolution: "eslint-scope@npm:5.1.1" dependencies: @@ -4684,7 +4678,7 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.43.0": +"eslint@npm:^8.57.0": version: 8.57.0 resolution: "eslint@npm:8.57.0" dependencies: @@ -5801,7 +5795,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.2.0": +"ignore@npm:^5.2.0, ignore@npm:^5.3.1": version: 5.3.1 resolution: "ignore@npm:5.3.1" checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3 @@ -7609,7 +7603,7 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.1": +"minimatch@npm:^9.0.1, minimatch@npm:^9.0.4": version: 9.0.4 resolution: "minimatch@npm:9.0.4" dependencies: @@ -7810,13 +7804,6 @@ __metadata: languageName: node linkType: hard -"natural-compare-lite@npm:^1.4.0": - version: 1.4.0 - resolution: "natural-compare-lite@npm:1.4.0" - checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225 - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -8760,12 +8747,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.8.8": - version: 2.8.8 - resolution: "prettier@npm:2.8.8" +"prettier@npm:^3.2.5": + version: 3.2.5 + resolution: "prettier@npm:3.2.5" bin: - prettier: bin-prettier.js - checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8 + prettier: bin/prettier.cjs + checksum: 2ee4e1417572372afb7a13bb446b34f20f1bf1747db77cf6ccaf57a9be005f2f15c40f903d41a6b79eec3f57fff14d32a20fb6dee1f126da48908926fe43c311 languageName: node linkType: hard @@ -9431,7 +9418,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0": +"semver@npm:^7.3.5, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0": version: 7.6.0 resolution: "semver@npm:7.6.0" dependencies: @@ -10419,6 +10406,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.3.0": + version: 1.3.0 + resolution: "ts-api-utils@npm:1.3.0" + peerDependencies: + typescript: ">=4.2.0" + checksum: c746ddabfdffbf16cb0b0db32bb287236a19e583057f8649ee7c49995bb776e1d3ef384685181c11a1a480369e022ca97512cb08c517b2d2bd82c83754c97012 + languageName: node + linkType: hard + "ts-interface-checker@npm:^0.1.9": version: 0.1.13 resolution: "ts-interface-checker@npm:0.1.13" @@ -10502,13 +10498,6 @@ __metadata: languageName: node linkType: hard -"tslib@npm:^1.8.1": - version: 1.14.1 - resolution: "tslib@npm:1.14.1" - checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd - languageName: node - linkType: hard - "tslib@npm:^2.0.0, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.4.1": version: 2.6.2 resolution: "tslib@npm:2.6.2" @@ -10516,17 +10505,6 @@ __metadata: languageName: node linkType: hard -"tsutils@npm:^3.21.0": - version: 3.21.0 - resolution: "tsutils@npm:3.21.0" - dependencies: - tslib: ^1.8.1 - peerDependencies: - typescript: ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - checksum: 1843f4c1b2e0f975e08c4c21caa4af4f7f65a12ac1b81b3b8489366826259323feb3fc7a243123453d2d1a02314205a7634e048d4a8009921da19f99755cdc48 - languageName: node - linkType: hard - "tty-table@npm:^2.8.10": version: 2.8.13 resolution: "tty-table@npm:2.8.13"