core(deprecations): backport translated strings (#14482)

GoogleChrome · Oct 31, 2022 · 5932d59 · 5932d59
1 parent 364ccdf
commit 5932d59
Show file tree

Hide file tree

Showing 10 changed files with 898 additions and 977 deletions.
diff --git a/lighthouse-cli/test/smokehouse/test-definitions/dobetterweb.js b/lighthouse-cli/test/smokehouse/test-definitions/dobetterweb.js
@@ -307,13 +307,12 @@ const expectations = {
         },
       },
       'deprecations': {
-        _maxChromiumVersion: '103.0.5017.0', // TODO: deprecation strings need to be translated
         // see https://github.com/GoogleChrome/lighthouse/issues/13895
         score: 0,
         details: {
           items: [
             {
-              value: /'window.webkitStorageInfo' is deprecated/,
+              value: /`window.webkitStorageInfo` is deprecated/,
               source: {
                 type: 'source-location',
                 url: 'http://localhost:10200/dobetterweb/dbw_tester.js',
@@ -324,8 +323,7 @@ const expectations = {
               subItems: undefined,
             },
             {
-              _maxChromiumVersion: '103.0.5017.0',
-              value: /Synchronous XMLHttpRequest on the main thread is deprecated/,
+              value: /Synchronous `XMLHttpRequest` on the main thread is deprecated/,
               source: {
                 type: 'source-location',
                 url: 'http://localhost:10200/dobetterweb/dbw_tester.html',

diff --git a/lighthouse-core/audits/deprecations.js b/lighthouse-core/audits/deprecations.js
diff --git a/lighthouse-core/lib/deprecations-strings.js b/lighthouse-core/lib/deprecations-strings.js
diff --git a/lighthouse-core/lib/network-request.js b/lighthouse-core/lib/network-request.js
@@ -68,6 +68,7 @@ const RESOURCE_TYPES = {
   Ping: 'Ping',
   Preflight: 'Preflight',
   CSPViolationReport: 'CSPViolationReport',
+  Prefetch: 'Prefetch',
 };
 
 class NetworkRequest {

diff --git a/lighthouse-core/scripts/i18n/collect-strings.js b/lighthouse-core/scripts/i18n/collect-strings.js
@@ -653,15 +653,8 @@ function resolveMessageCollisions(strings) {
 
   try {
     expect(collidingMessages).toEqual([
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ or $MARKDOWN_SNIPPET_2$ instead.',
-      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use $MARKDOWN_SNIPPET_1$ or $MARKDOWN_SNIPPET_2$ instead.',
+      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use standardized $MARKDOWN_SNIPPET_1$ instead.',
+      '$MARKDOWN_SNIPPET_0$ is deprecated. Please use standardized $MARKDOWN_SNIPPET_1$ instead.',
       'ARIA $MARKDOWN_SNIPPET_0$ elements do not have accessible names.',
       'ARIA $MARKDOWN_SNIPPET_0$ elements do not have accessible names.',
       'ARIA $MARKDOWN_SNIPPET_0$ elements do not have accessible names.',
@@ -681,8 +674,6 @@ function resolveMessageCollisions(strings) {
       'Name',
       'Potential Savings',
       'Potential Savings',
-      'Triggering $MARKDOWN_SNIPPET_0$ from cross origin iframes has been deprecated and will be removed in the future.',
-      'Triggering $MARKDOWN_SNIPPET_0$ from cross origin iframes has been deprecated and will be removed in the future.',
       'Use the $MARKDOWN_SNIPPET_0$ component and set the appropriate $MARKDOWN_SNIPPET_1$. $LINK_START_0$Learn more$LINK_END_0$.',
       'Use the $MARKDOWN_SNIPPET_0$ component and set the appropriate $MARKDOWN_SNIPPET_1$. $LINK_START_0$Learn more$LINK_END_0$.',
     ]);

diff --git a/lighthouse-core/test/audits/deprecations-test.js b/lighthouse-core/test/audits/deprecations-test.js
@@ -53,15 +53,23 @@ describe('Deprecations audit', () => {
               columnNumber: 100,
             },
           },
+          {
+            type: 'PrefixedVideoDisplayingFullscreen',
+            sourceCodeLocation: {
+              url: URL,
+              lineNumber: 101,
+              columnNumber: 100,
+            },
+          },
         ],
       },
       SourceMaps: [],
       ScriptElements: [],
     }, context);
 
     assert.equal(auditResult.score, 0);
-    expect(auditResult.displayValue).toBeDisplayString('3 warnings found');
-    assert.equal(auditResult.details.items.length, 3);
+    expect(auditResult.displayValue).toBeDisplayString('4 warnings found');
+    assert.equal(auditResult.details.items.length, 4);
     assert.equal(auditResult.details.items[0].value, 'Deprecation message 123');
     assert.equal(auditResult.details.items[0].source.url, URL);
     assert.equal(auditResult.details.items[0].source.line, 123);
@@ -77,5 +85,8 @@ describe('Deprecations audit', () => {
       text: expect.toBeDisplayString('This change will go into effect with milestone 109.'),
       url: 'https://chromiumdash.appspot.com/schedule',
     });
+    expect(auditResult.details.items[3].value).toBeDisplayString(
+      // eslint-disable-next-line max-len
+      'HTMLVideoElement.webkitDisplayingFullscreen is deprecated. Please use Document.fullscreenElement instead.');
   });
 });
diff --git a/package.json b/package.json
@@ -138,7 +138,7 @@
     "cpy": "^8.1.2",
     "cross-env": "^7.0.2",
     "csv-validator": "^0.0.3",
-    "devtools-protocol": "0.0.999451",
+    "devtools-protocol": "0.0.1034970",
     "es-main": "^1.0.2",
     "eslint": "^8.4.1",
     "eslint-config-google": "^0.14.0",
@@ -209,8 +209,8 @@
     "yargs-parser": "^21.0.0"
   },
   "resolutions": {
-    "puppeteer/**/devtools-protocol": "0.0.999451",
-    "puppeteer-core/**/devtools-protocol": "0.0.999451"
+    "puppeteer/**/devtools-protocol": "0.0.1034970",
+    "puppeteer-core/**/devtools-protocol": "0.0.1034970"
   },
   "repository": "GoogleChrome/lighthouse",
   "keywords": [