From 524e0ace99fe3d2393d62a0535b807e54cb90123 Mon Sep 17 00:00:00 2001 From: Dief Bell Date: Wed, 28 May 2025 17:56:24 +0100 Subject: [PATCH 1/5] Bumped version of `which`, bumped `cmake-ts`'s version --- package.json | 2 +- pnpm-lock.yaml | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2f115bb..9b37022 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cmake-ts", - "version": "1.0.2", + "version": "1.0.3", "description": "cmake-js rewrite in typescript to support advanced build configurations", "main": "build/lib.js", "module": "build/lib.mjs", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d90523..30227fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ importers: specifier: 3.1.1 version: 3.1.1(@types/debug@4.1.12)(@types/node@22.14.0)(@vitest/ui@3.1.1)(terser@5.39.0)(yaml@2.7.0) which: - specifier: ^2 - version: 2.0.2 + specifier: ^3.0.1 + version: 3.0.1 packages: @@ -3318,6 +3318,11 @@ packages: engines: {node: '>= 8'} hasBin: true + which@3.0.1: + resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + hasBin: true + which@5.0.0: resolution: {integrity: sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==} engines: {node: ^18.17.0 || >=20.5.0} @@ -7039,6 +7044,10 @@ snapshots: dependencies: isexe: 2.0.0 + which@3.0.1: + dependencies: + isexe: 2.0.0 + which@5.0.0: dependencies: isexe: 3.1.1 From 59002f4db4a25560697a947b2c4bb5028892d53d Mon Sep 17 00:00:00 2001 From: Dief Bell Date: Wed, 28 May 2025 18:03:59 +0100 Subject: [PATCH 2/5] Added minimum Node version engine requirement --- package.json | 3 +++ pnpm-lock.yaml | 13 ++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 9b37022..64b8366 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,9 @@ "description": "cmake-js rewrite in typescript to support advanced build configurations", "main": "build/lib.js", "module": "build/lib.mjs", + "engines": { + "node": ">= 18" + }, "exports": { ".": { "require": "./build/lib.js", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30227fc..9d90523 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ importers: specifier: 3.1.1 version: 3.1.1(@types/debug@4.1.12)(@types/node@22.14.0)(@vitest/ui@3.1.1)(terser@5.39.0)(yaml@2.7.0) which: - specifier: ^3.0.1 - version: 3.0.1 + specifier: ^2 + version: 2.0.2 packages: @@ -3318,11 +3318,6 @@ packages: engines: {node: '>= 8'} hasBin: true - which@3.0.1: - resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==} - engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} - hasBin: true - which@5.0.0: resolution: {integrity: sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==} engines: {node: ^18.17.0 || >=20.5.0} @@ -7044,10 +7039,6 @@ snapshots: dependencies: isexe: 2.0.0 - which@3.0.1: - dependencies: - isexe: 2.0.0 - which@5.0.0: dependencies: isexe: 3.1.1 From 2a35885ecabaa87c2d012a4fb10332b765d94298 Mon Sep 17 00:00:00 2001 From: Dief Bell Date: Wed, 28 May 2025 18:11:36 +0100 Subject: [PATCH 3/5] Upgraded which version, idk how it ended up not being in the PR --- package.json | 72 ++++++++++++++++++++++++++++++++------------------ pnpm-lock.yaml | 13 +++++++-- 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 64b8366..695cf4a 100644 --- a/package.json +++ b/package.json @@ -69,14 +69,30 @@ "test": "cross-env NODE_OPTIONS=--enable-source-maps pnpx vitest --watch false", "coverage": "cross-env NODE_OPTIONS=--enable-source-maps pnpx vitest --coverage --watch false" }, - "files": ["build/**/*", "src/**/*", "./*.mts", "./tsconfig.json"], + "files": [ + "build/**/*", + "src/**/*", + "./*.mts", + "./tsconfig.json" + ], "repository": { "type": "git", "url": "git+https://github.com/EmbeddedEnterprises/cmake-ts.git" }, - "keywords": ["cmake", "nan", "node", "native", "addon", "build", "cmake-js"], + "keywords": [ + "cmake", + "nan", + "node", + "native", + "addon", + "build", + "cmake-js" + ], "author": "Amin Yahyaabadi ", - "contributors": ["Amin Yahyaabadi ", "Martin Koppehel "], + "contributors": [ + "Amin Yahyaabadi ", + "Martin Koppehel " + ], "license": "MIT", "bugs": { "url": "https://github.com/EmbeddedEnterprises/cmake-ts/issues" @@ -84,51 +100,55 @@ "homepage": "https://github.com/EmbeddedEnterprises/cmake-ts#readme", "devDependencies": { "@babel/core": "7.26.10", + "@biomejs/biome": "1.9.4", "@types/babel__core": "7.20.5", + "@types/escape-quotes": "1.0.0", "@types/fs-extra": "11.0.4", + "@types/memoizee": "0.4.7", "@types/node": "22.14.0", "@types/resolve": "1.20.6", "@types/semver": "7.7.0", "@types/tar": "6.1.13", "@types/url-join": "4.0.3", "@types/which": "3.0.4", - "@types/escape-quotes": "1.0.0", "@upleveled/babel-plugin-remove-node-prefix": "1.0.5", - "@types/memoizee": "0.4.7", - "turbo": "2.5.0", + "@vitest/coverage-v8": "3.1.1", + "@vitest/ui": "3.1.1", + "ci-info": "4.2.0", + "commander": "^13.1.0", "cross-env": "7.0.3", + "escape-quotes": "^1.0.2", "eslint": "^8", "eslint-config-atomic": "1.22.1", - "npm-run-all2": "7.0.2", - "rollup-plugin-visualizer": "5.14.0", - "shx": "0.4.0", - "typescript": "5.8.3", - "vite": "6.2.7", - "vitest": "3.1.1", - "vite-plugin-babel": "1.3.0", - "@vitest/coverage-v8": "3.1.1", - "@vitest/ui": "3.1.1", - "@biomejs/biome": "1.9.4", - "prettier": "3.5.3", - "prettier-config-atomic": "4.0.0", "execa": "9.5.2", - "ci-info": "4.2.0", "fast-glob": "3.3.3", "fs-extra": "^10", + "memoizee": "0.4.17", + "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd", + "node-downloader-helper": "^2.1.9", + "npm-run-all2": "7.0.2", + "prettier": "3.5.3", + "prettier-config-atomic": "4.0.0", "resolve": "^1.22.10", + "rollup-plugin-visualizer": "5.14.0", "semver": "^7.7.1", + "shx": "0.4.0", "tar": "^6", + "turbo": "2.5.0", + "typescript": "5.8.3", "url-join": "^4.0.1", - "which": "^2", - "node-downloader-helper": "^2.1.9", - "escape-quotes": "^1.0.2", - "commander": "^13.1.0", - "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd", - "memoizee": "0.4.17" + "vite": "6.2.7", + "vite-plugin-babel": "1.3.0", + "vitest": "3.1.1", + "which": "^3.0.1" }, "packageManager": "pnpm@10.8.0", "$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/package.json", "pnpm": { - "onlyBuiltDependencies": ["@biomejs/biome", "core-js", "esbuild"] + "onlyBuiltDependencies": [ + "@biomejs/biome", + "core-js", + "esbuild" + ] } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d90523..30227fc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,8 +132,8 @@ importers: specifier: 3.1.1 version: 3.1.1(@types/debug@4.1.12)(@types/node@22.14.0)(@vitest/ui@3.1.1)(terser@5.39.0)(yaml@2.7.0) which: - specifier: ^2 - version: 2.0.2 + specifier: ^3.0.1 + version: 3.0.1 packages: @@ -3318,6 +3318,11 @@ packages: engines: {node: '>= 8'} hasBin: true + which@3.0.1: + resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + hasBin: true + which@5.0.0: resolution: {integrity: sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==} engines: {node: ^18.17.0 || >=20.5.0} @@ -7039,6 +7044,10 @@ snapshots: dependencies: isexe: 2.0.0 + which@3.0.1: + dependencies: + isexe: 2.0.0 + which@5.0.0: dependencies: isexe: 3.1.1 From 06b096e314f15ff6411972022c285f5e16251f33 Mon Sep 17 00:00:00 2001 From: Dief Bell Date: Wed, 28 May 2025 18:13:58 +0100 Subject: [PATCH 4/5] Undid pnpm's reformat --- package.json | 72 +++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 695cf4a..5f20c4d 100644 --- a/package.json +++ b/package.json @@ -69,30 +69,14 @@ "test": "cross-env NODE_OPTIONS=--enable-source-maps pnpx vitest --watch false", "coverage": "cross-env NODE_OPTIONS=--enable-source-maps pnpx vitest --coverage --watch false" }, - "files": [ - "build/**/*", - "src/**/*", - "./*.mts", - "./tsconfig.json" - ], + "files": ["build/**/*", "src/**/*", "./*.mts", "./tsconfig.json"], "repository": { "type": "git", "url": "git+https://github.com/EmbeddedEnterprises/cmake-ts.git" }, - "keywords": [ - "cmake", - "nan", - "node", - "native", - "addon", - "build", - "cmake-js" - ], + "keywords": ["cmake", "nan", "node", "native", "addon", "build", "cmake-js"], "author": "Amin Yahyaabadi ", - "contributors": [ - "Amin Yahyaabadi ", - "Martin Koppehel " - ], + "contributors": ["Amin Yahyaabadi ", "Martin Koppehel "], "license": "MIT", "bugs": { "url": "https://github.com/EmbeddedEnterprises/cmake-ts/issues" @@ -100,55 +84,51 @@ "homepage": "https://github.com/EmbeddedEnterprises/cmake-ts#readme", "devDependencies": { "@babel/core": "7.26.10", - "@biomejs/biome": "1.9.4", "@types/babel__core": "7.20.5", - "@types/escape-quotes": "1.0.0", "@types/fs-extra": "11.0.4", - "@types/memoizee": "0.4.7", "@types/node": "22.14.0", "@types/resolve": "1.20.6", "@types/semver": "7.7.0", "@types/tar": "6.1.13", "@types/url-join": "4.0.3", "@types/which": "3.0.4", + "@types/escape-quotes": "1.0.0", "@upleveled/babel-plugin-remove-node-prefix": "1.0.5", - "@vitest/coverage-v8": "3.1.1", - "@vitest/ui": "3.1.1", - "ci-info": "4.2.0", - "commander": "^13.1.0", + "@types/memoizee": "0.4.7", + "turbo": "2.5.0", "cross-env": "7.0.3", - "escape-quotes": "^1.0.2", "eslint": "^8", "eslint-config-atomic": "1.22.1", - "execa": "9.5.2", - "fast-glob": "3.3.3", - "fs-extra": "^10", - "memoizee": "0.4.17", - "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd", - "node-downloader-helper": "^2.1.9", "npm-run-all2": "7.0.2", + "rollup-plugin-visualizer": "5.14.0", + "shx": "0.4.0", + "typescript": "5.8.3", + "vite": "6.2.7", + "vitest": "3.1.1", + "vite-plugin-babel": "1.3.0", + "@vitest/coverage-v8": "3.1.1", + "@vitest/ui": "3.1.1", + "@biomejs/biome": "1.9.4", "prettier": "3.5.3", "prettier-config-atomic": "4.0.0", + "execa": "9.5.2", + "ci-info": "4.2.0", + "fast-glob": "3.3.3", + "fs-extra": "^10", "resolve": "^1.22.10", - "rollup-plugin-visualizer": "5.14.0", "semver": "^7.7.1", - "shx": "0.4.0", "tar": "^6", - "turbo": "2.5.0", - "typescript": "5.8.3", "url-join": "^4.0.1", - "vite": "6.2.7", - "vite-plugin-babel": "1.3.0", - "vitest": "3.1.1", - "which": "^3.0.1" + "which": "3.0.1", + "node-downloader-helper": "^2.1.9", + "escape-quotes": "^1.0.2", + "commander": "^13.1.0", + "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd", + "memoizee": "0.4.17" }, "packageManager": "pnpm@10.8.0", "$schema": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/package.json", "pnpm": { - "onlyBuiltDependencies": [ - "@biomejs/biome", - "core-js", - "esbuild" - ] + "onlyBuiltDependencies": ["@biomejs/biome", "core-js", "esbuild"] } } From 3329751bb728723793d6c8c1301f5dee139c7b16 Mon Sep 17 00:00:00 2001 From: Dief Bell Date: Wed, 28 May 2025 18:15:35 +0100 Subject: [PATCH 5/5] Updated lockfile --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30227fc..16d67aa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -132,7 +132,7 @@ importers: specifier: 3.1.1 version: 3.1.1(@types/debug@4.1.12)(@types/node@22.14.0)(@vitest/ui@3.1.1)(terser@5.39.0)(yaml@2.7.0) which: - specifier: ^3.0.1 + specifier: 3.0.1 version: 3.0.1 packages: