newspack-scripts 5.6.0 → 5.7.0

package/.github/workflows/main.yml

@@ -1,15 +1,105 @@
-on: pull_request_review
-name: Label approved pull requests
+on:
+  pull_request_review:
+    types: [submitted]
+name: Label pull requests on review
 jobs:
   labelWhenApproved:
     name: Label when approved
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
     steps:
-      - name: Label when approved
-        uses: abinoda/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'
+      - name: Check if review is approved
+        id: check_approval
+        run: |
+          if [ "${{ github.event.review.state }}" = "approved" ]; then
+            echo "approved=true" >> $GITHUB_OUTPUT
+          else
+            echo "approved=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Add approved label
+        if: steps.check_approval.outputs.approved == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo, number } = context.issue;
+
+            // Add the approved label
+            await github.rest.issues.addLabels({
+              owner,
+              repo,
+              issue_number: number,
+              labels: ['[Status] Approved']
+            });
+
+            // Remove the needs review label if it exists
+            try {
+              await github.rest.issues.removeLabel({
+                owner,
+                repo,
+                issue_number: number,
+                name: '[Status] Needs Review'
+              });
+            } catch (error) {
+              // Label might not exist, which is fine
+              console.log('Label "[Status] Needs Review" not found or already removed');
+            }
+
+            // Remove the needs changes or feedback label if it exists
+            try {
+              await github.rest.issues.removeLabel({
+                owner,
+                repo,
+                issue_number: number,
+                name: '[Status] Needs Changes or Feedback'
+              });
+            } catch (error) {
+              // Label might not exist, which is fine
+              console.log('Label "[Status] Needs Changes or Feedback" not found or already removed');
+            }
+
+  labelWhenChangesRequested:
+    name: Label when changes requested
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check if review requests changes
+        id: check_changes_requested
+        run: |
+          if [ "${{ github.event.review.state }}" = "changes_requested" ]; then
+            echo "changes_requested=true" >> $GITHUB_OUTPUT
+          else
+            echo "changes_requested=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Add changes requested label
+        if: steps.check_changes_requested.outputs.changes_requested == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const { owner, repo, number } = context.issue;
+
+            // Add the changes requested label
+            await github.rest.issues.addLabels({
+              owner,
+              repo,
+              issue_number: number,
+              labels: ['[Status] Needs Changes or Feedback']
+            });
+
+            // Remove the approved label if it exists
+            try {
+              await github.rest.issues.removeLabel({
+                owner,
+                repo,
+                issue_number: number,
+                name: '[Status] Approved'
+              });
+            } catch (error) {
+              // Label might not exist, which is fine
+              console.log('Label "[Status] Approved" not found or already removed');
+            }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack-scripts",
-	"version": "5.6.0",
+	"version": "5.7.0",
 	"description": "",
 	"bin": {
 		"newspack-scripts": "./bin/newspack-scripts.js"
@@ -54,7 +54,7 @@
 		"postcss-focus-within": "^5.0.4",
 		"postcss-scss": "^4.0.9",
 		"prettier": "npm:wp-prettier@^3.0.3",
-		"semantic-release": "^19.0.5",
+		"semantic-release": "^22.0.0",
 		"semantic-release-version-bump": "^1.4.1",
 		"stylelint": "^14.2.0",
 		"typescript": "^5.4.5",

package/scripts/release.js

@@ -12,12 +12,6 @@ const filesList = files.split( ',' );
 
 utils.log( `Releasing ${ process.env.CIRCLE_PROJECT_REPONAME }…` );
 
-const shouldPublishOnNPM = Boolean( process.env.NPM_TOKEN );
-
-if ( shouldPublishOnNPM ) {
-	utils.log( `Will publish on npm` );
-}
-
 const getConfig = ({ gitBranchName }) => {
 	const branchType = gitBranchName.split("/")[0];
 	const githubConfig = {
@@ -35,6 +29,12 @@ const getConfig = ({ gitBranchName }) => {
 		githubConfig.failComment = false;
 	}
 
+	// Only publish alpha and release branches to NPM.
+	const shouldPublishOnNPM = Boolean( process.env.NPM_TOKEN ) && ["alpha", "release"].includes(branchType);
+	if ( shouldPublishOnNPM ) {
+		utils.log( `Will publish to npm.` );
+	}
+
 	const config = {
 		dryRun: otherArgs.dryRun,
 		ci: otherArgs.ci,
@@ -154,6 +154,7 @@ const run = async () => {
 		}
 	} catch ( err ) {
 		console.error( 'The automated release failed with %O', err );
+		process.exit( 1 );
 	}
 };
 

package/scripts/test.js

@@ -45,8 +45,10 @@ const JEST_CONFIG = {
 
 args.push( '--config', JSON.stringify( JEST_CONFIG ) );
 
-spawn.sync( wpScripts, args, {
+const result = spawn.sync( wpScripts, args, {
 	cwd: modules.rootDirectory,
 	stdio: 'inherit',
 	env: { ...process.env, NODE_ENV: 'development' },
 } );
+
+process.exit(result.status);

package/src/executors/default.yml

@@ -3,6 +3,6 @@ docker:
   - image: "cimg/php:<<parameters.tag>>"
 parameters:
   tag:
-    default: 8.0-node
+    default: 8.3-node
     description: PHP image version
     type: string

package/src/jobs/i18n.yml

@@ -0,0 +1,91 @@
+description: >
+  Create translation files.
+
+executor: default
+
+steps:
+  - checkout_with_workspace
+  - run:
+      name: Check if commit author is bot
+      command: |
+        COMMIT_AUTHOR=$(git log -1 --pretty=format:'%ae')
+        if [ "$COMMIT_AUTHOR" = "$GITHUB_COMMITER_EMAIL" ]; then
+          echo "Commit was made by bot ($(git rev-parse --short HEAD)), skipping translation update"
+          circleci step halt
+        fi
+  - run:
+      name: Install WP CLI
+      command: |
+        curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar
+        chmod +x wp-cli.phar
+        sudo mv wp-cli.phar /usr/local/bin/wp
+  - run:
+      name: Build plugin files, so dist dir is available
+      command: |
+        npm run build || true
+  - run:
+      name: Create POT translation files
+      command: |
+        # Theme is excluded, more in https://github.com/Automattic/newspack-theme/pull/2458
+        if [ "$CIRCLE_PROJECT_REPONAME" = "newspack-theme" ]; then
+          cd ./newspack-theme
+          wp i18n make-pot . languages/${CIRCLE_PROJECT_REPONAME}.pot --exclude='src' --domain=${CIRCLE_PROJECT_REPONAME}
+          cd -
+        else
+          wp i18n make-pot . languages/${CIRCLE_PROJECT_REPONAME}.pot --domain=${CIRCLE_PROJECT_REPONAME}
+        fi
+  - run:
+      name: Create JSON translation files
+      command: |
+        if [ "$CIRCLE_PROJECT_REPONAME" = "newspack-theme" ]; then
+          cd ./newspack-theme
+        fi
+
+        sudo apt-get update && sudo apt-get install -y gettext
+
+        cd languages
+
+        # Create PO files from POT if they don't exist
+        if [ ! -f "${CIRCLE_PROJECT_REPONAME}-en_US.po" ]; then
+          echo "Creating ${CIRCLE_PROJECT_REPONAME}-en_US.po from POT file"
+          wp i18n update-po ${CIRCLE_PROJECT_REPONAME}.pot .
+        else
+          echo "${CIRCLE_PROJECT_REPONAME}-en_US.po file already exists, skipping creation"
+        fi
+
+        for po in *.po; do
+          if [ -f "$po" ]; then
+            echo "Processing file $po …"
+            # Update translations according to the new POT file
+            msgmerge $po $CIRCLE_PROJECT_REPONAME.pot -o $po.out
+            mv $po.out $po
+            msgfmt $po -o $(basename $po .po).mo
+            # no-purge since we need the JS translations for the next run
+            wp i18n make-json --no-purge $po .
+          fi
+        done
+  - run:
+      name: Commit translation files
+      command: |
+        if [ "$CIRCLE_PROJECT_REPONAME" = "newspack-theme" ]; then
+          cd ./newspack-theme
+        fi
+        if [ -d "languages" ]; then
+          LINES_CHANGED=$(git diff --numstat languages/ | awk '{sum += $1 + $2} END {print sum}')
+          # If no existing files were changed, check for new files
+          if [ -z "$LINES_CHANGED" ] || [ "$LINES_CHANGED" -eq 0 ]; then
+            LINES_CHANGED=$(git ls-files --others --exclude-standard languages/ | xargs wc -l 2>/dev/null | tail -1 | awk '{print $1}')
+          fi
+        else
+          LINES_CHANGED=0
+        fi
+        LINES_CHANGED=${LINES_CHANGED:-0}
+        echo "Lines changed in languages/: $LINES_CHANGED"
+        if [ "$LINES_CHANGED" -gt 3 ]; then
+          git config user.email "$GITHUB_COMMITER_EMAIL"
+          git config user.name "$GIT_COMMITTER_NAME"
+          git remote set-url origin https://$GITHUB_TOKEN@github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git
+          git add languages/
+          git commit -m "chore: update translation files [skip ci]"
+          git push origin $CIRCLE_BRANCH
+        fi

package/src/jobs/lint-php.yml

@@ -1,7 +1,7 @@
 description: >
   Lint PHP files.
 
-executor: php-81
+executor: default
 
 steps:
   - checkout

package/src/jobs/test-php.yml

@@ -2,7 +2,7 @@ description: >
   Run PHP tests.
 
 docker:
-  - image: cimg/php:8.0
+  - image: cimg/php:8.3
   - image: circleci/mysql:5.6.50
 
 environment: