Crawlee—A web scraping and browser automation library for Node.js to build reliable crawlers. In JavaScript and TypeScript. Extract data for AI, LLMs, RAG, or GPTs. Download HTML, PDF, JPG, PNG, and other files from websites. Works with Puppeteer, Playwright, Cheerio, JSDOM, and raw HTTP. Both headful and headless mode. With proxy rotation.
TypeScript apifyautomationcrawlercrawlingheadlessheadless-chromejavascriptnodejsnpmplaywrightpuppeteerscraperscrapingtypescriptweb-crawlerweb-crawlingweb-scraping
chore: update to eslint v9 (#2830)
Martin Adámek07cd2c43fcbf
diff --git a/.eslintrc.json b/.eslintrc.jsondeleted file mode 100644index 5f5e2ac90..000000000--- a/.eslintrc.json+++ /dev/null@@ -1,82 +0,0 @@-{- "root": true,- "env": {- "browser": true,- "es2020": true,- "node": true- },- "extends": ["@apify/eslint-config-ts", "prettier"],- "parserOptions": {- "project": "./tsconfig.eslint.json",- "ecmaVersion": 2022- },- "ignorePatterns": ["node_modules", "dist", "coverage", "**/*.d.ts"],- "overrides": [- {- "plugins": ["@typescript-eslint"],- "files": ["*.ts"],- "rules": {- "@typescript-eslint/array-type": "error",- "@typescript-eslint/ban-ts-comment": 0,- "@typescript-eslint/ban-types": [- "error",- {- "types": {- "{}": false- },- "extendDefaults": true- }- ],- "@typescript-eslint/consistent-type-imports": [- "error",- {- "disallowTypeAnnotations": false- }- ],- "@typescript-eslint/consistent-type-definitions": [- "error",- "interface"- ],- "@typescript-eslint/member-delimiter-style": [- "error",- {- "multiline": { "delimiter": "semi", "requireLast": true },- "singleline": { "delimiter": "semi", "requireLast": false }- }- ],- "@typescript-eslint/no-empty-interface": "off",- "@typescript-eslint/prefer-destructuring": "off",- "prefer-destructuring": "off",- "no-empty-function": "off",- "@typescript-eslint/no-empty-function": "off",- "@typescript-eslint/no-explicit-any": "off",- "@typescript-eslint/no-floating-promises": "error",- "@typescript-eslint/no-unused-vars": "off",- "@typescript-eslint/comma-dangle": ["error", "always-multiline"]- }- }- ],- "rules": {- "quote-props": ["error", "consistent"],- "import/no-extraneous-dependencies": "off",- "max-classes-per-file": 0,- "no-console": "error",- "no-underscore-dangle": 0,- "no-void": 0,- "max-len": "off",- "import/order": [- "error",- {- "groups": [- "builtin",- "external",- ["parent", "sibling"],- "index",- "object"- ],- "alphabetize": { "order": "asc", "caseInsensitive": true },- "newlines-between": "always"- }- ]- }-}diff --git a/docs/guides/custom-http-client/implementation.ts b/docs/guides/custom-http-client/implementation.tsindex ba86b6eae..bb3976601 100644--- a/docs/guides/custom-http-client/implementation.ts+++ b/docs/guides/custom-http-client/implementation.ts@@ -1,4 +1,4 @@-import {+import type {BaseHttpClient,HttpRequest,HttpResponse,diff --git a/eslint.config.mjs b/eslint.config.mjsnew file mode 100644index 000000000..2092da6a7--- /dev/null+++ b/eslint.config.mjs@@ -0,0 +1,81 @@+import tsEslint from 'typescript-eslint';+import tsStylistic from '@stylistic/eslint-plugin-ts';+import apify from '@apify/eslint-config/ts';+import prettier from 'eslint-config-prettier';++export default [+ {+ ignores: ['**/dist', 'node_modules', 'coverage', 'website/{build,.docusaurus}', '**/*.d.ts'],+ },+ ...apify,+ prettier,+ {+ languageOptions: {+ parser: tsEslint.parser,+ parserOptions: {+ project: 'tsconfig.eslint.json',+ },+ },+ },+ {+ plugins: {+ '@typescript-eslint': tsEslint.plugin,+ '@stylistic': tsStylistic,+ },+ rules: {+ '@typescript-eslint/no-empty-object-type': 'off',+ '@typescript-eslint/no-explicit-any': 'off',+ 'max-classes-per-file': 'off',+ 'no-empty-function': 'off',+ 'import/order': 'off', // TODO+ 'no-use-before-define': 'off', // TODO+ 'no-param-reassign': 'off',+ 'no-void': 'off',+ 'no-underscore-dangle': 'off',+ 'no-console': 'off',+ 'import/no-extraneous-dependencies': 'off',+ 'import/extensions': 'off',+ 'import/no-default-export': 'off',+ '@typescript-eslint/array-type': 'error',+ '@typescript-eslint/ban-ts-comment': 0,+ '@typescript-eslint/consistent-type-imports': [+ 'error',+ {+ 'disallowTypeAnnotations': false,+ },+ ],+ '@typescript-eslint/consistent-type-definitions': ['error', 'interface'],+ '@stylistic/member-delimiter-style': [+ 'error',+ {+ 'multiline': { 'delimiter': 'semi', 'requireLast': true },+ 'singleline': { 'delimiter': 'semi', 'requireLast': false },+ },+ ],+ '@typescript-eslint/no-empty-interface': 'off',+ '@typescript-eslint/promise-function-async': 'off',+ 'no-promise-executor-return': 'off',+ '@typescript-eslint/prefer-destructuring': 'off',+ 'prefer-destructuring': 'off',+ '@typescript-eslint/no-empty-function': 'off',+ '@typescript-eslint/no-floating-promises': 'error',+ '@typescript-eslint/no-unused-vars': 'off',+ '@stylistic/comma-dangle': ['error', 'always-multiline'],+ },+ },+ {+ files: ['packages/templates/**/*'],+ rules: {+ 'no-unused-vars': 'off',+ '@typescript-eslint/no-unused-vars': 'off',+ },+ },+ {+ files: ['website/**/*'],+ rules: {+ '@typescript-eslint/no-shadow': 'off',+ 'no-console': 'off',+ 'no-undef': 'off',+ },+ },+];diff --git a/package.json b/package.jsonindex 7e9aa82e4..f49e103f4 100644--- a/package.json+++ b/package.json@@ -55,7 +55,7 @@"prepare": "husky"},"devDependencies": {- "@apify/eslint-config-ts": "^0.4.1",+ "@apify/eslint-config": "^1.0.0","@apify/log": "^2.4.0","@apify/tsconfig": "^0.1.0","@biomejs/biome": "^1.7.3",@@ -63,6 +63,7 @@"@playwright/browser-chromium": "1.51.1","@playwright/browser-firefox": "1.51.1","@playwright/browser-webkit": "1.51.1",+ "@stylistic/eslint-plugin-ts": "^4.2.0","@types/content-type": "^1.1.5","@types/deep-equal": "^1.0.1","@types/domhandler": "^2.4.2",@@ -81,8 +82,6 @@"@types/semver": "^7.3.12","@types/stream-json": "^1.7.2","@types/yargs": "^17.0.26",- "@typescript-eslint/eslint-plugin": "^7.18.0",- "@typescript-eslint/parser": "^7.18.0","@vitest/coverage-v8": "^2.0.0","apify": "*","apify-node-curl-impersonate": "^1.0.15",@@ -92,11 +91,12 @@"commitlint": "^19.0.0","cross-env": "^7.0.3","deep-equal": "^2.0.5",- "eslint": "^8.57.1",- "eslint-config-prettier": "^10.0.0",+ "eslint": "^9.23.0",+ "eslint-config-prettier": "^10.1.1","express": "^4.18.1","fs-extra": "^11.0.0","gen-esm-wrapper": "^1.1.3",+ "globals": "^16.0.0","globby": "^14.0.0","got": "^13.0.0","husky": "^9.0.11",@@ -111,7 +111,8 @@"rimraf": "^6.0.0","tsx": "^4.4.0","turbo": "^2.1.0",- "typescript": "^5.7.2",+ "typescript": "^5.7.3",+ "typescript-eslint": "^8.28.0","vite-tsconfig-paths": "^4.3.2","vitest": "^2.0.0"},diff --git a/packages/basic-crawler/src/internals/basic-crawler.ts b/packages/basic-crawler/src/internals/basic-crawler.tsindex 46a3e4708..15f68dafd 100644--- a/packages/basic-crawler/src/internals/basic-crawler.ts+++ b/packages/basic-crawler/src/internals/basic-crawler.ts@@ -1,33 +1,29 @@import { dirname } from 'node:path';-import type { Log } from '@apify/log';-import defaultLog, { LogLevel } from '@apify/log';-import { addTimeoutToPromise, TimeoutError, tryCancel } from '@apify/timeout';-import { cryptoRandomObjectId } from '@apify/utilities';import type {AddRequestsBatchedOptions,AddRequestsBatchedResult,AutoscaledPoolOptions,+ BaseHttpClient,CrawlingContext,+ DatasetExportOptions,EnqueueLinksOptions,EventManager,- DatasetExportOptions,FinalStatistics,GetUserDataFromRequest,IRequestList,+ LoadedContext,ProxyInfo,Request,RequestOptions,+ RestrictedCrawlingContext,RouterHandler,RouterRoutes,Session,SessionPoolOptions,Source,- StatisticState,StatisticsOptions,- LoadedContext,- BaseHttpClient,- RestrictedCrawlingContext,+ StatisticState,} from '@crawlee/core';import {AutoscaledPool,@@ -37,13 +33,14 @@ import {enqueueLinks,EnqueueStrategy,EventType,+ GotScrapingHttpClient,KeyValueStore,mergeCookies,NonRetryableError,purgeDefaultStorages,RequestProvider,- RequestQueueV1,RequestQueue,+ RequestQueueV1,RequestState,RetryRequestError,Router,@@ -51,18 +48,22 @@ import {SessionPool,Statistics,validators,- GotScrapingHttpClient,} from '@crawlee/core';import type { Awaitable, BatchAddRequestsResult, Dictionary, SetStatusMessageOptions } from '@crawlee/types';import { ROTATE_PROXY_ERRORS } from '@crawlee/utils';import { stringify } from 'csv-stringify/sync';import { ensureDir, writeFile, writeJSON } from 'fs-extra';// @ts-expect-error This throws a compilation error due to got-scraping being ESM only but we only import types, so its alllll gooooood-import type { OptionsInit, Method, GotResponse } from 'got-scraping';+import type { GotResponse, Method, OptionsInit } from 'got-scraping';import ow, { ArgumentError } from 'ow';import { getDomain } from 'tldts';import type { SetRequired } from 'type-fest';+import type { Log } from '@apify/log';+import defaultLog, { LogLevel } from '@apify/log';+import { addTimeoutToPromise, TimeoutError, tryCancel } from '@apify/timeout';+import { cryptoRandomObjectId } from '@apify/utilities';+import { createSendRequest } from './send-request';export interface BasicCrawlingContext<UserData extends Dictionary = Dictionary>@@ -844,12 +845,13 @@ export class BasicCrawler<Context extends CrawlingContext = BasicCrawlingContext}if (this.statusMessageCallback) {- return this.statusMessageCallback({+ await this.statusMessageCallback({crawler: this as any,state: this.stats.state,previousState,message,});+ return;}await this.setStatusMessage(message);@@ -1401,7 +1403,8 @@ export class BasicCrawler<Context extends CrawlingContext = BasicCrawlingContextif (retried <= maxRetries) {// we retry on any error, not just timeoutthis.log.warning(`${(e as Error).message} (retrying ${retried}/${maxRetries})`);- return this._timeoutAndRetry(handler, timeout, error, maxRetries, retried + 1);+ void this._timeoutAndRetry(handler, timeout, error, maxRetries, retried + 1);+ return;}throw e;diff --git a/packages/basic-crawler/src/internals/send-request.ts b/packages/basic-crawler/src/internals/send-request.tsindex a841efcae..2e678e0e7 100644--- a/packages/basic-crawler/src/internals/send-request.ts+++ b/packages/basic-crawler/src/internals/send-request.ts@@ -1,12 +1,12 @@import {- type Session,- type Request,type BaseHttpClient,type HttpRequestOptions,processHttpRequestOptions,+ type Request,+ type Session,} from '@crawlee/core';// @ts-expect-error This throws a compilation error due to got-scraping being ESM only but we only import types, so its alllll gooooood-import type { Method, GotResponse } from 'got-scraping';+import type { GotResponse, Method } from 'got-scraping';/*** Prepares a function to be used as the `sendRequest` context helper.diff --git a/packages/browser-crawler/src/internals/browser-crawler.ts b/packages/browser-crawler/src/internals/browser-crawler.tsindex 3b162ed99..f15c70478 100644--- a/packages/browser-crawler/src/internals/browser-crawler.ts+++ b/packages/browser-crawler/src/internals/browser-crawler.ts@@ -1,4 +1,3 @@-import { addTimeoutToPromise, tryCancel } from '@apify/timeout';import type {Awaitable,BasicCrawlerOptions,@@ -16,17 +15,17 @@ import type {import {BASIC_CRAWLER_TIMEOUT_BUFFER_SECS,BasicCrawler,+ BLOCKED_STATUS_CODES as DEFAULT_BLOCKED_STATUS_CODES,Configuration,cookieStringToToughCookie,enqueueLinks,EVENT_SESSION_RETIRED,handleRequestTimeout,- tryAbsoluteURL,RequestState,resolveBaseUrlForEnqueueLinksFiltering,- validators,SessionError,- BLOCKED_STATUS_CODES as DEFAULT_BLOCKED_STATUS_CODES,+ tryAbsoluteURL,+ validators,} from '@crawlee/basic';import type {BrowserController,@@ -43,6 +42,8 @@ import { CLOUDFLARE_RETRY_CSS_SELECTORS, RETRY_CSS_SELECTORS, sleep } from '@craimport ow from 'ow';import type { ReadonlyDeep } from 'type-fest';+import { addTimeoutToPromise, tryCancel } from '@apify/timeout';+import type { BrowserLaunchContext } from './browser-launcher';export interface BrowserCrawlingContext<@@ -828,7 +829,7 @@ export async function browserCrawlerEnqueueLinks({* @ignore*/export async function extractUrlsFromPage(- // eslint-disable-next-line @typescript-eslint/ban-types+ // eslint-disable-next-line @typescript-eslint/no-unsafe-function-typepage: { $$eval: Function },selector: string,baseUrl: string,diff --git a/packages/browser-crawler/src/internals/browser-launcher.ts b/packages/browser-crawler/src/internals/browser-launcher.tsindex 0fd487fa9..1b68b1bb3 100644--- a/packages/browser-crawler/src/internals/browser-launcher.ts+++ b/packages/browser-crawler/src/internals/browser-launcher.ts@@ -3,7 +3,7 @@ import os from 'node:os';import { Configuration } from '@crawlee/basic';import type { BrowserPlugin, BrowserPluginOptions } from '@crawlee/browser-pool';-import type { Dictionary, Constructor } from '@crawlee/utils';+import type { Constructor, Dictionary } from '@crawlee/utils';import ow from 'ow';const DEFAULT_VIEWPORT = {diff --git a/packages/browser-crawler/test/migration.test.ts b/packages/browser-crawler/test/migration.test.tsindex 17ca066cd..af683550b 100644--- a/packages/browser-crawler/test/migration.test.ts+++ b/packages/browser-crawler/test/migration.test.ts@@ -1,8 +1,9 @@-import type { Log } from '@apify/log';-import log from '@apify/log';import { PuppeteerPlugin } from '@crawlee/browser-pool';import puppeteer from 'puppeteer';+import type { Log } from '@apify/log';+import log from '@apify/log';+import { MemoryStorageEmulator } from '../../../test/shared/MemoryStorageEmulator';import { BrowserCrawler, RequestList } from '../src/index';diff --git a/packages/browser-pool/src/abstract-classes/browser-controller.ts b/packages/browser-pool/src/abstract-classes/browser-controller.tsindex b3f136c01..7a4e796f3 100644--- a/packages/browser-pool/src/abstract-classes/browser-controller.ts+++ b/packages/browser-pool/src/abstract-classes/browser-controller.ts@@ -1,13 +1,14 @@-import { tryCancel } from '@apify/timeout';import type { Cookie, Dictionary } from '@crawlee/types';import { nanoid } from 'nanoid';import { TypedEmitter } from 'tiny-typed-emitter';-import type { BrowserPlugin, CommonBrowser, CommonLibrary } from './browser-plugin';+import { tryCancel } from '@apify/timeout';+import { BROWSER_CONTROLLER_EVENTS } from '../events';import type { LaunchContext } from '../launch-context';import { log } from '../logger';import type { UnwrapPromise } from '../utils';+import type { BrowserPlugin, CommonBrowser, CommonLibrary } from './browser-plugin';const PROCESS_KILL_TIMEOUT_MILLIS = 5000;diff --git a/packages/browser-pool/src/abstract-classes/browser-plugin.ts b/packages/browser-pool/src/abstract-classes/browser-plugin.tsindex 567db3245..7b95dd755 100644--- a/packages/browser-pool/src/abstract-classes/browser-plugin.ts+++ b/packages/browser-pool/src/abstract-classes/browser-plugin.ts@@ -2,10 +2,10 @@ import { CriticalError } from '@crawlee/core';import type { Dictionary } from '@crawlee/types';import merge from 'lodash.merge';-import type { BrowserController } from './browser-controller';import type { LaunchContextOptions } from '../launch-context';import { LaunchContext } from '../launch-context';import type { UnwrapPromise } from '../utils';+import type { BrowserController } from './browser-controller';/*** The default User Agent used by `PlaywrightCrawler`, `launchPlaywright`, 'PuppeteerCrawler' and 'launchPuppeteer'diff --git a/packages/browser-pool/src/browser-pool.ts b/packages/browser-pool/src/browser-pool.tsindex 142a25897..2f539625a 100644--- a/packages/browser-pool/src/browser-pool.ts+++ b/packages/browser-pool/src/browser-pool.ts@@ -1,4 +1,3 @@-import { addTimeoutToPromise, tryCancel } from '@apify/timeout';import type { TieredProxy } from '@crawlee/core';import type { BrowserFingerprintWithHeaders } from 'fingerprint-generator';import { FingerprintGenerator } from 'fingerprint-generator';@@ -9,13 +8,15 @@ import pLimit from 'p-limit';import QuickLRU from 'quick-lru';import { TypedEmitter } from 'tiny-typed-emitter';+import { addTimeoutToPromise, tryCancel } from '@apify/timeout';+import type { BrowserController } from './abstract-classes/browser-controller';import type { BrowserPlugin } from './abstract-classes/browser-plugin';import { BROWSER_POOL_EVENTS } from './events';import {createFingerprintPreLaunchHook,- createPrePageCreateHook,createPostPageCreateHook,+ createPrePageCreateHook,} from './fingerprinting/hooks';import type { FingerprintGeneratorOptions } from './fingerprinting/types';import type { LaunchContext } from './launch-context';diff --git a/packages/browser-pool/src/container-proxy-server.ts b/packages/browser-pool/src/container-proxy-server.tsindex 3acc8841e..fffc460e2 100644--- a/packages/browser-pool/src/container-proxy-server.ts+++ b/packages/browser-pool/src/container-proxy-server.ts@@ -26,7 +26,6 @@ export async function createProxyServerForContainers(fallbackProxyUrl?: string)};}- // eslint-disable-next-line no-consoleconsole.warn(`Request without proxy ${localAddress} ${request.headers.host}`);}diff --git a/packages/browser-pool/src/fingerprinting/hooks.ts b/packages/browser-pool/src/fingerprinting/hooks.tsindex 898f68aa1..3a8e83724 100644--- a/packages/browser-pool/src/fingerprinting/hooks.ts+++ b/packages/browser-pool/src/fingerprinting/hooks.ts@@ -1,12 +1,12 @@import type { BrowserFingerprintWithHeaders } from 'fingerprint-generator';import type { FingerprintInjector } from 'fingerprint-injector';-import { getGeneratorDefaultOptions } from './utils';import type { BrowserController } from '../abstract-classes/browser-controller';import type { BrowserPool } from '../browser-pool';import type { LaunchContext } from '../launch-context';import { PlaywrightPlugin } from '../playwright/playwright-plugin';import { PuppeteerPlugin } from '../puppeteer/puppeteer-plugin';+import { getGeneratorDefaultOptions } from './utils';/*** @internaldiff --git a/packages/browser-pool/src/fingerprinting/utils.ts b/packages/browser-pool/src/fingerprinting/utils.tsindex a0cadb1f3..5efd4b7de 100644--- a/packages/browser-pool/src/fingerprinting/utils.ts+++ b/packages/browser-pool/src/fingerprinting/utils.ts@@ -1,9 +1,9 @@-import type { FingerprintGeneratorOptions } from './types';-import { BrowserName, DeviceCategory, OperatingSystemsName } from './types';import type { BrowserPlugin } from '../abstract-classes/browser-plugin';import type { LaunchContext } from '../launch-context';import { PlaywrightPlugin } from '../playwright/playwright-plugin';import { PuppeteerPlugin } from '../puppeteer/puppeteer-plugin';+import type { FingerprintGeneratorOptions } from './types';+import { BrowserName, DeviceCategory, OperatingSystemsName } from './types';export const getGeneratorDefaultOptions = (launchContext: LaunchContext): FingerprintGeneratorOptions => {const { browserPlugin, launchOptions } = launchContext;diff --git a/packages/browser-pool/src/playwright/load-firefox-addon.ts b/packages/browser-pool/src/playwright/load-firefox-addon.tsindex 5855519c5..a11960248 100644--- a/packages/browser-pool/src/playwright/load-firefox-addon.ts+++ b/packages/browser-pool/src/playwright/load-firefox-addon.ts@@ -1,5 +1,5 @@-import { Buffer } from 'buffer';-import net from 'net';+import { Buffer } from 'node:buffer';+import net from 'node:net';export const loadFirefoxAddon = async (port: number, host: string, addonPath: string) => {return new Promise<boolean>((resolve) => {@@ -51,7 +51,6 @@ export const loadFirefoxAddon = async (port: number, host: string, addonPath: stlet remainingBytes = 0;socket.on('data', (data) => {- // eslint-disable-next-line no-constant-conditionwhile (true) {if (remainingBytes === 0) {const index = data.indexOf(':');diff --git a/packages/browser-pool/src/playwright/playwright-controller.ts b/packages/browser-pool/src/playwright/playwright-controller.tsindex 88e4c745a..283968a7e 100644--- a/packages/browser-pool/src/playwright/playwright-controller.ts+++ b/packages/browser-pool/src/playwright/playwright-controller.ts@@ -1,11 +1,12 @@-import { tryCancel } from '@apify/timeout';import type { Cookie } from '@crawlee/types';import type { Browser, BrowserType, Page } from 'playwright';-import type { PlaywrightPlugin } from './playwright-plugin';+import { tryCancel } from '@apify/timeout';+import { BrowserController } from '../abstract-classes/browser-controller';import { anonymizeProxySugar } from '../anonymize-proxy';import type { SafeParameters } from '../utils';+import type { PlaywrightPlugin } from './playwright-plugin';const tabIds = new WeakMap<Page, number>();const keyFromTabId = (tabId: string | number) => `.${tabId}.`;@@ -107,7 +108,6 @@ export class PlaywrightController extends BrowserController<const { remoteIPAddress } = response;if (remoteIPAddress && remoteIPAddress !== proxyip) {- // eslint-disable-next-line no-consoleconsole.warn(`Request to ${response.url} was through ${remoteIPAddress} instead of ${proxyip}`,);diff --git a/packages/browser-pool/src/playwright/playwright-plugin.ts b/packages/browser-pool/src/playwright/playwright-plugin.tsindex 7b4167da3..5e59d4656 100644--- a/packages/browser-pool/src/playwright/playwright-plugin.ts+++ b/packages/browser-pool/src/playwright/playwright-plugin.ts@@ -1,13 +1,10 @@-import fs from 'fs';-import net from 'net';-import os from 'os';-import path from 'path';+import fs from 'node:fs';+import net from 'node:net';+import os from 'node:os';+import path from 'node:path';import type { Browser as PlaywrightBrowser, BrowserType } from 'playwright';-import { loadFirefoxAddon } from './load-firefox-addon';-import { PlaywrightBrowser as PlaywrightBrowserWithPersistentContext } from './playwright-browser';-import { PlaywrightController } from './playwright-controller';import type { BrowserController } from '../abstract-classes/browser-controller';import { BrowserPlugin } from '../abstract-classes/browser-plugin';import { anonymizeProxySugar } from '../anonymize-proxy';@@ -16,6 +13,9 @@ import type { LaunchContext } from '../launch-context';import { log } from '../logger';import { getLocalProxyAddress } from '../proxy-server';import type { SafeParameters } from '../utils';+import { loadFirefoxAddon } from './load-firefox-addon';+import { PlaywrightBrowser as PlaywrightBrowserWithPersistentContext } from './playwright-browser';+import { PlaywrightController } from './playwright-controller';const getFreePort = async () => {return new Promise<number>((resolve, reject) => {diff --git a/packages/browser-pool/src/puppeteer/puppeteer-controller.ts b/packages/browser-pool/src/puppeteer/puppeteer-controller.tsindex 031e4ed58..d51a8ef1d 100644--- a/packages/browser-pool/src/puppeteer/puppeteer-controller.ts+++ b/packages/browser-pool/src/puppeteer/puppeteer-controller.ts@@ -1,8 +1,9 @@-import { tryCancel } from '@apify/timeout';import type { Cookie } from '@crawlee/types';import type Puppeteer from 'puppeteer';import type * as PuppeteerTypes from 'puppeteer';+import { tryCancel } from '@apify/timeout';+import { BrowserController } from '../abstract-classes/browser-controller';import { anonymizeProxySugar } from '../anonymize-proxy';import { log } from '../logger';diff --git a/packages/browser-pool/src/puppeteer/puppeteer-plugin.ts b/packages/browser-pool/src/puppeteer/puppeteer-plugin.tsindex 4b309f7ed..f273916c8 100644--- a/packages/browser-pool/src/puppeteer/puppeteer-plugin.ts+++ b/packages/browser-pool/src/puppeteer/puppeteer-plugin.ts@@ -1,17 +1,17 @@-import { readFile } from 'fs/promises';+import { readFile } from 'node:fs/promises';import type { Dictionary } from '@crawlee/types';import type Puppeteer from 'puppeteer';import type * as PuppeteerTypes from 'puppeteer';-import type { PuppeteerNewPageOptions } from './puppeteer-controller';-import { PuppeteerController } from './puppeteer-controller';import type { BrowserController } from '../abstract-classes/browser-controller';import { BrowserPlugin } from '../abstract-classes/browser-plugin';import { anonymizeProxySugar } from '../anonymize-proxy';import type { LaunchContext } from '../launch-context';import { log } from '../logger';import { noop } from '../utils';+import type { PuppeteerNewPageOptions } from './puppeteer-controller';+import { PuppeteerController } from './puppeteer-controller';const PROXY_SERVER_ARG = '--proxy-server=';diff --git a/packages/browser-pool/src/utils.ts b/packages/browser-pool/src/utils.tsindex 396c81e2c..f6ea9b9d4 100644--- a/packages/browser-pool/src/utils.ts+++ b/packages/browser-pool/src/utils.ts@@ -1,6 +1,6 @@import type { BrowserPlugin } from './abstract-classes/browser-plugin';--import type { PlaywrightPlugin, PuppeteerPlugin } from '.';+import type { PlaywrightPlugin } from './playwright/playwright-plugin';+import type { PuppeteerPlugin } from './puppeteer/puppeteer-plugin';export type UnwrapPromise<T> = T extends PromiseLike<infer R> ? UnwrapPromise<R> : T;diff --git a/packages/browser-pool/tab-as-a-container/background.js b/packages/browser-pool/tab-as-a-container/background.jsindex ab45706f0..f315fcdf1 100644--- a/packages/browser-pool/tab-as-a-container/background.js+++ b/packages/browser-pool/tab-as-a-container/background.js@@ -68,7 +68,6 @@ chrome.cookies.onChanged.addListener(async (changeInfo) => {const opener = getOpenerId(tabId);if (tabId !== opener) {- // eslint-disable-next-line no-consoleconsole.log(`${realCookieName} -> ${keyFromTabId(opener)}`);await chrome.cookies.remove({@@ -107,7 +106,6 @@ chrome.webRequest.onBeforeSendHeaders.addListener(// We don't want these in order to prevent cluttering cookies.// Yes, `webNavigation.onCommitted` is emitted and `webNavigation.onCreatedNavigationTarget` is not.if (header.name.toLowerCase() === 'purpose' && header.value === 'prefetch' && !counter.has(details.tabId)) {- // eslint-disable-next-line no-consoleconsole.log(details);return {cancel: true,@@ -116,7 +114,6 @@ chrome.webRequest.onBeforeSendHeaders.addListener(// This one is for Firefoxif (header.name.toLowerCase() === 'x-moz' && header.value === 'prefetch' && !counter.has(details.tabId)) {- // eslint-disable-next-line no-consoleconsole.log(details);return {cancel: true,@@ -124,7 +121,6 @@ chrome.webRequest.onBeforeSendHeaders.addListener(}if (['beacon', 'csp_report', 'ping', 'speculative'].includes(details.type)) {- // eslint-disable-next-line no-consoleconsole.log(details);return {cancel: true,@@ -132,7 +128,6 @@ chrome.webRequest.onBeforeSendHeaders.addListener(}if (details.tabId === -1) {- // eslint-disable-next-line no-consoleconsole.log(details);}}@@ -367,7 +362,7 @@ const onCompleted = async (details) => {chrome.webNavigation.onCompleted.addListener(onCompleted);// Load content scripts.-(async () => {+void (async () => {const contentResponse = await fetch(chrome.runtime.getURL('content.js'));const contentText = await contentResponse.text();diff --git a/packages/browser-pool/tab-as-a-container/content.js b/packages/browser-pool/tab-as-a-container/content.jsindex 0ed1ef809..efbbff7c0 100644--- a/packages/browser-pool/tab-as-a-container/content.js+++ b/packages/browser-pool/tab-as-a-container/content.js@@ -454,7 +454,6 @@ try {},});} catch (error) {- // eslint-disable-next-line no-consoleconsole.error(error);}diff --git a/packages/browser-pool/test/changing-page-options.test.ts b/packages/browser-pool/test/changing-page-options.test.tsindex 76aed3042..69c68953b 100644--- a/packages/browser-pool/test/changing-page-options.test.ts+++ b/packages/browser-pool/test/changing-page-options.test.ts@@ -2,8 +2,8 @@ import http from 'node:http';import type { AddressInfo } from 'node:net';import { promisify } from 'node:util';-import type { PrePageCreateHook, PuppeteerController, PlaywrightController } from '@crawlee/browser-pool';-import { BrowserPool, PuppeteerPlugin, PlaywrightPlugin } from '@crawlee/browser-pool';+import type { PlaywrightController, PrePageCreateHook, PuppeteerController } from '@crawlee/browser-pool';+import { BrowserPool, PlaywrightPlugin, PuppeteerPlugin } from '@crawlee/browser-pool';import playwright from 'playwright';import type { Server as ProxyChainServer } from 'proxy-chain';import puppeteer from 'puppeteer';diff --git a/packages/browser-pool/test/proxy-sugar.test.ts b/packages/browser-pool/test/proxy-sugar.test.tsindex 733cb1ac5..a16b960cf 100644--- a/packages/browser-pool/test/proxy-sugar.test.ts+++ b/packages/browser-pool/test/proxy-sugar.test.ts@@ -2,7 +2,7 @@ import http from 'node:http';import type { AddressInfo } from 'node:net';import { promisify } from 'node:util';-import { BrowserPool, PuppeteerPlugin, PlaywrightPlugin } from '@crawlee/browser-pool';+import { BrowserPool, PlaywrightPlugin, PuppeteerPlugin } from '@crawlee/browser-pool';import playwright from 'playwright';import type { Server as ProxyChainServer } from 'proxy-chain';import puppeteer from 'puppeteer';diff --git a/packages/cheerio-crawler/src/internals/cheerio-crawler.ts b/packages/cheerio-crawler/src/internals/cheerio-crawler.tsindex 6c3fa71bb..55d780c94 100644--- a/packages/cheerio-crawler/src/internals/cheerio-crawler.ts+++ b/packages/cheerio-crawler/src/internals/cheerio-crawler.ts@@ -1,7 +1,8 @@-import type { IncomingMessage } from 'http';+import type { IncomingMessage } from 'node:http';import { text as readStreamToString } from 'node:stream/consumers';import type {+ Configuration,EnqueueLinksOptions,ErrorHandler,GetUserDataFromRequest,@@ -9,11 +10,10 @@ import type {InternalHttpCrawlingContext,InternalHttpHook,RequestHandler,- RouterRoutes,- Configuration,RequestProvider,+ RouterRoutes,} from '@crawlee/http';-import { HttpCrawler, enqueueLinks, Router, resolveBaseUrlForEnqueueLinksFiltering } from '@crawlee/http';+import { enqueueLinks, HttpCrawler, resolveBaseUrlForEnqueueLinksFiltering, Router } from '@crawlee/http';import type { Dictionary } from '@crawlee/types';import { type CheerioRoot, extractUrlsFromCheerio } from '@crawlee/utils';import type { CheerioOptions } from 'cheerio';diff --git a/packages/cli/src/commands/CreateProjectCommand.ts b/packages/cli/src/commands/CreateProjectCommand.tsindex 76b363b4a..cb1055246 100644--- a/packages/cli/src/commands/CreateProjectCommand.ts+++ b/packages/cli/src/commands/CreateProjectCommand.ts@@ -1,11 +1,9 @@-/* eslint-disable no-console */import { execSync } from 'node:child_process';import { mkdirSync } from 'node:fs';import { readFile, writeFile } from 'node:fs/promises';import { get } from 'node:https';-import { dirname, join } from 'node:path';+import { dirname, join, resolve } from 'node:path';import { setTimeout } from 'node:timers/promises';-import { resolve } from 'path';import type { Template } from '@crawlee/templates';import { fetchManifest } from '@crawlee/templates';diff --git a/packages/cli/src/commands/InstallPlaywrightBrowsersCommand.ts b/packages/cli/src/commands/InstallPlaywrightBrowsersCommand.tsindex 3c6c9f7ed..f397e6e9f 100644--- a/packages/cli/src/commands/InstallPlaywrightBrowsersCommand.ts+++ b/packages/cli/src/commands/InstallPlaywrightBrowsersCommand.ts@@ -1,5 +1,3 @@-/* eslint-disable no-console */-import { execSync } from 'node:child_process';import ansiColors from 'ansi-colors';diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.tsindex 3ba87386c..066e19766 100755--- a/packages/cli/src/index.ts+++ b/packages/cli/src/index.ts@@ -1,6 +1,6 @@#!/usr/bin/env node-// eslint-disable-next-line @typescript-eslint/no-var-requires+// eslint-disable-next-line @typescript-eslint/no-require-importsrequire('yargonaut') //.style('blue').style('yellow', 'required')diff --git a/packages/core/src/autoscaling/autoscaled_pool.ts b/packages/core/src/autoscaling/autoscaled_pool.tsindex ff63fc160..7bfa33f80 100644--- a/packages/core/src/autoscaling/autoscaled_pool.ts+++ b/packages/core/src/autoscaling/autoscaled_pool.ts@@ -1,16 +1,17 @@+import ow from 'ow';+import type { Log } from '@apify/log';import { addTimeoutToPromise } from '@apify/timeout';import type { BetterIntervalID } from '@apify/utilities';import { betterClearInterval, betterSetInterval } from '@apify/utilities';-import ow from 'ow';+import { Configuration } from '../configuration';+import { CriticalError } from '../errors';+import { log as defaultLog } from '../log';import type { SnapshotterOptions } from './snapshotter';import { Snapshotter } from './snapshotter';import type { SystemInfo, SystemStatusOptions } from './system_status';import { SystemStatus } from './system_status';-import { Configuration } from '../configuration';-import { CriticalError } from '../errors';-import { log as defaultLog } from '../log';export interface AutoscaledPoolOptions {/**@@ -420,7 +421,7 @@ export class AutoscaledPool {async pause(timeoutSecs?: number): Promise<void> {if (this.isStopped) return;this.isStopped = true;- return new Promise((resolve, reject) => {+ await new Promise<void>((resolve, reject) => {let timeout: NodeJS.Timeout;if (timeoutSecs) {timeout = setTimeout(() => {@@ -573,6 +574,8 @@ export class AutoscaledPool {this.reject(err);}}++ return undefined;}/**@@ -624,7 +627,7 @@ export class AutoscaledPool {}// Start a new interval cycle.- intervalCallback();+ return intervalCallback();}/**diff --git a/packages/core/src/autoscaling/snapshotter.ts b/packages/core/src/autoscaling/snapshotter.tsindex b718a48dd..866c2199e 100644--- a/packages/core/src/autoscaling/snapshotter.ts+++ b/packages/core/src/autoscaling/snapshotter.ts@@ -1,15 +1,16 @@-import type { Log } from '@apify/log';-import type { BetterIntervalID } from '@apify/utilities';-import { betterClearInterval, betterSetInterval } from '@apify/utilities';import type { StorageClient } from '@crawlee/types';import { getMemoryInfo } from '@crawlee/utils';import ow from 'ow';-import type { SystemInfo } from './system_status';+import type { Log } from '@apify/log';+import type { BetterIntervalID } from '@apify/utilities';+import { betterClearInterval, betterSetInterval } from '@apify/utilities';+import { Configuration } from '../configuration';import type { EventManager } from '../events/event_manager';import { EventType } from '../events/event_manager';import { log as defaultLog } from '../log';+import type { SystemInfo } from './system_status';const RESERVE_MEMORY_RATIO = 0.5;const CLIENT_RATE_LIMIT_ERROR_RETRY_COUNT = 2;@@ -221,7 +222,9 @@ export class Snapshotter {this.events.off(EventType.SYSTEM_INFO, this._snapshotCpu);this.events.off(EventType.SYSTEM_INFO, this._snapshotMemory);// Allow microtask queue to unwind before stop returns.- await new Promise((resolve) => setImmediate(resolve));+ await new Promise((resolve) => {+ setImmediate(resolve);+ });}/**diff --git a/packages/core/src/autoscaling/system_status.ts b/packages/core/src/autoscaling/system_status.tsindex 4f0a23f1f..b2b86434e 100644--- a/packages/core/src/autoscaling/system_status.ts+++ b/packages/core/src/autoscaling/system_status.ts@@ -1,8 +1,8 @@import { weightedAvg } from '@crawlee/utils';import ow from 'ow';-import { Snapshotter } from './snapshotter';import type { Configuration } from '../configuration';+import { Snapshotter } from './snapshotter';/*** Represents the current status of the system.diff --git a/packages/core/src/configuration.ts b/packages/core/src/configuration.tsindex 626fb3120..4c93004ef 100644--- a/packages/core/src/configuration.ts+++ b/packages/core/src/configuration.ts@@ -2,15 +2,16 @@ import { AsyncLocalStorage } from 'node:async_hooks';import { EventEmitter } from 'node:events';import { join } from 'node:path';-import log, { LogLevel } from '@apify/log';-import { MemoryStorage } from '@crawlee/memory-storage';import type { MemoryStorageOptions } from '@crawlee/memory-storage';+import { MemoryStorage } from '@crawlee/memory-storage';import type { Dictionary, StorageClient } from '@crawlee/types';import { pathExistsSync, readFileSync } from 'fs-extra';-import { LocalEventManager, type EventManager } from './events';+import log, { LogLevel } from '@apify/log';++import { type EventManager, LocalEventManager } from './events';import type { StorageManager } from './storages';-import { entries, type Constructor } from './typedefs';+import { type Constructor, entries } from './typedefs';export interface ConfigurationOptions {/**diff --git a/packages/core/src/crawlers/crawler_commons.ts b/packages/core/src/crawlers/crawler_commons.tsindex 14a1d1f96..e92e70973 100644--- a/packages/core/src/crawlers/crawler_commons.ts+++ b/packages/core/src/crawlers/crawler_commons.ts@@ -1,6 +1,6 @@-import type { Dictionary, BatchAddRequestsResult } from '@crawlee/types';+import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';// @ts-expect-error This throws a compilation error due to got-scraping being ESM only but we only import types, so its alllll gooooood-import type { Response as GotResponse, OptionsInit } from 'got-scraping';+import type { OptionsInit, Response as GotResponse } from 'got-scraping';import type { ReadonlyDeep } from 'type-fest';import type { Configuration } from '../configuration';@@ -9,7 +9,7 @@ import type { Log } from '../log';import type { ProxyInfo } from '../proxy_configuration';import type { Request, Source } from '../request';import type { Session } from '../session_pool/session';-import type { RequestQueueOperationOptions, Dataset, RecordOptions } from '../storages';+import type { Dataset, RecordOptions, RequestQueueOperationOptions } from '../storages';import { KeyValueStore } from '../storages';/** @internal */diff --git a/packages/core/src/crawlers/crawler_extension.ts b/packages/core/src/crawlers/crawler_extension.tsindex 04c73290b..c098d6c15 100644--- a/packages/core/src/crawlers/crawler_extension.ts+++ b/packages/core/src/crawlers/crawler_extension.ts@@ -1,4 +1,4 @@-import { log as defaultLog, type Log } from '../log';+import { type Log, log as defaultLog } from '../log';/*** Abstract class with pre-defined method to connect to the Crawlers class by the "use" crawler method.diff --git a/packages/core/src/crawlers/error_snapshotter.ts b/packages/core/src/crawlers/error_snapshotter.tsindex 02194347e..96af2f3f4 100644--- a/packages/core/src/crawlers/error_snapshotter.ts+++ b/packages/core/src/crawlers/error_snapshotter.ts@@ -1,8 +1,8 @@import crypto from 'node:crypto';-import type { ErrnoException } from './error_tracker';import type { CrawlingContext } from '../crawlers/crawler_commons';import type { KeyValueStore } from '../storages';+import type { ErrnoException } from './error_tracker';// Define the following types as we cannot import the complete types from the respective packagesinterface BrowserCrawlingContext {diff --git a/packages/core/src/crawlers/error_tracker.ts b/packages/core/src/crawlers/error_tracker.tsindex 444abfe52..eefa2f2c9 100644--- a/packages/core/src/crawlers/error_tracker.ts+++ b/packages/core/src/crawlers/error_tracker.ts@@ -1,7 +1,7 @@import { inspect } from 'node:util';-import { ErrorSnapshotter } from './error_snapshotter';import type { CrawlingContext } from '../crawlers/crawler_commons';+import { ErrorSnapshotter } from './error_snapshotter';/*** Node.js Error interfacediff --git a/packages/core/src/crawlers/statistics.ts b/packages/core/src/crawlers/statistics.tsindex 397d63a24..11c0e3894 100644--- a/packages/core/src/crawlers/statistics.ts+++ b/packages/core/src/crawlers/statistics.ts@@ -1,12 +1,13 @@-import type { Log } from '@apify/log';import ow from 'ow';-import { ErrorTracker } from './error_tracker';+import type { Log } from '@apify/log';+import { Configuration } from '../configuration';import type { EventManager } from '../events/event_manager';import { EventType } from '../events/event_manager';import { log as defaultLog } from '../log';import { KeyValueStore } from '../storages/key_value_store';+import { ErrorTracker } from './error_tracker';/*** @ignorediff --git a/packages/core/src/enqueue_links/enqueue_links.ts b/packages/core/src/enqueue_links/enqueue_links.tsindex 881d1f595..2f743f93b 100644--- a/packages/core/src/enqueue_links/enqueue_links.ts+++ b/packages/core/src/enqueue_links/enqueue_links.ts@@ -1,20 +1,21 @@-import log from '@apify/log';import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';import ow from 'ow';import { getDomain } from 'tldts';import type { SetRequired } from 'type-fest';+import log from '@apify/log';++import type { RequestOptions } from '../request';+import type { RequestProvider, RequestQueueOperationOptions } from '../storages';import type { GlobInput, PseudoUrlInput, RegExpInput, RequestTransform, UrlPatternObject } from './shared';import {- filterRequestsByPatterns,constructGlobObjectsFromGlobs,constructRegExpObjectsFromPseudoUrls,constructRegExpObjectsFromRegExps,createRequestOptions,createRequests,+ filterRequestsByPatterns,} from './shared';-import type { RequestOptions } from '../request';-import type { RequestProvider, RequestQueueOperationOptions } from '../storages';export interface EnqueueLinksOptions extends RequestQueueOperationOptions {/** Limit the amount of actually enqueued URLs to this number. Useful for testing across the entire crawling scope. */diff --git a/packages/core/src/enqueue_links/shared.ts b/packages/core/src/enqueue_links/shared.tsindex 8edfc8fb9..72c04a676 100644--- a/packages/core/src/enqueue_links/shared.ts+++ b/packages/core/src/enqueue_links/shared.ts@@ -1,11 +1,12 @@-import { URL } from 'url';+import { URL } from 'node:url';-import { purlToRegExp } from '@apify/pseudo_url';import { minimatch } from 'minimatch';-import type { EnqueueLinksOptions } from './enqueue_links';+import { purlToRegExp } from '@apify/pseudo_url';+import type { RequestOptions } from '../request';import { Request } from '../request';+import type { EnqueueLinksOptions } from './enqueue_links';export { tryAbsoluteURL } from '@crawlee/utils';diff --git a/packages/core/src/events/event_manager.ts b/packages/core/src/events/event_manager.tsindex 30cdb6d28..c8cad080a 100644--- a/packages/core/src/events/event_manager.ts+++ b/packages/core/src/events/event_manager.ts@@ -1,7 +1,8 @@+import { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';+import log from '@apify/log';import type { BetterIntervalID } from '@apify/utilities';import { betterClearInterval, betterSetInterval } from '@apify/utilities';-import { AsyncEventEmitter } from '@vladfrangu/async_event_emitter';import { Configuration } from '../configuration';diff --git a/packages/core/src/events/local_event_manager.ts b/packages/core/src/events/local_event_manager.tsindex c30a3b50e..9f54c403d 100644--- a/packages/core/src/events/local_event_manager.ts+++ b/packages/core/src/events/local_event_manager.ts@@ -1,11 +1,12 @@import os from 'node:os';+import { getCurrentCpuTicksV2, getMemoryInfo, getMemoryInfoV2, isContainerized } from '@crawlee/utils';+import log from '@apify/log';import { betterClearInterval, betterSetInterval } from '@apify/utilities';-import { getMemoryInfo, getMemoryInfoV2, getCurrentCpuTicksV2, isContainerized } from '@crawlee/utils';-import { EventManager, EventType } from './event_manager';import type { SystemInfo } from '../autoscaling';+import { EventManager, EventType } from './event_manager';export class LocalEventManager extends EventManager {private previousTicks = { idle: 0, total: 0 };diff --git a/packages/core/src/http_clients/got-scraping-http-client.ts b/packages/core/src/http_clients/got-scraping-http-client.tsindex e9ef09079..45cfeb317 100644--- a/packages/core/src/http_clients/got-scraping-http-client.ts+++ b/packages/core/src/http_clients/got-scraping-http-client.ts@@ -3,12 +3,12 @@ import { gotScraping } from '@crawlee/utils';import type { Options, PlainResponse } from 'got-scraping';import type {+ BaseHttpClient,HttpRequest,HttpResponse,RedirectHandler,ResponseTypes,StreamingHttpResponse,- BaseHttpClient,} from './base-http-client';/**diff --git a/packages/core/src/log.ts b/packages/core/src/log.tsindex d06336bea..d90c97011 100644--- a/packages/core/src/log.ts+++ b/packages/core/src/log.ts@@ -1,3 +1,3 @@-import log, { Log, LoggerOptions, LogLevel, Logger, LoggerJson, LoggerText } from '@apify/log';+import log, { Log, Logger, LoggerJson, LoggerOptions, LoggerText, LogLevel } from '@apify/log';export { log, Log, LoggerOptions, LogLevel, Logger, LoggerJson, LoggerText };diff --git a/packages/core/src/proxy_configuration.ts b/packages/core/src/proxy_configuration.tsindex 3444e0ed3..5bbada6f8 100644--- a/packages/core/src/proxy_configuration.ts+++ b/packages/core/src/proxy_configuration.ts@@ -1,8 +1,9 @@-import log from '@apify/log';-import { cryptoRandomObjectId } from '@apify/utilities';import type { Dictionary } from '@crawlee/types';import ow from 'ow';+import log from '@apify/log';+import { cryptoRandomObjectId } from '@apify/utilities';+import type { Request } from './request';export interface ProxyConfigurationFunction {@@ -422,14 +423,12 @@ export class ProxyConfiguration {}return proxyUrl;} catch (err) {- this._throwNewUrlFunctionInvalid(err as Error);+ throw new Error(+ `The provided newUrlFunction did not return a valid URL.\nCause: ${(err as Error).message}`,+ );}}- protected _throwNewUrlFunctionInvalid(err: Error): never {- throw new Error(`The provided newUrlFunction did not return a valid URL.\nCause: ${err.message}`);- }-protected _throwCannotCombineCustomMethods(): never {throw new Error('Cannot combine custom proxies "options.proxyUrls" with custom generating function "options.newUrlFunction".',diff --git a/packages/core/src/request.ts b/packages/core/src/request.tsindex 0f779dd2b..db96c2c49 100644--- a/packages/core/src/request.ts+++ b/packages/core/src/request.ts@@ -2,11 +2,12 @@ import type { BinaryLike } from 'node:crypto';import crypto from 'node:crypto';import util from 'node:util';-import { normalizeUrl } from '@apify/utilities';import type { Dictionary } from '@crawlee/types';import type { BasePredicate } from 'ow';import ow from 'ow';+import { normalizeUrl } from '@apify/utilities';+import type { EnqueueLinksOptions } from './enqueue_links/enqueue_links';import { log as defaultLog } from './log';import type { AllowedHttpMethods } from './typedefs';diff --git a/packages/core/src/serialization.ts b/packages/core/src/serialization.tsindex 616bc9e06..ace72f206 100644--- a/packages/core/src/serialization.ts+++ b/packages/core/src/serialization.ts@@ -1,6 +1,6 @@+import { pipeline as streamPipeline, Readable, Writable } from 'node:stream';import util from 'node:util';import zlib from 'node:zlib';-import { pipeline as streamPipeline, Readable, Writable } from 'stream';import ow from 'ow';import StreamArray from 'stream-json/streamers/StreamArray';diff --git a/packages/core/src/session_pool/session.ts b/packages/core/src/session_pool/session.tsindex 8154cf012..81925c2eb 100644--- a/packages/core/src/session_pool/session.ts+++ b/packages/core/src/session_pool/session.ts@@ -1,13 +1,13 @@import { EventEmitter } from 'node:events';-import type { Log } from '@apify/log';-import { cryptoRandomObjectId } from '@apify/utilities';import type { Cookie as CookieObject, Dictionary } from '@crawlee/types';import ow from 'ow';import type { Cookie, SerializedCookieJar } from 'tough-cookie';import { CookieJar } from 'tough-cookie';-import { EVENT_SESSION_RETIRED } from './events';+import type { Log } from '@apify/log';+import { cryptoRandomObjectId } from '@apify/utilities';+import type { ResponseLike } from '../cookie_utils';import {browserPoolCookieToToughCookie,@@ -16,6 +16,7 @@ import {toughCookieToBrowserPoolCookie,} from '../cookie_utils';import { log as defaultLog } from '../log';+import { EVENT_SESSION_RETIRED } from './events';/*** Persistable {@apilink Session} state.diff --git a/packages/core/src/session_pool/session_pool.ts b/packages/core/src/session_pool/session_pool.tsindex 19591f8f7..676e92207 100644--- a/packages/core/src/session_pool/session_pool.ts+++ b/packages/core/src/session_pool/session_pool.ts@@ -1,19 +1,20 @@import { EventEmitter } from 'node:events';-import type { Log } from '@apify/log';import type { Dictionary } from '@crawlee/types';import { AsyncQueue } from '@sapphire/async-queue';import ow from 'ow';-import { BLOCKED_STATUS_CODES, MAX_POOL_SIZE, PERSIST_STATE_KEY } from './consts';-import type { SessionOptions } from './session';-import { Session } from './session';+import type { Log } from '@apify/log';+import { Configuration } from '../configuration';import type { PersistenceOptions } from '../crawlers/statistics';import type { EventManager } from '../events/event_manager';import { EventType } from '../events/event_manager';import { log as defaultLog } from '../log';import { KeyValueStore } from '../storages/key_value_store';+import { BLOCKED_STATUS_CODES, MAX_POOL_SIZE, PERSIST_STATE_KEY } from './consts';+import type { SessionOptions } from './session';+import { Session } from './session';/*** Factory user-function which creates customized {@apilink Session} instances.diff --git a/packages/core/src/storages/access_checking.ts b/packages/core/src/storages/access_checking.tsindex eddb4b661..941823e8d 100644--- a/packages/core/src/storages/access_checking.ts+++ b/packages/core/src/storages/access_checking.ts@@ -1,4 +1,4 @@-import { AsyncLocalStorage } from 'async_hooks';+import { AsyncLocalStorage } from 'node:async_hooks';import type { Awaitable } from '../typedefs';diff --git a/packages/core/src/storages/dataset.ts b/packages/core/src/storages/dataset.tsindex 95fcb046e..27dd15731 100644--- a/packages/core/src/storages/dataset.ts+++ b/packages/core/src/storages/dataset.ts@@ -1,16 +1,17 @@-import { MAX_PAYLOAD_SIZE_BYTES } from '@apify/consts';import type { DatasetClient, DatasetInfo, Dictionary, StorageClient } from '@crawlee/types';import { stringify } from 'csv-stringify/sync';import ow from 'ow';+import { MAX_PAYLOAD_SIZE_BYTES } from '@apify/consts';++import { Configuration } from '../configuration';+import { type Log, log } from '../log';+import type { Awaitable } from '../typedefs';import { checkStorageAccess } from './access_checking';import { KeyValueStore } from './key_value_store';import type { StorageManagerOptions } from './storage_manager';import { StorageManager } from './storage_manager';import { purgeDefaultStorages } from './utils';-import { Configuration } from '../configuration';-import { log, type Log } from '../log';-import type { Awaitable } from '../typedefs';/** @internal */export const DATASET_ITERATORS_DEFAULT_LIMIT = 10000;@@ -274,7 +275,8 @@ export class Dataset<Data extends Dictionary = Dictionary> {// Handle singular Objectsif (!Array.isArray(data)) {const payload = checkAndSerialize(data, limit);- return dispatch(payload);+ await dispatch(payload);+ return;}// Handle Arrays@@ -326,7 +328,7 @@ export class Dataset<Data extends Dictionary = Dictionary> {items.push(...value.items);if (value.total > offset + value.count) {- return fetchNextChunk(offset + value.count);+ await fetchNextChunk(offset + value.count);}};@@ -480,7 +482,7 @@ export class Dataset<Data extends Dictionary = Dictionary> {if (newOffset >= total) return;const newOpts = { ...options, offset: newOffset };- return this.forEach(iteratee, newOpts, index);+ await this.forEach(iteratee, newOpts, index);}/**diff --git a/packages/core/src/storages/key_value_store.ts b/packages/core/src/storages/key_value_store.tsindex 466aae925..c41c6c512 100644--- a/packages/core/src/storages/key_value_store.ts+++ b/packages/core/src/storages/key_value_store.ts@@ -1,18 +1,19 @@import { readFile } from 'node:fs/promises';import { join } from 'node:path';-import { KEY_VALUE_STORE_KEY_REGEX } from '@apify/consts';-import { jsonStringifyExtended } from '@apify/utilities';import type { Dictionary, KeyValueStoreClient, StorageClient } from '@crawlee/types';import JSON5 from 'json5';import ow, { ArgumentError } from 'ow';+import { KEY_VALUE_STORE_KEY_REGEX } from '@apify/consts';+import { jsonStringifyExtended } from '@apify/utilities';++import { Configuration } from '../configuration';+import type { Awaitable } from '../typedefs';import { checkStorageAccess } from './access_checking';import type { StorageManagerOptions } from './storage_manager';import { StorageManager } from './storage_manager';import { purgeDefaultStorages } from './utils';-import { Configuration } from '../configuration';-import type { Awaitable } from '../typedefs';/*** Helper function to possibly stringify value if options.contentType is not set.@@ -30,7 +31,7 @@ export const maybeStringify = <T>(value: T, options: { contentType?: string }) =} catch (e) {const error = e as Error;// Give more meaningful error message- if (error.message?.indexOf('Invalid string length') >= 0) {+ if (error.message?.includes('Invalid string length')) {error.message = 'Object is too large';}throw new Error(`The "value" parameter cannot be stringified to JSON: ${error.message}`);diff --git a/packages/core/src/storages/request_list.ts b/packages/core/src/storages/request_list.tsindex 5f4b90806..eba5b54bf 100644--- a/packages/core/src/storages/request_list.ts+++ b/packages/core/src/storages/request_list.ts@@ -2,15 +2,15 @@ import type { Dictionary } from '@crawlee/types';import { downloadListOfUrls } from '@crawlee/utils';import ow, { ArgumentError } from 'ow';-import { KeyValueStore } from './key_value_store';-import { purgeDefaultStorages } from './utils';import { Configuration } from '../configuration';import type { EventManager } from '../events';import { EventType } from '../events';import { log } from '../log';import type { ProxyConfiguration } from '../proxy_configuration';-import { type InternalSource, type RequestOptions, Request, type Source } from '../request';+import { type InternalSource, Request, type RequestOptions, type Source } from '../request';import { createDeserialize, serializeArray } from '../serialization';+import { KeyValueStore } from './key_value_store';+import { purgeDefaultStorages } from './utils';/** @internal */export const STATE_PERSISTENCE_KEY = 'REQUEST_LIST_STATE';@@ -818,7 +818,7 @@ export class RequestList implements IRequestList {this._ensureUniqueKeyValid(uniqueKey);// Skip requests with duplicate uniqueKey- if (!this.uniqueKeyToIndex.hasOwnProperty(uniqueKey)) {+ if (!Object.hasOwn(this.uniqueKeyToIndex, uniqueKey)) {this.uniqueKeyToIndex[uniqueKey] = this.requests.length;this.requests.push(request);} else if (this.keepDuplicateUrls) {diff --git a/packages/core/src/storages/request_provider.ts b/packages/core/src/storages/request_provider.tsindex 53983fbe2..0b89c8a66 100644--- a/packages/core/src/storages/request_provider.ts+++ b/packages/core/src/storages/request_provider.ts@@ -1,8 +1,5 @@import { inspect } from 'node:util';-import { ListDictionary, LruCache } from '@apify/datastructures';-import type { Log } from '@apify/log';-import { cryptoRandomObjectId } from '@apify/utilities';import type {BatchAddRequestsResult,Dictionary,@@ -15,17 +12,21 @@ import type {import { chunk, downloadListOfUrls, sleep } from '@crawlee/utils';import ow from 'ow';-import { checkStorageAccess } from './access_checking';-import type { IStorage, StorageManagerOptions } from './storage_manager';-import { StorageManager } from './storage_manager';-import { QUERY_HEAD_MIN_LENGTH, getRequestId, purgeDefaultStorages } from './utils';+import { ListDictionary, LruCache } from '@apify/datastructures';+import type { Log } from '@apify/log';+import { cryptoRandomObjectId } from '@apify/utilities';+import { Configuration } from '../configuration';import { EventType } from '../events';import { log } from '../log';import type { ProxyConfiguration } from '../proxy_configuration';+import type { InternalSource, RequestOptions, Source } from '../request';import { Request } from '../request';-import type { RequestOptions, InternalSource, Source } from '../request';import type { Constructor } from '../typedefs';+import { checkStorageAccess } from './access_checking';+import type { IStorage, StorageManagerOptions } from './storage_manager';+import { StorageManager } from './storage_manager';+import { getRequestId, purgeDefaultStorages, QUERY_HEAD_MIN_LENGTH } from './utils';export abstract class RequestProvider implements IStorage {id: string;diff --git a/packages/core/src/storages/request_queue.ts b/packages/core/src/storages/request_queue.tsindex 0b501465d..804b18739 100644--- a/packages/core/src/storages/request_queue.ts+++ b/packages/core/src/storages/request_queue.ts@@ -1,21 +1,22 @@import { setTimeout as sleep } from 'node:timers/promises';-import { REQUEST_QUEUE_HEAD_MAX_LIMIT } from '@apify/consts';import type { Dictionary } from '@crawlee/types';+import { REQUEST_QUEUE_HEAD_MAX_LIMIT } from '@apify/consts';++import { Configuration } from '../configuration';+import type { Request } from '../request';import { checkStorageAccess } from './access_checking';import type { RequestProviderOptions, RequestQueueOperationInfo } from './request_provider';import { RequestProvider } from './request_provider';import {API_PROCESSED_REQUESTS_DELAY_MILLIS,+ getRequestId,MAX_QUERIES_FOR_CONSISTENCY,QUERY_HEAD_BUFFER,QUERY_HEAD_MIN_LENGTH,STORAGE_CONSISTENCY_DELAY_MILLIS,- getRequestId,} from './utils';-import { Configuration } from '../configuration';-import type { Request } from '../request';const MAX_CACHED_REQUESTS = 1_000_000;diff --git a/packages/core/src/storages/request_queue_v2.ts b/packages/core/src/storages/request_queue_v2.tsindex bf23021f0..41878ab23 100644--- a/packages/core/src/storages/request_queue_v2.ts+++ b/packages/core/src/storages/request_queue_v2.ts@@ -1,16 +1,16 @@import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';+import { Configuration } from '../configuration';+import { EventType } from '../events';+import type { Request, Source } from '../request';import { checkStorageAccess } from './access_checking';import type {- RequestQueueOperationInfo,RequestProviderOptions,+ RequestQueueOperationInfo,RequestQueueOperationOptions,} from './request_provider';import { RequestProvider } from './request_provider';import { getRequestId } from './utils';-import { Configuration } from '../configuration';-import { EventType } from '../events';-import type { Request, Source } from '../request';// Double the limit of RequestQueue v1 (1_000_000) as we also store keyed by request.id, not just from uniqueKeyconst MAX_CACHED_REQUESTS = 2_000_000;diff --git a/packages/core/src/storages/sitemap_request_list.ts b/packages/core/src/storages/sitemap_request_list.tsindex 92e9c6bac..97d2017e1 100644--- a/packages/core/src/storages/sitemap_request_list.ts+++ b/packages/core/src/storages/sitemap_request_list.ts@@ -1,16 +1,17 @@import { Transform } from 'node:stream';-import defaultLog from '@apify/log';-import { type ParseSitemapOptions, parseSitemap } from '@crawlee/utils';+import { parseSitemap, type ParseSitemapOptions } from '@crawlee/utils';import { minimatch } from 'minimatch';import ow from 'ow';-import { KeyValueStore } from './key_value_store';-import type { IRequestList } from './request_list';-import { purgeDefaultStorages } from './utils';+import defaultLog from '@apify/log';+import type { GlobInput, RegExpInput, UrlPatternObject } from '../enqueue_links';import { constructGlobObjectsFromGlobs, constructRegExpObjectsFromRegExps } from '../enqueue_links';import { Request } from '../request';+import { KeyValueStore } from './key_value_store';+import type { IRequestList } from './request_list';+import { purgeDefaultStorages } from './utils';/** @internal */const STATE_PERSISTENCE_KEY = 'SITEMAP_REQUEST_LIST_STATE';@@ -158,7 +159,7 @@ export class SitemapRequestList implements IRequestList {** If the loading is aborted and all the requests are handled, `isFinished()` will return `true`.*/- private abortLoading: boolean = false;+ private abortLoading = false;/** Number of URLs that were marked as handled */private handledUrlCount = 0;@@ -167,7 +168,7 @@ export class SitemapRequestList implements IRequestList {private store?: KeyValueStore;- private closed: boolean = false;+ private closed = false;/*** Proxy URL to be used for sitemap loading.@@ -278,7 +279,8 @@ export class SitemapRequestList implements IRequestList {private async pushNextUrl(url: string | null) {return new Promise<void>((resolve) => {if (this.closed || (url && !this.isUrlMatchingPatterns(url))) {- return resolve();+ resolve();+ return;}if (!this.urlQueueStream.push(url)) {@@ -301,7 +303,8 @@ export class SitemapRequestList implements IRequestList {private async readNextUrl(): Promise<string | null> {return new Promise((resolve) => {if (this.closed) {- return resolve(null);+ resolve(null);+ return;}const result = this.urlQueueStream.read();diff --git a/packages/core/src/storages/utils.ts b/packages/core/src/storages/utils.tsindex 42260a521..31135c948 100644--- a/packages/core/src/storages/utils.ts+++ b/packages/core/src/storages/utils.ts@@ -2,8 +2,8 @@ import crypto from 'node:crypto';import type { Dictionary, StorageClient } from '@crawlee/types';-import { KeyValueStore } from './key_value_store';import { Configuration } from '../configuration';+import { KeyValueStore } from './key_value_store';/*** Options for purging default storage.diff --git a/packages/core/test/enqueue_links/add-enqueue-strategy-to-requests.ts b/packages/core/test/enqueue_links/add-enqueue-strategy-to-requests.tsindex 4f6f89a83..553a1d1f8 100644--- a/packages/core/test/enqueue_links/add-enqueue-strategy-to-requests.ts+++ b/packages/core/test/enqueue_links/add-enqueue-strategy-to-requests.ts@@ -1,7 +1,8 @@-import log from '@apify/log';import { load } from 'cheerio';import type { Source } from 'crawlee';-import { EnqueueStrategy, Configuration, cheerioCrawlerEnqueueLinks, RequestQueue } from 'crawlee';+import { cheerioCrawlerEnqueueLinks, Configuration, EnqueueStrategy, RequestQueue } from 'crawlee';++import log from '@apify/log';const apifyClient = Configuration.getStorageClient();diff --git a/packages/core/test/enqueue_links/protocol-matching-based-on-strategy.test.ts b/packages/core/test/enqueue_links/protocol-matching-based-on-strategy.test.tsindex 4e66168f3..139aba7d8 100644--- a/packages/core/test/enqueue_links/protocol-matching-based-on-strategy.test.ts+++ b/packages/core/test/enqueue_links/protocol-matching-based-on-strategy.test.ts@@ -1,7 +1,8 @@-import log from '@apify/log';import { load } from 'cheerio';import type { CheerioRoot, Source } from 'crawlee';-import { EnqueueStrategy, Configuration, cheerioCrawlerEnqueueLinks, RequestQueue } from 'crawlee';+import { cheerioCrawlerEnqueueLinks, Configuration, EnqueueStrategy, RequestQueue } from 'crawlee';++import log from '@apify/log';const apifyClient = Configuration.getStorageClient();diff --git a/packages/core/test/enqueue_links/user-provided-patterns-with-enqueue-strategy.test.ts b/packages/core/test/enqueue_links/user-provided-patterns-with-enqueue-strategy.test.tsindex 5ee6771f2..d3ee7a163 100644--- a/packages/core/test/enqueue_links/user-provided-patterns-with-enqueue-strategy.test.ts+++ b/packages/core/test/enqueue_links/user-provided-patterns-with-enqueue-strategy.test.ts@@ -1,7 +1,8 @@-import log from '@apify/log';import { load } from 'cheerio';import type { CheerioRoot, Source } from 'crawlee';-import { Configuration, cheerioCrawlerEnqueueLinks, RequestQueue, EnqueueStrategy } from 'crawlee';+import { cheerioCrawlerEnqueueLinks, Configuration, EnqueueStrategy, RequestQueue } from 'crawlee';++import log from '@apify/log';const apifyClient = Configuration.getStorageClient();diff --git a/packages/core/test/enqueue_links/userData.test.ts b/packages/core/test/enqueue_links/userData.test.tsindex 298f27ba4..82bb59c8e 100644--- a/packages/core/test/enqueue_links/userData.test.ts+++ b/packages/core/test/enqueue_links/userData.test.ts@@ -1,9 +1,10 @@-import log from '@apify/log';import type { Source } from '@crawlee/cheerio';-import { Configuration, cheerioCrawlerEnqueueLinks, RequestQueue } from '@crawlee/cheerio';+import { cheerioCrawlerEnqueueLinks, Configuration, RequestQueue } from '@crawlee/cheerio';import type { CheerioAPI } from 'cheerio';import { load } from 'cheerio';+import log from '@apify/log';+const apifyClient = Configuration.getStorageClient();const HTML = `diff --git a/packages/crawlee/src/index.ts b/packages/crawlee/src/index.tsindex a84b650c9..4d50aff68 100644--- a/packages/crawlee/src/index.ts+++ b/packages/crawlee/src/index.ts@@ -1,7 +1,7 @@-import { log, enqueueLinks } from '@crawlee/core';+import { enqueueLinks, log } from '@crawlee/core';import { playwrightUtils } from '@crawlee/playwright';import { puppeteerUtils } from '@crawlee/puppeteer';-import { social, sleep, downloadListOfUrls, parseOpenGraph } from '@crawlee/utils';+import { downloadListOfUrls, parseOpenGraph, sleep, social } from '@crawlee/utils';export * from '@crawlee/core';export * from '@crawlee/utils';diff --git a/packages/http-crawler/src/internals/file-download.ts b/packages/http-crawler/src/internals/file-download.tsindex b816c8c4a..48cd2e9c0 100644--- a/packages/http-crawler/src/internals/file-download.ts+++ b/packages/http-crawler/src/internals/file-download.ts@@ -1,5 +1,5 @@-import { finished } from 'stream/promises';-import { isPromise } from 'util/types';+import { finished } from 'node:stream/promises';+import { isPromise } from 'node:util/types';import type { Dictionary } from '@crawlee/types';// @ts-expect-error got-scraping is ESM onlydiff --git a/packages/http-crawler/src/internals/http-crawler.ts b/packages/http-crawler/src/internals/http-crawler.tsindex 30b1bc6f5..8d723e6db 100644--- a/packages/http-crawler/src/internals/http-crawler.ts+++ b/packages/http-crawler/src/internals/http-crawler.ts@@ -1,10 +1,8 @@import type { IncomingHttpHeaders, IncomingMessage } from 'node:http';import { extname } from 'node:path';+import type { Readable } from 'node:stream';import util from 'node:util';-import type { Readable } from 'stream';-import { addTimeoutToPromise, tryCancel } from '@apify/timeout';-import { concatStreamToBuffer, readStreamToString } from '@apify/utilities';import type {AutoscaledPoolOptions,BasicCrawlerOptions,@@ -19,26 +17,26 @@ import type {Session,} from '@crawlee/basic';import {- BasicCrawler,BASIC_CRAWLER_TIMEOUT_BUFFER_SECS,+ BasicCrawler,+ Configuration,CrawlerExtension,mergeCookies,- Router,- validators,- Configuration,+ processHttpRequestOptions,RequestState,+ Router,SessionError,- processHttpRequestOptions,+ validators,} from '@crawlee/basic';import type { HttpResponse, StreamingHttpResponse } from '@crawlee/core';import type { Awaitable, Dictionary } from '@crawlee/types';-import { RETRY_CSS_SELECTORS, type CheerioRoot } from '@crawlee/utils';+import { type CheerioRoot, RETRY_CSS_SELECTORS } from '@crawlee/utils';import * as cheerio from 'cheerio';import type { RequestLike, ResponseLike } from 'content-type';import contentTypeParser from 'content-type';import type {- OptionsInit,Method,+ OptionsInit,TimeoutError as TimeoutErrorClass,// @ts-expect-error This throws a compilation error due to got-scraping being ESM only but we only import types, so its alllll gooooood} from 'got-scraping';@@ -47,6 +45,9 @@ import mime from 'mime-types';import ow, { ObjectPredicate } from 'ow';import type { JsonValue } from 'type-fest';+import { addTimeoutToPromise, tryCancel } from '@apify/timeout';+import { concatStreamToBuffer, readStreamToString } from '@apify/utilities';+let TimeoutError: typeof TimeoutErrorClass;/**@@ -477,7 +478,7 @@ export class HttpCrawler<const extensionOptions = extension.getCrawlerOptions();for (const [key, value] of Object.entries(extensionOptions)) {- const isConfigurable = this.hasOwnProperty(key);+ const isConfigurable = Object.hasOwn(this, key);const originalType = typeof this[key as keyof this];const extensionType = typeof value; // What if we want to null something? It is really needed?const isSameType = originalType === extensionType || value == null; // fast track for deleting keysdiff --git a/packages/impit-client/src/index.ts b/packages/impit-client/src/index.tsindex 5b4ec7024..9f9f616c7 100644--- a/packages/impit-client/src/index.ts+++ b/packages/impit-client/src/index.ts@@ -1,9 +1,9 @@+import { Readable } from 'node:stream';import { ReadableStream } from 'node:stream/web';-import { Readable } from 'stream';-import { isTypedArray } from 'util/types';+import { isTypedArray } from 'node:util/types';-import type { HttpRequest, HttpResponse, ResponseTypes, StreamingHttpResponse, BaseHttpClient } from '@crawlee/core';-import { type ImpitOptions, type HttpMethod, Impit, type ImpitResponse } from 'impit';+import type { BaseHttpClient, HttpRequest, HttpResponse, ResponseTypes, StreamingHttpResponse } from '@crawlee/core';+import { type HttpMethod, Impit, type ImpitOptions, type ImpitResponse } from 'impit';export { Browser } from 'impit';@@ -41,7 +41,6 @@ export class ImpitHttpClient implements BaseHttpClient {const reader = body.getReader();const buffer = new Uint8Array();- // eslint-disable-next-line no-constant-conditionwhile (true) {const { done, value } = await reader.read();@@ -113,7 +112,7 @@ export class ImpitHttpClient implements BaseHttpClient {});if (this.followRedirects && response.status >= 300 && response.status < 400) {- const location = response.headers.location;+ const { location } = response.headers;if (!location) {throw new Error('Redirect response missing location header.');diff --git a/packages/jsdom-crawler/src/internals/jsdom-crawler.ts b/packages/jsdom-crawler/src/internals/jsdom-crawler.tsindex e92103025..00fa566aa 100644--- a/packages/jsdom-crawler/src/internals/jsdom-crawler.ts+++ b/packages/jsdom-crawler/src/internals/jsdom-crawler.ts@@ -1,8 +1,7 @@-import type { IncomingMessage } from 'http';+import type { IncomingMessage } from 'node:http';-import { addTimeoutToPromise } from '@apify/timeout';-import { concatStreamToBuffer } from '@apify/utilities';import type {+ Configuration,EnqueueLinksOptions,ErrorHandler,GetUserDataFromRequest,@@ -10,15 +9,14 @@ import type {InternalHttpCrawlingContext,InternalHttpHook,RequestHandler,- RouterRoutes,- Configuration,RequestProvider,+ RouterRoutes,} from '@crawlee/http';import {- HttpCrawler,enqueueLinks,- Router,+ HttpCrawler,resolveBaseUrlForEnqueueLinksFiltering,+ Router,tryAbsoluteURL,} from '@crawlee/http';import type { Dictionary } from '@crawlee/types';@@ -28,6 +26,9 @@ import type { DOMWindow } from 'jsdom';import { JSDOM, ResourceLoader, VirtualConsole } from 'jsdom';import ow from 'ow';+import { addTimeoutToPromise } from '@apify/timeout';+import { concatStreamToBuffer } from '@apify/utilities';+export type JSDOMErrorHandler<UserData extends Dictionary = any, // with default to Dictionary we cant use a typed router in untyped crawlerJSONData extends Dictionary = any, // with default to Dictionary we cant use a typed router in untyped crawler@@ -317,7 +318,8 @@ export class JSDOMCrawler extends HttpCrawler<JSDOMCrawlingContext> {if ($(selector).get().length === 0) {if (timeoutMs) {await sleep(50);- return context.waitForSelector(selector, Math.max(timeoutMs - 50, 0));+ await context.waitForSelector(selector, Math.max(timeoutMs - 50, 0));+ return;}throw new Error(`Selector '${selector}' not found.`);diff --git a/packages/linkedom-crawler/src/internals/linkedom-crawler.ts b/packages/linkedom-crawler/src/internals/linkedom-crawler.tsindex b9048eaa7..3207dde90 100644--- a/packages/linkedom-crawler/src/internals/linkedom-crawler.ts+++ b/packages/linkedom-crawler/src/internals/linkedom-crawler.ts@@ -1,22 +1,21 @@-import type { IncomingMessage } from 'http';+import type { IncomingMessage } from 'node:http';-import { concatStreamToBuffer } from '@apify/utilities';import type {+ EnqueueLinksOptions,+ ErrorHandler,+ GetUserDataFromRequest,HttpCrawlerOptions,InternalHttpCrawlingContext,InternalHttpHook,- ErrorHandler,RequestHandler,- EnqueueLinksOptions,- GetUserDataFromRequest,- RouterRoutes,RequestProvider,+ RouterRoutes,} from '@crawlee/http';import {- HttpCrawler,enqueueLinks,- Router,+ HttpCrawler,resolveBaseUrlForEnqueueLinksFiltering,+ Router,tryAbsoluteURL,} from '@crawlee/http';import type { Dictionary } from '@crawlee/types';@@ -25,6 +24,8 @@ import * as cheerio from 'cheerio';// @ts-expect-error This throws a compilation error due to TypeScript not inferring the module has CJS versions tooimport { DOMParser } from 'linkedom/cached';+import { concatStreamToBuffer } from '@apify/utilities';+export type LinkeDOMErrorHandler<UserData extends Dictionary = any, // with default to Dictionary we cant use a typed router in untyped crawlerJSONData extends Dictionary = any, // with default to Dictionary we cant use a typed router in untyped crawler@@ -200,7 +201,8 @@ export class LinkeDOMCrawler extends HttpCrawler<LinkeDOMCrawlingContext> {if ($(selector).get().length === 0) {if (timeoutMs) {await sleep(50);- return context.waitForSelector(selector, Math.max(timeoutMs - 50, 0));+ await context.waitForSelector(selector, Math.max(timeoutMs - 50, 0));+ return;}throw new Error(`Selector '${selector}' not found.`);diff --git a/packages/memory-storage/src/background-handler/fs-utils.ts b/packages/memory-storage/src/background-handler/fs-utils.tsindex ea1419b42..3e0bb1ba4 100644--- a/packages/memory-storage/src/background-handler/fs-utils.ts+++ b/packages/memory-storage/src/background-handler/fs-utils.ts@@ -3,10 +3,11 @@ import { writeFile as writeFileP } from 'node:fs/promises';import { resolve } from 'node:path';import { setTimeout } from 'node:timers/promises';-import log from '@apify/log';import { ensureDir } from 'fs-extra';import { lock } from 'proper-lockfile';+import log from '@apify/log';+import type { BackgroundHandlerReceivedMessage, BackgroundHandlerUpdateMetadataMessage } from '../utils';const backgroundHandlerLog = log.child({ prefix: 'MemoryStorageBackgroundHandler' });diff --git a/packages/memory-storage/src/background-handler/index.ts b/packages/memory-storage/src/background-handler/index.tsindex 4a9f8eb3b..4f2c1ee02 100644--- a/packages/memory-storage/src/background-handler/index.ts+++ b/packages/memory-storage/src/background-handler/index.ts@@ -1,7 +1,7 @@import { randomUUID } from 'node:crypto';-import { handleMessage } from './fs-utils';import type { BackgroundHandlerReceivedMessage } from '../utils';+import { handleMessage } from './fs-utils';/*** A map of promises that are created when a background task is scheduled.diff --git a/packages/memory-storage/src/cache-helpers.ts b/packages/memory-storage/src/cache-helpers.tsindex 67371edcd..157e69847 100644--- a/packages/memory-storage/src/cache-helpers.ts+++ b/packages/memory-storage/src/cache-helpers.ts@@ -8,8 +8,7 @@ import mimeTypes from 'mime-types';import { DatasetFileSystemEntry } from './fs/dataset/fs';import { KeyValueFileSystemEntry } from './fs/key-value-store/fs';import { RequestQueueFileSystemEntry } from './fs/request-queue/fs';-// eslint-disable-next-line import/order-import type { MemoryStorage } from './memory-storage';+import { type MemoryStorage } from './memory-storage';const uuidRegex = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;@@ -336,7 +335,7 @@ export async function findRequestQueueByPossibleId(client: MemoryStorage, entryNJSON.parse(fileContent);entries.add(entryName);- } catch (err) {+ } catch {memoryStorageLog.warning(`Request queue entry "${entry.name}" for store ${entryNameOrId} has invalid JSON content and will be ignored from the store.`,);diff --git a/packages/memory-storage/src/fs/dataset/fs.ts b/packages/memory-storage/src/fs/dataset/fs.tsindex ad65e3f2a..06bf21d5d 100644--- a/packages/memory-storage/src/fs/dataset/fs.ts+++ b/packages/memory-storage/src/fs/dataset/fs.ts@@ -6,7 +6,6 @@ import { ensureDir } from 'fs-extra';import { lockAndWrite } from '../../background-handler/fs-utils';import type { StorageImplementation } from '../common';-import type { CreateStorageImplementationOptions } from './index';export class DatasetFileSystemEntry<Data> implements StorageImplementation<Data> {diff --git a/packages/memory-storage/src/fs/dataset/index.ts b/packages/memory-storage/src/fs/dataset/index.tsindex 87a39885b..3fc24562f 100644--- a/packages/memory-storage/src/fs/dataset/index.ts+++ b/packages/memory-storage/src/fs/dataset/index.ts@@ -1,8 +1,8 @@import type { Dictionary } from '@crawlee/types';+import type { StorageImplementation } from '../common';import { DatasetFileSystemEntry } from './fs';import { DatasetMemoryEntry } from './memory';-import type { StorageImplementation } from '../common';export function createDatasetStorageImplementation<Data extends Dictionary>(options: CreateStorageImplementationOptions,diff --git a/packages/memory-storage/src/fs/key-value-store/fs.ts b/packages/memory-storage/src/fs/key-value-store/fs.tsindex c08e1a0c4..48b727d63 100644--- a/packages/memory-storage/src/fs/key-value-store/fs.ts+++ b/packages/memory-storage/src/fs/key-value-store/fs.ts@@ -10,7 +10,6 @@ import { lockAndWrite } from '../../background-handler/fs-utils';import type { InternalKeyRecord } from '../../resource-clients/key-value-store';import { memoryStorageLog } from '../../utils';import type { StorageImplementation } from '../common';-import type { CreateStorageImplementationOptions } from '.';export class KeyValueFileSystemEntry implements StorageImplementation<InternalKeyRecord> {diff --git a/packages/memory-storage/src/fs/key-value-store/index.ts b/packages/memory-storage/src/fs/key-value-store/index.tsindex 665579e54..7889ac5e7 100644--- a/packages/memory-storage/src/fs/key-value-store/index.ts+++ b/packages/memory-storage/src/fs/key-value-store/index.ts@@ -1,7 +1,7 @@-import { KeyValueFileSystemEntry } from './fs';-import { KeyValueMemoryEntry } from './memory';import type { InternalKeyRecord } from '../../resource-clients/key-value-store';import type { StorageImplementation } from '../common';+import { KeyValueFileSystemEntry } from './fs';+import { KeyValueMemoryEntry } from './memory';export function createKeyValueStorageImplementation(options: CreateStorageImplementationOptions,diff --git a/packages/memory-storage/src/fs/request-queue/fs.ts b/packages/memory-storage/src/fs/request-queue/fs.tsindex f5be082f8..23a4d8ff2 100644--- a/packages/memory-storage/src/fs/request-queue/fs.ts+++ b/packages/memory-storage/src/fs/request-queue/fs.ts@@ -7,7 +7,6 @@ import { ensureDir } from 'fs-extra';import { lockAndCallback, lockAndWrite } from '../../background-handler/fs-utils';import type { InternalRequest } from '../../resource-clients/request-queue';import type { StorageImplementation } from '../common';-import type { CreateStorageImplementationOptions } from '.';export class RequestQueueFileSystemEntry implements StorageImplementation<InternalRequest> {diff --git a/packages/memory-storage/src/memory-storage.ts b/packages/memory-storage/src/memory-storage.tsindex 60c9b3569..c19931dbd 100644--- a/packages/memory-storage/src/memory-storage.ts+++ b/packages/memory-storage/src/memory-storage.ts@@ -1,5 +1,5 @@/* eslint-disable import/no-duplicates */-import { rm, readdir } from 'node:fs/promises';+import { readdir, rm } from 'node:fs/promises';import { resolve } from 'node:path';import type * as storage from '@crawlee/types';diff --git a/packages/memory-storage/src/resource-clients/dataset-collection.ts b/packages/memory-storage/src/resource-clients/dataset-collection.tsindex 606f0462c..b82c8a262 100644--- a/packages/memory-storage/src/resource-clients/dataset-collection.ts+++ b/packages/memory-storage/src/resource-clients/dataset-collection.ts@@ -1,12 +1,12 @@-import { resolve } from 'path';+import { resolve } from 'node:path';import type * as storage from '@crawlee/types';import { s } from '@sapphire/shapeshift';-import { DatasetClient } from './dataset';import { scheduleBackgroundTask } from '../background-handler';import { findOrCacheDatasetByPossibleId } from '../cache-helpers';import type { MemoryStorage } from '../index';+import { DatasetClient } from './dataset';export interface DatasetCollectionClientOptions {baseStorageDirectory: string;diff --git a/packages/memory-storage/src/resource-clients/key-value-store-collection.ts b/packages/memory-storage/src/resource-clients/key-value-store-collection.tsindex 95086c5e9..d552374be 100644--- a/packages/memory-storage/src/resource-clients/key-value-store-collection.ts+++ b/packages/memory-storage/src/resource-clients/key-value-store-collection.ts@@ -3,10 +3,10 @@ import { resolve } from 'node:path';import type * as storage from '@crawlee/types';import { s } from '@sapphire/shapeshift';-import { KeyValueStoreClient } from './key-value-store';import { scheduleBackgroundTask } from '../background-handler';import { findOrCacheKeyValueStoreByPossibleId } from '../cache-helpers';import type { MemoryStorage } from '../index';+import { KeyValueStoreClient } from './key-value-store';export interface KeyValueStoreCollectionClientOptions {baseStorageDirectory: string;diff --git a/packages/memory-storage/src/resource-clients/request-queue-collection.ts b/packages/memory-storage/src/resource-clients/request-queue-collection.tsindex 290867bd3..004fd3aac 100644--- a/packages/memory-storage/src/resource-clients/request-queue-collection.ts+++ b/packages/memory-storage/src/resource-clients/request-queue-collection.ts@@ -3,10 +3,10 @@ import { resolve } from 'node:path';import type * as storage from '@crawlee/types';import { s } from '@sapphire/shapeshift';-import { RequestQueueClient } from './request-queue';import { scheduleBackgroundTask } from '../background-handler';import { findRequestQueueByPossibleId } from '../cache-helpers';import type { MemoryStorage } from '../index';+import { RequestQueueClient } from './request-queue';export interface RequestQueueCollectionClientOptions {baseStorageDirectory: string;diff --git a/packages/memory-storage/src/utils.ts b/packages/memory-storage/src/utils.tsindex d372aa2e4..b423bfb48 100644--- a/packages/memory-storage/src/utils.ts+++ b/packages/memory-storage/src/utils.ts@@ -1,9 +1,10 @@import { createHash } from 'node:crypto';-import defaultLog from '@apify/log';import type * as storage from '@crawlee/types';import { s } from '@sapphire/shapeshift';+import defaultLog from '@apify/log';+import { REQUEST_ID_LENGTH } from './consts';/**diff --git a/packages/memory-storage/test/__shared__.ts b/packages/memory-storage/test/__shared__.tsindex dbfce6d2d..5a2769b87 100644--- a/packages/memory-storage/test/__shared__.ts+++ b/packages/memory-storage/test/__shared__.ts@@ -4,6 +4,7 @@ import { setTimeout } from 'node:timers/promises';export async function waitTillWrittenToDisk(path: string): Promise<void> {try {await access(path);+ return undefined;} catch {await setTimeout(50);return waitTillWrittenToDisk(path);diff --git a/packages/memory-storage/test/key-value-store/with-extension.test.ts b/packages/memory-storage/test/key-value-store/with-extension.test.tsindex 50288ee47..58bceb191 100644--- a/packages/memory-storage/test/key-value-store/with-extension.test.ts+++ b/packages/memory-storage/test/key-value-store/with-extension.test.ts@@ -1,6 +1,6 @@import { resolve } from 'node:path';-import { existsSync, emptyDirSync } from 'fs-extra';+import { emptyDirSync, existsSync } from 'fs-extra';import { createKeyValueStorageImplementation } from 'packages/memory-storage/src/fs/key-value-store';describe('KeyValueStore should append extension only when needed', () => {diff --git a/packages/playwright-crawler/src/internals/adaptive-playwright-crawler.ts b/packages/playwright-crawler/src/internals/adaptive-playwright-crawler.tsindex 82bd77d8b..95284f23b 100644--- a/packages/playwright-crawler/src/internals/adaptive-playwright-crawler.ts+++ b/packages/playwright-crawler/src/internals/adaptive-playwright-crawler.ts@@ -1,5 +1,3 @@-import type { Log } from '@apify/log';-import { addTimeoutToPromise } from '@apify/timeout';import {extractUrlsFromPage,type LoadedContext,@@ -8,22 +6,25 @@ import {type RouterHandler,} from '@crawlee/browser';import type {- RestrictedCrawlingContext,- StatisticState,- StatisticsOptions,- StatisticPersistedState,GetUserDataFromRequest,+ RestrictedCrawlingContext,RouterRoutes,+ StatisticPersistedState,+ StatisticsOptions,+ StatisticState,} from '@crawlee/core';import { Configuration, RequestHandlerResult, Router, Statistics, withCheckedStorageAccess } from '@crawlee/core';import type { Awaitable, Dictionary } from '@crawlee/types';import { type CheerioRoot, extractUrlsFromCheerio } from '@crawlee/utils';-import { load, type Cheerio, type Element } from 'cheerio';+import { type Cheerio, type Element, load } from 'cheerio';import isEqual from 'lodash.isequal';+import type { Log } from '@apify/log';+import { addTimeoutToPromise } from '@apify/timeout';+import type { PlaywrightCrawlerOptions, PlaywrightCrawlingContext } from './playwright-crawler';import { PlaywrightCrawler } from './playwright-crawler';-import { RenderingTypePredictor, type RenderingType } from './utils/rendering-type-prediction';+import { type RenderingType, RenderingTypePredictor } from './utils/rendering-type-prediction';type Result<TResult> =| { result: TResult; ok: true; logs?: LogProxyCall[] }diff --git a/packages/playwright-crawler/src/internals/enqueue-links/click-elements.ts b/packages/playwright-crawler/src/internals/enqueue-links/click-elements.tsindex 897e7da97..2a12000fb 100644--- a/packages/playwright-crawler/src/internals/enqueue-links/click-elements.ts+++ b/packages/playwright-crawler/src/internals/enqueue-links/click-elements.ts@@ -1,25 +1,26 @@-import { URL } from 'url';+import { URL } from 'node:url';-import log_ from '@apify/log';import type {GlobInput,PseudoUrlInput,RegExpInput,- RequestTransform,- UrlPatternObject,RequestOptions,RequestProvider,+ RequestTransform,+ UrlPatternObject,} from '@crawlee/browser';import {constructGlobObjectsFromGlobs,constructRegExpObjectsFromPseudoUrls,constructRegExpObjectsFromRegExps,- createRequests,createRequestOptions,+ createRequests,} from '@crawlee/browser';-import type { Dictionary, BatchAddRequestsResult } from '@crawlee/types';+import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';import ow from 'ow';-import type { Page, Frame, Request, Route } from 'playwright';+import type { Frame, Page, Request, Route } from 'playwright';++import log_ from '@apify/log';const STARTING_Z_INDEX = 2147400000;const log = log_.child({ prefix: 'Playwright Click Elements' });diff --git a/packages/playwright-crawler/src/internals/utils/playwright-utils.ts b/packages/playwright-crawler/src/internals/utils/playwright-utils.tsindex 12b9dbe23..4531f43cb 100644--- a/packages/playwright-crawler/src/internals/utils/playwright-utils.ts+++ b/packages/playwright-crawler/src/internals/utils/playwright-utils.ts@@ -19,12 +19,17 @@*/import { readFile } from 'node:fs/promises';-import vm from 'vm';--import { LruCache } from '@apify/datastructures';-import log_ from '@apify/log';-import type { Request, Session } from '@crawlee/browser';-import { SessionError, validators, KeyValueStore, RequestState, Configuration } from '@crawlee/browser';+import vm from 'node:vm';++import {+ Configuration,+ KeyValueStore,+ type Request,+ RequestState,+ type Session,+ SessionError,+ validators,+} from '@crawlee/browser';import type { BatchAddRequestsResult } from '@crawlee/types';import { type CheerioRoot, type Dictionary, expandShadowRoots, sleep } from '@crawlee/utils';import * as cheerio from 'cheerio';@@ -32,10 +37,13 @@ import { getInjectableScript as getCookieClosingScript } from 'idcac-playwright'import ow from 'ow';import type { Page, Response, Route } from 'playwright';-import { RenderingTypePredictor } from './rendering-type-prediction';+import { LruCache } from '@apify/datastructures';+import log_ from '@apify/log';+import type { EnqueueLinksByClickingElementsOptions } from '../enqueue-links/click-elements';import { enqueueLinksByClickingElements } from '../enqueue-links/click-elements';import type { PlaywrightCrawlerOptions, PlaywrightCrawlingContext } from '../playwright-crawler';+import { RenderingTypePredictor } from './rendering-type-prediction';const log = log_.child({ prefix: 'Playwright Utils' });@@ -223,6 +231,8 @@ export async function gotoExtended(} catch (error) {log.debug('Error inside request interceptor', { error });}++ return undefined;};await page.route('**/*', interceptRequestHandler);@@ -297,7 +307,7 @@ export async function blockRequests(page: Page, options: BlockRequestsOptions =await client.send('Network.enable');await client.send('Network.setBlockedURLs', { urls: patternsToBlock });- } catch (error) {+ } catch {log.warning('blockRequests() helper is incompatible with non-Chromium browsers.');}}diff --git a/packages/playwright-crawler/src/logistic-regression.d.ts b/packages/playwright-crawler/src/logistic-regression.d.tsindex b9ac28879..d9dbfa4f7 100644--- a/packages/playwright-crawler/src/logistic-regression.d.ts+++ b/packages/playwright-crawler/src/logistic-regression.d.ts@@ -1,5 +1,5 @@declare module 'ml-logistic-regression' {- import Matrix from 'ml-matrix';+ import type Matrix from 'ml-matrix';class LogisticRegressionTwoClasses {testScores(Xtest: Matrix): number;diff --git a/packages/puppeteer-crawler/src/internals/enqueue-links/click-elements.ts b/packages/puppeteer-crawler/src/internals/enqueue-links/click-elements.tsindex e34ffc9e9..73347ae90 100644--- a/packages/puppeteer-crawler/src/internals/enqueue-links/click-elements.ts+++ b/packages/puppeteer-crawler/src/internals/enqueue-links/click-elements.ts@@ -1,26 +1,27 @@-import { URL } from 'url';+import { URL } from 'node:url';-import log_ from '@apify/log';import type {GlobInput,PseudoUrlInput,RegExpInput,- RequestTransform,- UrlPatternObject,RequestOptions,RequestProvider,+ RequestTransform,+ UrlPatternObject,} from '@crawlee/browser';import {constructGlobObjectsFromGlobs,constructRegExpObjectsFromPseudoUrls,constructRegExpObjectsFromRegExps,- createRequests,createRequestOptions,+ createRequests,} from '@crawlee/browser';-import type { Dictionary, BatchAddRequestsResult } from '@crawlee/types';+import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';import ow from 'ow';import type { ClickOptions, Frame, HTTPRequest as PuppeteerRequest, Page, Target } from 'puppeteer';+import log_ from '@apify/log';+import { addInterceptRequestHandler, removeInterceptRequestHandler } from '../utils/puppeteer_request_interception';const STARTING_Z_INDEX = 2147400000;@@ -351,6 +352,8 @@ function createInterceptRequestHandler(page: Page, requests: Set<string>): (req:} else {await req.abort('aborted'); // Prevents navigation by js}++ return undefined;};}diff --git a/packages/puppeteer-crawler/src/internals/utils/puppeteer_request_interception.ts b/packages/puppeteer-crawler/src/internals/utils/puppeteer_request_interception.tsindex 36c6f2db5..d5b1f44a3 100644--- a/packages/puppeteer-crawler/src/internals/utils/puppeteer_request_interception.ts+++ b/packages/puppeteer-crawler/src/internals/utils/puppeteer_request_interception.ts@@ -1,10 +1,13 @@-import { EventEmitter } from 'events';+import { EventEmitter } from 'node:events';-import log from '@apify/log';import type { Dictionary } from '@crawlee/utils';import ow from 'ow';import type { HTTPRequest, HTTPRequest as PuppeteerRequest, Page } from 'puppeteer';+import log from '@apify/log';++export type InterceptHandler = (request: PuppeteerRequest) => unknown;+// We use weak maps here so that the content gets discarded after page gets closed.const pageInterceptRequestHandlersMap: WeakMap<Page, InterceptHandler[]> = new WeakMap(); // Maps page to an array of request interception handlers.const pageInterceptRequestMasterHandlerMap = new WeakMap(); // Maps page to master request interception handler.@@ -34,8 +37,6 @@ class ObservableSet<T> extends EventEmitter {}}-export type InterceptHandler = (request: PuppeteerRequest) => unknown;-/*** Makes all request headers capitalized to more look like in browser*/@@ -65,7 +66,7 @@ function browserifyHeaders(headers: Record<string, string>): Record<string, striasync function handleRequest(request: PuppeteerRequest, interceptRequestHandlers?: InterceptHandler[]): Promise<void> {// If there are no intercept handlers, it means that request interception is not enabled (anymore)// and therefore .abort() .respond() and .continue() would throw and crash the process.- if (!interceptRequestHandlers?.length) return;+ if (!interceptRequestHandlers?.length) return undefined;let wasAborted = false;let wasResponded = false;@@ -101,7 +102,7 @@ async function handleRequest(request: PuppeteerRequest, interceptRequestHandlers}// If request was aborted or responded then we can finish immediately.- if (wasAborted || wasResponded) return;+ if (wasAborted || wasResponded) return undefined;}return originalContinue(accumulatedOverrides);diff --git a/packages/puppeteer-crawler/src/internals/utils/puppeteer_utils.ts b/packages/puppeteer-crawler/src/internals/utils/puppeteer_utils.tsindex 51a4d7b7c..425415ce3 100644--- a/packages/puppeteer-crawler/src/internals/utils/puppeteer_utils.ts+++ b/packages/puppeteer-crawler/src/internals/utils/puppeteer_utils.ts@@ -18,26 +18,27 @@* @module puppeteerUtils*/-import { readFile } from 'fs/promises';-import vm from 'vm';+import { readFile } from 'node:fs/promises';+import vm from 'node:vm';-import { LruCache } from '@apify/datastructures';-import log_ from '@apify/log';import type { Request } from '@crawlee/browser';-import { KeyValueStore, RequestState, validators, Configuration } from '@crawlee/browser';-import type { Dictionary, BatchAddRequestsResult } from '@crawlee/types';+import { Configuration, KeyValueStore, RequestState, validators } from '@crawlee/browser';+import type { BatchAddRequestsResult, Dictionary } from '@crawlee/types';import { type CheerioRoot, expandShadowRoots, sleep } from '@crawlee/utils';import * as cheerio from 'cheerio';import type { ProtocolMapping } from 'devtools-protocol/types/protocol-mapping.js';import { getInjectableScript } from 'idcac-playwright';import ow from 'ow';-import type { Page, HTTPResponse, ResponseForRequest, HTTPRequest as PuppeteerRequest } from 'puppeteer';+import type { HTTPRequest as PuppeteerRequest, HTTPResponse, Page, ResponseForRequest } from 'puppeteer';++import { LruCache } from '@apify/datastructures';+import log_ from '@apify/log';-import type { InterceptHandler } from './puppeteer_request_interception';-import { addInterceptRequestHandler, removeInterceptRequestHandler } from './puppeteer_request_interception';import type { EnqueueLinksByClickingElementsOptions } from '../enqueue-links/click-elements';import { enqueueLinksByClickingElements } from '../enqueue-links/click-elements';import type { PuppeteerCrawlerOptions, PuppeteerCrawlingContext } from '../puppeteer-crawler';+import type { InterceptHandler } from './puppeteer_request_interception';+import { addInterceptRequestHandler, removeInterceptRequestHandler } from './puppeteer_request_interception';const jqueryPath = require.resolve('jquery');@@ -396,7 +397,7 @@ export async function cacheResponses(body: buffer,};}- } catch (e) {+ } catch {// ignore errors, usually means that buffer is empty or broken connection}});@@ -504,6 +505,8 @@ export async function gotoExtended(if (!isEmpty(headers)) overrides.headers = headers;await removeInterceptRequestHandler(page, interceptRequestHandler);await interceptedRequest.continue(overrides);++ return undefined;};await addInterceptRequestHandler(page, interceptRequestHandler);diff --git a/packages/templates/src/index.ts b/packages/templates/src/index.tsindex 942aac957..836ba630c 100644--- a/packages/templates/src/index.ts+++ b/packages/templates/src/index.ts@@ -1,4 +1,4 @@-import https from 'https';+import https from 'node:https';export const MANIFEST_URL = 'https://raw.githubusercontent.com/apify/crawlee/master/packages/templates/manifest.json';@@ -21,17 +21,17 @@ interface RawManifest {}// Data returned for the CLI or users to consume-export interface Manifest {- templates: Template[];+export interface TemplateFile {+ path: string;+ url: string;}export interface Template extends SharedTemplateData {files: TemplateFile[];}-export interface TemplateFile {- path: string;- url: string;+export interface Manifest {+ templates: Template[];}export async function fetchManifest(): Promise<Manifest> {diff --git a/packages/templates/templates/puppeteer-ts/src/main.ts b/packages/templates/templates/puppeteer-ts/src/main.tsindex d613d1e88..04b43ec21 100644--- a/packages/templates/templates/puppeteer-ts/src/main.ts+++ b/packages/templates/templates/puppeteer-ts/src/main.ts@@ -1,5 +1,5 @@// For more information, see https://crawlee.dev/-import { PuppeteerCrawler, log } from 'crawlee';+import { log, PuppeteerCrawler } from 'crawlee';import { router } from './routes.js';diff --git a/packages/types/src/storages.ts b/packages/types/src/storages.tsindex df6bd18b5..799e6d139 100644--- a/packages/types/src/storages.ts+++ b/packages/types/src/storages.ts@@ -27,6 +27,25 @@ export interface DatasetCollectionData {accessedAt: Date;}+export interface PaginatedList<Data> {+ /** Total count of entries in the dataset. */+ total: number;+ /** Count of dataset entries returned in this set. */+ count: number;+ /** Position of the first returned entry in the dataset. */+ offset: number;+ /** Maximum number of dataset entries requested. */+ limit: number;+ /** Should the results be in descending order. */+ desc?: boolean;+ /** Dataset entries based on chosen format parameter. */+ items: Data[];+}++export interface Dataset extends DatasetCollectionData {+ itemCount: number;+}+/*** Dataset collection client.*/@@ -35,10 +54,6 @@ export interface DatasetCollectionClient {getOrCreate(name?: string): Promise<DatasetCollectionData>;}-export interface Dataset extends DatasetCollectionData {- itemCount: number;-}-export interface DatasetClientUpdateOptions {name?: string;}@@ -49,21 +64,6 @@ export interface DatasetClientListOptions {offset?: number;}-export interface PaginatedList<Data> {- /** Total count of entries in the dataset. */- total: number;- /** Count of dataset entries returned in this set. */- count: number;- /** Position of the first returned entry in the dataset. */- offset: number;- /** Maximum number of dataset entries requested. */- limit: number;- /** Should the results be in descending order. */- desc?: boolean;- /** Dataset entries based on chosen format parameter. */- items: Data[];-}-export interface DatasetInfo {id: string;name?: string;@@ -90,6 +90,14 @@ export interface DatasetClient<Data extends Dictionary = Dictionary> {pushItems(items: Data | Data[] | string | string[]): Promise<void>;}+export interface KeyValueStoreStats {+ readCount?: number;+ writeCount?: number;+ deleteCount?: number;+ listCount?: number;+ storageBytes?: number;+}+export interface KeyValueStoreInfo {id: string;name?: string;@@ -102,14 +110,6 @@ export interface KeyValueStoreInfo {stats?: KeyValueStoreStats;}-export interface KeyValueStoreStats {- readCount?: number;- writeCount?: number;- deleteCount?: number;- listCount?: number;- storageBytes?: number;-}-/*** Key-value store collection client.*/@@ -166,27 +166,12 @@ export interface KeyValueStoreClient {deleteRecord(key: string): Promise<void>;}-/**- * Request queue collection client.- */-export interface RequestQueueCollectionClient {- list(): Promise<PaginatedList<RequestQueueInfo>>;- getOrCreate(name: string): Promise<RequestQueueInfo>;-}--export interface QueueHead {- limit: number;- queueModifiedAt: Date;- hadMultipleClients?: boolean;- items: RequestQueueHeadItem[];-}--export interface RequestQueueHeadItem {- id: string;- retryCount: number;- uniqueKey: string;- url: string;- method: AllowedHttpMethods;+export interface RequestQueueStats {+ readCount?: number;+ writeCount?: number;+ deleteCount?: number;+ headItemReadCount?: number;+ storageBytes?: number;}export interface RequestQueueInfo {@@ -206,12 +191,27 @@ export interface RequestQueueInfo {stats?: RequestQueueStats;}-export interface RequestQueueStats {- readCount?: number;- writeCount?: number;- deleteCount?: number;- headItemReadCount?: number;- storageBytes?: number;+/**+ * Request queue collection client.+ */+export interface RequestQueueCollectionClient {+ list(): Promise<PaginatedList<RequestQueueInfo>>;+ getOrCreate(name: string): Promise<RequestQueueInfo>;+}++export interface RequestQueueHeadItem {+ id: string;+ retryCount: number;+ uniqueKey: string;+ url: string;+ method: AllowedHttpMethods;+}++export interface QueueHead {+ limit: number;+ queueModifiedAt: Date;+ hadMultipleClients?: boolean;+ items: RequestQueueHeadItem[];}export interface ListOptions {diff --git a/packages/utils/src/internals/cheerio.ts b/packages/utils/src/internals/cheerio.tsindex e0cfbc03b..6a42ec70e 100644--- a/packages/utils/src/internals/cheerio.ts+++ b/packages/utils/src/internals/cheerio.ts@@ -1,5 +1,5 @@import type { Dictionary } from '@crawlee/types';-import type { load, CheerioAPI } from 'cheerio';+import type { CheerioAPI, load } from 'cheerio';import * as cheerio from 'cheerio';import { tryAbsoluteURL } from './extract-urls';@@ -93,7 +93,7 @@ export function htmlToText(htmlOrCheerioElement: string | CheerioRoot): string {* @throws when a relative URL is encountered with no baseUrl set* @return An array of absolute URLs*/-export function extractUrlsFromCheerio($: CheerioAPI, selector: string = 'a', baseUrl: string = ''): string[] {+export function extractUrlsFromCheerio($: CheerioAPI, selector = 'a', baseUrl = ''): string[] {const base = $('base').attr('href');const absoluteBaseUrl = base && tryAbsoluteURL(base, baseUrl);diff --git a/packages/utils/src/internals/debug.ts b/packages/utils/src/internals/debug.tsindex efacc7e05..a7ca60f5c 100644--- a/packages/utils/src/internals/debug.ts+++ b/packages/utils/src/internals/debug.ts@@ -1,6 +1,6 @@import type { IncomingMessage } from 'node:http';-import type { Dictionary, AllowedHttpMethods } from '@crawlee/types';+import type { AllowedHttpMethods, Dictionary } from '@crawlee/types';import ow from 'ow';interface BrowserResponseLike {diff --git a/packages/utils/src/internals/memory-info.ts b/packages/utils/src/internals/memory-info.tsindex c4c2f9972..4cc8024c6 100644--- a/packages/utils/src/internals/memory-info.ts+++ b/packages/utils/src/internals/memory-info.ts@@ -3,10 +3,11 @@ import { access, readFile } from 'node:fs/promises';import { freemem, totalmem } from 'node:os';import util from 'node:util';+import type { Dictionary } from '@crawlee/types';+import log from '@apify/log';// @ts-expect-error We need to add typings for @apify/ps-treeimport psTree from '@apify/ps-tree';-import type { Dictionary } from '@crawlee/types';import { isDocker } from './general';diff --git a/packages/utils/src/internals/sitemap.ts b/packages/utils/src/internals/sitemap.tsindex 471230c29..cb8c00f9c 100644--- a/packages/utils/src/internals/sitemap.ts+++ b/packages/utils/src/internals/sitemap.ts@@ -1,15 +1,16 @@import { createHash } from 'node:crypto';import type { Duplex } from 'node:stream';-import { PassThrough, Readable, Transform, pipeline } from 'node:stream';+import { PassThrough, pipeline, Readable, Transform } from 'node:stream';import { StringDecoder } from 'node:string_decoder';import { createGunzip } from 'node:zlib';-import log from '@apify/log';// @ts-expect-error This throws a compilation error due to got-scraping being ESM only but we only import typesimport type { Delays } from 'got-scraping';import sax from 'sax';import MIMEType from 'whatwg-mimetype';+import log from '@apify/log';+interface SitemapUrlData {loc: string;lastmod?: Date;@@ -31,7 +32,7 @@ type SitemapItem = ({ type: 'url' } & SitemapUrlData) | { type: 'sitemapUrl'; urclass SitemapTxtParser extends Transform {private decoder: StringDecoder = new StringDecoder('utf8');- private buffer: string = '';+ private buffer = '';constructor() {super({@@ -199,12 +200,12 @@ export async function* parseSitemap<T extends ParseSitemapOptions>(const sources = [...initialSources];const visitedSitemapUrls = new Set<string>();- const createParser = (contentType: string = '', url?: URL): Duplex => {+ const createParser = (contentType = '', url?: URL): Duplex => {let mimeType: MIMEType | null;try {mimeType = new MIMEType(contentType);- } catch (e) {+ } catch {mimeType = null;}@@ -246,7 +247,7 @@ export async function* parseSitemap<T extends ParseSitemapOptions>(method: 'GET',timeout: networkTimeouts,headers: {- 'accept': 'text/plain, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8',+ accept: 'text/plain, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8',},});request.on('response', () => resolve(request));@@ -320,8 +321,7 @@ export async function* parseSitemap<T extends ParseSitemapOptions>(if (item.type === 'sitemapUrl' && !visitedSitemapUrls.has(item.url)) {sources.push({ type: 'url', url: item.url, depth: (source.depth ?? 0) + 1 });if (emitNestedSitemaps) {- // @ts-ignore- yield { loc: item.url, originSitemapUrl: null };+ yield { loc: item.url, originSitemapUrl: null } as any;}}@@ -411,7 +411,7 @@ export class Sitemap {for await (const item of parseSitemap(sources, proxyUrl, parseSitemapOptions)) {urls.push(item.loc);}- } catch (e) {+ } catch {return new Sitemap([]);}diff --git a/packages/utils/src/internals/social.ts b/packages/utils/src/internals/social.tsindex b2de7bd2b..7eccc7a2e 100644--- a/packages/utils/src/internals/social.ts+++ b/packages/utils/src/internals/social.ts@@ -213,91 +213,6 @@ export interface SocialHandles {discords: string[];}-/**- * The function attempts to extract emails, phone numbers and social profile URLs from a HTML document,- * specifically LinkedIn, Twitter, Instagram and Facebook profile URLs.- * The function removes duplicates from the resulting arrays and sorts the items alphabetically.- *- * Note that the `phones` field contains phone numbers extracted from the special phone links- * such as `[call us](tel:+1234556789)` (see {@apilink phonesFromUrls})- * and potentially other sources with high certainty, while `phonesUncertain` contains phone numbers- * extracted from the plain text, which might be very inaccurate.- *- * **Example usage:**- * ```typescript- * import { launchPuppeteer, social } from 'crawlee';- *- * const browser = await launchPuppeteer();- * const page = await browser.newPage();- * await page.goto('http://www.example.com');- * const html = await page.content();- *- * const result = social.parseHandlesFromHtml(html);- * console.log('Social handles:');- * console.dir(result);- * ```- *- * @param html HTML text- * @param [data] Optional object which will receive the `text` and `$` properties- * that contain text content of the HTML and `cheerio` object, respectively. This is an optimization- * so that the caller doesn't need to parse the HTML document again, if needed.- * @return An object with the social handles.- */-export function parseHandlesFromHtml(html: string, data: Record<string, unknown> | null = null): SocialHandles {- const result: SocialHandles = {- emails: [],- phones: [],- phonesUncertain: [],- linkedIns: [],- twitters: [],- instagrams: [],- facebooks: [],- youtubes: [],- tiktoks: [],- pinterests: [],- discords: [],- };-- if ((typeof html as unknown) !== 'string') return result;-- const $ = cheerio.load(html, { decodeEntities: true });- if (data) data.$ = $;-- const text = htmlToText($);- if (data) data.text = text;-- // Find all <a> links with href tag- const linkUrls: string[] = [];- $('a[href]').each((_index, elem) => {- if (elem) linkUrls.push($(elem).attr('href')!);- });-- result.emails = emailsFromUrls(linkUrls).concat(emailsFromText(text));- result.phones = phonesFromUrls(linkUrls);- result.phonesUncertain = phonesFromText(text);-- // Note that these regexps extract just the base profile path. For example for- // https://www.linkedin.com/in/carl-newman-123456a/detail/recent-activity/- // they match just:- // https://www.linkedin.com/in/carl-newman-123456a- result.linkedIns = html.match(LINKEDIN_REGEX_GLOBAL) || [];- result.twitters = html.match(TWITTER_REGEX_GLOBAL) || [];- result.instagrams = html.match(INSTAGRAM_REGEX_GLOBAL) || [];- result.facebooks = html.match(FACEBOOK_REGEX_GLOBAL) || [];- result.youtubes = html.match(YOUTUBE_REGEX_GLOBAL) || [];- result.tiktoks = html.match(TIKTOK_REGEX_GLOBAL) || [];- result.pinterests = html.match(PINTEREST_REGEX_GLOBAL) || [];- result.discords = html.match(DISCORD_REGEX_GLOBAL) || [];-- // Sort and deduplicate handles- for (const key of Object.keys(result) as (keyof SocialHandles)[]) {- result[key].sort();- result[key] = [...new Set(result[key])].sort();- }-- return result;-}-/*** Regular expression to exactly match a single LinkedIn profile URL.* It has the following form: `/^...$/i` and matches URLs such as:@@ -712,3 +627,88 @@ export const DISCORD_REGEX = new RegExp(`^${DISCORD_REGEX_STRING}$`, 'i');* ```*/export const DISCORD_REGEX_GLOBAL = new RegExp(DISCORD_REGEX_STRING, 'ig');++/**+ * The function attempts to extract emails, phone numbers and social profile URLs from a HTML document,+ * specifically LinkedIn, Twitter, Instagram and Facebook profile URLs.+ * The function removes duplicates from the resulting arrays and sorts the items alphabetically.+ *+ * Note that the `phones` field contains phone numbers extracted from the special phone links+ * such as `[call us](tel:+1234556789)` (see {@apilink phonesFromUrls})+ * and potentially other sources with high certainty, while `phonesUncertain` contains phone numbers+ * extracted from the plain text, which might be very inaccurate.+ *+ * **Example usage:**+ * ```typescript+ * import { launchPuppeteer, social } from 'crawlee';+ *+ * const browser = await launchPuppeteer();+ * const page = await browser.newPage();+ * await page.goto('http://www.example.com');+ * const html = await page.content();+ *+ * const result = social.parseHandlesFromHtml(html);+ * console.log('Social handles:');+ * console.dir(result);+ * ```+ *+ * @param html HTML text+ * @param [data] Optional object which will receive the `text` and `$` properties+ * that contain text content of the HTML and `cheerio` object, respectively. This is an optimization+ * so that the caller doesn't need to parse the HTML document again, if needed.+ * @return An object with the social handles.+ */+export function parseHandlesFromHtml(html: string, data: Record<string, unknown> | null = null): SocialHandles {+ const result: SocialHandles = {+ emails: [],+ phones: [],+ phonesUncertain: [],+ linkedIns: [],+ twitters: [],+ instagrams: [],+ facebooks: [],+ youtubes: [],+ tiktoks: [],+ pinterests: [],+ discords: [],+ };++ if ((typeof html as unknown) !== 'string') return result;++ const $ = cheerio.load(html, { decodeEntities: true });+ if (data) data.$ = $;++ const text = htmlToText($);+ if (data) data.text = text;++ // Find all <a> links with href tag+ const linkUrls: string[] = [];+ $('a[href]').each((_index, elem) => {+ if (elem) linkUrls.push($(elem).attr('href')!);+ });++ result.emails = emailsFromUrls(linkUrls).concat(emailsFromText(text));+ result.phones = phonesFromUrls(linkUrls);+ result.phonesUncertain = phonesFromText(text);++ // Note that these regexps extract just the base profile path. For example for+ // https://www.linkedin.com/in/carl-newman-123456a/detail/recent-activity/+ // they match just:+ // https://www.linkedin.com/in/carl-newman-123456a+ result.linkedIns = html.match(LINKEDIN_REGEX_GLOBAL) || [];+ result.twitters = html.match(TWITTER_REGEX_GLOBAL) || [];+ result.instagrams = html.match(INSTAGRAM_REGEX_GLOBAL) || [];+ result.facebooks = html.match(FACEBOOK_REGEX_GLOBAL) || [];+ result.youtubes = html.match(YOUTUBE_REGEX_GLOBAL) || [];+ result.tiktoks = html.match(TIKTOK_REGEX_GLOBAL) || [];+ result.pinterests = html.match(PINTEREST_REGEX_GLOBAL) || [];+ result.discords = html.match(DISCORD_REGEX_GLOBAL) || [];++ // Sort and deduplicate handles+ for (const key of Object.keys(result) as (keyof SocialHandles)[]) {+ result[key].sort();+ result[key] = [...new Set(result[key])].sort();+ }++ return result;+}diff --git a/packages/utils/src/internals/systemInfoV2/ps-tree.ts b/packages/utils/src/internals/systemInfoV2/ps-tree.tsindex 395539d55..b1f39d27d 100644--- a/packages/utils/src/internals/systemInfoV2/ps-tree.ts+++ b/packages/utils/src/internals/systemInfoV2/ps-tree.ts@@ -1,6 +1,6 @@-import type { ChildProcess } from 'child_process';-import { spawn } from 'child_process';-import * as readline from 'readline';+import type { ChildProcess } from 'node:child_process';+import { spawn } from 'node:child_process';+import * as readline from 'node:readline';export interface ProcessInfo {PPID: string;@@ -24,7 +24,7 @@ type ProcessInfoStringKeys = {* Defaults to false.* @internal*/-export async function psTree(pid: number | string, includeRoot: boolean = false): Promise<ProcessInfo[]> {+export async function psTree(pid: number | string, includeRoot = false): Promise<ProcessInfo[]> {return new Promise((resolve, reject) => {if (typeof pid === 'number') {pid = pid.toString();diff --git a/packages/utils/test/robots.test.ts b/packages/utils/test/robots.test.tsindex 7ed14a590..72e79ffce 100644--- a/packages/utils/test/robots.test.ts+++ b/packages/utils/test/robots.test.ts@@ -1,5 +1,5 @@import nock from 'nock';-import { describe, expect, it, beforeEach } from 'vitest';+import { beforeEach, describe, expect, it } from 'vitest';import { RobotsFile } from '../src/internals/robots';diff --git a/packages/utils/test/sitemap.test.ts b/packages/utils/test/sitemap.test.tsindex 5b6225ddd..bc04e8ab3 100644--- a/packages/utils/test/sitemap.test.ts+++ b/packages/utils/test/sitemap.test.ts@@ -1,8 +1,8 @@import nock from 'nock';-import { describe, expect, it, beforeEach } from 'vitest';+import { beforeEach, describe, expect, it } from 'vitest';import type { SitemapUrl } from '../src/internals/sitemap';-import { Sitemap, parseSitemap } from '../src/internals/sitemap';+import { parseSitemap, Sitemap } from '../src/internals/sitemap';describe('Sitemap', () => {beforeEach(() => {@@ -180,7 +180,7 @@ describe('Sitemap', () => {2005-02-03</lastmod>`,`<changefreq>-+monthly</changefreq>`,`<priority>diff --git a/scripts/copy.ts b/scripts/copy.tsindex a5fe0c356..2c4024386 100644--- a/scripts/copy.ts+++ b/scripts/copy.ts@@ -1,4 +1,4 @@-/* eslint-disable @typescript-eslint/no-var-requires,import/no-dynamic-require,global-require */+/* eslint-disable import/no-dynamic-require,global-require */import { execSync } from 'node:child_process';import { copyFileSync, readFileSync, writeFileSync } from 'node:fs';import { resolve } from 'node:path';@@ -31,7 +31,6 @@ function getRootVersion(bump = true): string {return rootVersion;}- // eslint-disable-next-line @typescript-eslint/no-var-requires,import/no-dynamic-require,global-requirerootVersion = require(resolve(root, './lerna.json')).version.replace(/^(\d+\.\d+\.\d+)-?.*$/, '$1');if (bump) {@@ -61,7 +60,6 @@ function getNextVersion() {const version = getRootVersion();if (versions.some((v) => v === version)) {- // eslint-disable-next-line no-consoleconsole.error(`before-deploy: A release with version ${version} already exists. Please increment version accordingly.`,);@@ -95,7 +93,6 @@ if (options.canary) {}}- // eslint-disable-next-line no-consoleconsole.info(`canary: setting version to ${nextVersion}`);writeFileSync(pkgPath, `${JSON.stringify(pkgJson, null, 4)}\n`);@@ -111,7 +108,6 @@ if (options['pin-versions']) {}}- // eslint-disable-next-line no-consoleconsole.info(`pin-versions: version ${version}`, pkgJson.dependencies);writeFileSync(pkgPath, `${JSON.stringify(pkgJson, null, 4)}\n`);diff --git a/test/browser-pool/browser-plugins/plugins.test.ts b/test/browser-pool/browser-plugins/plugins.test.tsindex beae39ca5..5ceebafa7 100644--- a/test/browser-pool/browser-plugins/plugins.test.ts+++ b/test/browser-pool/browser-plugins/plugins.test.ts@@ -1,17 +1,17 @@-import type { Server } from 'http';-import http from 'http';-import type { AddressInfo } from 'net';-import { promisify } from 'util';+import type { Server } from 'node:http';+import http from 'node:http';+import type { AddressInfo } from 'node:net';+import { promisify } from 'node:util';+import type { CommonLibrary, UnwrapPromise } from '@crawlee/browser-pool';import {- PuppeteerPlugin,+ LaunchContext,+ PlaywrightBrowser,+ PlaywrightController,PlaywrightPlugin,PuppeteerController,- PlaywrightController,- PlaywrightBrowser,- LaunchContext,+ PuppeteerPlugin,} from '@crawlee/browser-pool';-import type { UnwrapPromise, CommonLibrary } from '@crawlee/browser-pool';import playwright from 'playwright';import type { Server as ProxyChainServer } from 'proxy-chain';import type { Browser } from 'puppeteer';diff --git a/test/browser-pool/browser-pool.test.ts b/test/browser-pool/browser-pool.test.tsindex 43d3cd233..655fde4cb 100644--- a/test/browser-pool/browser-pool.test.ts+++ b/test/browser-pool/browser-pool.test.ts@@ -1,21 +1,22 @@/* eslint-disable dot-notation -- Accessing private properties */-import http from 'http';-import { promisify } from 'util';+import http from 'node:http';+import { promisify } from 'node:util';-import { addTimeoutToPromise } from '@apify/timeout';import type { BrowserFingerprintWithHeaders } from 'fingerprint-generator';import playwright from 'playwright';import type { Server as ProxyChainServer } from 'proxy-chain';import type { Page } from 'puppeteer';import puppeteer from 'puppeteer';-import { createProxyServer } from './browser-plugins/create-proxy-server';+import { addTimeoutToPromise } from '@apify/timeout';+import type { BrowserController } from '../../packages/browser-pool/src/abstract-classes/browser-controller';import { BrowserPool } from '../../packages/browser-pool/src/browser-pool';import { BROWSER_POOL_EVENTS } from '../../packages/browser-pool/src/events';import { BrowserName, OperatingSystemsName } from '../../packages/browser-pool/src/fingerprinting/types';import { PlaywrightPlugin } from '../../packages/browser-pool/src/playwright/playwright-plugin';import { PuppeteerPlugin } from '../../packages/browser-pool/src/puppeteer/puppeteer-plugin';+import { createProxyServer } from './browser-plugins/create-proxy-server';const fingerprintingMatrix: [string, PlaywrightPlugin | PuppeteerPlugin][] = [[diff --git a/test/core/autoscaling/autoscaled_pool.test.ts b/test/core/autoscaling/autoscaled_pool.test.tsindex 44a085649..0118a3032 100644--- a/test/core/autoscaling/autoscaled_pool.test.ts+++ b/test/core/autoscaling/autoscaled_pool.test.ts@@ -1,7 +1,8 @@-import log from '@apify/log';import { AutoscaledPool } from '@crawlee/core';import { sleep } from '@crawlee/utils';+import log from '@apify/log';+describe('AutoscaledPool', () => {let logLevel: number;beforeAll(() => {diff --git a/test/core/autoscaling/snapshotter.test.ts b/test/core/autoscaling/snapshotter.test.tsindex e6a776c89..27f24ba1d 100644--- a/test/core/autoscaling/snapshotter.test.ts+++ b/test/core/autoscaling/snapshotter.test.ts@@ -1,11 +1,12 @@-import os from 'os';+import os from 'node:os';-import log from '@apify/log';import { Configuration, EventType, LocalEventManager, Snapshotter } from '@crawlee/core';import type { MemoryInfo } from '@crawlee/utils';import * as utils from '@crawlee/utils';import { sleep } from '@crawlee/utils';+import log from '@apify/log';+const toBytes = (x: number) => x * 1024 * 1024;describe('Snapshotter', () => {diff --git a/test/core/autoscaling/system_status.test.ts b/test/core/autoscaling/system_status.test.tsindex 86787f2b1..4dddab23a 100644--- a/test/core/autoscaling/system_status.test.ts+++ b/test/core/autoscaling/system_status.test.ts@@ -1,6 +1,7 @@-import log from '@apify/log';import { Snapshotter, SystemStatus } from '@crawlee/core';+import log from '@apify/log';+describe('SystemStatus', () => {let logLevel: number;beforeAll(() => {diff --git a/test/core/browser_launchers/playwright_launcher.test.ts b/test/core/browser_launchers/playwright_launcher.test.tsindex ec12e97a3..6e66f060d 100644--- a/test/core/browser_launchers/playwright_launcher.test.ts+++ b/test/core/browser_launchers/playwright_launcher.test.ts@@ -1,9 +1,9 @@-import fs from 'fs';-import type { Server } from 'http';-import http from 'http';-import type { AddressInfo } from 'net';-import path from 'path';-import util from 'util';+import fs from 'node:fs';+import type { Server } from 'node:http';+import http from 'node:http';+import type { AddressInfo } from 'node:net';+import path from 'node:path';+import util from 'node:util';import { BrowserLauncher, Configuration, launchPlaywright, PlaywrightLauncher } from '@crawlee/playwright';// @ts-expect-error no types@@ -47,7 +47,8 @@ beforeAll(async () => {if (!auth) {// optimization: don't invoke the child process if no// "Proxy-Authorization" header was given- return fn(null, false);+ fn(null, false);+ return;}const parsed = basicAuthParser(auth);const isEqual = JSON.stringify(parsed) === JSON.stringify(proxyAuth);diff --git a/test/core/browser_launchers/puppeteer_launcher.test.ts b/test/core/browser_launchers/puppeteer_launcher.test.tsindex 448fb6710..762248941 100644--- a/test/core/browser_launchers/puppeteer_launcher.test.ts+++ b/test/core/browser_launchers/puppeteer_launcher.test.ts@@ -1,9 +1,9 @@-import fs from 'fs';-import type { Server } from 'http';-import http from 'http';-import type { AddressInfo } from 'net';-import path from 'path';-import util from 'util';+import fs from 'node:fs';+import type { Server } from 'node:http';+import http from 'node:http';+import type { AddressInfo } from 'node:net';+import path from 'node:path';+import util from 'node:util';import { BrowserLauncher, launchPuppeteer } from '@crawlee/puppeteer';import type { Dictionary } from '@crawlee/utils';@@ -53,7 +53,8 @@ beforeAll(() => {if (!auth) {// optimization: don't invoke the child process if no// "Proxy-Authorization" header was given- return fn(null, false);+ fn(null, false);+ return;}const parsed = basicAuthParser(auth);const isEqual = JSON.stringify(parsed) === JSON.stringify(proxyAuth);diff --git a/test/core/crawlers/adaptive_playwright_crawler.test.ts b/test/core/crawlers/adaptive_playwright_crawler.test.tsindex 5eb420845..531e5a9b5 100644--- a/test/core/crawlers/adaptive_playwright_crawler.test.ts+++ b/test/core/crawlers/adaptive_playwright_crawler.test.ts@@ -1,5 +1,5 @@-import type { Server } from 'http';-import type { AddressInfo } from 'net';+import type { Server } from 'node:http';+import type { AddressInfo } from 'node:net';import { type Dictionary, KeyValueStore } from '@crawlee/core';import type { AdaptivePlaywrightCrawlerOptions } from '@crawlee/playwright';diff --git a/test/core/crawlers/basic_browser_crawler.ts b/test/core/crawlers/basic_browser_crawler.tsindex acbefc04b..620752da3 100644--- a/test/core/crawlers/basic_browser_crawler.ts+++ b/test/core/crawlers/basic_browser_crawler.ts@@ -1,5 +1,5 @@import type { PuppeteerPlugin } from '@crawlee/browser-pool';-import type { PuppeteerCrawlingContext, PuppeteerCrawlerOptions, PuppeteerGoToOptions } from '@crawlee/puppeteer';+import type { PuppeteerCrawlerOptions, PuppeteerCrawlingContext, PuppeteerGoToOptions } from '@crawlee/puppeteer';import { BrowserCrawler } from '@crawlee/puppeteer';import type { HTTPResponse, LaunchOptions } from 'puppeteer';diff --git a/test/core/crawlers/basic_crawler.test.ts b/test/core/crawlers/basic_crawler.test.tsindex aa988e540..713144109 100644--- a/test/core/crawlers/basic_crawler.test.ts+++ b/test/core/crawlers/basic_crawler.test.ts@@ -1,23 +1,21 @@-import { mkdir, mkdtemp } from 'fs/promises';-import type { Server } from 'http';-import http from 'http';-import type { AddressInfo } from 'net';-import { readFile, rm } from 'node:fs/promises';-import { join } from 'path';+import { mkdir, mkdtemp, readFile, rm } from 'node:fs/promises';+import type { Server } from 'node:http';+import http from 'node:http';+import type { AddressInfo } from 'node:net';+import { join } from 'node:path';-import log from '@apify/log';import type { CrawlingContext, ErrorHandler, RequestHandler } from '@crawlee/basic';import {- Request,- RequestQueue,- RequestList,- Configuration,BasicCrawler,- KeyValueStore,- EventType,- NonRetryableError,+ Configuration,CriticalError,+ EventType,+ KeyValueStore,MissingRouteError,+ NonRetryableError,+ Request,+ RequestList,+ RequestQueue,} from '@crawlee/basic';import { RequestState } from '@crawlee/core';import type { Dictionary } from '@crawlee/utils';@@ -25,6 +23,8 @@ import { sleep } from '@crawlee/utils';import express from 'express';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import log from '@apify/log';+import { startExpressAppPromise } from '../../shared/_helper';describe('BasicCrawler', () => {@@ -1393,7 +1393,7 @@ describe('BasicCrawler', () => {const payload: Dictionary[] = [{ foo: 'bar', baz: 123 }];const getPayload: (id: string) => Dictionary[] = (id) => [{ foo: id }];- const tmpDir: string = `${__dirname}/tmp/foo/bar`;+ const tmpDir = `${__dirname}/tmp/foo/bar`;beforeAll(async () => {await rm(tmpDir, { recursive: true, force: true });diff --git a/test/core/crawlers/browser_crawler.test.ts b/test/core/crawlers/browser_crawler.test.tsindex 6c740c7bc..439a8c57c 100644--- a/test/core/crawlers/browser_crawler.test.ts+++ b/test/core/crawlers/browser_crawler.test.ts@@ -1,7 +1,5 @@-import type { Server } from 'http';+import type { Server } from 'node:http';-import { ENV_VARS } from '@apify/consts';-import log from '@apify/log';import { BROWSER_POOL_EVENTS, BrowserPool, OperatingSystemsName, PuppeteerPlugin } from '@crawlee/browser-pool';import { BLOCKED_STATUS_CODES } from '@crawlee/core';import type { PuppeteerCrawlingContext, PuppeteerGoToOptions, PuppeteerRequestHandler } from '@crawlee/puppeteer';@@ -15,11 +13,14 @@ import {Session,} from '@crawlee/puppeteer';import { sleep } from '@crawlee/utils';-import puppeteer from 'puppeteer';import type { HTTPResponse } from 'puppeteer';+import puppeteer from 'puppeteer';import { runExampleComServer } from 'test/shared/_helper';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import { ENV_VARS } from '@apify/consts';+import log from '@apify/log';+import { BrowserCrawlerTest } from './basic_browser_crawler';describe('BrowserCrawler', () => {@@ -463,9 +464,9 @@ describe('BrowserCrawler', () => {// TODO this test is flaky in CI and we need some more info to debug why.if (cookie !== 'TEST=12321312312') {// for some reason, the CI failures report the first cookie to be just empty string- // eslint-disable-next-line no-console+console.log('loadedCookies:');- // eslint-disable-next-line no-console+console.dir(loadedCookies);}@@ -978,7 +979,7 @@ describe('BrowserCrawler', () => {expect(crawlingContext.session).toBeInstanceOf(Session);expect(typeof crawlingContext.page).toBe('object');expect(crawlingContext.crawler).toBeInstanceOf(BrowserCrawlerTest);- expect(crawlingContext.hasOwnProperty('response')).toBe(true);+ expect(Object.hasOwn(crawlingContext, 'response')).toBe(true);throw new Error('some error');};@@ -991,7 +992,7 @@ describe('BrowserCrawler', () => {expect(typeof crawlingContext.page).toBe('object');expect(crawlingContext.crawler).toBeInstanceOf(BrowserCrawlerTest);expect(crawlingContext.crawler.browserPool).toBeInstanceOf(BrowserPool);- expect(crawlingContext.hasOwnProperty('response')).toBe(true);+ expect(Object.hasOwn(crawlingContext, 'response')).toBe(true);expect(crawlingContext.error).toBeInstanceOf(Error);expect(error).toBeInstanceOf(Error);diff --git a/test/core/crawlers/cheerio_crawler.test.ts b/test/core/crawlers/cheerio_crawler.test.tsindex 86150c31f..13948c018 100644--- a/test/core/crawlers/cheerio_crawler.test.ts+++ b/test/core/crawlers/cheerio_crawler.test.ts@@ -1,8 +1,7 @@-import type { IncomingHttpHeaders, Server } from 'http';-import { Readable } from 'stream';+import type { IncomingHttpHeaders, Server } from 'node:http';+import { Readable } from 'node:stream';-import log, { Log } from '@apify/log';-import type { CheerioRequestHandler, CheerioCrawlingContext, ProxyInfo, Source } from '@crawlee/cheerio';+import type { CheerioCrawlingContext, CheerioRequestHandler, ProxyInfo, Source } from '@crawlee/cheerio';import {AutoscaledPool,CheerioCrawler,@@ -15,14 +14,16 @@ import {RequestList,Session,} from '@crawlee/cheerio';-import { sleep } from '@crawlee/utils';import type { Dictionary } from '@crawlee/utils';+import { sleep } from '@crawlee/utils';// @ts-expect-error type import of ESM only packageimport type { OptionsInit } from 'got-scraping';import iconv from 'iconv-lite';-import { runExampleComServer, responseSamples } from 'test/shared/_helper';+import { responseSamples, runExampleComServer } from 'test/shared/_helper';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import log, { Log } from '@apify/log';+let server: Server;let port: number;let serverAddress = 'http://localhost:';@@ -938,9 +939,8 @@ describe('CheerioCrawler', () => {// TODO this test is flaky in CI and we need some more info to debug why.// @ts-expect-error Accessing private propif (session.errorScore !== 1) {- // eslint-disable-next-line no-consoleconsole.log('SESSIONS:');- // eslint-disable-next-line no-console+console.dir(sessions);}diff --git a/test/core/crawlers/file_download.test.ts b/test/core/crawlers/file_download.test.tsindex 9a6083890..50170be59 100644--- a/test/core/crawlers/file_download.test.ts+++ b/test/core/crawlers/file_download.test.ts@@ -1,4 +1,4 @@-import type { Server } from 'http';+import type { Server } from 'node:http';import type { AddressInfo } from 'node:net';import { Duplex } from 'node:stream';import { pipeline } from 'node:stream/promises';@@ -21,7 +21,7 @@ class ReadableStreamGenerator {return buffer;}- static getReadableStream(size: number, seed: number, throttle: number = 0): ReadableStream {+ static getReadableStream(size: number, seed: number, throttle = 0): ReadableStream {let bytesRead = 0;const stream = new ReadableStream({start: async (controller) => {diff --git a/test/core/crawlers/playwright_crawler.test.ts b/test/core/crawlers/playwright_crawler.test.tsindex 1f9bbcacf..789dd4995 100644--- a/test/core/crawlers/playwright_crawler.test.ts+++ b/test/core/crawlers/playwright_crawler.test.ts@@ -1,14 +1,15 @@-import type { Server } from 'http';-import type { AddressInfo } from 'net';-import os from 'os';+import type { Server } from 'node:http';+import type { AddressInfo } from 'node:net';+import os from 'node:os';-import log from '@apify/log';import type { PlaywrightGotoOptions, PlaywrightRequestHandler, Request } from '@crawlee/playwright';import { PlaywrightCrawler, RequestList } from '@crawlee/playwright';import express from 'express';import playwright from 'playwright';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import log from '@apify/log';+import { startExpressAppPromise } from '../../shared/_helper';if (os.platform() === 'win32') vitest.setConfig({ testTimeout: 2 * 60 * 1e3 });diff --git a/test/core/crawlers/puppeteer_crawler.test.ts b/test/core/crawlers/puppeteer_crawler.test.tsindex 3703bbb71..422f30bde 100644--- a/test/core/crawlers/puppeteer_crawler.test.ts+++ b/test/core/crawlers/puppeteer_crawler.test.ts@@ -1,11 +1,10 @@-import { once } from 'events';-import type { Server } from 'http';-import { createServer } from 'http';-import type { AddressInfo } from 'net';-import os from 'os';-import { promisify } from 'util';+import { once } from 'node:events';+import type { Server } from 'node:http';+import { createServer } from 'node:http';+import type { AddressInfo } from 'node:net';+import os from 'node:os';+import { promisify } from 'node:util';-import log from '@apify/log';import type { PuppeteerCrawlingContext, PuppeteerGoToOptions, Request } from '@crawlee/puppeteer';import { ProxyConfiguration, PuppeteerCrawler, RequestList, RequestQueue, Session } from '@crawlee/puppeteer';import type { Cookie } from '@crawlee/types';@@ -13,6 +12,8 @@ import { sleep } from '@crawlee/utils';import type { Server as ProxyChainServer } from 'proxy-chain';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import log from '@apify/log';+import { createProxyServer } from '../create-proxy-server';describe('PuppeteerCrawler', () => {diff --git a/test/core/crawlers/statistics.test.ts b/test/core/crawlers/statistics.test.tsindex 5066f66b0..d8872fa6c 100644--- a/test/core/crawlers/statistics.test.ts+++ b/test/core/crawlers/statistics.test.ts@@ -1,4 +1,4 @@-import { Statistics, Configuration, EventType } from '@crawlee/core';+import { Configuration, EventType, Statistics } from '@crawlee/core';import type { Dictionary } from '@crawlee/utils';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';diff --git a/test/core/enqueue_links/click_elements.test.ts b/test/core/enqueue_links/click_elements.test.tsindex 50ec682bf..cdbe340f8 100644--- a/test/core/enqueue_links/click_elements.test.ts+++ b/test/core/enqueue_links/click_elements.test.ts@@ -1,15 +1,15 @@-import type { Server } from 'http';+import type { Server } from 'node:http';import type { RequestQueueOperationOptions, Source } from 'crawlee';import {Configuration,- RequestQueue,- puppeteerClickElements,- launchPuppeteer,launchPlaywright,+ launchPuppeteer,playwrightClickElements,- puppeteerUtils,playwrightUtils,+ puppeteerClickElements,+ puppeteerUtils,+ RequestQueue,} from 'crawlee';import type { Browser as PWBrowser, Page as PWPage } from 'playwright';import type { Browser as PPBrowser, Target } from 'puppeteer';diff --git a/test/core/enqueue_links/enqueue_links.test.ts b/test/core/enqueue_links/enqueue_links.test.tsindex fa872160a..2b33d8d1d 100644--- a/test/core/enqueue_links/enqueue_links.test.ts+++ b/test/core/enqueue_links/enqueue_links.test.ts@@ -1,4 +1,3 @@-import log from '@apify/log';import { type AddRequestsBatchedOptions, cheerioCrawlerEnqueueLinks } from '@crawlee/cheerio';import { launchPlaywright } from '@crawlee/playwright';import type { RequestQueueOperationOptions, Source } from '@crawlee/puppeteer';@@ -14,6 +13,8 @@ import { load } from 'cheerio';import type { Browser as PlaywrightBrowser, Page as PlaywrightPage } from 'playwright';import type { Browser as PuppeteerBrowser, Page as PuppeteerPage } from 'puppeteer';+import log from '@apify/log';+const apifyClient = Configuration.getStorageClient();const HTML = `@@ -540,9 +541,9 @@ describe('enqueueLinks()', () => {selector: '.click',pseudoUrls,transformRequestFunction: (request) => {- if (/example\.com/.test(request.url)) {+ if (request.url.includes('example.com')) {request.method = 'POST';- } else if (/cool\.com/.test(request.url)) {+ } else if (request.url.includes('cool.com')) {request.userData!.foo = 'bar';}return request;@@ -936,9 +937,9 @@ describe('enqueueLinks()', () => {selector: '.click',pseudoUrls,transformRequestFunction: (request) => {- if (/example\.com/.test(request.url)) {+ if (request.url.includes('example.com')) {request.method = 'POST';- } else if (/cool\.com/.test(request.url)) {+ } else if (request.url.includes('cool.com')) {request.userData!.foo = 'bar';}return request;diff --git a/test/core/enqueue_links/shared.test.ts b/test/core/enqueue_links/shared.test.tsindex 3f0fd3239..8264e907d 100644--- a/test/core/enqueue_links/shared.test.ts+++ b/test/core/enqueue_links/shared.test.ts@@ -3,8 +3,8 @@ import {constructGlobObjectsFromGlobs,constructRegExpObjectsFromPseudoUrls,constructRegExpObjectsFromRegExps,- createRequests,createRequestOptions,+ createRequests,validateGlobPattern,} from '@crawlee/core';diff --git a/test/core/playwright_utils.test.ts b/test/core/playwright_utils.test.tsindex 477f877da..8d861f0b7 100644--- a/test/core/playwright_utils.test.ts+++ b/test/core/playwright_utils.test.ts@@ -1,13 +1,14 @@-import type { Server } from 'http';-import path from 'path';+import type { Server } from 'node:http';+import path from 'node:path';-import log from '@apify/log';-import { KeyValueStore, Request, launchPlaywright, playwrightUtils } from '@crawlee/playwright';+import { KeyValueStore, launchPlaywright, playwrightUtils, Request } from '@crawlee/playwright';import type { Browser, Page } from 'playwright';import { chromium } from 'playwright';import { runExampleComServer } from 'test/shared/_helper';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import log from '@apify/log';+let serverAddress = 'http://localhost:';let port: number;let server: Server;diff --git a/test/core/puppeteer_request_interception.test.ts b/test/core/puppeteer_request_interception.test.tsindex aa008fa09..352b43e32 100644--- a/test/core/puppeteer_request_interception.test.ts+++ b/test/core/puppeteer_request_interception.test.ts@@ -1,4 +1,4 @@-import type { Server } from 'http';+import type { Server } from 'node:http';import { sleep } from '@crawlee/utils';import { launchPuppeteer, utils } from 'crawlee';diff --git a/test/core/puppeteer_utils.test.ts b/test/core/puppeteer_utils.test.tsindex fb7f15172..29b0902e9 100644--- a/test/core/puppeteer_utils.test.ts+++ b/test/core/puppeteer_utils.test.ts@@ -1,13 +1,14 @@-import type { Server } from 'http';-import path from 'path';+import type { Server } from 'node:http';+import path from 'node:path';-import log from '@apify/log';import { KeyValueStore, launchPuppeteer, puppeteerUtils, Request } from '@crawlee/puppeteer';import type { Dictionary } from '@crawlee/utils';import type { Browser, Page, ResponseForRequest } from 'puppeteer';import { runExampleComServer } from 'test/shared/_helper';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import log from '@apify/log';+const launchContext = { launchOptions: { headless: true } };let port: number;diff --git a/test/core/request_list.test.ts b/test/core/request_list.test.tsindex c94f6bd39..0ae3bcc19 100644--- a/test/core/request_list.test.ts+++ b/test/core/request_list.test.ts@@ -1,4 +1,3 @@-import log from '@apify/log';import {Configuration,deserializeArray,@@ -8,11 +7,13 @@ import {Request,RequestList,} from '@crawlee/core';-import { sleep } from '@crawlee/utils';import type { gotScraping } from '@crawlee/utils';+import { sleep } from '@crawlee/utils';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';import { beforeAll, type MockedFunction } from 'vitest';+import log from '@apify/log';+/*** Stand-in for underscore.js shuffle (weird, but how else?)*/@@ -166,7 +167,7 @@ describe('RequestList', () => {const spy = vitest.spyOn(RequestList.prototype as any, '_downloadListOfUrls');const list1 = ['https://example.com', 'https://google.com', 'https://wired.com'];const list2 = ['https://another.com', 'https://page.com'];- spy.mockImplementationOnce(() => new Promise((resolve) => setTimeout(resolve(list1) as any, 100)) as any);+ spy.mockImplementationOnce(() => new Promise((resolve) => setTimeout(() => resolve(list1) as any, 100)) as any);spy.mockResolvedValueOnce(list2);const requestList = await RequestList.open({diff --git a/test/core/serialization.test.ts b/test/core/serialization.test.tsindex 6fd1c7952..e81601c3c 100644--- a/test/core/serialization.test.ts+++ b/test/core/serialization.test.ts@@ -1,9 +1,9 @@-import { promises as fs } from 'fs';-import path from 'path';-import util from 'util';-import zlib from 'zlib';+import { promises as fs } from 'node:fs';+import path from 'node:path';+import util from 'node:util';+import zlib from 'node:zlib';-import { serializeArray, deserializeArray, createDeserialize } from '@crawlee/core';+import { createDeserialize, deserializeArray, serializeArray } from '@crawlee/core';const TEST_JSON_PATH = path.join(__dirname, '..', 'shared', 'data', 'sample.json.gz');diff --git a/test/core/session_pool/session_pool.test.ts b/test/core/session_pool/session_pool.test.tsindex 74c4e7e25..cfd9e205d 100644--- a/test/core/session_pool/session_pool.test.ts+++ b/test/core/session_pool/session_pool.test.ts@@ -1,8 +1,9 @@-import { Log } from '@apify/log';-import { SessionPool, Session, KeyValueStore, Configuration, EventType } from '@crawlee/core';+import { Configuration, EventType, KeyValueStore, Session, SessionPool } from '@crawlee/core';import { entries } from '@crawlee/utils';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import { Log } from '@apify/log';+describe('SessionPool - testing session pool', () => {let sessionPool: SessionPool;const localStorageEmulator = new MemoryStorageEmulator();diff --git a/test/core/sitemap_request_list.test.ts b/test/core/sitemap_request_list.test.tsindex 2fe420f29..72cc499c9 100644--- a/test/core/sitemap_request_list.test.ts+++ b/test/core/sitemap_request_list.test.ts@@ -1,9 +1,9 @@-import type { Server } from 'http';-import type { AddressInfo } from 'net';-import { Readable } from 'stream';-import { finished } from 'stream/promises';+import type { Server } from 'node:http';+import type { AddressInfo } from 'node:net';+import { Readable } from 'node:stream';+import { finished } from 'node:stream/promises';-import { SitemapRequestList, type Request } from '@crawlee/core';+import { type Request, SitemapRequestList } from '@crawlee/core';import { sleep } from '@crawlee/utils';import express from 'express';import { startExpressAppPromise } from 'test/shared/_helper';diff --git a/test/core/storages/dataset.test.ts b/test/core/storages/dataset.test.tsindex a00671c06..646969c5e 100644--- a/test/core/storages/dataset.test.ts+++ b/test/core/storages/dataset.test.ts@@ -1,8 +1,9 @@-import { MAX_PAYLOAD_SIZE_BYTES } from '@apify/consts';-import { Dataset, checkAndSerialize, chunkBySize, Configuration, KeyValueStore } from '@crawlee/core';+import { checkAndSerialize, chunkBySize, Configuration, Dataset, KeyValueStore } from '@crawlee/core';import type { Dictionary } from '@crawlee/utils';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';+import { MAX_PAYLOAD_SIZE_BYTES } from '@apify/consts';+const localStorageEmulator = new MemoryStorageEmulator();beforeEach(async () => {diff --git a/test/core/storages/key_value_store.test.ts b/test/core/storages/key_value_store.test.tsindex 0e3a3acab..d92776048 100644--- a/test/core/storages/key_value_store.test.ts+++ b/test/core/storages/key_value_store.test.ts@@ -1,6 +1,6 @@-import { PassThrough } from 'stream';+import { PassThrough } from 'node:stream';-import { maybeStringify, Configuration, KeyValueStore } from '@crawlee/core';+import { Configuration, KeyValueStore, maybeStringify } from '@crawlee/core';import type { Dictionary } from '@crawlee/utils';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';diff --git a/test/core/storages/request_queue.test.ts b/test/core/storages/request_queue.test.tsindex 904e5c9e0..f35a7ccbb 100644--- a/test/core/storages/request_queue.test.ts+++ b/test/core/storages/request_queue.test.ts@@ -1,17 +1,17 @@/* eslint-disable dot-notation */import {- QUERY_HEAD_MIN_LENGTH,API_PROCESSED_REQUESTS_DELAY_MILLIS,- STORAGE_CONSISTENCY_DELAY_MILLIS,- RequestQueueV1 as RequestQueue,- RequestQueueV2,- Request,Configuration,ProxyConfiguration,+ QUERY_HEAD_MIN_LENGTH,+ Request,+ RequestQueueV1 as RequestQueue,+ RequestQueueV2,+ STORAGE_CONSISTENCY_DELAY_MILLIS,} from '@crawlee/core';-import { sleep } from '@crawlee/utils';import type { gotScraping } from '@crawlee/utils';+import { sleep } from '@crawlee/utils';import type { MockedFunction } from 'vitest';import { MemoryStorageEmulator } from '../../shared/MemoryStorageEmulator';@@ -754,7 +754,7 @@ describe('RequestQueue with requestsFromUrl', () => {const spy = vitest.spyOn(RequestQueue.prototype as any, '_downloadListOfUrls');const list1 = ['https://example.com', 'https://google.com', 'https://wired.com'];const list2 = ['https://another.com', 'https://page.com'];- spy.mockImplementationOnce(() => new Promise((resolve) => setTimeout(resolve(list1) as any, 100)) as any);+ spy.mockImplementationOnce(() => new Promise((resolve) => setTimeout(() => resolve(list1) as any, 100)) as any);spy.mockResolvedValueOnce(list2);const queue = await RequestQueue.open();diff --git a/test/core/storages/utils.test.ts b/test/core/storages/utils.test.tsindex 1ff627c74..8a8a41f80 100644--- a/test/core/storages/utils.test.ts+++ b/test/core/storages/utils.test.ts@@ -1,5 +1,5 @@-import { useState, KeyValueStore, Configuration } from '@crawlee/core';import type { Dictionary } from '@crawlee/core';+import { Configuration, KeyValueStore, useState } from '@crawlee/core';import { MemoryStorageEmulator } from 'test/shared/MemoryStorageEmulator';describe('useState', () => {diff --git a/test/e2e/cheerio-curl-impersonate-ts/actor/main.ts b/test/e2e/cheerio-curl-impersonate-ts/actor/main.tsindex 2019d4503..0f6b4fdcb 100644--- a/test/e2e/cheerio-curl-impersonate-ts/actor/main.ts+++ b/test/e2e/cheerio-curl-impersonate-ts/actor/main.ts@@ -1,7 +1,8 @@-import { Readable } from 'stream';+import { Readable } from 'node:stream';-import { CheerioCrawler, Dictionary } from '@crawlee/cheerio';-import {+import type { Dictionary } from '@crawlee/cheerio';+import { CheerioCrawler } from '@crawlee/cheerio';+import type {BaseHttpClient,BaseHttpResponseData,HttpRequest,diff --git a/test/e2e/cheerio-impit-ts/actor/main.ts b/test/e2e/cheerio-impit-ts/actor/main.tsindex 64f2aeb77..496c39c06 100644--- a/test/e2e/cheerio-impit-ts/actor/main.ts+++ b/test/e2e/cheerio-impit-ts/actor/main.ts@@ -1,5 +1,6 @@-import { CheerioCrawler, Dictionary } from '@crawlee/cheerio';-import { ImpitHttpClient, Browser } from '@crawlee/impit-client';+import type { Dictionary } from '@crawlee/cheerio';+import { CheerioCrawler } from '@crawlee/cheerio';+import { Browser, ImpitHttpClient } from '@crawlee/impit-client';import { Actor } from 'apify';if (process.env.STORAGE_IMPLEMENTATION === 'LOCAL') {diff --git a/test/e2e/jsdom-default-ts/actor/main.ts b/test/e2e/jsdom-default-ts/actor/main.tsindex 273498bb5..3c56b294f 100644--- a/test/e2e/jsdom-default-ts/actor/main.ts+++ b/test/e2e/jsdom-default-ts/actor/main.ts@@ -1,6 +1,6 @@import assert from 'node:assert';-import { JSDOMCrawler, Dataset } from '@crawlee/jsdom';+import { Dataset, JSDOMCrawler } from '@crawlee/jsdom';import { Actor } from 'apify';if (process.env.STORAGE_IMPLEMENTATION === 'LOCAL') {diff --git a/test/e2e/jsdom-react-ts/actor/main.ts b/test/e2e/jsdom-react-ts/actor/main.tsindex 8cd788c1f..7d6be675a 100644--- a/test/e2e/jsdom-react-ts/actor/main.ts+++ b/test/e2e/jsdom-react-ts/actor/main.ts@@ -1,4 +1,4 @@-import { JSDOMCrawler, Dataset } from '@crawlee/jsdom';+import { Dataset, JSDOMCrawler } from '@crawlee/jsdom';import { Actor } from 'apify';if (process.env.STORAGE_IMPLEMENTATION === 'LOCAL') {diff --git a/test/e2e/linkedom-default-ts/actor/main.ts b/test/e2e/linkedom-default-ts/actor/main.tsindex ca97877d2..d5c07a987 100644--- a/test/e2e/linkedom-default-ts/actor/main.ts+++ b/test/e2e/linkedom-default-ts/actor/main.ts@@ -1,6 +1,6 @@import assert from 'node:assert';-import { LinkeDOMCrawler, Dataset } from '@crawlee/linkedom';+import { Dataset, LinkeDOMCrawler } from '@crawlee/linkedom';import { Actor } from 'apify';if (process.env.STORAGE_IMPLEMENTATION === 'LOCAL') {diff --git a/test/e2e/migration/actor/main.js b/test/e2e/migration/actor/main.jsindex b77d46e74..f49dd3be3 100644--- a/test/e2e/migration/actor/main.js+++ b/test/e2e/migration/actor/main.js@@ -47,7 +47,6 @@ if (workerData !== '#actor') {},});- // eslint-disable-next-line no-underscore-dangleConfiguration.getGlobalConfig().getStorageClient().__purged = false;await crawler.run(['https://crawlee.dev']);diff --git a/test/e2e/tools.mjs b/test/e2e/tools.mjsindex 8f7875375..366de3eb4 100644--- a/test/e2e/tools.mjs+++ b/test/e2e/tools.mjs@@ -10,7 +10,6 @@ import { Actor } from 'apify';import fs from 'fs-extra';import { got } from 'got';-// eslint-disable-next-line import/no-relative-packagesimport { URL_NO_COMMAS_REGEX } from '../../packages/utils/dist/index.mjs';/**diff --git a/test/shared/MemoryStorageEmulator.ts b/test/shared/MemoryStorageEmulator.tsindex 186396a0d..c39bb248e 100644--- a/test/shared/MemoryStorageEmulator.ts+++ b/test/shared/MemoryStorageEmulator.ts@@ -1,11 +1,12 @@import { resolve } from 'node:path';-import log from '@apify/log';-import { cryptoRandomObjectId } from '@apify/utilities';import { MemoryStorage } from '@crawlee/memory-storage';import { Configuration } from 'crawlee';import { ensureDir } from 'fs-extra';+import log from '@apify/log';+import { cryptoRandomObjectId } from '@apify/utilities';+import { StorageEmulator } from './StorageEmulator';const LOCAL_EMULATION_DIR = resolve(__dirname, '..', 'tmp', 'memory-emulation-dir');diff --git a/test/shared/_helper.ts b/test/shared/_helper.tsindex 493d1602b..eb9822a14 100644--- a/test/shared/_helper.ts+++ b/test/shared/_helper.ts@@ -1,12 +1,12 @@-import fs from 'fs';-import type { Server } from 'http';-import path from 'path';-import { setTimeout } from 'timers/promises';+import fs from 'node:fs';+import type { Server } from 'node:http';+import path from 'node:path';+import { setTimeout } from 'node:timers/promises';import bodyParser from 'body-parser';import { entries } from 'crawlee';-import express from 'express';import type { Application } from 'express';+import express from 'express';export const startExpressAppPromise = async (app: Application, port: number) => {return new Promise<Server>((resolve) => {diff --git a/test/utils/cpu-infoV2.test.ts b/test/utils/cpu-infoV2.test.tsindex 6107bbdb2..fbdacd511 100644--- a/test/utils/cpu-infoV2.test.ts+++ b/test/utils/cpu-infoV2.test.ts@@ -1,16 +1,16 @@import { readFile } from 'node:fs/promises';-import os from 'os';+import os from 'node:os';import { getCgroupsVersion } from '@crawlee/utils';import {- getCurrentCpuTicks,- getCpuQuota,- getCpuPeriod,getContainerCpuUsage,+ getCpuPeriod,+ getCpuQuota,+ getCurrentCpuTicks,+ getCurrentCpuTicksV2,getSystemCpuUsage,sampleCpuUsage,- getCurrentCpuTicksV2,} from '../../packages/utils/src/internals/systemInfoV2/cpu-info';vitest.mock('@crawlee/utils/src/internals/general', async (importActual) => {diff --git a/test/utils/general.test.ts b/test/utils/general.test.tsindex ef668bb21..6b7212790 100644--- a/test/utils/general.test.ts+++ b/test/utils/general.test.ts@@ -1,6 +1,6 @@import asyncFs from 'node:fs/promises';-import { getCgroupsVersion, isDocker, isLambda, weightedAvg, sleep, snakeCaseToCamelCase } from '@crawlee/utils';+import { getCgroupsVersion, isDocker, isLambda, sleep, snakeCaseToCamelCase, weightedAvg } from '@crawlee/utils';describe('isDocker()', () => {test('works for dockerenv && cgroup', async () => {diff --git a/test/utils/memory-info.test.ts b/test/utils/memory-info.test.tsindex cd8c7457b..ffac5a9e2 100644--- a/test/utils/memory-info.test.ts+++ b/test/utils/memory-info.test.ts@@ -1,8 +1,8 @@-import { readFile, access } from 'node:fs/promises';+import { access, readFile } from 'node:fs/promises';import { freemem, totalmem } from 'node:os';import { launchPuppeteer } from '@crawlee/puppeteer';-import { isDocker, getMemoryInfo } from '@crawlee/utils';+import { getMemoryInfo, isDocker } from '@crawlee/utils';vitest.mock('node:os', async (importActual) => {const originalOs: typeof import('node:os') = await importActual();diff --git a/test/utils/memory-infoV2.test.ts b/test/utils/memory-infoV2.test.tsindex 5130ccca1..df5e9b458 100644--- a/test/utils/memory-infoV2.test.ts+++ b/test/utils/memory-infoV2.test.ts@@ -1,4 +1,4 @@-import { readFile, access } from 'node:fs/promises';+import { access, readFile } from 'node:fs/promises';import { freemem, totalmem } from 'node:os';import { launchPuppeteer } from '@crawlee/puppeteer';diff --git a/test/utils/psTree.test.ts b/test/utils/psTree.test.tsindex 2b55aac04..8c7f3079a 100644--- a/test/utils/psTree.test.ts+++ b/test/utils/psTree.test.ts@@ -1,5 +1,5 @@-import { exec } from 'child_process';-import path from 'path';+import { exec } from 'node:child_process';+import path from 'node:path';import { psTree } from '../../packages/utils/src/internals/systemInfoV2/ps-tree';diff --git a/tsconfig.eslint.json b/tsconfig.eslint.jsonindex 9e4475fda..e035b81d1 100644--- a/tsconfig.eslint.json+++ b/tsconfig.eslint.json@@ -1,15 +1,17 @@{"extends": "./tsconfig.json","include": [- "packages/**/src/**/*.js",- "packages/**/src/**/*.ts",- "scripts/**/*.js",+ "packages/**/*.ts",+ "packages/**/*.mjs",+ "packages/**/*.js","scripts/**/*.ts",+ "scripts/**/*.js",+ "scripts/**/*.mjs",+ "website/**/*.ts",+ "website/**/*.mjs",+ "test/**/*.ts","test/**/*.js","test/**/*.mjs",- "test/**/*.ts",- "packages/**/test/**/*.js",- "packages/**/test/**/*.ts","docs/**/*.ts","vitest.config.ts"]diff --git a/vitest.config.ts b/vitest.config.tsindex 37c994b05..2810f26ee 100644--- a/vitest.config.ts+++ b/vitest.config.ts@@ -8,7 +8,6 @@ import { defineConfig } from 'vitest/config';let threads: { minThreads: number; maxThreads: number } | undefined;if (isCI) {- // eslint-disable-next-line no-consoleconsole.log(`Running in CI, throttling threads to 1 test at a time`);threads = { minThreads: 1, maxThreads: 1 };}diff --git a/website/tools/website_gif/website_gif.mjs b/website/tools/website_gif/website_gif.mjsindex 5c5a0fc54..8803fce68 100644--- a/website/tools/website_gif/website_gif.mjs+++ b/website/tools/website_gif/website_gif.mjs@@ -32,53 +32,53 @@ await crawler.run([{url: 'https://crawlee.dev',userData: { label: 'start' },- uniqueKey: 'dark-start'+ uniqueKey: 'dark-start',},{url: 'https://crawlee.dev/js/docs/quick-start',- uniqueKey: 'dark-1'+ uniqueKey: 'dark-1',},{url: 'https://crawlee.dev/js/docs/introduction/setting-up',- uniqueKey: 'dark-2'+ uniqueKey: 'dark-2',},{url: 'https://crawlee.dev/js/docs/introduction/first-crawler',- uniqueKey: 'dark-3'+ uniqueKey: 'dark-3',},{url: 'https://crawlee.dev/js/docs/introduction/adding-urls',- uniqueKey: 'dark-4'+ uniqueKey: 'dark-4',},{url: 'https://crawlee.dev/js/docs/introduction/real-world-project',- uniqueKey: 'dark-5'+ uniqueKey: 'dark-5',},// Light theme{url: 'https://crawlee.dev',userData: { label: 'start' },- uniqueKey: 'light th-start'+ uniqueKey: 'light th-start',},{url: 'https://crawlee.dev/js/docs/quick-start',- uniqueKey: 'light th-1'+ uniqueKey: 'light th-1',},{url: 'https://crawlee.dev/js/docs/introduction/setting-up',- uniqueKey: 'light th-2'+ uniqueKey: 'light th-2',},{url: 'https://crawlee.dev/js/docs/introduction/first-crawler',- uniqueKey: 'light th-3'+ uniqueKey: 'light th-3',},{url: 'https://crawlee.dev/js/docs/introduction/adding-urls',- uniqueKey: 'light th-4'+ uniqueKey: 'light th-4',},{url: 'https://crawlee.dev/js/docs/introduction/real-world-project',- uniqueKey: 'light th-5'- }+ uniqueKey: 'light th-5',+ },]);diff --git a/website/tsconfig.eslint.json b/website/tsconfig.eslint.jsondeleted file mode 100644index 6f0a472b9..000000000--- a/website/tsconfig.eslint.json+++ /dev/null@@ -1,12 +0,0 @@-{- "extends": "@apify/tsconfig",- "compilerOptions": {- "jsx": "preserve"- },- "include": [- "src/**/*.js",- "src/**/*.ts",- "src/**/*.jsx",- "src/**/*.tsx"- ]-}diff --git a/website/versioned_docs/version-3.0/examples/export_entire_dataset.ts b/website/versioned_docs/version-3.0/examples/export_entire_dataset.tsindex a0d301036..a7007e8ea 100644--- a/website/versioned_docs/version-3.0/examples/export_entire_dataset.ts+++ b/website/versioned_docs/version-3.0/examples/export_entire_dataset.ts@@ -8,7 +8,7 @@ const data = [},{id: 456,- name: 'bar'+ name: 'bar',},];diff --git a/website/versioned_docs/version-3.10/examples/map.ts b/website/versioned_docs/version-3.10/examples/map.tsindex a06142a91..55c1ab03a 100644--- a/website/versioned_docs/version-3.10/examples/map.ts+++ b/website/versioned_docs/version-3.10/examples/map.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.10/examples/reduce.ts b/website/versioned_docs/version-3.10/examples/reduce.tsindex 243966c90..cb2b28487 100644--- a/website/versioned_docs/version-3.10/examples/reduce.ts+++ b/website/versioned_docs/version-3.10/examples/reduce.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.10/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.10/guides/parallel-scraping/parallel-scraper.mjsindex 1ea13da71..710316510 100644--- a/website/versioned_docs/version-3.10/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.10/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/website/versioned_docs/version-3.11/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.11/guides/parallel-scraping/parallel-scraper.mjsindex 6bee4f4ff..1062d3dca 100644--- a/website/versioned_docs/version-3.11/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.11/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/website/versioned_docs/version-3.12/guides/custom-http-client/implementation.ts b/website/versioned_docs/version-3.12/guides/custom-http-client/implementation.tsindex ba86b6eae..bb3976601 100644--- a/website/versioned_docs/version-3.12/guides/custom-http-client/implementation.ts+++ b/website/versioned_docs/version-3.12/guides/custom-http-client/implementation.ts@@ -1,4 +1,4 @@-import {+import type {BaseHttpClient,HttpRequest,HttpResponse,diff --git a/website/versioned_docs/version-3.12/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.12/guides/parallel-scraping/parallel-scraper.mjsindex 6bee4f4ff..1062d3dca 100644--- a/website/versioned_docs/version-3.12/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.12/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/website/versioned_docs/version-3.5/examples/map.ts b/website/versioned_docs/version-3.5/examples/map.tsindex a06142a91..55c1ab03a 100644--- a/website/versioned_docs/version-3.5/examples/map.ts+++ b/website/versioned_docs/version-3.5/examples/map.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.5/examples/reduce.ts b/website/versioned_docs/version-3.5/examples/reduce.tsindex 243966c90..cb2b28487 100644--- a/website/versioned_docs/version-3.5/examples/reduce.ts+++ b/website/versioned_docs/version-3.5/examples/reduce.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.6/examples/map.ts b/website/versioned_docs/version-3.6/examples/map.tsindex a06142a91..55c1ab03a 100644--- a/website/versioned_docs/version-3.6/examples/map.ts+++ b/website/versioned_docs/version-3.6/examples/map.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.6/examples/reduce.ts b/website/versioned_docs/version-3.6/examples/reduce.tsindex 243966c90..cb2b28487 100644--- a/website/versioned_docs/version-3.6/examples/reduce.ts+++ b/website/versioned_docs/version-3.6/examples/reduce.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.6/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.6/guides/parallel-scraping/parallel-scraper.mjsindex 1ea13da71..710316510 100644--- a/website/versioned_docs/version-3.6/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.6/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/website/versioned_docs/version-3.7/examples/map.ts b/website/versioned_docs/version-3.7/examples/map.tsindex a06142a91..55c1ab03a 100644--- a/website/versioned_docs/version-3.7/examples/map.ts+++ b/website/versioned_docs/version-3.7/examples/map.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.7/examples/reduce.ts b/website/versioned_docs/version-3.7/examples/reduce.tsindex 243966c90..cb2b28487 100644--- a/website/versioned_docs/version-3.7/examples/reduce.ts+++ b/website/versioned_docs/version-3.7/examples/reduce.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.7/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.7/guides/parallel-scraping/parallel-scraper.mjsindex 1ea13da71..710316510 100644--- a/website/versioned_docs/version-3.7/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.7/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/website/versioned_docs/version-3.8/examples/map.ts b/website/versioned_docs/version-3.8/examples/map.tsindex a06142a91..55c1ab03a 100644--- a/website/versioned_docs/version-3.8/examples/map.ts+++ b/website/versioned_docs/version-3.8/examples/map.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.8/examples/reduce.ts b/website/versioned_docs/version-3.8/examples/reduce.tsindex 243966c90..cb2b28487 100644--- a/website/versioned_docs/version-3.8/examples/reduce.ts+++ b/website/versioned_docs/version-3.8/examples/reduce.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.8/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.8/guides/parallel-scraping/parallel-scraper.mjsindex 1ea13da71..710316510 100644--- a/website/versioned_docs/version-3.8/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.8/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/website/versioned_docs/version-3.9/examples/map.ts b/website/versioned_docs/version-3.9/examples/map.tsindex a06142a91..55c1ab03a 100644--- a/website/versioned_docs/version-3.9/examples/map.ts+++ b/website/versioned_docs/version-3.9/examples/map.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.9/examples/reduce.ts b/website/versioned_docs/version-3.9/examples/reduce.tsindex 243966c90..cb2b28487 100644--- a/website/versioned_docs/version-3.9/examples/reduce.ts+++ b/website/versioned_docs/version-3.9/examples/reduce.ts@@ -1,8 +1,8 @@import { Dataset, KeyValueStore } from 'crawlee';const dataset = await Dataset.open<{- url: string,- headingCount: number,+ url: string;+ headingCount: number;}>();// Seeding the dataset with some datadiff --git a/website/versioned_docs/version-3.9/guides/parallel-scraping/parallel-scraper.mjs b/website/versioned_docs/version-3.9/guides/parallel-scraping/parallel-scraper.mjsindex 1ea13da71..710316510 100644--- a/website/versioned_docs/version-3.9/guides/parallel-scraping/parallel-scraper.mjs+++ b/website/versioned_docs/version-3.9/guides/parallel-scraping/parallel-scraper.mjs@@ -35,12 +35,12 @@ if (!process.env.IN_WORKER_THREAD) {// Log out what the crawlers are doing// Note: we want to use console.log instead of log.info because we already get formatted output from the crawlersproc.stdout.on('data', (data) => {- // eslint-disable-next-line no-console+console.log(data.toString());});proc.stderr.on('data', (data) => {- // eslint-disable-next-line no-console+console.error(data.toString());});});diff --git a/yarn.lock b/yarn.lockindex 188d82384..3e8eca034 100644--- a/yarn.lock+++ b/yarn.lock@@ -29,39 +29,26 @@ __metadata:languageName: nodelinkType: hard-"@apify/eslint-config-ts@npm:^0.4.1":- version: 0.4.1- resolution: "@apify/eslint-config-ts@npm:0.4.1"- dependencies:- "@apify/eslint-config": "npm:^0.4.0"- eslint-import-resolver-typescript: "npm:^3.6.1"- eslint-plugin-import: "npm:^2.29.0"- eslint-plugin-jsx-a11y: "npm:^6.7.1"- eslint-plugin-react: "npm:^7.33.2"- eslint-plugin-react-hooks: "npm:^4.6.0"- peerDependencies:- "@typescript-eslint/eslint-plugin": "*"- "@typescript-eslint/parser": "*"- eslint: "*"- typescript: "*"- checksum: 10c0/4c3695634280fec8878cc6e43538be5913deec9b49cd4bfbe2e1b70a8eb4d449ec1bdde3e5b1826bff2558ef8a15afaf9730714156c1e622218d70523e467962- languageName: node- linkType: hard--"@apify/eslint-config@npm:^0.4.0":- version: 0.4.0- resolution: "@apify/eslint-config@npm:0.4.0"+"@apify/eslint-config@npm:^1.0.0":+ version: 1.0.0+ resolution: "@apify/eslint-config@npm:1.0.0"dependencies:- eslint-config-airbnb: "npm:^19.0.0"+ "@eslint/compat": "npm:^1.2.6"+ "@jirimoravcik/eslint-plugin-import": "npm:2.32.0"eslint-config-airbnb-base: "npm:^15.0.0"- eslint-import-resolver-typescript: "npm:^2.5.0"- eslint-plugin-import: "npm:^2.25.3"- eslint-plugin-jsx-a11y: "npm:^6.5.1"- eslint-plugin-react: "npm:^7.27.0"- eslint-plugin-react-hooks: "npm:^4.3.0"+ eslint-plugin-import: "npm:^2.31.0"+ eslint-plugin-simple-import-sort: "npm:^12.1.1"+ globals: "npm:^15.14.0"peerDependencies:- eslint: "*"- checksum: 10c0/ad8422b05d7b352d4dee2972c13b3c589a5750696aeca8d36b42689525bc795692cfc9057c58608cafcb1031656e6313a6f322a50f08b2e2998b549d31aac3e0+ eslint: ^9.19.0+ eslint-plugin-jest: ^28.11.0+ typescript-eslint: ^8.23.0+ peerDependenciesMeta:+ eslint-plugin-jest:+ optional: true+ typescript-eslint:+ optional: true+ checksum: 10c0/8209477b867581c0a8fd502fe54ec6553cc0247f7b97a38e4e7d709416db1556222280917bc7324c0fc4df71d8931c39662377738e0c98b9ba144bb527625f27languageName: nodelinkType: hard@@ -745,7 +732,7 @@ __metadata:version: 0.0.0-use.localresolution: "@crawlee/root@workspace:."dependencies:- "@apify/eslint-config-ts": "npm:^0.4.1"+ "@apify/eslint-config": "npm:^1.0.0""@apify/log": "npm:^2.4.0""@apify/tsconfig": "npm:^0.1.0""@biomejs/biome": "npm:^1.7.3"@@ -753,6 +740,7 @@ __metadata:"@playwright/browser-chromium": "npm:1.51.1""@playwright/browser-firefox": "npm:1.51.1""@playwright/browser-webkit": "npm:1.51.1"+ "@stylistic/eslint-plugin-ts": "npm:^4.2.0""@types/content-type": "npm:^1.1.5""@types/deep-equal": "npm:^1.0.1""@types/domhandler": "npm:^2.4.2"@@ -771,8 +759,6 @@ __metadata:"@types/semver": "npm:^7.3.12""@types/stream-json": "npm:^1.7.2""@types/yargs": "npm:^17.0.26"- "@typescript-eslint/eslint-plugin": "npm:^7.18.0"- "@typescript-eslint/parser": "npm:^7.18.0""@vitest/coverage-v8": "npm:^2.0.0"apify: "npm:*"apify-node-curl-impersonate: "npm:^1.0.15"@@ -782,11 +768,12 @@ __metadata:commitlint: "npm:^19.0.0"cross-env: "npm:^7.0.3"deep-equal: "npm:^2.0.5"- eslint: "npm:^8.57.1"- eslint-config-prettier: "npm:^10.0.0"+ eslint: "npm:^9.23.0"+ eslint-config-prettier: "npm:^10.1.1"express: "npm:^4.18.1"fs-extra: "npm:^11.0.0"gen-esm-wrapper: "npm:^1.1.3"+ globals: "npm:^16.0.0"globby: "npm:^14.0.0"got: "npm:^13.0.0"husky: "npm:^9.0.11"@@ -801,7 +788,8 @@ __metadata:rimraf: "npm:^6.0.0"tsx: "npm:^4.4.0"turbo: "npm:^2.1.0"- typescript: "npm:^5.7.2"+ typescript: "npm:^5.7.3"+ typescript-eslint: "npm:^8.28.0"vite-tsconfig-paths: "npm:^4.3.2"vitest: "npm:^2.0.0"languageName: unknown@@ -893,7 +881,7 @@ __metadata:languageName: nodelinkType: hard-"@emnapi/core@npm:^1.1.0, @emnapi/core@npm:^1.3.1":+"@emnapi/core@npm:^1.1.0":version: 1.3.1resolution: "@emnapi/core@npm:1.3.1"dependencies:@@ -903,7 +891,7 @@ __metadata:languageName: nodelinkType: hard-"@emnapi/runtime@npm:^1.1.0, @emnapi/runtime@npm:^1.3.1":+"@emnapi/runtime@npm:^1.1.0":version: 1.3.1resolution: "@emnapi/runtime@npm:1.3.1"dependencies:@@ -1268,34 +1256,90 @@ __metadata:languageName: nodelinkType: hard-"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1":+"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.12.1":version: 4.12.1resolution: "@eslint-community/regexpp@npm:4.12.1"checksum: 10c0/a03d98c246bcb9109aec2c08e4d10c8d010256538dcb3f56610191607214523d4fb1b00aa81df830b6dffb74c5fa0be03642513a289c567949d3e550ca11cdf6languageName: nodelinkType: hard-"@eslint/eslintrc@npm:^2.1.4":- version: 2.1.4- resolution: "@eslint/eslintrc@npm:2.1.4"+"@eslint/compat@npm:^1.2.6":+ version: 1.2.7+ resolution: "@eslint/compat@npm:1.2.7"+ peerDependencies:+ eslint: ^9.10.0+ peerDependenciesMeta:+ eslint:+ optional: true+ checksum: 10c0/df89a0396750748c3748eb5fc582bd6cb89be6599d88ed1c5cc60ae0d13f77d4bf5fb30fabdb6c9ce16dda35745ef2e6417fa82548cde7d2b3fa5a896da02c8e+ languageName: node+ linkType: hard++"@eslint/config-array@npm:^0.19.2":+ version: 0.19.2+ resolution: "@eslint/config-array@npm:0.19.2"+ dependencies:+ "@eslint/object-schema": "npm:^2.1.6"+ debug: "npm:^4.3.1"+ minimatch: "npm:^3.1.2"+ checksum: 10c0/dd68da9abb32d336233ac4fe0db1e15a0a8d794b6e69abb9e57545d746a97f6f542496ff9db0d7e27fab1438546250d810d90b1904ac67677215b8d8e7573f3d+ languageName: node+ linkType: hard++"@eslint/config-helpers@npm:^0.2.0":+ version: 0.2.0+ resolution: "@eslint/config-helpers@npm:0.2.0"+ checksum: 10c0/743a64653e13177029108f57ab47460ded08e3412c86216a14b7e8ab2dc79c2b64be45bf55c5ef29f83692a707dc34cf1e9217e4b8b4b272a0d9b691fdaf6a2a+ languageName: node+ linkType: hard++"@eslint/core@npm:^0.12.0":+ version: 0.12.0+ resolution: "@eslint/core@npm:0.12.0"+ dependencies:+ "@types/json-schema": "npm:^7.0.15"+ checksum: 10c0/d032af81195bb28dd800c2b9617548c6c2a09b9490da3c5537fd2a1201501666d06492278bb92cfccac1f7ac249e58601dd87f813ec0d6a423ef0880434fa0c3+ languageName: node+ linkType: hard++"@eslint/eslintrc@npm:^3.3.1":+ version: 3.3.1+ resolution: "@eslint/eslintrc@npm:3.3.1"dependencies:ajv: "npm:^6.12.4"debug: "npm:^4.3.2"- espree: "npm:^9.6.0"- globals: "npm:^13.19.0"+ espree: "npm:^10.0.1"+ globals: "npm:^14.0.0"ignore: "npm:^5.2.0"import-fresh: "npm:^3.2.1"js-yaml: "npm:^4.1.0"minimatch: "npm:^3.1.2"strip-json-comments: "npm:^3.1.1"- checksum: 10c0/32f67052b81768ae876c84569ffd562491ec5a5091b0c1e1ca1e0f3c24fb42f804952fdd0a137873bc64303ba368a71ba079a6f691cee25beee9722d94cc8573+ checksum: 10c0/b0e63f3bc5cce4555f791a4e487bf999173fcf27c65e1ab6e7d63634d8a43b33c3693e79f192cbff486d7df1be8ebb2bd2edc6e70ddd486cbfa84a359a3e3b41languageName: nodelinkType: hard-"@eslint/js@npm:8.57.1":- version: 8.57.1- resolution: "@eslint/js@npm:8.57.1"- checksum: 10c0/b489c474a3b5b54381c62e82b3f7f65f4b8a5eaaed126546520bf2fede5532a8ed53212919fed1e9048dcf7f37167c8561d58d0ba4492a4244004e7793805223+"@eslint/js@npm:9.23.0":+ version: 9.23.0+ resolution: "@eslint/js@npm:9.23.0"+ checksum: 10c0/4e70869372b6325389e0ab51cac6d3062689807d1cef2c3434857571422ce11dde3c62777af85c382b9f94d937127598d605d2086787f08611351bf99faded81+ languageName: node+ linkType: hard++"@eslint/object-schema@npm:^2.1.6":+ version: 2.1.6+ resolution: "@eslint/object-schema@npm:2.1.6"+ checksum: 10c0/b8cdb7edea5bc5f6a96173f8d768d3554a628327af536da2fc6967a93b040f2557114d98dbcdbf389d5a7b290985ad6a9ce5babc547f36fc1fde42e674d11a56+ languageName: node+ linkType: hard++"@eslint/plugin-kit@npm:^0.2.7":+ version: 0.2.7+ resolution: "@eslint/plugin-kit@npm:0.2.7"+ dependencies:+ "@eslint/core": "npm:^0.12.0"+ levn: "npm:^0.4.1"+ checksum: 10c0/0a1aff1ad63e72aca923217e556c6dfd67d7cd121870eb7686355d7d1475d569773528a8b2111b9176f3d91d2ea81f7413c34600e8e5b73d59e005d70780b633languageName: nodelinkType: hard@@ -1306,14 +1350,20 @@ __metadata:languageName: nodelinkType: hard-"@humanwhocodes/config-array@npm:^0.13.0":- version: 0.13.0- resolution: "@humanwhocodes/config-array@npm:0.13.0"+"@humanfs/core@npm:^0.19.1":+ version: 0.19.1+ resolution: "@humanfs/core@npm:0.19.1"+ checksum: 10c0/aa4e0152171c07879b458d0e8a704b8c3a89a8c0541726c6b65b81e84fd8b7564b5d6c633feadc6598307d34564bd53294b533491424e8e313d7ab6c7bc5dc67+ languageName: node+ linkType: hard++"@humanfs/node@npm:^0.16.6":+ version: 0.16.6+ resolution: "@humanfs/node@npm:0.16.6"dependencies:- "@humanwhocodes/object-schema": "npm:^2.0.3"- debug: "npm:^4.3.1"- minimatch: "npm:^3.0.5"- checksum: 10c0/205c99e756b759f92e1f44a3dc6292b37db199beacba8f26c2165d4051fe73a4ae52fdcfd08ffa93e7e5cb63da7c88648f0e84e197d154bbbbe137b2e0dd332e+ "@humanfs/core": "npm:^0.19.1"+ "@humanwhocodes/retry": "npm:^0.3.0"+ checksum: 10c0/8356359c9f60108ec204cbd249ecd0356667359b2524886b357617c4a7c3b6aace0fd5a369f63747b926a762a88f8a25bc066fa1778508d110195ce7686243e1languageName: nodelinkType: hard@@ -1324,10 +1374,17 @@ __metadata:languageName: nodelinkType: hard-"@humanwhocodes/object-schema@npm:^2.0.3":- version: 2.0.3- resolution: "@humanwhocodes/object-schema@npm:2.0.3"- checksum: 10c0/80520eabbfc2d32fe195a93557cef50dfe8c8905de447f022675aaf66abc33ae54098f5ea78548d925aa671cd4ab7c7daa5ad704fe42358c9b5e7db60f80696c+"@humanwhocodes/retry@npm:^0.3.0":+ version: 0.3.1+ resolution: "@humanwhocodes/retry@npm:0.3.1"+ checksum: 10c0/f0da1282dfb45e8120480b9e2e275e2ac9bbe1cf016d046fdad8e27cc1285c45bb9e711681237944445157b430093412b4446c1ab3fc4bb037861b5904101d3b+ languageName: node+ linkType: hard++"@humanwhocodes/retry@npm:^0.4.2":+ version: 0.4.2+ resolution: "@humanwhocodes/retry@npm:0.4.2"+ checksum: 10c0/0235525d38f243bee3bf8b25ed395fbf957fb51c08adae52787e1325673071abe856c7e18e530922ed2dd3ce12ed82ba01b8cee0279ac52a3315fcdc3a69ef0clanguageName: nodelinkType: hard@@ -1391,6 +1448,35 @@ __metadata:languageName: nodelinkType: hard+"@jirimoravcik/eslint-plugin-import@npm:2.32.0":+ version: 2.32.0+ resolution: "@jirimoravcik/eslint-plugin-import@npm:2.32.0"+ dependencies:+ "@rtsao/scc": "npm:^1.1.0"+ array-includes: "npm:^3.1.8"+ array.prototype.findlastindex: "npm:^1.2.5"+ array.prototype.flat: "npm:^1.3.3"+ array.prototype.flatmap: "npm:^1.3.3"+ debug: "npm:^3.2.7"+ doctrine: "npm:^2.1.0"+ eslint-import-resolver-node: "npm:^0.3.9"+ eslint-module-utils: "npm:^2.12.0"+ hasown: "npm:^2.0.2"+ is-core-module: "npm:^2.16.1"+ is-glob: "npm:^4.0.3"+ minimatch: "npm:^3.1.2"+ object.fromentries: "npm:^2.0.8"+ object.groupby: "npm:^1.0.3"+ object.values: "npm:^1.2.1"+ semver: "npm:^6.3.1"+ string.prototype.trimend: "npm:^1.0.9"+ tsconfig-paths: "npm:^3.15.0"+ peerDependencies:+ eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9+ checksum: 10c0/fbeb711869991914010fd122ab1555fe56b077c5a5db46e0ab7147897f4fe76b7f4f044884b04bcb17a7103fb0d7039ceff743987d2c8dd353ce1ba5391355a6+ languageName: node+ linkType: hard+"@jridgewell/gen-mapping@npm:^0.3.5":version: 0.3.8resolution: "@jridgewell/gen-mapping@npm:0.3.8"@@ -1522,17 +1608,6 @@ __metadata:languageName: nodelinkType: hard-"@napi-rs/wasm-runtime@npm:^0.2.7":- version: 0.2.7- resolution: "@napi-rs/wasm-runtime@npm:0.2.7"- dependencies:- "@emnapi/core": "npm:^1.3.1"- "@emnapi/runtime": "npm:^1.3.1"- "@tybys/wasm-util": "npm:^0.9.0"- checksum: 10c0/04a5edd79144bfa4e821a373fb6d4939f10c578c5f3633b5e67a57d0f5e36a593f595834d26654ea757bba7cd80b6c42d0d1405d6a8460c5d774e8cd5c9548a4- languageName: node- linkType: hard-"@nodelib/fs.scandir@npm:2.1.5":version: 2.1.5resolution: "@nodelib/fs.scandir@npm:2.1.5"@@ -1550,7 +1625,7 @@ __metadata:languageName: nodelinkType: hard-"@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":+"@nodelib/fs.walk@npm:^1.2.3":version: 1.2.8resolution: "@nodelib/fs.walk@npm:1.2.8"dependencies:@@ -1560,13 +1635,6 @@ __metadata:languageName: nodelinkType: hard-"@nolyfill/is-core-module@npm:1.0.39":- version: 1.0.39- resolution: "@nolyfill/is-core-module@npm:1.0.39"- checksum: 10c0/34ab85fdc2e0250879518841f74a30c276bca4f6c3e13526d2d1fe515e1adf6d46c25fcd5989d22ea056d76f7c39210945180b4859fc83b050e2da411aa86289- languageName: node- linkType: hard-"@npmcli/agent@npm:^2.0.0":version: 2.2.2resolution: "@npmcli/agent@npm:2.2.2"@@ -2348,6 +2416,19 @@ __metadata:languageName: nodelinkType: hard+"@stylistic/eslint-plugin-ts@npm:^4.2.0":+ version: 4.2.0+ resolution: "@stylistic/eslint-plugin-ts@npm:4.2.0"+ dependencies:+ "@typescript-eslint/utils": "npm:^8.23.0"+ eslint-visitor-keys: "npm:^4.2.0"+ espree: "npm:^10.3.0"+ peerDependencies:+ eslint: ">=9.0.0"+ checksum: 10c0/018a0cf08f9cfbf48ff77d214ca5cb52a60ba8b4b70bda1af3eea8f9640e24ea7add694fd6bfd916566cc7a63635ba07d6fde4d1f298fc1a99bd6ab39c99a7c2+ languageName: node+ linkType: hard+"@szmarczak/http-timer@npm:^5.0.1":version: 5.0.1resolution: "@szmarczak/http-timer@npm:5.0.1"@@ -2464,7 +2545,7 @@ __metadata:languageName: nodelinkType: hard-"@types/estree@npm:1.0.6":+"@types/estree@npm:1.0.6, @types/estree@npm:^1.0.6":version: 1.0.6resolution: "@types/estree@npm:1.0.6"checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a@@ -2556,6 +2637,13 @@ __metadata:languageName: nodelinkType: hard+"@types/json-schema@npm:^7.0.15":+ version: 7.0.15+ resolution: "@types/json-schema@npm:7.0.15"+ checksum: 10c0/a996a745e6c5d60292f36731dd41341339d4eeed8180bb09226e5c8d23759067692b1d88e5d91d72ee83dfc00d3aca8e7bd43ea120516c17922cbcb7c3e252db+ languageName: node+ linkType: hard+"@types/json5@npm:^0.0.29":version: 0.0.29resolution: "@types/json5@npm:0.0.29"@@ -2801,207 +2889,115 @@ __metadata:languageName: nodelinkType: hard-"@typescript-eslint/eslint-plugin@npm:^7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"+"@typescript-eslint/eslint-plugin@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/eslint-plugin@npm:8.28.0"dependencies:"@eslint-community/regexpp": "npm:^4.10.0"- "@typescript-eslint/scope-manager": "npm:7.18.0"- "@typescript-eslint/type-utils": "npm:7.18.0"- "@typescript-eslint/utils": "npm:7.18.0"- "@typescript-eslint/visitor-keys": "npm:7.18.0"+ "@typescript-eslint/scope-manager": "npm:8.28.0"+ "@typescript-eslint/type-utils": "npm:8.28.0"+ "@typescript-eslint/utils": "npm:8.28.0"+ "@typescript-eslint/visitor-keys": "npm:8.28.0"graphemer: "npm:^1.4.0"ignore: "npm:^5.3.1"natural-compare: "npm:^1.4.0"- ts-api-utils: "npm:^1.3.0"+ ts-api-utils: "npm:^2.0.1"peerDependencies:- "@typescript-eslint/parser": ^7.0.0- eslint: ^8.56.0- peerDependenciesMeta:- typescript:- optional: true- checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3+ "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0+ eslint: ^8.57.0 || ^9.0.0+ typescript: ">=4.8.4 <5.9.0"+ checksum: 10c0/f01b7d231b01ec2c1cc7c40599ddceb329532f2876664a39dec9d25c0aed4cfdbef3ec07f26bac357df000d798f652af6fdb6a2481b6120e43bfa38f7c7a7c48languageName: nodelinkType: hard-"@typescript-eslint/parser@npm:^7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/parser@npm:7.18.0"+"@typescript-eslint/parser@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/parser@npm:8.28.0"dependencies:- "@typescript-eslint/scope-manager": "npm:7.18.0"- "@typescript-eslint/types": "npm:7.18.0"- "@typescript-eslint/typescript-estree": "npm:7.18.0"- "@typescript-eslint/visitor-keys": "npm:7.18.0"+ "@typescript-eslint/scope-manager": "npm:8.28.0"+ "@typescript-eslint/types": "npm:8.28.0"+ "@typescript-eslint/typescript-estree": "npm:8.28.0"+ "@typescript-eslint/visitor-keys": "npm:8.28.0"debug: "npm:^4.3.4"peerDependencies:- eslint: ^8.56.0- peerDependenciesMeta:- typescript:- optional: true- checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059+ eslint: ^8.57.0 || ^9.0.0+ typescript: ">=4.8.4 <5.9.0"+ checksum: 10c0/4bde6887bbf3fe031c01e46db90f9f384a8cac2e67c2972b113a62d607db75e01db943601279aac847b9187960a038981814042cb02fd5aa27ea4613028f9313languageName: nodelinkType: hard-"@typescript-eslint/scope-manager@npm:7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/scope-manager@npm:7.18.0"+"@typescript-eslint/scope-manager@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/scope-manager@npm:8.28.0"dependencies:- "@typescript-eslint/types": "npm:7.18.0"- "@typescript-eslint/visitor-keys": "npm:7.18.0"- checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e+ "@typescript-eslint/types": "npm:8.28.0"+ "@typescript-eslint/visitor-keys": "npm:8.28.0"+ checksum: 10c0/f3bd76b3f54e60f1efe108b233b2d818e44ecf0dc6422cc296542f784826caf3c66d51b8acc83d8c354980bd201e1d9aa1ea01011de96e0613d320c00e40ccfdlanguageName: nodelinkType: hard-"@typescript-eslint/type-utils@npm:7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/type-utils@npm:7.18.0"+"@typescript-eslint/type-utils@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/type-utils@npm:8.28.0"dependencies:- "@typescript-eslint/typescript-estree": "npm:7.18.0"- "@typescript-eslint/utils": "npm:7.18.0"+ "@typescript-eslint/typescript-estree": "npm:8.28.0"+ "@typescript-eslint/utils": "npm:8.28.0"debug: "npm:^4.3.4"- ts-api-utils: "npm:^1.3.0"+ ts-api-utils: "npm:^2.0.1"peerDependencies:- eslint: ^8.56.0- peerDependenciesMeta:- typescript:- optional: true- checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd+ eslint: ^8.57.0 || ^9.0.0+ typescript: ">=4.8.4 <5.9.0"+ checksum: 10c0/b8936edc2153bf794efba39bfb06393a228217830051767360f4b691fed7c82f3831c4fc6deac6d78b90a58596e61f866c17eaee9dd793c3efda3ebdcf5a71d8languageName: nodelinkType: hard-"@typescript-eslint/types@npm:7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/types@npm:7.18.0"- checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054+"@typescript-eslint/types@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/types@npm:8.28.0"+ checksum: 10c0/1f95895e20dac1cf063dc93c99142fd1871e53be816bcbbee93f22a05e6b2a82ca83c20ce3a551f65555910aa0956443a23268edbb004369d0d5cb282d13c377languageName: nodelinkType: hard-"@typescript-eslint/typescript-estree@npm:7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"+"@typescript-eslint/typescript-estree@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/typescript-estree@npm:8.28.0"dependencies:- "@typescript-eslint/types": "npm:7.18.0"- "@typescript-eslint/visitor-keys": "npm:7.18.0"+ "@typescript-eslint/types": "npm:8.28.0"+ "@typescript-eslint/visitor-keys": "npm:8.28.0"debug: "npm:^4.3.4"- globby: "npm:^11.1.0"+ fast-glob: "npm:^3.3.2"is-glob: "npm:^4.0.3"minimatch: "npm:^9.0.4"semver: "npm:^7.6.0"- ts-api-utils: "npm:^1.3.0"- peerDependenciesMeta:- typescript:- optional: true- checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81+ ts-api-utils: "npm:^2.0.1"+ peerDependencies:+ typescript: ">=4.8.4 <5.9.0"+ checksum: 10c0/97a91c95b1295926098c12e2d2c2abaa68994dc879da132dcce1e75ec9d7dee8187695eaa5241d09cbc42b5e633917b6d35c624e78e3d3ee9bda42d1318080b6languageName: nodelinkType: hard-"@typescript-eslint/utils@npm:7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/utils@npm:7.18.0"+"@typescript-eslint/utils@npm:8.28.0, @typescript-eslint/utils@npm:^8.23.0":+ version: 8.28.0+ resolution: "@typescript-eslint/utils@npm:8.28.0"dependencies:"@eslint-community/eslint-utils": "npm:^4.4.0"- "@typescript-eslint/scope-manager": "npm:7.18.0"- "@typescript-eslint/types": "npm:7.18.0"- "@typescript-eslint/typescript-estree": "npm:7.18.0"+ "@typescript-eslint/scope-manager": "npm:8.28.0"+ "@typescript-eslint/types": "npm:8.28.0"+ "@typescript-eslint/typescript-estree": "npm:8.28.0"peerDependencies:- eslint: ^8.56.0- checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e+ eslint: ^8.57.0 || ^9.0.0+ typescript: ">=4.8.4 <5.9.0"+ checksum: 10c0/d3425be7f86c1245a11f0ea39136af681027797417348d8e666d38c76646945eaed7b35eb8db66372b067dee8b02a855caf2c24c040ec9c31e59681ab223b59dlanguageName: nodelinkType: hard-"@typescript-eslint/visitor-keys@npm:7.18.0":- version: 7.18.0- resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"+"@typescript-eslint/visitor-keys@npm:8.28.0":+ version: 8.28.0+ resolution: "@typescript-eslint/visitor-keys@npm:8.28.0"dependencies:- "@typescript-eslint/types": "npm:7.18.0"- eslint-visitor-keys: "npm:^3.4.3"- checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0- languageName: node- linkType: hard--"@ungap/structured-clone@npm:^1.2.0":- version: 1.3.0- resolution: "@ungap/structured-clone@npm:1.3.0"- checksum: 10c0/0fc3097c2540ada1fc340ee56d58d96b5b536a2a0dab6e3ec17d4bfc8c4c86db345f61a375a8185f9da96f01c69678f836a2b57eeaa9e4b8eeafd26428e57b0a- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-darwin-arm64@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-darwin-arm64@npm:1.2.2"- conditions: os=darwin & cpu=arm64- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-darwin-x64@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-darwin-x64@npm:1.2.2"- conditions: os=darwin & cpu=x64- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-freebsd-x64@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-freebsd-x64@npm:1.2.2"- conditions: os=freebsd & cpu=x64- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.2.2"- conditions: os=linux & cpu=arm- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.2.2"- conditions: os=linux & cpu=arm64 & libc=glibc- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.2.2"- conditions: os=linux & cpu=arm64 & libc=musl- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.2.2"- conditions: os=linux & cpu=x64 & libc=glibc- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.2.2"- conditions: os=linux & cpu=x64 & libc=musl- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.2.2"- dependencies:- "@napi-rs/wasm-runtime": "npm:^0.2.7"- conditions: cpu=wasm32- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.2.2"- conditions: os=win32 & cpu=arm64- languageName: node- linkType: hard--"@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.2.2":- version: 1.2.2- resolution: "@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.2.2"- conditions: os=win32 & cpu=x64+ "@typescript-eslint/types": "npm:8.28.0"+ eslint-visitor-keys: "npm:^4.2.0"+ checksum: 10c0/245a78ed983fe95fbd1b0f2d4cb9e9d1d964bddc0aa3e3d6ab10c19c4273855bfb27d840bb1fd55deb7ae3078b52f26592472baf6fd2c7019a5aa3b1da974f35languageName: nodelinkType: hard@@ -3199,12 +3195,12 @@ __metadata:languageName: nodelinkType: hard-"acorn@npm:^8.9.0":- version: 8.14.1- resolution: "acorn@npm:8.14.1"+"acorn@npm:^8.14.0":+ version: 8.14.0+ resolution: "acorn@npm:8.14.0"bin:acorn: bin/acorn- checksum: 10c0/dbd36c1ed1d2fa3550140000371fcf721578095b18777b85a79df231ca093b08edc6858d75d6e48c73e431c174dcf9214edbd7e6fa5911b93bd8abfa54e47123+ checksum: 10c0/6d4ee461a7734b2f48836ee0fbb752903606e576cc100eb49340295129ca0b452f3ba91ddd4424a1d4406a98adfb2ebb6bd0ff4c49d7a0930c10e462719bbfd7languageName: nodelinkType: hard@@ -3458,13 +3454,6 @@ __metadata:languageName: nodelinkType: hard-"aria-query@npm:^5.3.2":- version: 5.3.2- resolution: "aria-query@npm:5.3.2"- checksum: 10c0/003c7e3e2cff5540bf7a7893775fc614de82b0c5dde8ae823d47b7a28a9d4da1f7ed85f340bdb93d5649caa927755f0e31ecc7ab63edfdfc00c8ef07e505e03e- languageName: node- linkType: hard-"array-buffer-byte-length@npm:^1.0.0, array-buffer-byte-length@npm:^1.0.1, array-buffer-byte-length@npm:^1.0.2":version: 1.0.2resolution: "array-buffer-byte-length@npm:1.0.2"@@ -3496,7 +3485,7 @@ __metadata:languageName: nodelinkType: hard-"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8":+"array-includes@npm:^3.1.8":version: 3.1.8resolution: "array-includes@npm:3.1.8"dependencies:@@ -3517,20 +3506,6 @@ __metadata:languageName: nodelinkType: hard-"array.prototype.findlast@npm:^1.2.5":- version: 1.2.5- resolution: "array.prototype.findlast@npm:1.2.5"- dependencies:- call-bind: "npm:^1.0.7"- define-properties: "npm:^1.2.1"- es-abstract: "npm:^1.23.2"- es-errors: "npm:^1.3.0"- es-object-atoms: "npm:^1.0.0"- es-shim-unscopables: "npm:^1.0.2"- checksum: 10c0/ddc952b829145ab45411b9d6adcb51a8c17c76bf89c9dd64b52d5dffa65d033da8c076ed2e17091779e83bc892b9848188d7b4b33453c5565e65a92863cb2775- languageName: node- linkType: hard-"array.prototype.findlastindex@npm:^1.2.5":version: 1.2.6resolution: "array.prototype.findlastindex@npm:1.2.6"@@ -3546,7 +3521,7 @@ __metadata:languageName: nodelinkType: hard-"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2":+"array.prototype.flat@npm:^1.3.2, array.prototype.flat@npm:^1.3.3":version: 1.3.3resolution: "array.prototype.flat@npm:1.3.3"dependencies:@@ -3570,19 +3545,6 @@ __metadata:languageName: nodelinkType: hard-"array.prototype.tosorted@npm:^1.1.4":- version: 1.1.4- resolution: "array.prototype.tosorted@npm:1.1.4"- dependencies:- call-bind: "npm:^1.0.7"- define-properties: "npm:^1.2.1"- es-abstract: "npm:^1.23.3"- es-errors: "npm:^1.3.0"- es-shim-unscopables: "npm:^1.0.2"- checksum: 10c0/eb3c4c4fc0381b0bf6dba2ea4d48d367c2827a0d4236a5718d97caaccc6b78f11f4cadf090736e86301d295a6aa4967ed45568f92ced51be8cbbacd9ca410943- languageName: node- linkType: hard-"arraybuffer.prototype.slice@npm:^1.0.4":version: 1.0.4resolution: "arraybuffer.prototype.slice@npm:1.0.4"@@ -3629,13 +3591,6 @@ __metadata:languageName: nodelinkType: hard-"ast-types-flow@npm:^0.0.8":- version: 0.0.8- resolution: "ast-types-flow@npm:0.0.8"- checksum: 10c0/f2a0ba8055353b743c41431974521e5e852a9824870cd6fce2db0e538ac7bf4da406bbd018d109af29ff3f8f0993f6a730c9eddbd0abd031fbcb29ca75c1014e- languageName: node- linkType: hard-"ast-types@npm:^0.13.4":version: 0.13.4resolution: "ast-types@npm:0.13.4"@@ -3684,13 +3639,6 @@ __metadata:languageName: nodelinkType: hard-"axe-core@npm:^4.10.0":- version: 4.10.3- resolution: "axe-core@npm:4.10.3"- checksum: 10c0/1b1c24f435b2ffe89d76eca0001cbfff42dbf012ad9bd37398b70b11f0d614281a38a28bc3069e8972e3c90ec929a8937994bd24b0ebcbaab87b8d1e241ab0c7- languageName: node- linkType: hard-"axios@npm:^1.6.7, axios@npm:^1.8.3":version: 1.8.4resolution: "axios@npm:1.8.4"@@ -3702,13 +3650,6 @@ __metadata:languageName: nodelinkType: hard-"axobject-query@npm:^4.1.0":- version: 4.1.0- resolution: "axobject-query@npm:4.1.0"- checksum: 10c0/c470e4f95008f232eadd755b018cb55f16c03ccf39c027b941cd8820ac6b68707ce5d7368a46756db4256fbc91bb4ead368f84f7fb034b2b7932f082f6dc0775- languageName: node- linkType: hard-"b4a@npm:^1.6.4":version: 1.6.7resolution: "b4a@npm:1.6.7"@@ -4796,7 +4737,7 @@ __metadata:languageName: nodelinkType: hard-"cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6":+"cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.3, cross-spawn@npm:^7.0.6":version: 7.0.6resolution: "cross-spawn@npm:7.0.6"dependencies:@@ -4860,13 +4801,6 @@ __metadata:languageName: nodelinkType: hard-"damerau-levenshtein@npm:^1.0.8":- version: 1.0.8- resolution: "damerau-levenshtein@npm:1.0.8"- checksum: 10c0/4c2647e0f42acaee7d068756c1d396e296c3556f9c8314bac1ac63ffb236217ef0e7e58602b18bb2173deec7ec8e0cac8e27cccf8f5526666b4ff11a13ad54a3- languageName: node- linkType: hard-"dargs@npm:^7.0.0":version: 7.0.0resolution: "dargs@npm:7.0.0"@@ -5094,7 +5028,7 @@ __metadata:languageName: nodelinkType: hard-"define-properties@npm:^1.1.3, define-properties@npm:^1.2.1":+"define-properties@npm:^1.2.1":version: 1.2.1resolution: "define-properties@npm:1.2.1"dependencies:@@ -5211,15 +5145,6 @@ __metadata:languageName: nodelinkType: hard-"doctrine@npm:^3.0.0":- version: 3.0.0- resolution: "doctrine@npm:3.0.0"- dependencies:- esutils: "npm:^2.0.2"- checksum: 10c0/c96bdccabe9d62ab6fea9399fdff04a66e6563c1d6fb3a3a063e8d53c3bb136ba63e84250bbf63d00086a769ad53aef92d2bd483f03f837fc97b71cbee6b2520- languageName: node- linkType: hard-"dom-serializer@npm:^2.0.0":version: 2.0.0resolution: "dom-serializer@npm:2.0.0"@@ -5466,7 +5391,7 @@ __metadata:languageName: nodelinkType: hard-"es-abstract@npm:^1.17.5, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3, es-abstract@npm:^1.23.5, es-abstract@npm:^1.23.6, es-abstract@npm:^1.23.9":+"es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.5, es-abstract@npm:^1.23.9":version: 1.23.9resolution: "es-abstract@npm:1.23.9"dependencies:@@ -5556,30 +5481,6 @@ __metadata:languageName: nodelinkType: hard-"es-iterator-helpers@npm:^1.2.1":- version: 1.2.1- resolution: "es-iterator-helpers@npm:1.2.1"- dependencies:- call-bind: "npm:^1.0.8"- call-bound: "npm:^1.0.3"- define-properties: "npm:^1.2.1"- es-abstract: "npm:^1.23.6"- es-errors: "npm:^1.3.0"- es-set-tostringtag: "npm:^2.0.3"- function-bind: "npm:^1.1.2"- get-intrinsic: "npm:^1.2.6"- globalthis: "npm:^1.0.4"- gopd: "npm:^1.2.0"- has-property-descriptors: "npm:^1.0.2"- has-proto: "npm:^1.2.0"- has-symbols: "npm:^1.1.0"- internal-slot: "npm:^1.1.0"- iterator.prototype: "npm:^1.1.4"- safe-array-concat: "npm:^1.1.3"- checksum: 10c0/97e3125ca472d82d8aceea11b790397648b52c26d8768ea1c1ee6309ef45a8755bb63225a43f3150c7591cffc17caf5752459f1e70d583b4184370a8f04ebd2f- languageName: node- linkType: hard-"es-module-lexer@npm:^1.5.4":version: 1.6.0resolution: "es-module-lexer@npm:1.6.0"@@ -5596,7 +5497,7 @@ __metadata:languageName: nodelinkType: hard-"es-set-tostringtag@npm:^2.0.3, es-set-tostringtag@npm:^2.1.0":+"es-set-tostringtag@npm:^2.1.0":version: 2.1.0resolution: "es-set-tostringtag@npm:2.1.0"dependencies:@@ -5855,24 +5756,7 @@ __metadata:languageName: nodelinkType: hard-"eslint-config-airbnb@npm:^19.0.0":- version: 19.0.4- resolution: "eslint-config-airbnb@npm:19.0.4"- dependencies:- eslint-config-airbnb-base: "npm:^15.0.0"- object.assign: "npm:^4.1.2"- object.entries: "npm:^1.1.5"- peerDependencies:- eslint: ^7.32.0 || ^8.2.0- eslint-plugin-import: ^2.25.3- eslint-plugin-jsx-a11y: ^6.5.1- eslint-plugin-react: ^7.28.0- eslint-plugin-react-hooks: ^4.3.0- checksum: 10c0/867feeda45c4b480b1b8eff8fabc1bb107e837da8b48e5039e0c175ae6ad34af383b1924fc163bbfcef24a324e6651b1515e5bd12cbcbb19535a8838e2544a02- languageName: node- linkType: hard--"eslint-config-prettier@npm:^10.0.0":+"eslint-config-prettier@npm:^10.1.1":version: 10.1.1resolution: "eslint-config-prettier@npm:10.1.1"peerDependencies:@@ -5894,46 +5778,6 @@ __metadata:languageName: nodelinkType: hard-"eslint-import-resolver-typescript@npm:^2.5.0":- version: 2.7.1- resolution: "eslint-import-resolver-typescript@npm:2.7.1"- dependencies:- debug: "npm:^4.3.4"- glob: "npm:^7.2.0"- is-glob: "npm:^4.0.3"- resolve: "npm:^1.22.0"- tsconfig-paths: "npm:^3.14.1"- peerDependencies:- eslint: "*"- eslint-plugin-import: "*"- checksum: 10c0/42e2af8f86bc39413a1dbd597f9e3c645568e2ba02a960dea2e77e6970f57b3a90193ac7c950e28286404956a9b7d1a69fd5072795afe1b98a76d401a612128e- languageName: node- linkType: hard--"eslint-import-resolver-typescript@npm:^3.6.1":- version: 3.9.1- resolution: "eslint-import-resolver-typescript@npm:3.9.1"- dependencies:- "@nolyfill/is-core-module": "npm:1.0.39"- debug: "npm:^4.4.0"- get-tsconfig: "npm:^4.10.0"- is-bun-module: "npm:^1.3.0"- rspack-resolver: "npm:^1.1.0"- stable-hash: "npm:^0.0.5"- tinyglobby: "npm:^0.2.12"- peerDependencies:- eslint: "*"- eslint-plugin-import: "*"- eslint-plugin-import-x: "*"- peerDependenciesMeta:- eslint-plugin-import:- optional: true- eslint-plugin-import-x:- optional: true- checksum: 10c0/6bcc5d74719dc51e20602c5b3a30ca5682dd6db4a5828697cf1485b19dd3aef4dff7cb1f434da48df26a35d9c362e834d4ea1adc1218d77dfd84cf6ce65f4662- languageName: node- linkType: hard-"eslint-module-utils@npm:^2.12.0":version: 2.12.0resolution: "eslint-module-utils@npm:2.12.0"@@ -5946,7 +5790,7 @@ __metadata:languageName: nodelinkType: hard-"eslint-plugin-import@npm:^2.25.3, eslint-plugin-import@npm:^2.29.0":+"eslint-plugin-import@npm:^2.31.0":version: 2.31.0resolution: "eslint-plugin-import@npm:2.31.0"dependencies:@@ -5975,141 +5819,97 @@ __metadata:languageName: nodelinkType: hard-"eslint-plugin-jsx-a11y@npm:^6.5.1, eslint-plugin-jsx-a11y@npm:^6.7.1":- version: 6.10.2- resolution: "eslint-plugin-jsx-a11y@npm:6.10.2"- dependencies:- aria-query: "npm:^5.3.2"- array-includes: "npm:^3.1.8"- array.prototype.flatmap: "npm:^1.3.2"- ast-types-flow: "npm:^0.0.8"- axe-core: "npm:^4.10.0"- axobject-query: "npm:^4.1.0"- damerau-levenshtein: "npm:^1.0.8"- emoji-regex: "npm:^9.2.2"- hasown: "npm:^2.0.2"- jsx-ast-utils: "npm:^3.3.5"- language-tags: "npm:^1.0.9"- minimatch: "npm:^3.1.2"- object.fromentries: "npm:^2.0.8"- safe-regex-test: "npm:^1.0.3"- string.prototype.includes: "npm:^2.0.1"- peerDependencies:- eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9- checksum: 10c0/d93354e03b0cf66f018d5c50964e074dffe4ddf1f9b535fa020d19c4ae45f89c1a16e9391ca61ac3b19f7042c751ac0d361a056a65cbd1de24718a53ff8daa6e- languageName: node- linkType: hard--"eslint-plugin-react-hooks@npm:^4.3.0, eslint-plugin-react-hooks@npm:^4.6.0":- version: 4.6.2- resolution: "eslint-plugin-react-hooks@npm:4.6.2"- peerDependencies:- eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0- checksum: 10c0/4844e58c929bc05157fb70ba1e462e34f1f4abcbc8dd5bbe5b04513d33e2699effb8bca668297976ceea8e7ebee4e8fc29b9af9d131bcef52886feaa2308b2cc- languageName: node- linkType: hard--"eslint-plugin-react@npm:^7.27.0, eslint-plugin-react@npm:^7.33.2":- version: 7.37.4- resolution: "eslint-plugin-react@npm:7.37.4"- dependencies:- array-includes: "npm:^3.1.8"- array.prototype.findlast: "npm:^1.2.5"- array.prototype.flatmap: "npm:^1.3.3"- array.prototype.tosorted: "npm:^1.1.4"- doctrine: "npm:^2.1.0"- es-iterator-helpers: "npm:^1.2.1"- estraverse: "npm:^5.3.0"- hasown: "npm:^2.0.2"- jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"- minimatch: "npm:^3.1.2"- object.entries: "npm:^1.1.8"- object.fromentries: "npm:^2.0.8"- object.values: "npm:^1.2.1"- prop-types: "npm:^15.8.1"- resolve: "npm:^2.0.0-next.5"- semver: "npm:^6.3.1"- string.prototype.matchall: "npm:^4.0.12"- string.prototype.repeat: "npm:^1.0.0"+"eslint-plugin-simple-import-sort@npm:^12.1.1":+ version: 12.1.1+ resolution: "eslint-plugin-simple-import-sort@npm:12.1.1"peerDependencies:- eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7- checksum: 10c0/4acbbdb19669dfa9a162ed8847c3ad1918f6aea1ceb675ee320b5d903b4e463fdef25e15233295b6d0a726fef2ea8b015c527da769c7690932ddc52d5b82ba12+ eslint: ">=5.0.0"+ checksum: 10c0/0ad1907ad9ddbadd1db655db0a9d0b77076e274b793a77b982c8525d808d868e6ecfce24f3a411e8a1fa551077387f9ebb38c00956073970ebd7ee6a029ce2b3languageName: nodelinkType: hard-"eslint-scope@npm:^7.2.2":- version: 7.2.2- resolution: "eslint-scope@npm:7.2.2"+"eslint-scope@npm:^8.3.0":+ version: 8.3.0+ resolution: "eslint-scope@npm:8.3.0"dependencies:esrecurse: "npm:^4.3.0"estraverse: "npm:^5.2.0"- checksum: 10c0/613c267aea34b5a6d6c00514e8545ef1f1433108097e857225fed40d397dd6b1809dffd11c2fde23b37ca53d7bf935fe04d2a18e6fc932b31837b6ad67e1c116+ checksum: 10c0/23bf54345573201fdf06d29efa345ab508b355492f6c6cc9e2b9f6d02b896f369b6dd5315205be94b8853809776c4d13353b85c6b531997b164ff6c3328ecf5blanguageName: nodelinkType: hard-"eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":+"eslint-visitor-keys@npm:^3.4.3":version: 3.4.3resolution: "eslint-visitor-keys@npm:3.4.3"checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820languageName: nodelinkType: hard-"eslint@npm:^8.57.1":- version: 8.57.1- resolution: "eslint@npm:8.57.1"+"eslint-visitor-keys@npm:^4.2.0":+ version: 4.2.0+ resolution: "eslint-visitor-keys@npm:4.2.0"+ checksum: 10c0/2ed81c663b147ca6f578312919483eb040295bbab759e5a371953456c636c5b49a559883e2677112453728d66293c0a4c90ab11cab3428cf02a0236d2e738269+ languageName: node+ linkType: hard++"eslint@npm:^9.23.0":+ version: 9.23.0+ resolution: "eslint@npm:9.23.0"dependencies:"@eslint-community/eslint-utils": "npm:^4.2.0"- "@eslint-community/regexpp": "npm:^4.6.1"- "@eslint/eslintrc": "npm:^2.1.4"- "@eslint/js": "npm:8.57.1"- "@humanwhocodes/config-array": "npm:^0.13.0"+ "@eslint-community/regexpp": "npm:^4.12.1"+ "@eslint/config-array": "npm:^0.19.2"+ "@eslint/config-helpers": "npm:^0.2.0"+ "@eslint/core": "npm:^0.12.0"+ "@eslint/eslintrc": "npm:^3.3.1"+ "@eslint/js": "npm:9.23.0"+ "@eslint/plugin-kit": "npm:^0.2.7"+ "@humanfs/node": "npm:^0.16.6""@humanwhocodes/module-importer": "npm:^1.0.1"- "@nodelib/fs.walk": "npm:^1.2.8"- "@ungap/structured-clone": "npm:^1.2.0"+ "@humanwhocodes/retry": "npm:^0.4.2"+ "@types/estree": "npm:^1.0.6"+ "@types/json-schema": "npm:^7.0.15"ajv: "npm:^6.12.4"chalk: "npm:^4.0.0"- cross-spawn: "npm:^7.0.2"+ cross-spawn: "npm:^7.0.6"debug: "npm:^4.3.2"- doctrine: "npm:^3.0.0"escape-string-regexp: "npm:^4.0.0"- eslint-scope: "npm:^7.2.2"- eslint-visitor-keys: "npm:^3.4.3"- espree: "npm:^9.6.1"- esquery: "npm:^1.4.2"+ eslint-scope: "npm:^8.3.0"+ eslint-visitor-keys: "npm:^4.2.0"+ espree: "npm:^10.3.0"+ esquery: "npm:^1.5.0"esutils: "npm:^2.0.2"fast-deep-equal: "npm:^3.1.3"- file-entry-cache: "npm:^6.0.1"+ file-entry-cache: "npm:^8.0.0"find-up: "npm:^5.0.0"glob-parent: "npm:^6.0.2"- globals: "npm:^13.19.0"- graphemer: "npm:^1.4.0"ignore: "npm:^5.2.0"imurmurhash: "npm:^0.1.4"is-glob: "npm:^4.0.0"- is-path-inside: "npm:^3.0.3"- js-yaml: "npm:^4.1.0"json-stable-stringify-without-jsonify: "npm:^1.0.1"- levn: "npm:^0.4.1"lodash.merge: "npm:^4.6.2"minimatch: "npm:^3.1.2"natural-compare: "npm:^1.4.0"optionator: "npm:^0.9.3"- strip-ansi: "npm:^6.0.1"- text-table: "npm:^0.2.0"+ peerDependencies:+ jiti: "*"+ peerDependenciesMeta:+ jiti:+ optional: truebin:eslint: bin/eslint.js- checksum: 10c0/1fd31533086c1b72f86770a4d9d7058ee8b4643fd1cfd10c7aac1ecb8725698e88352a87805cf4b2ce890aa35947df4b4da9655fb7fdfa60dbb448a43f6ebcf1+ checksum: 10c0/9616c308dfa8d09db8ae51019c87d5d05933742214531b077bd6ab618baab3bec7938256c14dcad4dc47f5ba93feb0bc5e089f68799f076374ddea21b6a9be45languageName: nodelinkType: hard-"espree@npm:^9.6.0, espree@npm:^9.6.1":- version: 9.6.1- resolution: "espree@npm:9.6.1"+"espree@npm:^10.0.1, espree@npm:^10.3.0":+ version: 10.3.0+ resolution: "espree@npm:10.3.0"dependencies:- acorn: "npm:^8.9.0"+ acorn: "npm:^8.14.0"acorn-jsx: "npm:^5.3.2"- eslint-visitor-keys: "npm:^3.4.1"- checksum: 10c0/1a2e9b4699b715347f62330bcc76aee224390c28bb02b31a3752e9d07549c473f5f986720483c6469cf3cfb3c9d05df612ffc69eb1ee94b54b739e67de9bb460+ eslint-visitor-keys: "npm:^4.2.0"+ checksum: 10c0/272beeaca70d0a1a047d61baff64db04664a33d7cfb5d144f84bc8a5c6194c6c8ebe9cc594093ca53add88baa23e59b01e69e8a0160ab32eac570482e165c462languageName: nodelinkType: hard@@ -6123,7 +5923,7 @@ __metadata:languageName: nodelinkType: hard-"esquery@npm:^1.4.2":+"esquery@npm:^1.5.0":version: 1.6.0resolution: "esquery@npm:1.6.0"dependencies:@@ -6141,7 +5941,7 @@ __metadata:languageName: nodelinkType: hard-"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":+"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0":version: 5.3.0resolution: "estraverse@npm:5.3.0"checksum: 10c0/1ff9447b96263dec95d6d67431c5e0771eb9776427421260a3e2f0fdd5d6bd4f8e37a7338f5ad2880c9f143450c9b1e4fc2069060724570a49cf9cf0312bd107@@ -6336,7 +6136,7 @@ __metadata:languageName: nodelinkType: hard-"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.3":+"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.2, fast-glob@npm:^3.3.3":version: 3.3.3resolution: "fast-glob@npm:3.3.3"dependencies:@@ -6388,18 +6188,6 @@ __metadata:languageName: nodelinkType: hard-"fdir@npm:^6.4.3":- version: 6.4.3- resolution: "fdir@npm:6.4.3"- peerDependencies:- picomatch: ^3 || ^4- peerDependenciesMeta:- picomatch:- optional: true- checksum: 10c0/d13c10120e9625adf21d8d80481586200759928c19405a816b77dd28eaeb80e7c59c5def3e2941508045eb06d34eb47fad865ccc8bf98e6ab988bb0ed160fb6f- languageName: node- linkType: hard-"fflate@npm:^0.8.2":version: 0.8.2resolution: "fflate@npm:0.8.2"@@ -6425,12 +6213,12 @@ __metadata:languageName: nodelinkType: hard-"file-entry-cache@npm:^6.0.1":- version: 6.0.1- resolution: "file-entry-cache@npm:6.0.1"+"file-entry-cache@npm:^8.0.0":+ version: 8.0.0+ resolution: "file-entry-cache@npm:8.0.0"dependencies:- flat-cache: "npm:^3.0.4"- checksum: 10c0/58473e8a82794d01b38e5e435f6feaf648e3f36fdb3a56e98f417f4efae71ad1c0d4ebd8a9a7c50c3ad085820a93fc7494ad721e0e4ebc1da3573f4e1c3c7cdd+ flat-cache: "npm:^4.0.0"+ checksum: 10c0/9e2b5938b1cd9b6d7e3612bdc533afd4ac17b2fc646569e9a8abbf2eb48e5eb8e316bc38815a3ef6a1b456f4107f0d0f055a614ca613e75db6bf9ff4d72c1638languageName: nodelinkType: hard@@ -6555,14 +6343,13 @@ __metadata:languageName: nodelinkType: hard-"flat-cache@npm:^3.0.4":- version: 3.2.0- resolution: "flat-cache@npm:3.2.0"+"flat-cache@npm:^4.0.0":+ version: 4.0.1+ resolution: "flat-cache@npm:4.0.1"dependencies:flatted: "npm:^3.2.9"- keyv: "npm:^4.5.3"- rimraf: "npm:^3.0.2"- checksum: 10c0/b76f611bd5f5d68f7ae632e3ae503e678d205cf97a17c6ab5b12f6ca61188b5f1f7464503efae6dc18683ed8f0b41460beb48ac4b9ac63fe6201296a91ba2f75+ keyv: "npm:^4.5.4"+ checksum: 10c0/2c59d93e9faa2523e4fda6b4ada749bed432cfa28c8e251f33b25795e426a1c6dbada777afb1f74fcfff33934fdbdea921ee738fcc33e71adc9d6eca984a1cfclanguageName: nodelinkType: hard@@ -6927,12 +6714,12 @@ __metadata:languageName: nodelinkType: hard-"get-tsconfig@npm:^4.10.0, get-tsconfig@npm:^4.7.5":- version: 4.10.0- resolution: "get-tsconfig@npm:4.10.0"+"get-tsconfig@npm:^4.7.5":+ version: 4.8.1+ resolution: "get-tsconfig@npm:4.8.1"dependencies:resolve-pkg-maps: "npm:^1.0.0"- checksum: 10c0/c9b5572c5118923c491c04285c73bd55b19e214992af957c502a3be0fc0043bb421386ffd45ca3433c0a7fba81221ca300479e8393960acf15d0ed4563f38a86+ checksum: 10c0/536ee85d202f604f4b5fb6be81bcd6e6d9a96846811e83e9acc6de4a04fb49506edea0e1b8cf1d5ee7af33e469916ec2809d4c5445ab8ae015a7a51fbd1572f9languageName: nodelinkType: hard@@ -7080,7 +6867,7 @@ __metadata:languageName: nodelinkType: hard-"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.2.0":+"glob@npm:^7.1.3, glob@npm:^7.1.4":version: 7.2.3resolution: "glob@npm:7.2.3"dependencies:@@ -7115,12 +6902,24 @@ __metadata:languageName: nodelinkType: hard-"globals@npm:^13.19.0":- version: 13.24.0- resolution: "globals@npm:13.24.0"- dependencies:- type-fest: "npm:^0.20.2"- checksum: 10c0/d3c11aeea898eb83d5ec7a99508600fbe8f83d2cf00cbb77f873dbf2bcb39428eff1b538e4915c993d8a3b3473fa71eeebfe22c9bb3a3003d1e26b1f2c8a42cd+"globals@npm:^14.0.0":+ version: 14.0.0+ resolution: "globals@npm:14.0.0"+ checksum: 10c0/b96ff42620c9231ad468d4c58ff42afee7777ee1c963013ff8aabe095a451d0ceeb8dcd8ef4cbd64d2538cef45f787a78ba3a9574f4a634438963e334471302d+ languageName: node+ linkType: hard++"globals@npm:^15.14.0":+ version: 15.15.0+ resolution: "globals@npm:15.15.0"+ checksum: 10c0/f9ae80996392ca71316495a39bec88ac43ae3525a438b5626cd9d5ce9d5500d0a98a266409605f8cd7241c7acf57c354a48111ea02a767ba4f374b806d6861fe+ languageName: node+ linkType: hard++"globals@npm:^16.0.0":+ version: 16.0.0+ resolution: "globals@npm:16.0.0"+ checksum: 10c0/8906d5f01838df64a81d6c2a7b7214312e2216cf65c5ed1546dc9a7d0febddf55ffa906cf04efd5b01eec2534d6f14859a89535d1a68241832810e41ef3fd5bblanguageName: nodelinkType: hard@@ -7134,7 +6933,7 @@ __metadata:languageName: nodelinkType: hard-"globby@npm:11.1.0, globby@npm:^11.1.0":+"globby@npm:11.1.0":version: 11.1.0resolution: "globby@npm:11.1.0"dependencies:@@ -7931,15 +7730,6 @@ __metadata:languageName: nodelinkType: hard-"is-bun-module@npm:^1.3.0":- version: 1.3.0- resolution: "is-bun-module@npm:1.3.0"- dependencies:- semver: "npm:^7.6.3"- checksum: 10c0/2966744188fcd28e0123c52158c7073973f88babfa9ab04e2846ec5862d6b0f8f398df6413429d930f7c5ee6111ce2cbfb3eb8652d9ec42d4a37dc5089a866fb- languageName: node- linkType: hard-"is-callable@npm:^1.2.7":version: 1.2.7resolution: "is-callable@npm:1.2.7"@@ -7969,7 +7759,7 @@ __metadata:languageName: nodelinkType: hard-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1, is-core-module@npm:^2.16.0, is-core-module@npm:^2.5.0":+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1, is-core-module@npm:^2.16.0, is-core-module@npm:^2.16.1, is-core-module@npm:^2.5.0":version: 2.16.1resolution: "is-core-module@npm:2.16.1"dependencies:@@ -8113,13 +7903,6 @@ __metadata:languageName: nodelinkType: hard-"is-path-inside@npm:^3.0.3":- version: 3.0.3- resolution: "is-path-inside@npm:3.0.3"- checksum: 10c0/cf7d4ac35fb96bab6a1d2c3598fe5ebb29aafb52c0aaa482b5a3ed9d8ba3edc11631e3ec2637660c44b3ce0e61a08d54946e8af30dec0b60a7c27296c68ffd05- languageName: node- linkType: hard-"is-plain-obj@npm:^1.0.0, is-plain-obj@npm:^1.1.0":version: 1.1.0resolution: "is-plain-obj@npm:1.1.0"@@ -8388,20 +8171,6 @@ __metadata:languageName: nodelinkType: hard-"iterator.prototype@npm:^1.1.4":- version: 1.1.5- resolution: "iterator.prototype@npm:1.1.5"- dependencies:- define-data-property: "npm:^1.1.4"- es-object-atoms: "npm:^1.0.0"- get-intrinsic: "npm:^1.2.6"- get-proto: "npm:^1.0.0"- has-symbols: "npm:^1.1.0"- set-function-name: "npm:^2.0.2"- checksum: 10c0/f7a262808e1b41049ab55f1e9c29af7ec1025a000d243b83edf34ce2416eedd56079b117fa59376bb4a724110690f13aa8427f2ee29a09eec63a7e72367626d0- languageName: node- linkType: hard-"jackspeak@npm:^3.1.2":version: 3.4.3resolution: "jackspeak@npm:3.4.3"@@ -8473,7 +8242,7 @@ __metadata:languageName: nodelinkType: hard-"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":+"js-tokens@npm:^4.0.0":version: 4.0.0resolution: "js-tokens@npm:4.0.0"checksum: 10c0/e248708d377aa058eacf2037b07ded847790e6de892bbad3dac0abba2e759cb9f121b00099a65195616badcb6eca8d14d975cb3e89eb1cfda644756402c8aeed@@ -8654,18 +8423,6 @@ __metadata:languageName: nodelinkType: hard-"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.5":- version: 3.3.5- resolution: "jsx-ast-utils@npm:3.3.5"- dependencies:- array-includes: "npm:^3.1.6"- array.prototype.flat: "npm:^1.3.1"- object.assign: "npm:^4.1.4"- object.values: "npm:^1.1.6"- checksum: 10c0/a32679e9cb55469cb6d8bbc863f7d631b2c98b7fc7bf172629261751a6e7bc8da6ae374ddb74d5fbd8b06cf0eb4572287b259813d92b36e384024ed35e4c13e1- languageName: node- linkType: hard-"just-diff-apply@npm:^5.2.0":version: 5.5.0resolution: "just-diff-apply@npm:5.5.0"@@ -8703,15 +8460,6 @@ __metadata:languageName: nodelinkType: hard-"language-tags@npm:^1.0.9":- version: 1.0.9- resolution: "language-tags@npm:1.0.9"- dependencies:- language-subtag-registry: "npm:^0.3.20"- checksum: 10c0/9ab911213c4bd8bd583c850201c17794e52cb0660d1ab6e32558aadc8324abebf6844e46f92b80a5d600d0fbba7eface2c207bfaf270a1c7fd539e4c3a880bff- languageName: node- linkType: hard-"language-tags@npm:^2.0.1":version: 2.0.1resolution: "language-tags@npm:2.0.1"@@ -9090,17 +8838,6 @@ __metadata:languageName: nodelinkType: hard-"loose-envify@npm:^1.4.0":- version: 1.4.0- resolution: "loose-envify@npm:1.4.0"- dependencies:- js-tokens: "npm:^3.0.0 || ^4.0.0"- bin:- loose-envify: cli.js- checksum: 10c0/655d110220983c1a4b9c0c679a2e8016d4b67f6e9c7b5435ff5979ecdb20d0813f4dec0a08674fcbdd4846a3f07edbb50a36811fd37930b94aaa0d9daceb017e- languageName: node- linkType: hard-"loupe@npm:^3.1.0, loupe@npm:^3.1.2":version: 3.1.3resolution: "loupe@npm:3.1.3"@@ -9123,9 +8860,9 @@ __metadata:linkType: hard"lru-cache@npm:^11.0.0":- version: 11.1.0- resolution: "lru-cache@npm:11.1.0"- checksum: 10c0/85c312f7113f65fae6a62de7985348649937eb34fb3d212811acbf6704dc322a421788aca253b62838f1f07049a84cc513d88f494e373d3756514ad263670a64+ version: 11.0.2+ resolution: "lru-cache@npm:11.0.2"+ checksum: 10c0/c993b8e06ead0b24b969c1dbb5b301716aed66e320e9014a80012f5febe280b438f28ff50046b2c55ff404e889351ccb332ff91f8dd175a21f5eae80e3fb155flanguageName: nodelinkType: hard@@ -9450,7 +9187,7 @@ __metadata:languageName: nodelinkType: hard-"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":+"minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":version: 3.1.2resolution: "minimatch@npm:3.1.2"dependencies:@@ -10266,13 +10003,6 @@ __metadata:languageName: nodelinkType: hard-"object-assign@npm:^4.1.1":- version: 4.1.1- resolution: "object-assign@npm:4.1.1"- checksum: 10c0/1f4df9945120325d041ccf7b86f31e8bcc14e73d29171e37a7903050e96b81323784ec59f93f102ec635bcf6fa8034ba3ea0a8c7e69fa202b87ae3b6cec5a414- languageName: node- linkType: hard-"object-inspect@npm:^1.13.3":version: 1.13.4resolution: "object-inspect@npm:1.13.4"@@ -10311,7 +10041,7 @@ __metadata:languageName: nodelinkType: hard-"object.entries@npm:^1.1.5, object.entries@npm:^1.1.8":+"object.entries@npm:^1.1.5":version: 1.1.9resolution: "object.entries@npm:1.1.9"dependencies:@@ -10346,7 +10076,7 @@ __metadata:languageName: nodelinkType: hard-"object.values@npm:^1.1.6, object.values@npm:^1.2.0, object.values@npm:^1.2.1":+"object.values@npm:^1.2.0, object.values@npm:^1.2.1":version: 1.2.1resolution: "object.values@npm:1.2.1"dependencies:@@ -10980,13 +10710,6 @@ __metadata:languageName: nodelinkType: hard-"picomatch@npm:^4.0.2":- version: 4.0.2- resolution: "picomatch@npm:4.0.2"- checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc- languageName: node- linkType: hard-"pidtree@npm:^0.6.0":version: 0.6.0resolution: "pidtree@npm:0.6.0"@@ -11213,17 +10936,6 @@ __metadata:languageName: nodelinkType: hard-"prop-types@npm:^15.8.1":- version: 15.8.1- resolution: "prop-types@npm:15.8.1"- dependencies:- loose-envify: "npm:^1.4.0"- object-assign: "npm:^4.1.1"- react-is: "npm:^16.13.1"- checksum: 10c0/59ece7ca2fb9838031d73a48d4becb9a7cc1ed10e610517c7d8f19a1e02fa47f7c27d557d8a5702bec3cfeccddc853579832b43f449e54635803f277b1c78077- languageName: node- linkType: hard-"propagate@npm:^2.0.0":version: 2.0.1resolution: "propagate@npm:2.0.1"@@ -11423,13 +11135,6 @@ __metadata:languageName: nodelinkType: hard-"react-is@npm:^16.13.1":- version: 16.13.1- resolution: "react-is@npm:16.13.1"- checksum: 10c0/33977da7a5f1a287936a0c85639fec6ca74f4f15ef1e59a6bc20338fc73dc69555381e211f7a3529b8150a1f71e4225525b41b60b52965bda53ce7d47377ada1- languageName: node- linkType: hard-"react-is@npm:^18.0.0":version: 18.3.1resolution: "react-is@npm:18.3.1"@@ -11631,7 +11336,7 @@ __metadata:languageName: nodelinkType: hard-"resolve@npm:^1.10.0, resolve@npm:^1.22.0, resolve@npm:^1.22.4":+"resolve@npm:^1.10.0, resolve@npm:^1.22.4":version: 1.22.10resolution: "resolve@npm:1.22.10"dependencies:@@ -11644,20 +11349,7 @@ __metadata:languageName: nodelinkType: hard-"resolve@npm:^2.0.0-next.5":- version: 2.0.0-next.5- resolution: "resolve@npm:2.0.0-next.5"- dependencies:- is-core-module: "npm:^2.13.0"- path-parse: "npm:^1.0.7"- supports-preserve-symlinks-flag: "npm:^1.0.0"- bin:- resolve: bin/resolve- checksum: 10c0/a6c33555e3482ea2ec4c6e3d3bf0d78128abf69dca99ae468e64f1e30acaa318fd267fb66c8836b04d558d3e2d6ed875fe388067e7d8e0de647d3c21af21c43a- languageName: node- linkType: hard--"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":+"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>":version: 1.22.10resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin<compat/resolve>::version=1.22.10&hash=c3c19d"dependencies:@@ -11670,19 +11362,6 @@ __metadata:languageName: nodelinkType: hard-"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":- version: 2.0.0-next.5- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"- dependencies:- is-core-module: "npm:^2.13.0"- path-parse: "npm:^1.0.7"- supports-preserve-symlinks-flag: "npm:^1.0.0"- bin:- resolve: bin/resolve- checksum: 10c0/78ad6edb8309a2bfb720c2c1898f7907a37f858866ce11a5974643af1203a6a6e05b2fa9c53d8064a673a447b83d42569260c306d43628bff5bb101969708355- languageName: node- linkType: hard-"responselike@npm:^3.0.0":version: 3.0.0resolution: "responselike@npm:3.0.0"@@ -11874,48 +11553,6 @@ __metadata:languageName: nodelinkType: hard-"rspack-resolver@npm:^1.1.0":- version: 1.2.2- resolution: "rspack-resolver@npm:1.2.2"- dependencies:- "@unrs/rspack-resolver-binding-darwin-arm64": "npm:1.2.2"- "@unrs/rspack-resolver-binding-darwin-x64": "npm:1.2.2"- "@unrs/rspack-resolver-binding-freebsd-x64": "npm:1.2.2"- "@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "npm:1.2.2"- "@unrs/rspack-resolver-binding-linux-arm64-gnu": "npm:1.2.2"- "@unrs/rspack-resolver-binding-linux-arm64-musl": "npm:1.2.2"- "@unrs/rspack-resolver-binding-linux-x64-gnu": "npm:1.2.2"- "@unrs/rspack-resolver-binding-linux-x64-musl": "npm:1.2.2"- "@unrs/rspack-resolver-binding-wasm32-wasi": "npm:1.2.2"- "@unrs/rspack-resolver-binding-win32-arm64-msvc": "npm:1.2.2"- "@unrs/rspack-resolver-binding-win32-x64-msvc": "npm:1.2.2"- dependenciesMeta:- "@unrs/rspack-resolver-binding-darwin-arm64":- optional: true- "@unrs/rspack-resolver-binding-darwin-x64":- optional: true- "@unrs/rspack-resolver-binding-freebsd-x64":- optional: true- "@unrs/rspack-resolver-binding-linux-arm-gnueabihf":- optional: true- "@unrs/rspack-resolver-binding-linux-arm64-gnu":- optional: true- "@unrs/rspack-resolver-binding-linux-arm64-musl":- optional: true- "@unrs/rspack-resolver-binding-linux-x64-gnu":- optional: true- "@unrs/rspack-resolver-binding-linux-x64-musl":- optional: true- "@unrs/rspack-resolver-binding-wasm32-wasi":- optional: true- "@unrs/rspack-resolver-binding-win32-arm64-msvc":- optional: true- "@unrs/rspack-resolver-binding-win32-x64-msvc":- optional: true- checksum: 10c0/897343b6e0934b54570722f1d21ca0239eaf0bdbad9b3357cc636a9cfc775f2b28f5fea477caf800978c22efed0f312ef2893d71c7b5e84447ac1ef9c5d80f22- languageName: node- linkType: hard-"run-async@npm:^2.4.0":version: 2.4.1resolution: "run-async@npm:2.4.1"@@ -11985,7 +11622,7 @@ __metadata:languageName: nodelinkType: hard-"safe-regex-test@npm:^1.0.3, safe-regex-test@npm:^1.1.0":+"safe-regex-test@npm:^1.1.0":version: 1.1.0resolution: "safe-regex-test@npm:1.1.0"dependencies:@@ -12037,7 +11674,7 @@ __metadata:languageName: nodelinkType: hard-"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3, semver@npm:^7.7.1":+"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.7.1":version: 7.7.1resolution: "semver@npm:7.7.1"bin:@@ -12319,7 +11956,7 @@ __metadata:languageName: nodelinkType: hard-"socks@npm:^2.6.2, socks@npm:^2.8.3":+"socks@npm:^2.6.2":version: 2.8.4resolution: "socks@npm:2.8.4"dependencies:@@ -12329,6 +11966,16 @@ __metadata:languageName: nodelinkType: hard+"socks@npm:^2.8.3":+ version: 2.8.3+ resolution: "socks@npm:2.8.3"+ dependencies:+ ip-address: "npm:^9.0.5"+ smart-buffer: "npm:^4.2.0"+ checksum: 10c0/d54a52bf9325165770b674a67241143a3d8b4e4c8884560c4e0e078aace2a728dffc7f70150660f51b85797c4e1a3b82f9b7aa25e0a0ceae1a243365da5c51a7+ languageName: node+ linkType: hard+"sort-keys@npm:^2.0.0":version: 2.0.0resolution: "sort-keys@npm:2.0.0"@@ -12482,13 +12129,6 @@ __metadata:languageName: nodelinkType: hard-"stable-hash@npm:^0.0.5":- version: 0.0.5- resolution: "stable-hash@npm:0.0.5"- checksum: 10c0/ca670cb6d172f1c834950e4ec661e2055885df32fee3ebf3647c5df94993b7c2666a5dbc1c9a62ee11fc5c24928579ec5e81bb5ad31971d355d5a341aab493b3- languageName: node- linkType: hard-"stackback@npm:0.0.2":version: 0.0.2resolution: "stackback@npm:0.0.2"@@ -12606,48 +12246,6 @@ __metadata:languageName: nodelinkType: hard-"string.prototype.includes@npm:^2.0.1":- version: 2.0.1- resolution: "string.prototype.includes@npm:2.0.1"- dependencies:- call-bind: "npm:^1.0.7"- define-properties: "npm:^1.2.1"- es-abstract: "npm:^1.23.3"- checksum: 10c0/25ce9c9b49128352a2618fbe8758b46f945817a58a4420f4799419e40a8d28f116e176c7590d767d5327a61e75c8f32c86171063f48e389b9fdd325f1bd04ee5- languageName: node- linkType: hard--"string.prototype.matchall@npm:^4.0.12":- version: 4.0.12- resolution: "string.prototype.matchall@npm:4.0.12"- dependencies:- call-bind: "npm:^1.0.8"- call-bound: "npm:^1.0.3"- define-properties: "npm:^1.2.1"- es-abstract: "npm:^1.23.6"- es-errors: "npm:^1.3.0"- es-object-atoms: "npm:^1.0.0"- get-intrinsic: "npm:^1.2.6"- gopd: "npm:^1.2.0"- has-symbols: "npm:^1.1.0"- internal-slot: "npm:^1.1.0"- regexp.prototype.flags: "npm:^1.5.3"- set-function-name: "npm:^2.0.2"- side-channel: "npm:^1.1.0"- checksum: 10c0/1a53328ada73f4a77f1fdf1c79414700cf718d0a8ef6672af5603e709d26a24f2181208144aed7e858b1bcc1a0d08567a570abfb45567db4ae47637ed2c2f85c- languageName: node- linkType: hard--"string.prototype.repeat@npm:^1.0.0":- version: 1.0.0- resolution: "string.prototype.repeat@npm:1.0.0"- dependencies:- define-properties: "npm:^1.1.3"- es-abstract: "npm:^1.17.5"- checksum: 10c0/94c7978566cffa1327d470fd924366438af9b04b497c43a9805e476e2e908aa37a1fd34cc0911156c17556dab62159d12c7b92b3cc304c3e1281fe4c8e668f40- languageName: node- linkType: hard-"string.prototype.trim@npm:^1.2.10":version: 1.2.10resolution: "string.prototype.trim@npm:1.2.10"@@ -12966,13 +12564,6 @@ __metadata:languageName: nodelinkType: hard-"text-table@npm:^0.2.0":- version: 0.2.0- resolution: "text-table@npm:0.2.0"- checksum: 10c0/02805740c12851ea5982686810702e2f14369a5f4c5c40a836821e3eefc65ffeec3131ba324692a37608294b0fd8c1e55a2dd571ffed4909822787668ddbee5c- languageName: node- linkType: hard-"through2@npm:^2.0.0":version: 2.0.5resolution: "through2@npm:2.0.5"@@ -13018,16 +12609,6 @@ __metadata:languageName: nodelinkType: hard-"tinyglobby@npm:^0.2.12":- version: 0.2.12- resolution: "tinyglobby@npm:0.2.12"- dependencies:- fdir: "npm:^6.4.3"- picomatch: "npm:^4.0.2"- checksum: 10c0/7c9be4fd3625630e262dcb19015302aad3b4ba7fc620f269313e688f2161ea8724d6cb4444baab5ef2826eb6bed72647b169a33ec8eea37501832a2526ff540f- languageName: node- linkType: hard-"tinypool@npm:^1.0.1":version: 1.0.2resolution: "tinypool@npm:1.0.2"@@ -13148,12 +12729,12 @@ __metadata:languageName: nodelinkType: hard-"ts-api-utils@npm:^1.3.0":- version: 1.4.3- resolution: "ts-api-utils@npm:1.4.3"+"ts-api-utils@npm:^2.0.1":+ version: 2.1.0+ resolution: "ts-api-utils@npm:2.1.0"peerDependencies:- typescript: ">=4.2.0"- checksum: 10c0/e65dc6e7e8141140c23e1dc94984bf995d4f6801919c71d6dc27cf0cd51b100a91ffcfe5217626193e5bea9d46831e8586febdc7e172df3f1091a7384299e23a+ typescript: ">=4.8.4"+ checksum: 10c0/9806a38adea2db0f6aa217ccc6bc9c391ddba338a9fe3080676d0d50ed806d305bb90e8cef0276e793d28c8a929f400abb184ddd7ff83a416959c0f4d2ce754flanguageName: nodelinkType: hard@@ -13171,7 +12752,7 @@ __metadata:languageName: nodelinkType: hard-"tsconfig-paths@npm:^3.14.1, tsconfig-paths@npm:^3.15.0":+"tsconfig-paths@npm:^3.15.0":version: 3.15.0resolution: "tsconfig-paths@npm:3.15.0"dependencies:@@ -13324,13 +12905,6 @@ __metadata:languageName: nodelinkType: hard-"type-fest@npm:^0.20.2":- version: 0.20.2- resolution: "type-fest@npm:0.20.2"- checksum: 10c0/dea9df45ea1f0aaa4e2d3bed3f9a0bfe9e5b2592bddb92eb1bf06e50bcf98dbb78189668cd8bc31a0511d3fc25539b4cd5c704497e53e93e2d40ca764b10bfc3- languageName: node- linkType: hard-"type-fest@npm:^0.21.3":version: 0.21.3resolution: "type-fest@npm:0.21.3"@@ -13450,23 +13024,37 @@ __metadata:languageName: nodelinkType: hard-"typescript@npm:>=3 < 6, typescript@npm:^5.7.2":- version: 5.8.2- resolution: "typescript@npm:5.8.2"+"typescript-eslint@npm:^8.28.0":+ version: 8.28.0+ resolution: "typescript-eslint@npm:8.28.0"+ dependencies:+ "@typescript-eslint/eslint-plugin": "npm:8.28.0"+ "@typescript-eslint/parser": "npm:8.28.0"+ "@typescript-eslint/utils": "npm:8.28.0"+ peerDependencies:+ eslint: ^8.57.0 || ^9.0.0+ typescript: ">=4.8.4 <5.9.0"+ checksum: 10c0/bf1c1e4b2f21a95930758d5b285c39a394a50e3b6983f373413b93b80a6cb5aabc1d741780e60c63cb42ad5d645ea9c1e6d441d98174c5a2884ab88f4ac46df6+ languageName: node+ linkType: hard++"typescript@npm:>=3 < 6, typescript@npm:^5.7.3":+ version: 5.7.3+ resolution: "typescript@npm:5.7.3"bin:tsc: bin/tsctsserver: bin/tsserver- checksum: 10c0/5c4f6fbf1c6389b6928fe7b8fcd5dc73bb2d58cd4e3883f1d774ed5bd83b151cbac6b7ecf11723de56d4676daeba8713894b1e9af56174f2f9780ae7848ec3c6+ checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afalanguageName: nodelinkType: hard-"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.7.2#optional!builtin<compat/typescript>":- version: 5.8.2- resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"+"typescript@patch:typescript@npm%3A>=3 < 6#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A^5.7.3#optional!builtin<compat/typescript>":+ version: 5.7.3+ resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"bin:tsc: bin/tsctsserver: bin/tsserver- checksum: 10c0/5448a08e595cc558ab321e49d4cac64fb43d1fa106584f6ff9a8d8e592111b373a995a1d5c7f3046211c8a37201eb6d0f1566f15cdb7a62a5e3be01d087848e2+ checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4languageName: nodelinkType: hard