pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pnpm: update to 12.12.0

Module Name:	pkgsrc-wip
Committed By:	Iku Iwasa <iku.iwasa%gmail.com@localhost>
Pushed By:	iquiw
Date:		Sun Oct 11 11:44:49 2026 +0900
Changeset:	a7821a808072cbe01d16b642f852d5ff5b25044a

Modified Files:
	pnpm/Makefile
	pnpm/cargo-depends.mk
	pnpm/distinfo

Log Message:
pnpm: update to 12.12.0

Pkgsrc changes:

* Relocate only node-semver crate.
* Download enhanced-resolve, graceful-fs and tapable from NPM repository.
  Note that pnpm uses patched version of graceful-fs, which is not used for
  now as it complicates the build steps too much.
* Use esbuild to bundle cas-loader.mjs.inc.

Upstream changes are omitted.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a7821a808072cbe01d16b642f852d5ff5b25044a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pnpm/Makefile         | 51 +++++++++++++++++++++++++++++++++++++++++----------
 pnpm/cargo-depends.mk |  2 +-
 pnpm/distinfo         | 21 +++++++++++++++------
 3 files changed, 57 insertions(+), 17 deletions(-)

diffs:
diff --git a/pnpm/Makefile b/pnpm/Makefile
index 2321265f84..b1b23fcd39 100644
--- a/pnpm/Makefile
+++ b/pnpm/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 PKGNAME=	${DISTNAME:C/-rc\./rc/}
-DISTNAME=	pnpm-12.9.1
+DISTNAME=	pnpm-12.12.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pnpm/}
 GITHUB_TAG=	refs/tags/v${DISTNAME:C/^[^-]*-//}
@@ -15,6 +15,8 @@ WRKSRC=	${WRKDIR}/${DISTNAME}
 
 USE_LANGUAGES=	c c++
 
+TOOL_DEPENDS+=	esbuild>=0.28:../../wip/esbuild
+
 RUST_REQ=	1.98
 
 INSTALLATION_DIRS=	bin
@@ -28,20 +30,49 @@ DISTFILES+=		node-semver-${NODE_SEMVER_REV}.tar.gz
 
 SITES.node-semver-${NODE_SEMVER_REV}.tar.gz+=	-${MASTER_SITE_GITHUB:=pnpm/}node-semver-rs/archive/${NODE_SEMVER_REV}.tar.gz
 
+# Required to generate cas-loader.mjs.inc.
+ENHANCED_RESOLVE_VER=	5.26.0
+# TODO: This version is not same as what pnpm uses. pnpm uses patched version.
+GRACEFUL_FS_VER=	4.2.11
+TAPABLE_VER=		2.3.3
+DISTFILES+=		enhanced-resolve-${ENHANCED_RESOLVE_VER}.tgz
+DISTFILES+=		graceful-fs-${GRACEFUL_FS_VER}.tgz
+DISTFILES+=		tapable-${TAPABLE_VER}.tgz
+
+SITES.enhanced-resolve-${ENHANCED_RESOLVE_VER}.tgz+=	https://registry.npmjs.org/enhanced-resolve/-/
+SITES.graceful-fs-${GRACEFUL_FS_VER}.tgz+=		https://registry.npmjs.org/graceful-fs/-/
+SITES.tapable-${TAPABLE_VER}.tgz+=			https://registry.npmjs.org/tapable/-/
+
+EXTRACT_DIR.enhanced-resolve-${ENHANCED_RESOLVE_VER}.tgz+=	${WRKDIR}/enhanced-resolve
+EXTRACT_DIR.graceful-fs-${GRACEFUL_FS_VER}.tgz+=		${WRKDIR}/graceful-fs
+EXTRACT_DIR.tapable-${TAPABLE_VER}.tgz+=			${WRKDIR}/tapable
+
 post-extract:
 	@${STEP_MSG} "Relocating cargo crates in the pnpm way ;)"
-	${RUN}${MKDIR} ${WRKSRC}/.pnpm/crates
-	${RUN}${LN} -fs ${CARGO_VENDOR_DIR} ${WRKSRC}/.pnpm/crates/crates-io
 	${RUN}${MKDIR} ${WRKSRC}/.pnpm/crates/git
 	${RUN}${MV} ${WRKDIR}/node-semver-rs-${NODE_SEMVER_REV} ${WRKSRC}/.pnpm/crates/git/node-semver
+	${RUN}${SED} "s/@NODE_SEMVER_REV@/${NODE_SEMVER_REV}/" ${FILESDIR}/config.toml > ${WRKSRC}/.pnpm/crates/config.toml
+
+#	NOTE: cargo-checksum.json was generated as follows.
+#		${FIND} . -type f ! -name .cargo-checksum.json -print0 | xargs -0 ${DIGEST} sha256 | ${AWK} \
+#		'BEGIN { first=1; printf "{\"files\":{" } \
+#		 /^SHA256 / { if (first==0) { printf "," } else { first=0 }\
+#		              len=length($$2); printf "\"%s\":\"%s\"", substr($$2, 4, len-4), $$4 } \
+#		 END { printf "},\"package\":null}" }' > .cargo-checksum.json
+	${RUN}${CP} ${FILESDIR}/cargo-checksum.json ${WRKSRC}/.pnpm/crates/git/node-semver/.cargo-checksum.json
+
+	@${STEP_MSG} "Relocating npm packages for esbuild"
+	${RUN}${MKDIR} ${WRKSRC}/pnpm/esm-loader/node_modules
+	${RUN}${MV} ${WRKDIR}/enhanced-resolve/package ${WRKSRC}/pnpm/esm-loader/node_modules/enhanced-resolve
+	${RUN}${MV} ${WRKDIR}/graceful-fs/package ${WRKSRC}/pnpm/esm-loader/node_modules/graceful-fs
+	${RUN}${MV} ${WRKDIR}/tapable/package ${WRKSRC}/pnpm/esm-loader/node_modules/tapable
 
-	@${STEP_MSG} "Generating .cargo-checksum.json for node-semver"
-	${RUN}cd ${WRKSRC}/.pnpm/crates/git/node-semver && \
-	${FIND} . -type f ! -name .cargo-checksum.json -print0 | xargs -0 ${DIGEST} sha256 | ${AWK} \
-	'BEGIN { first=1; printf "{\"files\":{" } \
-	 /^SHA256 / { if (first==0) { printf "," } else { first=0 }\
-	              len=length($$2); printf "\"%s\":\"%s\"", substr($$2, 4, len-4), $$4 } \
-	 END { printf "},\"package\":null}" }' > .cargo-checksum.json
+pre-build:
+	@${STEP_MSG} "Bundling cas-loader.mjs.inc by esbuild"
+	${RUN}cd ${WRKSRC}/pnpm/esm-loader && \
+	esbuild --minify --bundle --platform=node --format=esm \
+	--banner:js="import { createRequire as bootstrapRequire } from 'node:module'; const require = bootstrapRequire(import.meta.url);" install-register.mjs \
+	--outfile=../crates/deps-restorer/src/cas-loader.mjs.inc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/pnpm ${DESTDIR}${PREFIX}/bin
diff --git a/pnpm/cargo-depends.mk b/pnpm/cargo-depends.mk
index 360727ba73..2f4fd47646 100644
--- a/pnpm/cargo-depends.mk
+++ b/pnpm/cargo-depends.mk
@@ -479,6 +479,7 @@ CARGO_CRATE_DEPENDS+=	reflink-copy-0.1.30
 CARGO_CRATE_DEPENDS+=	regex-1.12.3
 CARGO_CRATE_DEPENDS+=	regex-automata-0.4.14
 CARGO_CRATE_DEPENDS+=	regex-syntax-0.8.10
+CARGO_CRATE_DEPENDS+=	regress-0.12.0
 CARGO_CRATE_DEPENDS+=	replace_with-0.1.8
 CARGO_CRATE_DEPENDS+=	reqwest-0.13.4
 CARGO_CRATE_DEPENDS+=	rfc6979-0.4.0
@@ -602,7 +603,6 @@ CARGO_CRATE_DEPENDS+=	sysinfo-0.39.3
 CARGO_CRATE_DEPENDS+=	tabled-0.21.0
 CARGO_CRATE_DEPENDS+=	tabled_derive-0.11.0
 CARGO_CRATE_DEPENDS+=	tap-1.0.1
-CARGO_CRATE_DEPENDS+=	tar-0.4.46
 CARGO_CRATE_DEPENDS+=	tempfile-3.27.0
 CARGO_CRATE_DEPENDS+=	terminal_size-0.4.4
 CARGO_CRATE_DEPENDS+=	termtree-0.5.1
diff --git a/pnpm/distinfo b/pnpm/distinfo
index 78eac2b9f0..f8419bfc2e 100644
--- a/pnpm/distinfo
+++ b/pnpm/distinfo
@@ -558,6 +558,9 @@ Size (encoding_rs-0.8.35.crate) = 1381050 bytes
 BLAKE2s (encoding_rs_io-0.1.7.crate) = 3f94a1751eb0c6e79b8cbcf7aa9986b159ba60c563c9dedfeda1783a121716fc
 SHA512 (encoding_rs_io-0.1.7.crate) = 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
 Size (encoding_rs_io-0.1.7.crate) = 16969 bytes
+BLAKE2s (enhanced-resolve-5.26.0.tgz) = c3bfb6fee3708825026ea9527daa38be2e96dd23b60e6d7198051c926d6803bc
+SHA512 (enhanced-resolve-5.26.0.tgz) = f6f85e772945a276f6606a20cd4297ebe25aef680e25b37540702a76bbea2f085d97f4166caa29ce8502f446d0355b009ecfdbc7fe2ecaa6a5ad0028cb5201cb
+Size (enhanced-resolve-5.26.0.tgz) = 124037 bytes
 BLAKE2s (equivalent-1.0.2.crate) = ecc976834a05d886b02d4691be4fa79ccdc19070d8548d36b740fe8f3f137bd6
 SHA512 (equivalent-1.0.2.crate) = 8e0e2dc070794a85b276e93f9e4a65d3bbb8587b33fda211c34479a0b88504c913d8bef9e84d7996254aeabe1efe4ff1ef6259ff4fe3f9ccb90dd90070b3e4d4
 Size (equivalent-1.0.2.crate) = 7419 bytes
@@ -681,6 +684,9 @@ Size (glob-0.3.3.crate) = 22861 bytes
 BLAKE2s (globset-0.4.18.crate) = e11bcd40201278f23b7b3aa74f96441bf85cc94e4c3364847ce6c15c4e5d1115
 SHA512 (globset-0.4.18.crate) = 44afbcdaff506dba351b967ff435752988f7d980e0b908c248c2aa462dcc95c94907a6d9ec7aec28599dc29d3fbd421cdf0bc8082042263b6af69b36fc1a2c54
 Size (globset-0.4.18.crate) = 28970 bytes
+BLAKE2s (graceful-fs-4.2.11.tgz) = 0aab3718d580c312c1b2c9ba38eb28b10d9742f1c5187ff2fe829296957a3d02
+SHA512 (graceful-fs-4.2.11.tgz) = 45b279fe398570d342703579a3d7939c12c9fc7b33595d0fef76dcf857f89d2feb263f98692e881b288e2f45680585fe9755ab97793ade1fcaac7fa7849d17bd
+Size (graceful-fs-4.2.11.tgz) = 9804 bytes
 BLAKE2s (granit-parser-0.0.7.crate) = 5968655843256c4afe7c147cb2e1cfb9f4c88776613a74f0fa72c18c6d0ecf56
 SHA512 (granit-parser-0.0.7.crate) = dd9cb1e6768540b670b3201c029a0df6eb3a67cf7a497f44da0e452615982a974488d948c709033437f3aced4d247c560518c556e1df30ccac3d6d4d7611ae60
 Size (granit-parser-0.0.7.crate) = 160073 bytes
@@ -1296,9 +1302,9 @@ Size (plotters-backend-0.3.7.crate) = 13709 bytes
 BLAKE2s (plotters-svg-0.3.7.crate) = 45ce997f301f84f7ef5810aa286bd004ce184d74f9837d23b4d768ef4707ae1b
 SHA512 (plotters-svg-0.3.7.crate) = 9a60e19026edfad359a7d042630b60825d7723855fc0c17881ac880c29160a81449ca672a3ae5cea4405293947ae0556f31cb37f519dad4cef56353248350cd6
 Size (plotters-svg-0.3.7.crate) = 6715 bytes
-BLAKE2s (pnpm-12.9.1.tar.gz) = f3761644e42f28b16824ce467c26bec767c434395f6a14392f3afd60a11d6038
-SHA512 (pnpm-12.9.1.tar.gz) = 91b8cabe525d173669267b5f92b6422b3b0282cecb23b33ec99d61853c2a1ce02f7543486106c654d1e56d0fab67c2587e0f69cb49acb9a02bfabadbb52d2901
-Size (pnpm-12.9.1.tar.gz) = 14488155 bytes
+BLAKE2s (pnpm-12.12.0.tar.gz) = f83121802ffff652334c6de3d1a2b6d50896a81a30801f70d84d4d820613e990
+SHA512 (pnpm-12.12.0.tar.gz) = 7bef0d2305d87579641f577b1aef841eca98cc22f487dbd5fba6a6643e5102ca55724c75e5d5245a62e9bb1165abcb8a621e943dab023f810b0710d30b9e63d3
+Size (pnpm-12.12.0.tar.gz) = 15078672 bytes
 BLAKE2s (polyval-0.6.2.crate) = bd3a600f4b27c8e33ab640320ed3215e9abd62ff62b37e07768e17bdc3224c2f
 SHA512 (polyval-0.6.2.crate) = 113646edef3a7f60d59db3cf06c1796bf81305b66835c71bbce0fdc07345f41e23f2bbd7d5cebc50c72eac11c98f351bc793e2f568b5fc0bbf9fb2597eb44f0d
 Size (polyval-0.6.2.crate) = 18425 bytes
@@ -1443,6 +1449,9 @@ Size (regex-automata-0.4.14.crate) = 618012 bytes
 BLAKE2s (regex-syntax-0.8.10.crate) = e2ae5809632d9dadfe451ea51eef4cc65796237eb50568db33594de2e308b06f
 SHA512 (regex-syntax-0.8.10.crate) = ca9c36c963c81c2fa36e1105cdd193a9b99ee259de1765e6e8010fb4091e49ac100e2ba0cd117adb0890b32e74421581dd6397eb896772168c6eae9da0a938c3
 Size (regex-syntax-0.8.10.crate) = 358781 bytes
+BLAKE2s (regress-0.12.0.crate) = 0bb29603828b88249a8376a83b0b120dfa4929d78369fca1f1845ed1b5e6bb90
+SHA512 (regress-0.12.0.crate) = 0a49e193d84681db7c28f439d72a306b0022b68aad2ee0ebba6b5ecf11c78793c6cc46be54bc5c065157cf37ca13f7040329de38579c7f97b819a6c9e41b0d97
+Size (regress-0.12.0.crate) = 376723 bytes
 BLAKE2s (replace_with-0.1.8.crate) = 4f0a27cdd36b7fd812e0e02f432fdf87b6948508b4bd0591dca94b858d2080e4
 SHA512 (replace_with-0.1.8.crate) = 99dec696b4e9d86e91945b94f48238e338b9daa0a153a705ae24df9e37cb27877b6be755b3704e02d868a4e80a9259043b1971f04bb18d09e73ea49ef7d9fac4
 Size (replace_with-0.1.8.crate) = 11251 bytes
@@ -1812,9 +1821,9 @@ Size (tabled_derive-0.11.0.crate) = 12860 bytes
 BLAKE2s (tap-1.0.1.crate) = 53f99ee7163ca9302a9cd35c56302c86e113c8c1c27902da720035740dd6ea34
 SHA512 (tap-1.0.1.crate) = d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995
 Size (tap-1.0.1.crate) = 11316 bytes
-BLAKE2s (tar-0.4.46.crate) = 53c9720ae1f59999f83de1b73ba2fbd519e07a18fac1385ad12ea3e6d39e01fa
-SHA512 (tar-0.4.46.crate) = 7e703def0d0fa16c6fc35e12adc11bb059efd927d7ec9fa3185b4f160fde7fa930c36ac08faf19fde8d2002c1247c30221438e02fdf7c3e304425d68eb8d9e78
-Size (tar-0.4.46.crate) = 70809 bytes
+BLAKE2s (tapable-2.3.3.tgz) = d292ace87ed87cef8481918e524b1a8195ac7f9f375cf42b2651eb6c269f8f52
+SHA512 (tapable-2.3.3.tgz) = bb173fce9a8583ac7b0bcbce13b961e8b6dd6bc7842fdce6566fcf2de4cf051861d710a0756690f89d42522786a487e6d8776db14a51bfe1ec8626ac04c71ce8
+Size (tapable-2.3.3.tgz) = 18600 bytes
 BLAKE2s (tempfile-3.27.0.crate) = 5b2887d461478adc12198985891bd0950d8d9db9cbc4fc7fa2850fe6e7a234b4
 SHA512 (tempfile-3.27.0.crate) = bb20b9b0c5d3301ad05f73f1de538ae240366d9aefa25ca823ba40041a8a11b4a7361a6a9ec03871b14230d42038d7af6d0b652c8c471935b481a1628b59314a
 Size (tempfile-3.27.0.crate) = 44780 bytes
Home | Main Index | Thread Index | Old Index