clients: convert extension to ES modules (#14181)

GoogleChrome · Jun 30, 2022 · 53a4e3d · 53a4e3d
1 parent 133cb9f
commit 53a4e3d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 16 deletions.
diff --git a/build/build-extension.js b/build/build-extension.js
@@ -39,7 +39,6 @@ async function buildEntryPoint() {
       rollupPlugins.replace({
         '___BROWSER_BRAND___': browserBrand,
       }),
-      rollupPlugins.commonjs(),
       rollupPlugins.nodeResolve(),
       rollupPlugins.inlineFs({verbose: false}),
       rollupPlugins.terser(),

diff --git a/clients/extension/scripts/popup.js b/clients/extension/scripts/popup.js
@@ -5,7 +5,7 @@
  */
 'use strict';
 
-const SettingsController = require('./settings-controller.js');
+import * as SettingsController from './settings-controller.js';
 
 const VIEWER_URL = 'https://googlechrome.github.io/lighthouse/viewer/';
 const optionsVisibleClass = 'main--options-visible';

diff --git a/clients/extension/scripts/settings-controller.js b/clients/extension/scripts/settings-controller.js
@@ -89,7 +89,7 @@ function loadSettings() {
   });
 }
 
-module.exports = {
+export {
   DEFAULT_CATEGORIES,
   STORAGE_KEYS,
   saveSettings,

diff --git a/clients/lightrider/package.json → clients/package.json b/clients/lightrider/package.json → clients/package.json
diff --git a/clients/test/extension/popup-test-pptr.js b/clients/test/extension/popup-test-pptr.js
@@ -5,12 +5,11 @@
  */
 'use strict';
 
-const path = require('path');
-const puppeteer = require('puppeteer-core');
-const {getChromePath} = require('chrome-launcher');
-const {DEFAULT_CATEGORIES, STORAGE_KEYS} =
-  require('../../extension/scripts/settings-controller.js');
-const {LH_ROOT} = require('../../../root.js');
+import path from 'path';
+import puppeteer from 'puppeteer-core';
+import {getChromePath} from 'chrome-launcher';
+import {DEFAULT_CATEGORIES, STORAGE_KEYS} from '../../extension/scripts/settings-controller.js';
+import {LH_ROOT} from '../../../root.js';
 
 const lighthouseExtensionPath = path.resolve(LH_ROOT, 'dist/extension-chrome');
 

diff --git a/clients/test/extension/settings-controller-test.js b/clients/test/extension/settings-controller-test.js
@@ -5,9 +5,9 @@
  */
 'use strict';
 
-const SettingsController = require('../../extension/scripts/settings-controller.js');
-const defaultConfig = require('../../../lighthouse-core/config/default-config.js');
-const format = require('../../../shared/localization/format.js');
+import * as SettingsController from '../../extension/scripts/settings-controller.js';
+import defaultConfig from '../../../lighthouse-core/config/default-config.js';
+import * as format from '../../../shared/localization/format.js';
 
 describe('Lighthouse chrome extension SettingsController', () => {
   it('default categories should be correct', () => {

diff --git a/clients/test/lightrider/package.json b/clients/test/lightrider/package.json