diff --git a/packages/puppeteer-core/src/node/BrowserFetcher.ts b/packages/puppeteer-core/src/node/BrowserFetcher.ts index 6ea3be20..24c6a936 100644 --- a/packages/puppeteer-core/src/node/BrowserFetcher.ts +++ b/packages/puppeteer-core/src/node/BrowserFetcher.ts @@ -36,7 +36,8 @@ import bzip from 'unbzip2-stream'; import {debug} from '../common/Debug.js'; import {Product} from '../common/Product.js'; import {assert} from '../util/assert.js'; -import {rm} from '../util/fs.js'; + +import {rm} from './util/fs.js'; const debugFetcher = debug('puppeteer:fetcher'); diff --git a/packages/puppeteer-core/src/node/ChromeLauncher.ts b/packages/puppeteer-core/src/node/ChromeLauncher.ts index b93b1baa..4a30116a 100644 --- a/packages/puppeteer-core/src/node/ChromeLauncher.ts +++ b/packages/puppeteer-core/src/node/ChromeLauncher.ts @@ -25,7 +25,6 @@ import { import {debugError} from '../common/util.js'; import {assert} from '../util/assert.js'; -import {rm} from '../util/fs.js'; import { BrowserLaunchArgumentOptions, @@ -34,6 +33,7 @@ import { } from './LaunchOptions.js'; import {ProductLauncher, ResolvedLaunchArgs} from './ProductLauncher.js'; import {PuppeteerNode} from './PuppeteerNode.js'; +import {rm} from './util/fs.js'; /** * @internal diff --git a/packages/puppeteer-core/src/node/FirefoxLauncher.ts b/packages/puppeteer-core/src/node/FirefoxLauncher.ts index 835fb7ba..4eeb424b 100644 --- a/packages/puppeteer-core/src/node/FirefoxLauncher.ts +++ b/packages/puppeteer-core/src/node/FirefoxLauncher.ts @@ -23,7 +23,6 @@ import {Browser as SupportedBrowsers, createProfile} from '@puppeteer/browsers'; import {debugError} from '../common/util.js'; import {assert} from '../util/assert.js'; -import {rm} from '../util/fs.js'; import { BrowserLaunchArgumentOptions, @@ -31,6 +30,7 @@ import { } from './LaunchOptions.js'; import {ProductLauncher, ResolvedLaunchArgs} from './ProductLauncher.js'; import {PuppeteerNode} from './PuppeteerNode.js'; +import {rm} from './util/fs.js'; /** * @internal diff --git a/packages/puppeteer-core/src/util/fs.ts b/packages/puppeteer-core/src/node/util/fs.ts similarity index 100% rename from packages/puppeteer-core/src/util/fs.ts rename to packages/puppeteer-core/src/node/util/fs.ts diff --git a/packages/puppeteer-core/src/util/util.ts b/packages/puppeteer-core/src/util/util.ts index cfa024ae..d3160757 100644 --- a/packages/puppeteer-core/src/util/util.ts +++ b/packages/puppeteer-core/src/util/util.ts @@ -15,7 +15,6 @@ */ export * from './assert.js'; -export * from './fs.js'; export * from './DebuggableDeferredPromise.js'; export * from './DeferredPromise.js'; export * from './ErrorLike.js'; diff --git a/test/src/headful.spec.ts b/test/src/headful.spec.ts index aad99d28..f75654f1 100644 --- a/test/src/headful.spec.ts +++ b/test/src/headful.spec.ts @@ -23,7 +23,7 @@ import { PuppeteerLaunchOptions, PuppeteerNode, } from 'puppeteer-core/internal/node/PuppeteerNode.js'; -import {rmSync} from 'puppeteer-core/internal/util/fs.js'; +import {rmSync} from 'puppeteer-core/internal/node/util/fs.js'; import {getTestState} from './mocha-utils.js'; diff --git a/test/src/launcher.spec.ts b/test/src/launcher.spec.ts index 9279ff07..4cd6a1e1 100644 --- a/test/src/launcher.spec.ts +++ b/test/src/launcher.spec.ts @@ -23,7 +23,7 @@ import {Protocol} from 'devtools-protocol'; import expect from 'expect'; import {BrowserFetcher, TimeoutError} from 'puppeteer'; import {Page} from 'puppeteer-core/internal/api/Page.js'; -import {rmSync} from 'puppeteer-core/internal/util/fs.js'; +import {rmSync} from 'puppeteer-core/internal/node/util/fs.js'; import sinon from 'sinon'; import {getTestState, itOnlyRegularInstall} from './mocha-utils.js'; diff --git a/test/src/mocha-utils.ts b/test/src/mocha-utils.ts index 2a996710..e414f2a0 100644 --- a/test/src/mocha-utils.ts +++ b/test/src/mocha-utils.ts @@ -33,8 +33,8 @@ import { PuppeteerLaunchOptions, PuppeteerNode, } from 'puppeteer-core/internal/node/PuppeteerNode.js'; +import {rmSync} from 'puppeteer-core/internal/node/util/fs.js'; import {isErrorLike} from 'puppeteer-core/internal/util/ErrorLike.js'; -import {rmSync} from 'puppeteer-core/internal/util/fs.js'; import sinon from 'sinon'; import {extendExpectWithToBeGolden} from './utils.js';