From 6e6926a8b892af30a588bce868428a2174e78ae7 Mon Sep 17 00:00:00 2001
From: Vincent Devos <46601673+karismann@users.noreply.github.com>
Date: Fri, 26 Apr 2019 16:34:25 +0200
Subject: [PATCH] [TypeScript] harmonize gitignore file (#2746)

---
 .gitignore                                                  | 6 ------
 .../codegen/languages/TypeScriptFetchClientCodegen.java     | 1 +
 .../codegen/languages/TypeScriptRxjsClientCodegen.java      | 1 +
 .../src/main/resources/typescript-aurelia/gitignore         | 1 +
 .../src/main/resources/typescript-axios/gitignore           | 1 +
 .../src/main/resources/typescript-fetch/gitignore           | 4 ++++
 .../src/main/resources/typescript-node/gitignore            | 1 +
 .../src/main/resources/typescript-rxjs/gitignore            | 4 ++++
 .../client/petstore/typescript-aurelia/default/.gitignore   | 1 +
 .../petstore/typescript-axios/builds/default/.gitignore     | 1 +
 .../petstore/typescript-axios/builds/es6-target/.gitignore  | 1 +
 .../typescript-axios/builds/with-interfaces/.gitignore      | 1 +
 .../with-npm-version-and-separate-models-and-api/.gitignore | 1 +
 .../typescript-axios/builds/with-npm-version/.gitignore     | 1 +
 .../petstore/typescript-fetch/builds/default/.gitignore     | 4 ++++
 .../petstore/typescript-fetch/builds/es6-target/.gitignore  | 4 ++++
 .../typescript-fetch/builds/with-interfaces/.gitignore      | 4 ++++
 .../typescript-fetch/builds/with-npm-version/.gitignore     | 4 ++++
 samples/client/petstore/typescript-node/default/.gitignore  | 1 +
 samples/client/petstore/typescript-node/npm/.gitignore      | 1 +
 .../petstore/typescript-rxjs/builds/default/.gitignore      | 4 ++++
 .../petstore/typescript-rxjs/builds/es6-target/.gitignore   | 4 ++++
 .../typescript-rxjs/builds/with-interfaces/.gitignore       | 4 ++++
 .../typescript-rxjs/builds/with-npm-version/.gitignore      | 4 ++++
 24 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/typescript-fetch/gitignore
 create mode 100644 modules/openapi-generator/src/main/resources/typescript-rxjs/gitignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/default/.gitignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/es6-target/.gitignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/.gitignore
 create mode 100644 samples/client/petstore/typescript-rxjs/builds/default/.gitignore
 create mode 100644 samples/client/petstore/typescript-rxjs/builds/es6-target/.gitignore
 create mode 100644 samples/client/petstore/typescript-rxjs/builds/with-interfaces/.gitignore
 create mode 100644 samples/client/petstore/typescript-rxjs/builds/with-npm-version/.gitignore

diff --git a/.gitignore b/.gitignore
index b864c95e2ad..b933d50e99c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,14 +166,8 @@ samples/client/petstore/python-asyncio/.pytest_cache/
 samples/client/petstore/python-tornado/.venv/
 
 # ts
-samples/client/petstore/typescript-node/npm/node_modules
-samples/client/petstore/typescript-node/**/typings
-samples/client/petstore/typescript-angular/**/typings
-samples/client/petstore/typescript-fetch/**/dist/
-samples/client/petstore/typescript-fetch/**/typings
 samples/client/petstore/typescript-angular2/npm/npm-debug.log
 samples/client/petstore/typescript-node/npm/npm-debug.log
-samples/client/petstore/typescript-aurelia/**/dist/
 samples/client/petstore/typescript-angular/tsd-debug.log
 
 # aspnetcore
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
index dc7d7165cf0..45aa36c02d6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
@@ -110,6 +110,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
         supportingFiles.add(new SupportingFile("apis.index.mustache", apiPackage().replace('.', File.separatorChar), "index.ts"));
         supportingFiles.add(new SupportingFile("models.index.mustache", modelPackage().replace('.', File.separatorChar), "index.ts"));
         supportingFiles.add(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
+        supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
         if (additionalProperties.containsKey(NPM_NAME)) {
             addNpmPackageGeneration();
         }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
index 777ae409cf0..fef59ec90af 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
@@ -110,6 +110,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
         supportingFiles.add(new SupportingFile("apis.index.mustache", apiPackage().replace('.', File.separatorChar), "index.ts"));
         supportingFiles.add(new SupportingFile("models.index.mustache", modelPackage().replace('.', File.separatorChar), "index.ts"));
         supportingFiles.add(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
+        supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
         if (additionalProperties.containsKey(NPM_NAME)) {
             addNpmPackageGeneration();
         }
diff --git a/modules/openapi-generator/src/main/resources/typescript-aurelia/gitignore b/modules/openapi-generator/src/main/resources/typescript-aurelia/gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/modules/openapi-generator/src/main/resources/typescript-aurelia/gitignore
+++ b/modules/openapi-generator/src/main/resources/typescript-aurelia/gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/gitignore b/modules/openapi-generator/src/main/resources/typescript-axios/gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/gitignore
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/gitignore b/modules/openapi-generator/src/main/resources/typescript-fetch/gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/gitignore b/modules/openapi-generator/src/main/resources/typescript-node/gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/gitignore
+++ b/modules/openapi-generator/src/main/resources/typescript-node/gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/gitignore b/modules/openapi-generator/src/main/resources/typescript-rxjs/gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-aurelia/default/.gitignore b/samples/client/petstore/typescript-aurelia/default/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-aurelia/default/.gitignore
+++ b/samples/client/petstore/typescript-aurelia/default/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-axios/builds/default/.gitignore b/samples/client/petstore/typescript-axios/builds/default/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-axios/builds/default/.gitignore
+++ b/samples/client/petstore/typescript-axios/builds/default/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/.gitignore b/samples/client/petstore/typescript-axios/builds/es6-target/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-axios/builds/es6-target/.gitignore
+++ b/samples/client/petstore/typescript-axios/builds/es6-target/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/.gitignore b/samples/client/petstore/typescript-axios/builds/with-interfaces/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-axios/builds/with-interfaces/.gitignore
+++ b/samples/client/petstore/typescript-axios/builds/with-interfaces/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.gitignore b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.gitignore
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/.gitignore b/samples/client/petstore/typescript-axios/builds/with-npm-version/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-axios/builds/with-npm-version/.gitignore
+++ b/samples/client/petstore/typescript-axios/builds/with-npm-version/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-fetch/builds/default/.gitignore b/samples/client/petstore/typescript-fetch/builds/default/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/default/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/.gitignore b/samples/client/petstore/typescript-fetch/builds/es6-target/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/.gitignore b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-node/default/.gitignore b/samples/client/petstore/typescript-node/default/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-node/default/.gitignore
+++ b/samples/client/petstore/typescript-node/default/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-node/npm/.gitignore b/samples/client/petstore/typescript-node/npm/.gitignore
index 35e2fb2b02e..149b5765472 100644
--- a/samples/client/petstore/typescript-node/npm/.gitignore
+++ b/samples/client/petstore/typescript-node/npm/.gitignore
@@ -1,3 +1,4 @@
 wwwroot/*.js
 node_modules
 typings
+dist
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/.gitignore b/samples/client/petstore/typescript-rxjs/builds/default/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/default/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/.gitignore b/samples/client/petstore/typescript-rxjs/builds/es6-target/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.gitignore b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.gitignore b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.gitignore
new file mode 100644
index 00000000000..149b5765472
--- /dev/null
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist