Merge branch 'main' into select-scrollview

Author: yihuiliao

packages/@react-spectrum/color/src/ColorSlider.tsx

@@ -92,7 +92,8 @@ export const ColorSlider = React.forwardRef(function ColorSlider(props: Spectrum
         {
           'spectrum-ColorSlider-container--horizontal': !vertical,
           'spectrum-ColorSlider-container--vertical': vertical
-        }
+        },
+        styleProps.className
       )}>
       {label &&
         <div className={classNames(styles, 'spectrum-ColorSlider-labelContainer')}>

packages/dev/optimize-locales-plugin/LocalesPlugin.d.ts

@@ -4,5 +4,5 @@ type Options = {
   locales: readonly string[]
 };
 
-declare const plugin: UnpluginInstance<Options, boolean>;
+declare const plugin: UnpluginInstance<Options, false>;
 export = plugin;