Merge branch 'main' into versioned

deploy/release.ts

@@ -26,6 +26,10 @@ program
 
 		const published: string[] = [];
 		try {
+			if (!('NPM_TOKEN' in process.env))
+				throw new Error(
+					"Missing NPM_TOKEN. We won't be able to publish any npm packages."
+				);
 			for (const [name, target] of to_publish) {
 				child_process.execFileSync(target, {
 					stdio: 'pipe',
@@ -49,7 +53,8 @@ program
 			tag_name: syntheticVersion,
 
 			body:
-				body +
+				(await fs.readFile(body)).toString() +
+				'\n' +
 				`This release also includes the following published NPM packages:\n${published
 					.map(name => `   - ${name}`)
 					.join('\n')}`,

js/npm/package_json/rules.bzl

@@ -51,4 +51,4 @@ def package_json(name, targets, template, version):
               ),
         outs = ["package.json"],
         tools = [genrule_name],
-    )
+    )

ts/cmd/svgshot/BUILD

@@ -54,9 +54,9 @@ npm_pkg(
     major_version = "version/MAJOR",
     minor_version = "version/MINOR",
     patch_version = "version/PATCH",
-    version_lock = ".version.lock",
     pkg_json_base = "package.template.json",
     tgz = "svgshot.tgz",
+    version_lock = ".version.lock",
     visibility = ["//deploy:__subpackages__"],
     deps = [":project_ts"],
 )