From a447df04bdbd648e2f607ae89b0019410bf7f9ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= <ferferga@hotmail.com>
Date: Wed, 1 Sep 2021 21:15:00 +0200
Subject: [PATCH] [typescript-axios] Properly emit module as ES6 instead of
 commonJS when using ES6 (#10308)

---
 .../src/main/resources/typescript-axios/tsconfig.mustache     | 4 ++--
 .../petstore/typescript-axios/builds/es6-target/tsconfig.json | 4 ++--
 .../tsconfig.json                                             | 4 ++--
 .../typescript-axios/builds/with-npm-version/tsconfig.json    | 4 ++--
 .../petstore/typescript-axios/tests/default/tsconfig.json     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/tsconfig.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/tsconfig.mustache
index c4a4cc771e7..f550c084ae1 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/tsconfig.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/tsconfig.mustache
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "target": "{{#supportsES6}}es6{{/supportsES6}}{{^supportsES6}}es5{{/supportsES6}}",
-    "module": "commonjs",
+    "target": "{{#supportsES6}}ES6{{/supportsES6}}{{^supportsES6}}ES5{{/supportsES6}}",
+    "module": "{{#supportsES6}}ES6{{/supportsES6}}{{^supportsES6}}ES5{{/supportsES6}}",
     "noImplicitAny": true,
     "outDir": "dist",
     "rootDir": ".",
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/tsconfig.json b/samples/client/petstore/typescript-axios/builds/es6-target/tsconfig.json
index 2e9a191f8d3..1d9d883877a 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/tsconfig.json
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "target": "es6",
-    "module": "commonjs",
+    "target": "ES6",
+    "module": "ES6",
     "noImplicitAny": true,
     "outDir": "dist",
     "rootDir": ".",
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/tsconfig.json b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/tsconfig.json
index 2f27acb9fd9..22c0342c1e4 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/tsconfig.json
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "target": "es5",
-    "module": "commonjs",
+    "target": "ES5",
+    "module": "ES5",
     "noImplicitAny": true,
     "outDir": "dist",
     "rootDir": ".",
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/tsconfig.json b/samples/client/petstore/typescript-axios/builds/with-npm-version/tsconfig.json
index 2f27acb9fd9..22c0342c1e4 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/tsconfig.json
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "declaration": true,
-    "target": "es5",
-    "module": "commonjs",
+    "target": "ES5",
+    "module": "ES5",
     "noImplicitAny": true,
     "outDir": "dist",
     "rootDir": ".",
diff --git a/samples/client/petstore/typescript-axios/tests/default/tsconfig.json b/samples/client/petstore/typescript-axios/tests/default/tsconfig.json
index 19ec18e2a45..e7958b13213 100644
--- a/samples/client/petstore/typescript-axios/tests/default/tsconfig.json
+++ b/samples/client/petstore/typescript-axios/tests/default/tsconfig.json
@@ -1,8 +1,8 @@
 {
     "compilerOptions": {
         "moduleResolution": "node",
-        "module": "commonjs",
-        "target": "es5",
+        "module": "ES5",
+        "target": "ES5",
         "noImplicitAny": true,
         "sourceMap": false,
         "outDir": "dist",