From a5f89112004fd6c8e0bec92bea04ab124d53e3d0 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Sat, 21 Oct 2023 12:25:27 +0200 Subject: [PATCH 1/4] chore(layers) widen version check in e2e --- .../layerPublisher.class.test.functionCode.ts | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts index d63f389d7c..3f15dfbbb1 100644 --- a/layers/tests/e2e/layerPublisher.class.test.functionCode.ts +++ b/layers/tests/e2e/layerPublisher.class.test.functionCode.ts @@ -81,11 +81,22 @@ const getVersionFromModule = async (moduleName: string): Promise => { export const handler = async (): Promise => { // Check that the packages version matches the expected one - for (const moduleName of ['commons', 'logger', 'metrics', 'tracer']) { + for (const moduleName of [ + 'commons', + 'logger', + 'metrics', + 'tracer', + 'parameters', + 'idempotency', + 'batch', + ]) { const moduleVersion = await getVersionFromModule(moduleName); - if (moduleVersion != expectedVersion) { + // TODO: remove this check once v2 becomes GA + // if (moduleVersion != expectedVersion) { + if (!moduleVersion.startsWith(expectedVersion)) { throw new Error( - `Package version mismatch (${moduleName}): ${moduleVersion} != ${expectedVersion}` + // `Package version mismatch (${moduleName}): ${moduleVersion} != ${expectedVersion}` + `Package version mismatch (${moduleName}): ${moduleVersion} does not start with ${expectedVersion}` ); } } From 4dd66c070327c1388da1c915d4dd04c3cfae64a9 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Mon, 23 Oct 2023 16:45:28 +0200 Subject: [PATCH 2/4] chore(maintenance): enable isolatedModules --- packages/commons/src/types/LambdaInterface.ts | 11 ++++++++--- packages/commons/src/types/awsSdk.ts | 2 +- packages/commons/src/types/index.ts | 13 +++++++++---- packages/commons/src/types/middy.ts | 2 +- .../idempotency/src/types/BasePersistenceLayer.ts | 2 +- .../idempotency/src/types/ConfigServiceInterface.ts | 2 +- .../idempotency/src/types/IdempotencyOptions.ts | 2 +- packages/idempotency/src/types/IdempotencyRecord.ts | 2 +- packages/idempotency/src/types/LRUCache.ts | 2 +- packages/idempotency/src/types/index.ts | 6 +++--- packages/logger/src/types/ConfigServiceInterface.ts | 2 +- packages/logger/src/types/Logger.ts | 2 +- packages/logger/src/types/index.ts | 1 - .../metrics/src/types/ConfigServiceInterface.ts | 2 +- packages/metrics/src/types/Metrics.ts | 2 +- packages/metrics/src/types/MetricsInterface.ts | 2 +- packages/metrics/src/types/index.ts | 6 +++--- .../parameters/src/types/ConfigServiceInterface.ts | 2 +- packages/testing/src/types.ts | 2 +- packages/tracer/src/types/ConfigServiceInterface.ts | 2 +- .../tracer/src/types/ProviderServiceInterface.ts | 2 +- packages/tracer/src/types/Tracer.ts | 2 +- packages/tracer/src/types/index.ts | 2 +- tsconfig.json | 7 +------ 24 files changed, 42 insertions(+), 38 deletions(-) diff --git a/packages/commons/src/types/LambdaInterface.ts b/packages/commons/src/types/LambdaInterface.ts index 38a55cdb48..7eb6609487 100644 --- a/packages/commons/src/types/LambdaInterface.ts +++ b/packages/commons/src/types/LambdaInterface.ts @@ -1,12 +1,12 @@ import type { Handler } from 'aws-lambda'; -export type SyncHandler = ( +type SyncHandler = ( event: Parameters[0], context: Parameters[1], callback: Parameters[2] ) => void; -export type AsyncHandler = ( +type AsyncHandler = ( event: Parameters[0], context: Parameters[1] ) => Promise[2]>[1]>>; @@ -23,4 +23,9 @@ type HandlerMethodDecorator = ( | TypedPropertyDescriptor> ) => void; -export { LambdaInterface, HandlerMethodDecorator }; +export type { + AsyncHandler, + SyncHandler, + LambdaInterface, + HandlerMethodDecorator, +}; diff --git a/packages/commons/src/types/awsSdk.ts b/packages/commons/src/types/awsSdk.ts index a62ba6c891..f29d1bc8ff 100644 --- a/packages/commons/src/types/awsSdk.ts +++ b/packages/commons/src/types/awsSdk.ts @@ -19,4 +19,4 @@ interface SdkClient { */ type MiddlewareArgsLike = { request: { headers: { [key: string]: string } } }; -export { SdkClient, MiddlewareArgsLike }; +export type { SdkClient, MiddlewareArgsLike }; diff --git a/packages/commons/src/types/index.ts b/packages/commons/src/types/index.ts index 115abe81fb..068a9225e3 100644 --- a/packages/commons/src/types/index.ts +++ b/packages/commons/src/types/index.ts @@ -1,11 +1,16 @@ -export { +export type { MiddlewareLikeObj, MiddyLikeRequest, CleanupFunction, } from './middy.js'; -export { SdkClient, MiddlewareArgsLike } from './awsSdk.js'; -export { JSONPrimitive, JSONValue, JSONObject, JSONArray } from './json.js'; -export { +export type { SdkClient, MiddlewareArgsLike } from './awsSdk.js'; +export type { + JSONPrimitive, + JSONValue, + JSONObject, + JSONArray, +} from './json.js'; +export type { SyncHandler, AsyncHandler, LambdaInterface, diff --git a/packages/commons/src/types/middy.ts b/packages/commons/src/types/middy.ts index 0399408d8c..92c94a0ba5 100644 --- a/packages/commons/src/types/middy.ts +++ b/packages/commons/src/types/middy.ts @@ -57,4 +57,4 @@ type MiddyLikeRequest = { */ type CleanupFunction = (request: MiddyLikeRequest) => Promise; -export { MiddlewareLikeObj, MiddyLikeRequest, CleanupFunction }; +export type { MiddlewareLikeObj, MiddyLikeRequest, CleanupFunction }; diff --git a/packages/idempotency/src/types/BasePersistenceLayer.ts b/packages/idempotency/src/types/BasePersistenceLayer.ts index 7bd61689f8..badda0271f 100644 --- a/packages/idempotency/src/types/BasePersistenceLayer.ts +++ b/packages/idempotency/src/types/BasePersistenceLayer.ts @@ -15,4 +15,4 @@ interface BasePersistenceLayerInterface { getRecord(data: unknown): Promise; } -export { BasePersistenceLayerOptions, BasePersistenceLayerInterface }; +export type { BasePersistenceLayerOptions, BasePersistenceLayerInterface }; diff --git a/packages/idempotency/src/types/ConfigServiceInterface.ts b/packages/idempotency/src/types/ConfigServiceInterface.ts index f4938baeaf..eaa36e8e1f 100644 --- a/packages/idempotency/src/types/ConfigServiceInterface.ts +++ b/packages/idempotency/src/types/ConfigServiceInterface.ts @@ -8,4 +8,4 @@ interface ConfigServiceInterface { getIdempotencyEnabled(): boolean; } -export { ConfigServiceInterface }; +export type { ConfigServiceInterface }; diff --git a/packages/idempotency/src/types/IdempotencyOptions.ts b/packages/idempotency/src/types/IdempotencyOptions.ts index 54487d3396..0f2345cd09 100644 --- a/packages/idempotency/src/types/IdempotencyOptions.ts +++ b/packages/idempotency/src/types/IdempotencyOptions.ts @@ -179,7 +179,7 @@ type IdempotencyConfigOptions = { lambdaContext?: Context; }; -export { +export type { AnyFunction, IdempotencyConfigOptions, ItempotentFunctionOptions, diff --git a/packages/idempotency/src/types/IdempotencyRecord.ts b/packages/idempotency/src/types/IdempotencyRecord.ts index af62b2ac22..486cb2561d 100644 --- a/packages/idempotency/src/types/IdempotencyRecord.ts +++ b/packages/idempotency/src/types/IdempotencyRecord.ts @@ -13,4 +13,4 @@ type IdempotencyRecordOptions = { payloadHash?: string; }; -export { IdempotencyRecordStatusValue, IdempotencyRecordOptions }; +export type { IdempotencyRecordStatusValue, IdempotencyRecordOptions }; diff --git a/packages/idempotency/src/types/LRUCache.ts b/packages/idempotency/src/types/LRUCache.ts index 6ab31d260a..67ab035e60 100644 --- a/packages/idempotency/src/types/LRUCache.ts +++ b/packages/idempotency/src/types/LRUCache.ts @@ -5,4 +5,4 @@ type LRUCacheOptions = { maxSize: number; }; -export { LRUCacheOptions }; +export type { LRUCacheOptions }; diff --git a/packages/idempotency/src/types/index.ts b/packages/idempotency/src/types/index.ts index c67b3e6fe6..3f7d50ea34 100644 --- a/packages/idempotency/src/types/index.ts +++ b/packages/idempotency/src/types/index.ts @@ -1,12 +1,12 @@ -export { +export type { IdempotencyRecordOptions, IdempotencyRecordStatusValue, } from './IdempotencyRecord.js'; -export { +export type { BasePersistenceLayerInterface, BasePersistenceLayerOptions, } from './BasePersistenceLayer.js'; -export { +export type { IdempotencyConfigOptions, IdempotencyLambdaHandlerOptions, IdempotencyHandlerOptions, diff --git a/packages/logger/src/types/ConfigServiceInterface.ts b/packages/logger/src/types/ConfigServiceInterface.ts index 7cbee088b6..99f98dff36 100644 --- a/packages/logger/src/types/ConfigServiceInterface.ts +++ b/packages/logger/src/types/ConfigServiceInterface.ts @@ -65,4 +65,4 @@ interface ConfigServiceInterface { isValueTrue(value: string): boolean; } -export { ConfigServiceInterface }; +export type { ConfigServiceInterface }; diff --git a/packages/logger/src/types/Logger.ts b/packages/logger/src/types/Logger.ts index 67d22a2963..fdeb41d4e3 100644 --- a/packages/logger/src/types/Logger.ts +++ b/packages/logger/src/types/Logger.ts @@ -86,7 +86,7 @@ type LoggerInterface = { warn(input: LogItemMessage, ...extraInput: LogItemExtraInput): void; }; -export { +export type { LogFunction, LoggerInterface, LogItemMessage, diff --git a/packages/logger/src/types/index.ts b/packages/logger/src/types/index.ts index 88f38933d1..e18a8806e0 100644 --- a/packages/logger/src/types/index.ts +++ b/packages/logger/src/types/index.ts @@ -6,7 +6,6 @@ export type { LogAttributes, LogLevel, } from './Log.js'; - export type { LogItemMessage, LogItemExtraInput, diff --git a/packages/metrics/src/types/ConfigServiceInterface.ts b/packages/metrics/src/types/ConfigServiceInterface.ts index ea1c127db6..81842a691d 100644 --- a/packages/metrics/src/types/ConfigServiceInterface.ts +++ b/packages/metrics/src/types/ConfigServiceInterface.ts @@ -4,4 +4,4 @@ interface ConfigServiceInterface { getServiceName(): string; } -export { ConfigServiceInterface }; +export type { ConfigServiceInterface }; diff --git a/packages/metrics/src/types/Metrics.ts b/packages/metrics/src/types/Metrics.ts index f925ed2e9b..a8780bca10 100644 --- a/packages/metrics/src/types/Metrics.ts +++ b/packages/metrics/src/types/Metrics.ts @@ -68,7 +68,7 @@ type MetricDefinition = { StorageResolution?: MetricResolution; }; -export { +export type { MetricsOptions, Dimensions, EmfOutput, diff --git a/packages/metrics/src/types/MetricsInterface.ts b/packages/metrics/src/types/MetricsInterface.ts index 99650937ba..c4e796cf98 100644 --- a/packages/metrics/src/types/MetricsInterface.ts +++ b/packages/metrics/src/types/MetricsInterface.ts @@ -29,4 +29,4 @@ interface MetricsInterface { singleMetric(): Metrics; } -export { MetricsInterface }; +export type { MetricsInterface }; diff --git a/packages/metrics/src/types/index.ts b/packages/metrics/src/types/index.ts index 115b00059e..7d30ec8888 100644 --- a/packages/metrics/src/types/index.ts +++ b/packages/metrics/src/types/index.ts @@ -1,4 +1,4 @@ -export { +export type { MetricsOptions, Dimensions, EmfOutput, @@ -9,5 +9,5 @@ export { MetricResolution, MetricUnit, } from './Metrics.js'; -export { ConfigServiceInterface } from './ConfigServiceInterface.js'; -export { MetricsInterface } from './MetricsInterface.js'; +export type { ConfigServiceInterface } from './ConfigServiceInterface.js'; +export type { MetricsInterface } from './MetricsInterface.js'; diff --git a/packages/parameters/src/types/ConfigServiceInterface.ts b/packages/parameters/src/types/ConfigServiceInterface.ts index c422265c48..2baf93974d 100644 --- a/packages/parameters/src/types/ConfigServiceInterface.ts +++ b/packages/parameters/src/types/ConfigServiceInterface.ts @@ -8,4 +8,4 @@ interface ConfigServiceInterface { getSSMDecrypt(): string; } -export { ConfigServiceInterface }; +export type { ConfigServiceInterface }; diff --git a/packages/testing/src/types.ts b/packages/testing/src/types.ts index ef38cb5347..ce11c0fc41 100644 --- a/packages/testing/src/types.ts +++ b/packages/testing/src/types.ts @@ -76,7 +76,7 @@ interface TestStackProps { stack?: Stack; } -export { +export type { ExtraTestProps, TestDynamodbTableProps, TestNodejsFunctionProps, diff --git a/packages/tracer/src/types/ConfigServiceInterface.ts b/packages/tracer/src/types/ConfigServiceInterface.ts index 78169c4de3..53b49febf9 100644 --- a/packages/tracer/src/types/ConfigServiceInterface.ts +++ b/packages/tracer/src/types/ConfigServiceInterface.ts @@ -12,4 +12,4 @@ interface ConfigServiceInterface { getTracingCaptureError(): string; } -export { ConfigServiceInterface }; +export type { ConfigServiceInterface }; diff --git a/packages/tracer/src/types/ProviderServiceInterface.ts b/packages/tracer/src/types/ProviderServiceInterface.ts index 5439b3a27d..5a704fc705 100644 --- a/packages/tracer/src/types/ProviderServiceInterface.ts +++ b/packages/tracer/src/types/ProviderServiceInterface.ts @@ -45,4 +45,4 @@ interface ProviderServiceInterface { putMetadata(key: string, value: unknown, namespace?: string): void; } -export { ProviderServiceInterface, ContextMissingStrategy }; +export type { ProviderServiceInterface, ContextMissingStrategy }; diff --git a/packages/tracer/src/types/Tracer.ts b/packages/tracer/src/types/Tracer.ts index abac332cf9..ac2e399707 100644 --- a/packages/tracer/src/types/Tracer.ts +++ b/packages/tracer/src/types/Tracer.ts @@ -134,7 +134,7 @@ interface TracerInterface { setSegment(segment: Segment | Subsegment): void; } -export { +export type { TracerOptions, CaptureLambdaHandlerOptions, CaptureMethodOptions, diff --git a/packages/tracer/src/types/index.ts b/packages/tracer/src/types/index.ts index 9c5074d83a..62fd8b99b2 100644 --- a/packages/tracer/src/types/index.ts +++ b/packages/tracer/src/types/index.ts @@ -1,4 +1,4 @@ -export { +export type { TracerOptions, CaptureLambdaHandlerOptions, CaptureMethodOptions, diff --git a/tsconfig.json b/tsconfig.json index c2eb4a63ed..392fc57ef9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,12 +10,7 @@ // "traceResolution": true, // Enable this to debug module resolution issues "declaration": true, "removeComments": false, - // TODO: experiment with this & move to tslib in v2 - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // TODO: see if this can introduced in v2 (requires breaking changes in exports) - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + "isolatedModules": true, "declarationMap": true, "esModuleInterop": true, "forceConsistentCasingInFileNames": true, From d077a9dea562c009c894f41d826d3fd318a93b20 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Mon, 23 Oct 2023 16:46:30 +0200 Subject: [PATCH 3/4] chore: remove redundant comments from tsconfig --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 392fc57ef9..08d5af9848 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "target": "ES2022", // Node.js 16 "experimentalDecorators": true, "module": "commonjs", - "moduleResolution": "node", // TODO: experiment with bundler & esnext + "moduleResolution": "node", "baseUrl": ".", // "traceResolution": true, // Enable this to debug module resolution issues "declaration": true, From b451ed56d82716d84b6eedf512a3f67c9289e249 Mon Sep 17 00:00:00 2001 From: Andrea Amorosi Date: Mon, 23 Oct 2023 18:55:32 +0200 Subject: [PATCH 4/4] chore: changed path of tsbuild cache --- .gitignore | 3 +-- packages/batch/package.json | 7 +++---- packages/batch/tsconfig.esm.json | 3 ++- packages/batch/tsconfig.json | 1 + packages/commons/package.json | 6 +++--- packages/commons/tsconfig.esm.json | 3 ++- packages/commons/tsconfig.json | 1 + packages/idempotency/package.json | 9 ++++----- packages/idempotency/tsconfig.esm.json | 3 ++- packages/idempotency/tsconfig.json | 1 + packages/logger/package.json | 7 +++---- packages/logger/tsconfig.esm.json | 9 ++++++--- packages/logger/tsconfig.json | 9 ++++++--- packages/metrics/package.json | 7 +++---- packages/metrics/tsconfig.esm.json | 3 ++- packages/metrics/tsconfig.json | 1 + packages/parameters/package.json | 9 ++++----- packages/parameters/tsconfig.esm.json | 3 ++- packages/parameters/tsconfig.json | 1 + packages/testing/package.json | 9 ++++----- packages/testing/tsconfig.esm.json | 3 ++- packages/testing/tsconfig.json | 1 + packages/tracer/package.json | 9 ++++----- packages/tracer/tsconfig.esm.json | 3 ++- packages/tracer/tsconfig.json | 1 + 25 files changed, 62 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 82e57f76bd..73b53761bc 100644 --- a/.gitignore +++ b/.gitignore @@ -49,5 +49,4 @@ site tmp # TS build files -tsconfig.tsbuildinfo -tsconfig.esm.tsbuildinfo \ No newline at end of file +*.tsbuildinfo \ No newline at end of file diff --git a/packages/batch/package.json b/packages/batch/package.json index e2c8701c2b..224d0e17d5 100644 --- a/packages/batch/package.json +++ b/packages/batch/package.json @@ -17,13 +17,12 @@ "test:e2e:nodejs18x": "echo 'Not Implemented'", "test:e2e": "echo 'Not Implemented'", "watch": "jest --watch", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" diff --git a/packages/batch/tsconfig.esm.json b/packages/batch/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/batch/tsconfig.esm.json +++ b/packages/batch/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/batch/tsconfig.json b/packages/batch/tsconfig.json index 5be842b9f8..4836a14962 100644 --- a/packages/batch/tsconfig.json +++ b/packages/batch/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs/", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*" diff --git a/packages/commons/package.json b/packages/commons/package.json index 9398f36a6a..508c45dbd3 100644 --- a/packages/commons/package.json +++ b/packages/commons/package.json @@ -16,12 +16,12 @@ "test:e2e": "echo 'Not Applicable'", "watch": "jest --watch", "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 --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" diff --git a/packages/commons/tsconfig.esm.json b/packages/commons/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/commons/tsconfig.esm.json +++ b/packages/commons/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/commons/tsconfig.json b/packages/commons/tsconfig.json index 5be842b9f8..4836a14962 100644 --- a/packages/commons/tsconfig.json +++ b/packages/commons/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs/", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*" diff --git a/packages/idempotency/package.json b/packages/idempotency/package.json index aca801e6db..48a9850d1c 100644 --- a/packages/idempotency/package.json +++ b/packages/idempotency/package.json @@ -17,13 +17,12 @@ "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e", "test:e2e": "jest --group=e2e", "watch": "jest --watch", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" @@ -136,4 +135,4 @@ "aws-sdk-client-mock": "^3.0.0", "aws-sdk-client-mock-jest": "^3.0.0" } -} \ No newline at end of file +} diff --git a/packages/idempotency/tsconfig.esm.json b/packages/idempotency/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/idempotency/tsconfig.esm.json +++ b/packages/idempotency/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/idempotency/tsconfig.json b/packages/idempotency/tsconfig.json index a30fdead42..f216927295 100644 --- a/packages/idempotency/tsconfig.json +++ b/packages/idempotency/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*" diff --git a/packages/logger/package.json b/packages/logger/package.json index 90afea2ead..f38e2f388f 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -17,13 +17,12 @@ "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e", "test:e2e": "jest --group=e2e", "watch": "jest --watch --group=unit", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" diff --git a/packages/logger/tsconfig.esm.json b/packages/logger/tsconfig.esm.json index a78be21539..123291b0cf 100644 --- a/packages/logger/tsconfig.esm.json +++ b/packages/logger/tsconfig.esm.json @@ -3,7 +3,10 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 6b64decffb..d56a564ef6 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -2,7 +2,10 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "./lib/cjs/", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, - "include": ["./src/**/*"] -} + "include": [ + "./src/**/*" + ] +} \ No newline at end of file diff --git a/packages/metrics/package.json b/packages/metrics/package.json index 5c1a384064..185fdcfa9b 100644 --- a/packages/metrics/package.json +++ b/packages/metrics/package.json @@ -17,13 +17,12 @@ "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e", "test:e2e": "jest --group=e2e", "watch": "jest --group=unit --watch ", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" diff --git a/packages/metrics/tsconfig.esm.json b/packages/metrics/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/metrics/tsconfig.esm.json +++ b/packages/metrics/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/metrics/tsconfig.json b/packages/metrics/tsconfig.json index a30fdead42..f216927295 100644 --- a/packages/metrics/tsconfig.json +++ b/packages/metrics/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*" diff --git a/packages/parameters/package.json b/packages/parameters/package.json index 5afa5f1abf..41fac17563 100644 --- a/packages/parameters/package.json +++ b/packages/parameters/package.json @@ -17,13 +17,12 @@ "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e", "test:e2e": "jest --group=e2e", "watch": "jest --watch", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" @@ -198,4 +197,4 @@ "optional": true } } -} \ No newline at end of file +} diff --git a/packages/parameters/tsconfig.esm.json b/packages/parameters/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/parameters/tsconfig.esm.json +++ b/packages/parameters/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/parameters/tsconfig.json b/packages/parameters/tsconfig.json index 5be842b9f8..4836a14962 100644 --- a/packages/parameters/tsconfig.json +++ b/packages/parameters/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs/", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*" diff --git a/packages/testing/package.json b/packages/testing/package.json index c22980cb23..b4c5dc1588 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -13,13 +13,12 @@ "jest": "jest --detectOpenHandles --verbose", "test:e2e": "echo 'Not implemented'", "watch": "jest --watch", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" @@ -101,4 +100,4 @@ "aws-cdk-lib": "^2.96.1", "esbuild": "^0.19.3" } -} \ No newline at end of file +} diff --git a/packages/testing/tsconfig.esm.json b/packages/testing/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/testing/tsconfig.esm.json +++ b/packages/testing/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/testing/tsconfig.json b/packages/testing/tsconfig.json index a30fdead42..f216927295 100644 --- a/packages/testing/tsconfig.json +++ b/packages/testing/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*" diff --git a/packages/tracer/package.json b/packages/tracer/package.json index a3534a43bc..308feb3ac1 100644 --- a/packages/tracer/package.json +++ b/packages/tracer/package.json @@ -17,13 +17,12 @@ "test:e2e:nodejs18x": "RUNTIME=nodejs18x jest --group=e2e", "test:e2e": "jest --group=e2e", "watch": "jest --watch", - "build:cjs": "tsc --build --force && echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json", - "build:esm": "tsc --project tsconfig.esm.json && echo '{ \"type\": \"module\" }' > lib/esm/package.json", + "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": "npm run build:esm & npm run build:cjs", "lint": "eslint --ext .ts,.js --no-error-on-unmatched-pattern .", "lint-fix": "eslint --fix --ext .ts,.js --no-error-on-unmatched-pattern .", - "prebuild": "rimraf ./lib", - "prepack": "rimraf ./lib/*.tsbuildinfo && node ../../.github/scripts/release_patch_package_json.js ." + "prepack": "node ../../.github/scripts/release_patch_package_json.js ." }, "lint-staged": { "*.{js,ts}": "npm run lint-fix" @@ -105,4 +104,4 @@ "serverless", "nodejs" ] -} \ No newline at end of file +} diff --git a/packages/tracer/tsconfig.esm.json b/packages/tracer/tsconfig.esm.json index 9bed8e4da4..123291b0cf 100644 --- a/packages/tracer/tsconfig.esm.json +++ b/packages/tracer/tsconfig.esm.json @@ -3,7 +3,8 @@ "compilerOptions": { "baseUrl": ".", "outDir": "./lib/esm", - "rootDir": "./src" + "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/esm.json" }, "include": [ "./src/**/*" diff --git a/packages/tracer/tsconfig.json b/packages/tracer/tsconfig.json index a30fdead42..f216927295 100644 --- a/packages/tracer/tsconfig.json +++ b/packages/tracer/tsconfig.json @@ -3,6 +3,7 @@ "compilerOptions": { "outDir": "./lib/cjs", "rootDir": "./src", + "tsBuildInfoFile": ".tsbuildinfo/cjs.json" }, "include": [ "./src/**/*"