lighthouse 9.5.0-dev.20220806 → 9.5.0-dev.20220809

package/core/audits/bootup-time.js

@@ -32,7 +32,7 @@ const UIStrings = {
     'Try auditing the page in incognito mode or from a Chrome profile without extensions.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class BootupTime extends Audit {
   /**

package/core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -13,7 +13,7 @@ import NetworkRecords from '../../computed/network-records.js';
 import LoadSimulator from '../../computed/load-simulator.js';
 import PageDependencyGraph from '../../computed/page-dependency-graph.js';
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, {});
+const str_ = i18n.createIcuMessageFn(import.meta.url, {});
 
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator').Simulator} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */

package/core/audits/byte-efficiency/duplicated-javascript.js

@@ -25,7 +25,7 @@ const UIStrings = {
   // '[Learn more](https://web.dev/duplicated-javascript/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 1024;
 

package/core/audits/byte-efficiency/efficient-animated-content.js

@@ -21,7 +21,7 @@ const UIStrings = {
     'network bytes. [Learn more about efficient video formats](https://web.dev/efficient-animated-content/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 // If GIFs are above this size, we'll flag them
 // See https://github.com/GoogleChrome/lighthouse/pull/4885#discussion_r178406623 and https://github.com/GoogleChrome/lighthouse/issues/4696#issuecomment-370979920

package/core/audits/byte-efficiency/legacy-javascript.js

@@ -43,7 +43,7 @@ const UIStrings = {
   description: 'Polyfills and transforms enable legacy browsers to use new JavaScript features. However, many aren\'t necessary for modern browsers. For your bundled JavaScript, adopt a modern script deployment strategy using module/nomodule feature detection to reduce the amount of code shipped to modern browsers, while retaining support for legacy browsers. [Learn how to use modern JavaScript](https://web.dev/publish-modern-javascript/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * Takes a list of patterns (consisting of a name identifier and a RegExp expression string)

package/core/audits/byte-efficiency/modern-image-formats.js

@@ -21,7 +21,7 @@ const UIStrings = {
     '[Learn more about modern image formats](https://web.dev/uses-webp-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 8192;
 

package/core/audits/byte-efficiency/offscreen-images.js

@@ -27,7 +27,7 @@ const UIStrings = {
     '[Learn how to defer offscreen images](https://web.dev/offscreen-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 // See https://github.com/GoogleChrome/lighthouse/issues/10471 for discussion about the thresholds here.
 const ALLOWABLE_OFFSCREEN_IN_PX = 100;

package/core/audits/byte-efficiency/render-blocking-resources.js

@@ -39,7 +39,7 @@ const UIStrings = {
     'JS/styles. [Learn how to eliminate render-blocking resources](https://web.dev/render-blocking-resources/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * Given a simulation's nodeTimings, return an object with the nodes/timing keyed by network URL

package/core/audits/byte-efficiency/total-byte-weight.js

@@ -23,7 +23,7 @@ const UIStrings = {
   displayValue: 'Total size was {totalBytes, number, bytes}\xa0KiB',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class TotalByteWeight extends Audit {
   /**

package/core/audits/byte-efficiency/unminified-css.js

@@ -18,7 +18,7 @@ const UIStrings = {
     '[Learn how to minify CSS](https://web.dev/unminified-css/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_PERCENT = 5;
 const IGNORE_THRESHOLD_IN_BYTES = 2048;

package/core/audits/byte-efficiency/unminified-javascript.js

@@ -18,7 +18,7 @@ const UIStrings = {
     '[Learn how to minify JavaScript](https://web.dev/unminified-javascript/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_PERCENT = 10;
 const IGNORE_THRESHOLD_IN_BYTES = 2048;

package/core/audits/byte-efficiency/unused-css-rules.js

@@ -18,7 +18,7 @@ const UIStrings = {
     '[Learn how to reduce unused CSS](https://web.dev/unused-css-rules/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 // Allow 10KiB of unused CSS to permit `:hover` and other styles not used on a non-interactive load.
 // @see https://github.com/GoogleChrome/lighthouse/issues/9353 for more discussion.

package/core/audits/byte-efficiency/unused-javascript.js

@@ -19,7 +19,7 @@ const UIStrings = {
     'decrease bytes consumed by network activity. [Learn how to reduce unused JavaScript](https://web.dev/unused-javascript/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const UNUSED_BYTES_IGNORE_THRESHOLD = 20 * 1024;
 const UNUSED_BYTES_IGNORE_BUNDLE_SOURCE_THRESHOLD = 512;

package/core/audits/byte-efficiency/uses-long-cache-ttl.js

@@ -29,7 +29,7 @@ const UIStrings = {
     }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 // Ignore assets that have very high likelihood of cache hit
 const IGNORE_THRESHOLD_IN_PERCENT = 0.925;

package/core/audits/byte-efficiency/uses-optimized-images.js

@@ -21,7 +21,7 @@ const UIStrings = {
   '[Learn how to efficiently encode images](https://web.dev/uses-optimized-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 4096;
 

package/core/audits/byte-efficiency/uses-responsive-images-snapshot.js

@@ -27,7 +27,7 @@ const UIStrings = {
   columnActualDimensions: 'Actual dimensions',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 // Based on byte threshold of 4096, with 3 bytes per pixel.
 const IGNORE_THRESHOLD_IN_PIXELS = 1365;

package/core/audits/byte-efficiency/uses-responsive-images.js

@@ -29,7 +29,7 @@ const UIStrings = {
   '[Learn how to size images](https://web.dev/uses-responsive-images/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 4096;
 

package/core/audits/byte-efficiency/uses-text-compression.js

@@ -22,7 +22,7 @@ const UIStrings = {
     ' [Learn more about text compression](https://web.dev/uses-text-compression/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const IGNORE_THRESHOLD_IN_BYTES = 1400;
 const IGNORE_THRESHOLD_IN_PERCENT = 0.1;

package/core/audits/content-width.js

@@ -26,7 +26,7 @@ const UIStrings = {
     'size of {outerWidth}px.',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class ContentWidth extends Audit {
   /**

package/core/audits/critical-request-chains.js

@@ -25,7 +25,7 @@ const UIStrings = {
     }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class CriticalRequestChains extends Audit {
   /**

package/core/audits/csp-xss.js

@@ -32,7 +32,7 @@ const UIStrings = {
   itemSeveritySyntax: 'Syntax',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class CspXss extends Audit {
   /**

package/core/audits/deprecations.js

@@ -36,7 +36,7 @@ const UIStrings = {
 };
 /* eslint-enable max-len */
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class Deprecations extends Audit {
   /**

package/core/audits/dobetterweb/charset.js

@@ -27,7 +27,7 @@ const UIStrings = {
     '[Learn more about declaring the character encoding](https://web.dev/charset/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const CONTENT_TYPE_HEADER = 'content-type';
 // /^[a-zA-Z0-9-_:.()]{2,}$/ matches all known IANA charset names (https://www.iana.org/assignments/character-sets/character-sets.xhtml)

package/core/audits/dobetterweb/doctype.js

@@ -29,7 +29,7 @@ const UIStrings = {
   explanationBadDoctype: 'Doctype name must be the string `html`',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class Doctype extends Audit {
   /**

package/core/audits/dobetterweb/dom-size.js

@@ -41,7 +41,7 @@ const UIStrings = {
   statisticDOMWidth: 'Maximum Child Elements',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class DOMSize extends Audit {
   /**

package/core/audits/dobetterweb/geolocation-on-start.js

@@ -25,7 +25,7 @@ const UIStrings = {
     '[Learn more about the geolocation permission](https://web.dev/geolocation-on-start/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class GeolocationOnStart extends ViolationAudit {
   /**

package/core/audits/dobetterweb/inspector-issues.js

@@ -36,7 +36,7 @@ const UIStrings = {
   issueTypeHeavyAds: 'Heavy resource usage by ads',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class IssuesPanelEntries extends Audit {
   /**

package/core/audits/dobetterweb/js-libraries.js

@@ -22,7 +22,7 @@ const UIStrings = {
   columnVersion: 'Version',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class JsLibrariesAudit extends Audit {
   /**

package/core/audits/dobetterweb/no-document-write.js

@@ -42,7 +42,7 @@ const UIStrings = {
       '[Learn how to avoid document.write()](https://web.dev/no-document-write/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class NoDocWriteAudit extends ViolationAudit {
   /**

package/core/audits/dobetterweb/no-vulnerable-libraries.js

@@ -46,7 +46,7 @@ const UIStrings = {
   columnSeverity: 'Highest Severity',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const SEMVER_REGEX = /^(\d+\.\d+\.\d+)[^-0-9]+/;
 

package/core/audits/dobetterweb/notification-on-start.js

@@ -25,7 +25,7 @@ const UIStrings = {
       'instead. [Learn more about responsibly getting permission for notifications](https://web.dev/notification-on-start/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class NotificationOnStart extends ViolationAudit {
   /**

package/core/audits/dobetterweb/password-inputs-can-be-pasted-into.js

@@ -18,7 +18,7 @@ const UIStrings = {
       '[Learn more about user-friendly password fields](https://web.dev/password-inputs-can-be-pasted-into/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class PasswordInputsCanBePastedIntoAudit extends Audit {
   /**

package/core/audits/dobetterweb/uses-http2.js

@@ -40,7 +40,7 @@ const UIStrings = {
   columnProtocol: 'Protocol',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /** @type {Set<LH.Artifacts.NetworkRequest['resourceType']>} */
 const STATIC_RESOURCE_TYPES = new Set([

package/core/audits/dobetterweb/uses-passive-event-listeners.js

@@ -25,7 +25,7 @@ const UIStrings = {
       '[Learn more about adopting passive event listeners](https://web.dev/uses-passive-event-listeners/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class PassiveEventsAudit extends ViolationAudit {
   /**

package/core/audits/errors-in-console.js

@@ -27,7 +27,7 @@ const UIStrings = {
     '[Learn more about this errors in console diagnostic audit](https://web.dev/errors-in-console/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /** @typedef {{ignoredPatterns?: Array<RegExp|string>}} AuditOptions */
 

package/core/audits/font-display.js

@@ -36,7 +36,7 @@ const UIStrings = {
     'other {Lighthouse was unable to automatically check the `font-display` values for the origin {fontOrigin}.}}',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class FontDisplay extends Audit {
   /**

package/core/audits/image-aspect-ratio.js

@@ -29,7 +29,7 @@ const UIStrings = {
   columnActual: 'Aspect Ratio (Actual)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 const THRESHOLD_PX = 2;
 

package/core/audits/image-size-responsive.js

@@ -33,7 +33,7 @@ const UIStrings = {
   columnExpected: 'Expected size',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 // Factors used to allow for smaller effective density.
 // A factor of 1 means the actual device pixel density will be used.

package/core/audits/installable-manifest.js

@@ -106,7 +106,7 @@ const UIStrings = {
 };
 /* eslint-enable max-len */
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview

package/core/audits/is-on-https.js

@@ -49,7 +49,7 @@ const resolutionToString = {
   MixedContentWarning: UIStrings.warning,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 
 class HTTPS extends Audit {

package/core/audits/largest-contentful-paint-element.js

@@ -16,7 +16,7 @@ const UIStrings = {
     '[Learn more about the Largest Contentful Paint element](https://web.dev/lighthouse-largest-contentful-paint/)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class LargestContentfulPaintElement extends Audit {
   /**

package/core/audits/layout-shift-elements.js

@@ -17,7 +17,7 @@ const UIStrings = {
   columnContribution: 'CLS Contribution',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class LayoutShiftElements extends Audit {
   /**

package/core/audits/lcp-lazy-loaded.js

@@ -17,7 +17,7 @@ const UIStrings = {
   description: 'Above-the-fold images that are lazily loaded render later in the page lifecycle, which can delay the largest contentful paint. [Learn more about optimal lazy loading](https://web.dev/lcp-lazy-loading/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class LargestContentfulPaintLazyLoaded extends Audit {
   /**

package/core/audits/long-tasks.js

@@ -30,7 +30,7 @@ const UIStrings = {
   }`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class LongTasks extends Audit {
   /**

package/core/audits/mainthread-work-breakdown.js

@@ -28,7 +28,7 @@ const UIStrings = {
   columnCategory: 'Category',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /** @typedef {import('../lib/tracehouse/task-groups.js').TaskGroupIds} TaskGroupIds */
 

package/core/audits/manual/pwa-cross-browser.js

@@ -17,7 +17,7 @@ const UIStrings = {
   'every major browser. [Learn about cross-browser compatibility](https://web.dev/pwa-cross-browser/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual PWA audit for cross browser support.

package/core/audits/manual/pwa-each-page-has-url.js

@@ -16,7 +16,7 @@ const UIStrings = {
       'unique for the purpose of shareability on social media. [Learn more about providing deep links](https://web.dev/pwa-each-page-has-url/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual PWA audit to ensure every page has a deep link.

package/core/audits/manual/pwa-page-transitions.js

@@ -16,7 +16,7 @@ const UIStrings = {
     'This experience is key to a user\'s perception of performance. [Learn more about page transitions](https://web.dev/pwa-page-transitions/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview Manual PWA audit for janky-free page transitions.

package/core/audits/maskable-icon.js

@@ -20,7 +20,7 @@ const UIStrings = {
     'the app on a device. [Learn about maskable manifest icons](https://web.dev/maskable-icon-audit/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview

package/core/audits/metrics/cumulative-layout-shift.js

@@ -16,7 +16,7 @@ const UIStrings = {
                '[Learn more about the Cumulative Layout Shift metric](https://web.dev/cls/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric represents the amount of visual shifting of DOM elements during page load.

package/core/audits/metrics/experimental-interaction-to-next-paint.js

@@ -16,7 +16,7 @@ const UIStrings = {
                '[Learn more about the Interaction to Next Paint metric](https://web.dev/inp/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric gives a high-percentile measure of responsiveness to input.

package/core/audits/metrics/first-contentful-paint.js

@@ -15,7 +15,7 @@ const UIStrings = {
       'painted. [Learn more about the First Contentful Paint metric](https://web.dev/first-contentful-paint/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class FirstContentfulPaint extends Audit {
   /**

package/core/audits/metrics/first-meaningful-paint.js

@@ -15,7 +15,7 @@ const UIStrings = {
       'visible. [Learn more about the First Meaningful Paint metric](https://web.dev/first-meaningful-paint/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class FirstMeaningfulPaint extends Audit {
   /**

package/core/audits/metrics/interactive.js

@@ -15,7 +15,7 @@ const UIStrings = {
     'interactive. [Learn more about the Time to Interactive metric](https://web.dev/interactive/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This audit identifies the time the page is "consistently interactive".

package/core/audits/metrics/largest-contentful-paint.js

@@ -15,7 +15,7 @@ const UIStrings = {
       `painted. [Learn more about the Largest Contentful Paint metric](https://web.dev/lighthouse-largest-contentful-paint/)`,
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class LargestContentfulPaint extends Audit {
   /**

package/core/audits/metrics/max-potential-fid.js

@@ -16,7 +16,7 @@ const UIStrings = {
       '[Learn more about the Maximum Potential First Input Delay metric](https://web.dev/lighthouse-max-potential-fid/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
  * @fileoverview This metric is the duration of the longest task after FCP. It is meant to capture

package/core/audits/metrics/speed-index.js

@@ -15,7 +15,7 @@ const UIStrings = {
       '[Learn more about the Speed Index metric](https://web.dev/speed-index/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class SpeedIndex extends Audit {
   /**

package/core/audits/metrics/total-blocking-time.js

@@ -16,7 +16,7 @@ const UIStrings = {
       '[Learn more about the Total Blocking Time metric](https://web.dev/lighthouse-total-blocking-time/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class TotalBlockingTime extends Audit {
   /**

package/core/audits/network-rtt.js

@@ -19,7 +19,7 @@ const UIStrings = {
     'improve performance. [Learn more about the Round Trip Time](https://hpbn.co/primer-on-latency-and-bandwidth/).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class NetworkRTT extends Audit {
   /**

package/core/audits/network-server-latency.js

@@ -19,7 +19,7 @@ const UIStrings = {
     'or has poor backend performance. [Learn more about server response time](https://hpbn.co/primer-on-web-performance/#analyzing-the-resource-waterfall).',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class NetworkServerLatency extends Audit {
   /**

package/core/audits/no-unload-listeners.js

@@ -18,7 +18,7 @@ const UIStrings = {
   description: 'The `unload` event does not fire reliably and listening for it can prevent browser optimizations like the Back-Forward Cache. Use `pagehide` or `visibilitychange` events instead. [Learn more about unload event listeners](https://web.dev/bfcache/#never-use-the-unload-event)',
 };
 
-const str_ = i18n.createMessageInstanceIdFn(import.meta.url, UIStrings);
+const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 class NoUnloadListeners extends Audit {
   /**