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,7 @@ 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 = ['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;
+  (typeof PROGRESS_CIRCLE_STATIC_COLORS)[number];

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,7 @@ 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 = [
   'fuchsia',
   'indigo',
   'magenta',
@@ -53,43 +41,22 @@ 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,
+export const STATUSLIGHT_VARIANTS = [
+  ...STATUSLIGHT_VARIANTS_SEMANTIC,
+  ...STATUSLIGHT_VARIANTS_COLOR,
 ] 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;
+  (typeof STATUSLIGHT_VARIANTS_SEMANTIC)[number];
 
-export type StatusLightColorVariantS1 =
-  (typeof STATUSLIGHT_VARIANTS_COLOR_S1)[number];
-export type StatusLightColorVariantS2 =
-  (typeof STATUSLIGHT_VARIANTS_COLOR_S2)[number];
 export type StatusLightColorVariant =
-  | StatusLightColorVariantS1
-  | StatusLightColorVariantS2;
+  (typeof STATUSLIGHT_VARIANTS_COLOR)[number];
 
-export type StatusLightVariantS1 = (typeof STATUSLIGHT_VARIANTS_S1)[number];
-export type StatusLightVariantS2 = (typeof STATUSLIGHT_VARIANTS_S2)[number];
-export type StatusLightVariant = StatusLightVariantS1 | StatusLightVariantS2;
+export type StatusLightVariant = (typeof STATUSLIGHT_VARIANTS)[number];

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;

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

@@ -15,9 +15,9 @@ import { property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 
 import {
-  PROGRESS_CIRCLE_STATIC_COLORS_S2,
+  PROGRESS_CIRCLE_STATIC_COLORS,
   ProgressCircleBase,
-  type ProgressCircleStaticColorS2,
+  type ProgressCircleStaticColor,
 } from '@spectrum-web-components/core/components/progress-circle';
 import { capitalize } from '@spectrum-web-components/core/utils/index.js';
 
@@ -51,7 +51,7 @@ export class ProgressCircle extends ProgressCircleBase {
   /**
    * @internal
    */
-  static override readonly STATIC_COLORS = PROGRESS_CIRCLE_STATIC_COLORS_S2;
+  static override readonly STATIC_COLORS = PROGRESS_CIRCLE_STATIC_COLORS;
 
   /**
    * Static color variant for use on different backgrounds.
@@ -61,7 +61,7 @@ export class ProgressCircle extends ProgressCircleBase {
    * When set to 'black', the component uses black styling for images with a light tinted background.
    */
   @property({ reflect: true, attribute: 'static-color' })
-  public override staticColor?: ProgressCircleStaticColorS2;
+  public override staticColor?: ProgressCircleStaticColor;
 
   // ──────────────────────────────
   //     RENDERING & STYLING

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

@@ -15,11 +15,11 @@ import { property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 
 import {
-  STATUSLIGHT_VARIANTS_COLOR_S2,
-  STATUSLIGHT_VARIANTS_S2,
-  STATUSLIGHT_VARIANTS_SEMANTIC_S2,
+  STATUSLIGHT_VARIANTS,
+  STATUSLIGHT_VARIANTS_COLOR,
+  STATUSLIGHT_VARIANTS_SEMANTIC,
   StatusLightBase,
-  type StatusLightVariantS2 as StatusLightVariant,
+  type StatusLightVariant,
 } from '@spectrum-web-components/core/components/status-light';
 
 import styles from './status-light.css';
@@ -45,17 +45,17 @@ export class StatusLight extends StatusLightBase {
   /**
    * @internal
    */
-  static override readonly VARIANTS_COLOR = STATUSLIGHT_VARIANTS_COLOR_S2;
+  static override readonly VARIANTS_COLOR = STATUSLIGHT_VARIANTS_COLOR;
 
   /**
    * @internal
    */
-  static override readonly VARIANTS_SEMANTIC = STATUSLIGHT_VARIANTS_SEMANTIC_S2;
+  static override readonly VARIANTS_SEMANTIC = STATUSLIGHT_VARIANTS_SEMANTIC;
 
   /**
    * @internal
    */
-  static override readonly VARIANTS = STATUSLIGHT_VARIANTS_S2;
+  static override readonly VARIANTS = STATUSLIGHT_VARIANTS;
 
   /**
    * Changes the color of the status dot. The variant list includes both semantic and non-semantic options.

2nd-gen/packages/swc/components/status-light/stories/status-light.stories.ts

@@ -16,10 +16,10 @@ import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
 
 import { StatusLight } from '@adobe/spectrum-wc/status-light';
 import {
-  STATUSLIGHT_VARIANTS_COLOR_S2,
-  STATUSLIGHT_VARIANTS_SEMANTIC_S2,
-  StatusLightColorVariantS2,
-  StatusLightSemanticVariantS2,
+  STATUSLIGHT_VARIANTS_COLOR,
+  STATUSLIGHT_VARIANTS_SEMANTIC,
+  StatusLightColorVariant,
+  StatusLightSemanticVariant,
 } from '@spectrum-web-components/core/components/status-light';
 
 import '@adobe/spectrum-wc/status-light';
@@ -90,7 +90,7 @@ const semanticLabels = {
   positive: 'Approved',
   notice: 'Pending approval',
   negative: 'Rejected',
-} as const satisfies Record<StatusLightSemanticVariantS2, string>;
+} as const satisfies Record<StatusLightSemanticVariant, string>;
 
 const nonSemanticLabels = {
   yellow: 'Operations',
@@ -107,7 +107,7 @@ const nonSemanticLabels = {
   brown: 'Facilities',
   cinnamon: 'Compliance',
   silver: 'Version 1.2.10',
-} as const satisfies Record<StatusLightColorVariantS2, string>;
+} as const satisfies Record<StatusLightColorVariant, string>;
 
 // ────────────────────
 //    AUTODOCS STORY
@@ -199,13 +199,12 @@ export const Sizes: Story = {
  */
 export const SemanticVariants: Story = {
   render: (args) => html`
-    ${STATUSLIGHT_VARIANTS_SEMANTIC_S2.map(
-      (variant: StatusLightSemanticVariantS2) =>
-        template({
-          ...args,
-          variant,
-          'default-slot': semanticLabels[variant],
-        })
+    ${STATUSLIGHT_VARIANTS_SEMANTIC.map((variant: StatusLightSemanticVariant) =>
+      template({
+        ...args,
+        variant,
+        'default-slot': semanticLabels[variant],
+      })
     )}
   `,
   parameters: {
@@ -233,7 +232,7 @@ export const SemanticVariants: Story = {
  */
 export const NonSemanticVariants: Story = {
   render: (args) => html`
-    ${STATUSLIGHT_VARIANTS_COLOR_S2.map((variant: StatusLightColorVariantS2) =>
+    ${STATUSLIGHT_VARIANTS_COLOR.map((variant: StatusLightColorVariant) =>
       template({
         ...args,
         variant,

2nd-gen/packages/swc/components/status-light/test/status-light.test.ts

@@ -139,28 +139,3 @@ export const UnsupportedVariantWarningTest: Story = {
     );
   },
 };
-
-export const DisabledAttributeWarningTest: Story = {
-  render: () => html`
-    <swc-status-light variant="positive">Positive</swc-status-light>
-  `,
-  play: async ({ canvasElement, step }) => {
-    await step('warns when disabled attribute is set', () =>
-      withWarningSpy(async (warnCalls) => {
-        const statusLight = await getComponent<StatusLight>(
-          canvasElement,
-          'swc-status-light'
-        );
-        statusLight.setAttribute('disabled', '');
-        statusLight.requestUpdate();
-        await statusLight.updateComplete;
-
-        expect(warnCalls.length).toBeGreaterThan(0);
-        expect(warnCalls[0][0]).toBe(statusLight);
-        expect(warnCalls[0][1]).toContain(
-          'does not support the disabled state'
-        );
-      })
-    );
-  },
-};