@graphcommerce/next-config 6.2.0-canary.55 → 6.2.0-canary.57

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 6.2.0-canary.57
+
+### Patch Changes
+
+- [#1982](https://github.com/graphcommerce-org/graphcommerce/pull/1982) [`e1fab2f6d`](https://github.com/graphcommerce-org/graphcommerce/commit/e1fab2f6d8f57d0488d8a915596d5c19cb7718e6) - Better detection what the package roots are when a custom node_modules directory is used ([@paales](https://github.com/paales))
+
+## 6.2.0-canary.56
+
 ## 6.2.0-canary.55
 
 ## 6.2.0-canary.54

package/__tests__/utils/packageRoots.ts

@@ -0,0 +1,35 @@
+import { packageRoots } from '../../src/utils/packageRoots'
+
+describe('packageRoots', () => {
+  it('should simplify all common paths', () => {
+    const paths = [
+      '../../packages/cli',
+      '../../packages/hygraph-cli',
+      '../../packagesDev/next-config',
+      '../../packagesDev/next-la',
+      '../../../layers/paketo-buildpacks_yarn-install/build-modules/node_modules/@graphcommerce/magento-cart-items',
+      '../../../layers/paketo-buildpacks_yarn-install/build-modules/node_modules/@graphcommerce/magento-product',
+      // ... (rest of your paths)
+    ]
+
+    const expectedRoots = [
+      '../../packages',
+      '../../packagesDev',
+      '../../../layers/paketo-buildpacks_yarn-install/build-modules/node_modules/@graphcommerce',
+    ]
+
+    const roots = packageRoots(paths)
+
+    // Expect roots to be an array
+    expect(Array.isArray(roots)).toBe(true)
+
+    // Expect the roots array to be equal to expectedRoots
+    expect(expectedRoots).toEqual(roots)
+  })
+
+  it('should return an empty array for no common roots', () => {
+    const paths = ['../a/b', '../c/d']
+    const roots = packageRoots(paths)
+    expect(roots).toEqual([])
+  })
+})

package/dist/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./utils/isMonorepo"), exports);
 __exportStar(require("./utils/resolveDependenciesSync"), exports);
+__exportStar(require("./utils/packageRoots"), exports);
 __exportStar(require("./withGraphCommerce"), exports);
 __exportStar(require("./generated/config"), exports);
 __exportStar(require("./config"), exports);

package/dist/utils/packageRoots.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.packageRoots = void 0;
+const packageRoots = (packagePaths) => {
+    const pathMap = {};
+    // Iterate over each path in the array
+    packagePaths.forEach((singlePath) => {
+        const parts = singlePath.split('/');
+        // Iterate through each part of the path
+        for (let i = 1; i < parts.length; i++) {
+            const subPath = parts.slice(0, i + 1).join('/');
+            // Increment the count of this subPath
+            if (pathMap[subPath]) {
+                pathMap[subPath].count += 1;
+            }
+            else {
+                pathMap[subPath] = { path: subPath, count: 1 };
+            }
+        }
+    });
+    // Filter the paths that appear more than once
+    const roots = [];
+    Object.values(pathMap).forEach(({ path, count }) => {
+        if (count > 1) {
+            roots.push(path);
+        }
+    });
+    // Filter out the sub-paths which are part of another longer sub-path
+    return roots.filter((root, index, self) => self.findIndex((r) => r !== root && r.startsWith(root + '/')) === -1);
+};
+exports.packageRoots = packageRoots;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "6.2.0-canary.55",
+  "version": "6.2.0-canary.57",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",

package/src/index.ts

@@ -2,6 +2,7 @@ import type React from 'react'
 
 export * from './utils/isMonorepo'
 export * from './utils/resolveDependenciesSync'
+export * from './utils/packageRoots'
 export * from './withGraphCommerce'
 export * from './generated/config'
 export * from './config'

package/src/utils/packageRoots.ts

@@ -0,0 +1,35 @@
+type PathCount = { path: string; count: number }
+
+export const packageRoots = (packagePaths: string[]): string[] => {
+  const pathMap: { [key: string]: PathCount } = {}
+
+  // Iterate over each path in the array
+  packagePaths.forEach((singlePath) => {
+    const parts = singlePath.split('/')
+
+    // Iterate through each part of the path
+    for (let i = 1; i < parts.length; i++) {
+      const subPath = parts.slice(0, i + 1).join('/')
+
+      // Increment the count of this subPath
+      if (pathMap[subPath]) {
+        pathMap[subPath].count += 1
+      } else {
+        pathMap[subPath] = { path: subPath, count: 1 }
+      }
+    }
+  })
+
+  // Filter the paths that appear more than once
+  const roots: string[] = []
+  Object.values(pathMap).forEach(({ path, count }) => {
+    if (count > 1) {
+      roots.push(path)
+    }
+  })
+
+  // Filter out the sub-paths which are part of another longer sub-path
+  return roots.filter(
+    (root, index, self) => self.findIndex((r) => r !== root && r.startsWith(root + '/')) === -1,
+  )
+}