Merge branch 'main' into add/bun

GoogleForCreators · Mar 12, 2024 · 1d50890 · 1d50890
2 parents a78fd6c + e146a96
commit 1d50890
Show file tree

Hide file tree

Showing 70 changed files with 4,221 additions and 2,547 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -1,7 +1,6 @@
 last 2 Chrome versions
 last 2 Firefox versions
 last 2 Safari versions
-Safari 15.3 # polyfill support for structuredClone #11799
 last 2 iOS versions
 last 2 Edge versions
 last 2 Opera versions
diff --git a/.eslintrc b/.eslintrc
@@ -649,7 +649,7 @@
       ],
       "extends": [
         "plugin:node/recommended",
-        "plugin:security/recommended"
+        "plugin:security/recommended-legacy"
       ],
       "plugins": [
         "security"

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,10 @@ updates:
     open-pull-requests-limit: 10
     labels:
       - Dependencies
+    groups:
+      github-actions:
+        patterns:
+          - '*'
 
   - package-ecosystem: npm
     directory: '/'

diff --git a/.github/workflows/cleanup-pr-assets.yml b/.github/workflows/cleanup-pr-assets.yml
@@ -21,7 +21,7 @@ jobs:
       github.event.pull_request.user.login != 'dependabot[bot]'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           disable-file-monitoring: true
           disable-sudo: true
@@ -34,12 +34,12 @@ jobs:
             raw.githubusercontent.com:443
 
       - name: Authenticate
-        uses: google-github-actions/auth@67e9c72af6e0492df856527b474995862b7b6591
+        uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c
         with:
           credentials_json: ${{ secrets.GCP_SA_KEY }}
 
       - name: Setup Cloud SDK
-        uses: google-github-actions/setup-gcloud@e30db14379863a8c79331b04a9969f4c1e225e0b
+        uses: google-github-actions/setup-gcloud@98ddc00a17442e89a24bbf282954a3b65ce6d200
         with:
           project_id: ${{ secrets.GCP_PROJECT_ID }}
 

diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml
@@ -41,7 +41,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           disable-file-monitoring: true
           egress-policy: block
@@ -68,7 +68,7 @@ jobs:
         run: composer --no-interaction validate --no-check-all
 
       - name: Install PHP dependencies
-        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6
+        uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
         with:
           composer-options: '--prefer-dist --no-progress --no-interaction'
 

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
@@ -48,7 +48,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: 'Upload artifact'
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: SARIF file
           path: results.sarif

diff --git a/.github/workflows/tests-karma-dashboard.yml b/.github/workflows/tests-karma-dashboard.yml
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           disable-file-monitoring: true
           egress-policy: block
@@ -71,7 +71,7 @@ jobs:
         uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
 
       - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
         with:
           node-version-file: '.nvmrc'
           cache: npm
@@ -100,7 +100,7 @@ jobs:
           DISABLE_ERROR_BOUNDARIES: true
 
       - name: Upload code coverage report
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+        uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
         with:
           file: build/logs/karma-coverage/dashboard/lcov.info
           flags: karmatests
diff --git a/.github/workflows/tests-karma-editor.yml b/.github/workflows/tests-karma-editor.yml
@@ -83,7 +83,7 @@ jobs:
           ]
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           disable-file-monitoring: true
           egress-policy: block
@@ -109,7 +109,7 @@ jobs:
         uses: oven-sh/setup-bun@9b21598af8d4dfc302e5a30250007de0fda92acc
 
       - name: Setup Node
-        uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
         with:
           node-version-file: '.nvmrc'
           cache: npm
@@ -141,7 +141,7 @@ jobs:
           SHARD: ${{ matrix.shard }}
 
       - name: Upload code coverage report
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+        uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
         with:
           file: build/logs/karma-coverage/story-editor/lcov.info
           flags: karmatests
diff --git a/.github/workflows/tests-unit-php.yml b/.github/workflows/tests-unit-php.yml
@@ -43,7 +43,7 @@ jobs:
     timeout-minutes: 20
     services:
       mysql:
-        image: mariadb:latest
+        image: mariadb:lts
         env:
           MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
           MARIADB_DATABASE: wordpress_test
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           disable-file-monitoring: true
           egress-policy: audit
@@ -116,7 +116,7 @@ jobs:
           tools: composer
 
       - name: Install PHP dependencies
-        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6
+        uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
         with:
           composer-options: '--prefer-dist --no-progress --no-interaction'
 
@@ -132,7 +132,7 @@ jobs:
           tools: composer, cs2pr
 
       - name: Install PHP dependencies
-        uses: ramsey/composer-install@83af392bf5f031813d25e6fe4cd626cdba9a2df6
+        uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
         with:
           composer-options: '--prefer-dist --no-progress --no-interaction --no-scripts'
 
@@ -181,7 +181,7 @@ jobs:
         if: ${{ matrix.random }}
 
       - name: Upload code coverage report
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+        uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab
         with:
           file: build/logs/*.xml
         if: ${{ matrix.coverage }}
diff --git a/.github/workflows/update-browserslist.yml b/.github/workflows/update-browserslist.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
@@ -38,7 +38,7 @@ jobs:
         run: bunx browserslist@latest --update-db
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
         with:
           token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
           commit-message: Update browserslist db

diff --git a/.github/workflows/update-product-schema.yml b/.github/workflows/update-product-schema.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
@@ -38,7 +38,7 @@ jobs:
           mv product.schema.json tests/phpunit/integration/data/schema.json
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
+        uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc
         with:
           token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
           commit-message: Update Product Schema

diff --git a/babel.config.cjs b/babel.config.cjs
@@ -32,7 +32,7 @@ module.exports = function (api) {
           shippedProposals: true,
           targets,
           useBuiltIns: 'usage',
-          corejs: '3.33.2',
+          corejs: '3.35.1',
         },
       ],
       [

diff --git a/bin/local-env/docker-compose.yml b/bin/local-env/docker-compose.yml
@@ -45,7 +45,7 @@ services:
     command: tail -f /dev/null
 
   mysql:
-    image: mariadb:focal
+    image: mariadb:lts
     command: --max-allowed-packet=16777216
     environment:
       MYSQL_ROOT_PASSWORD: example

diff --git a/bun.lockb b/bun.lockb
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "ext-mbstring": "*",
     "ampproject/amp-toolbox": "*",
     "ampproject/amp-wp": "dev-develop",
-    "enshrined/svg-sanitize": "^0.16.0",
+    "enshrined/svg-sanitize": "^0.18.0",
     "mcaskill/composer-exclude-files": "^3.0",
     "symfony/polyfill-mbstring": "^1.18"
   },
@@ -33,8 +33,8 @@
     "sirbrillig/phpcs-variable-analysis": "^2.8",
     "slevomat/coding-standard": "^8.0.0",
     "sniccowp/php-scoper-wordpress-excludes": "^6.0",
-    "swissspidy/phpstan-no-private": "^v0.2.0",
-    "szepeviktor/phpstan-wordpress": "^v1.1.3",
+    "swissspidy/phpstan-no-private": "^0.2.0",
+    "szepeviktor/phpstan-wordpress": "^1.1.3",
     "wp-coding-standards/wpcs": "^3.0.0",
     "yoast/wp-test-utils": "^1.0.0"
   },
@@ -52,28 +52,28 @@
   "prefer-stable": true,
   "autoload": {
     "psr-4": {
-      "Google\\Web_Stories\\": "includes",
       "AmpProject\\": "vendor/ampproject/amp-wp/lib/common/src",
-      "AmpProject\\Optimizer\\": "vendor/ampproject/amp-wp/lib/optimizer/src"
+      "AmpProject\\Optimizer\\": "vendor/ampproject/amp-wp/lib/optimizer/src",
+      "Google\\Web_Stories\\": "includes"
     }
   },
   "autoload-dev": {
     "psr-4": {
+      "Google\\Web_Stories\\PHPStan\\": "tests/phpstan/src",
       "Google\\Web_Stories\\Tests\\Integration\\": "tests/phpunit/integration/includes",
-      "Google\\Web_Stories\\Tests\\Unit\\": "tests/phpunit/unit/includes",
       "Google\\Web_Stories\\Tests\\Shared\\": "tests/phpunit/shared",
-      "Google\\Web_Stories\\PHPStan\\": "tests/phpstan/src"
+      "Google\\Web_Stories\\Tests\\Unit\\": "tests/phpunit/unit/includes"
     }
   },
   "config": {
     "allow-plugins": {
-      "dealerdirect/phpcodesniffer-composer-installer": true,
-      "cweagans/composer-patches": true,
-      "mcaskill/composer-exclude-files": true,
-      "phpstan/extension-installer": true,
+      "civicrm/composer-downloads-plugin": true,
       "composer/installers": true,
+      "cweagans/composer-patches": true,
+      "dealerdirect/phpcodesniffer-composer-installer": true,
       "ergebnis/composer-normalize": true,
-      "civicrm/composer-downloads-plugin": true
+      "mcaskill/composer-exclude-files": true,
+      "phpstan/extension-installer": true
     },
     "discard-changes": true,
     "platform": {