Skip to content

Commit

Permalink
Merge branch 'main' into feat/13603-speculative-prerendering
Browse files Browse the repository at this point in the history
  • Loading branch information
AnuragVasanwala committed Jun 6, 2024
2 parents 422dd67 + 4e60364 commit f6f99e4
Show file tree
Hide file tree
Showing 127 changed files with 7,082 additions and 4,192 deletions.
39 changes: 25 additions & 14 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"plugin:@wordpress/eslint-plugin/i18n",
"eslint:recommended",
"plugin:import/recommended",
"plugin:eslint-comments/recommended",
"plugin:@eslint-community/eslint-comments/recommended",
"plugin:react/recommended",
"plugin:prettier/recommended",
"plugin:jsx-a11y/recommended",
Expand Down Expand Up @@ -141,7 +141,8 @@
"react/forbid-component-props": ["error", {
"forbid": ["for"]
}],
"react/no-array-index-key": "warn",
"react/jsx-key": "error",
"react/no-array-index-key": "error",
"react/no-unknown-property": [
"error",
{
Expand Down Expand Up @@ -244,8 +245,8 @@
{ "startLines": 1 }
],
"jsdoc/valid-types": "error",
"eslint-comments/no-unused-disable": "error",
"eslint-comments/require-description": "error",
"@eslint-community/eslint-comments/no-unused-disable": "error",
"@eslint-community/eslint-comments/require-description": "error",
"@wordpress/dependency-group": "error",
"@wordpress/i18n-no-flanking-whitespace": "error",
"@wordpress/no-unused-vars-before-return": ["error", {
Expand Down Expand Up @@ -422,12 +423,13 @@
"node": true
},
"rules": {
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"react/prop-types": "off",
"jest/no-hooks": "off",
"jest/no-untyped-mock-factory": "off",
"jest/max-expects": "off",
"jest/prefer-expect-assertions": "off",
"jest/prefer-importing-jest-globals": "off",
"jest/prefer-inline-snapshots": "off",
"jest/prefer-lowercase-title": [
"error",
Expand Down Expand Up @@ -482,7 +484,7 @@
"node": true
},
"rules": {
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"testing-library/no-await-sync-events": "error",
"testing-library/no-await-sync-queries": "error",
"testing-library/no-debugging-utils": "error",
Expand Down Expand Up @@ -548,10 +550,11 @@
"node": true
},
"rules": {
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"jest/max-expects": "off",
"jest/no-hooks": "off",
"jest/prefer-expect-assertions": "off",
"jest/prefer-importing-jest-globals": "off",
"jest/prefer-inline-snapshots": "off",
"jest/prefer-lowercase-title": [
"error",
Expand Down Expand Up @@ -586,7 +589,7 @@
"packages/e2e-test-utils/**/*.js"
],
"rules": {
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"jest/expect-expect": "off",
"jest/max-expects": "off",
"jest/no-export": "off",
Expand All @@ -605,7 +608,7 @@
"**/testUtils/**/*.js"
],
"rules": {
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"jest/require-hook": "off"
}
},
Expand Down Expand Up @@ -658,7 +661,7 @@
"node": true
},
"rules": {
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"node/no-extraneous-import": "off",
"node/no-missing-import": "off",
"node/no-unpublished-import": "off",
Expand All @@ -680,7 +683,7 @@
"packages/migration/scripts/utils/updateTemplates.js"
],
"rules": {
"eslint-comments/no-unused-disable": "off"
"@eslint-community/eslint-comments/no-unused-disable": "off"
}
},
{
Expand Down Expand Up @@ -708,7 +711,7 @@
"no-unused-vars": "off",
"header/header": "off",
"prettier/prettier": "off",
"eslint-comments/require-description": "off",
"@eslint-community/eslint-comments/require-description": "off",
"react/prop-types" : "off"
}
},
Expand Down Expand Up @@ -841,8 +844,8 @@
"rules": {
"react/no-array-index-key" : "off",
"react/prop-types": "off",
"eslint-comments/no-unused-disable": "off",
"eslint-comments/require-description": "off"
"@eslint-community/eslint-comments/no-unused-disable": "off",
"@eslint-community/eslint-comments/require-description": "off"
}
},
{
Expand Down Expand Up @@ -885,6 +888,14 @@
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-unsafe-return": "off"
}
},
{
"files": [
"packages/story-editor/src/components/canvas/mediaCaptions/cue.js"
],
"rules": {
"@eslint-community/eslint-comments/no-unused-disable": "off",
}
}
]
}
23 changes: 21 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,29 @@ updates:
# We have not yet upgraded to React 18.
- dependency-name: 'react'
versions:
- '>= 118'
- '>= 18'
- dependency-name: 'react-dom'
versions:
- '>= 118'
- '>= 18'
- dependency-name: '@testing-library/react'
versions:
- '>= 13'

# ESM only
- dependency-name: 'use-context-selector'
versions:
- '>= 2'
- dependency-name: 'flagged'
versions:
- '>= 3'
- dependency-name: 'mime'
versions:
- '>= 4'

# Needs manual update
- dependency-name: 'styled-components'
versions:
- '>= 6'

- package-ecosystem: composer
directory: '/'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
github.event.pull_request.user.login != 'dependabot[bot]'
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
disable-file-monitoring: true
egress-policy: block
Expand All @@ -101,7 +101,7 @@ jobs:
54.185.253.63:443
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down Expand Up @@ -129,12 +129,12 @@ jobs:
github.event.pull_request.user.login != 'dependabot[bot]'
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
# Upload ZIP file to GCS for use in QA environment.

- name: Authenticate
uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c
uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cleanup-pr-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
github.event.pull_request.user.login != 'dependabot[bot]'
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
disable-file-monitoring: true
disable-sudo: true
Expand All @@ -34,7 +34,7 @@ jobs:
raw.githubusercontent.com:443
- name: Authenticate
uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c
uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa
with:
credentials_json: ${{ secrets.GCP_SA_KEY }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ jobs:
timeout-minutes: 30
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Initialize CodeQL
uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a
uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f
with:
languages: javascript

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a
uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f
4 changes: 2 additions & 2 deletions .github/workflows/deploy-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand All @@ -50,7 +50,7 @@ jobs:
run: npm run storybook:build

- name: Checkout gh-pages
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
with:
ref: gh-pages
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-css-js-md.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
timeout-minutes: 20
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
disable-sudo: true
disable-file-monitoring: true
Expand All @@ -74,7 +74,7 @@ jobs:
54.185.253.63:443
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ jobs:
timeout-minutes: 10
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
timeout-minutes: 5
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
disable-file-monitoring: true
egress-policy: block
Expand All @@ -55,7 +55,7 @@ jobs:
dl.cloudsmith.io:443
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup PHP
uses: shivammathur/setup-php@e6f75134d35752277f093989e72e140eaa222f35
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/npm-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
environment: Production
steps:
- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29

- name: Setup Node
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
Expand Down Expand Up @@ -102,12 +102,12 @@ jobs:
needs: [dry-run]
steps:
- name: Harden Runner
uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4
uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- name: Checkout
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
with:
token: ${{ secrets.GOOGLEFORCREATORS_BOT_TOKEN }}

Expand Down

0 comments on commit f6f99e4

Please sign in to comment.