[GCOM-1315] fix cli tool + fix migration 6to7

.changeset/twelve-socks-tap.md

@@ -0,0 +1,6 @@
+---
+"@graphcommerce/next-config": patch
+"@graphcommerce/hygraph-cli": patch
+---
+
+Fix hygraph 6to7 cli

docs/framework/config.md

@@ -205,6 +205,10 @@ The Google Tagmanager ID to be used on the site.
 
 This value is required even if you are configuring different values for each locale.
 
+#### hygraphManagementApi: string
+
+Hygraph Management API. **Only used for migrations.**
+
 #### hygraphProjectId: string
 
 Hygraph Project ID. **Only used for migrations.**

docs/hygraph/cli.md

@@ -48,16 +48,20 @@ The following steps are needed to utilize this tool:
       - Update public content views
       - Delete public content views
       - Can see schema view
-   5. Add this new token to your env file: `GC_HYGRAPH_WRITE_ACCESS_TOKEN=""`
+   5. Add this new token to your env file:
+      `GC_HYGRAPH_WRITE_ACCESS_TOKEN="{YOUR_WRITE_ACCESS_TOKEN}"`
 2. Add the Content API key to your env file like this:
    1. Open your Hygraph project. Go to: Project settings -> API Access
    2. Copy the Content API URL and add to your env file:
-      `GC_HYGRAPH_WRITE_ACCESS_ENDPOINT=""`
+      `GC_HYGRAPH_WRITE_ACCESS_ENDPOINT="{YOUR_WRITE_ACCESS_ENDPOINT}"`
 3. Add your hygraphProjectId to your env file like this:
    1. Copy the project ID from the URL when logged in
       `https://app.hygraph.com/PROJECT_ID_IS_HERE/master`
-   2. Add the project ID to your env file: `GC_HYGRAPH_PROJECT_ID=””`
-4. Run `yarn graphcommerce hygraph-migrate`
-5. Select the migration you want to run and press enter.
-6. The migrations should now be applied, check your Hygraph Schema if changes
+   2. Add the project ID to your env file:
+      `GC_HYGRAPH_PROJECT_ID=”{YOUR_PROJECT_ID}”`
+4. Add your hygraphManagementApi to your env file like this:
+   `GC_HYGRAPH_MANAGEMENT_API="{YOUR_MANAGEMENT_API}"`
+5. Run `yarn graphcommerce hygraph-migrate`
+6. Select the migration you want to run and press enter.
+7. The migrations should now be applied, check your Hygraph Schema if changes
    are made.

packages/hygraph-cli/Config.graphqls

@@ -45,4 +45,9 @@ extend input GraphCommerceConfig {
   Hygraph Project ID. **Only used for migrations.**
   """
   hygraphProjectId: String
+
+  """
+  Hygraph Management API. **Only used for migrations.**
+  """
+  hygraphManagementApi: String
 }

packages/hygraph-cli/dist/migrations/graphcommerce6to7.js

@@ -196,6 +196,13 @@ const graphcommerce6to7 = async (schema) => {
         enumerationApiId: 'RowColumnOneVariants',
         parentApiId: 'RowColumnOne',
     }, 'RowColumnOne', 'model');
+    (0, migrationAction_1.migrationAction)(schema, 'componentUnionField', 'create', {
+        displayName: 'Conditions',
+        apiId: 'conditions',
+        parentApiId: 'ConditionOr',
+        componentApiIds: ['ConditionText', 'ConditionNumber'],
+        isList: true,
+    }, 'ConditionOr', 'component');
     return migrationAction_1.client.run(true);
 };
 exports.graphcommerce6to7 = graphcommerce6to7;

packages/hygraph-cli/dist/readSchema.js

@@ -13,7 +13,7 @@ const readSchema = async (config) => {
     const projectId = config.hygraphProjectId;
     const hygraphClient = new client_1.ApolloClient({
         link: new client_1.HttpLink({
-            uri: 'https://management.hygraph.com/graphql',
+            uri: config.hygraphManagementApi ?? 'https://management.hygraph.com/graphql',
             fetch: fetch_1.fetch,
             headers: { Authorization: `Bearer ${config.hygraphWriteAccessToken}` },
         }),

packages/hygraph-cli/src/migrations/graphcommerce6to7.ts

@@ -303,5 +303,20 @@ export const graphcommerce6to7 = async (schema: Schema) => {
     'model',
   )
 
+  migrationAction(
+    schema,
+    'componentUnionField',
+    'create',
+    {
+      displayName: 'Conditions',
+      apiId: 'conditions',
+      parentApiId: 'ConditionOr',
+      componentApiIds: ['ConditionText', 'ConditionNumber'],
+      isList: true,
+    },
+    'ConditionOr',
+    'component',
+  )
+
   return client.run(true)
 }

packages/hygraph-cli/src/readSchema.ts

@@ -15,7 +15,7 @@ export const readSchema = async (config: GraphCommerceConfig) => {
 
   const hygraphClient = new ApolloClient({
     link: new HttpLink({
-      uri: 'https://management.hygraph.com/graphql',
+      uri: config.hygraphManagementApi ?? 'https://management.hygraph.com/graphql',
       fetch,
       headers: { Authorization: `Bearer ${config.hygraphWriteAccessToken}` },
     }),

packagesDev/next-config/dist/generated/config.js

@@ -1,136 +1,94 @@
-/* eslint-disable */ "use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    CompareVariantSchema: function() {
-        return CompareVariantSchema;
-    },
-    GraphCommerceConfigSchema: function() {
-        return GraphCommerceConfigSchema;
-    },
-    GraphCommerceDebugConfigSchema: function() {
-        return GraphCommerceDebugConfigSchema;
-    },
-    GraphCommerceStorefrontConfigSchema: function() {
-        return GraphCommerceStorefrontConfigSchema;
-    },
-    MagentoConfigurableVariantValuesSchema: function() {
-        return MagentoConfigurableVariantValuesSchema;
-    },
-    ProductFiltersLayoutSchema: function() {
-        return ProductFiltersLayoutSchema;
-    },
-    RecentlyViewedProductsConfigSchema: function() {
-        return RecentlyViewedProductsConfigSchema;
-    },
-    SidebarGalleryConfigSchema: function() {
-        return SidebarGalleryConfigSchema;
-    },
-    SidebarGalleryPaginationVariantSchema: function() {
-        return SidebarGalleryPaginationVariantSchema;
-    },
-    definedNonNullAnySchema: function() {
-        return definedNonNullAnySchema;
-    },
-    isDefinedNonNullAny: function() {
-        return isDefinedNonNullAny;
-    }
-});
-const _zod = require("zod");
-const isDefinedNonNullAny = (v)=>v !== undefined && v !== null;
-const definedNonNullAnySchema = _zod.z.any().refine((v)=>isDefinedNonNullAny(v));
-const CompareVariantSchema = _zod.z.enum([
-    "CHECKBOX",
-    "ICON"
-]);
-const ProductFiltersLayoutSchema = _zod.z.enum([
-    "DEFAULT",
-    "SIDEBAR"
-]);
-const SidebarGalleryPaginationVariantSchema = _zod.z.enum([
-    "DOTS",
-    "THUMBNAILS_BOTTOM"
-]);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SidebarGalleryConfigSchema = exports.RecentlyViewedProductsConfigSchema = exports.MagentoConfigurableVariantValuesSchema = exports.GraphCommerceStorefrontConfigSchema = exports.GraphCommerceDebugConfigSchema = exports.GraphCommerceConfigSchema = exports.SidebarGalleryPaginationVariantSchema = exports.ProductFiltersLayoutSchema = exports.CompareVariantSchema = exports.definedNonNullAnySchema = exports.isDefinedNonNullAny = void 0;
+/* eslint-disable */
+const zod_1 = require("zod");
+const isDefinedNonNullAny = (v) => v !== undefined && v !== null;
+exports.isDefinedNonNullAny = isDefinedNonNullAny;
+exports.definedNonNullAnySchema = zod_1.z.any().refine((v) => (0, exports.isDefinedNonNullAny)(v));
+exports.CompareVariantSchema = zod_1.z.enum(['CHECKBOX', 'ICON']);
+exports.ProductFiltersLayoutSchema = zod_1.z.enum(['DEFAULT', 'SIDEBAR']);
+exports.SidebarGalleryPaginationVariantSchema = zod_1.z.enum(['DOTS', 'THUMBNAILS_BOTTOM']);
 function GraphCommerceConfigSchema() {
-    return _zod.z.object({
-        canonicalBaseUrl: _zod.z.string().min(1),
-        cartDisplayPricesInclTax: _zod.z.boolean().nullish(),
-        compare: _zod.z.boolean().nullish(),
-        compareVariant: CompareVariantSchema.nullish(),
-        configurableVariantForSimple: _zod.z.boolean().nullish(),
+    return zod_1.z.object({
+        canonicalBaseUrl: zod_1.z.string().min(1),
+        cartDisplayPricesInclTax: zod_1.z.boolean().nullish(),
+        compare: zod_1.z.boolean().nullish(),
+        compareVariant: exports.CompareVariantSchema.nullish(),
+        configurableVariantForSimple: zod_1.z.boolean().nullish(),
         configurableVariantValues: MagentoConfigurableVariantValuesSchema().nullish(),
-        crossSellsHideCartItems: _zod.z.boolean().nullish(),
-        crossSellsRedirectItems: _zod.z.boolean().nullish(),
-        customerRequireEmailConfirmation: _zod.z.boolean().nullish(),
+        crossSellsHideCartItems: zod_1.z.boolean().nullish(),
+        crossSellsRedirectItems: zod_1.z.boolean().nullish(),
+        customerRequireEmailConfirmation: zod_1.z.boolean().nullish(),
         debug: GraphCommerceDebugConfigSchema().nullish(),
-        demoMode: _zod.z.boolean().nullish(),
-        enableGuestCheckoutLogin: _zod.z.boolean().nullish(),
-        googleAnalyticsId: _zod.z.string().nullish(),
-        googleRecaptchaKey: _zod.z.string().nullish(),
-        googleTagmanagerId: _zod.z.string().nullish(),
-        hygraphEndpoint: _zod.z.string().min(1),
-        hygraphProjectId: _zod.z.string().nullish(),
-        hygraphWriteAccessEndpoint: _zod.z.string().nullish(),
-        hygraphWriteAccessToken: _zod.z.string().nullish(),
-        limitSsg: _zod.z.boolean().nullish(),
-        magentoEndpoint: _zod.z.string().min(1),
-        previewSecret: _zod.z.string().nullish(),
-        productFiltersLayout: ProductFiltersLayoutSchema.nullish(),
-        productFiltersPro: _zod.z.boolean().nullish(),
-        productRoute: _zod.z.string().nullish(),
+        demoMode: zod_1.z.boolean().nullish(),
+        enableGuestCheckoutLogin: zod_1.z.boolean().nullish(),
+        googleAnalyticsId: zod_1.z.string().nullish(),
+        googleRecaptchaKey: zod_1.z.string().nullish(),
+        googleTagmanagerId: zod_1.z.string().nullish(),
+        hygraphEndpoint: zod_1.z.string().min(1),
+        hygraphManagementApi: zod_1.z.string().nullish(),
+        hygraphProjectId: zod_1.z.string().nullish(),
+        hygraphWriteAccessEndpoint: zod_1.z.string().nullish(),
+        hygraphWriteAccessToken: zod_1.z.string().nullish(),
+        limitSsg: zod_1.z.boolean().nullish(),
+        magentoEndpoint: zod_1.z.string().min(1),
+        previewSecret: zod_1.z.string().nullish(),
+        productFiltersLayout: exports.ProductFiltersLayoutSchema.nullish(),
+        productFiltersPro: zod_1.z.boolean().nullish(),
+        productRoute: zod_1.z.string().nullish(),
         recentlyViewedProducts: RecentlyViewedProductsConfigSchema().nullish(),
-        robotsAllow: _zod.z.boolean().nullish(),
+        robotsAllow: zod_1.z.boolean().nullish(),
         sidebarGallery: SidebarGalleryConfigSchema().nullish(),
-        storefront: _zod.z.array(GraphCommerceStorefrontConfigSchema()),
-        wishlistHideForGuests: _zod.z.boolean().nullish(),
-        wishlistShowFeedbackMessage: _zod.z.boolean().nullish()
+        storefront: zod_1.z.array(GraphCommerceStorefrontConfigSchema()),
+        wishlistHideForGuests: zod_1.z.boolean().nullish(),
+        wishlistShowFeedbackMessage: zod_1.z.boolean().nullish()
     });
 }
+exports.GraphCommerceConfigSchema = GraphCommerceConfigSchema;
 function GraphCommerceDebugConfigSchema() {
-    return _zod.z.object({
-        pluginStatus: _zod.z.boolean().nullish(),
-        sessions: _zod.z.boolean().nullish(),
-        webpackCircularDependencyPlugin: _zod.z.boolean().nullish(),
-        webpackDuplicatesPlugin: _zod.z.boolean().nullish()
+    return zod_1.z.object({
+        pluginStatus: zod_1.z.boolean().nullish(),
+        sessions: zod_1.z.boolean().nullish(),
+        webpackCircularDependencyPlugin: zod_1.z.boolean().nullish(),
+        webpackDuplicatesPlugin: zod_1.z.boolean().nullish()
     });
 }
+exports.GraphCommerceDebugConfigSchema = GraphCommerceDebugConfigSchema;
 function GraphCommerceStorefrontConfigSchema() {
-    return _zod.z.object({
-        canonicalBaseUrl: _zod.z.string().nullish(),
-        cartDisplayPricesInclTax: _zod.z.boolean().nullish(),
-        defaultLocale: _zod.z.boolean().nullish(),
-        domain: _zod.z.string().nullish(),
-        googleAnalyticsId: _zod.z.string().nullish(),
-        googleRecaptchaKey: _zod.z.string().nullish(),
-        googleTagmanagerId: _zod.z.string().nullish(),
-        hygraphLocales: _zod.z.array(_zod.z.string().min(1)).nullish(),
-        linguiLocale: _zod.z.string().nullish(),
-        locale: _zod.z.string().min(1),
-        magentoStoreCode: _zod.z.string().min(1)
+    return zod_1.z.object({
+        canonicalBaseUrl: zod_1.z.string().nullish(),
+        cartDisplayPricesInclTax: zod_1.z.boolean().nullish(),
+        defaultLocale: zod_1.z.boolean().nullish(),
+        domain: zod_1.z.string().nullish(),
+        googleAnalyticsId: zod_1.z.string().nullish(),
+        googleRecaptchaKey: zod_1.z.string().nullish(),
+        googleTagmanagerId: zod_1.z.string().nullish(),
+        hygraphLocales: zod_1.z.array(zod_1.z.string().min(1)).nullish(),
+        linguiLocale: zod_1.z.string().nullish(),
+        locale: zod_1.z.string().min(1),
+        magentoStoreCode: zod_1.z.string().min(1)
     });
 }
+exports.GraphCommerceStorefrontConfigSchema = GraphCommerceStorefrontConfigSchema;
 function MagentoConfigurableVariantValuesSchema() {
-    return _zod.z.object({
-        content: _zod.z.boolean().nullish(),
-        gallery: _zod.z.boolean().nullish(),
-        url: _zod.z.boolean().nullish()
+    return zod_1.z.object({
+        content: zod_1.z.boolean().nullish(),
+        gallery: zod_1.z.boolean().nullish(),
+        url: zod_1.z.boolean().nullish()
     });
 }
+exports.MagentoConfigurableVariantValuesSchema = MagentoConfigurableVariantValuesSchema;
 function RecentlyViewedProductsConfigSchema() {
-    return _zod.z.object({
-        enabled: _zod.z.boolean().nullish(),
-        maxCount: _zod.z.number().nullish()
+    return zod_1.z.object({
+        enabled: zod_1.z.boolean().nullish(),
+        maxCount: zod_1.z.number().nullish()
     });
 }
+exports.RecentlyViewedProductsConfigSchema = RecentlyViewedProductsConfigSchema;
 function SidebarGalleryConfigSchema() {
-    return _zod.z.object({
-        paginationVariant: SidebarGalleryPaginationVariantSchema.nullish()
+    return zod_1.z.object({
+        paginationVariant: exports.SidebarGalleryPaginationVariantSchema.nullish()
     });
 }
+exports.SidebarGalleryConfigSchema = SidebarGalleryConfigSchema;

packagesDev/next-config/dist/withGraphCommerce.js

@@ -65,19 +65,17 @@ function withGraphCommerce(nextConfig, cwd) {
         },
         redirects: async () => {
             const redirects = (await nextConfig.redirects?.()) ?? [];
-            if (!graphcommerceConfig.legacyProductRoute) {
-                const destination = `${graphcommerceConfig.productRoute ?? '/p/'}:url*`;
-                redirects.push(...[
-                    { source: '/product/bundle/:url*', destination, permanent: true },
-                    { source: '/product/configurable/:url*', destination, permanent: true },
-                    { source: '/product/downloadable/:url*', destination, permanent: true },
-                    { source: '/product/grouped/:url*', destination, permanent: true },
-                    { source: '/product/virtual/:url*', destination, permanent: true },
-                    { source: '/customer/account', destination: '/account', permanent: true },
-                ]);
-                if (destination !== '/product/:url*')
-                    redirects.push({ source: '/product/:url*', destination, permanent: true });
-            }
+            const destination = `${graphcommerceConfig.productRoute ?? '/p/'}:url*`;
+            redirects.push(...[
+                { source: '/product/bundle/:url*', destination, permanent: true },
+                { source: '/product/configurable/:url*', destination, permanent: true },
+                { source: '/product/downloadable/:url*', destination, permanent: true },
+                { source: '/product/grouped/:url*', destination, permanent: true },
+                { source: '/product/virtual/:url*', destination, permanent: true },
+                { source: '/customer/account', destination: '/account', permanent: true },
+            ]);
+            if (destination !== '/product/:url*')
+                redirects.push({ source: '/product/:url*', destination, permanent: true });
             return redirects;
         },
         rewrites: async () => {

packagesDev/next-config/src/generated/config.ts

@@ -211,6 +211,8 @@ export type GraphCommerceConfig = {
    * Project settings -> API Access -> High Performance Read-only Content API
    */
   hygraphEndpoint: Scalars['String']['input'];
+  /** Hygraph Management API. **Only used for migrations.** */
+  hygraphManagementApi?: InputMaybe<Scalars['String']['input']>;
   /** Hygraph Project ID. **Only used for migrations.** */
   hygraphProjectId?: InputMaybe<Scalars['String']['input']>;
   /**
@@ -444,6 +446,7 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
     googleRecaptchaKey: z.string().nullish(),
     googleTagmanagerId: z.string().nullish(),
     hygraphEndpoint: z.string().min(1),
+    hygraphManagementApi: z.string().nullish(),
     hygraphProjectId: z.string().nullish(),
     hygraphWriteAccessEndpoint: z.string().nullish(),
     hygraphWriteAccessToken: z.string().nullish(),