Merge branch 'release/v3.0.12'

manuth · Dec 17, 2021 · e714ad6 · e714ad6
2 parents 91cb7b5 + 10e5a5c
commit e714ad6
Show file tree

Hide file tree

Showing 15 changed files with 146 additions and 72 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -100,7 +100,7 @@ steps:
       api_key:
         from_secret: github_publish_token
       files:
-        - "./*.tgz"
+        - "*.tgz"
       title: .releaseTitle.md
       note: .releaseNotes.md
     when:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## TSProjectGenerator [Unreleased]
 
-[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v3.0.11...dev)
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v3.0.12...dev)
+
+## TSProjectGenerator v3.0.12
+### Fixed
+  - Broken drone pipeline creation
+  - Incorrect `test` npm script
+  - Creation of vscode debug settings
+
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v3.0.11...v3.0.12)
 
 ## TSProjectGenerator v3.0.11
 ### Fixed

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
   },
   "devDependencies": {
     "@manuth/eslint-plugin-typescript": "^3.2.6",
+    "@manuth/package-json-editor": "^2.2.5",
     "@tsd/typescript": "npm:nop@^1.0.0",
     "@types/diff": "^5.0.1",
     "@types/fs-extra": "^9.0.13",

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": "3.0.11",
+  "version": "3.0.12",
   "description": "Generates TypeScript-Projects with custom additions",
   "author": "Manuel Thalmann <[email protected]>",
   "license": "MIT",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@manuth/extended-yo-generator": "^11.0.6",
-    "@manuth/generator-ts-project": "^3.0.11",
+    "@manuth/generator-ts-project": "^3.0.12",
     "@manuth/package-json-editor": "2.2.5",
     "comment-json": "^4.1.1",
     "detect-newline": "^3.1.0",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@manuth/extended-yo-generator-test": "^11.0.6",
-    "@manuth/generator-ts-project-test": "^3.0.11",
+    "@manuth/generator-ts-project-test": "^3.0.12",
     "@manuth/temp-files": "^2.0.8",
     "@types/dedent": "^0.7.0",
     "@types/fs-extra": "^9.0.13",

diff --git a/packages/generator-my-ts-project/src/DroneFileMapping.ts b/packages/generator-my-ts-project/src/DroneFileMapping.ts
@@ -74,18 +74,13 @@ export class DroneFileMapping<TSettings extends ITSProjectSettings, TOptions ext
             {
                 let command = commands[j];
 
-                if (/\b--workspaces\b/.test(command))
+                if (/\s+--workspaces\b/.test(command))
                 {
                     document.setIn(
                         [stepsKey, i, commandsKey, j],
-                        command.replace(/\b--workspaces\b/, ""));
+                        command.replace(/\s+--workspaces\b/, ""));
                 }
             }
-
-            if (step.image === "plugins/github-release")
-            {
-                document.setIn([stepsKey, i, "settings", "files", "0"], "*.tgz");
-            }
         }
 
         return [document];

diff --git a/packages/generator-my-ts-project/src/tests/DroneFileMapping.test.ts b/packages/generator-my-ts-project/src/tests/DroneFileMapping.test.ts
@@ -82,23 +82,15 @@ export function DroneFileMappingTests(context: TestContext<MyTSModuleGenerator>)
                 nameof<DroneFileMapping<any, any>>((fileMapping) => fileMapping.Transform),
                 () =>
                 {
-                    test(
-                        "Checking whether `publish` commands are replaced correctly…",
-                        async function()
-                        {
-                            this.timeout(2 * 1000);
-                            this.slow(1 * 1000);
-                            ok(await AssertCommand((command) => command.startsWith("npm publish")));
-                            ok(await AssertCommand((command) => !command.startsWith("npx lerna publish"), true));
-                        });
+                    let workspaceArg = "--workspaces";
 
                     test(
-                        "Checking whether `lerna exec` commands are replaced correctly…",
+                        `Checking whether \`${workspaceArg}\` arguments of commands are stripped away…`,
                         async function()
                         {
                             this.timeout(2 * 1000);
                             this.slow(1 * 1000);
-                            ok(await AssertCommand((command) => !command.startsWith("npx lerna exec"), true));
+                            ok(await AssertCommand((command) => !command.includes(workspaceArg)));
                         });
 
                     test(
@@ -131,34 +123,6 @@ export function DroneFileMappingTests(context: TestContext<MyTSModuleGenerator>)
                                             });
                                     }));
                         });
-
-                    test(
-                        "Checking whether the `test`-step is adjusted correctly…",
-                        async function()
-                        {
-                            this.timeout(2 * 1000);
-                            this.slow(1 * 1000);
-
-                            ok(
-                                (await tester.ParseOutput()).every(
-                                    (document) =>
-                                    {
-                                        let steps: any[] = document.toJSON().steps;
-
-                                        return steps.every(
-                                            (step) =>
-                                            {
-                                                if (step.name === "test")
-                                                {
-                                                    return !(step.image as string).endsWith(":lts");
-                                                }
-                                                else
-                                                {
-                                                    return true;
-                                                }
-                                            });
-                                    }));
-                        });
                 });
         });
 }
diff --git a/packages/generator-my-ts-project/src/tests/MyTSProjectPackageFileMapping.test.ts b/packages/generator-my-ts-project/src/tests/MyTSProjectPackageFileMapping.test.ts
@@ -1,4 +1,4 @@
-import { ok } from "assert";
+import { ok, strictEqual } from "assert";
 import { GeneratorOptions } from "@manuth/extended-yo-generator";
 import { FileMappingTester, TestContext } from "@manuth/extended-yo-generator-test";
 import { ITSProjectSettings, TSProjectPackageFileMapping } from "@manuth/generator-ts-project";
@@ -97,7 +97,7 @@ export function MyTSProjectPackageFileMappingTests(context: TestContext<TestTSMo
                             let patchScriptName = "patch-ts";
 
                             ok(npmPackage.Scripts.Get(prepareScriptName).includes(patchScriptName));
-                            ok(npmPackage.Scripts.Has(patchScriptName));
+                            strictEqual(npmPackage.Scripts.Get(patchScriptName), "ts-patch install");
                         });
                 });
 

diff --git a/packages/generator-ts-project-test/package.json b/packages/generator-ts-project-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@manuth/generator-ts-project-test",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "Provides the functionality to test `TSProjectGenerator`-components",
   "author": "Manuel Thalmann <[email protected]>",
   "license": "MIT",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@manuth/extended-yo-generator": "^11.0.6",
     "@manuth/extended-yo-generator-test": "^11.0.6",
-    "@manuth/generator-ts-project": "^3.0.11",
+    "@manuth/generator-ts-project": "^3.0.12",
     "@manuth/package-json-editor": "^2.2.5",
     "@manuth/temp-files": "^2.0.8",
     "@stdlib/utils-escape-regexp-string": "^0.0.7",

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": "3.0.11",
+  "version": "3.0.12",
   "description": "A Set of Generators for Creating Projects Written in TypeScript",
   "author": "Manuel Thalmann <[email protected]>",
   "license": "MIT",
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@manuth/eslint-plugin-typescript": "^3.2.6",
     "@manuth/extended-yo-generator-test": "^11.0.6",
-    "@manuth/generator-ts-project-test": "^3.0.11",
+    "@manuth/generator-ts-project-test": "^3.0.12",
     "@manuth/tsconfig": "^3.0.0",
     "@types/dedent": "^0.7.0",
     "@types/diff": "^5.0.1",

diff --git a/...enerator-ts-project/src/Project/FileMappings/NPMPackagning/TSProjectPackageFileMapping.ts b/...enerator-ts-project/src/Project/FileMappings/NPMPackagning/TSProjectPackageFileMapping.ts
@@ -79,10 +79,30 @@ export class TSProjectPackageFileMapping<TSettings extends ITSProjectSettings, T
      */
     public get MiscScripts(): Array<IScriptMapping<TSettings, TOptions> | string>
     {
+        let testScriptName = "test";
         let prepareScriptName = "prepare";
 
         return [
-            "test",
+            {
+                Source: testScriptName,
+                Destination: testScriptName,
+                Processor: async (script) =>
+                {
+                    let separator = " && ";
+                    let commands = script.split(separator);
+                    let filtered: string[] = [];
+
+                    for (let command of commands)
+                    {
+                        if (command !== "tsd")
+                        {
+                            filtered.push(command);
+                        }
+                    }
+
+                    return filtered.join(separator);
+                }
+            },
             {
                 Source: "initialize",
                 Destination: prepareScriptName

diff --git a/packages/generator-ts-project/src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts b/packages/generator-ts-project/src/Project/VSCode/TSProjectLaunchSettingsProcessor.ts
@@ -56,7 +56,11 @@ export class TSProjectLaunchSettingsProcessor<TSettings extends ITSProjectSettin
      */
     protected override async FilterDebugConfig(debugConfig: DebugConfiguration): Promise<boolean>
     {
-        return (debugConfig.program ?? "").includes(this.GetWorkspaceFolderDirective("TSProjectGenerator")) &&
+        let workspaceDirective = this.GetWorkspaceFolderDirective("TSProjectGenerator");
+
+        return (
+            (debugConfig.args as string[])?.[0]?.includes(workspaceDirective) ||
+            (debugConfig.cwd as string)?.includes(workspaceDirective)) &&
             !(normalize(debugConfig.program ?? "").toLowerCase().endsWith(join("node_modules", "yo", "lib", "cli.js")));
     }
 

diff --git a/...s-project/src/tests/Project/FileMappings/NPMPackaging/TSProjectPackageFileMapping.test.ts b/...s-project/src/tests/Project/FileMappings/NPMPackaging/TSProjectPackageFileMapping.test.ts
@@ -162,7 +162,7 @@ export function TSProjectPackageFileMappingTests(context: TestContext<TSProjectG
                                     lintCodeScript,
                                     lintScript));
 
-                            await AssertScriptCopy("test");
+                            await tester.AssertScript("test", (script) => !script.includes("tsd"));
 
                             await tester.AssertScript(
                                 "prepare",

diff --git a/...es/generator-ts-project/src/tests/Project/VSCode/TSProjectLaunchSettingsProcessor.test.ts b/...es/generator-ts-project/src/tests/Project/VSCode/TSProjectLaunchSettingsProcessor.test.ts
@@ -76,6 +76,7 @@ export function TSProjectLaunchSettingsProcessorTests(context: TestContext<TSPro
                         {
                             this.timeout(4 * 1000);
                             this.slow(2 * 1000);
+                            let workspaceDirective = processor.GetWorkspaceFolderDirective(generatorName);
 
                             strictEqual(
                                 (await processor.Process(
@@ -100,7 +101,24 @@ export function TSProjectLaunchSettingsProcessorTests(context: TestContext<TSPro
                                                 name: "",
                                                 request: "",
                                                 type: "",
-                                                program: processor.GetWorkspaceFolderDirective(generatorName)
+                                                cwd: workspaceDirective
+                                            }
+                                        ]
+                                    })).configurations.length,
+                                1);
+
+                            strictEqual(
+                                (await processor.Process(
+                                    {
+                                        version: "",
+                                        configurations: [
+                                            {
+                                                name: "",
+                                                request: "",
+                                                type: "",
+                                                args: [
+                                                    workspaceDirective
+                                                ]
                                             }
                                         ]
                                     })).configurations.length,