newspack-scripts 3.1.1-alpha.1 → 3.2.0

package/bin/newspack-scripts.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 const spawn = require("cross-spawn");
+const utils = require("../scripts/utils/index.js");
 
 const [scriptName, ...nodeArgs] = process.argv.slice(2);
 
@@ -22,13 +23,13 @@ if (
   );
   if (result.signal) {
     if (result.signal === "SIGKILL") {
-      console.log(
+      utils.log(
         "The build failed because the process exited too early. " +
           "This probably means the system ran out of memory or someone called " +
           "`kill -9` on the process."
       );
     } else if (result.signal === "SIGTERM") {
-      console.log(
+      utils.log(
         "The build failed because the process exited too early. " +
           "Someone might have called `kill` or `killall`, or the system could " +
           "be shutting down."
@@ -38,5 +39,5 @@ if (
   }
   process.exit(result.status);
 } else {
-  console.log(`Unknown script "${scriptName}".`);
+  utils.log(`Unknown script "${scriptName}".`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newspack-scripts",
-  "version": "3.1.1-alpha.1",
+  "version": "3.2.0",
   "description": "",
   "bin": {
     "newspack-scripts": "./bin/newspack-scripts.js"

package/post-release.sh

@@ -35,7 +35,6 @@ fi
 echo '[newspack-scripts] Merging the release branch into master'
 git checkout master
 # Merge release branch into master branch, prefering the changes from release branch if conflicts arise.
-git merge release --strategy-option=theirs
-git commit --message "chore(release): merge in release $LATEST_VERSION_TAG"
+git merge --no-ff release --strategy-option=theirs -m "chore(release): merge in release $LATEST_VERSION_TAG"
 # Push updated master upstream.
 git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git"

package/scripts/release.js

@@ -2,6 +2,7 @@
 
 const spawn = require("cross-spawn");
 const path = require("path");
+const utils = require("./utils/index.js");
 
 const semanticRelease = require("semantic-release");
 
@@ -11,7 +12,7 @@ const { files, ...semanticReleaseArgs } = require("yargs/yargs")(
 
 const filesList = files.split(",");
 
-console.log(`Releasing ${process.env.CIRCLE_PROJECT_REPONAME}…`);
+utils.log(`Releasing ${process.env.CIRCLE_PROJECT_REPONAME}…`);
 
 const config = {
   dryRun: semanticReleaseArgs.dryRun,
@@ -89,21 +90,21 @@ const run = async () => {
     if (result) {
       const { lastRelease, commits, nextRelease, releases } = result;
 
-      console.log(
+      utils.log(
         `Published ${nextRelease.type} release version ${nextRelease.version} containing ${commits.length} commits.`
       );
 
       if (lastRelease.version) {
-        console.log(`The last release was "${lastRelease.version}".`);
+        utils.log(`The last release was "${lastRelease.version}".`);
       }
 
       for (const release of releases) {
-        console.log(
+        utils.log(
           `The release was published with plugin "${release.pluginName}".`
         );
       }
     } else {
-      console.log("No release published.");
+      utils.log("No release published.");
     }
   } catch (err) {
     console.error("The automated release failed with %O", err);

package/scripts/typescript-check.js

@@ -3,13 +3,14 @@
 const spawn = require("cross-spawn");
 const path = require("path");
 const modules = require("./utils/modules");
+const utils = require("./utils/index.js");
 
 const result = spawn.sync(`${process.cwd()}/node_modules/.bin/tsc`, [], {
   stdio: "inherit",
 });
 
 if (result.status === 0) {
-  console.log("All good!");
+  utils.log("All good!");
 }
 
 process.exit(result.status);

package/scripts/utils/index.js

@@ -0,0 +1,11 @@
+const { version } = require("../../package.json");
+
+const log = (content, type) => {
+  console.log(
+    `[newspack-scripts@${version}]${type ? `[${type}]` : ""} ${content}`
+  );
+};
+
+module.exports = {
+  log,
+};