core(service-worker): remove service-worker gatherer (#15942)

GoogleChrome · Apr 12, 2024 · 9a62cd8 · 9a62cd8
1 parent 79c78be
commit 9a62cd8
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 238 deletions.
diff --git a/core/config/default-config.js b/core/config/default-config.js
@@ -133,7 +133,6 @@ const defaultConfig = {
     {id: 'OptimizedImages', gatherer: 'dobetterweb/optimized-images'},
     {id: 'ResponseCompression', gatherer: 'dobetterweb/response-compression'},
     {id: 'RobotsTxt', gatherer: 'seo/robots-txt'},
-    {id: 'ServiceWorker', gatherer: 'service-worker'},
     {id: 'Scripts', gatherer: 'scripts'},
     {id: 'SourceMaps', gatherer: 'source-maps'},
     {id: 'Stacks', gatherer: 'stacks'},

diff --git a/core/gather/driver/service-workers.js b/core/gather/driver/service-workers.js
diff --git a/core/gather/gatherers/service-worker.js b/core/gather/gatherers/service-worker.js
diff --git a/core/test/audits/mainthread-work-breakdown-test.js b/core/test/audits/mainthread-work-breakdown-test.js
@@ -54,7 +54,7 @@ describe('Performance: page execution timings audit', () => {
     };
   });
 
-  it('should compute the correct pageExecutionTiming values for the pwa trace', async () => {
+  it('should compute the correct pageExecutionTiming values for the trace', async () => {
     const artifacts = {
       traces: {defaultPass: acceptableTrace},
       devtoolsLogs: {defaultPass: acceptableDevtoolsLog},

diff --git a/core/test/gather/driver/service-workers-test.js b/core/test/gather/driver/service-workers-test.js
diff --git a/core/test/gather/gatherers/service-worker-test.js b/core/test/gather/gatherers/service-worker-test.js
diff --git a/core/test/results/artifacts/artifacts.json b/core/test/results/artifacts/artifacts.json
@@ -12680,10 +12680,6 @@
       }
     }
   },
-  "ServiceWorker": {
-    "versions": [],
-    "registrations": []
-  },
   "Inputs": {
     "inputs": [
       {

diff --git a/core/test/runner-test.js b/core/test/runner-test.js
@@ -35,11 +35,6 @@ await td.replaceEsm('../lib/asset-saver.js', {
   loadArtifacts: loadArtifactsSpy = jestMock.fn((...args) => assetSaver.loadArtifacts(...args)),
 });
 
-await td.replaceEsm('../gather/driver/service-workers.js', {
-  getServiceWorkerVersions: jestMock.fn().mockResolvedValue({versions: []}),
-  getServiceWorkerRegistrations: jestMock.fn().mockResolvedValue({registrations: []}),
-});
-
 // Some imports needs to be done dynamically, so that their dependencies will be mocked.
 // https://github.com/GoogleChrome/lighthouse/blob/main/docs/hacking-tips.md#mocking-modules-with-testdouble
 const {Runner} = await import('../runner.js');

diff --git a/core/test/scripts/run-mocha-tests.js b/core/test/scripts/run-mocha-tests.js
@@ -70,7 +70,6 @@ const testsToIsolate = new Set([
   'core/test/user-flow-test.js',
   'core/test/gather/driver/prepare-test.js',
   'core/test/gather/gatherers/link-elements-test.js',
-  'core/test/gather/gatherers/service-worker-test.js',
   'core/test/runner-test.js',
 
   // grep -lRE --include='-test.js' 'mockDriverSubmodules|mockRunnerModule|mockDriverModule|mockDriverSubmodules|makeMocksForGatherRunner' --include='*-test.*' --exclude-dir=node_modules

diff --git a/report/renderer/report-renderer.js b/report/renderer/report-renderer.js
@@ -203,7 +203,7 @@ export class ReportRenderer {
    * @return {!DocumentFragment[]}
    */
   _renderScoreGauges(report, categoryRenderer, specificCategoryRenderers) {
-    // Group gauges in this order: default, pwa, plugins.
+    // Group gauges in this order: default, plugins.
     const defaultGauges = [];
     const pluginGauges = [];
 

diff --git a/report/test/renderer/report-renderer-test.js b/report/test/renderer/report-renderer-test.js
@@ -61,7 +61,7 @@ describe('ReportRenderer', () => {
       assert.ok(output.querySelector('.lh-report'), 'has report body');
       // 3 sets of gauges - one in sticky header, one in scores header, and one in each section.
       // eslint-disable-next-line max-len
-      assert.equal(output.querySelectorAll('.lh-gauge__wrapper, .lh-gauge--pwa__wrapper, .lh-exp-gauge__wrapper').length,
+      assert.equal(output.querySelectorAll('.lh-gauge__wrapper, .lh-exp-gauge__wrapper').length,
           Object.keys(sampleResults.categories).length * 3, 'renders category gauges');
     });
 

diff --git a/tsconfig.json b/tsconfig.json
@@ -56,7 +56,6 @@
     "core/test/gather/gatherers/offline-test.js",
     "core/test/gather/gatherers/runtime-exceptions-test.js",
     "core/test/gather/gatherers/seo/font-size-test.js",
-    "core/test/gather/gatherers/service-worker-test.js",
     "core/test/gather/gatherers/source-maps-test.js",
     "core/test/gather/gatherers/stack-collector-test.js",
     "core/test/gather/gatherers/start-url-test.js",

diff --git a/types/artifacts.d.ts b/types/artifacts.d.ts
@@ -141,8 +141,6 @@ export interface GathererArtifacts extends PublicGathererArtifacts {
   RobotsTxt: {status: number|null, content: string|null, errorMessage?: string};
   /** The result of calling the shared trace engine root cause analysis. */
   RootCauses: Artifacts.TraceEngineRootCauses;
-  /** Version information for all ServiceWorkers active after the first page load. */
-  ServiceWorker: {versions: Crdp.ServiceWorker.ServiceWorkerVersion[], registrations: Crdp.ServiceWorker.ServiceWorkerRegistration[]};
   /** Source maps of scripts executed in the page. */
   SourceMaps: Array<Artifacts.SourceMap>;
   /** Information on detected tech stacks (e.g. JS libraries) used by the page. */