Skip to content

Commit

Permalink
chore: fix changelog renderer patch (typescript-eslint#9348)
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesHenry authored Jun 13, 2024
1 parent d05cdf0 commit ced65ed
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
diff --git a/src/command-line/release/utils/resolve-changelog-renderer.js b/src/command-line/release/utils/resolve-changelog-renderer.js
index 8c6fa468633703fcdbe491c08e509d10574cd75d..b1a669d22097dde0c88c7c8d5a956159b246b33c 100644
index 8c6fa468633703fcdbe491c08e509d10574cd75d..c36c55b75bffb22a173ec8c5ad5a37abd76b24e4 100644
--- a/src/command-line/release/utils/resolve-changelog-renderer.js
+++ b/src/command-line/release/utils/resolve-changelog-renderer.js
@@ -13,10 +13,10 @@ function resolveChangelogRenderer(changelogRendererPath) {
@@ -13,11 +13,11 @@ function resolveChangelogRenderer(changelogRendererPath) {
let changelogRenderer;
let cleanupTranspiler = () => { };
try {
- const rootTsconfigPath = (0, typescript_1.getRootTsConfigPath)();
- if (rootTsconfigPath) {
- cleanupTranspiler = (0, register_1.registerTsProject)(rootTsconfigPath);
- }
- const r = require(interpolatedChangelogRendererPath);
+ // const rootTsconfigPath = (0, typescript_1.getRootTsConfigPath)();
+ // if (rootTsconfigPath) {
+ // cleanupTranspiler = (0, register_1.registerTsProject)(rootTsconfigPath);
+ // }
const r = require(interpolatedChangelogRendererPath);
+ const r = require(require('node:path').join(interpolatedChangelogRendererPath));
changelogRenderer = r.default || r;
}
catch (err) {
4 changes: 2 additions & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"changelog": {
"workspaceChangelog": {
"createRelease": "github",
"renderer": "tools/release/changelog-renderer"
"renderer": "{workspaceRoot}/tools/release/changelog-renderer"
},
"projectChangelogs": {
"renderer": "tools/release/changelog-renderer"
"renderer": "{workspaceRoot}/tools/release/changelog-renderer"
}
},
"version": {
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@
"tmp": "0.2.1",
"tsx": "^4.7.2",
"typescript": "5.4.5",
"nx@18.3.5": "patch:nx@npm%3A18.3.5#./.yarn/patches/nx-npm-18.3.5-58c0bedf91.patch",
"eslint-plugin-eslint-plugin@^5.5.0": "patch:eslint-plugin-eslint-plugin@npm%3A5.5.1#./.yarn/patches/eslint-plugin-eslint-plugin-npm-5.5.1-4206c2506d.patch",
"@nx/eslint@19.3.0-canary.20240611-1600875": "patch:@nx/eslint@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/@nx-eslint-npm-19.3.0-canary.20240611-1600875-f5cb695794.patch",
"nx@19.3.0-canary.20240611-1600875": "patch:nx@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/nx-npm-19.3.0-canary.20240611-1600875-bd96520563.patch"
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15719,7 +15719,7 @@ __metadata:

"nx@patch:nx@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/nx-npm-19.3.0-canary.20240611-1600875-bd96520563.patch::locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A.":
version: 19.3.0-canary.20240611-1600875
resolution: "nx@patch:nx@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/nx-npm-19.3.0-canary.20240611-1600875-bd96520563.patch::version=19.3.0-canary.20240611-1600875&hash=a55919&locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A."
resolution: "nx@patch:nx@npm%3A19.3.0-canary.20240611-1600875#./.yarn/patches/nx-npm-19.3.0-canary.20240611-1600875-bd96520563.patch::version=19.3.0-canary.20240611-1600875&hash=56bd23&locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A."
dependencies:
"@nrwl/tao": 19.3.0-canary.20240611-1600875
"@nx/nx-darwin-arm64": 19.3.0-canary.20240611-1600875
Expand Down Expand Up @@ -15797,7 +15797,7 @@ __metadata:
bin:
nx: bin/nx.js
nx-cloud: bin/nx-cloud.js
checksum: d814ddc827c4dedee3d3bef4de2b4ded01e9d885d1fe0787cb98aef1477dccf93d1e05e9160583fcd2a86186b662e37ac09723a8ee96a06528ed687159d16f43
checksum: 2f337128cb9cc845295dcbe27abafcbe44b3bcbff452ba91c4de94457024bac137616ce2dc9e40400e7209d977465f8fa13eb6f70171e65e452978e41bf0ab94
languageName: node
linkType: hard

Expand Down

0 comments on commit ced65ed

Please sign in to comment.