diff --git a/infra/bin/zar-fizzy.ts b/infra/bin/zar-fizzy.ts index 27cf5626c9..b3f3658ad0 100644 --- a/infra/bin/zar-fizzy.ts +++ b/infra/bin/zar-fizzy.ts @@ -2,8 +2,8 @@ import 'source-map-support/register'; import { ZarApp } from '@zarpay/zar-cdk-lib'; -import { FizzyStack } from '../lib/fizzy-stack.js'; -import { environment, region } from '../lib/shared/global-variables.js'; +import { FizzyStack } from '../lib/fizzy-stack'; +import { environment, region } from '../lib/shared/global-variables'; const app = new ZarApp({ deployEnvironment: environment, diff --git a/infra/environments/config-loader.ts b/infra/environments/config-loader.ts index 0960ffa7a1..5fde33fede 100644 --- a/infra/environments/config-loader.ts +++ b/infra/environments/config-loader.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import * as path from 'path'; -import { environment } from '../lib/shared/global-variables.js'; +import { environment } from '../lib/shared/global-variables'; function deepMerge(target: any, source: any): any { if (typeof target !== 'object' || typeof source !== 'object') { diff --git a/infra/lib/constructs/database.ts b/infra/lib/constructs/database.ts index 4450c328b8..ab5e1646de 100644 --- a/infra/lib/constructs/database.ts +++ b/infra/lib/constructs/database.ts @@ -4,8 +4,8 @@ import * as logs from 'aws-cdk-lib/aws-logs'; import * as rds from 'aws-cdk-lib/aws-rds'; import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as secrets from 'aws-cdk-lib/aws-secretsmanager'; -import { config } from '../../environments/config-loader.js'; -import { environment, isProduction } from '../shared/global-variables.js'; +import { config } from '../../environments/config-loader'; +import { environment, isProduction } from '../shared/global-variables'; export interface DatabaseProps { vpc: ec2.IVpc; diff --git a/infra/lib/constructs/service.ts b/infra/lib/constructs/service.ts index 4ebd2c0a28..919b5c2aa3 100644 --- a/infra/lib/constructs/service.ts +++ b/infra/lib/constructs/service.ts @@ -4,10 +4,10 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'; import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'; import { Construct } from 'constructs'; import { EcrContainerImage, SharedAlbEcsFargateService } from '@zarpay/zar-cdk-lib'; -import { config } from '../../environments/config-loader.js'; -import { appName, environment, isProduction, smtp } from '../shared/global-variables.js'; -import { Database } from './database.js'; -import { Storage } from './storage.js'; +import { config } from '../../environments/config-loader'; +import { appName, environment, isProduction, smtp } from '../shared/global-variables'; +import { Database } from './database'; +import { Storage } from './storage'; interface ServiceProps { vpc: ec2.IVpc; diff --git a/infra/lib/constructs/storage.ts b/infra/lib/constructs/storage.ts index b21b9942d9..75ea9b2ac0 100644 --- a/infra/lib/constructs/storage.ts +++ b/infra/lib/constructs/storage.ts @@ -2,7 +2,7 @@ import { Construct } from 'constructs'; import * as cdk from 'aws-cdk-lib'; import * as s3 from 'aws-cdk-lib/aws-s3'; import * as iam from 'aws-cdk-lib/aws-iam'; -import { isProduction, region } from '../shared/global-variables.js'; +import { isProduction, region } from '../shared/global-variables'; export class Storage extends Construct { public readonly bucket: s3.Bucket; diff --git a/infra/lib/fizzy-stack.ts b/infra/lib/fizzy-stack.ts index 83d41daffe..b0d6fcf49b 100644 --- a/infra/lib/fizzy-stack.ts +++ b/infra/lib/fizzy-stack.ts @@ -1,10 +1,10 @@ import * as cdk from 'aws-cdk-lib/core'; import { awsOrganizationAccounts, EcrRepository, Platform } from '@zarpay/zar-cdk-lib'; import { Construct } from 'constructs'; -import { Database } from './constructs/database.js'; -import { Service } from './constructs/service.js'; -import { Storage } from './constructs/storage.js'; -import { isProduction, vpcName } from './shared/global-variables.js'; +import { Database } from './constructs/database'; +import { Service } from './constructs/service'; +import { Storage } from './constructs/storage'; +import { isProduction, vpcName } from './shared/global-variables'; export class FizzyStack extends cdk.Stack { constructor(scope: Construct, id: string, props: cdk.StackProps) { diff --git a/infra/tsconfig.json b/infra/tsconfig.json index acf48be97e..5ac31176a1 100644 --- a/infra/tsconfig.json +++ b/infra/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { - "target": "ES2022", - "module": "NodeNext", - "moduleResolution": "NodeNext", - "lib": ["es2022"], + "target": "ES2020", + "module": "commonjs", + "lib": ["es2020"], + "esModuleInterop": true, "declaration": true, "strict": true, "noImplicitAny": true,