chrome-devtools-frontend 1.0.942095 → 1.0.943709

package/front_end/ui/legacy/textButton.css

@@ -108,8 +108,9 @@
   .text-button:not(:disabled):focus {
     forced-color-adjust: none;
     background-color: ButtonFace;
-    color: ButtonText;
+    color: Highlight !important; /* stylelint-disable-line declaration-no-important */
     border-color: Highlight;
+    outline: 2px solid ButtonText;
     box-shadow: var(--legacy-focus-ring-active-shadow);
   }
 
@@ -117,7 +118,7 @@
   .text-button:not(:disabled):active {
     forced-color-adjust: none;
     background-color: Highlight;
-    color: HighlightText;
+    color: HighlightText !important; /* stylelint-disable-line declaration-no-important */
     box-shadow: var(--legacy-accent-color);
   }
 
@@ -130,14 +131,14 @@
 
   .text-button.primary-button:not(:disabled):focus {
     background-color: Highlight;
-    color: HighlightText;
+    color: HighlightText !important; /* stylelint-disable-line declaration-no-important */
     border-color: ButtonText;
   }
 
   .text-button.primary-button:not(:disabled):hover,
   .text-button.primary-button:not(:disabled):active {
     background-color: HighlightText;
-    color: Highlight;
+    color: Highlight !important; /* stylelint-disable-line declaration-no-important */
     border-color: Highlight;
   }
 }

package/front_end/ui/legacy/theme_support/theme_support_impl.ts

@@ -35,7 +35,9 @@
 
 import * as Common from '../../../core/common/common.js';
 import * as Platform from '../../../core/platform/platform.js';
-import * as Root from '../../../core/root/root.js';
+
+import inspectorSyntaxHighlightStyles from '../inspectorSyntaxHighlight.css.legacy.js';
+import inspectorSyntaxHighlightDarkStyles from '../inspectorSyntaxHighlightDark.css.legacy.js';
 
 let themeSupportInstance: ThemeSupport;
 
@@ -112,9 +114,9 @@ export class ThemeSupport {
 
   injectHighlightStyleSheets(element: Element|ShadowRoot): void {
     this.injectingStyleSheet = true;
-    this.appendStyle(element, 'ui/legacy/inspectorSyntaxHighlight.css');
+    this.appendStyle(element, inspectorSyntaxHighlightStyles);
     if (this.themeNameInternal === 'dark') {
-      this.appendStyle(element, 'ui/legacy/inspectorSyntaxHighlightDark.css');
+      this.appendStyle(element, inspectorSyntaxHighlightDarkStyles);
     }
     this.injectingStyleSheet = false;
   }
@@ -123,13 +125,9 @@ export class ThemeSupport {
    * Note: this is a duplicate of the function in ui/utils. It exists here
    * so there is no circular dependency between ui/utils and theme_support.
    */
-  private appendStyle(node: Node, cssFile: string): void {
-    const content = Root.Runtime.cachedResources.get(cssFile) || '';
-    if (!content) {
-      console.error(cssFile + ' not preloaded. Check module.json');
-    }
+  private appendStyle(node: Node, {cssContent}: {cssContent: string}): void {
     const styleElement = document.createElement('style');
-    styleElement.textContent = content;
+    styleElement.textContent = cssContent;
     node.appendChild(styleElement);
   }
 

package/front_end/ui/legacy/utils/create-shadow-root-with-core-styles.ts

@@ -7,7 +7,7 @@ import {focusChanged} from './focus-changed.js';
 import {injectCoreStyles} from './inject-core-styles.js';
 
 interface Options {
-  cssFile?: string|CSSStyleSheet[];
+  cssFile?: string|CSSStyleSheet[]|{cssContent: string};
   delegatesFocus?: boolean;
 }
 
@@ -22,7 +22,7 @@ export function createShadowRootWithCoreStyles(element: Element, options: Option
 
   const shadowRoot = element.attachShadow({mode: 'open', delegatesFocus});
   injectCoreStyles(shadowRoot);
-  if (typeof cssFile === 'string') {
+  if (typeof cssFile === 'string' || (cssFile !== undefined && 'cssContent' in cssFile)) {
     appendStyle(shadowRoot, cssFile);
   } else if (cssFile) {
     shadowRoot.adoptedStyleSheets = cssFile;

package/front_end/ui/legacy/utils/inject-core-styles.ts

@@ -2,14 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import inspectorCommonStyles from '../inspectorCommon.css.legacy.js';
+import textButtonStyles from '../textButton.css.legacy.js';
 import * as ThemeSupport from '../theme_support/theme_support.js';
+import themeColorsStyles from '../themeColors.css.legacy.js';
+
 import {appendStyle} from './append-style.js';
 
 export function injectCoreStyles(root: Element|ShadowRoot): void {
-  // TODO: Migrate inspectorCommpon.css last https://crbug.com/1222666
-  appendStyle(root, 'ui/legacy/inspectorCommon.css');
-  appendStyle(root, 'ui/legacy/textButton.css');
-  appendStyle(root, 'ui/legacy/themeColors.css');
+  appendStyle(root, inspectorCommonStyles);
+  appendStyle(root, textButtonStyles);
+  appendStyle(root, themeColorsStyles);
 
   ThemeSupport.ThemeSupport.instance().injectHighlightStyleSheets(root);
   ThemeSupport.ThemeSupport.instance().injectCustomStyleSheets(root);

package/inspector_overlay/css_grid_label_helpers.ts

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import {luminance} from '../front_end/core/common/ColorUtils.js';
+import {luminance} from '../front_end/core/common/ColorUtils.js';  // eslint-disable-line rulesdir/es_modules_import
 
 import type {AreaBounds, Bounds, Position} from './common.js';
 import {createChild} from './common.js';

package/inspector_overlay/highlight_common.ts

@@ -28,7 +28,7 @@
 //  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 //  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import {rgbaToHsla} from '../front_end/core/common/ColorUtils.js';
+import {rgbaToHsla} from '../front_end/core/common/ColorUtils.js';  // eslint-disable-line rulesdir/es_modules_import
 
 import type {Bounds, PathCommands, Quad} from './common.js';
 

package/inspector_overlay/tool_highlight.ts

@@ -28,7 +28,7 @@
 //  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 //  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import {contrastRatio, contrastRatioAPCA, getAPCAThreshold, getContrastThreshold} from '../front_end/core/common/ColorUtils.js';
+import {contrastRatio, contrastRatioAPCA, getAPCAThreshold, getContrastThreshold} from '../front_end/core/common/ColorUtils.js';  // eslint-disable-line rulesdir/es_modules_import
 
 import type {Bounds, PathCommands, ResetData} from './common.js';
 import {constrainNumber, createChild, createElement, createTextChild, ellipsify, Overlay} from './common.js';

package/package.json

@@ -55,5 +55,5 @@
     "unittest": "scripts/test/run_unittests.py --no-text-coverage",
     "watch": "third_party/node/node.py --output scripts/watch_build.js"
   },
-  "version": "1.0.942095"
+  "version": "1.0.943709"
 }

package/scripts/check_gn.js

@@ -17,40 +17,6 @@ const gnPath = path.resolve(__dirname, '..', 'BUILD.gn');
 const gnFile = fs.readFileSync(gnPath, 'utf-8');
 const gnLines = gnFile.split('\n');
 
-/**
- * Ensures that generated module files are in the right list in BUILD.gn.
- * This is primarily to avoid remote modules from accidentally getting
- * bundled with the main Chrome binary.
- */
-function checkNonAutostartNonRemoteModules() {
-  const errors = [];
-  const gnVariable = 'non_autostart_non_remote_modules';
-  const lines = selectGNLines(`${gnVariable} = [`, ']');
-  if (!lines.length) {
-    return [
-      'Could not identify non-autostart non-remote modules in gn file',
-      'Please look at: ' + __filename,
-    ];
-  }
-  const text = lines.join('\n');
-  const modules = manifestModules.filter(m => m.type !== 'autostart').map(m => m.name);
-
-  const missingModules = modules.filter(m => !text.includes(`${m}/${path.basename(m)}_module.js`));
-  if (missingModules.length) {
-    errors.push(`Check that you've included [${missingModules.join(', ')}] modules in: ` + gnVariable);
-  }
-
-  // e.g. "lighthouse/lighthouse_module.js" => "lighthouse"
-  const mapLineToModuleName = line => path.dirname(line.substring(1));
-
-  const extraneousModules = lines.map(mapLineToModuleName).filter(module => !modules.includes(module));
-  if (extraneousModules.length) {
-    errors.push(`Found extraneous modules [${extraneousModules.join(', ')}] in: ` + gnVariable);
-  }
-
-  return errors;
-}
-
 /**
  * Ensures that all source files (according to the various module.json files) are
  * listed in BUILD.gn.
@@ -139,7 +105,6 @@ function selectGNLines(startLine, endLine, linesToCheck = gnLines) {
 
 function main() {
   const errors = [
-    ...checkNonAutostartNonRemoteModules(),
     ...checkAllDevToolsFiles(),
   ];
   if (errors.length) {

package/scripts/eslint_rules/lib/es_modules_import.js

@@ -11,7 +11,6 @@
 const path = require('path');
 
 const FRONT_END_DIRECTORY = path.join(__dirname, '..', '..', '..', 'front_end');
-const UNITTESTS_DIRECTORY = path.join(__dirname, '..', '..', '..', 'test', 'unittests');
 const INSPECTOR_OVERLAY_DIRECTORY = path.join(__dirname, '..', '..', '..', 'front_end', 'inspector_overlay');
 const COMPONENT_DOCS_DIRECTORY = path.join(FRONT_END_DIRECTORY, 'ui', 'components', 'docs');
 
@@ -90,14 +89,21 @@ function checkStarImport(context, node, importPath, importPathForErrorMessage, i
   const invalidCrossFolderUsage = !isSameFolder && !isModuleEntrypoint(exportingFileName);
 
   if (invalidSameFolderUsage) {
-    context.report({
-      node,
-      message:
-          'Incorrect same-namespace import: "{{importPathForErrorMessage}}". Use "import { Symbol } from \'./relative-file.js\';" instead.',
-      data: {
-        importPathForErrorMessage,
-      },
-    });
+    // Meta files import their entrypoints and are considered separate entrypoints.
+    // Additionally, any file ending with `-entrypoint.ts` is considered an entrypoint as well.
+    // Therefore, they are allowed to import using a same-namespace star-import.
+    const importingFileIsEntrypoint =
+        importingFileName.endsWith('-entrypoint.ts') || importingFileName.endsWith('-meta.ts');
+    if (!importingFileIsEntrypoint) {
+      context.report({
+        node,
+        message:
+            'Incorrect same-namespace import: "{{importPathForErrorMessage}}". Use "import { Symbol } from \'./relative-file.js\';" instead.',
+        data: {
+          importPathForErrorMessage,
+        },
+      });
+    }
   }
 
   if (invalidCrossFolderUsage) {
@@ -157,12 +163,6 @@ module.exports = {
           });
         }
 
-        const importingFileIsUnitTestFile = importingFileName.startsWith(UNITTESTS_DIRECTORY);
-        const importingFileIsComponentDocsFile = importingFileName.startsWith(COMPONENT_DOCS_DIRECTORY);
-        if (!importingFileName.startsWith(FRONT_END_DIRECTORY) && !importingFileIsUnitTestFile) {
-          return;
-        }
-
         if (importingFileName.startsWith(INSPECTOR_OVERLAY_DIRECTORY)) {
           return;
         }
@@ -173,15 +173,6 @@ module.exports = {
 
         const exportingFileName = path.resolve(path.dirname(importingFileName), importPath);
 
-        if (importPath.replace(/\\/g, '/').includes('/front_end/') && !importingFileIsUnitTestFile &&
-            !importingFileIsComponentDocsFile) {
-          context.report({
-            node,
-            message:
-                'Invalid relative import: an import should not include the "front_end" directory. If you are in a unit test, you should import from the module entrypoint.',
-          });
-        }
-
         if (importPathForErrorMessage.endsWith('platform/platform.js') &&
             nodeSpecifiersSpecialImportsOnly(node.specifiers)) {
           /* We allow direct importing of the ls and assertNotNull utility as it's so frequently used. */

package/scripts/eslint_rules/tests/es_modules_import_test.js

@@ -106,6 +106,14 @@ ruleTester.run('es_modules_import', rule, {
       code: 'import * as ConsoleCounters from \'../console_counters/console_counters.js\';',
       filename: 'front_end/panels/console/ConsoleView.ts',
     },
+    {
+      code: 'import * as Elements from \'./elements.js\';',
+      filename: 'front_end/panels/elements/elements-meta.ts',
+    },
+    {
+      code: 'import * as Elements from \'./elements.js\';',
+      filename: 'front_end/panels/elements/elements-entrypoint.ts',
+    },
     // Tests are allowed to import from front_end
     {
       code: 'import * as UI from \'../../../front_end/ui/ui.js\';',
@@ -240,21 +248,5 @@ ruleTester.run('es_modules_import', rule, {
             'Incorrect cross-namespace import: "../third_party/marked/package/lib/marked.esm.js". Use "import * as Namespace from \'../namespace/namespace.js\';" instead. If the third_party dependency does not expose a single entrypoint, update es_modules_import.js to make it exempt.'
       }],
     },
-    {
-      code: 'import * as Marked from \'../../front_end/third_party/marked/package/lib/marked.esm.js\';',
-      filename: 'front_end/marked/marked.js',
-      errors: [{
-        message:
-            'Invalid relative import: an import should not include the "front_end" directory. If you are in a unit test, you should import from the module entrypoint.'
-      }],
-    },
-    {
-      code: 'import * as SDK from \'../../front_end/sdk/sdk.js\';',
-      filename: 'front_end/marked/marked.js',
-      errors: [{
-        message:
-            'Invalid relative import: an import should not include the "front_end" directory. If you are in a unit test, you should import from the module entrypoint.'
-      }],
-    }
   ]
 });

package/front_end/emulated_devices/module.json

@@ -1,6 +0,0 @@
-{
-  "dependencies": [
-    "panels/emulation"
-  ],
-  "resources": []
-}

package/front_end/panels/emulation/module.json

@@ -1,11 +0,0 @@
-{
-  "dependencies": [
-    "ui/legacy"
-  ],
-    "resources": [
-    "deviceModeToolbar.css",
-    "deviceModeView.css",
-    "inspectedPagePlaceholder.css",
-    "mediaQueryInspector.css"
-  ]
-}

package/front_end/panels/js_profiler/module.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": [
-    "panels/profiler"
-  ]
-}

package/front_end/panels/layers/module.json

@@ -1,4 +0,0 @@
-{
-  "dependencies": [
-  ]
-}

package/front_end/panels/profiler/module.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": [
-    "ui/legacy"
-  ]
-}

package/front_end/panels/screencast/module.json

@@ -1,6 +0,0 @@
-{
-  "dependencies": [
-    "ui/legacy",
-    "panels/emulation"
-  ]
-}

package/front_end/panels/timeline/module.json

@@ -1,6 +0,0 @@
-{
-  "dependencies": [
-    "ui/legacy",
-    "panels/profiler"
-  ]
-}