Merge branch 'release/v1.0.2' into master

.gitignore

@@ -70,9 +70,9 @@ typings/
 
 # Redundant ignore files
 packages/*/.npmignore
-packages/*/.gitignore
 packages/*/.drone.yml
 packages/*/LICENSE
+packages/generator-ts-project/templates/.gitignore.ejs
 
 # Yarn Integrity file
 .yarn-integrity

.gulp/npmignore.diff

@@ -0,0 +1,11 @@
+diff --git a/.npmignore b/.npmignore
+index 9d3909d..e8a353f 100644
+--- a/.npmignore
++++ b/.npmignore
+@@ -123,6 +123,3 @@ tsconfig.*.json
+
+ # Visual Studio Code-Environment
+ .vscode/
+-
+-# Drone configuration
+-.drone.yml

.npmignore

@@ -107,7 +107,8 @@ dist
 .tern-port
 
 # Source-files
-[Ss]rc/
+[Ss]rc/**/*
+![Ss]rc/tests/tsconfig.json
 
 # Source-maps
 [Ll]ib/**/*.map

CHANGELOG.md

@@ -6,7 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## TSProjectGenerator [Unreleased]
 
-[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.0.1...dev)
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.0.2...dev)
+
+## TSProjectGenerator v1.0.2
+### Fixed
+  - Fix the creation of `.gitignore` files
+  - Malformed and inexistent imports
+  - Fix the creation of `.drone.yml` files
+  - Errors due to missing dependencies
+  - Errors during the `cleanup`-task due to `.eslintrc.js` being placed incorrectly
+
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.0.1...v1.0.2)
 
 ## TSProjectGenerator v1.0.1
 ### Updated

gulpfile.ts

@@ -1,8 +1,9 @@
 import glob = require("glob");
 import { src, dest, parallel, watch, series } from "gulp";
+import rename = require("gulp-rename");
 import merge = require("merge-stream");
 import minimist = require("minimist");
-import { join } from "upath";
+import { join, basename } from "upath";
 import ApplyPatch = require("./.gulp/ApplyPatch");
 
 let projectGeneratorName = "generator-ts-project";
@@ -12,7 +13,8 @@ let npmIgnoreFile = ".npmignore";
 let droneFile = ".drone.yml";
 let licenseFile = "LICENSE";
 let gitDiffFile = GulpPath("gitignore.diff");
-let npmDiffFile = CommonTemplatePath("npmignore.diff");
+let npmDiffFile = CommonTemplatePath(projectGeneratorName, "npmignore.diff");
+let customNPMDiffFile = GulpPath("npmignore.diff");
 let options = minimist(process.argv.slice(2), { boolean: "watch" });
 
 /**
@@ -46,15 +48,18 @@ function PackagePath(...path: string[]): string
 /**
  * Creates a path relative to the common template folder.
  *
+ * @param generatorName
+ * The name of the generator containing the common templates.
+ *
  * @param path
  * The path to join.
  *
  * @returns
  * The `path` relative to the common template folder.
  */
-function CommonTemplatePath(...path: string[]): string
+function CommonTemplatePath(generatorName: string, ...path: string[]): string
 {
-    return PackagePath(projectGeneratorName, "templates", ...path);
+    return PackagePath(generatorName, "templates", ...path);
 }
 
 /**
@@ -85,7 +90,8 @@ export let CopyFiles =
                             watch(
                                 [
                                     npmIgnoreFile,
-                                    npmDiffFile
+                                    npmDiffFile,
+                                    customNPMDiffFile
                                 ],
                                 CopyNPMIgnore);
 
@@ -118,7 +124,12 @@ export function CopyGitIgnore(): NodeJS.ReadWriteStream
     return src(gitIgnoreFile).pipe(
         ApplyPatch(gitDiffFile)
     ).pipe(
-        dest(PackagePath(projectGeneratorName))
+        rename(
+            {
+                suffix: ".ejs"
+            })
+    ).pipe(
+        dest(CommonTemplatePath(projectGeneratorName))
     );
 }
 
@@ -135,15 +146,26 @@ export function CopyNPMIgnore(): NodeJS.ReadWriteStream
     let ignoreFile = (): NodeJS.ReadWriteStream => src(npmIgnoreFile);
     let streams: NodeJS.ReadWriteStream[] = [];
 
-    for (let folder of glob.sync(PackagePath(`!(${projectGeneratorName})`)))
+    for (let folder of glob.sync(PackagePath("*")))
     {
-        streams.push(
-            ignoreFile().pipe(
-                ApplyPatch(npmDiffFile)
-            ).pipe(dest(folder)));
+        let stream = ignoreFile();
+        let packageName = basename(folder);
+
+        if (packageName !== projectGeneratorName)
+        {
+            stream = stream.pipe(
+                ApplyPatch(npmDiffFile));
+
+            if (packageName === customProjectGeneratorName)
+            {
+                stream = stream.pipe(
+                    ApplyPatch(customNPMDiffFile));
+            }
+        }
+
+        streams.push(stream.pipe(dest(folder)));
     }
 
-    streams.push(ignoreFile().pipe(dest(PackagePath(projectGeneratorName))));
     return merge(streams);
 }
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.1",
+  "version": "1.0.2",
   "packages": [
     "./packages/*"
   ],