From 3ea1fbb6454546d1fe4830bc2c6b458057add41f Mon Sep 17 00:00:00 2001 From: Dennis Ameling Date: Fri, 8 Nov 2024 13:37:06 +0100 Subject: [PATCH] [typescript] use supportsES6 in sample testing --- bin/configs/typescript-consolidated-inversify.yaml | 1 + .../petstore/typescript/builds/inversify/apis/PetApi.ts | 2 +- .../petstore/typescript/builds/inversify/apis/StoreApi.ts | 2 +- .../petstore/typescript/builds/inversify/apis/UserApi.ts | 2 +- .../client/petstore/typescript/builds/inversify/http/http.ts | 2 +- .../client/petstore/typescript/builds/inversify/package.json | 5 +++-- .../petstore/typescript/builds/inversify/tsconfig.json | 3 ++- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bin/configs/typescript-consolidated-inversify.yaml b/bin/configs/typescript-consolidated-inversify.yaml index 5d230cb88ea5..2941c3c1ce2a 100644 --- a/bin/configs/typescript-consolidated-inversify.yaml +++ b/bin/configs/typescript-consolidated-inversify.yaml @@ -8,3 +8,4 @@ additionalProperties: useInversify: true projectName: ts-petstore-client moduleName: petstore + supportsES6: true diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts index f1a6e270e0b2..984dbd77dcea 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/PetApi.ts @@ -2,7 +2,7 @@ import {BaseAPIRequestFactory, RequiredError, COLLECTION_FORMATS} from './baseapi'; import {Configuration} from '../configuration'; import {RequestContext, HttpMethod, ResponseContext, HttpFile, HttpInfo} from '../http/http'; -import * as FormData from "form-data"; +import FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts index 40898f29d80d..2bbb54b777bc 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/StoreApi.ts @@ -2,7 +2,7 @@ import {BaseAPIRequestFactory, RequiredError, COLLECTION_FORMATS} from './baseapi'; import {Configuration} from '../configuration'; import {RequestContext, HttpMethod, ResponseContext, HttpFile, HttpInfo} from '../http/http'; -import * as FormData from "form-data"; +import FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts index 766707c7b9b8..13aca4d0559e 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/apis/UserApi.ts @@ -2,7 +2,7 @@ import {BaseAPIRequestFactory, RequiredError, COLLECTION_FORMATS} from './baseapi'; import {Configuration} from '../configuration'; import {RequestContext, HttpMethod, ResponseContext, HttpFile, HttpInfo} from '../http/http'; -import * as FormData from "form-data"; +import FormData from "form-data"; import { URLSearchParams } from 'url'; import {ObjectSerializer} from '../models/ObjectSerializer'; import {ApiException} from './exception'; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts index a86684691d45..11e424d29ac2 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/http/http.ts @@ -1,5 +1,5 @@ // TODO: evaluate if we can easily get rid of this library -import * as FormData from "form-data"; +import FormData from "form-data"; import { URL, URLSearchParams } from 'url'; import * as http from 'http'; import * as https from 'https'; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/package.json b/samples/openapi3/client/petstore/typescript/builds/inversify/package.json index 8f4d591669dc..1118902e6673 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/package.json +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/package.json @@ -15,10 +15,11 @@ ], "license": "Unlicense", "main": "./dist/index.js", - "type": "commonjs", + "type": "module", + "module": "./dist/index.js", "exports": { ".": { - "require": "./dist/index.js", + "import": "./dist/index.js", "types": "./dist/index.d.js" } }, diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json b/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json index 5e5e64395c2a..cc0b2b2a3795 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/tsconfig.json @@ -2,7 +2,8 @@ "compilerOptions": { "strict": true, /* Basic Options */ - "target": "es5", + "target": "es6", + "esModuleInterop": true, "moduleResolution": "node", "declaration": true,