@bigbinary/neeto-audit-frontend 2.0.11 → 2.0.13

package/common/recommendedDependencies/frontend.js

@@ -13,6 +13,8 @@ const DEV_DEPENDENCIES = {
   "@rollup/plugin-node-resolve": "15.2.3",
   "@rollup/plugin-replace": "5.0.4",
   "@svgr/rollup": "8.1.0",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   antd: "5.10.2",
   axios: "1.6.0",
   classnames: "2.3.2",
@@ -25,7 +27,6 @@ const DEV_DEPENDENCIES = {
   "react-dom": "18.2.0",
   "react-helmet": "6.1.0",
   "react-i18next": "13.3.1",
-  "react-query": "3.39.3",
   "react-router-dom": "5.3.4",
   "react-toastify": "8.2.0",
   rollup: "2.79.1",
@@ -47,6 +48,8 @@ const PEER_DEPENDENCIES = {
   "@bigbinary/neetoui": "latest",
   "@honeybadger-io/js": "^6.5.3",
   "@honeybadger-io/react": "^6.1.9",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   axios: "^1.6.0",
   classnames: "^2.3.2",
   formik: "^2.4.5",
@@ -57,7 +60,6 @@ const PEER_DEPENDENCIES = {
   "react-dom": "^18.2.0",
   "react-helmet": "^6.1.0",
   "react-i18next": "^13.3.1",
-  "react-query": "^3.39.3",
   "react-router-dom": "^5.3.4",
   "react-toastify": "^8.2.0",
   yup: "^0.32.11",

package/common/recommendedDependencies/nano.js

@@ -13,6 +13,8 @@ const DEV_DEPENDENCIES = {
   "@rollup/plugin-node-resolve": "15.2.3",
   "@rollup/plugin-replace": "5.0.4",
   "@svgr/rollup": "8.1.0",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   antd: "5.10.2",
   axios: "1.6.0",
   classnames: "2.3.2",
@@ -25,7 +27,6 @@ const DEV_DEPENDENCIES = {
   "react-dom": "18.2.0",
   "react-helmet": "6.1.0",
   "react-i18next": "13.3.1",
-  "react-query": "3.39.3",
   "react-router-dom": "5.3.4",
   "react-toastify": "8.2.0",
   rollup: "2.79.1",
@@ -47,6 +48,8 @@ const PEER_DEPENDENCIES = {
   "@bigbinary/neetoui": "latest",
   "@honeybadger-io/js": "^6.5.3",
   "@honeybadger-io/react": "^6.1.9",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   axios: "^1.6.0",
   classnames: "^2.3.2",
   formik: "^2.4.5",
@@ -57,7 +60,6 @@ const PEER_DEPENDENCIES = {
   "react-dom": "^18.2.0",
   "react-helmet": "^6.1.0",
   "react-i18next": "^13.3.1",
-  "react-query": "^3.39.3",
   "react-router-dom": "^5.3.4",
   "react-toastify": "^8.2.0",
   yup: "^0.32.11",

package/dist/index.js

@@ -2852,6 +2852,42 @@ _curry2(function mergeDeepRight(lObj, rObj) {
   }, lObj, rObj);
 });
 
+/**
+ * Returns a partial copy of an object containing only the keys specified. If
+ * the key does not exist, the property is ignored.
+ *
+ * @func
+ * @memberOf R
+ * @since v0.1.0
+ * @category Object
+ * @sig [k] -> {k: v} -> {k: v}
+ * @param {Array} names an array of String property names to copy onto a new object
+ * @param {Object} obj The object to copy from
+ * @return {Object} A new object with only properties from `names` on it.
+ * @see R.omit, R.props
+ * @example
+ *
+ *      R.pick(['a', 'd'], {a: 1, b: 2, c: 3, d: 4}); //=> {a: 1, d: 4}
+ *      R.pick(['a', 'e', 'f'], {a: 1, b: 2, c: 3, d: 4}); //=> {a: 1}
+ */
+
+var pick$1 =
+/*#__PURE__*/
+_curry2(function pick(names, obj) {
+  var result = {};
+  var idx = 0;
+
+  while (idx < names.length) {
+    if (names[idx] in obj) {
+      result[names[idx]] = obj[names[idx]];
+    }
+
+    idx += 1;
+  }
+
+  return result;
+});
+
 /**
  * Returns a partial copy of an object containing only the keys that satisfy
  * the supplied predicate.
@@ -16155,6 +16191,8 @@ const DEV_DEPENDENCIES$2 = {
   "@rollup/plugin-node-resolve": "15.2.3",
   "@rollup/plugin-replace": "5.0.4",
   "@svgr/rollup": "8.1.0",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   antd: "5.10.2",
   axios: "1.6.0",
   classnames: "2.3.2",
@@ -16167,7 +16205,6 @@ const DEV_DEPENDENCIES$2 = {
   "react-dom": "18.2.0",
   "react-helmet": "6.1.0",
   "react-i18next": "13.3.1",
-  "react-query": "3.39.3",
   "react-router-dom": "5.3.4",
   "react-toastify": "8.2.0",
   rollup: "2.79.1",
@@ -16189,6 +16226,8 @@ const PEER_DEPENDENCIES$2 = {
   "@bigbinary/neetoui": "latest",
   "@honeybadger-io/js": "^6.5.3",
   "@honeybadger-io/react": "^6.1.9",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   axios: "^1.6.0",
   classnames: "^2.3.2",
   formik: "^2.4.5",
@@ -16199,7 +16238,6 @@ const PEER_DEPENDENCIES$2 = {
   "react-dom": "^18.2.0",
   "react-helmet": "^6.1.0",
   "react-i18next": "^13.3.1",
-  "react-query": "^3.39.3",
   "react-router-dom": "^5.3.4",
   "react-toastify": "^8.2.0",
   yup: "^0.32.11",
@@ -16226,6 +16264,8 @@ const DEV_DEPENDENCIES$1 = {
   "@rollup/plugin-node-resolve": "15.2.3",
   "@rollup/plugin-replace": "5.0.4",
   "@svgr/rollup": "8.1.0",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   antd: "5.10.2",
   axios: "1.6.0",
   classnames: "2.3.2",
@@ -16238,7 +16278,6 @@ const DEV_DEPENDENCIES$1 = {
   "react-dom": "18.2.0",
   "react-helmet": "6.1.0",
   "react-i18next": "13.3.1",
-  "react-query": "3.39.3",
   "react-router-dom": "5.3.4",
   "react-toastify": "8.2.0",
   rollup: "2.79.1",
@@ -16260,6 +16299,8 @@ const PEER_DEPENDENCIES$1 = {
   "@bigbinary/neetoui": "latest",
   "@honeybadger-io/js": "^6.5.3",
   "@honeybadger-io/react": "^6.1.9",
+  "@tanstack/react-query": "5.40.0",
+  "@tanstack/react-query-devtools": "5.40.0",
   axios: "^1.6.0",
   classnames: "^2.3.2",
   formik: "^2.4.5",
@@ -16270,7 +16311,6 @@ const PEER_DEPENDENCIES$1 = {
   "react-dom": "^18.2.0",
   "react-helmet": "^6.1.0",
   "react-i18next": "^13.3.1",
-  "react-query": "^3.39.3",
   "react-router-dom": "^5.3.4",
   "react-toastify": "^8.2.0",
   yup: "^0.32.11",
@@ -33480,38 +33520,35 @@ const updateBigbinaryPackages = async (recommendedList) => {
     startsWith("@bigbinary")
   );
 
-  if (isNotEmpty(auditPackages)) {
-    let retries = 0;
+  if (isEmpty$1(auditPackages)) return recommendedList;
+  let retries = 0;
 
-    while (retries < MAX_RETRIES) {
-      try {
-        const {
-          data: { nanos }
-        } = await axios.get(
-          "https://ops.neetotower.com/api/v1/public/nanos"
-        );
+  while (retries < MAX_RETRIES) {
+    try {
+      const {
+        data: { nanos },
+      } = await axios.get("https://ops.neetotower.com/api/v1/public/nanos");
 
-        const trackedPackages = filterBy(
-          { name: includes(__, auditPackages) },
-          nanos
-        );
+      const trackedPackages = filterBy(
+        { name: includes(__, auditPackages) },
+        nanos
+      );
 
-        trackedPackages.forEach(({ name, current_version }) => {
-          recommendedList[name] = current_version;
-        });
+      trackedPackages.forEach(({ name, current_version }) => {
+        recommendedList[name] = current_version;
+      });
 
-        return recommendedList;
-      } catch (error) {
-        retries++;
-        await new Promise((resolve) => setTimeout(resolve, REQUEST_DELAY));
-        if (retries === MAX_RETRIES) {
-          console.log(
-            chalk$1.yellowBright(
-              "\nCouldn't connect to nanos release tool. Please retry or verify the link is working correctly."
-            )
-          );
-          process.exitCode = 1;
-        }
+      return recommendedList;
+    } catch (error) {
+      retries++;
+      await new Promise((resolve) => setTimeout(resolve, REQUEST_DELAY));
+      if (retries === MAX_RETRIES) {
+        console.log(
+          chalk$1.yellowBright(
+            "\nCouldn't connect to nanos release tool. Please retry or verify the link is working correctly."
+          )
+        );
+        process.exitCode = 1;
       }
     }
   }
@@ -33525,9 +33562,26 @@ const getOutdatedPackages = (recommendedVersions, packageJson) => {
 
     const dependencyTypePackages = packageJson[type] ?? {};
 
-    const packages = mapObjIndexed(
+    let packages = {};
+    let dependenciesToCheck = {};
+
+    if (type === "peerDependencies") {
+      const installedDependencies = [
+        ...Object.keys(packageJson.dependencies || {}),
+        ...Object.keys(packageJson.devDependencies || {}),
+      ];
+
+      dependenciesToCheck = pick$1(installedDependencies, recommendedList);
+    } else {
+      dependenciesToCheck = pick$1(
+        Object.keys(dependencyTypePackages),
+        recommendedList
+      );
+    }
+
+    packages = mapObjIndexed(
       (_, key) => eqProps(key, recommendedList, dependencyTypePackages),
-      recommendedList
+      dependenciesToCheck
     );
 
     const outdatedPackages = pickBy(not$1, packages);
@@ -33582,17 +33636,28 @@ const recommendedPackageVersions = async (debug) => {
   );
 
   const fix = async (debug) => {
+    const outdatedPeerDependenciesKeys = findBy(
+      { type: "peerDependencies" },
+      packagesToUpdate
+    )?.outdatedPackages;
+
+    const peerDependenciesToBeUpdated = pick$1(
+      outdatedPeerDependenciesKeys,
+      recommendedVersions.peerDependencies
+    );
+
     let newPackageJson = mergeDeepRight(
       packageJson,
-      objOf("peerDependencies", recommendedVersions.peerDependencies)
+      objOf("peerDependencies", peerDependenciesToBeUpdated)
     );
+
     newPackageJson = sortByKey(newPackageJson);
 
-    isNotEmpty(recommendedVersions.peerDependencies) &&
+    isNotEmpty(peerDependenciesToBeUpdated) &&
       (await createOrReplaceFile({
         relativeFilePath: PACKAGE_JSON_PATH,
         content: JSON.stringify(newPackageJson, null, 2),
-        debug
+        debug,
       }));
 
     const commands = getInstallationCommands(
@@ -33614,7 +33679,7 @@ const recommendedPackageVersions = async (debug) => {
     return {
       error: "The dependency packages are not using the recommended versions.",
       status: STATUSES.FAIL,
-      fix
+      fix,
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbinary/neeto-audit-frontend",
-  "version": "2.0.11",
+  "version": "2.0.13",
   "description": "Audits neeto frontend codebase for issues and suggests a fix.",
   "type": "module",
   "bin": "./dist/index.js",

package/src/verifiers/recommendedPackageVersions/index.js

@@ -1,5 +1,5 @@
-import { existsBy, isNotEmpty } from "@bigbinary/neeto-cist";
-import { mergeDeepRight, objOf } from "ramda";
+import { existsBy, isNotEmpty, findBy } from "@bigbinary/neeto-cist";
+import { mergeDeepRight, objOf, pick } from "ramda";
 
 import recommendedDependencies from "../../../common/recommendedDependencies";
 import { NANO_TYPE_MAP, PACKAGE_JSON_PATH, STATUSES } from "../../constants";
@@ -7,12 +7,12 @@ import {
   createOrReplaceFile,
   execute,
   getNanoType,
-  getPackageJson
+  getPackageJson,
 } from "../../utils";
 import {
   getInstallationCommands,
   getOutdatedPackages,
-  sortByKey
+  sortByKey,
 } from "./utils";
 
 const recommendedPackageVersions = async (debug) => {
@@ -35,17 +35,28 @@ const recommendedPackageVersions = async (debug) => {
   );
 
   const fix = async (debug) => {
+    const outdatedPeerDependenciesKeys = findBy(
+      { type: "peerDependencies" },
+      packagesToUpdate
+    )?.outdatedPackages;
+
+    const peerDependenciesToBeUpdated = pick(
+      outdatedPeerDependenciesKeys,
+      recommendedVersions.peerDependencies
+    );
+
     let newPackageJson = mergeDeepRight(
       packageJson,
-      objOf("peerDependencies", recommendedVersions.peerDependencies)
+      objOf("peerDependencies", peerDependenciesToBeUpdated)
     );
+
     newPackageJson = sortByKey(newPackageJson);
 
-    isNotEmpty(recommendedVersions.peerDependencies) &&
+    isNotEmpty(peerDependenciesToBeUpdated) &&
       (await createOrReplaceFile({
         relativeFilePath: PACKAGE_JSON_PATH,
         content: JSON.stringify(newPackageJson, null, 2),
-        debug
+        debug,
       }));
 
     const commands = getInstallationCommands(
@@ -67,7 +78,7 @@ const recommendedPackageVersions = async (debug) => {
     return {
       error: "The dependency packages are not using the recommended versions.",
       status: STATUSES.FAIL,
-      fix
+      fix,
     };
   }
 

package/src/verifiers/recommendedPackageVersions/utils.js

@@ -12,9 +12,10 @@ import {
   isEmpty,
   startsWith,
   includes,
-  __
+  pick,
+  __,
 } from "ramda";
-import { filterBy, findBy, isNotEmpty } from "@bigbinary/neeto-cist";
+import { filterBy, findBy } from "@bigbinary/neeto-cist";
 
 import { DEPENDENCY_TYPES, MAX_RETRIES, REQUEST_DELAY } from "./constants";
 
@@ -23,39 +24,37 @@ const updateBigbinaryPackages = async (recommendedList) => {
     startsWith("@bigbinary")
   );
 
-  if (isNotEmpty(auditPackages)) {
-    let success = false;
-    let retries = 0;
-
-    while (!success && retries < MAX_RETRIES) {
-      try {
-        const {
-          data: { nanos }
-        } = await axios.get(
-          "https://ops.neetotower.com/api/v1/public/nanos"
-        );
-
-        const trackedPackages = filterBy(
-          { name: includes(__, auditPackages) },
-          nanos
+  if (isEmpty(auditPackages)) return recommendedList;
+
+  let success = false;
+  let retries = 0;
+
+  while (!success && retries < MAX_RETRIES) {
+    try {
+      const {
+        data: { nanos },
+      } = await axios.get("https://ops.neetotower.com/api/v1/public/nanos");
+
+      const trackedPackages = filterBy(
+        { name: includes(__, auditPackages) },
+        nanos
+      );
+
+      trackedPackages.forEach(({ name, current_version }) => {
+        recommendedList[name] = current_version;
+      });
+
+      return recommendedList;
+    } catch (error) {
+      retries++;
+      await new Promise((resolve) => setTimeout(resolve, REQUEST_DELAY));
+      if (retries === MAX_RETRIES) {
+        console.log(
+          chalk.yellowBright(
+            "\nCouldn't connect to nanos release tool. Please retry or verify the link is working correctly."
+          )
         );
-
-        trackedPackages.forEach(({ name, current_version }) => {
-          recommendedList[name] = current_version;
-        });
-
-        return recommendedList;
-      } catch (error) {
-        retries++;
-        await new Promise((resolve) => setTimeout(resolve, REQUEST_DELAY));
-        if (retries === MAX_RETRIES) {
-          console.log(
-            chalk.yellowBright(
-              "\nCouldn't connect to nanos release tool. Please retry or verify the link is working correctly."
-            )
-          );
-          process.exitCode = 1;
-        }
+        process.exitCode = 1;
       }
     }
   }
@@ -69,9 +68,26 @@ export const getOutdatedPackages = (recommendedVersions, packageJson) => {
 
     const dependencyTypePackages = packageJson[type] ?? {};
 
-    const packages = mapObjIndexed(
+    let packages = {};
+    let dependenciesToCheck = {};
+
+    if (type === "peerDependencies") {
+      const installedDependencies = [
+        ...Object.keys(packageJson.dependencies || {}),
+        ...Object.keys(packageJson.devDependencies || {}),
+      ];
+
+      dependenciesToCheck = pick(installedDependencies, recommendedList);
+    } else {
+      dependenciesToCheck = pick(
+        Object.keys(dependencyTypePackages),
+        recommendedList
+      );
+    }
+
+    packages = mapObjIndexed(
       (_, key) => eqProps(key, recommendedList, dependencyTypePackages),
-      recommendedList
+      dependenciesToCheck
     );
 
     const outdatedPackages = pickBy(not, packages);