newspack-scripts 5.0.0 → 5.1.1

package/README.md

@@ -73,7 +73,7 @@ The following assumes that CI will run:
 ### Hotfix release flow
 
 1. Create a new `hotfix/*` branch off the `release` branch
-1. Push the branch to Github, so the CI can process it – _don't create a PR just yet!*_
+1. Push the branch to Github, so the CI can process it – _don't create a PR just yet!\*_
 1. A new "hotfix" pre-release (e.g. `1.2.0-hotfix.1`) will be published
 1. Merge the hotfix branch into `release` to create a release
 1. `alpha` & `master` branches will be updated with the changes from the `release` branch
@@ -91,13 +91,13 @@ This package exposes a couple of configuration files.
 The `webpack.config.js` file should use this package's config-extending function:
 
 ```js
-const getBaseWebpackConfig = require( 'newspack-scripts/config/getWebpackConfig' );
+const getBaseWebpackConfig = require("newspack-scripts/config/getWebpackConfig");
 
 const webpackConfig = getBaseWebpackConfig(
   { WP: true },
   {
     entry: {
-      'some-script': './src/some-script.js'
+      "some-script": "./src/some-script.js",
     },
   }
 );
@@ -110,10 +110,10 @@ module.exports = webpackConfig;
 A basic `babel.config.js`:
 
 ```js
-module.exports = api => {
-  api.cache( true );
+module.exports = (api) => {
+  api.cache(true);
   return {
-    extends: 'newspack-scripts/config/babel.config.js',
+    extends: "newspack-scripts/config/babel.config.js",
   };
 };
 ```
@@ -123,10 +123,10 @@ module.exports = api => {
 Because of eslint's [issue](https://github.com/eslint/eslint/issues/3458) with resolving dependencies of extended configurations, a patch has to be used to use this config in a stand-alone fashion: install `@rushstack/eslint-patch` and set up the `.eslintrc.js` like so:
 
 ```js
-require( '@rushstack/eslint-patch/modern-module-resolution' );
+require("@rushstack/eslint-patch/modern-module-resolution");
 
 module.exports = {
-  extends: [ './node_modules/newspack-scripts/config/eslintrc.js' ],
+  extends: ["./node_modules/newspack-scripts/config/eslintrc.js"],
   // Additional options…
 };
 ```
@@ -155,7 +155,7 @@ This repository hosts a [CircleCI Orb](https://circleci.com/docs/2.0/orb-intro),
 version: 2.1
 
 orbs:
-  newspack: adekbadek/newspack@1.0.0
+  newspack: newspack/newspack@1.0.0
 
 workflows:
   version: 2
@@ -170,9 +170,11 @@ To update the Orb, use [CircleCI's CLI's](https://circleci.com/docs/2.0/local-cl
 
 ```bash
 # Replace the `version` at the end (e.g. 1.0.1)
-circleci orb pack src/ > orb.yml && circleci orb publish orb.yml adekbadek/newspack@version
+circleci orb pack src/ > orb.yml && circleci orb publish orb.yml newspack/newspack@version
 ```
 
+Note that before the first time updating you'll need to set the API key for CircleCI CLI by running `$ circleci setup`.
+
 ---
 
 ## Misc

package/config/stylelint.config.js

@@ -13,6 +13,7 @@ module.exports = {
     "at-rule-no-unknown": null,
     "alpha-value-notation": null,
     "color-function-notation": null,
+    "selector-not-notation": null,
     "function-no-unknown": [
       true,
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newspack-scripts",
-  "version": "5.0.0",
+  "version": "5.1.1",
   "description": "",
   "bin": {
     "newspack-scripts": "./bin/newspack-scripts.js"

package/post-release.sh

@@ -11,24 +11,40 @@ SECOND_TO_LAST_COMMIT_MSG=$(git log -n 1 --skip 1 --pretty=format:"%s")
 
 LATEST_VERSION_TAG=$(git describe --tags --abbrev=0)
 
+git pull origin release
+git checkout alpha
+
 # If the merge was from alpha branch (the basic flow), alpha branch should be reset.
 if [[ $(echo $SECOND_TO_LAST_COMMIT_MSG | grep '^Merge .*alpha') ]]; then
   echo '[newspack-scripts] Release was created from the alpha branch. Alpha branch will now be reset.'
 
   # Reset the tip of alpha branch to the release branch.
-  # The alpha brach is single-serving, just for alpha releases. After a release,
+  # The alpha branch is single-serving, just for alpha releases. After a release,
   # we don't care about any alpha changes.
-  git pull origin release
-  git checkout alpha
   git reset --hard release --
   # Force-push the alpha branch.
   git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git" --force
 else
   echo '[newspack-scripts] Release was created from a different branch than the alpha branch (e.g. a hotfix branch).'
   echo '[newspack-scripts] Alpha branch will now be updated with the lastest changes from release.'
-  git checkout alpha
-  git merge release --strategy-option=theirs --message="Merge release into alpha"
-  git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git"
+  git merge --no-ff release -m "chore(release): merge in release $LATEST_VERSION_TAG"
+  if [[ $? == 0 ]]; then
+    git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git"
+  else
+    git merge --abort
+    echo '[newspack-scripts] Post-release merge to alpha failed.'
+    if [ -z "$SLACK_CHANNEL_ID" ] || [ -z "$SLACK_AUTH_TOKEN" ]; then
+      echo '[newspack-scripts] Missing Slack channel ID and/or token. Cannot notify.'
+    else
+      echo '[newspack-scripts] Notifying the team on Slack.'
+      curl \
+        --data "{\"channel\":\"$SLACK_CHANNEL_ID\",\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"⚠️ Post-release merge to alpha failed for: \`$CIRCLE_PROJECT_REPONAME\`. Check <$CIRCLE_BUILD_URL|the build> for details.\"}}]}" \
+        -H "Content-type: application/json" \
+        -H "Authorization: Bearer $SLACK_AUTH_TOKEN" \
+        -X POST https://slack.com/api/chat.postMessage \
+        -s > /dev/null
+    fi
+  fi
 fi
 
 # Update master branch with latest changes from the release branch, so they are in sync.
@@ -48,7 +64,7 @@ else
   else
     echo '[newspack-scripts] Notifying the team on Slack.'
     curl \
-      --data "{\"channel\":\"$SLACK_CHANNEL_ID\",\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"⚠️ Post-release merge failed for: \`$CIRCLE_PROJECT_REPONAME\`. Check <$CIRCLE_BUILD_URL|the build> for details.\"}}]}" \
+      --data "{\"channel\":\"$SLACK_CHANNEL_ID\",\"blocks\":[{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"⚠️ Post-release merge to master failed for: \`$CIRCLE_PROJECT_REPONAME\`. Check <$CIRCLE_BUILD_URL|the build> for details.\"}}]}" \
       -H "Content-type: application/json" \
       -H "Authorization: Bearer $SLACK_AUTH_TOKEN" \
       -X POST https://slack.com/api/chat.postMessage \