undo typescript change

Author: wing328

modules/openapi-generator/src/main/resources/typescript/api/api.mustache

@@ -4,7 +4,7 @@ import {Configuration} from '../configuration{{importFileExtension}}';
 import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http{{importFileExtension}}';
 {{#platforms}}
 {{#node}}
-import FormData from "form-data";
+import {{^supportsES6}}* as{{/supportsES6}} FormData from "form-data";
 import { URLSearchParams } from 'url';
 {{/node}}
 {{/platforms}}

modules/openapi-generator/src/main/resources/typescript/http/http.mustache

@@ -1,7 +1,7 @@
 {{#platforms}}
 {{#node}}
 // TODO: evaluate if we can easily get rid of this library
-import FormData from "form-data{{importFileExtension}}";
+import {{^supportsES6}}* as{{/supportsES6}} FormData from "form-data{{importFileExtension}}";
 import { URL, URLSearchParams } from 'url{{importFileExtension}}';
 import * as http from 'http{{importFileExtension}}';
 import * as https from 'https{{importFileExtension}}';

modules/openapi-generator/src/main/resources/typescript/package.mustache

@@ -15,13 +15,21 @@
   ],
   "license": "Unlicense",
   "main": "./dist/index.js",
-  {{#supportTypeModule}}
+  {{#supportsES6}}
   "type": "module",
   "module": "./dist/index.js",
-  {{/supportTypeModule}}
+  {{/supportsES6}}
+  {{^supportsES6}}
+  "type": "commonjs",
+  {{/supportsES6}}
   "exports": {
     ".": {
+      {{#supportsES6}}
       "import": "./dist/index.js",
+      {{/supportsES6}}
+      {{^supportsES6}}
+      "require": "./dist/index.js",
+      {{/supportsES6}}
       "types": "./dist/index.d.js"
     }
   },

modules/openapi-generator/src/main/resources/typescript/tsconfig.mustache

@@ -2,8 +2,13 @@
   "compilerOptions": {
     "strict": true,
     /* Basic Options */
+    {{#supportsES6}}
     "target": "es6",
     "esModuleInterop": true,
+    {{/supportsES6}}
+    {{^supportsES6}}
+    "target": "es5",
+    {{/supportsES6}}
     "moduleResolution": "node",
     "declaration": true,
 

samples/client/others/typescript/builds/with-unique-items/package.json

@@ -15,9 +15,10 @@
   ],
   "license": "Unlicense",
   "main": "./dist/index.js",
+  "type": "commonjs",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "types": "./dist/index.d.js"
     }
   },

samples/client/others/typescript/builds/with-unique-items/tsconfig.json

@@ -2,8 +2,7 @@
   "compilerOptions": {
     "strict": true,
     /* Basic Options */
-    "target": "es6",
-    "esModuleInterop": true,
+    "target": "es5",
     "moduleResolution": "node",
     "declaration": true,
 

samples/openapi3/client/petstore/typescript/builds/browser/package.json

@@ -15,6 +15,8 @@
   ],
   "license": "Unlicense",
   "main": "./dist/index.js",
+  "type": "module",
+  "module": "./dist/index.js",
   "exports": {
     ".": {
       "import": "./dist/index.js",

samples/openapi3/client/petstore/typescript/builds/composed-schemas/package.json

@@ -15,9 +15,10 @@
   ],
   "license": "Unlicense",
   "main": "./dist/index.js",
+  "type": "commonjs",
   "exports": {
     ".": {
-      "import": "./dist/index.js",
+      "require": "./dist/index.js",
       "types": "./dist/index.d.js"
     }
   },

samples/openapi3/client/petstore/typescript/builds/composed-schemas/tsconfig.json

@@ -2,8 +2,7 @@
   "compilerOptions": {
     "strict": true,
     /* Basic Options */
-    "target": "es6",
-    "esModuleInterop": true,
+    "target": "es5",
     "moduleResolution": "node",
     "declaration": true,
 

samples/openapi3/client/petstore/typescript/builds/default/apis/PetApi.ts

@@ -2,7 +2,7 @@
 import {BaseAPIRequestFactory, RequiredError, COLLECTION_FORMATS} from './baseapi';
 import {Configuration} from '../configuration';
 import {RequestContext, HttpMethod, ResponseContext, HttpFile} from '../http/http';
-import FormData from "form-data";
+import * as FormData from "form-data";
 import { URLSearchParams } from 'url';
 import {ObjectSerializer} from '../models/ObjectSerializer';
 import {ApiException} from './exception';