Merge branch 'release/v4.0.1'

manuth · Sep 10, 2022 · 109a036 · 109a036
2 parents 7c7fc6b + 0eaebc3
commit 109a036
Show file tree

Hide file tree

Showing 10 changed files with 145 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## TSProjectGenerator [Unreleased]
 
-[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v4.0.0...dev)
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v4.0.1...dev)
+
+## TSProjectGenerator v4.0.1
+### MyTSProjectGenerator
+#### Fixed
+  - The package for the use on windows systems
+
+[Show differences](https://github.com/manuth/TSProjectGenerator/compare/v4.0.0...v4.0.1)
 
 ## TSProjectGenerator v4.0.0
 ### General

diff --git a/package-lock.json b/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": "4.0.0",
+  "version": "4.0.1",
   "type": "module",
   "description": "Generates TypeScript-Projects with custom additions",
   "author": "Manuel Thalmann <[email protected]>",
@@ -43,17 +43,17 @@
   },
   "dependencies": {
     "@manuth/extended-yo-generator": "^12.1.2",
-    "@manuth/generator-ts-project": "^4.0.0",
+    "@manuth/generator-ts-project": "^4.0.1",
     "@manuth/package-json-editor": "3.0.2",
+    "dependency-package-path": "^1.0.0",
     "detect-newline": "^4.0.0",
     "eol": "^0.9.1",
-    "esm-resolve": "^1.0.8",
     "upath": "^2.0.1",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
     "@manuth/extended-yo-generator-test": "^12.1.2",
-    "@manuth/generator-ts-project-test": "^4.0.0",
+    "@manuth/generator-ts-project-test": "^4.0.1",
     "@manuth/temp-files": "^3.0.0",
     "@types/dedent": "^0.7.0",
     "@types/mocha": "^9.1.1",

diff --git a/packages/generator-my-ts-project/src/generators/generator/MyTSGeneratorGenerator.ts b/packages/generator-my-ts-project/src/generators/generator/MyTSGeneratorGenerator.ts
@@ -1,13 +1,11 @@
-import { createRequire } from "node:module";
+import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { GeneratorOptions } from "@manuth/extended-yo-generator";
 import { ITSGeneratorSettings, TSGeneratorGenerator } from "@manuth/generator-ts-project";
-import buildResolver from "esm-resolve";
+import { dependencyPath } from "dependency-package-path";
 import { MyTSProjectGenerator } from "../../MyTSProjectGenerator.js";
 
-const basePath = createRequire(import.meta.url).resolve(
-    buildResolver(fileURLToPath(import.meta.url))("@manuth/generator-ts-project")
-);
+const basePath = dependencyPath("@manuth/generator-ts-project", dirname(fileURLToPath(import.meta.url)));
 
 /**
  * Provides the functionality to generate a custom generator written in TypeScript.

diff --git a/packages/generator-my-ts-project/src/generators/module/MyTSModuleGenerator.ts b/packages/generator-my-ts-project/src/generators/module/MyTSModuleGenerator.ts
@@ -1,13 +1,11 @@
-import { createRequire } from "node:module";
+import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { GeneratorOptions } from "@manuth/extended-yo-generator";
 import { ITSProjectSettings, TSModuleGenerator } from "@manuth/generator-ts-project";
-import buildResolver from "esm-resolve";
+import { dependencyPath } from "dependency-package-path";
 import { MyTSProjectGenerator } from "../../MyTSProjectGenerator.js";
 
-const basePath = createRequire(import.meta.url).resolve(
-    buildResolver(fileURLToPath(import.meta.url))("@manuth/generator-ts-project")
-);
+const basePath = dependencyPath("@manuth/generator-ts-project", dirname(fileURLToPath(import.meta.url)));
 
 /**
  * Provides the functionality to generate a module written in TypeScript.

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": "4.0.0",
+  "version": "4.0.1",
   "type": "module",
   "description": "Provides the functionality to test `TSProjectGenerator`-components",
   "author": "Manuel Thalmann <[email protected]>",
@@ -41,7 +41,7 @@
   "dependencies": {
     "@manuth/extended-yo-generator": "^12.1.2",
     "@manuth/extended-yo-generator-test": "^12.1.2",
-    "@manuth/generator-ts-project": "^4.0.0",
+    "@manuth/generator-ts-project": "^4.0.1",
     "@manuth/package-json-editor": "^3.0.2",
     "@manuth/temp-files": "^3.0.0",
     "@stdlib/utils-escape-regexp-string": "^0.0.9",