Release/4.2.2 rc10

.github/workflows/release.yml

@@ -1,14 +1,12 @@
 name: Release
 
 on:
-  workflow_run:
-    workflows: [test]
-    types:
-      - completed
+  push:
+    branches:
+      - master
 
 jobs:
   release:
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'master' }}
     runs-on: ubuntu-latest
     steps:
 

.github/workflows/test.yml

@@ -1,8 +1,9 @@
 name: Test
 
 on:
-  push:
-    branches: [master]
+  pull_request:
+    branches:
+      - master
 
 jobs:
   test:
@@ -14,30 +15,34 @@ jobs:
         id: checkout_repo
         uses: actions/checkout@v4
 
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it.
-      - name: Enter Theme Directory
-        id: enter_theme_directory
-        run: cd package
-
       # Gets the name from package.json and sets it as an environment variable.
       - name: Set Theme Name
         id: set_theme_name
-        run: echo "THEME_NAME=$(jq -r '.name' package.json)" >> $GITHUB_ENV
+        run: echo "THEME_NAME=$(jq -r '.name' package/package.json)" >> $GITHUB_ENV
 
       # Gets the version from package.json and sets it as an environment variable.
       - name: Set Theme Version
         id: set_theme_version
-        run: echo "THEME_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_ENV
+        run: echo "THEME_VERSION=$(jq -r '.version' package/package.json)" >> $GITHUB_ENV
 
-      # Gets the PHP version from composer.json and sets it as an environment variable.
+      # Gets the PHP version from composer.json and sets it as an environment variable,
+      # by parsing the semver string to a setup-php string.
       - name: Set PHP Version
         id: set_php_version
-        run: echo "PHP_VERSION=$(jq -r '.require.php' composer.json)" >> $GITHUB_ENV
+        run: |
+          RAW_PHP_VERSION=$(jq -r '.require.php' package/composer.json)
+          MAJOR_VERSION_PATTERN="^\^"
+          if [[ $RAW_PHP_VERSION =~ $MAJOR_VERSION_PATTERN ]]; then
+            PARSED_PHP_VERSION=$(echo $RAW_PHP_VERSION | grep -oE '[0-9]+' | head -n 1)
+          else
+            PARSED_PHP_VERSION=$(echo $RAW_PHP_VERSION | grep -oE '[0-9]+(\.[0-9]+)?' | head -n 1)
+          fi
+          echo "PHP_VERSION=$PARSED_PHP_VERSION" >> $GITHUB_ENV
 
       # Gets the Node version from .nvmrc and sets it as an environment variable.
       - name: Set Node Version
         id: set_node_version
-        run: echo "NODE_VERSION=$(cat .nvmrc)" >> $GITHUB_ENV
+        run: echo "NODE_VERSION=$(cat package/.nvmrc)" >> $GITHUB_ENV
 
       # Setup PHP.
       - name: Setup PHP
@@ -57,19 +62,17 @@ jobs:
       # instead of `npm ci` because we do not yet have a lock file.
       - name: Install
         id: install
+        working-directory: package
         run: npm install
 
       # Lint all files.
       - name: Lint
         id: lint
+        working-directory: package
         run: npm run lint
 
       # Runs a build.
       - name: Build
         id: build
+        working-directory: package
         run: npm run build
-
-      # Return to root.
-      - name: Return to Root Directory
-        id: return_to_root_directory
-        run: cd ..

package/.github/workflows/release.yml

@@ -2,7 +2,8 @@ name: Release
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   release:
@@ -23,10 +24,19 @@ jobs:
         id: set_theme_version
         run: echo "THEME_VERSION=$(jq -r '.version' package.json)" >> $GITHUB_ENV
 
-      # Gets the PHP version from composer.json and sets it as an environment variable.
+      # Gets the PHP version from composer.json and sets it as an environment variable,
+      # by parsing the semver string to a setup-php string.
       - name: Set PHP Version
         id: set_php_version
-        run: echo "PHP_VERSION=$(jq -r '.require.php' composer.json)" >> $GITHUB_ENV
+        run: |
+          RAW_PHP_VERSION=$(jq -r '.require.php' composer.json)
+          MAJOR_VERSION_PATTERN="^\^"
+          if [[ $RAW_PHP_VERSION =~ $MAJOR_VERSION_PATTERN ]]; then
+            PARSED_PHP_VERSION=$(echo $RAW_PHP_VERSION | grep -oE '[0-9]+' | head -n 1)
+          else
+            PARSED_PHP_VERSION=$(echo $RAW_PHP_VERSION | grep -oE '[0-9]+(\.[0-9]+)?' | head -n 1)
+          fi
+          echo "PHP_VERSION=$PARSED_PHP_VERSION" >> $GITHUB_ENV
 
       # Gets the Node version from .nvmrc and sets it as an environment variable.
       - name: Set Node Version

package/composer.json

@@ -1,12 +1,12 @@
 {
 	"require": {
-		"php": "^8"
+		"php": "~8.3.0"
 	},
 	"require-dev": {
 		"squizlabs/php_codesniffer": "~3.7.0",
 		"dealerdirect/phpcodesniffer-composer-installer": "~0.7.2",
 		"wp-coding-standards/wpcs": "~2.3.0",
-		"wp-cli/i18n-command": "~2.6"
+		"wp-cli/i18n-command": "~2.6.0"
 	},
 	"config": {
 		"allow-plugins": {

package/webpack.config.js

@@ -135,7 +135,12 @@ class ThemePackageBuilderPlugin {
 	apply(compiler) {
 		compiler.hooks.afterCompile.tap(this.pluginName, (compilation) => {
 			// Watch PHP files by adding them to the fileDependencies.
-			const phpFiles = glob.sync('./**/*.php', { ignore: this.phpIgnore }).map(relPath => path.join(this.themePath, relPath));
+			const phpFiles = glob.sync('**/*.php', { 
+				cwd: this.themePath,
+				ignore: this.phpIgnore,
+				absolute: true,
+			});
+			// Resolve all relative paths.
 			compilation.fileDependencies.addAll(phpFiles);
 		});
 		// On watch.