From 8c18685f64ec32c36573948a168880c0051e3c38 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:24:57 -0500 Subject: [PATCH 1/7] Encode URI component in typography --- src/components/font-family/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/font-family/index.js b/src/components/font-family/index.js index 84c51634ccf..04a564a094c 100644 --- a/src/components/font-family/index.js +++ b/src/components/font-family/index.js @@ -62,14 +62,14 @@ function FontFamilyPicker( { label, value, help, instanceId, onChange, className if ( ba.length > 0 ) { //Load fonts on the header if ( ! ba.includes( event.target.value ) && ! isSystemFont ) { - link.href = 'https://fonts.googleapis.com/css?family=' + event.target.value.replace( / /g, '+' ) + googleFontsAttr; + link.href = 'https://fonts.googleapis.com/css?family=' + window.encodeURIComponent( event.target.value.replace( / /g, '+' ) ) + googleFontsAttr; document.head.appendChild( link ); } ba = ba.replace( ',' + event.target.value, '' ); ba = ba + ',' + event.target.value; } else { - link.href = 'https://fonts.googleapis.com/css?family=' + event.target.value.replace( / /g, '+' ) + googleFontsAttr; + link.href = 'https://fonts.googleapis.com/css?family=' + window.encodeURIComponent( event.target.value.replace( / /g, '+' ) ) + googleFontsAttr; document.head.appendChild( link ); ba = event.target.value; From 00279d11fa6156860f5834098e66c915accf6804 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:42:37 -0500 Subject: [PATCH 2/7] Remove WP 6.1 and add 6.4 --- .github/workflows/test-e2e.yml | 2 +- .github/workflows/test-php.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 653fcc2155c..1ed7b090547 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -24,7 +24,7 @@ jobs: wp: # Test against Prev-Prev Major, Prev-Major, and current Major release versions. - "6.2" - "6.3" - # - "6.4" Should enable this when 6.4 is released. + - "6.4" theme: - "https://downloads.wordpress.org/theme/go.zip" - "" # Default theme is TwentyTwentyThree diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index 9b2adb9441d..846e070f590 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: php: ['7.4','8.0','8.1','8.2'] - wp: ['6.3', '6.2', '6.1'] + wp: ['6.4', '6.3', '6.2'] name: PHP Unit ${{ matrix.php }} | WP Version ${{ matrix.wp }} uses: ./.github/workflows/test-php-unit.yml with: From 3580fb71ab7ea794d3dfca99e765bf095fcd3f28 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:47:37 -0500 Subject: [PATCH 3/7] Remove WP 6.2. Does not meet Woo minimum version support. --- .github/workflows/test-e2e.yml | 1 - .github/workflows/test-php.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 1ed7b090547..3547c856e1b 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -22,7 +22,6 @@ jobs: fail-fast: false matrix: wp: # Test against Prev-Prev Major, Prev-Major, and current Major release versions. - - "6.2" - "6.3" - "6.4" theme: diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml index 846e070f590..3803fdc890d 100644 --- a/.github/workflows/test-php.yml +++ b/.github/workflows/test-php.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: php: ['7.4','8.0','8.1','8.2'] - wp: ['6.4', '6.3', '6.2'] + wp: ['6.4', '6.3'] name: PHP Unit ${{ matrix.php }} | WP Version ${{ matrix.wp }} uses: ./.github/workflows/test-php-unit.yml with: From 9922ea38307af2fcc49a506ddff62a04b3826905 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:50:18 -0500 Subject: [PATCH 4/7] Bump codeql to v2 --- .github/workflows/github-codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github-codeql-analysis.yml b/.github/workflows/github-codeql-analysis.yml index a9b8e123676..ef0a1069419 100644 --- a/.github/workflows/github-codeql-analysis.yml +++ b/.github/workflows/github-codeql-analysis.yml @@ -43,7 +43,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From c178a04e472900368b169553fe001e6e1a0e7031 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:53:56 -0500 Subject: [PATCH 5/7] Bump git action versions --- .github/workflows/github-codeql-analysis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-codeql-analysis.yml b/.github/workflows/github-codeql-analysis.yml index ef0a1069419..38b950c3645 100644 --- a/.github/workflows/github-codeql-analysis.yml +++ b/.github/workflows/github-codeql-analysis.yml @@ -39,11 +39,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 From 66626f7a2cb9ac0d44982fad93d88a2aba316ad5 Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:56:31 -0500 Subject: [PATCH 6/7] Rename codeql-analysis workflow file --- .../workflows/{github-codeql-analysis.yml => codeql-analysis.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{github-codeql-analysis.yml => codeql-analysis.yml} (100%) diff --git a/.github/workflows/github-codeql-analysis.yml b/.github/workflows/codeql-analysis.yml similarity index 100% rename from .github/workflows/github-codeql-analysis.yml rename to .github/workflows/codeql-analysis.yml From a6acac1f7bf70d547364c34234e9af8387eb3e8f Mon Sep 17 00:00:00 2001 From: Evan Herman Date: Tue, 20 Feb 2024 14:58:00 -0500 Subject: [PATCH 7/7] Revert file name --- .../workflows/{codeql-analysis.yml => github-codeql-analysis.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{codeql-analysis.yml => github-codeql-analysis.yml} (100%) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/github-codeql-analysis.yml similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/github-codeql-analysis.yml