Refactoring checking playwright packages (#151)

* Update dependencies

* Rewrite checking playwright packages

* cleanup: getPlaywrightInstance

* fix: it

* Revert "cleanup: getPlaywrightInstance"

This reverts commit 18d7ee0.

* fix: tests

* Update ts-jest

* Update ts-jest

Co-authored-by: Max Schmitt <max@schmitt.mx>

Author: mmarkelov

package-lock.json

@@ -61,7 +61,7 @@
     "@typescript-eslint/eslint-plugin": "3.3.0",
     "@typescript-eslint/parser": "3.3.0",
     "coveralls": "3.1.0",
-    "eslint": "7.2.0",
+    "eslint": "7.3.0",
     "eslint-config-airbnb-base": "14.2.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-import": "2.21.2",
@@ -73,8 +73,8 @@
     "playwright-chromium": ">=1.1.1",
     "playwright-core": "npm:playwright-chromium@>=1.1.1",
     "prettier": "2.0.5",
-    "snyk": "^1.343.0",
-    "ts-jest": "26.1.0",
+    "snyk": "^1.346.0",
+    "ts-jest": "26.1.1",
     "typescript": "3.9.5"
   }
 }

package.json

@@ -13,7 +13,6 @@ import {
   getDeviceType,
   getPlaywrightInstance,
   readConfig,
-  readPackage,
 } from './utils'
 import { savePageCoverage } from './coverage'
 
@@ -68,8 +67,14 @@ export const getPlaywrightEnv = (basicEnv = 'node') => {
       const browserType = getBrowserType(browserName)
       const { exitOnPageError, selectors } = config
       let { contextOptions } = config
-      const playwrightPackage = await readPackage()
-      if (playwrightPackage === IMPORT_KIND_PLAYWRIGHT) {
+      const device = getDeviceType(this._config.device)
+      const {
+        name,
+        instance: playwrightInstance,
+        devices,
+      } = getPlaywrightInstance(browserType)
+
+      if (name === IMPORT_KIND_PLAYWRIGHT) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const playwright = require('playwright')
         if (selectors) {
@@ -80,11 +85,6 @@ export const getPlaywrightEnv = (basicEnv = 'node') => {
           )
         }
       }
-      const device = getDeviceType(this._config.device)
-      const { instance: playwrightInstance, devices } = getPlaywrightInstance(
-        playwrightPackage,
-        browserType,
-      )
 
       if (device) {
         const { viewport, userAgent } = devices[device]

src/PlaywrightEnvironment.ts

@@ -21,7 +21,6 @@ import {
   getDisplayName,
   readConfig,
   getPlaywrightInstance,
-  readPackage,
 } from './utils'
 import { DEFAULT_TEST_PLAYWRIGHT_TIMEOUT } from './constants'
 import { BrowserServer } from 'playwright-core'
@@ -72,13 +71,11 @@ class PlaywrightRunner extends JestRunner {
 
   async getTests(tests: Test[], config: JestPlaywrightConfig): Promise<Test[]> {
     const { browsers, devices, launchOptions } = config
-    const playwrightPackage = await readPackage()
     const pwTests: Test[] = []
     for (const test of tests) {
       for (const browser of browsers) {
         checkBrowserEnv(browser)
         const { devices: availableDevices, instance } = getPlaywrightInstance(
-          playwrightPackage,
           browser,
         )
         if (!this.browser2Server[browser]) {

src/PlaywrightRunner.ts

@@ -28,13 +28,14 @@ export type SelectorType = {
   name: string
 }
 
+export type PlaywrightRequireType = BrowserType | typeof IMPORT_KIND_PLAYWRIGHT
+
 export interface Playwright {
+  name: PlaywrightRequireType
   instance: GenericBrowser
   devices: typeof devices
 }
 
-export type PlaywrightRequireType = BrowserType | typeof IMPORT_KIND_PLAYWRIGHT
-
 export interface JestPlaywrightConfig {
   launchOptions?: LaunchOptions
   connectOptions?: Parameters<GenericBrowser['connect']>[0]