puppeteer · jrandolf · Oct 6, 2022 · Oct 5, 2022
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
       - name: Pin dependencies
-        run: utils/pin_dependencies.py
+        run: tools/pin_dependencies.py
       - name: Install dependencies
         run: npm install
       - name: Build

diff --git a/.github/workflows/tot-ci.yml b/.github/workflows/tot-ci.yml
@@ -39,7 +39,7 @@ jobs:
           PUPPETEER_PRODUCT=firefox npm install
           npm install
           ls .local-chromium .local-firefox
-          REV=$(node utils/check_availability.js -p linux)
+          REV=$(node tools/check_availability.js -p linux)
           echo "Installing revision $REV"
           cat src/revisions.ts | sed "s/[0-9]\{6,\}/$REV/" > src/revisions.ts.replaced
           mv src/revisions.ts.replaced src/revisions.ts
@@ -77,7 +77,7 @@ jobs:
           PUPPETEER_PRODUCT=firefox npm install
           npm install
           ls .local-chromium .local-firefox
-          REV=$(node utils/check_availability.js -p linux)
+          REV=$(node tools/check_availability.js -p linux)
           echo "Installing revision $REV"
           cat src/revisions.ts | sed "s/[0-9]\{6,\}/$REV/" > src/revisions.ts.replaced
           mv src/revisions.ts.replaced src/revisions.ts
@@ -115,7 +115,7 @@ jobs:
           PUPPETEER_PRODUCT=firefox npm install
           npm install
           ls .local-chromium .local-firefox
-          REV=$(node utils/check_availability.js -p linux)
+          REV=$(node tools/check_availability.js -p linux)
           echo "Installing revision $REV"
           cat src/revisions.ts | sed "s/[0-9]\{6,\}/$REV/" > src/revisions.ts.replaced
           mv src/revisions.ts.replaced src/revisions.ts

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -59,7 +59,7 @@ We also have other tests such as `test:types` that tests types and
 
 Puppeteer is using a custom test runner on top of Mocha that consults
 the [TestExpectations.json](https://github.com/puppeteer/puppeteer/blob/main/test/TestExpectations.json)
-to see if a given test result is expected or not. See more info about the test runner in [`utils/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/utils/mochaRunner).
+to see if a given test result is expected or not. See more info about the test runner in [`tools/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/tools/mochaRunner).
 
 ## Code reviews
 
@@ -97,8 +97,8 @@ The following is a description of the primary folders in Puppeteer:
 - `src` - contains the source code for Puppeteer.
 - `test/src` - contains the source code for Puppeteer tests.
 - `utils`/`scripts` - contains various scripts.
-- `utils/testserver` - contains the source code for our test servers in testing.
-- `utils/mochaRunner` - contains the source code for our test runner.
+- `tools/testserver` - contains the source code for our test servers in testing.
+- `tools/mochaRunner` - contains the source code for our test runner.
 - `compat` - contains code separated by module import type. See [`compat/README.md`](https://github.com/puppeteer/puppeteer/blob/main/compat/README.md) for details.
 - `test-d` contains type tests using [`tsd`](https://github.com/SamVerschueren/tsd).
 - `third_party` contains all dependencies that we vendor into the final build. See the [`third_party/README.md`](https://github.com/puppeteer/puppeteer/blob/main/third_party/README.md) for details.
@@ -251,7 +251,7 @@ BINARY=<path-to-executable> npm run test:chrome:headless # Or npm run test:firef
 ```
 
 If a test is expected to fail on certain configurations or became flaky, update [TestExpectations.json](https://github.com/puppeteer/puppeteer/blob/main/test/TestExpectations.json)
-to reflect that. See more info about TestExpectations.json in [`utils/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/utils/mochaRunner).
+to reflect that. See more info about TestExpectations.json in [`tools/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/tools/mochaRunner).
 
 ## API Coverage
 
@@ -269,7 +269,7 @@ The following steps are needed to update the Chromium version.
 
 1. Find a suitable Chromium revision
    Not all revisions have builds for all platforms, so we need to find one that does.
-   To do so, run `utils/check_availability.js -rd` to find the latest suitable `dev` Chromium revision (see `utils/check_availability.js -help` for more options).
+   To do so, run `tools/check_availability.js -rd` to find the latest suitable `dev` Chromium revision (see `tools/check_availability.js -help` for more options).
 1. Update `src/revisions.ts` with the found revision number.
 1. Update `versions.js` with the new Chromium-to-Puppeteer version mapping and update `lastMaintainedChromiumVersion` with the latest stable Chrome version.
 1. Run `npm run check:protocol-revision`.
@@ -281,11 +281,11 @@ The following steps are needed to update the Chromium version.
 
 ### Bisecting upstream changes
 
-Sometimes, performing a Chromium roll causes tests to fail. To figure out the cause, you need to bisect Chromium revisions to figure out the earliest possible revision that changed the behavior. The script in `utils/bisect.js` can be helpful here. Given a pattern for one or more unit tests, it will automatically bisect the current range:
+Sometimes, performing a Chromium roll causes tests to fail. To figure out the cause, you need to bisect Chromium revisions to figure out the earliest possible revision that changed the behavior. The script in `tools/bisect.js` can be helpful here. Given a pattern for one or more unit tests, it will automatically bisect the current range:
 
 ```sh
-node utils/bisect.js --good 686378 --bad 706915 script.js
-node utils/bisect.js --unit-test Response.fromCache
+node tools/bisect.js --good 686378 --bad 706915 script.js
+node tools/bisect.js --unit-test Response.fromCache
 ```
 
 By default, it will use the Chromium revision in `src/revisions.ts` from the `main` branch and from the working tree to determine the range to bisect.

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "build:test": "wireit",
     "build": "npm run build --workspaces --if-present",
-    "check:pinned-deps": "tsx scripts/ensure-pinned-deps",
+    "check:pinned-deps": "tsx tools/ensure-pinned-deps",
     "check": "npm run check --workspaces --if-present && run-p check:*",
     "clean": "npm run clean --workspaces --if-present && rimraf **/.wireit",
     "commitlint": "commitlint --from=HEAD~1",
@@ -17,7 +17,7 @@
     "format:eslint": "eslint --ext js --ext ts --fix .",
     "format:prettier": "prettier --write .",
     "format": "run-s format:*",
-    "generate:markdown": "tsx utils/generate_docs.ts",
+    "generate:markdown": "tsx tools/generate_docs.ts",
     "lint:eslint": "([ \"$CI\" = true ] && eslint --ext js --ext ts --quiet -f codeframe . || eslint --ext js --ext ts .)",
     "lint:prettier": "prettier --check .",
     "lint": "run-s lint:prettier lint:eslint",
@@ -32,7 +32,7 @@
     "test:firefox": "run-s test:firefox:*",
     "test:install": "test/test-install.sh",
     "test:types": "tsd -t packages/puppeteer",
-    "test": "cross-env PUPPETEER_DEFERRED_PROMISE_DEBUG_TIMEOUT=20000 node utils/mochaRunner/lib/main.js"
+    "test": "cross-env PUPPETEER_DEFERRED_PROMISE_DEBUG_TIMEOUT=20000 node tools/mochaRunner/lib/main.js"
   },
   "wireit": {
     "build:test": {

diff --git a/packages/puppeteer-core/src/injected/README.md b/packages/puppeteer-core/src/injected/README.md
@@ -2,4 +2,4 @@
 
 This folder contains code that is injected into every Puppeteer execution context. Each file is transpiled using esbuild into a script in `src/generated` which is then imported into server code.
 
-See `utils/generate_injected.ts` for more information.
+See `tools/generate_injected.ts` for more information.
diff --git a/packages/puppeteer-core/tools/generate_sources.ts b/packages/puppeteer-core/tools/generate_sources.ts
@@ -4,7 +4,7 @@ import {mkdir, mkdtemp, readFile, rm, writeFile} from 'fs/promises';
 import {sync as glob} from 'glob';
 import path, {join, resolve} from 'path';
 import {chdir} from 'process';
-import {job} from '../../../utils/internal/job.js';
+import {job} from '../../../tools/internal/job.js';
 
 const packageRoot = resolve(join(__dirname, '..'));
 chdir(packageRoot);

diff --git a/test/tsconfig.json b/test/tsconfig.json
@@ -7,5 +7,5 @@
     "rootDir": "src"
   },
   "include": ["src"],
-  "references": [{"path": "../utils/mochaRunner/tsconfig.json"}]
+  "references": [{"path": "../tools/mochaRunner/tsconfig.json"}]
 }
diff --git a/utils/bisect.js → tools/bisect.js b/utils/bisect.js → tools/bisect.js
@@ -42,9 +42,9 @@ Parameters:
   --script     path to a script that returns non-zero code for BAD revisions and 0 for good
 
 Example:
-  node utils/bisect.js --unit-test test
-  node utils/bisect.js --good 577361 --bad 599821 --script simple.js
-  node utils/bisect.js --good 577361 --bad 599821 --unit-test test
+  node tools/bisect.js --unit-test test
+  node tools/bisect.js --good 577361 --bad 599821 --script simple.js
+  node tools/bisect.js --good 577361 --bad 599821 --unit-test test
 `;
 
 if (argv.h || argv.help) {

diff --git a/utils/check_availability.js → tools/check_availability.js b/utils/check_availability.js → tools/check_availability.js
diff --git a/scripts/ensure-pinned-deps.ts → tools/ensure-pinned-deps.ts b/scripts/ensure-pinned-deps.ts → tools/ensure-pinned-deps.ts
diff --git a/utils/generate-matrix.js → tools/generate-matrix.js b/utils/generate-matrix.js → tools/generate-matrix.js
diff --git a/utils/generate_docs.ts → tools/generate_docs.ts b/utils/generate_docs.ts → tools/generate_docs.ts
diff --git a/utils/get_deprecated_version_range.js → tools/get_deprecated_version_range.js b/utils/get_deprecated_version_range.js → tools/get_deprecated_version_range.js
diff --git a/utils/internal/custom_markdown_action.ts → tools/internal/custom_markdown_action.ts b/utils/internal/custom_markdown_action.ts → tools/internal/custom_markdown_action.ts
diff --git a/utils/internal/custom_markdown_documenter.ts → tools/internal/custom_markdown_documenter.ts b/utils/internal/custom_markdown_documenter.ts → tools/internal/custom_markdown_documenter.ts
diff --git a/utils/internal/job.ts → tools/internal/job.ts b/utils/internal/job.ts → tools/internal/job.ts
diff --git a/utils/internal/util.ts → tools/internal/util.ts b/utils/internal/util.ts → tools/internal/util.ts
diff --git a/utils/mochaRunner/README.md → tools/mochaRunner/README.md b/utils/mochaRunner/README.md → tools/mochaRunner/README.md
@@ -5,7 +5,7 @@ Mocha Runner is a test runner on top of mocha. It uses `/test/TestSuites.json` a
 ## Running tests for Mocha Runner itself.
 
 ```
-npm run build:test && npx c8 node utils/mochaRunner/lib/test.js
+npm run build:test && npx c8 node tools/mochaRunner/lib/test.js
 ```
 
 ## Running tests using Mocha Runner

diff --git a/utils/mochaRunner/src/interface.ts → tools/mochaRunner/src/interface.ts b/utils/mochaRunner/src/interface.ts → tools/mochaRunner/src/interface.ts
diff --git a/utils/mochaRunner/src/main.ts → tools/mochaRunner/src/main.ts b/utils/mochaRunner/src/main.ts → tools/mochaRunner/src/main.ts
diff --git a/utils/mochaRunner/src/reporter.ts → tools/mochaRunner/src/reporter.ts b/utils/mochaRunner/src/reporter.ts → tools/mochaRunner/src/reporter.ts
diff --git a/utils/mochaRunner/src/test.ts → tools/mochaRunner/src/test.ts b/utils/mochaRunner/src/test.ts → tools/mochaRunner/src/test.ts
diff --git a/utils/mochaRunner/src/types.ts → tools/mochaRunner/src/types.ts b/utils/mochaRunner/src/types.ts → tools/mochaRunner/src/types.ts
diff --git a/utils/mochaRunner/src/utils.ts → tools/mochaRunner/src/utils.ts b/utils/mochaRunner/src/utils.ts → tools/mochaRunner/src/utils.ts
diff --git a/utils/mochaRunner/tsconfig.json → tools/mochaRunner/tsconfig.json b/utils/mochaRunner/tsconfig.json → tools/mochaRunner/tsconfig.json
diff --git a/utils/pin_dependencies.py → tools/pin_dependencies.py b/utils/pin_dependencies.py → tools/pin_dependencies.py
diff --git a/utils/remove_version_suffix.js → tools/remove_version_suffix.js b/utils/remove_version_suffix.js → tools/remove_version_suffix.js
diff --git a/scripts/tsconfig.json → tools/tsconfig.json b/scripts/tsconfig.json → tools/tsconfig.json
diff --git a/utils/tsconfig.json b/utils/tsconfig.json
diff --git a/website/versioned_docs/version-18.2.0/contributing.md b/website/versioned_docs/version-18.2.0/contributing.md
@@ -59,7 +59,7 @@ We also have other tests such as `test:types` that tests types and
 
 Puppeteer is using a custom test runner on top of Mocha that consults
 the [TestExpectations.json](https://github.com/puppeteer/puppeteer/blob/main/test/TestExpectations.json)
-to see if a given test result is expected or not. See more info about the test runner in [`utils/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/utils/mochaRunner).
+to see if a given test result is expected or not. See more info about the test runner in [`tools/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/tools/mochaRunner).
 
 ## Code reviews
 
@@ -97,8 +97,8 @@ The following is a description of the primary folders in Puppeteer:
 - `src` - contains the source code for Puppeteer.
 - `test/src` - contains the source code for Puppeteer tests.
 - `utils`/`scripts` - contains various scripts.
-- `utils/testserver` - contains the source code for our test servers in testing.
-- `utils/mochaRunner` - contains the source code for our test runner.
+- `tools/testserver` - contains the source code for our test servers in testing.
+- `tools/mochaRunner` - contains the source code for our test runner.
 - `compat` - contains code separated by module import type. See [`compat/README.md`](https://github.com/puppeteer/puppeteer/blob/main/compat/README.md) for details.
 - `test-d` contains type tests using [`tsd`](https://github.com/SamVerschueren/tsd).
 - `third_party` contains all dependencies that we vendor into the final build. See the [`third_party/README.md`](https://github.com/puppeteer/puppeteer/blob/main/third_party/README.md) for details.
@@ -251,7 +251,7 @@ BINARY=<path-to-executable> npm run test:chrome:headless # Or npm run test:firef
 ```
 
 If a test is expected to fail on certain configurations or became flaky, update [TestExpectations.json](https://github.com/puppeteer/puppeteer/blob/main/test/TestExpectations.json)
-to reflect that. See more info about TestExpectations.json in [`utils/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/utils/mochaRunner).
+to reflect that. See more info about TestExpectations.json in [`tools/mochaRunner`](https://github.com/puppeteer/puppeteer/tree/main/tools/mochaRunner).
 
 ## API Coverage
 
@@ -269,7 +269,7 @@ The following steps are needed to update the Chromium version.
 
 1. Find a suitable Chromium revision
    Not all revisions have builds for all platforms, so we need to find one that does.
-   To do so, run `utils/check_availability.js -rd` to find the latest suitable `dev` Chromium revision (see `utils/check_availability.js -help` for more options).
+   To do so, run `tools/check_availability.js -rd` to find the latest suitable `dev` Chromium revision (see `tools/check_availability.js -help` for more options).
 1. Update `src/revisions.ts` with the found revision number.
 1. Update `versions.js` with the new Chromium-to-Puppeteer version mapping and update `lastMaintainedChromiumVersion` with the latest stable Chrome version.
 1. Run `npm run check:protocol-revision`.
@@ -281,11 +281,11 @@ The following steps are needed to update the Chromium version.
 
 ### Bisecting upstream changes
 
-Sometimes, performing a Chromium roll causes tests to fail. To figure out the cause, you need to bisect Chromium revisions to figure out the earliest possible revision that changed the behavior. The script in `utils/bisect.js` can be helpful here. Given a pattern for one or more unit tests, it will automatically bisect the current range:
+Sometimes, performing a Chromium roll causes tests to fail. To figure out the cause, you need to bisect Chromium revisions to figure out the earliest possible revision that changed the behavior. The script in `tools/bisect.js` can be helpful here. Given a pattern for one or more unit tests, it will automatically bisect the current range:
 
 ```sh
-node utils/bisect.js --good 686378 --bad 706915 script.js
-node utils/bisect.js --unit-test Response.fromCache
+node tools/bisect.js --good 686378 --bad 706915 script.js
+node tools/bisect.js --unit-test Response.fromCache
 ```
 
 By default, it will use the Chromium revision in `src/revisions.ts` from the `main` branch and from the working tree to determine the range to bisect.