From d2359686809e5dde36d47f368a4976d3a126b529 Mon Sep 17 00:00:00 2001 From: wtrocki Date: Fri, 14 Feb 2025 13:39:55 +0100 Subject: [PATCH 1/4] CLOUDP-298233: use JS instead of cjs --- tools/.tool-versions | 1 + tools/postman/Makefile | 2 +- .../scripts/{transform-postman.cjs => transform-postman.js} | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) rename tools/postman/scripts/{transform-postman.cjs => transform-postman.js} (98%) diff --git a/tools/.tool-versions b/tools/.tool-versions index 1a59aeb0b8..e0ebc6a4b2 100644 --- a/tools/.tool-versions +++ b/tools/.tool-versions @@ -1 +1,2 @@ golang 1.23.0 +nodejs 22.11.0 diff --git a/tools/postman/Makefile b/tools/postman/Makefile index b3cc1ff450..e0c188d89c 100644 --- a/tools/postman/Makefile +++ b/tools/postman/Makefile @@ -19,7 +19,7 @@ transform_collection: .PHONY: transform_collection_js transform_collection_js: - node ./scripts/transform-postman.cjs + node ./scripts/transform-postman.js .PHONY: transform_collection_test transform_collection_test: diff --git a/tools/postman/scripts/transform-postman.cjs b/tools/postman/scripts/transform-postman.js similarity index 98% rename from tools/postman/scripts/transform-postman.cjs rename to tools/postman/scripts/transform-postman.js index 7184aaad10..b7dafc9cd4 100644 --- a/tools/postman/scripts/transform-postman.cjs +++ b/tools/postman/scripts/transform-postman.js @@ -1,6 +1,6 @@ -const fs = require('fs'); -const path = require('path'); -const _ = require('lodash'); +import fs from 'fs' +import path from 'path'; +import _ from 'lodash'; /** # Prepare collection for Postman API From c4fad28374e869f5d3393a6028e664ea9e150b7c Mon Sep 17 00:00:00 2001 From: Wojciech Trocki Date: Fri, 14 Feb 2025 16:10:38 +0100 Subject: [PATCH 2/4] Update tools/.tool-versions --- tools/.tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/.tool-versions b/tools/.tool-versions index e0ebc6a4b2..1161a6d418 100644 --- a/tools/.tool-versions +++ b/tools/.tool-versions @@ -1,2 +1,2 @@ golang 1.23.0 -nodejs 22.11.0 +nodejs 20.9.0 From cca799630019c067230bb427c0ec1c4eef38000f Mon Sep 17 00:00:00 2001 From: wtrocki Date: Fri, 14 Feb 2025 16:11:13 +0100 Subject: [PATCH 3/4] fix: format --- tools/postman/scripts/transform-postman.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/postman/scripts/transform-postman.js b/tools/postman/scripts/transform-postman.js index b7dafc9cd4..97a51c0f07 100644 --- a/tools/postman/scripts/transform-postman.js +++ b/tools/postman/scripts/transform-postman.js @@ -1,4 +1,4 @@ -import fs from 'fs' +import fs from 'fs'; import path from 'path'; import _ from 'lodash'; From 794fd8a7912adad899037b2543a6db0fa0e57f85 Mon Sep 17 00:00:00 2001 From: Wojciech Trocki Date: Mon, 17 Feb 2025 10:35:59 +0100 Subject: [PATCH 4/4] ensure node in package.json --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index ea2fc0d964..b045a2db2e 100644 --- a/package.json +++ b/package.json @@ -43,5 +43,9 @@ "globals": "^15.14.0", "jest": "^29.7.0", "prettier": "3.5.0" + }, + "engineStrict": false, + "engines": { + "node": ">=20.0.0" } }