chore(core): remove 1st-gen type references from 2nd-gen core

Author: cdransf

2nd-gen/packages/core/components/alert-banner/AlertBanner.types.ts

@@ -19,9 +19,3 @@ export const ALERT_BANNER_VALID_VARIANTS = [
 export type AlertBannerVariant =
   | (typeof ALERT_BANNER_VALID_VARIANTS)[number]
   | '';
-
-/**
- * @deprecated Use `AlertBannerVariant` instead.
- * Kept as `string` for backward compatibility with 1st-gen.
- */
-export type AlertBannerVariants = string;

2nd-gen/packages/core/components/badge/Badge.types.ts

@@ -10,10 +10,6 @@
  * governing permissions and limitations under the License.
  */
 
-/*
- * @todo The S1 types can be removed once we are no longer maintaining 1st-gen.
- */
-
 import type { ElementSize } from '@spectrum-web-components/core/mixins/index.js';
 
 // ──────────────────
@@ -65,32 +61,6 @@ export const FIXED_VALUES = [
   'inline-end',
 ] as const;
 
-// ──────────────────────────────────────────
-//     S1-ONLY (remove with 1st-gen)
-// ──────────────────────────────────────────
-
-export const BADGE_VARIANTS_COLOR_S1 = [
-  'fuchsia',
-  'indigo',
-  'magenta',
-  'purple',
-  'seafoam',
-  'yellow',
-  'gray',
-  'red',
-  'orange',
-  'chartreuse',
-  'celery',
-  'green',
-  'cyan',
-  'blue',
-] as const satisfies readonly BadgeColorVariant[];
-
-export const BADGE_VARIANTS_S1 = [
-  ...BADGE_VARIANTS_SEMANTIC,
-  ...BADGE_VARIANTS_COLOR_S1,
-] as const;
-
 // ──────────────────
 //     CANONICAL
 // ──────────────────
@@ -109,10 +79,6 @@ export type FixedValues = (typeof FIXED_VALUES)[number];
 export type BadgeSize = (typeof BADGE_VALID_SIZES)[number];
 export type BadgeSemanticVariant = (typeof BADGE_VARIANTS_SEMANTIC)[number];
 
-// S1-only (remove with 1st-gen)
-export type BadgeColorVariantS1 = (typeof BADGE_VARIANTS_COLOR_S1)[number]; // remove with 1st-gen
-export type BadgeVariantS1 = (typeof BADGE_VARIANTS_S1)[number]; // remove with 1st-gen
-
 // Canonical
 export type BadgeColorVariant = (typeof BADGE_VARIANTS_COLOR)[number];
 export type BadgeVariant = (typeof BADGE_VARIANTS)[number];

2nd-gen/packages/core/components/progress-circle/ProgressCircle.types.ts

@@ -17,16 +17,8 @@ export const PROGRESS_CIRCLE_VALID_SIZES = [
   'm',
   'l',
 ] as const satisfies ElementSize[];
-export const PROGRESS_CIRCLE_STATIC_COLORS_S1 = ['white'] as const;
-export const PROGRESS_CIRCLE_STATIC_COLORS_S2 = [
-  ...PROGRESS_CIRCLE_STATIC_COLORS_S1,
-  'black',
-] as const;
+export const PROGRESS_CIRCLE_STATIC_COLORS_S2 = ['white', 'black'] as const;
 
-export type ProgressCircleStaticColorS1 =
-  (typeof PROGRESS_CIRCLE_STATIC_COLORS_S1)[number];
 export type ProgressCircleStaticColorS2 =
   (typeof PROGRESS_CIRCLE_STATIC_COLORS_S2)[number];
-export type ProgressCircleStaticColor =
-  | ProgressCircleStaticColorS1
-  | ProgressCircleStaticColorS2;
+export type ProgressCircleStaticColor = ProgressCircleStaticColorS2;

2nd-gen/packages/core/components/status-light/StatusLight.base.ts

@@ -105,17 +105,6 @@ export abstract class StatusLightBase extends SizedMixin(SpectrumElement, {
           }
         );
       }
-      // Check disabled property if it exists (S1 only)
-      if (this.hasAttribute('disabled') && !('disabled' in this)) {
-        window.__swc.warn(
-          this,
-          `<${this.localName}> element does not support the disabled state.`,
-          'https://opensource.adobe.com/spectrum-web-components/components/status-light/#states',
-          {
-            issues: ['disabled is not a supported property in Spectrum 2'],
-          }
-        );
-      }
     }
   }
 }

2nd-gen/packages/core/components/status-light/StatusLight.types.ts

@@ -11,11 +11,8 @@
  */
 
 /**
- * @todo The S1 types can be removed once we are no longer maintaining 1st-gen.
  * @todo Rename STATUSLIGHT_ prefix to STATUS_LIGHT_ to align with type prefix
- * naming convention (use underscore separators for multi-word names). This
- * requires updating all imports in 1st-gen and 2nd-gen that reference these
- * constants.
+ * naming convention (use underscore separators for multi-word names).
  */
 import type { ElementSize } from '@spectrum-web-components/core/mixins/index.js';
 
@@ -34,16 +31,11 @@ export const STATUSLIGHT_VARIANTS_SEMANTIC = [
   'notice',
 ] as const;
 
-export const STATUSLIGHT_VARIANTS_SEMANTIC_S1 = [
-  ...STATUSLIGHT_VARIANTS_SEMANTIC,
-  'accent',
-] as const;
-
 export const STATUSLIGHT_VARIANTS_SEMANTIC_S2 = [
   ...STATUSLIGHT_VARIANTS_SEMANTIC,
 ] as const;
 
-export const STATUSLIGHT_VARIANTS_COLOR_S1 = [
+export const STATUSLIGHT_VARIANTS_COLOR_S2 = [
   'fuchsia',
   'indigo',
   'magenta',
@@ -53,43 +45,25 @@ export const STATUSLIGHT_VARIANTS_COLOR_S1 = [
   'chartreuse',
   'celery',
   'cyan',
-] as const;
-
-export const STATUSLIGHT_VARIANTS_COLOR_S2 = [
-  ...STATUSLIGHT_VARIANTS_COLOR_S1,
   'pink',
   'turquoise',
   'brown',
   'cinnamon',
   'silver',
 ] as const;
 
-export const STATUSLIGHT_VARIANTS_S1 = [
-  ...STATUSLIGHT_VARIANTS_SEMANTIC_S1,
-  ...STATUSLIGHT_VARIANTS_COLOR_S1,
-] as const;
-
 export const STATUSLIGHT_VARIANTS_S2 = [
   ...STATUSLIGHT_VARIANTS_SEMANTIC_S2,
   ...STATUSLIGHT_VARIANTS_COLOR_S2,
 ] as const;
 
-export type StatusLightSemanticVariantS1 =
-  (typeof STATUSLIGHT_VARIANTS_SEMANTIC_S1)[number];
 export type StatusLightSemanticVariantS2 =
   (typeof STATUSLIGHT_VARIANTS_SEMANTIC_S2)[number];
-export type StatusLightSemanticVariant =
-  | StatusLightSemanticVariantS1
-  | StatusLightSemanticVariantS2;
+export type StatusLightSemanticVariant = StatusLightSemanticVariantS2;
 
-export type StatusLightColorVariantS1 =
-  (typeof STATUSLIGHT_VARIANTS_COLOR_S1)[number];
 export type StatusLightColorVariantS2 =
   (typeof STATUSLIGHT_VARIANTS_COLOR_S2)[number];
-export type StatusLightColorVariant =
-  | StatusLightColorVariantS1
-  | StatusLightColorVariantS2;
+export type StatusLightColorVariant = StatusLightColorVariantS2;
 
-export type StatusLightVariantS1 = (typeof STATUSLIGHT_VARIANTS_S1)[number];
 export type StatusLightVariantS2 = (typeof STATUSLIGHT_VARIANTS_S2)[number];
-export type StatusLightVariant = StatusLightVariantS1 | StatusLightVariantS2;
+export type StatusLightVariant = StatusLightVariantS2;

2nd-gen/packages/swc/components/badge/Badge.ts

@@ -74,8 +74,6 @@ export class Badge extends BadgeBase {
 
   /**
    * Whether the badge is subtle.
-   *
-   * @todo This can be moved to the base class once we are no longer maintaining 1st-gen.
    */
   @property({ type: Boolean, reflect: true })
   public subtle: boolean = false;
@@ -84,8 +82,6 @@ export class Badge extends BadgeBase {
    * Whether the badge is outlined.
    *
    * Can only be used with semantic variants.
-   *
-   * @todo This can be moved to the base class once we are no longer maintaining 1st-gen.
    */
   @property({ type: Boolean, reflect: true })
   public outline: boolean = false;