@graphcommerce/next-config 9.0.0-canary.107 → 9.0.0-canary.109

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 9.0.0-canary.109
+
+## 9.0.0-canary.108
+
 ## 9.0.0-canary.107
 
 ## 9.0.0-canary.106

package/__tests__/interceptors/findPlugins.ts

@@ -240,14 +240,6 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product",
         "type": "component",
       },
-      {
-        "enabled": true,
-        "sourceExport": "ProductPageGallery",
-        "sourceModule": "@graphcommerce/magento-product-configurable/plugins/ConfigurableProductPage/ConfigurableProductPageGallery",
-        "targetExport": "ProductPageGallery",
-        "targetModule": "@graphcommerce/magento-product",
-        "type": "component",
-      },
       {
         "enabled": true,
         "sourceExport": "CartItemActionCard",
@@ -668,6 +660,15 @@ it('finds plugins', () => {
         "targetModule": "@graphcommerce/magento-product",
         "type": "component",
       },
+      {
+        "enabled": false,
+        "ifConfig": "configurableVariantValues.gallery",
+        "sourceExport": "ProductPageGallery",
+        "sourceModule": "@graphcommerce/magento-product-configurable/plugins/ConfigurableProductPage/ConfigurableProductPageGallery",
+        "targetExport": "ProductPageGallery",
+        "targetModule": "@graphcommerce/magento-product",
+        "type": "component",
+      },
       {
         "enabled": false,
         "ifConfig": "configurableVariantValues.content",

package/__tests__/utils/resolveDependenciesSync.ts

@@ -31,6 +31,7 @@ it('resolves dependences', () => {
       "@graphcommerce/magento-product-virtual" => "packages/magento-product-virtual",
       "@graphcommerce/magento-review" => "packages/magento-review",
       "@graphcommerce/magento-wishlist" => "packages/magento-wishlist",
+      "@graphcommerce/service-worker" => "packages/service-worker",
       "@graphcommerce/magento-cart-pickup" => "packages/magento-cart-pickup",
       "@graphcommerce/magento-payment-braintree" => "packages/magento-payment-braintree",
       "@graphcommerce/mollie-magento-payment" => "packages/mollie-magento-payment",

package/dist/commands/copyFiles.js

@@ -192,8 +192,7 @@ Found in packages:
 Source: ${sourcePath}`);
                     process.exit(1);
                 }
-                console.log(`Creating new file: ${file}
-Source: ${sourcePath}`);
+                console.log(`Creating new file: ${file}\nSource: ${sourcePath}`);
                 debug('File does not exist yet');
             }
             // Skip if content is identical (including magic comment)

package/dist/index.js

@@ -21,7 +21,6 @@ __exportStar(require("./utils/sig"), exports);
 __exportStar(require("./withGraphCommerce"), exports);
 __exportStar(require("./generated/config"), exports);
 __exportStar(require("./config"), exports);
-__exportStar(require("./runtimeCachingOptimizations"), exports);
 __exportStar(require("./interceptors/commands/codegenInterceptors"), exports);
 __exportStar(require("./commands/copyFiles"), exports);
 __exportStar(require("./commands/codegen"), exports);

package/dist/utils/isMonorepo.js

@@ -4,10 +4,72 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMonorepo = isMonorepo;
+exports.findParentPath = findParentPath;
+const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
+const debug = process.env.DEBUG === '1';
+// eslint-disable-next-line no-console
+const log = (message) => debug && console.log(`isMonorepo: ${message}`);
+function findPackageJson(directory) {
+    try {
+        const packageJsonPath = node_path_1.default.join(directory, 'package.json');
+        const content = node_fs_1.default.readFileSync(packageJsonPath, 'utf8');
+        return JSON.parse(content);
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Determines if we're running in a monorepo context and how to handle postinstall scripts.
+ *
+ * If there is a parent `@graphcommerce/*` package, we're in a monorepo.
+ */
 function isMonorepo() {
-    const root = process.cwd();
-    const meshDir = node_path_1.default.dirname(require.resolve('@graphcommerce/graphql-mesh'));
-    const relativePath = node_path_1.default.join(node_path_1.default.relative(meshDir, root), '/');
-    return relativePath.startsWith(`..${node_path_1.default.sep}..${node_path_1.default.sep}examples`);
+    let currentDir = process.cwd();
+    log(`Starting directory: ${currentDir}`);
+    // Start from the parent directory to find a parent @graphcommerce package
+    currentDir = node_path_1.default.dirname(currentDir);
+    log(`Looking for parent packages starting from: ${currentDir}`);
+    // Keep going up until we find a root package or hit the filesystem root
+    while (currentDir !== node_path_1.default.parse(currentDir).root) {
+        const packageJson = findPackageJson(currentDir);
+        if (packageJson) {
+            log(`Found package.json in: ${currentDir}`);
+            log(`Package name: ${packageJson.name}`);
+            if (packageJson.name.startsWith('@graphcommerce/')) {
+                log('isMonorepo result: true (found parent @graphcommerce package)');
+                return true;
+            }
+        }
+        currentDir = node_path_1.default.dirname(currentDir);
+    }
+    log('isMonorepo result: false (no parent @graphcommerce package found)');
+    return false;
+}
+/**
+ * Finds the path of the parent @graphcommerce package if it exists Returns null if no parent
+ * package is found
+ */
+function findParentPath(directory) {
+    let currentDir = directory;
+    log(`Starting directory: ${currentDir}`);
+    // Start from the parent directory
+    currentDir = node_path_1.default.dirname(currentDir);
+    log(`Looking for parent packages starting from: ${currentDir}`);
+    // Keep going up until we find a root package or hit the filesystem root
+    while (currentDir !== node_path_1.default.parse(currentDir).root) {
+        const packageJson = findPackageJson(currentDir);
+        if (packageJson) {
+            log(`Found package.json in: ${currentDir}`);
+            log(`Package name: ${packageJson.name}`);
+            if (packageJson.name.startsWith('@graphcommerce/')) {
+                log(`Found parent @graphcommerce package at: ${currentDir}`);
+                return currentDir;
+            }
+        }
+        currentDir = node_path_1.default.dirname(currentDir);
+    }
+    log('No parent @graphcommerce package found');
+    return null;
 }

package/dist/withGraphCommerce.js

@@ -31,7 +31,7 @@ function domains(config) {
  * module.exports = withGraphCommerce(nextConfig)
  * ```
  */
-function withGraphCommerce(nextConfig, cwd) {
+function withGraphCommerce(nextConfig, cwd = process.cwd()) {
     graphcommerceConfig ??= (0, loadConfig_1.loadConfig)(cwd);
     const importMetaPaths = (0, configToImportMeta_1.configToImportMeta)(graphcommerceConfig);
     const { storefront } = graphcommerceConfig;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/next-config",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.0-canary.107",
+  "version": "9.0.0-canary.109",
   "type": "commonjs",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -17,6 +17,8 @@
     "@lingui/macro": "4.14.0",
     "@lingui/react": "4.14.0",
     "@lingui/swc-plugin": "4.1.0",
+    "@serwist/build": "^9.0.10",
+    "@serwist/next": "^9.0.10",
     "@swc/core": "1.9.3",
     "@swc/wasm-web": "^1.9.3",
     "@types/circular-dependency-plugin": "^5.0.8",
@@ -25,7 +27,7 @@
     "circular-dependency-plugin": "^5.2.2",
     "fast-glob": "^3.3.2",
     "glob": "^10.4.5",
-    "graphql": "^16",
+    "graphql": "^16.9.0",
     "inspectpack": "^4.7.1",
     "js-yaml-loader": "^1.2.2",
     "lodash": "^4.17.21",

package/src/commands/copyFiles.ts

@@ -220,8 +220,7 @@ Found in packages:
 Source: ${sourcePath}`)
             process.exit(1)
           }
-          console.log(`Creating new file: ${file}
-Source: ${sourcePath}`)
+          console.log(`Creating new file: ${file}\nSource: ${sourcePath}`)
           debug('File does not exist yet')
         }
 

package/src/index.ts

@@ -10,7 +10,6 @@ export * from './utils/sig'
 export * from './withGraphCommerce'
 export * from './generated/config'
 export * from './config'
-export * from './runtimeCachingOptimizations'
 export * from './interceptors/commands/codegenInterceptors'
 export * from './commands/copyFiles'
 export * from './commands/codegen'

package/src/utils/isMonorepo.ts

@@ -1,8 +1,83 @@
+import fs from 'node:fs'
 import path from 'node:path'
 
+const debug = process.env.DEBUG === '1'
+// eslint-disable-next-line no-console
+const log = (message: string) => debug && console.log(`isMonorepo: ${message}`)
+
+function findPackageJson(directory: string): { name: string } | null {
+  try {
+    const packageJsonPath = path.join(directory, 'package.json')
+    const content = fs.readFileSync(packageJsonPath, 'utf8')
+    return JSON.parse(content)
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Determines if we're running in a monorepo context and how to handle postinstall scripts.
+ *
+ * If there is a parent `@graphcommerce/*` package, we're in a monorepo.
+ */
 export function isMonorepo() {
-  const root = process.cwd()
-  const meshDir = path.dirname(require.resolve('@graphcommerce/graphql-mesh'))
-  const relativePath = path.join(path.relative(meshDir, root), '/')
-  return relativePath.startsWith(`..${path.sep}..${path.sep}examples`)
+  let currentDir = process.cwd()
+  log(`Starting directory: ${currentDir}`)
+
+  // Start from the parent directory to find a parent @graphcommerce package
+  currentDir = path.dirname(currentDir)
+  log(`Looking for parent packages starting from: ${currentDir}`)
+
+  // Keep going up until we find a root package or hit the filesystem root
+  while (currentDir !== path.parse(currentDir).root) {
+    const packageJson = findPackageJson(currentDir)
+
+    if (packageJson) {
+      log(`Found package.json in: ${currentDir}`)
+      log(`Package name: ${packageJson.name}`)
+
+      if (packageJson.name.startsWith('@graphcommerce/')) {
+        log('isMonorepo result: true (found parent @graphcommerce package)')
+        return true
+      }
+    }
+
+    currentDir = path.dirname(currentDir)
+  }
+
+  log('isMonorepo result: false (no parent @graphcommerce package found)')
+  return false
+}
+
+/**
+ * Finds the path of the parent @graphcommerce package if it exists Returns null if no parent
+ * package is found
+ */
+export function findParentPath(directory: string): string | null {
+  let currentDir = directory
+  log(`Starting directory: ${currentDir}`)
+
+  // Start from the parent directory
+  currentDir = path.dirname(currentDir)
+  log(`Looking for parent packages starting from: ${currentDir}`)
+
+  // Keep going up until we find a root package or hit the filesystem root
+  while (currentDir !== path.parse(currentDir).root) {
+    const packageJson = findPackageJson(currentDir)
+
+    if (packageJson) {
+      log(`Found package.json in: ${currentDir}`)
+      log(`Package name: ${packageJson.name}`)
+
+      if (packageJson.name.startsWith('@graphcommerce/')) {
+        log(`Found parent @graphcommerce package at: ${currentDir}`)
+        return currentDir
+      }
+    }
+
+    currentDir = path.dirname(currentDir)
+  }
+
+  log('No parent @graphcommerce package found')
+  return null
 }

package/src/withGraphCommerce.ts

@@ -41,7 +41,7 @@ function domains(config: GraphCommerceConfig): DomainLocale[] {
  * module.exports = withGraphCommerce(nextConfig)
  * ```
  */
-export function withGraphCommerce(nextConfig: NextConfig, cwd: string): NextConfig {
+export function withGraphCommerce(nextConfig: NextConfig, cwd: string = process.cwd()): NextConfig {
   graphcommerceConfig ??= loadConfig(cwd)
   const importMetaPaths = configToImportMeta(graphcommerceConfig)
 

package/dist/runtimeCachingOptimizations.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runtimeCachingOptimizations = void 0;
-exports.runtimeCachingOptimizations = [
-    {
-        urlPattern: /\/_next\/image\?url=.+$/i,
-        handler: 'StaleWhileRevalidate',
-        options: {
-            cacheName: 'next-image',
-            expiration: {
-                maxEntries: 1000, // 1000 images
-                maxAgeSeconds: 168 * 60 * 60, // 1 week
-                matchOptions: { ignoreVary: true },
-            },
-        },
-    },
-    {
-        urlPattern: /\/_next\/data\/.+\/.+\.json$/i,
-        handler: 'NetworkFirst',
-        options: {
-            cacheName: 'next-data',
-            expiration: {
-                maxEntries: 32,
-                maxAgeSeconds: 24 * 60 * 60, // 24 hours
-            },
-        },
-    },
-];

package/src/runtimeCachingOptimizations.ts

@@ -1,27 +0,0 @@
-import type { RuntimeCaching } from 'workbox-build'
-
-export const runtimeCachingOptimizations: RuntimeCaching[] = [
-  {
-    urlPattern: /\/_next\/image\?url=.+$/i,
-    handler: 'StaleWhileRevalidate',
-    options: {
-      cacheName: 'next-image',
-      expiration: {
-        maxEntries: 1000, // 1000 images
-        maxAgeSeconds: 168 * 60 * 60, // 1 week
-        matchOptions: { ignoreVary: true },
-      },
-    },
-  },
-  {
-    urlPattern: /\/_next\/data\/.+\/.+\.json$/i,
-    handler: 'NetworkFirst',
-    options: {
-      cacheName: 'next-data',
-      expiration: {
-        maxEntries: 32,
-        maxAgeSeconds: 24 * 60 * 60, // 24 hours
-      },
-    },
-  },
-]