chrome-devtools-frontend 1.0.943017 → 1.0.944427

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/panels/layers/module.json

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

package/front_end/ui/legacy/components/source_frame/messagesPopover.css

@@ -1,32 +0,0 @@
-/*
- * Copyright 2017 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-.text-editor-messages-description-container {
-  display: inline-block;
-}
-
-.text-editor-row-message {
-  line-height: 1.2;
-  white-space: nowrap;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-  margin-top: 2px;
-}
-
-.text-editor-row-message:first-child {
-  border-top-width: 0;
-}
-
-.text-editor-row-message-repeat-count {
-  margin-right: 0.5em;
-}
-
-.text-editor-row-message-icon {
-  display: flex;
-  margin-right: 6px;
-  cursor: pointer;
-}

package/front_end/ui/legacy/components/source_frame/module.json

@@ -1,11 +0,0 @@
-{
-    "resources": [
-    "fontView.css",
-    "imageView.css",
-    "jsonView.css",
-    "messagesPopover.css",
-    "xmlTree.css",
-    "xmlView.css",
-    "resourceSourceFrame.css"
-  ]
-}