Merge branch 'trunk' into 9.8-sync-with-trunk

Author: jorgeatorres

.github/project-community-pr-assigner.yml

@@ -110,7 +110,7 @@
   - team: woo-fse
   - team: ghidorah
 
-"plugins/woocommerce-blocks/**/*":
+"plugins/woocommerce/client/blocks/**/*":
   - team: rubik
   - team: woo-fse
 

.github/workflows/ci.yml

@@ -52,9 +52,9 @@ jobs:
         with:
           filters: |
             needs-code-validation:
-              - '!((**/*.md)|(**/changelog/*)|(.github/**)|(.husky/**)|(.cursor/**)|(.gitignore))'
+              - '!((**/*.md)|(**/changelog/*)|(.github/**)|(.husky/**)|(.cursor/**)|(.gitignore)|(**/readme.txt))'
             needs-changelog-validation:
-              - '{packages,plugins}/*/!(changelog/**)/**'
+              - '{packages,plugins}/*/!((changelog/*)|(readme.txt))'
             needs-markdown-validation:
               - '!(.github/**)/**/*.md'
             needs-syncpack-validation:
@@ -182,7 +182,7 @@ jobs:
           RELEASE_TAG: ${{ github.ref_name }}
           ARTIFACT_NAME: ${{ github.ref_name == 'nightly' && 'woocommerce-trunk-nightly.zip' || 'woocommerce.zip' }}
           # band-aid to get the path to wp-env.json for blocks e2e tests, until they're migrated to plugins/woocommerce
-          WP_ENV_CONFIG_PATH: ${{ github.workspace }}/${{ matrix.testEnv.start == 'env:start:blocks' && 'plugins/woocommerce-blocks' || matrix.projectPath  }}
+          WP_ENV_CONFIG_PATH: ${{ github.workspace }}/${{ matrix.testEnv.start == 'env:start:blocks' && 'plugins/woocommerce/client/blocks' || matrix.projectPath  }}
         run: node .github/workflows/scripts/override-wp-env-plugins.js
 
       - name: 'Start Test Environment'
@@ -487,7 +487,7 @@ jobs:
 
   validate-changelog:
     name: 'Validate changelog'
-    if: ${{ !cancelled() && github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'trunk' && needs.identify-jobs-to-run.outputs.needs-changelog-validation == 'true' && ! contains( github.event.pull_request.body, '[x] This Pull Request does not require a changelog' ) }}
+    if: ${{ !cancelled() && github.event_name == 'pull_request' && github.event.pull_request.user.login != 'github-actions[bot]' && github.event.pull_request.base.ref == 'trunk' && needs.identify-jobs-to-run.outputs.needs-changelog-validation == 'true' && ! contains( github.event.pull_request.body, '[x] This Pull Request does not require a changelog' ) }}
     needs: [ 'identify-jobs-to-run' ]
     runs-on: ubuntu-latest
     permissions:
@@ -585,28 +585,35 @@ jobs:
           NC="\e[0m"
           set -e
           rc=0
-          changed_files="${{ steps.repo-changed-files.outputs.all_changed_files  }}"
-          if [ -n "$changed_files" ]; then
+          added_and_modified_docs="${{ steps.repo-changed-files.outputs.added_files }} ${{ steps.repo-changed-files.outputs.modified_files }}"
+
+          if [ -n "$added_and_modified_docs" ]; then
             lint_results=""
-            for file in $changed_files; do
+
+            for file in $added_and_modified_docs; do
               lint_result=$( { cat "$file" | markdownlint --stdin ; } 2>&1 ) || rc="$?"
               if [ $rc -ne 0 ]; then
+                echo -e "${RED}[err] $file${NC}"
                 lint_results="$lint_results\n>>>Linting failed for file: $file <<<\n$lint_result\n--------"
+              else
+                echo -e "${GREEN}[ok] $file${NC}"
               fi
             done
+
             if [ $rc -ne 0 ]; then
               echo -e "${RED}Linting failed for one or more files${NC}"
               echo -e "$lint_results"
               exit 1
             else
               echo -e "${GREEN}Linting successful for all files.${NC}"
             fi
+
           else
             echo "No repo markdown files changed."
           fi
 
       - name: Validate - manifest files for monorepo documentation
-        id: is-valid-json
+        id: manifest-validation
         run: node .github/workflows/scripts/is-valid-json.js docs/docs-manifest.json
 
       - name: Validate - changed markdown files from monorepo documentation
@@ -616,25 +623,34 @@ jobs:
           NC="\e[0m"
           set -e
           rc=0
-          changed_files="${{ steps.docs-changed-files.outputs.all_changed_files }}"
-          changed_manifest="${{ steps.docs-manifest.outputs.all_changed_files }}"
-          is_valid_json="${{ steps.is-valid-json.outputs.is-valid-json }}"
+          any_docs_changed=${{ steps.docs-changed-files.outputs.any_modified }}
           storybook="no"
+
           for L in ${{github.event.pull_request.labels.*.name}}
           do
             if [ $L == "type: storybook" ]; then
               storybook="yes"
             fi
           done
-          if [ -n "$changed_files" ]; then
+
+          if [ "$any_docs_changed" == "true" ]; then
+            added_and_modified_docs="${{ steps.docs-changed-files.outputs.added_files }} ${{ steps.docs-changed-files.outputs.modified_files }}"
+            manifest_changed="${{ steps.docs-manifest.outputs.any_changed }}"
+            is_manifest_valid_json="${{ steps.manifest-validation.outputs.is-valid-json }}"
             lint_results=""
             failed_check=""
-            for file in $changed_files; do
-              lint_result=$( { cat "$file" | markdownlint --stdin -c docs/.markdownlint.json ; } 2>&1 ) || rc="$?"
-              if [ $rc -ne 0 ]; then
-                lint_results="$lint_results\n>>>Linting failed for file: $file <<<\n$lint_result\n--------"
-              fi
-            done
+
+            if [ -n "$added_and_modified_docs" ]; then
+              for file in $added_and_modified_docs; do
+                lint_result=$( { cat "$file" | markdownlint --stdin -c docs/.markdownlint.json ; } 2>&1 ) || rc="$?"
+                if [ $rc -ne 0 ]; then
+                  echo -e "${RED}[err] $file${NC}"
+                  lint_results="$lint_results\n>>>Linting failed for file: $file <<<\n$lint_result\n--------"
+                else
+                  echo -e "${GREEN}[ok] $file${NC}"
+                fi
+              done
+            fi
           
             if [ $rc -ne 0 ]; then
               echo -e "${RED}Linting failed for one or more files${NC}"
@@ -645,13 +661,17 @@ jobs:
             fi
           
             if [ "$storybook" == "no" ]; then
-              if [ -z "$changed_manifest" ]; then
+              if [ "$manifest_changed" == "false" ]; then
                 echo -e "${RED}Changes in the docs folder require updating the manifest${NC}"
                 failed_check="manifest"
+              else
+                echo -e "${GREEN}[ok] docs/docs-manifest.json (updated)${NC}"
               fi
-              if [ "$is_valid_json" == "no" ]; then
+              if [ "$is_manifest_valid_json" == "no" ]; then
                 echo -e "${RED}'docs/docs-manifest.json' is not valid JSON${NC}"
                 failed_check="manifest"
+              else
+                echo -e "${GREEN}[ok] docs/docs-manifest.json (valid)${NC}"
               fi
               if [ "$failed_check" == "manifest" ]; then
                 echo -e "Generate a manifest with 'pnpm utils md-docs create docs woocommerce -o docs/docs-manifest.json'"

.github/workflows/deprecated/blocks-playwright.yml

@@ -4,7 +4,7 @@ on:
     pull_request:
         paths:
             - '.github/workflows/blocks-playwright.yml' # This file
-            - 'plugins/woocommerce-blocks/**'
+            - 'plugins/woocommerce/client/blocks/**'
             - 'plugins/woocommerce/src/Blocks/**'
             - 'plugins/woocommerce/templates/**'
             - 'plugins/woocommerce/patterns/**'
@@ -17,7 +17,7 @@ on:
             - trunk
         paths:
             - '.github/workflows/blocks-playwright.yml' # This file
-            - 'plugins/woocommerce-blocks/**'
+            - 'plugins/woocommerce/client/blocks/**'
             - 'plugins/woocommerce/src/Blocks/**'
             - 'plugins/woocommerce/templates/**'
             - 'plugins/woocommerce/patterns/**'
@@ -36,7 +36,7 @@ jobs:
         runs-on: ubuntu-latest
         defaults:
             run:
-                working-directory: plugins/woocommerce-blocks
+                working-directory: plugins/woocommerce/client/blocks
         strategy:
             fail-fast: false
             matrix:
@@ -68,15 +68,15 @@ jobs:
               if: ${{ !cancelled() }}
               with:
                   name: failures-artifacts-shard-${{ matrix.shardIndex }}
-                  path: plugins/woocommerce-blocks/tests/e2e/artifacts/test-results
+                  path: plugins/woocommerce/client/blocks/tests/e2e/artifacts/test-results
                   if-no-files-found: ignore
 
             - name: Archive flaky test reports
               uses: actions/upload-artifact@v4
               if: ${{ !cancelled() }}
               with:
                   name: flaky-tests-report-shard-${{ matrix.shardIndex }}
-                  path: plugins/woocommerce-blocks/flaky-tests
+                  path: plugins/woocommerce/client/blocks/flaky-tests
                   if-no-files-found: ignore
 
     merge-artifacts:

.github/workflows/pr-assess-bundle-size.yml

@@ -66,7 +66,7 @@ jobs:
                   BROWSERSLIST_IGNORE_OLD_DATA: true
               with:
                   repo-token: '${{ secrets.GITHUB_TOKEN }}'
-                  pattern: './{packages/js/!(*e2e*|*internal*|*test*|*plugin*|*create*),plugins/woocommerce-blocks,plugins/woocommerce/client/admin,plugins/woocommerce/client/legacy}/{build,build-style}/**/*.{js,css}'
+                  pattern: './{packages/js/!(*e2e*|*internal*|*test*|*plugin*|*create*),plugins/woocommerce/client/blocks,plugins/woocommerce/client/admin,plugins/woocommerce/client/legacy}/{build,build-style}/**/*.{js,css}'
                   install-script: 'pnpm install --filter="@woocommerce/plugin-woocommerce..." --frozen-lockfile --config.dedupe-peer-dependents=false --ignore-scripts'
                   build-script: '--filter="@woocommerce/plugin-woocommerce" build'
                   clean-script: '--if-present clean:build'

.github/workflows/scripts/run-metrics.sh

@@ -21,13 +21,17 @@ if [ "$GITHUB_EVENT_NAME" == "push" ] || [ "$GITHUB_EVENT_NAME" == "pull_request
 
 	if [ "$GITHUB_EVENT_NAME" == "push" ]
 	then
-		# Use-case: performance comparison on trunk push with fixed reference point
-		# It should be 3d7d7f02017383937f1a4158d433d0e5d44b3dc9, but we pick 55f855a2e6d769b5ae44305b2772eb30d3e721df
-		# where compare-perf reporting mode was introduced for processing the provided reports.
+		# Use-case: performance comparison on trunk push with fixed reference
+		# point It should be 3d7d7f02017383937f1a4158d433d0e5d44b3dc9, but we
+		# pick 55f855a2e6d769b5ae44305b2772eb30d3e721df where compare-perf
+		# reporting mode was introduced for processing the provided reports.
 		BASE_SHA=55f855a2e6d769b5ae44305b2772eb30d3e721df
 	else
-		# Use-case: performance comparison on PRs changes.
-		BASE_SHA=$GITHUB_BASE_SHA
+		# Use-case: performance comparison on PRs changes. We need to explicitly
+		# fetch trunk because $GITHUB_BASE_SHA might point to the base of a PR
+		# chain rather than trunk.
+		git fetch --depth=1 --no-tags origin trunk
+		BASE_SHA=$(git rev-parse origin/trunk)
 	fi
 	HEAD_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 	WP_VERSION=$(awk -F ': ' '/^Tested up to/{print $2}' readme.txt)

.syncpackrc

@@ -44,7 +44,6 @@
 				"@wordpress/data-controls",
 				"@wordpress/date",
 				"@wordpress/editor",
-				"@wordpress/dependency-extraction-webpack-plugin",
 				"@wordpress/deprecated",
 				"@wordpress/dom",
 				"@wordpress/dom-ready",
@@ -233,7 +232,6 @@
 				"@wordpress/stylelint-config",
 				"@wordpress/scripts",
 				"@wordpress/jest-console",
-				"@wordpress/dependency-extraction-webpack-plugin",
 				"@wordpress/e2e-test-utils",
 				"@wordpress/jest-preset-default",
 				"@wordpress/postcss-plugins-preset",
@@ -311,6 +309,17 @@
 			"pinVersion": "^1.15.0"
 		},
 		{
+			"label": "@wordpress/* build-dependencies (always ahead of runtime-dependencies)",
+			"dependencies": [
+				"@wordpress/dependency-extraction-webpack-plugin"
+			],
+			"packages": [
+				"**"
+			],
+			"pinVersion": "next"
+		},
+		{
+			"label": "@wordpress/* runtime-dependencies",
 			"dependencies": [
 				"@wordpress/**"
 			],

README.md

@@ -25,7 +25,7 @@ Once you've installed all of the prerequisites, the following will prepare all o
 # Ensure that correct version of Node is installed and being used
 nvm install
 # Install the PHP and Composer dependencies for all of the plugins, packages, and tools
-pnpm install
+pnpm install -frozen-lockfile
 # Build all of the plugins, packages, and tools in the monorepo
 pnpm build
 ```

bin/wp-env-with-wp-641.js

@@ -2,7 +2,7 @@ const fs = require( 'fs' );
 const path = require( 'path' );
 
 const wpEnvRaw = fs.readFileSync(
-	path.join( __dirname, '../plugins/woocommerce-blocks/.wp-env.json' )
+	path.join( __dirname, '../plugins/woocommerce/client/blocks/.wp-env.json' )
 );
 const wpEnv = JSON.parse( wpEnvRaw );
 

docs/block-theme-development/css-styling.md

@@ -9,7 +9,7 @@ tags: reference
 > [!IMPORTANT]
 > We strongly discourage writing CSS code based on existing block class names and prioritize using global styles when possible. We especially discourage writing CSS selectors that rely on a specific block being a descendant of another one, as users can move blocks around freely, so they are prone to breaking. Similar to WordPress itself, we consider the HTML structure within components, blocks, and block templates to be "private", and subject to further change in the future, so using CSS to target the internals of a block or a block template is _not recommended or supported_.
 
-WooCommerce Blocks follows BEM for class names, as [stated in our coding guidelines](https://github.com/woocommerce/woocommerce/blob/trunk/plugins/woocommerce-blocks/docs/contributors/coding-guidelines.md). All classes start with one of these two prefixes:
+WooCommerce Blocks follows BEM for class names, as [stated in our coding guidelines](../../plugins/woocommerce/client/blocks/docs/contributors/coding-guidelines.md). All classes start with one of these two prefixes:
 
 * `.wc-block-`: class names specific to a single block.
 * `.wc-block-components-`: class names specific to a component. The component might be reused by different blocks.
@@ -69,4 +69,3 @@ WC Blocks use the [`hidden` HTML attribute](https://developer.mozilla.org/en-US/
 ## Legacy classes from WooCommerce (.price, .star-rating, .button...)
 
 WooCommerce Blocks avoids using legacy unprefixed classes as much as possible. However, you might find some of them that have been added for backwards compatibility. We still encourage themes to use the prefixed classes when possible, this avoids conflicts with other plugins, the editor, etc.
-