Merge branch 'release/v1.0.3' into master

Author: neurolag

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.2...dev)
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.0.3...dev)
+
+## TSProjectGenerator v1.0.3
+### Fixed
+  - Errors due to incorrect imports
+  - Errors due to the `cleanup` task being scoped incorrectly
+
+## Updated
+  - All packages
+
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.0.2...v1.0.3)
 
 ## TSProjectGenerator v1.0.2
 ### Fixed

lerna.json

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

package-lock.json

@@ -37,7 +37,7 @@
     "concurrently": "^5.3.0",
     "copy-and-watch": "^0.1.5",
     "diff": "^4.0.2",
-    "eslint": "^7.7.0",
+    "eslint": "^7.8.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jsdoc": "^30.3.0",
     "fs-extra": "^9.0.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manuth/generator-my-ts-project",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Generates TypeScript-Projects with custom additions",
   "author": "Manuel Thalmann <[email protected]>",
   "keywords": [
@@ -40,8 +40,8 @@
     "prepare": "npm run rebuild"
   },
   "dependencies": {
-    "@manuth/extended-yo-generator": "^7.3.2",
-    "@manuth/generator-ts-project": "^1.0.2",
+    "@manuth/extended-yo-generator": "^7.3.3",
+    "@manuth/generator-ts-project": "^1.0.3",
     "chalk": "^4.1.0",
     "dedent": "^0.7.0",
     "detect-newline": "^3.1.0",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@manuth/eslint-plugin-typescript": "^2.1.2",
-    "@manuth/extended-yo-generator-test": "^7.3.2",
+    "@manuth/extended-yo-generator-test": "^7.3.3",
     "@manuth/tsconfig": "^1.2.2",
     "@types/dedent": "^0.7.0",
     "@types/fs-extra": "^9.0.1",
@@ -65,7 +65,7 @@
     "@typescript-eslint/eslint-plugin-tslint": "^4.0.1",
     "@typescript-eslint/parser": "^4.0.1",
     "concurrently": "^5.3.0",
-    "eslint": "^7.7.0",
+    "eslint": "^7.8.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-jsdoc": "^30.3.0",
     "mocha": "^8.1.3",

packages/generator-my-ts-project/package-lock.json

@@ -1,7 +1,7 @@
 import { GeneratorOptions, IGeneratorSettings, IFileMapping, IGenerator, FileMapping } from "@manuth/extended-yo-generator";
+import { FileMappingBase } from "@manuth/generator-ts-project";
 import detectNewLine = require("detect-newline");
 import { split } from "eol";
-import { FileMappingBase } from "../../generator-ts-project/lib";
 
 /**
  * Provides the functionality to remove unnecessary blank lines from markdown-files.

packages/generator-my-ts-project/package.json

@@ -1,6 +1,5 @@
-import { Generator, IComponentCollection, IFileMapping, FileMapping, IComponentCategory, IComponent, Component, IGenerator } from "@manuth/extended-yo-generator";
-import { CompositeConstructor } from "@manuth/extended-yo-generator/lib/CompositeConstructor";
-import { GeneratorConstructor } from "@manuth/extended-yo-generator/lib/GeneratorConstructor";
+import { CompositeConstructor, Generator, GeneratorConstructor, IComponentCollection, IFileMapping, FileMapping, IComponentCategory, IComponent, Component, IGenerator } from "@manuth/extended-yo-generator";
+import { TSProjectGenerator } from "@manuth/generator-ts-project";
 import { DroneFileMapping } from "./DroneFileMapping";
 import { MarkdownFileProcessor } from "./MarkdownFileProcessor";
 import { MyGeneratorComponent } from "./MyGeneratorComponent";
@@ -28,7 +27,7 @@ export abstract class MyTSProjectGenerator
      * @returns
      * The generated constructor.
      */
-    public static Create<T extends GeneratorConstructor>(base: T, namespaceOrPath?: string): CompositeConstructor<T>
+    public static Create<T extends GeneratorConstructor<TSProjectGenerator>>(base: T, namespaceOrPath?: string): CompositeConstructor<T>
     {
         let baseClass = Generator.ComposeWith(base, namespaceOrPath);
 
@@ -115,6 +114,14 @@ export abstract class MyTSProjectGenerator
 
                 return components;
             }
+
+            /**
+             * @inheritdoc
+             */
+            public async cleanup(): Promise<void>
+            {
+                this.Base.cleanup();
+            }
         }
 
         return BaseGenerator as any;