@graphcommerce/next-config 6.0.2-canary.2 → 6.0.2-canary.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 6.0.2-canary.3
+
+### Patch Changes
+
+- [#1872](https://github.com/graphcommerce-org/graphcommerce/pull/1872) [`05522796f`](https://github.com/graphcommerce-org/graphcommerce/commit/05522796f3f132db50e7b4c26089740a12a9153a) - Fix issue where a deeper plugin from the root of the project doesn't have a correct relative path ([@paales](https://github.com/paales))
+
 ## 6.0.2-canary.2
 
 ## 6.0.2-canary.1

package/__tests__/config/utils/__snapshots__/mergeEnvIntoConfig.ts.snap

@@ -741,5 +741,6 @@ exports[`traverses a schema and returns a list of env variables that match 1`] =
   "GC_STOREFRONT_20_MAGENTO_STORE_CODE",
   "GC_WISHLIST_HIDE_FOR_GUESTS",
   "GC_WISHLIST_IGNORE_PRODUCT_WISHLIST_STATUS",
+  "GC_WISHLIST_SHOW_FEEDBACK_MESSAGE",
 ]
 `;

package/__tests__/interceptors/findPlugins.ts

@@ -71,6 +71,13 @@ it('finds plugins', () => {
         "ifConfig": "googleAnalyticsId",
         "plugin": "@graphcommerce/googleanalytics/plugins/GaProductListItemsBase",
       },
+      {
+        "component": "RemoveItemFromCartFab",
+        "enabled": true,
+        "exported": "@graphcommerce/magento-cart-items/RemoveItemFromCart/RemoveItemFromCartFab",
+        "ifConfig": "googleAnalyticsId",
+        "plugin": "@graphcommerce/googleanalytics/plugins/GaRemoveItemFromCart",
+      },
       {
         "component": "ShippingMethodForm",
         "enabled": true,
@@ -85,6 +92,12 @@ it('finds plugins', () => {
         "ifConfig": "googleAnalyticsId",
         "plugin": "@graphcommerce/googleanalytics/plugins/GaUpdateItemQuantity",
       },
+      {
+        "component": "ProductPageMeta",
+        "enabled": true,
+        "exported": "@graphcommerce/magento-product",
+        "plugin": "@graphcommerce/googleanalytics/plugins/GaViewItem",
+      },
       {
         "component": "ApolloErrorAlert",
         "enabled": true,
@@ -187,6 +200,13 @@ it('finds plugins', () => {
         "ifConfig": "demoMode",
         "plugin": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoProductListItemsBase",
       },
+      {
+        "component": "RowLinks",
+        "enabled": false,
+        "exported": "@graphcommerce/next-ui/Row/RowLinks/RowLinks",
+        "ifConfig": "demoMode",
+        "plugin": "@graphcommerce/demo-magento-graphcommerce/plugins/demo/DemoRowLinks",
+      },
       {
         "component": "FramerNextPages",
         "enabled": false,

package/__tests__/interceptors/generateInterceptors.ts

@@ -250,3 +250,20 @@ it('it handles root plugins', () => {
     "
   `)
 })
+
+it('it handles root plugins deeper nested', () => {
+  const plugins = [
+    {
+      component: 'OverlaySsr',
+      enabled: true,
+      exported: '@graphcommerce/next-ui/Overlay/components/OverlaySsr',
+      plugin: './plugins/EnableCrosssellsPlugin',
+    },
+  ]
+  const resolve = resolveDependency(projectRoot)
+  const interceptors = generateInterceptors(plugins, resolve)
+
+  expect(
+    interceptors['packages/next-ui/Overlay/components/OverlaySsr'].components.OverlaySsr[0].plugin,
+  ).toMatchInlineSnapshot(`"../../../../examples/magento-graphcms/plugins/EnableCrosssellsPlugin"`)
+})

package/dist/interceptors/generateInterceptors.js

@@ -92,7 +92,7 @@ function generateInterceptors(plugins, resolve) {
         let pluginPathFromResolved = plugin;
         if (plugin.startsWith('.')) {
             const resolvedPlugin = resolve(plugin);
-            pluginPathFromResolved = node_path_1.default.relative(resolved.root, resolvedPlugin.fromRoot);
+            pluginPathFromResolved = node_path_1.default.relative(resolved.fromRoot.split('/').slice(0, -1).join('/'), resolvedPlugin.fromRoot);
         }
         if (!acc[resolved.fromRoot])
             acc[resolved.fromRoot] = {

package/dist/utils/resolveDependency.js

@@ -26,7 +26,7 @@ const resolveDependency = (cwd = process.cwd()) => {
                     `${rootCandidate}/src/index`,
                 ].find((location) => ['ts', 'tsx'].find((extension) => node_fs_1.default.existsSync(`${location}.${extension}`)));
                 if (!fromRoot) {
-                    throw Error(`Can't find plugin target for ${dependency}`);
+                    throw Error(`Can't find plugin ${dependency}`);
                 }
                 const denormalized = fromRoot.replace(root, depCandidate);
                 let fromModule = !relative

package/package.json

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

package/src/interceptors/generateInterceptors.ts

@@ -122,7 +122,10 @@ export function generateInterceptors(
     let pluginPathFromResolved = plugin
     if (plugin.startsWith('.')) {
       const resolvedPlugin = resolve(plugin)
-      pluginPathFromResolved = path.relative(resolved.root, resolvedPlugin.fromRoot)
+      pluginPathFromResolved = path.relative(
+        resolved.fromRoot.split('/').slice(0, -1).join('/'),
+        resolvedPlugin.fromRoot,
+      )
     }
 
     if (!acc[resolved.fromRoot])

package/src/utils/resolveDependency.ts

@@ -35,7 +35,7 @@ export const resolveDependency = (cwd: string = process.cwd()) => {
           ['ts', 'tsx'].find((extension) => fs.existsSync(`${location}.${extension}`)),
         )
         if (!fromRoot) {
-          throw Error(`Can't find plugin target for ${dependency}`)
+          throw Error(`Can't find plugin ${dependency}`)
         }
 
         const denormalized = fromRoot.replace(root, depCandidate)