From a7b4d5e0e1fc36bcb2b1b2ae4ebeaddbd9473a21 Mon Sep 17 00:00:00 2001 From: Dmitry Gozman Date: Tue, 21 Jul 2026 11:27:10 +0100 Subject: [PATCH] chore: cleanup some things (#41896) --- .../roll_browser_into_playwright.yml | 81 ------------------- .../src/server/bidi/bidiBrowser.ts | 2 - .../src/server/browserContext.ts | 3 - .../src/server/chromium/crBrowser.ts | 3 - .../src/server/firefox/ffBrowser.ts | 2 - .../src/server/webkit/webview/wvBrowser.ts | 1 - .../src/server/webkit/wkBrowser.ts | 2 - utils/build/build.js | 3 +- 8 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 .github/workflows/roll_browser_into_playwright.yml diff --git a/.github/workflows/roll_browser_into_playwright.yml b/.github/workflows/roll_browser_into_playwright.yml deleted file mode 100644 index 007eef766c197..0000000000000 --- a/.github/workflows/roll_browser_into_playwright.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: Roll Browser into Playwright - -on: - repository_dispatch: - types: [roll_into_pw] - -env: - BROWSER: ${{ github.event.client_payload.browser }} - REVISION: ${{ github.event.client_payload.revision }} - BROWSER_VERSION: ${{ github.event.client_payload.browserVersion }} - BUILD_LINK: ${{ github.event.client_payload.buildLink }} - -permissions: - contents: write - -concurrency: - group: 'roll-browser-into-playwright-${{ github.event.client_payload.browser }}-${{ github.event.client_payload.revision }}' - -jobs: - roll: - runs-on: ubuntu-24.04 - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-node@v6 - with: - node-version: lts/* - - run: npm ci - - run: npm run build - - name: Install dependencies - run: npx playwright install-deps - - name: Roll to new revision - run: | - ./utils/roll_browser.js $BROWSER $REVISION $BROWSER_VERSION - npm run build - - name: Prepare branch - id: prepare-branch - run: | - BRANCH_NAME="roll-into-pw-${BROWSER}/${REVISION}" - echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT - - git fetch origin $BRANCH_NAME:$BRANCH_NAME || true - if git show-ref --verify --quiet refs/heads/$BRANCH_NAME; then - echo "exists=1" >> $GITHUB_OUTPUT - echo "branch $BRANCH_NAME already exists, exiting" - exit 0 - fi - echo "exists=0" >> $GITHUB_OUTPUT - - git config --global user.name microsoft-playwright-automation[bot] - git config --global user.email 203992400+microsoft-playwright-automation[bot]@users.noreply.github.com - git checkout -b "$BRANCH_NAME" - git add . - git commit -m "feat(${BROWSER}): roll to r${REVISION}" - git push origin $BRANCH_NAME --force - - uses: actions/create-github-app-token@v3 - id: app-token - with: - client-id: ${{ vars.PLAYWRIGHT_APP_CLIENT_ID }} - private-key: ${{ secrets.PLAYWRIGHT_PRIVATE_KEY }} - - name: Create Pull Request - uses: actions/github-script@v9 - if: ${{ steps.prepare-branch.outputs.exists == '0' }} - with: - github-token: ${{ steps.app-token.outputs.token }} - script: | - const buildLink = process.env.BUILD_LINK; - const body = buildLink ? `Browser build: ${buildLink}. Build has full platform coverage - check that all tests pass there.` : undefined; - const response = await github.rest.pulls.create({ - owner: 'microsoft', - repo: 'playwright', - head: 'microsoft:${{ steps.prepare-branch.outputs.BRANCH_NAME }}', - base: 'main', - title: 'feat(${{ env.BROWSER }}): roll to r${{ env.REVISION }}', - body, - }); - await github.rest.issues.addLabels({ - owner: 'microsoft', - repo: 'playwright', - issue_number: response.data.number, - labels: ['CQ1'], - }); diff --git a/packages/playwright-core/src/server/bidi/bidiBrowser.ts b/packages/playwright-core/src/server/bidi/bidiBrowser.ts index 2e7d646455832..cf6699c924c6f 100644 --- a/packages/playwright-core/src/server/bidi/bidiBrowser.ts +++ b/packages/playwright-core/src/server/bidi/bidiBrowser.ts @@ -512,8 +512,6 @@ export class BidiBrowserContext extends BrowserContext { await Promise.all(promises); } - onClosePersistent() {} - override async clearCache(): Promise { } diff --git a/packages/playwright-core/src/server/browserContext.ts b/packages/playwright-core/src/server/browserContext.ts index 5353a4fd0f7ac..a240c5b1ba979 100644 --- a/packages/playwright-core/src/server/browserContext.ts +++ b/packages/playwright-core/src/server/browserContext.ts @@ -271,8 +271,6 @@ export abstract class BrowserContext extends Sdk this._closedStatus = 'closed'; this._clientCertificatesProxy?.close().catch(() => {}); this.tracing.abort(); - if (this._isPersistentContext) - this.onClosePersistent(); this._closePromiseFulfill!(new Error('Context closed')); this.emit(BrowserContext.Events.Close); } @@ -303,7 +301,6 @@ export abstract class BrowserContext extends Sdk protected abstract doUpdateDefaultEmulatedMedia(): Promise; protected abstract doExposePlaywrightBinding(): Promise; protected abstract doClose(reason: string | undefined): Promise; - protected abstract onClosePersistent(): void; async cookies(progress: Progress, urls: string | string[] | undefined = []): Promise { return await progress.race(this._cookies(urls)); diff --git a/packages/playwright-core/src/server/chromium/crBrowser.ts b/packages/playwright-core/src/server/chromium/crBrowser.ts index e4d95a68432d2..ba563a4b56118 100644 --- a/packages/playwright-core/src/server/chromium/crBrowser.ts +++ b/packages/playwright-core/src/server/chromium/crBrowser.ts @@ -576,9 +576,6 @@ export class CRBrowserContext extends BrowserContext { } } - onClosePersistent() { - } - override async clearCache(): Promise { for (const page of this._crPages()) await page._networkManager.clearCache(); diff --git a/packages/playwright-core/src/server/firefox/ffBrowser.ts b/packages/playwright-core/src/server/firefox/ffBrowser.ts index 73230d70eee20..5a11de9cba630 100644 --- a/packages/playwright-core/src/server/firefox/ffBrowser.ts +++ b/packages/playwright-core/src/server/firefox/ffBrowser.ts @@ -392,8 +392,6 @@ export class FFBrowserContext extends BrowserContext { this._browser.session.send('Browser.addBinding', { browserContextId: this._browserContextId, name: PageBinding.kBindingName, script: '' }); } - onClosePersistent() {} - override async clearCache(): Promise { // Clearing only the context cache does not work: https://bugzilla.mozilla.org/show_bug.cgi?id=1819147 await this._browser.session.send('Browser.clearCache'); diff --git a/packages/playwright-core/src/server/webkit/webview/wvBrowser.ts b/packages/playwright-core/src/server/webkit/webview/wvBrowser.ts index 00907301fae8d..bfc8160b2ef5f 100644 --- a/packages/playwright-core/src/server/webkit/webview/wvBrowser.ts +++ b/packages/playwright-core/src/server/webkit/webview/wvBrowser.ts @@ -409,7 +409,6 @@ export class WVBrowserContext extends BrowserContext { await (page.delegate as WVPage).exposePlaywrightBinding(); } - override async onClosePersistent() {} override async doUpdateDefaultViewport() {} override async doUpdateDefaultEmulatedMedia() {} override async clearCache(): Promise { throw new Error('Method not implemented.'); } diff --git a/packages/playwright-core/src/server/webkit/wkBrowser.ts b/packages/playwright-core/src/server/webkit/wkBrowser.ts index 12fbb53f99c12..d315e806c9abd 100644 --- a/packages/playwright-core/src/server/webkit/wkBrowser.ts +++ b/packages/playwright-core/src/server/webkit/wkBrowser.ts @@ -358,8 +358,6 @@ export class WKBrowserContext extends BrowserContext { await (page.delegate as WKPage).exposePlaywrightBinding(); } - onClosePersistent() {} - override async clearCache(): Promise { // We use ephemeral contexts so there is no disk cache. await this._browser._browserSession.send('Playwright.clearMemoryCache', { diff --git a/utils/build/build.js b/utils/build/build.js index 38825020fb0b6..b1599d2562942 100644 --- a/utils/build/build.js +++ b/utils/build/build.js @@ -192,7 +192,8 @@ async function runWatch() { for (const { files, from, to, ignored } of copyFiles) { const watcher = chokidar.watch([filePath(files)], { ignored }); watcher.on('all', (event, file) => { - copyFile(file, from, to); + if (event === 'add' || event === 'change') + copyFile(file, from, to); }); }