Merge branch 'release/v1.1.1' into master

manuth · Sep 6, 2020 · b6185ee · b6185ee
2 parents 25f38e0 + e32906c
commit b6185ee
Show file tree

Hide file tree

Showing 40 changed files with 195 additions and 119 deletions.
diff --git a/.gitignore b/.gitignore
@@ -68,7 +68,7 @@ typings/
 # Output of 'npm pack'
 *.tgz
 
-# Redundant ignore files
+# Redundant files
 packages/*/.npmignore
 packages/*/.drone.yml
 packages/*/LICENSE

diff --git a/.gulp/gitignore.diff b/.gulp/gitignore.diff
diff --git a/CHANGELOG.md b/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.1.0...dev)
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.1.1...dev)
+
+## TSProjectGenerator v1.1.1
+### Fixed
+  - Fixed broken `.gitignore` file creation
+
+### Updated
+  - The code for creating `launch.json` files
+  - The terminoloy of some file-processors
+
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v1.1.0...v1.1.1)
 
 ## TSProjectGenerator v1.1.0
 ### Added

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0",
+  "version": "1.1.1",
   "packages": [
     "./packages/*"
   ],

diff --git a/packages/generator-my-ts-project/package-lock.json b/packages/generator-my-ts-project/package-lock.json
diff --git a/packages/generator-my-ts-project/package.json b/packages/generator-my-ts-project/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@manuth/generator-my-ts-project",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Generates TypeScript-Projects with custom additions",
   "author": "Manuel Thalmann <[email protected]>",
   "keywords": [
@@ -41,13 +41,13 @@
   },
   "dependencies": {
     "@manuth/extended-yo-generator": "^7.3.3",
-    "@manuth/generator-ts-project": "^1.1.0",
+    "@manuth/generator-ts-project": "^1.1.1",
+    "@manuth/temp-files": "^1.2.0",
     "chalk": "^4.1.0",
     "dedent": "^0.7.0",
     "detect-newline": "^3.1.0",
     "eol": "^0.9.1",
     "fs-extra": "^9.0.1",
-    "temp-filesystem": "^1.1.3",
     "yaml": "^1.10.0",
     "yosay": "^2.0.2"
   },

diff --git a/packages/generator-my-ts-project/src/tests/MarkdownFileProcessor.test.ts b/packages/generator-my-ts-project/src/tests/MarkdownFileProcessor.test.ts
@@ -1,9 +1,9 @@
 import Assert = require("assert");
 import { GeneratorOptions } from "@manuth/extended-yo-generator";
 import { TestContext, TestGenerator, ITestGeneratorOptions, ITestOptions, ITestGeneratorSettings, FileMappingTester } from "@manuth/extended-yo-generator-test";
+import { TempFile } from "@manuth/temp-files";
 import dedent = require("dedent");
 import { writeFile } from "fs-extra";
-import { TempFile } from "temp-filesystem";
 import { MarkdownFileProcessor } from "../MarkdownFileProcessor";
 
 /**

diff --git a/packages/generator-ts-project/package-lock.json b/packages/generator-ts-project/package-lock.json
diff --git a/packages/generator-ts-project/package.json b/packages/generator-ts-project/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@manuth/generator-ts-project",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A Set of Generators for Creating Projects Written in TypeScript",
   "author": "Manuel Thalmann <[email protected]>",
   "license": "MIT",
@@ -44,6 +44,7 @@
   "dependencies": {
     "@manuth/extended-yo-generator": "^7.3.3",
     "@manuth/package-json-editor": "^1.4.1",
+    "@manuth/temp-files": "^1.2.0",
     "@types/vscode": "^1.48.0",
     "chalk": "^4.1.0",
     "comment-json": "^4.0.4",
@@ -58,7 +59,6 @@
     "npm-which": "^3.0.1",
     "parse-pkg-name": "^2.0.0",
     "shusher": "^0.1.1",
-    "temp-filesystem": "^1.1.3",
     "ts-morph": "^8.1.0",
     "typescript": "^4.0.2",
     "validate-npm-package-name": "^3.0.0",

diff --git a/packages/generator-ts-project/src/Project/TSProjectGenerator.ts b/packages/generator-ts-project/src/Project/TSProjectGenerator.ts
@@ -3,14 +3,14 @@ import { EOL } from "os";
 import { relative } from "path";
 import { Generator, GeneratorOptions, Question, IComponentCollection, IFileMapping, GeneratorSettingKey } from "@manuth/extended-yo-generator";
 import { Package } from "@manuth/package-json-editor";
+import { TempDirectory } from "@manuth/temp-files";
 import chalk = require("chalk");
 import JSON = require("comment-json");
 import dedent = require("dedent");
 import { split } from "eol";
 import { ESLint } from "eslint";
 import { readFile, writeJSON, readJSON, writeFile } from "fs-extra";
 import npmWhich = require("npm-which");
-import { TempDirectory } from "temp-filesystem";
 import { Linter } from "tslint";
 import { Program } from "typescript";
 import { join, resolve } from "upath";

diff --git a/...ct/VSCode/TSProjectLaunchFileProcessor.ts → ...SCode/TSProjectLaunchSettingsProcessor.ts b/...ct/VSCode/TSProjectLaunchFileProcessor.ts → ...SCode/TSProjectLaunchSettingsProcessor.ts
@@ -1,17 +1,18 @@
 import { GeneratorOptions } from "@manuth/extended-yo-generator";
+import { normalize } from "upath";
 import { DebugConfiguration } from "vscode";
 import { CodeWorkspaceComponent } from "../../VSCode/Components/CodeWorkspaceComponent";
 import { ILaunchSettings } from "../../VSCode/ILaunchSettings";
-import { LaunchFileProcessor } from "../../VSCode/LaunchFileProcessor";
+import { LaunchSettingsProcessor } from "../../VSCode/LaunchSettingsProcessor";
 import { ITSProjectSettings } from "../Settings/ITSProjectSettings";
 
 /**
  * Provides the functionality to process debug-configurations for `TSProject`s.
  */
-export class TSProjectLaunchFileProcessor<TSettings extends ITSProjectSettings, TOptions extends GeneratorOptions> extends LaunchFileProcessor<TSettings, TOptions>
+export class TSProjectLaunchSettingsProcessor<TSettings extends ITSProjectSettings, TOptions extends GeneratorOptions> extends LaunchSettingsProcessor<TSettings, TOptions>
 {
     /**
-     * Initializes a new instance of the `TSProjectLaunchFileProcessor` class.
+     * Initializes a new instance of the `TSProjectLaunchDataProcessor` class.
      *
      * @param component
      * The component of the processor.
@@ -48,8 +49,8 @@ export class TSProjectLaunchFileProcessor<TSettings extends ITSProjectSettings,
     protected async FilterDebugConfig(debugConfig: DebugConfiguration): Promise<boolean>
     {
         return !(
-            debugConfig.name.toLowerCase().includes("yeoman") ||
-            debugConfig.name.toLowerCase().includes("mytsproject"));
+            normalize(debugConfig.program ?? "").toLowerCase().endsWith("yo/lib/cli.js") ||
+            (debugConfig.program ?? "").includes("${workspaceFolder:MyTSProjectGenerator}"));
     }
 
     /**

diff --git a/packages/generator-ts-project/src/Project/VSCode/TSProjectWorkspaceProcessor.ts b/packages/generator-ts-project/src/Project/VSCode/TSProjectWorkspaceProcessor.ts
@@ -7,7 +7,7 @@ import { ITaskSettings } from "../../VSCode/ITaskSettings";
 import { WorkspaceProcessor } from "../../VSCode/WorkspaceProcessor";
 import { ITSProjectSettings } from "../Settings/ITSProjectSettings";
 import { TSProjectExtensionsProcessor } from "./TSProjectExtensionsProcessor";
-import { TSProjectLaunchFileProcessor } from "./TSProjectLaunchFileProcessor";
+import { TSProjectLaunchSettingsProcessor } from "./TSProjectLaunchSettingsProcessor";
 import { TSProjectSettingsProcessor } from "./TSProjectSettingsProcessor";
 import { TSProjectTasksProcessor } from "./TSProjectTasksProcessor";
 
@@ -38,9 +38,9 @@ export class TSProjectWorkspaceProcessor<TSettings extends ITSProjectSettings, T
     /**
      * @inheritdoc
      */
-    protected get LaunchFileProcessor(): JSONProcessor<TSettings, TOptions, ILaunchSettings>
+    protected get LaunchSettingsProcessor(): JSONProcessor<TSettings, TOptions, ILaunchSettings>
     {
-        return new TSProjectLaunchFileProcessor(this.Component);
+        return new TSProjectLaunchSettingsProcessor(this.Component);
     }
 
     /**

diff --git a/...project/src/VSCode/LaunchFileProcessor.ts → ...ect/src/VSCode/LaunchSettingsProcessor.ts b/...project/src/VSCode/LaunchFileProcessor.ts → ...ect/src/VSCode/LaunchSettingsProcessor.ts
@@ -7,10 +7,10 @@ import { VSCodeJSONProcessor } from "./VSCodeJSONProcessor";
 /**
  * Provides the functionality to process vscode debug configurations.
  */
-export class LaunchFileProcessor<TSettings extends IGeneratorSettings, TOptions extends GeneratorOptions> extends VSCodeJSONProcessor<TSettings, TOptions, ILaunchSettings>
+export class LaunchSettingsProcessor<TSettings extends IGeneratorSettings, TOptions extends GeneratorOptions> extends VSCodeJSONProcessor<TSettings, TOptions, ILaunchSettings>
 {
     /**
-     * Initializes a new instance of the `LaunchFileProcessor` class.
+     * Initializes a new instance of the `LaunchSettingsProcessor` class.
      *
      * @param component
      * The component of the processor.
@@ -23,15 +23,15 @@ export class LaunchFileProcessor<TSettings extends IGeneratorSettings, TOptions
     /**
      * @inheritdoc
      *
-     * @param data
+     * @param launchSettings
      * The data to process.
      *
      * @returns
      * The processed data.
      */
-    public async Process(data: ILaunchSettings): Promise<ILaunchSettings>
+    public async Process(launchSettings: ILaunchSettings): Promise<ILaunchSettings>
     {
-        let result = await super.Process(data);
+        let result = await super.Process(launchSettings);
 
         if (result?.configurations)
         {