core: remove util.cjs, break up util.js to shared and report utils

.github/workflows/ci.yml

@@ -57,7 +57,6 @@ jobs:
     - run: yarn test-legacy-javascript
     - run: yarn i18n:checks
     - run: yarn dogfood-lhci
-    - run: bash core/scripts/copy-util-commonjs.sh
 
     # Fail if any changes were written to any source files or generated untracked files (ex, from: build/build-cdt-lib.js).
     - run: git add -A && git diff --cached --exit-code

core/audits/audit.js

@@ -6,7 +6,7 @@
 
 import {isUnderTest} from '../lib/lh-env.js';
 import * as statistics from '../lib/statistics.js';
-import {Util} from '../util.cjs';
+import {Util} from '../../shared/shared-utils.js';
 
 const DEFAULT_PASS = 'defaultPass';
 

core/computed/resource-summary.js

@@ -8,7 +8,7 @@ import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {Budget} from '../config/budget.js';
-import {Util} from '../util.cjs';
+import {Util} from '../../shared/shared-utils.js';
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 

core/lib/url-utils.js

@@ -4,7 +4,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import {Util} from '../util.cjs';
+import {Util} from '../../shared/shared-utils.js';
 import {LighthouseError} from './lh-error.js';
 
 /** @typedef {import('./network-request.js').NetworkRequest} NetworkRequest */

core/scripts/c8.sh

@@ -16,10 +16,4 @@ node node_modules/.bin/c8 \
   --exclude '**/test/' \
   --exclude '**/scripts/' \
   --exclude 'core/lib/page-functions.js' \
-  --exclude 'core/util-commonjs.js' \
   $*
-
-# util-commonjs is a copy of renderer/util, which has its own test coverage.
-# Admittedly, util-commonjs is used in different ways, but we don't expect it to also have complete
-# coverage as some methods are renderer-specific.  Ideally, we'd combine the coverage, but in the
-# meantime we'll ignore coverage requirements for this file.

core/scripts/i18n/collect-strings.js

@@ -17,7 +17,7 @@ import tsc from 'typescript';
 import MessageParser from 'intl-messageformat-parser';
 import esMain from 'es-main';
 
-import {Util} from '../../util.cjs';
+import {splitMarkdownCodeSpans, splitMarkdownLink} from '../../../shared/markdown.js';
 import {collectAndBakeCtcStrings} from './bake-ctc-to-lhl.js';
 import {pruneObsoleteLhlMessages} from './prune-obsolete-lhl-messages.js';
 import {countTranslatedMessages} from './count-translated.js';
@@ -49,7 +49,6 @@ const ignoredPathComponents = [
   '**/test/**',
   '**/*-test.js',
   '**/*-renderer.js',
-  '**/util-commonjs.js',
   'treemap/app/src/main.js',
 ];
 
@@ -236,7 +235,7 @@ function _processPlaceholderMarkdownCode(icu) {
 
   icu.message = '';
   let idx = 0;
-  for (const segment of Util.splitMarkdownCodeSpans(message)) {
+  for (const segment of splitMarkdownCodeSpans(message)) {
     if (segment.isCode) {
       const placeholderName = `MARKDOWN_SNIPPET_${idx++}`;
       // Backtick replacement looks unreadable here, so .join() instead.
@@ -272,7 +271,7 @@ function _processPlaceholderMarkdownLink(icu) {
   icu.message = '';
   let idx = 0;
 
-  for (const segment of Util.splitMarkdownLink(message)) {
+  for (const segment of splitMarkdownLink(message)) {
     if (!segment.isLink) {
       // Plain text segment.
       icu.message += segment.text;