@html-validate/release-scripts 3.2.1 → 3.4.1

package/README.md

@@ -2,7 +2,7 @@
 
 Various scripts used by release toolchain.
 
-## `release-prepack` and `release-postpack`
+## `release-pre{pack,publish}` and `release-post{pack,publish}`
 
 `package.json`:
 
@@ -11,6 +11,8 @@ Various scripts used by release toolchain.
   "scripts": {
     "prepack": "release-prepack package.json",
     "postpack": "release-postpack package.json"
+    "prepublishOnly": "release-prepublish package.json",
+    "postpublish": "release-postpublish package.json"
   }
 }
 ```

package/lib/postpack.js

@@ -0,0 +1,17 @@
+/* eslint-disable no-console, no-process-exit */
+
+const path = require("path");
+const fs = require("fs");
+
+/* ensure this script runs via the correct lifecycle event */
+const { npm_command: command, npm_lifecycle_event: event } = process.env; // eslint-disable-line camelcase
+if (command === "publish" && event === "postpack") {
+	process.exit(0);
+}
+
+const filename = process.argv[2];
+const filepath = path.resolve(filename);
+const origfile = `${filepath}.orig`;
+
+console.log(`Restoring "${filepath}"`);
+fs.renameSync(origfile, filepath);

package/lib/prepack.js

@@ -1,25 +1,51 @@
+/* eslint-disable no-console, no-process-exit */
+
 const path = require("path");
 const fs = require("fs");
 const { filterDependencies } = require("./filter-dependencies");
+const { stripFields } = require("./strip-fields");
+
+/* ensure this script runs via the correct lifecycle event */
+const { npm_command: command, npm_lifecycle_event: event } = process.env; // eslint-disable-line camelcase
+if (command === "publish" && event === "prepack") {
+	process.exit(0);
+}
 
 const filename = process.argv[2];
 const filepath = path.resolve(filename);
-const pkg = JSON.parse(fs.readFileSync(filepath, "utf-8"));
+const tmpfile = `${filepath}.tmp`;
+const origfile = `${filepath}.orig`;
 
 const bundle = process.argv.includes("--bundle");
 const externals = process.argv
 	.filter((it) => it.startsWith("--external:"))
 	.map((it) => it.slice("--external:".length));
 
+if (!fs.existsSync(filepath)) {
+	process.stderr.write(`release-prepack: No such file or directory: "${filepath}"\n`);
+	process.exit(1);
+}
+
+const pkg = JSON.parse(fs.readFileSync(filepath, "utf-8"));
 pkg.dependencies = filterDependencies(pkg.dependencies, bundle, externals);
-delete pkg.devDependencies;
-delete pkg.scripts;
-delete pkg.commitlint;
-delete pkg["lint-staged"];
-delete pkg.prettier;
-delete pkg.jest;
-delete pkg.release;
-delete pkg.renovate;
-
-/* eslint-disable-next-line no-console */
-console.log(JSON.stringify(pkg, null, 2));
+
+stripFields(pkg);
+
+const content = JSON.stringify(pkg, null, 2);
+console.log(content);
+
+/* backup original file in case of error */
+fs.copyFileSync(filepath, origfile);
+
+try {
+	/* write to a temporary file first */
+	fs.writeFileSync(tmpfile, `${content}\n`, "utf-8");
+
+	/* swap tempfile for original */
+	fs.renameSync(tmpfile, filepath);
+} catch (err) {
+	console.error(err);
+	process.stderr.write(`\nRestoring "${filename}" after failure\n`);
+	fs.copyFileSync(origfile, filepath);
+	process.exit(1);
+}

package/lib/strip-fields.js

@@ -0,0 +1,29 @@
+const strip = [
+	"ava",
+	"c8",
+	"commitlint",
+	"devDependencies",
+	"greenkeeper",
+	"husky",
+	"jest",
+	"lint-staged",
+	"nyc",
+	"pre-commit",
+	"prettier",
+	"release",
+	"renovate",
+	"scripts",
+	"simple-git-hooks",
+	"stylelint",
+	"tsd",
+	"xo",
+];
+
+function stripFields(pkg) {
+	for (const key of strip) {
+		/* eslint-disable-next-line security/detect-object-injection */
+		delete pkg[key];
+	}
+}
+
+module.exports = { stripFields };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@html-validate/release-scripts",
-  "version": "3.2.1",
+  "version": "3.4.1",
   "description": "Various script used by release toolchain",
   "keywords": [
     "release"
@@ -17,8 +17,10 @@
   "license": "MIT",
   "author": "David Sveningsson <ext@sidvind.com>",
   "bin": {
+    "release-prepublish": "scripts/prepack",
+    "release-prepack": "scripts/prepack",
     "release-postpack": "scripts/postpack",
-    "release-prepack": "scripts/prepack"
+    "release-postpublish": "scripts/postpack"
   },
   "files": [
     "lib",
@@ -36,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "12f3a6a1b803337fc138e80d1180e98dd53c4dfb"
+  "gitHead": "47aa6af977c3e3f32334ffcc12d3bbd2c68aeee7"
 }

package/scripts/postpack

@@ -1,9 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env node
+"use strict";
 
-set -e
-
-FILENAME="$1"
-ORIGINAL="${FILENAME}.orig"
-
-echo "Restoring ${FILENAME}"
-mv "${ORIGINAL}" "${FILENAME}"
+require("../lib/postpack");

package/scripts/postpublish

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+"use strict";
+
+require("../lib/postpack");

package/scripts/prepack

@@ -1,22 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env node
+"use strict";
 
-FILENAME="$1"
-ORIGINAL="${FILENAME}.orig"
-TMPFILE="${FILENAME}.tmp"
-PREPACK="$(node -p "require.resolve('@html-validate/release-scripts/lib/prepack')")"
-shift 1
-
-restore() {
-	echo "Restoring ${FILENAME} after failure" > /dev/stderr
-	if [[ -e "${ORIGINAL}" ]]; then
-		mv "${ORIGINAL}" "${FILENAME}"
-	fi
-}
-
-set -e
-set -o pipefail
-trap restore ERR
-
-cp "${FILENAME}" "${ORIGINAL}"
-node "${PREPACK}" "${FILENAME}" "$@" | tee "${TMPFILE}"
-mv "${TMPFILE}" "${FILENAME}"
+require("../lib/prepack");

package/scripts/prepublish

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+"use strict";
+
+require("../lib/prepack");