newspack-scripts 1.7.0 → 3.0.0-alpha.2

package/.github/ISSUE_TEMPLATE/Bug_report.md

@@ -0,0 +1,21 @@
+---
+name: "\U0001F41E Bug report"
+about: Report a bug if something isn't working as expected.
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Please be as descriptive as possible; issues lacking detail, or for any other reason than to report a bug, may be closed without action.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.

package/.github/ISSUE_TEMPLATE/Enhancement.md

@@ -0,0 +1,17 @@
+---
+name: "✨ New Enhancement"
+about: "If you have an idea to improve an existing feature please let us know or submit a Pull Request!"
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

package/.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,17 @@
+---
+name: "\U0001F680 Feature request"
+about: "Suggest a new feature \U0001F389 We'll consider building it if it receives sufficient interest! \U0001F44D"
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

package/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,28 @@
+### All Submissions:
+
+* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md)?
+* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?
+
+<!-- Mark completed items with an [x] -->
+
+<!-- You can erase any parts of this template not applicable to your Pull Request. -->
+
+### Changes proposed in this Pull Request:
+
+<!-- Describe the changes made to this Pull Request, and the reason for such changes. -->
+
+Closes # .
+
+### How to test the changes in this Pull Request:
+
+1.
+2.
+3.
+
+### Other information:
+
+* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
+* [ ] Have you written new tests for your changes, as applicable?
+* [ ] Have you successfully ran tests with your changes locally?
+
+<!-- Mark completed items with an [x] -->

package/.github/dependabot.yml

@@ -0,0 +1,27 @@
+# Dependabot config.
+# Keep NPM and Composer packages up-to-date.
+# Let's start out with weekly updates and then drop back to less frequent intervals after everything is up-to-date.
+
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: 'npm'
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: '/'
+    # Check the npm registry for updates every day (weekdays)
+    schedule:
+      interval: 'weekly'
+    # Add reviewers
+    reviewers:
+      - 'Automattic/newspack-product'
+
+  # Enable version updates for Composer
+  - package-ecosystem: 'composer'
+    # Look for a `composer.lock` in the `root` directory
+    directory: '/'
+    # Check for updates every day (weekdays)
+    schedule:
+      interval: 'weekly'
+    # Add reviewers
+    reviewers:
+      - 'Automattic/newspack-product'

package/.github/workflows/auto-merge.yml

@@ -0,0 +1,18 @@
+on:
+  pull_request_target:
+    types: [labeled]
+
+name: Dependabot auto-merge
+jobs:
+  auto-merge:
+    name: Auto-merge dependabot PRs for minor and patch updates
+    runs-on: ubuntu-latest
+    if: |
+      contains( github.event.pull_request.labels.*.name, 'dependencies' )
+      && ! contains( github.event.pull_request.labels.*.name, '[Status] Approved' )
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          target: minor # includes patch updates.
+          github-token: ${{ secrets.DEPENDABOT_TOKEN }}

package/.github/workflows/main.yml

@@ -0,0 +1,15 @@
+on: pull_request_review
+name: Label approved pull requests
+jobs:
+  labelWhenApproved:
+    name: Label when approved
+    runs-on: ubuntu-latest
+    steps:
+      - name: Label when approved
+        uses: pullreminders/label-when-approved-action@master
+        env:
+          APPROVALS: '1'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ADD_LABEL: '[Status] Approved'
+          # Needs to be URL-encoded, see https://github.com/abinoda/label-when-approved-action/pull/3#discussion_r321882620
+          REMOVE_LABEL: '%5BStatus%5D%20Needs%20Review'

package/README.md

@@ -17,7 +17,7 @@ Will run `jest` tests. Useful flags:
 
 Will run `calypso-build`, creating optimised production builds.
 
-### start
+### watch
 
 Will run `calypso-build` in watch mode.
 

package/bin/newspack-scripts.js

@@ -5,7 +5,7 @@ const spawn = require("cross-spawn");
 const [scriptName, ...nodeArgs] = process.argv.slice(2);
 
 if (
-  ["test", "build", "start", "commit", "commitlint", "release"].includes(
+  ["test", "build", "watch", "commit", "commitlint", "release"].includes(
     scriptName
   )
 ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newspack-scripts",
-  "version": "1.7.0",
+  "version": "3.0.0-alpha.2",
   "description": "",
   "bin": {
     "newspack-scripts": "./bin/newspack-scripts.js"

package/post-release.sh

@@ -3,19 +3,30 @@
 git config user.name "$GIT_COMMITTER_NAME"
 git config user.email "$GITHUB_COMMITER_EMAIL"
 
-# Reset the tip of alpha branch to the release branch.
-# The alpha brach 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 --
-git push "https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git" --force
+# The last commit message at this point is the automated release commit. The second-to-last
+# commit message should contain data about the merge.
+SECOND_TO_LAST_COMMIT_MSG=$(git log -n 1 --skip 1 --pretty=format:"%s")
 
-# Cherry-pick the latest commit from the release branch onto the master branch.
-# This way the version numbers and the changelog on master are up to date.
-#
-# Note that this will fail if there is no CHANGELOG.md on master - in such case the cherry-pick will
-# result in a conflict.
+LATEST_VERSION_TAG=$(git describe --tags --abbrev=0)
+
+# If the merge was from alpha branch, alpha branch should be reset.
+if [[ $(echo $SECOND_TO_LAST_COMMIT_MSG | grep '^Merge pull request.*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,
+  # 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
+fi
+
+# Update master branch with latest changes from the release branch, so they are in sync.
+echo '[newspack-scripts] Merging the release branch into master'
 git checkout master
-git cherry-pick $(git rev-parse release) --strategy-option theirs
+git merge --squash release
+git commit --message "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

@@ -19,11 +19,18 @@ const config = {
   debug: semanticReleaseArgs.debug,
 
   branches: [
+    // `release` branch is published on the main distribution channel (a new version on GH).
     "release",
+    // `alpha` branch – for regular pre-releases.
     {
       name: "alpha",
       prerelease: "alpha",
     },
+    // `hotfix/*` branches – for releases outside of the release schedule.
+    {
+      name: "hotfix/*",
+      prerelease: "hotfix",
+    },
   ],
   prepare: [
     "@semantic-release/changelog",