diff --git a/.github/scripts/package.json b/.github/scripts/package.json new file mode 100644 index 0000000000..c9a4422614 --- /dev/null +++ b/.github/scripts/package.json @@ -0,0 +1,3 @@ +{ + "type": "commonjs" +} \ No newline at end of file diff --git a/layers/package.json b/layers/package.json index 8720ed22c1..7050971537 100644 --- a/layers/package.json +++ b/layers/package.json @@ -6,6 +6,7 @@ }, "private": true, "description": "This CDK app is meant to be used to publish Powertools for AWS Lambda (TypeScript) Lambda Layer. It is composed of a single stack deploying the Layer into the target account.", + "type": "module", "scripts": { "test": "vitest --run tests/unit", "test:unit": "vitest --run tests/unit", diff --git a/layers/tests/e2e/layerPublisher.test.ts b/layers/tests/e2e/layerPublisher.test.ts index 1f932ca98a..cffa1db3a5 100644 --- a/layers/tests/e2e/layerPublisher.test.ts +++ b/layers/tests/e2e/layerPublisher.test.ts @@ -9,7 +9,7 @@ import { TestNodejsFunction } from '@aws-lambda-powertools/testing-utils/resourc import { App } from 'aws-cdk-lib'; import { LayerVersion } from 'aws-cdk-lib/aws-lambda'; import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'; -import packageJson from '../../package.json'; +import packageJson from '../../package.json' with { type: 'json' }; import { LayerPublisherStack } from '../../src/layer-publisher-stack.js'; import { RESOURCE_NAME_PREFIX } from './constants.js'; diff --git a/package.json b/package.json index 6f13b5c162..e1cd83147a 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "packages/event-handler", "packages/validation" ], + "type": "module", "scripts": { "test": "npm t -ws", "test:parallel": "lerna exec --no-bail --no-sort --stream --concurrency 8 -- npm run test", diff --git a/packages/batch/package.json b/packages/batch/package.json index cdf19da4a8..6137aa533d 100644 --- a/packages/batch/package.json +++ b/packages/batch/package.json @@ -18,8 +18,8 @@ "test:e2e:nodejs20x": "echo 'Not Implemented'", "test:e2e:nodejs22x": "echo 'Not Implemented'", "test:e2e": "echo 'Not Implemented'", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/batch/tsconfig.cjs.json b/packages/batch/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/batch/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/batch/tsconfig.esm.json b/packages/batch/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/batch/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/batch/tsconfig.json b/packages/batch/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/batch/tsconfig.json +++ b/packages/batch/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/commons/package.json b/packages/commons/package.json index d6004e6a97..f66a5cd6aa 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -16,8 +16,8 @@ "test:unit:types": "vitest --run tests/types --typecheck", "test:e2e": "echo 'Not Applicable'", "generateVersionFile": "echo \"// this file is auto generated, do not modify\nexport const PT_VERSION = '$(jq -r '.version' package.json)';\" > src/version.ts", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/commons/tsconfig.cjs.json b/packages/commons/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/commons/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/commons/tsconfig.esm.json b/packages/commons/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/commons/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/commons/tsconfig.json b/packages/commons/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/commons/tsconfig.json +++ b/packages/commons/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/event-handler/package.json b/packages/event-handler/package.json index 09ca6be374..c99c3f4486 100644 --- a/packages/event-handler/package.json +++ b/packages/event-handler/package.json @@ -18,8 +18,8 @@ "test:e2e:nodejs20x": "echo \"Not implemented\"", "test:e2e:nodejs22x": "echo \"Not implemented\"", "test:e2e": "echo \"Not implemented\"", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/event-handler/tsconfig.cjs.json b/packages/event-handler/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/event-handler/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/event-handler/tsconfig.esm.json b/packages/event-handler/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/event-handler/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/event-handler/tsconfig.json b/packages/event-handler/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/event-handler/tsconfig.json +++ b/packages/event-handler/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/idempotency/package.json b/packages/idempotency/package.json index 0d18c77259..0be1aa23a7 100644 --- a/packages/idempotency/package.json +++ b/packages/idempotency/package.json @@ -19,8 +19,8 @@ "test:e2e:nodejs20x": "RUNTIME=nodejs20x vitest --run tests/e2e", "test:e2e:nodejs22x": "RUNTIME=nodejs22x vitest --run tests/e2e", "test:e2e": "vitest --run tests/e2e", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/idempotency/tsconfig.cjs.json b/packages/idempotency/tsconfig.cjs.json new file mode 100644 index 0000000000..682c17bfad --- /dev/null +++ b/packages/idempotency/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "outDir": "./lib/cjs", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json", + "composite": true, + "declaration": true + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/idempotency/tsconfig.esm.json b/packages/idempotency/tsconfig.esm.json deleted file mode 100644 index 123291b0cf..0000000000 --- a/packages/idempotency/tsconfig.esm.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": [ - "./src/**/*" - ] -} \ No newline at end of file diff --git a/packages/idempotency/tsconfig.json b/packages/idempotency/tsconfig.json index f216927295..204ff253d4 100644 --- a/packages/idempotency/tsconfig.json +++ b/packages/idempotency/tsconfig.json @@ -1,11 +1,14 @@ { - "extends": "../../tsconfig.json", - "compilerOptions": { - "outDir": "./lib/cjs", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" - }, - "include": [ - "./src/**/*" - ], + "extends": "../../tsconfig.json", + "compilerOptions": { + "baseUrl": ".", + "outDir": "./lib/esm", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true + }, + "include": [ + "./src/**/*" + ] } \ No newline at end of file diff --git a/packages/jmespath/package.json b/packages/jmespath/package.json index 87c51ef287..fd819b4940 100644 --- a/packages/jmespath/package.json +++ b/packages/jmespath/package.json @@ -15,8 +15,8 @@ "test:unit:coverage": "vitest --run tests/unit --coverage.enabled --coverage.thresholds.100 --coverage.include='src/**'", "test:unit:types": "echo 'Not applicable for this package'", "test:e2e": "echo 'Not applicable for this package'", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/jmespath/tsconfig.cjs.json b/packages/jmespath/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/jmespath/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/jmespath/tsconfig.esm.json b/packages/jmespath/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/jmespath/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/jmespath/tsconfig.json b/packages/jmespath/tsconfig.json index 4923c4f6f4..4fdaca79c4 100644 --- a/packages/jmespath/tsconfig.json +++ b/packages/jmespath/tsconfig.json @@ -1,9 +1,12 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/logger/package.json b/packages/logger/package.json index 6abed9cdd5..fd9d534560 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -19,8 +19,8 @@ "test:e2e:nodejs20x": "RUNTIME=nodejs20x vitest --run tests/e2e", "test:e2e:nodejs22x": "RUNTIME=nodejs22x vitest --run tests/e2e", "test:e2e": "vitest --run tests/e2e", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/logger/tsconfig.cjs.json b/packages/logger/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/logger/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/logger/tsconfig.esm.json b/packages/logger/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/logger/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/metrics/package.json b/packages/metrics/package.json index f90dd90171..08835c819a 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -19,8 +19,8 @@ "test:e2e:nodejs20x": "RUNTIME=nodejs20x vitest --run tests/e2e", "test:e2e:nodejs22x": "RUNTIME=nodejs22x vitest --run tests/e2e", "test:e2e": "vitest --run tests/e2e", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/metrics/tsconfig.cjs.json b/packages/metrics/tsconfig.cjs.json new file mode 100644 index 0000000000..f81fe3fbd1 --- /dev/null +++ b/packages/metrics/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/metrics/tsconfig.esm.json b/packages/metrics/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/metrics/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/metrics/tsconfig.json b/packages/metrics/tsconfig.json index 0f0cc593ac..204ff253d4 100644 --- a/packages/metrics/tsconfig.json +++ b/packages/metrics/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/parameters/package.json b/packages/parameters/package.json index 1c8b9c79bc..08cb29974b 100644 --- a/packages/parameters/package.json +++ b/packages/parameters/package.json @@ -19,8 +19,8 @@ "test:e2e:nodejs20x": "RUNTIME=nodejs20x vitest --run tests/e2e", "test:e2e:nodejs22x": "RUNTIME=nodejs22x vitest --run tests/e2e", "test:e2e": "vitest --run tests/e2e", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/parameters/tsconfig.cjs.json b/packages/parameters/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/parameters/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/parameters/tsconfig.esm.json b/packages/parameters/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/parameters/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/parameters/tsconfig.json b/packages/parameters/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/parameters/tsconfig.json +++ b/packages/parameters/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/parser/package.json b/packages/parser/package.json index a8448802e0..b6e51b3b7d 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -19,8 +19,8 @@ "test:e2e:nodejs20x": "echo 'Not implemented'", "test:e2e:nodejs22x": "echo 'Not implemented'", "test:e2e": "echo 'Not implemented'", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/parser/tsconfig.cjs.json b/packages/parser/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/parser/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/parser/tsconfig.esm.json b/packages/parser/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/parser/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/parser/tsconfig.json b/packages/parser/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/parser/tsconfig.json +++ b/packages/parser/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/testing/package.json b/packages/testing/package.json index ade6271a80..db5d3d98ff 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -11,8 +11,8 @@ "test": "vitest --run", "test:unit": "vitest --run", "test:e2e": "echo 'Not implemented'", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/testing/tsconfig.cjs.json b/packages/testing/tsconfig.cjs.json new file mode 100644 index 0000000000..f81fe3fbd1 --- /dev/null +++ b/packages/testing/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/testing/tsconfig.esm.json b/packages/testing/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/testing/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/testing/tsconfig.json b/packages/testing/tsconfig.json index 0f0cc593ac..204ff253d4 100644 --- a/packages/testing/tsconfig.json +++ b/packages/testing/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/tracer/package.json b/packages/tracer/package.json index 4f45a523e8..979b7a198b 100644 --- a/packages/tracer/package.json +++ b/packages/tracer/package.json @@ -19,8 +19,8 @@ "test:e2e:nodejs20x": "RUNTIME=nodejs20x vitest --run tests/e2e", "test:e2e:nodejs22x": "RUNTIME=nodejs22x vitest --run tests/e2e", "test:e2e": "vitest --run tests/e2e", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/tracer/tsconfig.cjs.json b/packages/tracer/tsconfig.cjs.json new file mode 100644 index 0000000000..f81fe3fbd1 --- /dev/null +++ b/packages/tracer/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/tracer/tsconfig.esm.json b/packages/tracer/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/tracer/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/tracer/tsconfig.json b/packages/tracer/tsconfig.json index 0f0cc593ac..204ff253d4 100644 --- a/packages/tracer/tsconfig.json +++ b/packages/tracer/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/validation/package.json b/packages/validation/package.json index f05ada14a4..d4fcf3f942 100644 --- a/packages/validation/package.json +++ b/packages/validation/package.json @@ -15,8 +15,8 @@ "test:e2e:nodejs20x": "echo \"Not implemented\"", "test:e2e:nodejs22x": "echo \"Not implemented\"", "test:e2e": "echo \"Not implemented\"", - "build:cjs": "tsc --build tsconfig.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --build tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "build:cjs": "tsc --build tsconfig.cjs.json && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", + "build:esm": "tsc --build tsconfig.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", "build": "npm run build:esm & npm run build:cjs", "lint": "biome lint .", "lint:fix": "biome check --write .", diff --git a/packages/validation/tests/unit/validate.test.ts b/packages/validation/tests/unit/validate.test.ts index c1e46cd1ca..04305977a0 100644 --- a/packages/validation/tests/unit/validate.test.ts +++ b/packages/validation/tests/unit/validate.test.ts @@ -1,4 +1,4 @@ -import Ajv from 'ajv'; +import { Ajv } from 'ajv'; import { describe, expect, it } from 'vitest'; import { SchemaCompilationError, diff --git a/packages/validation/tsconfig.cjs.json b/packages/validation/tsconfig.cjs.json new file mode 100644 index 0000000000..7d570c8dbe --- /dev/null +++ b/packages/validation/tsconfig.cjs.json @@ -0,0 +1,13 @@ +{ + "extends": "../../tsconfig.cjs.json", + "compilerOptions": { + "composite": true, + "declaration": true, + "outDir": "./lib/cjs/", + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + }, + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/validation/tsconfig.esm.json b/packages/validation/tsconfig.esm.json deleted file mode 100644 index 82486b64fa..0000000000 --- a/packages/validation/tsconfig.esm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "extends": "../../tsconfig.esm.json", - "compilerOptions": { - "baseUrl": ".", - "outDir": "./lib/esm", - "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/esm.json" - }, - "include": ["./src/**/*"] -} diff --git a/packages/validation/tsconfig.json b/packages/validation/tsconfig.json index 4923c4f6f4..204ff253d4 100644 --- a/packages/validation/tsconfig.json +++ b/packages/validation/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "./lib/cjs/", + "baseUrl": ".", + "outDir": "./lib/esm", "rootDir": "./src", - "tsBuildInfoFile": ".tsbuildinfo/cjs.json" + "tsBuildInfoFile": ".tsbuildinfo/esm.json", + "composite": true, + "declaration": true }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/tsconfig.esm.json b/tsconfig.cjs.json similarity index 50% rename from tsconfig.esm.json rename to tsconfig.cjs.json index 00eabe9c38..4ecd072a6e 100644 --- a/tsconfig.esm.json +++ b/tsconfig.cjs.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "module": "NodeNext", - "moduleResolution": "NodeNext" + "module": "commonjs", + "moduleResolution": "node", } } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 474a0b34ce..1ad4a97d20 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,8 +4,8 @@ "composite": true, "target": "ES2022", // Node.js 18 "experimentalDecorators": true, - "module": "commonjs", - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "baseUrl": ".", // "traceResolution": true, // Enable this to debug module resolution issues "declaration": true, @@ -46,6 +46,12 @@ }, { "path": "./packages/parser" + }, + { + "path": "./packages/event-handler" + }, + { + "path": "./packages/validation" } ] } \ No newline at end of file