Small fixes (#1090)

* chore(utils,radio): remove unused merged ref and add truthy check for useReadyRef

* chore(tools): combine update-dependabot-config and productionize scripts

.changeset/khaki-carpets-develop.md

@@ -0,0 +1,6 @@
+---
+'@real-system/utils-library': patch
+'@real-system/radio-group': patch
+---
+
+remove unused useMergeRefs and add truthy check to useReadyRef

README.md

@@ -110,7 +110,7 @@ $ git add .
 $ git commit -m "<your_commit_message>"
 
 # or to be prompted by commitizen :)
-$ yarn commit
+$ git commit
 $ git push origin <branch_name>
 
 # then raise a PR

packages/components/radio-group/src/Radio.tsx

@@ -1,11 +1,10 @@
-import React, { useRef } from 'react';
+import React from 'react';
 import { forwardRef } from 'react';
 
 import { useInteractions } from '@real-system/a11y-library';
 import type { AriakitRadioProps } from '@real-system/ariakit-library';
 import { AriakitRadio } from '@real-system/ariakit-library';
 import { Text } from '@real-system/typography';
-import { useMergeRefs } from '@real-system/utils-library';
 import { VisuallyHidden } from '@real-system/visually-hidden';
 
 import { RadioControl, RadioLabel } from './components';
@@ -28,8 +27,6 @@ const Radio = forwardRef<HTMLInputElement, RadioProps>(function Radio(
 
   const { hoverProps, pressProps, focusWithinProps, ...restInteractions } =
     useInteractions({ disabled });
-  const internalRef = useRef<HTMLInputElement>(null);
-  const mergedRef = useMergeRefs(internalRef, ref);
 
   return (
     <Text.Label
@@ -40,7 +37,7 @@ const Radio = forwardRef<HTMLInputElement, RadioProps>(function Radio(
       {...focusWithinProps}>
       <VisuallyHidden>
         <AriakitRadio
-          ref={mergedRef}
+          ref={ref}
           value={value}
           disabled={disabled}
           name={store.name}

packages/libraries/utils-library/src/hooks/useReadyRef.ts

@@ -13,8 +13,10 @@ const useReadyRef = <T>(
 
   const setRef = useCallback(
     (node: T) => {
-      mergeRefs(node);
-      setReady(!!node);
+      if (node) {
+        mergeRefs(node);
+        setReady(!!node);
+      }
     },
     [mergeRefs, refs]
   );

tools/productionize-package.js

@@ -5,6 +5,7 @@ const {
   getWorkspacesInfo,
   logger,
   writeToFile,
+  updateDependabotConfig,
   PRODUCTION,
 } = require('./utils');
 
@@ -37,8 +38,10 @@ const getPackagesToProductionize = async () => {
   if (!packagesToProductionize) {
     return logger.info('All packages are productionized already.');
   }
+
   /** update each original package.json */
-  packagesToProductionize.forEach(({ name, location }) => {
+  for (const pkg of packagesToProductionize) {
+    const { name, location } = pkg;
     const pathToPkgJson = `${resolve(location)}/package.json`;
     const pkgJson = fs.readFileSync(pathToPkgJson, 'utf-8');
 
@@ -51,5 +54,6 @@ const getPackagesToProductionize = async () => {
       successMessage: `Productionized ${name}.`,
       errorMessage: `Failed to productionize ${name}.`,
     });
-  });
+  }
+  updateDependabotConfig();
 })();

tools/update-dependabot-config.js

@@ -1,42 +1,3 @@
-const fs = require('fs');
-const yaml = require('js-yaml');
-const { getWorkspacesInfo, logger, writeToFile } = require('./utils');
+const { updateDependabotConfig } = require('./utils');
 
-const DEPENDABOT_CONFIG_PATH = `${__dirname}/../.github/dependabot.yml`;
-const applyUpdate = (directory, restOptions = {}) => ({
-  'package-ecosystem': 'npm',
-  directory,
-  schedule: { interval: 'weekly' },
-  labels: ['area: infra', 'area: security', 'area: repo'],
-  ...restOptions,
-});
-
-const staticUpdates = [
-  applyUpdate('/', { 'package-ecosystem': 'github-actions' }),
-  applyUpdate('/', { 'package-ecosystem': 'npm' }),
-];
-
-const makeTemplate = (packages) => {
-  const updates = staticUpdates;
-
-  packages.forEach((pkg) => {
-    updates.push(applyUpdate(`/${pkg.location}`));
-  });
-
-  return updates;
-};
-
-(async function updateDependabotConfig() {
-  logger.info('Updating dependabot config');
-
-  const { pkgList } = await getWorkspacesInfo({ withCore: true });
-
-  let dependabot = yaml.load(fs.readFileSync(DEPENDABOT_CONFIG_PATH, 'utf-8'));
-  const updates = makeTemplate(pkgList);
-
-  dependabot.updates = updates;
-
-  await writeToFile(DEPENDABOT_CONFIG_PATH, yaml.dump(dependabot), {
-    successMessage: 'Updated dependabot config',
-  });
-})();
+updateDependabotConfig();

tools/utils/index.js

@@ -17,6 +17,7 @@ const {
   getPurePkgName,
 } = require('./workspaceUtils');
 const { updatePackageCache } = require('./updatePackageCache');
+const { updateDependabotConfig } = require('./update-dependabot-config');
 
 module.exports = {
   writeToFile,
@@ -29,6 +30,7 @@ module.exports = {
   getFullPkgName,
   getPurePkgName,
   updatePackageCache,
+  updateDependabotConfig,
   CORE_PATH,
   ROOT_PATH,
   PACKAGE_STATUS_CONFIG,

tools/utils/update-dependabot-config.js

@@ -0,0 +1,46 @@
+const fs = require('fs');
+const yaml = require('js-yaml');
+const { getWorkspacesInfo } = require('./workspaceUtils');
+const { writeToFile } = require('./writeToFile');
+const { logger } = require('./logger');
+
+const DEPENDABOT_CONFIG_PATH = `${__dirname}/../../.github/dependabot.yml`;
+const applyUpdate = (directory, restOptions = {}) => ({
+  'package-ecosystem': 'npm',
+  directory,
+  schedule: { interval: 'weekly' },
+  labels: ['area: infra', 'area: security', 'area: repo'],
+  ...restOptions,
+});
+
+const staticUpdates = [
+  applyUpdate('/', { 'package-ecosystem': 'github-actions' }),
+  applyUpdate('/', { 'package-ecosystem': 'npm' }),
+];
+
+const makeTemplate = (packages) => {
+  const updates = staticUpdates;
+
+  packages.forEach((pkg) => {
+    updates.push(applyUpdate(`/${pkg.location}`));
+  });
+
+  return updates;
+};
+
+async function updateDependabotConfig() {
+  logger.info('Updating dependabot config');
+
+  const { pkgList } = await getWorkspacesInfo({ withCore: true });
+
+  let dependabot = yaml.load(fs.readFileSync(DEPENDABOT_CONFIG_PATH, 'utf-8'));
+  const updates = makeTemplate(pkgList);
+
+  dependabot.updates = updates;
+
+  await writeToFile(DEPENDABOT_CONFIG_PATH, yaml.dump(dependabot), {
+    successMessage: 'Updated dependabot config',
+  });
+}
+
+module.exports = { updateDependabotConfig };