chrome-devtools-frontend 1.0.1650100 → 1.0.1650232

package/front_end/third_party/third-party-web/package/lib/create-entity-finder-api.js

@@ -1,22 +1,35 @@
 const DOMAIN_IN_URL_REGEX = /:\/\/(\S*?)(:\d+)?(\/|$)/
-const DOMAIN_CHARACTERS = /([a-z0-9.-]+\.[a-z0-9]+|localhost)/i
+const DOMAIN_CHARACTERS = /(?:[a-z0-9.-]+\.[a-z0-9]+|localhost)/i
 const IP_REGEX = /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
 const ROOT_DOMAIN_REGEX = /[^.]+\.([^.]+|(gov|com|co|ne)\.\w{2})$/i
 
-function getDomainFromOriginOrURL(originOrURL) {
-  if (typeof originOrURL !== 'string') return null
-  if (originOrURL.length > 10000 || originOrURL.startsWith('data:')) return null
-  if (DOMAIN_IN_URL_REGEX.test(originOrURL)) return originOrURL.match(DOMAIN_IN_URL_REGEX)[1]
-  if (DOMAIN_CHARACTERS.test(originOrURL)) return originOrURL.match(DOMAIN_CHARACTERS)[0]
-  return null
+/**
+ * @param {string} originOrURL
+ * @return {[string|null, string|null]} - The first item is the root domain, the second item is the domain.
+ */
+function parseDomains(originOrURL) {
+  if (typeof originOrURL !== 'string') return [null, null]
+  if (originOrURL.length > 10000 || originOrURL.startsWith('data:')) return [null, null]
+  let m = originOrURL.match(DOMAIN_IN_URL_REGEX)
+  let domain;
+  if (m) {
+    domain = m[1]
+  }
+  m = originOrURL.match(DOMAIN_CHARACTERS)
+  if (m) {
+    domain = m[0]
+  }
+
+  if (!domain) return [null, null]
+  if (IP_REGEX.test(domain)) return [domain, domain]
+  m = domain.match(ROOT_DOMAIN_REGEX)
+  const rootDomain = m && m[0] || domain;
+
+  return [rootDomain, domain]
 }
 
-function getRootDomain(originOrURL) {
-  const domain = getDomainFromOriginOrURL(originOrURL)
-  if (!domain) return null
-  if (IP_REGEX.test(domain)) return domain
-  const match = domain.match(ROOT_DOMAIN_REGEX)
-  return (match && match[0]) || domain
+function getRootDomain(originOrURL,) {
+  return parseDomains(originOrURL)[0];
 }
 
 function sliceSubdomainFromDomain(domain, rootDomain) {
@@ -28,8 +41,7 @@ function sliceSubdomainFromDomain(domain, rootDomain) {
 }
 
 function getEntityInDataset(entityByDomain, entityBySubDomain, entityByRootDomain, originOrURL) {
-  const domain = getDomainFromOriginOrURL(originOrURL)
-  const rootDomain = getRootDomain(domain)
+  const [rootDomain, domain] = parseDomains(originOrURL);
   if (!domain || !rootDomain) return undefined
   if (entityByDomain.has(domain)) return entityByDomain.get(domain)
 

package/front_end/third_party/third-party-web/package/lib/create-entity-finder-api.test.js

@@ -1,3 +1,5 @@
+const fs = require('fs')
+const path = require('path')
 const {createAPIFromDataset} = require('./create-entity-finder-api.js')
 
 describe('getEntity', () => {
@@ -41,4 +43,16 @@ describe('getEntity', () => {
     expect(api.getEntity('https://bar.example.co.uk/path').name).toEqual('Domain')
     expect(api.getEntity('https://baz.bar.example.co.uk/path').name).toEqual('Domain')
   })
+
+  it.skip('stress test', () => {
+    const urls = fs
+      .readFileSync(path.join(__dirname, '../data/random-urls.txt'), 'utf8')
+      .split('\n')
+      .filter(Boolean)
+    console.time('getEntity')
+    for (let i = 0; i < 1_000_000; i++) {
+      api.getEntity(urls[i % urls.length])
+    }
+    console.timeEnd('getEntity')
+  })
 })

package/front_end/third_party/third-party-web/package/lib/entities.test.js

@@ -24,4 +24,14 @@ describe('Entities', () => {
       }
     }
   })
+
+  it('should not have commas within a domain', () => {
+    for (const entity of entities) {
+      for (const domain of entity.domains) {
+        // A domain can be `*.maxymiser.net` or `maxymiser.hs.llnwd.net`
+        // A domain can't be `*.maxymiser.net, maxymiser.hs.llnwd.net`
+        expect(domain).toEqual(expect.not.stringContaining(','))
+      }
+    }
+  })
 })

package/front_end/third_party/third-party-web/package/lib/index.test.js

@@ -59,7 +59,7 @@ describe('getEntity', () => {
   it('works for direct domain usage', () => {
     expect(getEntity('https://js.connect.facebook.net/lib.js')).toMatchInlineSnapshot(`
       Object {
-        "averageExecutionTime": 347.4278160199557,
+        "averageExecutionTime": 513.7506757503379,
         "categories": Array [
           "social",
         ],
@@ -103,8 +103,8 @@ describe('getEntity', () => {
             ],
           },
         ],
-        "totalExecutionTime": 1097107210,
-        "totalOccurrences": 3157799,
+        "totalExecutionTime": 2901178836,
+        "totalOccurrences": 5647056,
       }
     `)
   })
@@ -112,7 +112,7 @@ describe('getEntity', () => {
   it('works for inferred domain usage', () => {
     expect(getEntity('https://unknown.typekit.net/fonts.css')).toMatchInlineSnapshot(`
       Object {
-        "averageExecutionTime": 660.2645605704683,
+        "averageExecutionTime": 691.2697157512289,
         "categories": Array [
           "cdn",
         ],
@@ -129,8 +129,8 @@ describe('getEntity', () => {
         "homepage": "https://fonts.adobe.com/",
         "name": "Adobe TypeKit",
         "products": Array [],
-        "totalExecutionTime": 78981507,
-        "totalOccurrences": 119621,
+        "totalExecutionTime": 142315844,
+        "totalOccurrences": 205876,
       }
     `)
   })

package/front_end/third_party/third-party-web/package/lib/markdown/template.md

@@ -1,6 +1,4 @@
-# [Third Party Web](https://www.thirdpartyweb.today/)
-
-## Check out the shiny new web UI https://www.thirdpartyweb.today/
+# Third Party Web
 
 Data on third party entities and their impact on the web.
 

package/front_end/third_party/third-party-web/package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "third-party-web",
-  "version": "0.26.2",
+  "version": "0.29.2",
   "description": "Categorized data on third party entities on the web.",
   "main": "./lib/index.js",
   "scripts": {
@@ -23,6 +23,10 @@
     "url": "https://github.com/patrickhulce/third-party-web.git"
   },
   "license": "MIT",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/",
+    "provenance": true
+  },
   "devDependencies": {
     "@google-cloud/bigquery": "^7.9.0",
     "chart.js": "^2.9.4",
@@ -33,7 +37,7 @@
     "lodash": "^4.17.15",
     "prettier": "^1.18.2",
     "prompts": "^2.4.2",
-    "semantic-release": "^24.2.0"
+    "semantic-release": "^25.0.3"
   },
   "config": {
     "exportAliases": {
@@ -42,5 +46,5 @@
       "httparchive-subset": "./lib/subsets/httparchive.js"
     }
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.10.3"
 }

package/front_end/third_party/third-party-web/package.json

@@ -3,6 +3,6 @@
   "description": "Package list used when building/upgrading third-party-web",
   "private": true,
   "dependencies": {
-    "third-party-web": "0.26.2"
+    "third-party-web": "0.29.2"
   }
 }

package/front_end/ui/components/buttons/floatingButton.css

@@ -27,7 +27,7 @@ button {
     background-color: var(--sys-color-tonal-container);
   }
 
-  :host-context(.theme-with-dark-background) & {
+  :host-context(.theme-with-dark-background) &:not(:disabled) {
     background-color: var(--sys-color-primary);
   }
 
@@ -36,11 +36,11 @@ button {
     height: var(--sys-size-7);
   }
 
-  &:not(:disabled):host-context(:not(.theme-with-dark-background)) & > devtools-icon {
+  :host-context(:not(.theme-with-dark-background)) &:not(:disabled) > devtools-icon {
     color: var(--sys-color-on-tonal-container);
   }
 
-  &:not(:disabled):host-context(.theme-with-dark-background) & > devtools-icon {
+  :host-context(.theme-with-dark-background) &:not(:disabled) > devtools-icon {
     color: var(--sys-color-on-primary);
   }
 

package/front_end/ui/components/lists/list.css

@@ -76,6 +76,8 @@ li {
   pointer-events: none;
   position: absolute;
   right: 0;
+  top: 0;
+  bottom: 0;
 }
 
 .controls-gradient {

package/front_end/ui/legacy/ListWidget.ts

@@ -9,7 +9,7 @@ import './Toolbar.js';
 import * as i18n from '../../core/i18n/i18n.js';
 import * as Platform from '../../core/platform/platform.js';
 import * as Buttons from '../../ui/components/buttons/buttons.js';
-import {html, render} from '../lit/lit.js';
+import {html, nothing, render} from '../lit/lit.js';
 import * as VisualLogging from '../visual_logging/visual_logging.js';
 
 import * as ARIAUtils from './ARIAUtils.js';
@@ -107,6 +107,7 @@ export class ListWidget<T> extends VBox {
   updateItem(index: number, newItem: T, editable: boolean, focusable = true, controlLabels: {
     edit?: string,
     delete?: string,
+    hideEdit?: boolean,
   } = {}): void {
     if (index < 0 || index >= this.#items.length) {
       this.appendItem(newItem, editable, focusable, controlLabels);
@@ -130,7 +131,8 @@ export class ListWidget<T> extends VBox {
     }
   }
 
-  appendItem(item: T, editable: boolean, focusable = true, controlLabels: {edit?: string, delete?: string} = {}): void {
+  appendItem(item: T, editable: boolean, focusable = true,
+             controlLabels: {edit?: string, delete?: string, hideEdit?: boolean} = {}): void {
     if (this.lastSeparator && this.#items.length) {
       const element = document.createElement('div');
       element.classList.add('list-separator');
@@ -204,7 +206,8 @@ export class ListWidget<T> extends VBox {
     this.updatePlaceholder();
   }
 
-  private createControls(item: T, element: HTMLElement, controlLabels: {edit?: string, delete?: string}): Element {
+  private createControls(item: T, element: HTMLElement,
+                         controlLabels: {edit?: string, delete?: string, hideEdit?: boolean}): Element {
     const controls = document.createElement('div');
     controls.classList.add('controls-container');
     controls.classList.add('fill');
@@ -214,12 +217,12 @@ export class ListWidget<T> extends VBox {
       <div class="controls-gradient"></div>
       <div class="controls-buttons">
         <devtools-toolbar>
-          <devtools-button class=toolbar-button
+          ${controlLabels?.hideEdit ? nothing : html`<devtools-button class=toolbar-button
                            .iconName=${'edit'}
                            .jslogContext=${'edit-item'}
                            .title=${controlLabels?.edit ?? i18nString(UIStrings.editString)}
                            .variant=${Buttons.Button.Variant.ICON}
-                           @click=${onEditClicked}></devtools-button>
+                           @click=${onEditClicked}></devtools-button>`}
           <devtools-button class=toolbar-button
                            .iconName=${'bin'}
                            .jslogContext=${'remove-item'}

package/front_end/ui/legacy/TextPrompt.ts

@@ -226,11 +226,12 @@ export class TextPromptElement extends HTMLElement {
   #done(e: Event, commit: boolean): void {
     const target = e.target as HTMLElement;
     const text = target.textContent || '';
-    this.#internals.setValidity({});
     if (commit) {
       const validationMessage = this.#validator?.(text) ?? '';
       if (validationMessage) {
         this.#internals.setValidity({customError: true}, validationMessage, this.#entrypoint);
+      } else {
+        this.#internals.setValidity({});
       }
 
       if (!this.#internals.reportValidity()) {
@@ -239,6 +240,7 @@ export class TextPromptElement extends HTMLElement {
 
       this.dispatchEvent(new TextPromptElement.CommitEvent(text));
     } else {
+      this.#internals.setValidity({});
       this.dispatchEvent(new TextPromptElement.CancelEvent());
     }
     e.consume();
@@ -248,12 +250,13 @@ export class TextPromptElement extends HTMLElement {
     if (event.handled || !(event instanceof KeyboardEvent)) {
       return;
     }
-    this.#internals.setValidity({});
 
     if (event.key === 'Enter') {
       this.#done(event, /* commit=*/ true);
     } else if (Platform.KeyboardUtilities.isEscKey(event)) {
       this.#done(event, /* commit=*/ false);
+    } else {
+      this.#internals.setValidity({});
     }
   }
 

package/front_end/ui/legacy/textPrompt.css

@@ -21,6 +21,7 @@
 .text-prompt {
   cursor: text;
   overflow-x: visible;
+  min-width: var(--devtools-text-prompt-min-width, auto);
 }
 
 .text-prompt::-webkit-scrollbar {

package/front_end/ui/visual_logging/KnownContextValues.ts

@@ -4368,6 +4368,7 @@ export const knownContextValues = new Set([
   'ur',
   'url',
   'url-pattern',
+  'url-pattern-warning',
   'usage',
   'usb',
   'use-code-with-caution',

package/package.json

@@ -92,5 +92,5 @@
     "webidl2": "24.5.0",
     "yargs": "17.7.2"
   },
-  "version": "1.0.1650100"
+  "version": "1.0.1650232"
 }