[cr148] Fix ESLint reports for mixed imports

There's a now a check that flags the mixed imports of types and values
in the same statement.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/48ab71207d8bad222480e7fd5db54cb9120b391d

commit 48ab71207d8bad222480e7fd5db54cb9120b391d
Author: rbpotter <rbpotter@chromium.org>
Date:   Wed Mar 18 15:34:00 2026 -0700

    WebUI: Add a check for mixed type and value imports

    Bug: 493319444
    Change-Id: I2ddf4cb23367149deb52053cb37982a5296f33d2
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7671332
    Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
    Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1601585}
This commit is contained in:
Claudio DeSouza
2026-04-27 12:00:49 +01:00
parent 7500c3cf00
commit cd215eb75f
10 changed files with 30 additions and 17 deletions
@@ -6,11 +6,12 @@
import {loadTimeData} from 'chrome://resources/js/load_time_data.js'
import {
type PageVisibility,
pageVisibility as chromiumPageVisibility,
resetPageVisibilityForTesting
} from '../page_visibility.js'
import type { PageVisibility } from '../page_visibility.js'
// Merge our interface additions with upstream's interface
declare module '../page_visibility.js' {
export interface PageVisibility {
+1 -1
View File
@@ -15,7 +15,7 @@ import {
import {SettingsSearchPageElement} from '../search_page/search_page.js'
import {routes} from '../route.js'
import {type Route, RouteObserverMixin, Router} from '../router.js'
import {RouteObserverMixin, Router} from '../router.js'
import {getTrustedHTML} from 'chrome://resources/js/static_types.js'
import {loadTimeData} from '../i18n_setup.js'
@@ -16,7 +16,8 @@ import {
SettingsBraveClearBrowsingDataOnExitPageV2Element
} from './brave_clear_browsing_data_on_exit_page_v2.js'
import {BrowsingDataType, type UpdateSyncStateEvent} from '../clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js';
import {BrowsingDataType} from '../clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js';
import type {UpdateSyncStateEvent} from '../clear_browsing_data_dialog/clear_browsing_data_browser_proxy.js';
import {loadTimeData} from '../i18n_setup.js'
import {
@@ -16,12 +16,14 @@ import { BaseMixin } from '../base_mixin.js'
import { getTemplate } from './model_list_section.html.js'
import {
type BraveLeoAssistantBrowserProxy,
type Model,
OperationResult,
BraveLeoAssistantBrowserProxyImpl,
OLLAMA_ENDPOINT
} from './brave_leo_assistant_browser_proxy.js'
import type {
BraveLeoAssistantBrowserProxy,
Model
} from './brave_leo_assistant_browser_proxy.js'
const ModelListSectionBase = PrefsMixin(I18nMixin(BaseMixin(PolymerElement)))
@@ -17,10 +17,13 @@ import {SettingsViewMixin} from '../settings_page/settings_view_mixin.js'
import {
BraveWalletBrowserProxy,
BraveWalletBrowserProxyImpl,
type Option,
type SolanaProvider,
type CardanoProvider
BraveWalletBrowserProxyImpl
} from './brave_wallet_browser_proxy.js'
import type {
Option,
SolanaProvider,
CardanoProvider
} from './brave_wallet_browser_proxy.js'
import {assert} from 'chrome://resources/js/assert.js'
@@ -6,10 +6,8 @@
import 'chrome://resources/cr_elements/cr_button/cr_button.js'
import './add_wallet_network_dialog.js'
import {
BraveWalletBrowserProxyImpl,
type NetworkInfo,
} from './brave_wallet_browser_proxy.js'
import {BraveWalletBrowserProxyImpl} from './brave_wallet_browser_proxy.js'
import type {NetworkInfo} from './brave_wallet_browser_proxy.js'
import type {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu/cr_action_menu.js'
import type {CrLazyRenderElement} from 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.js'
@@ -9,8 +9,10 @@ import './components/brave_adblock_subscribe_dropdown.js'
import {PrefsMixin} from '/shared/settings/prefs/prefs_mixin.js'
import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'
import type {
DomRepeatEvent
} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'
import {
type DomRepeatEvent,
PolymerElement
} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'
@@ -5,7 +5,8 @@
import { CustomizeChromeApiProxy } from './customize_chrome_api_proxy.js'
import { CrLitElement, html, css, type CSSResultGroup } from '//resources/lit/v3_0/lit.rollup.js'
import { CrLitElement, html, css } from '//resources/lit/v3_0/lit.rollup.js'
import type { CSSResultGroup } from '//resources/lit/v3_0/lit.rollup.js'
import { loadTimeData } from '//resources/js/load_time_data.js'
import { I18nMixinLit } from '//resources/cr_elements/i18n_mixin_lit.js'
import { CustomizeColorSchemeModeBrowserProxy } from '//resources/cr_components/customize_color_scheme_mode/browser_proxy.js'
@@ -5,7 +5,11 @@
import '//resources/brave/leo.bundle.js';
import {CrLitElement, css, type CSSResultGroup, type PropertyValues} from '//resources/lit/v3_0/lit.rollup.js';
import {CrLitElement, css} from '//resources/lit/v3_0/lit.rollup.js';
import type {
CSSResultGroup,
PropertyValues}
from '//resources/lit/v3_0/lit.rollup.js';
import {getHtml} from './cr_button.html.js';
@@ -5,7 +5,8 @@
import '//resources/brave/leo.bundle.js'
import {CrLitElement, css, type CSSResultGroup} from '//resources/lit/v3_0/lit.rollup.js';
import {CrLitElement, css} from '//resources/lit/v3_0/lit.rollup.js';
import type {CSSResultGroup} from '//resources/lit/v3_0/lit.rollup.js';
import {getHtml} from './cr_toggle.html.js';