fix: update dependencies (#662)

puppeteer · Sep 19, 2023 · e29ffc7 · e29ffc7
1 parent 83d2f4b
commit e29ffc7
Show file tree

Hide file tree

Showing 9 changed files with 377 additions and 747 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,41 +52,41 @@
   "license": "Apache-2.0",
   "type": "module",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "25.0.3",
-    "@rollup/plugin-node-resolve": "15.1.0",
-    "@rollup/plugin-typescript": "11.1.2",
-    "@types/chai": "4.3.3",
+    "@rollup/plugin-commonjs": "25.0.4",
+    "@rollup/plugin-node-resolve": "15.2.1",
+    "@rollup/plugin-typescript": "11.1.3",
+    "@types/chai": "4.3.6",
     "@types/cssesc": "^3.0.0",
     "@types/mime": "3.0.1",
     "@types/mocha": "10.0.1",
-    "@types/node": "20.4.6",
+    "@types/node": "20.6.2",
     "@types/ws": "8.5.5",
     "@types/yargs": "17.0.24",
-    "@typescript-eslint/eslint-plugin": "6.2.1",
-    "@typescript-eslint/parser": "6.2.1",
+    "@typescript-eslint/eslint-plugin": "6.7.2",
+    "@typescript-eslint/parser": "6.7.2",
     "c8": "8.0.1",
-    "chai": "4.3.7",
+    "chai": "4.3.8",
     "cross-env": "7.0.3",
-    "eslint": "8.46.0",
+    "eslint": "8.49.0",
     "eslint-config-google": "0.14.0",
-    "eslint-config-prettier": "8.10.0",
+    "eslint-config-prettier": "9.0.0",
     "eslint-plugin-prettier": "5.0.0",
     "eslint-plugin-tsdoc": "0.2.17",
-    "lighthouse": "^10.0.1",
+    "lighthouse": "^11.1.0",
     "mime": "3.0.0",
     "mocha": "10.2.0",
-    "prettier": "3.0.1",
-    "puppeteer": "21.2.1",
-    "puppeteer-core": "21.1.1",
+    "prettier": "3.0.3",
+    "puppeteer": "21.3.0",
+    "puppeteer-core": "21.3.0",
     "rimraf": "5.0.1",
-    "rollup": "3.27.1",
-    "rollup-plugin-dts": "5.3.1",
+    "rollup": "3.29.2",
+    "rollup-plugin-dts": "6.0.2",
     "snap-shot-it": "7.9.10",
     "ts-node": "10.9.1",
-    "tslib": "2.6.1",
-    "typedoc": "0.24.8",
-    "typedoc-plugin-markdown": "3.15.4",
-    "typescript": "5.1.6"
+    "tslib": "2.6.2",
+    "typedoc": "0.25.1",
+    "typedoc-plugin-markdown": "3.16.0",
+    "typescript": "5.2.2"
   },
   "peerDependencies": {
     "lighthouse": ">=10.0.0",

diff --git a/rollup.config.cjs b/rollup.config.cjs
@@ -19,7 +19,7 @@ module.exports = [
       },
     ],
     external: Object.keys(pkg.peerDependencies),
-    plugins: [typescript({ module: 'NodeNext' })],
+    plugins: [typescript({ module: 'NodeNext', moduleResolution: 'NodeNext' })],
   },
   {
     input: 'src/main.ts',

diff --git a/src/PuppeteerRunnerExtension.ts b/src/PuppeteerRunnerExtension.ts
@@ -13,15 +13,9 @@
     See the License for the specific language governing permissions and
     limitations under the License.
  */
-import type {
-  Browser,
-  ElementHandle,
-  Frame,
-  LocatorEmittedEvents,
-  Page,
-} from 'puppeteer';
-import { Frame as InternalFrame } from 'puppeteer-core/internal/common/Frame.js';
-import { CDPPage as InternalPage } from 'puppeteer-core/internal/common/Page.js';
+import type { Browser, ElementHandle, Frame, Page } from 'puppeteer';
+import { CdpFrame as InternalFrame } from 'puppeteer-core/internal/cdp/Frame.js';
+import { CdpPage as InternalPage } from 'puppeteer-core/internal/cdp/Page.js';
 import { RunnerExtension } from './RunnerExtension.js';
 import {
   AssertedEventType,
@@ -33,8 +27,8 @@ import {
 } from './Schema.js';
 import {
   assertAllStepTypesAreHandled,
-  selectorToPElementSelector,
   mouseButtonMap,
+  selectorToPElementSelector,
 } from './SchemaUtils.js';
 
 const comparators = {
@@ -130,9 +124,7 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
           })
         )
           .setTimeout(timeout)
-          .on('action' as LocatorEmittedEvents.Action, () =>
-            startWaitingForEvents()
-          )
+          .on('action', () => startWaitingForEvents())
           .click({
             count: 2,
             button: step.button && mouseButtonMap.get(step.button),
@@ -152,9 +144,7 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
           })
         )
           .setTimeout(timeout)
-          .on('action' as LocatorEmittedEvents.Action, () =>
-            startWaitingForEvents()
-          )
+          .on('action', () => startWaitingForEvents())
           .click({
             delay: step.duration,
             button: step.button && mouseButtonMap.get(step.button),
@@ -173,9 +163,7 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
           })
         )
           .setTimeout(timeout)
-          .on('action' as LocatorEmittedEvents.Action, () =>
-            startWaitingForEvents()
-          )
+          .on('action', () => startWaitingForEvents())
           .hover();
         break;
       case StepType.EmulateNetworkConditions:
@@ -214,9 +202,7 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
             );
           })
         )
-          .on('action' as LocatorEmittedEvents.Action, () =>
-            startWaitingForEvents()
-          )
+          .on('action', () => startWaitingForEvents())
           .setTimeout(timeout)
           .fill(step.value);
         break;
@@ -236,9 +222,7 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
               );
             })
           )
-            .on('action' as LocatorEmittedEvents.Action, () =>
-              startWaitingForEvents()
-            )
+            .on('action', () => startWaitingForEvents())
             .setTimeout(timeout)
             .scroll({
               scrollLeft: step.x || 0,

diff --git a/test/SchemaUtils.test.ts b/test/SchemaUtils.test.ts
@@ -14,15 +14,15 @@
     limitations under the License.
  */
 
+import { assert } from 'chai';
+import puppeteer, { Browser, Page } from 'puppeteer';
+import snapshot from 'snap-shot-it';
+import { AssertedEventType, SelectorType, StepType } from '../src/Schema.js';
 import {
-  parse,
   getSelectorType,
+  parse,
   selectorToPElementSelector,
 } from '../src/SchemaUtils.js';
-import { AssertedEventType, SelectorType, StepType } from '../src/Schema.js';
-import { assert } from 'chai';
-import snapshot from 'snap-shot-it';
-import puppeteer from 'puppeteer';
 
 describe('SchemaUtils', () => {
   describe('Schema parser', () => {
@@ -816,8 +816,8 @@ describe('SchemaUtils', () => {
     });
 
     describe('selectorToPElementSelector', () => {
-      let browser: puppeteer.Browser;
-      let page: puppeteer.Page;
+      let browser: Browser;
+      let page: Page;
 
       before(async () => {
         browser = await puppeteer.launch({

diff --git a/test/runner.test.ts b/test/runner.test.ts
@@ -14,7 +14,7 @@
     limitations under the License.
  */
 
-import puppeteer from 'puppeteer';
+import puppeteer, { Browser, Page } from 'puppeteer';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { assert } from 'chai';
@@ -42,8 +42,8 @@ async function createServers() {
 }
 
 describe('Runner', () => {
-  let browser: puppeteer.Browser;
-  let page: puppeteer.Page;
+  let browser: Browser;
+  let page: Page;
   let httpServer: TestServer;
   let httpsServer: TestServer;
 

diff --git a/test/spec.test.ts b/test/spec.test.ts
@@ -16,7 +16,7 @@
 
 import fs from 'fs/promises';
 import path from 'path';
-import puppeteer from 'puppeteer';
+import puppeteer, { Browser, Page } from 'puppeteer';
 
 import { fileURLToPath } from 'url';
 import { assert } from 'chai';
@@ -48,8 +48,8 @@ async function createServers() {
 }
 
 describe('Spec test', () => {
-  let browser: puppeteer.Browser;
-  let page: puppeteer.Page;
+  let browser: Browser;
+  let page: Page;
   let httpServer: TestServer;
   let httpsServer: TestServer;
 

diff --git a/third_party/testserver/tsconfig.json b/third_party/testserver/tsconfig.json
@@ -3,7 +3,8 @@
   "compilerOptions": {
     "allowJs": true,
     "composite": true,
-    "module": "CommonJS",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "outDir": "lib",
     "rootDir": "src"
   },

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -6,8 +6,8 @@
     "declaration": true,
     "declarationMap": true,
     "esModuleInterop": true,
-    "module": "ESNext",
-    "moduleResolution": "NodeNext",
+    "module": "ES2022",
+    "moduleResolution": "Bundler",
     "noFallthroughCasesInSwitch": true,
     "noImplicitAny": true,
     "noImplicitOverride": true,