@angular/material 20.0.0-next.5 → 20.0.0-next.6

package/icon/_icon-theme.scss

@@ -1,14 +1,14 @@
-@use '../core/theming/theming';
+@use '../core/style/sass-utils';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
-@use '../core/tokens/m2/mat/icon' as tokens-mat-icon;
 @use '../core/tokens/token-utils';
-@use '../core/style/sass-utils';
+@use './m2-icon';
 
 @mixin _palette-colors($theme, $palette-name) {
   $color: inspection.get-theme-color($theme, $palette-name, text);
-  $tokens: tokens-mat-icon.private-get-icon-color-tokens($color);
-  @include token-utils.create-token-values-mixed(tokens-mat-icon.$prefix, $tokens);
+  $tokens: m2-icon.private-get-icon-color-tokens($color);
+  @include token-utils.create-token-values-mixed(m2-icon.$prefix, $tokens);
 }
 
 /// Outputs base theme styles (styles not dependent on the color, typography, or density settings)
@@ -32,8 +32,8 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-icon.$prefix,
-        tokens-mat-icon.get-color-tokens($theme)
+        m2-icon.$prefix,
+        m2-icon.get-color-tokens($theme)
       );
     }
 
@@ -75,8 +75,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-icon.$prefix,
-      tokens: tokens-mat-icon.get-token-slots(),
+      namespace: m2-icon.$prefix,
+      tokens: m2-icon.get-token-slots(),
     ),
   );
 }
@@ -115,6 +115,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-icon-tokens: token-utils.get-tokens-for($tokens, tokens-mat-icon.$prefix, $options...);
-  @include token-utils.create-token-values(tokens-mat-icon.$prefix, $mat-icon-tokens);
+  $mat-icon-tokens: token-utils.get-tokens-for($tokens, m2-icon.$prefix, $options...);
+  @include token-utils.create-token-values(m2-icon.$prefix, $mat-icon-tokens);
 }

package/{core/tokens/m2/mat/_icon.scss → icon/_m2-icon.scss}

@@ -1,5 +1,5 @@
-@use '../../token-definition';
-@use '../../../style/sass-utils';
+@use '../core/tokens/m2-utils';
+@use '../core/style/sass-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, icon);
@@ -38,8 +38,8 @@ $prefix: (mat, icon);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      get-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_icon.scss → icon/_m3-icon.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, icon);
@@ -11,7 +11,7 @@ $prefix: (mat, icon);
 /// @return {Map} A set of custom tokens for the mat-icon
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: (
-    color: token-definition.hardcode(inherit, $exclude-hardcoded),
+    color: m3-utils.hardcode(inherit, $exclude-hardcoded),
   );
 
   $variant-tokens: (
@@ -31,5 +31,5 @@ $prefix: (mat, icon);
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, ($tokens, $variant-tokens), $token-slots);
+  @return m3-utils.namespace($prefix, ($tokens, $variant-tokens), $token-slots);
 }

package/icon/index.d.ts

@@ -1,9 +1,9 @@
-export { b as MAT_ICON_DEFAULT_OPTIONS, c as MAT_ICON_LOCATION, e as MAT_ICON_LOCATION_FACTORY, f as MatIcon, a as MatIconDefaultOptions, d as MatIconLocation, M as MatIconModule } from '../icon-module.d-d06a5620.js';
-export { f as ICON_REGISTRY_PROVIDER, e as ICON_REGISTRY_PROVIDER_FACTORY, I as IconOptions, d as IconResolver, M as MatIconRegistry, S as SafeResourceUrlWithIconOptions, c as getMatIconFailedToSanitizeLiteralError, b as getMatIconFailedToSanitizeUrlError, g as getMatIconNameNotFoundError, a as getMatIconNoHttpProviderError } from '../icon-registry.d-b191b30b.js';
+export { b as MAT_ICON_DEFAULT_OPTIONS, c as MAT_ICON_LOCATION, e as MAT_ICON_LOCATION_FACTORY, f as MatIcon, a as MatIconDefaultOptions, d as MatIconLocation, M as MatIconModule } from '../icon-module.d-a4b3b1e1.js';
+export { f as ICON_REGISTRY_PROVIDER, e as ICON_REGISTRY_PROVIDER_FACTORY, I as IconOptions, d as IconResolver, M as MatIconRegistry, S as SafeResourceUrlWithIconOptions, c as getMatIconFailedToSanitizeLiteralError, b as getMatIconFailedToSanitizeUrlError, g as getMatIconNameNotFoundError, a as getMatIconNoHttpProviderError } from '../icon-registry.d-6dd1799a.js';
 import '@angular/core';
-import '../common-module.d-1b789e68.js';
+import '../common-module.d-421e3498.js';
 import '@angular/cdk/bidi';
-import '../palette.d-f5ca9a2b.js';
+import '../palette.d-1d8ebc0d.js';
 import '@angular/common/http';
 import '@angular/platform-browser';
 import 'rxjs';

package/icon/testing/index.d.ts

@@ -2,7 +2,7 @@ import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular
 import * as i0 from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { Observable } from 'rxjs';
-import { M as MatIconRegistry } from '../../icon-registry.d-b191b30b.js';
+import { M as MatIconRegistry } from '../../icon-registry.d-6dd1799a.js';
 import '@angular/common/http';
 import '@angular/platform-browser';
 
@@ -77,4 +77,5 @@ declare class MatIconTestingModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatIconTestingModule>;
 }
 
-export { FakeMatIconRegistry, type IconHarnessFilters, IconType, MatIconHarness, MatIconTestingModule };
+export { FakeMatIconRegistry, IconType, MatIconHarness, MatIconTestingModule };
+export type { IconHarnessFilters };

package/{icon-module.d-d06a5620.d.ts → icon-module.d-a4b3b1e1.d.ts}

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, OnInit, AfterViewChecked, OnDestroy, ElementRef } from '@angular/core';
-import { M as MatCommonModule } from './common-module.d-1b789e68.js';
-import { T as ThemePalette } from './palette.d-f5ca9a2b.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
+import { T as ThemePalette } from './palette.d-1d8ebc0d.js';
 
 /** Default options for `mat-icon`.  */
 interface MatIconDefaultOptions {
@@ -164,4 +164,5 @@ declare class MatIconModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<MatIconModule>;
 }
 
-export { MatIconModule as M, type MatIconDefaultOptions as a, MAT_ICON_DEFAULT_OPTIONS as b, MAT_ICON_LOCATION as c, type MatIconLocation as d, MAT_ICON_LOCATION_FACTORY as e, MatIcon as f };
+export { MatIconModule as M, MAT_ICON_DEFAULT_OPTIONS as b, MAT_ICON_LOCATION as c, MAT_ICON_LOCATION_FACTORY as e, MatIcon as f };
+export type { MatIconDefaultOptions as a, MatIconLocation as d };

package/{icon-registry.d-b191b30b.d.ts → icon-registry.d-6dd1799a.d.ts}

@@ -283,4 +283,5 @@ declare const ICON_REGISTRY_PROVIDER: {
     useFactory: typeof ICON_REGISTRY_PROVIDER_FACTORY;
 };
 
-export { type IconOptions as I, MatIconRegistry as M, type SafeResourceUrlWithIconOptions as S, getMatIconNoHttpProviderError as a, getMatIconFailedToSanitizeUrlError as b, getMatIconFailedToSanitizeLiteralError as c, type IconResolver as d, ICON_REGISTRY_PROVIDER_FACTORY as e, ICON_REGISTRY_PROVIDER as f, getMatIconNameNotFoundError as g };
+export { MatIconRegistry as M, getMatIconNoHttpProviderError as a, getMatIconFailedToSanitizeUrlError as b, getMatIconFailedToSanitizeLiteralError as c, ICON_REGISTRY_PROVIDER_FACTORY as e, ICON_REGISTRY_PROVIDER as f, getMatIconNameNotFoundError as g };
+export type { IconOptions as I, SafeResourceUrlWithIconOptions as S, IconResolver as d };

package/{index.d-609609fc.d.ts → index.d-511f9e6c.d.ts}

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
-import { M as MatCommonModule } from './common-module.d-1b789e68.js';
-import { M as MatRipple } from './ripple.d-838c5cd6.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
+import { M as MatRipple } from './ripple.d-305c30f3.js';
 
 declare class MatRippleModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatRippleModule, never>;

package/{index.d-6e895711.d.ts → index.d-73f24bb1.d.ts}

@@ -1,8 +1,8 @@
 import * as i0 from '@angular/core';
-import { M as MatRippleModule } from './index.d-609609fc.js';
-import { M as MatCommonModule } from './common-module.d-1b789e68.js';
-import { M as MatPseudoCheckboxModule } from './pseudo-checkbox-module.d-efa6959b.js';
-import { M as MatOption, a as MatOptgroup } from './option.d-be9de0a8.js';
+import { M as MatRippleModule } from './index.d-511f9e6c.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
+import { M as MatPseudoCheckboxModule } from './pseudo-checkbox-module.d-42351ab6.js';
+import { M as MatOption, a as MatOptgroup } from './option.d-4fb11594.js';
 
 declare class MatOptionModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatOptionModule, never>;

package/input/index.d.ts

@@ -4,15 +4,15 @@ import * as i0 from '@angular/core';
 import { InjectionToken, OnChanges, OnDestroy, AfterViewInit, DoCheck, ElementRef, WritableSignal } from '@angular/core';
 import { NgControl } from '@angular/forms';
 import { Subject } from 'rxjs';
-import { E as ErrorStateMatcher } from '../error-options.d-bd1801bf.js';
-import { k as MatFormField } from '../form-field.d-e2081e20.js';
-export { a as MatError, k as MatFormField, b as MatHint, d as MatPrefix, f as MatSuffix } from '../form-field.d-e2081e20.js';
-import { M as MatFormFieldControl } from '../form-field-control.d-d7b3a431.js';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
-import { a as MatFormFieldModule } from '../module.d-a335a842.js';
-export { M as MatLabel } from '../module.d-a335a842.js';
+import { E as ErrorStateMatcher } from '../error-options.d-059d9639.js';
+import { k as MatFormField } from '../form-field.d-486f4e86.js';
+export { a as MatError, k as MatFormField, b as MatHint, d as MatPrefix, f as MatSuffix } from '../form-field.d-486f4e86.js';
+import { M as MatFormFieldControl } from '../form-field-control.d-9ed49092.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { a as MatFormFieldModule } from '../module.d-683b2a19.js';
+export { M as MatLabel } from '../module.d-683b2a19.js';
 import * as i4 from '@angular/cdk/text-field';
-import '../palette.d-f5ca9a2b.js';
+import '../palette.d-1d8ebc0d.js';
 import '@angular/cdk/bidi';
 import '@angular/cdk/observers';
 
@@ -213,4 +213,5 @@ declare const MAT_INPUT_VALUE_ACCESSOR: InjectionToken<{
 /** @docs-private */
 declare function getMatInputUnsupportedTypeError(type: string): Error;
 
-export { MAT_INPUT_CONFIG, MAT_INPUT_VALUE_ACCESSOR, MatInput, type MatInputConfig, MatInputModule, getMatInputUnsupportedTypeError };
+export { MAT_INPUT_CONFIG, MAT_INPUT_VALUE_ACCESSOR, MatInput, MatInputModule, getMatInputUnsupportedTypeError };
+export type { MatInputConfig };

package/input/testing/index.d.ts

@@ -1,6 +1,6 @@
-export { I as InputHarnessFilters, M as MatInputHarness } from '../../input-harness.d-5a0b8058.js';
+export { I as InputHarnessFilters, M as MatInputHarness } from '../../input-harness.d-be80831e.js';
 import { BaseHarnessFilters, ComponentHarness, HarnessPredicate } from '@angular/cdk/testing';
-import { M as MatFormFieldControlHarness } from '../../form-field-control-harness.d-8ec51e17.js';
+import { M as MatFormFieldControlHarness } from '../../form-field-control-harness.d-e3cf007b.js';
 
 /** A set of criteria that can be used to filter a list of `MatNativeSelectHarness` instances. */
 interface NativeSelectHarnessFilters extends BaseHarnessFilters {
@@ -68,4 +68,5 @@ declare class MatNativeSelectHarness extends MatFormFieldControlHarness {
     selectOptions(filter?: NativeOptionHarnessFilters): Promise<void>;
 }
 
-export { MatNativeOptionHarness, MatNativeSelectHarness, type NativeOptionHarnessFilters, type NativeSelectHarnessFilters };
+export { MatNativeOptionHarness, MatNativeSelectHarness };
+export type { NativeOptionHarnessFilters, NativeSelectHarnessFilters };

package/{input-harness.d-5a0b8058.d.ts → input-harness.d-be80831e.d.ts}

@@ -1,5 +1,5 @@
 import { BaseHarnessFilters, HarnessPredicate } from '@angular/cdk/testing';
-import { M as MatFormFieldControlHarness } from './form-field-control-harness.d-8ec51e17.js';
+import { M as MatFormFieldControlHarness } from './form-field-control-harness.d-e3cf007b.js';
 
 /** A set of criteria that can be used to filter a list of `MatInputHarness` instances. */
 interface InputHarnessFilters extends BaseHarnessFilters {
@@ -57,4 +57,5 @@ declare class MatInputHarness extends MatFormFieldControlHarness {
     setValue(newValue: string): Promise<void>;
 }
 
-export { type InputHarnessFilters as I, MatInputHarness as M };
+export { MatInputHarness as M };
+export type { InputHarnessFilters as I };

package/{line.d-ed625688.d.ts → line.d-712398cb.d.ts}

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { QueryList, ElementRef } from '@angular/core';
-import { M as MatCommonModule } from './common-module.d-1b789e68.js';
+import { M as MatCommonModule } from './common-module.d-421e3498.js';
 
 /**
  * Shared directive to count lines inside a text area, such as a list item.

package/list/_list-theme.scss

@@ -1,14 +1,14 @@
 @use 'sass:map';
 
+@use '../checkbox/m2-checkbox';
 @use '../core/style/sass-utils';
-@use '../core/theming/theming';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 @use '../core/theming/validation';
-@use '../core/tokens/m2/mat/list' as tokens-mat-list;
-@use '../core/tokens/m2/mat/checkbox' as tokens-mat-checkbox;
-@use '../core/tokens/m2/mat/radio' as tokens-mat-radio;
 @use '../core/tokens/token-utils';
 @use '../core/typography/typography';
+@use '../radio/m2-radio';
+@use './m2-list';
 
 @mixin base($theme) {
   // Add default values for tokens not related to color, typography, or density.
@@ -17,9 +17,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-unthemable-tokens()
-      );
+        m2-list.$prefix, m2-list.get-unthemable-tokens());
     }
   }
 }
@@ -30,25 +28,21 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-color-tokens($theme)
-      );
+        m2-list.$prefix, m2-list.get-color-tokens($theme));
     }
 
     .mdc-list-item__start,
     .mdc-list-item__end {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-radio.$prefix,
-        tokens-mat-radio.get-color-tokens($theme, primary)
-      );
+        m2-radio.$prefix, m2-radio.get-color-tokens($theme, primary));
     }
 
     .mat-accent {
       .mdc-list-item__start,
       .mdc-list-item__end {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-radio.$prefix,
-          tokens-mat-radio.get-color-tokens($theme, accent)
+          m2-radio.$prefix,
+          m2-radio.get-color-tokens($theme, accent)
         );
       }
     }
@@ -57,28 +51,28 @@
       .mdc-list-item__start,
       .mdc-list-item__end {
         @include token-utils.create-token-values-mixed(
-          tokens-mat-radio.$prefix,
-          tokens-mat-radio.get-color-tokens($theme, warn)
+          m2-radio.$prefix,
+          m2-radio.get-color-tokens($theme, warn)
         );
       }
     }
 
     .mat-mdc-list-option {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-color-tokens($theme, primary)
+        m2-checkbox.$prefix,
+        m2-checkbox.get-color-tokens($theme, primary)
       );
     }
     .mat-mdc-list-option.mat-accent {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-color-tokens($theme, accent)
+        m2-checkbox.$prefix,
+        m2-checkbox.get-color-tokens($theme, accent)
       );
     }
     .mat-mdc-list-option.mat-warn {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-checkbox.$prefix,
-        tokens-mat-checkbox.get-color-tokens($theme, warn)
+        m2-checkbox.$prefix,
+        m2-checkbox.get-color-tokens($theme, warn)
       );
     }
 
@@ -116,17 +110,13 @@
     @include sass-utils.current-selector-or-root() {
       // TODO: See if this can be removed
       @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-density-tokens($theme)
-      );
+        m2-list.$prefix, m2-list.get-density-tokens($theme));
     }
 
     .mdc-list-item__start,
     .mdc-list-item__end {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-radio.$prefix,
-        tokens-mat-radio.get-density-tokens($theme)
-      );
+          m2-radio.$prefix, m2-radio.get-density-tokens($theme));
     }
 
     // TODO(mmalerba): This is added to maintain the same style MDC used prior to the token-based
@@ -174,9 +164,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-list.$prefix,
-        tokens-mat-list.get-typography-tokens($theme)
-      );
+        m2-list.$prefix, m2-list.get-typography-tokens($theme));
     }
 
     // MDC does not have tokens for the subheader.
@@ -192,8 +180,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-list.$prefix,
-      tokens: tokens-mat-list.get-token-slots(),
+      namespace: m2-list.$prefix,
+      tokens: m2-list.get-token-slots(),
     ),
   );
 }
@@ -225,6 +213,6 @@
   @include validation.selector-defined(
     'Calls to Angular Material theme mixins with an M3 theme must be wrapped in a selector'
   );
-  $mat-list-tokens: token-utils.get-tokens-for($tokens, tokens-mat-list.$prefix);
-  @include token-utils.create-token-values(tokens-mat-list.$prefix, $mat-list-tokens);
+  $mat-list-tokens: token-utils.get-tokens-for($tokens, m2-list.$prefix);
+  @include token-utils.create-token-values(m2-list.$prefix, $mat-list-tokens);
 }

package/{core/tokens/m2/mat/_list.scss → list/_m2-list.scss}

@@ -1,6 +1,6 @@
-@use '../../token-definition';
-@use '../../../style/sass-utils';
-@use '../../../theming/inspection';
+@use '../core/tokens/m2-utils';
+@use '../core/style/sass-utils';
+@use '../core/theming/inspection';
 @use 'sass:map';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -126,8 +126,8 @@ $prefix: (mat, list);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      get-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_list.scss → list/_m3-list.scss}

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../../token-definition';
+@use '../core/tokens/m3-utils';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, list);
@@ -74,5 +74,5 @@ $prefix: (mat, list);
     list-item-two-line-container-height: if($exclude-hardcoded, null, 72px),
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/list/index.d.ts

@@ -1,18 +1,18 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, ElementRef, AfterViewInit, OnDestroy, NgZone, QueryList, OnInit, EventEmitter, OnChanges, SimpleChanges } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
-import { a as RippleTarget, f as RippleConfig, b as RippleGlobalOptions } from '../ripple.d-838c5cd6.js';
-import { L as ListOption, M as MatListOptionTogglePosition } from '../list-option-types.d-32a3be09.js';
-export { M as MatListOptionCheckboxPosition, M as MatListOptionTogglePosition } from '../list-option-types.d-32a3be09.js';
-import * as i12 from '@angular/material/divider';
-export { MatDivider } from '@angular/material/divider';
+import { a as RippleTarget, f as RippleConfig, b as RippleGlobalOptions } from '../ripple.d-305c30f3.js';
+import { L as ListOption, M as MatListOptionTogglePosition } from '../list-option-types.d-076a5300.js';
+export { M as MatListOptionCheckboxPosition, M as MatListOptionTogglePosition } from '../list-option-types.d-076a5300.js';
+import { a as MatDividerModule } from '../divider-module.d-4305a1f1.js';
+export { M as MatDivider } from '../divider-module.d-4305a1f1.js';
 import * as i2 from '@angular/cdk/observers';
-import { M as MatCommonModule } from '../common-module.d-1b789e68.js';
-import { M as MatRippleModule } from '../index.d-609609fc.js';
-import { M as MatPseudoCheckboxModule } from '../pseudo-checkbox-module.d-efa6959b.js';
+import { M as MatCommonModule } from '../common-module.d-421e3498.js';
+import { M as MatRippleModule } from '../index.d-511f9e6c.js';
+import { M as MatPseudoCheckboxModule } from '../pseudo-checkbox-module.d-42351ab6.js';
 import { SelectionModel } from '@angular/cdk/collections';
 import { ControlValueAccessor } from '@angular/forms';
-import { T as ThemePalette } from '../palette.d-f5ca9a2b.js';
+import { T as ThemePalette } from '../palette.d-1d8ebc0d.js';
 import '@angular/cdk/platform';
 import '@angular/cdk/bidi';
 
@@ -510,8 +510,9 @@ declare class MatListSubheaderCssMatStyler {
 
 declare class MatListModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatListModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatListModule, never, [typeof i2.ObserversModule, typeof MatCommonModule, typeof MatRippleModule, typeof MatPseudoCheckboxModule, typeof MatList, typeof MatActionList, typeof MatNavList, typeof MatSelectionList, typeof MatListItem, typeof MatListOption, typeof MatListSubheaderCssMatStyler, typeof MatListItemAvatar, typeof MatListItemIcon, typeof MatListItemLine, typeof MatListItemTitle, typeof MatListItemMeta], [typeof MatList, typeof MatActionList, typeof MatNavList, typeof MatSelectionList, typeof MatListItem, typeof MatListOption, typeof MatListItemAvatar, typeof MatListItemIcon, typeof MatListSubheaderCssMatStyler, typeof i12.MatDividerModule, typeof MatListItemLine, typeof MatListItemTitle, typeof MatListItemMeta]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatListModule, never, [typeof i2.ObserversModule, typeof MatCommonModule, typeof MatRippleModule, typeof MatPseudoCheckboxModule, typeof MatList, typeof MatActionList, typeof MatNavList, typeof MatSelectionList, typeof MatListItem, typeof MatListOption, typeof MatListSubheaderCssMatStyler, typeof MatListItemAvatar, typeof MatListItemIcon, typeof MatListItemLine, typeof MatListItemTitle, typeof MatListItemMeta], [typeof MatList, typeof MatActionList, typeof MatNavList, typeof MatSelectionList, typeof MatListItem, typeof MatListOption, typeof MatListItemAvatar, typeof MatListItemIcon, typeof MatListSubheaderCssMatStyler, typeof MatDividerModule, typeof MatListItemLine, typeof MatListItemTitle, typeof MatListItemMeta]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<MatListModule>;
 }
 
-export { MAT_LIST, MAT_LIST_CONFIG, MAT_NAV_LIST, MAT_SELECTION_LIST_VALUE_ACCESSOR, MatActionList, MatList, type MatListConfig, MatListItem, MatListItemAvatar, MatListItemIcon, MatListItemLine, MatListItemMeta, MatListItemTitle, MatListModule, MatListOption, MatListSubheaderCssMatStyler, MatNavList, MatSelectionList, MatSelectionListChange, SELECTION_LIST, type SelectionList, _MatListItemGraphicBase };
+export { MAT_LIST, MAT_LIST_CONFIG, MAT_NAV_LIST, MAT_SELECTION_LIST_VALUE_ACCESSOR, MatActionList, MatList, MatListItem, MatListItemAvatar, MatListItemIcon, MatListItemLine, MatListItemMeta, MatListItemTitle, MatListModule, MatListOption, MatListSubheaderCssMatStyler, MatNavList, MatSelectionList, MatSelectionListChange, SELECTION_LIST, _MatListItemGraphicBase };
+export type { MatListConfig, SelectionList };

package/list/testing/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseHarnessFilters, ComponentHarness, HarnessPredicate, ContentContainerComponentHarness, ComponentHarnessConstructor } from '@angular/cdk/testing';
-import { D as DividerHarnessFilters, M as MatDividerHarness } from '../../divider-harness.d-beb7f187.js';
-import { M as MatListOptionTogglePosition } from '../../list-option-types.d-32a3be09.js';
+import { D as DividerHarnessFilters, M as MatDividerHarness } from '../../divider-harness.d-ee96b7aa.js';
+import { M as MatListOptionTogglePosition } from '../../list-option-types.d-076a5300.js';
 
 interface ListHarnessFilters extends BaseHarnessFilters {
 }
@@ -350,4 +350,5 @@ declare class MatListOptionHarness extends MatListItemHarnessBase {
     deselect(): Promise<void>;
 }
 
-export { type ActionListHarnessFilters, type ActionListItemHarnessFilters, type BaseListItemHarnessFilters, type ListHarnessFilters, type ListItemHarnessFilters, type ListOptionHarnessFilters, MatActionListHarness, MatActionListItemHarness, MatListHarness, MatListItemHarness, MatListItemSection, MatListItemType, MatListOptionHarness, MatNavListHarness, MatNavListItemHarness, MatSelectionListHarness, MatSubheaderHarness, type NavListHarnessFilters, type NavListItemHarnessFilters, type SelectionListHarnessFilters, type SubheaderHarnessFilters };
+export { MatActionListHarness, MatActionListItemHarness, MatListHarness, MatListItemHarness, MatListItemSection, MatListItemType, MatListOptionHarness, MatNavListHarness, MatNavListItemHarness, MatSelectionListHarness, MatSubheaderHarness };
+export type { ActionListHarnessFilters, ActionListItemHarnessFilters, BaseListItemHarnessFilters, ListHarnessFilters, ListItemHarnessFilters, ListOptionHarnessFilters, NavListHarnessFilters, NavListItemHarnessFilters, SelectionListHarnessFilters, SubheaderHarnessFilters };

package/{core/tokens/m2/mat/_menu.scss → menu/_m2-menu.scss}

@@ -1,7 +1,7 @@
-@use '../../token-definition';
-@use '../../../theming/inspection';
-@use '../../../style/sass-utils';
-@use '../../../style/elevation';
+@use '../core/tokens/m2-utils';
+@use '../core/theming/inspection';
+@use '../core/style/sass-utils';
+@use '../core/style/elevation';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, menu);
@@ -64,8 +64,8 @@ $prefix: (mat, menu);
 @function get-token-slots() {
   @return sass-utils.deep-merge-all(
       get-unthemable-tokens(),
-      get-color-tokens(token-definition.$placeholder-color-config),
-      get-typography-tokens(token-definition.$placeholder-typography-config),
-      get-density-tokens(token-definition.$placeholder-density-config)
+      get-color-tokens(m2-utils.$placeholder-color-config),
+      get-typography-tokens(m2-utils.$placeholder-typography-config),
+      get-density-tokens(m2-utils.$placeholder-density-config)
   );
 }

package/{core/tokens/m3/mat/_menu.scss → menu/_m3-menu.scss}

@@ -1,7 +1,7 @@
 @use 'sass:map';
-@use '../../../style/sass-utils';
-@use '../../token-definition';
-@use '../../../style/elevation';
+@use '../core/style/sass-utils';
+@use '../core/tokens/m3-utils';
+@use '../core/style/elevation';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
 $prefix: (mat, menu);
@@ -13,15 +13,15 @@ $prefix: (mat, menu);
 /// @return {Map} A set of custom tokens for the mat-menu
 @function get-tokens($systems, $exclude-hardcoded, $token-slots) {
   $tokens: sass-utils.merge-all(
-    token-definition.generate-typography-tokens($systems, item-label-text, label-large),
+    m3-utils.generate-typography-tokens($systems, item-label-text, label-large),
     (
       container-shape: map.get($systems, md-sys-shape, corner-extra-small),
       divider-color: map.get($systems, md-sys-color, surface-variant),
-      divider-bottom-spacing: token-definition.hardcode(8px, $exclude-hardcoded),
-      divider-top-spacing: token-definition.hardcode(8px, $exclude-hardcoded),
+      divider-bottom-spacing: m3-utils.hardcode(8px, $exclude-hardcoded),
+      divider-top-spacing: m3-utils.hardcode(8px, $exclude-hardcoded),
       item-label-text-color: map.get($systems, md-sys-color, on-surface),
       item-icon-color: map.get($systems, md-sys-color, on-surface-variant),
-      item-icon-size: token-definition.hardcode(24px, $exclude-hardcoded),
+      item-icon-size: m3-utils.hardcode(24px, $exclude-hardcoded),
       item-hover-state-layer-color: sass-utils.safe-color-change(
         map.get($systems, md-sys-color, on-surface),
         $alpha: map.get($systems, md-sys-state, hover-state-layer-opacity)
@@ -30,16 +30,16 @@ $prefix: (mat, menu);
         map.get($systems, md-sys-color, on-surface),
         $alpha: map.get($systems, md-sys-state, focus-state-layer-opacity)
       ),
-      item-spacing: token-definition.hardcode(12px, $exclude-hardcoded),
-      item-leading-spacing: token-definition.hardcode(12px, $exclude-hardcoded),
-      item-trailing-spacing: token-definition.hardcode(12px, $exclude-hardcoded),
-      item-with-icon-leading-spacing: token-definition.hardcode(12px, $exclude-hardcoded),
-      item-with-icon-trailing-spacing: token-definition.hardcode(12px, $exclude-hardcoded),
+      item-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
+      item-leading-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
+      item-trailing-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
+      item-with-icon-leading-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
+      item-with-icon-trailing-spacing: m3-utils.hardcode(12px, $exclude-hardcoded),
       container-color: map.get($systems, md-sys-color, surface-container),
-      container-elevation-shadow: token-definition.hardcode(
+      container-elevation-shadow: m3-utils.hardcode(
         elevation.get-box-shadow(2), $exclude-hardcoded),
     )
   );
 
-  @return token-definition.namespace-tokens($prefix, $tokens, $token-slots);
+  @return m3-utils.namespace($prefix, $tokens, $token-slots);
 }

package/menu/_menu-theme.scss

@@ -1,5 +1,5 @@
 @use 'sass:map';
-@use '../core/tokens/m2/mat/menu' as tokens-mat-menu;
+@use './m2-menu';
 @use '../core/style/sass-utils';
 @use '../core/tokens/token-utils';
 @use '../core/theming/theming';
@@ -13,9 +13,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-menu.$prefix,
-        tokens-mat-menu.get-unthemable-tokens()
-      );
+        m2-menu.$prefix, m2-menu.get-unthemable-tokens());
     }
   }
 }
@@ -26,9 +24,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-menu.$prefix,
-        tokens-mat-menu.get-color-tokens($theme)
-      );
+        m2-menu.$prefix, m2-menu.get-color-tokens($theme));
     }
   }
 }
@@ -39,9 +35,7 @@
   } @else {
     @include sass-utils.current-selector-or-root() {
       @include token-utils.create-token-values-mixed(
-        tokens-mat-menu.$prefix,
-        tokens-mat-menu.get-typography-tokens($theme)
-      );
+        m2-menu.$prefix, m2-menu.get-typography-tokens($theme));
     }
   }
 }
@@ -57,8 +51,8 @@
 @function _define-overrides() {
   @return (
     (
-      namespace: tokens-mat-menu.$prefix,
-      tokens: tokens-mat-menu.get-token-slots(),
+      namespace: m2-menu.$prefix,
+      tokens: m2-menu.get-token-slots(),
     ),
   );
 }
@@ -92,8 +86,8 @@
   );
   @if ($tokens != ()) {
     @include token-utils.create-token-values(
-      tokens-mat-menu.$prefix,
-      map.get($tokens, tokens-mat-menu.$prefix)
+      m2-menu.$prefix,
+      map.get($tokens, m2-menu.$prefix)
     );
   }
 }