[core] Normalize rest / other to match the most common used

mui · Jul 15, 2024 · 44c3c9a · 44c3c9a
1 parent 3bd6616
commit 44c3c9a
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 32 deletions.
diff --git a/apps/pigment-css-vite-app/src/Box.jsx b/apps/pigment-css-vite-app/src/Box.jsx
@@ -51,9 +51,9 @@ const atomics = generateAtomics(({ theme }) => ({
 }));
 
 // eslint-disable-next-line react/prop-types
-export function Box({ children, as = 'div', className = '', style = undefined, ...rest }) {
+export function Box({ children, as = 'div', className = '', style = undefined, ...other }) {
   const Component = as;
-  const atomicsResult = atomics(rest);
+  const atomicsResult = atomics(other);
   const componentClass = `${atomicsResult.className} ${className ?? ''}`.trim();
   const finalStyles = {
     ...(atomicsResult.style ?? {}),

diff --git a/packages/pigment-css-nextjs-plugin/src/index.ts b/packages/pigment-css-nextjs-plugin/src/index.ts
@@ -11,7 +11,7 @@ const extractionFile = path.join(
 );
 
 export function withPigment(nextConfig: NextConfig, pigmentConfig?: PigmentOptions) {
-  const { babelOptions = {}, asyncResolve, ...rest } = pigmentConfig ?? {};
+  const { babelOptions = {}, asyncResolve, ...other } = pigmentConfig ?? {};
   if (process.env.TURBOPACK === '1') {
     // eslint-disable-next-line no-console
     console.log(
@@ -46,7 +46,7 @@ export function withPigment(nextConfig: NextConfig, pigmentConfig?: PigmentOptio
     });
     config.plugins.push(
       webpackPlugin({
-        ...rest,
+        ...other,
         meta: {
           type: 'next',
           dev,

diff --git a/packages/pigment-css-react/src/Box.jsx b/packages/pigment-css-react/src/Box.jsx
@@ -20,7 +20,7 @@ const Box = React.forwardRef(
       sx,
       className,
       style,
-      ...rest
+      ...other
     },
     ref,
   ) => {
@@ -48,7 +48,7 @@ const Box = React.forwardRef(
     };
 
     // eslint-disable-next-line react/jsx-filename-extension
-    return <Component ref={ref} className={classes} style={styles} {...rest} />;
+    return <Component ref={ref} className={classes} style={styles} {...other} />;
   },
 );
 

diff --git a/packages/pigment-css-react/src/Grid.jsx b/packages/pigment-css-react/src/Grid.jsx
@@ -156,7 +156,7 @@ const Grid = React.forwardRef(function Grid(
     // eslint-disable-next-line react/prop-types
     unstable_parent_row_spacing,
     wrap = 'wrap',
-    ...rest
+    ...other
   },
   ref,
 ) {
@@ -205,7 +205,7 @@ const Grid = React.forwardRef(function Grid(
       ref={ref}
       className={clsx(gridClasses.className, className)}
       style={{ ...style, ...gridClasses.style }}
-      {...rest}
+      {...other}
       ownerState={ownerState}
     >
       {React.Children.map(children, (child) => {

diff --git a/packages/pigment-css-react/src/Hidden.jsx b/packages/pigment-css-react/src/Hidden.jsx
@@ -26,7 +26,7 @@ const Hidden = React.forwardRef(function Hidden(
   { className, component = 'div', style, ...props },
   ref,
 ) {
-  const rest = {};
+  const other = {};
   const breakpointProps = {};
   Object.keys(props).forEach((key) => {
     if (key.endsWith('Up') || key.endsWith('Down')) {
@@ -41,7 +41,7 @@ const Hidden = React.forwardRef(function Hidden(
         });
       }
     } else {
-      rest[key] = props[key];
+      other[key] = props[key];
     }
   });
   const stackClasses = hiddenAtomics({ display: breakpointProps });
@@ -51,7 +51,7 @@ const Hidden = React.forwardRef(function Hidden(
       ref={ref}
       className={clsx(stackClasses.className, className)}
       style={{ ...style, ...stackClasses.style }}
-      {...rest}
+      {...other}
     />
   );
 });

diff --git a/packages/pigment-css-react/src/Stack.jsx b/packages/pigment-css-react/src/Stack.jsx
@@ -63,7 +63,7 @@ const Stack = React.forwardRef(function Stack(
     divider,
     component = 'div',
     direction = 'column',
-    ...rest
+    ...other
   },
   ref,
 ) {
@@ -84,7 +84,7 @@ const Stack = React.forwardRef(function Stack(
         className,
       )}
       style={{ ...style, ...stackClasses.style }}
-      {...rest}
+      {...other}
     >
       {divider ? joinChildren(children, divider) : children}
     </Component>

diff --git a/packages/pigment-css-react/tests/Grid/fixtures/Grid.output.js b/packages/pigment-css-react/tests/Grid/fixtures/Grid.output.js
@@ -252,7 +252,7 @@ const Grid = React.forwardRef(function Grid(
     // eslint-disable-next-line react/prop-types
     unstable_parent_row_spacing,
     wrap = 'wrap',
-    ...rest
+    ...other
   },
   ref,
 ) {
@@ -301,7 +301,7 @@ const Grid = React.forwardRef(function Grid(
         ...style,
         ...gridClasses.style,
       }}
-      {...rest}
+      {...other}
       ownerState={ownerState}
     >
       {React.Children.map(children, (child) => {

diff --git a/packages/pigment-css-react/tests/Hidden/fixtures/Hidden.output.js b/packages/pigment-css-react/tests/Hidden/fixtures/Hidden.output.js
@@ -52,7 +52,7 @@ const Hidden = React.forwardRef(function Hidden(
   { className, component = 'div', style, ...props },
   ref,
 ) {
-  const rest = {};
+  const other = {};
   const breakpointProps = {};
   Object.keys(props).forEach((key) => {
     if (key.endsWith('Up') || key.endsWith('Down')) {
@@ -82,7 +82,7 @@ const Hidden = React.forwardRef(function Hidden(
         ...style,
         ...stackClasses.style,
       }}
-      {...rest}
+      {...other}
     />
   );
 });

diff --git a/packages/pigment-css-react/tests/styled/runtime-styled.test.js b/packages/pigment-css-react/tests/styled/runtime-styled.test.js
@@ -50,7 +50,7 @@ describe('props filtering', () => {
     const Link = styled('a')`
       color: green;
     `;
-    const rest = { m: [3], pt: [4] };
+    const other = { m: [3], pt: [4] };
 
     const { container } = render(
       <Link
@@ -64,7 +64,7 @@ describe('props filtering', () => {
         aria-label="some label"
         data-wow="value"
         href="link"
-        {...rest}
+        {...other}
       >
         hello world
       </Link>,

diff --git a/packages/pigment-css-unplugin/src/index.ts b/packages/pigment-css-unplugin/src/index.ts
@@ -130,7 +130,7 @@ export const plugin = createUnplugin<PigmentOptions, true>((options) => {
     overrideContext,
     tagResolver,
     css,
-    ...rest
+    ...other
   } = options;
   const finalTransformLibraries = transformLibraries
     .concat([process.env.RUNTIME_PACKAGE_NAME as string, '@mui/material-pigment-css'])
@@ -227,7 +227,7 @@ export const plugin = createUnplugin<PigmentOptions, true>((options) => {
           root: projectPath,
           preprocessor: preprocessor ?? withRtl,
           pluginOptions: {
-            ...rest,
+            ...other,
             themeArgs: {
               theme,
             },
@@ -241,7 +241,7 @@ export const plugin = createUnplugin<PigmentOptions, true>((options) => {
             features: {
               useWeakRefInEval: false,
               // If users know what they are doing, let them override to true
-              ...rest.features,
+              ...other.features,
             },
             overrideContext(context: Record<string, unknown>, filename: string) {
               if (!context.$RefreshSig$) {
@@ -264,13 +264,13 @@ export const plugin = createUnplugin<PigmentOptions, true>((options) => {
               return null;
             },
             babelOptions: {
-              ...rest.babelOptions,
+              ...other.babelOptions,
               plugins: [
                 require.resolve(
                   `${process.env.RUNTIME_PACKAGE_NAME}/exports/remove-prop-types-plugin`,
                 ),
                 'babel-plugin-define-var', // A fix for undefined variables in the eval phase of wyw-in-js, more details on https://github.com/siriwatknp/babel-plugin-define-var?tab=readme-ov-file#problem
-                ...(rest.babelOptions?.plugins ?? []),
+                ...(other.babelOptions?.plugins ?? []),
               ],
             },
           },

diff --git a/packages/pigment-css-vite-plugin/src/index.ts b/packages/pigment-css-vite-plugin/src/index.ts
@@ -55,7 +55,7 @@ export function pigment(options: PigmentOptions) {
     transformLibraries = [],
     transformSx = true,
     css,
-    ...rest
+    ...other
   } = options ?? {};
   const defaultLibs = [process.env.RUNTIME_PACKAGE_NAME as string, MATERIAL_WRAPPER_LIB];
   const allLibs = transformLibraries.concat(defaultLibs);
@@ -169,7 +169,7 @@ export function pigment(options: PigmentOptions) {
       ...babelOptions,
       plugins: ['@babel/plugin-syntax-typescript', ...(babelOptions.plugins ?? [])],
     },
-    ...rest,
+    ...other,
   });
 
   return [

diff --git a/packages/pigment-css-vite-plugin/src/vite-plugin.ts b/packages/pigment-css-vite-plugin/src/vite-plugin.ts
@@ -69,7 +69,7 @@ export default function wywVitePlugin({
   overrideContext,
   tagResolver,
   css: cssConfig,
-  ...rest
+  ...other
 }: VitePluginOptions = {}): Plugin {
   const filter = createFilter(include, exclude);
   const cssLookup = new Map<string, string>();
@@ -191,7 +191,7 @@ export default function wywVitePlugin({
       };
 
       const presets = new Set(
-        Array.isArray(rest.babelOptions?.presets) ? rest.babelOptions?.presets : [],
+        Array.isArray(other.babelOptions?.presets) ? other.babelOptions?.presets : [],
       );
       presets.add('@babel/preset-typescript');
 
@@ -203,20 +203,20 @@ export default function wywVitePlugin({
               root: process.cwd(),
               preprocessor,
               pluginOptions: {
-                ...rest,
+                ...other,
                 features: {
                   useWeakRefInEval: false,
                   // If users know what they are doing, let them override to true
-                  ...rest.features,
+                  ...other.features,
                 },
                 babelOptions: {
-                  ...rest.babelOptions,
+                  ...other.babelOptions,
                   plugins: [
                     require.resolve(
                       `${process.env.RUNTIME_PACKAGE_NAME}/exports/remove-prop-types-plugin`,
                     ),
                     'babel-plugin-define-var', // A fix for undefined variables in the eval phase of wyw-in-js, more details on https://github.com/siriwatknp/babel-plugin-define-var?tab=readme-ov-file#problem
-                    ...(rest.babelOptions?.plugins ?? []),
+                    ...(other.babelOptions?.plugins ?? []),
                   ],
                   presets: Array.from(presets),
                 },