chore: use utils via index export (4) (#13404)

Author: pavelfeldman

packages/playwright-core/index.js

@@ -14,5 +14,20 @@
  * limitations under the License.
  */
 
-require('./lib/utils/verifyNodeJsVersion');
+const currentNodeVersion = process.versions.node;
+const semver = currentNodeVersion.split('.');
+const [major] = [+semver[0]];
+
+if (major < 12) {
+  // eslint-disable-next-line no-console
+  console.error(
+      'You are running Node.js ' +
+      currentNodeVersion +
+      '.\n' +
+      'Playwright requires Node.js 12 or higher. \n' +
+      'Please update your version of Node.js.'
+  );
+  process.exit(1);
+}
+
 module.exports = require('./lib/inprocess');

packages/playwright-core/src/cli/DEPS.list

@@ -1,6 +1,7 @@
 [*]
 ../../
 ../client
+../common
 ../debug/injected
 ../generated/
 ../grid

packages/playwright-core/src/cli/cli.ts

@@ -32,7 +32,8 @@ import type { Page } from '../client/page';
 import type { BrowserType } from '../client/browserType';
 import type { BrowserContextOptions, LaunchOptions } from '../client/types';
 import { spawn } from 'child_process';
-import { spawnAsync, getPlaywrightVersion, wrapInASCIIBox } from '../utils';
+import { getPlaywrightVersion } from '../common/userAgent';
+import { spawnAsync, wrapInASCIIBox } from '../utils';
 import { launchGridAgent } from '../grid/gridAgent';
 import type { GridFactory } from '../grid/gridServer';
 import { GridServer } from '../grid/gridServer';

packages/playwright-core/src/client/DEPS.list

@@ -1,3 +1,4 @@
 [*]
+../common/
 ../protocol/
 ../utils/

packages/playwright-core/src/client/android.ts

@@ -23,7 +23,7 @@ import { ChannelOwner } from './channelOwner';
 import type * as api from '../../types/types';
 import type * as types from './types';
 import type { Page } from './page';
-import { TimeoutSettings } from '../utils/timeoutSettings';
+import { TimeoutSettings } from '../common/timeoutSettings';
 import { Waiter } from './waiter';
 import { EventEmitter } from 'events';
 

packages/playwright-core/src/client/api.ts

@@ -29,7 +29,7 @@ export { Locator, FrameLocator } from './locator';
 export { ElementHandle } from './elementHandle';
 export { FileChooser } from './fileChooser';
 export type { Logger } from './types';
-export { TimeoutError } from '../utils/errors';
+export { TimeoutError } from '../common/errors';
 export { Frame } from './frame';
 export { Keyboard, Mouse, Touchscreen } from './input';
 export { JSHandle } from './jsHandle';

packages/playwright-core/src/client/browser.ts

@@ -20,7 +20,7 @@ import type { Page } from './page';
 import { ChannelOwner } from './channelOwner';
 import { Events } from './events';
 import type { BrowserContextOptions } from './types';
-import { isSafeCloseError, kBrowserClosedError } from '../utils/errors';
+import { isSafeCloseError, kBrowserClosedError } from '../common/errors';
 import type * as api from '../../types/types';
 import { CDPSession } from './cdpSession';
 import type { BrowserType } from './browserType';

packages/playwright-core/src/client/browserContext.ts

@@ -25,11 +25,11 @@ import { evaluationScript } from './clientHelper';
 import { Browser } from './browser';
 import { Worker } from './worker';
 import { Events } from './events';
-import { TimeoutSettings } from '../utils/timeoutSettings';
+import { TimeoutSettings } from '../common/timeoutSettings';
 import { Waiter } from './waiter';
 import type { URLMatch, Headers, WaitForEventOptions, BrowserContextOptions, StorageState, LaunchOptions } from './types';
 import { headersObjectToArray, mkdirIfNeeded } from '../utils';
-import { isSafeCloseError } from '../utils/errors';
+import { isSafeCloseError } from '../common/errors';
 import type * as api from '../../types/types';
 import type * as structs from '../../types/structs';
 import { CDPSession } from './cdpSession';

packages/playwright-core/src/client/browserType.ts

@@ -25,7 +25,7 @@ import type { ChildProcess } from 'child_process';
 import { envObjectToArray } from './clientHelper';
 import { assert, headersObjectToArray, monotonicTime } from '../utils';
 import type * as api from '../../types/types';
-import { kBrowserClosedError } from '../utils/errors';
+import { kBrowserClosedError } from '../common/errors';
 import { raceAgainstTimeout } from '../utils';
 import type { Playwright } from './playwright';
 

packages/playwright-core/src/client/channelOwner.ts

@@ -18,11 +18,10 @@ import { EventEmitter } from 'events';
 import type * as channels from '../protocol/channels';
 import type { Validator } from '../protocol/validator';
 import { createScheme, ValidationError } from '../protocol/validator';
-import { debugLogger } from '../utils/debugLogger';
+import { debugLogger } from '../common/debugLogger';
 import type { ParsedStackTrace } from '../utils/stackTrace';
 import { captureRawStack, captureStackTrace } from '../utils/stackTrace';
-import { isUnderTest } from '../utils';
-import { zones } from '../utils/zones';
+import { isUnderTest, zones } from '../utils';
 import type { ClientInstrumentation } from './clientInstrumentation';
 import type { Connection } from './connection';
 import type { Logger } from './types';