Merge branch 'trunk' into multilingual-support

Author: abhijitb

.github/scripts/set-version-bump.js

@@ -2,32 +2,48 @@ const fs = require( 'fs' );
 const path = require( 'path' );
 const semver = require( 'semver' );
 const packagefile = path.resolve( __dirname, '../../package.json' );
-const pluginfile = path.resolve( __dirname, '../../bootstrap.php' );
+const pluginfile = path.resolve(
+	__dirname,
+	'../../bootstrap.php'
+);
 
 if ( fs.existsSync( packagefile ) && fs.existsSync( pluginfile ) ) {
-    const packageData = require( packagefile );
-    const currentVersion = packageData.version;
-    let type = process.argv[ 2 ];
-    if ( ! [ 'major', 'minor', 'patch' ].includes( type ) ) {
-        type = 'patch';
-    }
+	const packageData = require( packagefile );
+	const currentVersion = packageData.version;
+	let type = process.argv[ 2 ];
+	if ( ! [ 'major', 'minor', 'patch' ].includes( type ) ) {
+		type = 'patch';
+	}
 
-    const newVersion = semver.inc( packageData.version, type );
-    packageData.version = newVersion;
-    fs.writeFileSync( packagefile, JSON.stringify( packageData, null, 4 ) );
+	const newVersion = semver.inc( packageData.version, type );
+	packageData.version = newVersion;
 
-    fs.readFile( pluginfile, 'utf8', function ( err, data ) {
-        if ( err ) {
-            return console.log( err );
-        }
-        const result = data.replaceAll( currentVersion, newVersion );
+	// update version in package file
+	fs.writeFileSync( packagefile, JSON.stringify( packageData, null, 2 ) );
 
-        fs.writeFile( pluginfile, result, 'utf8', function ( err ) {
-            if ( err ) {
-                return console.log( err );
-            }
-        } );
-    } );
+	fs.readFile( pluginfile, 'utf8', function ( err, data ) {
+		if ( err ) {
+			return console.log( err );
+		}
+		const result = data.replaceAll( currentVersion, newVersion );
 
-    console.log( 'Version updated', currentVersion, '=>', newVersion );
+		// update version in php file
+		fs.writeFile( pluginfile, result, 'utf8', function ( err ) {
+			if ( err ) {
+				return console.log( err );
+			}
+		} );
+	} );
+
+	const output = {
+		oldVersion: currentVersion,
+		newVersion: newVersion,
+		level: type,
+		message: `Version updated from ${ currentVersion } to ${ newVersion }`,
+	}
+	console.log( JSON.stringify( output ) );
+} else {
+	console.log( JSON.stringify( {
+		message: 'Version update error. A file was not found.',
+	} ) );
 }

.github/workflows/brand-plugin-test.yml

@@ -29,7 +29,6 @@ jobs:
     needs: setup
     uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
     with:
-      only-module-tests: true
       module-repo: ${{ github.repository }}
       module-branch: ${{ needs.setup.outputs.branch }}
       plugin-repo: "newfold-labs/wp-plugin-bluehost"
@@ -40,7 +39,6 @@ jobs:
     needs: setup
     uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
     with:
-      only-module-tests: true
       module-repo: ${{ github.repository }}
       module-branch: ${{ needs.setup.outputs.branch }}
       plugin-repo: "newfold-labs/wp-plugin-hostgator"
@@ -51,7 +49,6 @@ jobs:
     needs: setup
     uses: newfold-labs/workflows/.github/workflows/module-plugin-test.yml@main
     with:
-      only-module-tests: true
       module-repo: ${{ github.repository }}
       module-branch: ${{ needs.setup.outputs.branch }}
       plugin-repo: "newfold-labs/wp-plugin-crazy-domains"

.github/workflows/lint-check-spa.yml

@@ -39,13 +39,9 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           restore-keys: ${{ runner.os }}-node-
 
-      - name: Setup Registry
-        run: printf "@newfold-labs:registry=https://npm.pkg.github.com/\n//npm.pkg.github.com/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
-        if: steps.cache.outputs.cache-hit != 'true'
-
       # Installs @wordpress/scripts for lint checks if it does not exist in the cache.
       - name: Install dependencies
-        run: npm i @wordpress/[email protected] @newfold-labs/js-utility-ui-analytics --legacy-peer-deps
+        run: npm i @wordpress/[email protected] --legacy-peer-deps
         if: steps.cache.outputs.cache-hit != 'true'
 
       # Gets the files changed wrt to trunk and filters out the js files.

.github/workflows/newfold-prep-release.yml

@@ -0,0 +1,39 @@
+name: Newfold Prepare Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      level:
+        description: The level of release to be used.
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+        default: 'patch'
+        required: true
+
+jobs:
+
+  # This job is used to extract the branch name from the pull request or branch.
+  setup:
+    name: Setup
+    runs-on: ubuntu-latest
+    outputs:
+      branch: ${{ steps.extract_branch.outputs.branch }}
+    steps:
+      - name: Extract branch name
+        shell: bash
+        run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+        id: extract_branch
+
+  # This job runs the newfold module-prep-release workflow for this module.
+  prep-release:
+    name: Prepare Release
+    needs: setup
+    uses: newfold-labs/workflows/.github/workflows/module-prep-release.yml@add/preprelease
+    with:
+      module-repo: ${{ github.repository }}
+      module-branch: ${{ needs.setup.outputs.branch }}
+      level: ${{ inputs.level }}
+    secrets: inherit

.github/workflows/prep-release.yml

@@ -0,0 +1,98 @@
+name: Prepare Release
+# This workflow is manually dispatched. It:
+# - bumps the version as specified in the input
+# - prepares build artifacts
+# - creates a release branch
+# - commits the changes
+# - creates a pull request to the main branch
+# - TODO: consider skipping the PR, push to main, and create a release automatically
+
+on:
+  workflow_dispatch:
+    inputs:
+      level:
+        description: The level of release to be used.
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
+        default: 'patch'
+        required: true
+
+jobs:
+  prep-release:
+    name: Prepare Release
+    runs-on: ubuntu-latest
+    permissions:
+      # Give the default token permission to commit, push the changed files, and open a pull request.
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0
+        with:
+          php-version: '8.1'
+          coverage: none
+          tools: composer, cs2pr
+
+      - name: Setup Node.js
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+        with:
+          node-version: 20.x
+          cache: 'npm'
+
+      - name: Get Composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache Composer vendor directory
+        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
+      - name: Show versions
+        run: |
+          php --version
+          composer --version
+          node --version
+          npm --version
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install Packages
+        run: npm install
+
+      - name: Run Update Version Script
+        id: version_bump
+        run: |
+          echo "Running version bump script..."
+          OUTPUT=$(node ./.github/scripts/set-version-bump.js ${{ inputs.level }})
+          echo ""
+          echo "====== Script Output ======"
+          echo "$OUTPUT"
+          echo "==========================="
+          echo ""
+          echo "new_version=$(echo "$OUTPUT" | jq -r '.newVersion')" >> $GITHUB_OUTPUT
+          echo "old_version=$(echo "$OUTPUT" | jq -r '.oldVersion')" >> $GITHUB_OUTPUT
+          echo "message=$(echo "$OUTPUT" | jq -r '.message')" >> $GITHUB_OUTPUT
+      
+      - name: Run Build and Update Language Files
+        run: npm run post-set-version
+
+      - name: Create Release Pull Request
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        with:
+          token: ${{ github.token }}
+          base: trunk
+          branch: release/${{ steps.version_bump.outputs.new_version }}
+          title: "Automated ${{ inputs.level }} Release ${{ steps.version_bump.outputs.new_version }} PR"
+          body: "This PR was created automatically by a GitHub Action."
+          commit-message: "🤖 prep release - ${{ steps.version_bump.outputs.message }}"

bootstrap.php

@@ -24,7 +24,7 @@ function nfd_wp_module_onboarding_register() {
 
 				// Set Global Constants
 				if ( ! defined( 'NFD_ONBOARDING_VERSION' ) ) {
-					define( 'NFD_ONBOARDING_VERSION', '2.6.8' );
+					define( 'NFD_ONBOARDING_VERSION', '2.7.0' );
 				}
 				if ( ! defined( 'NFD_ONBOARDING_DIR' ) ) {
 					define( 'NFD_ONBOARDING_DIR', __DIR__ );