Merge pull request #2369 from contentstack/fix/kickstart-apps

Fixed kickstart apps breaking issue in bootstrap command

Author: sunil-lakshman

.talismanrc

@@ -1,6 +1,8 @@
 fileignoreconfig:
 - filename: package-lock.json
-  checksum: 20001b2b16e2ab8cc8a3ccc30cebb5093c5c63f58e5b5fe64889d260a8d4cc56
+  checksum: 09bde87514151440d68bc6154984a984c536728e37d18173bab4fdb53827dadd
 - filename: pnpm-lock.yaml
-  checksum: c2982bbd478bd9aabcc12bc162d2a76e2635d70023674a677dea996a8671e9ab
+  checksum: e81b8b629ff23df0cd27af8c055c9bb3718b68e388fd9ff5e3485ef37bfe794b
+- filename: packages/contentstack-bootstrap/src/bootstrap/utils.ts
+  checksum: 6e6fb00bb11b03141e5ad27eeaa4af9718dc30520c3e73970bc208cc0ba2a7d2
 version: '1.0'

package-lock.json

@@ -26,7 +26,7 @@
     "chalk": "^4.1.2",
     "fast-csv": "^4.3.6",
     "fs-extra": "^11.3.0",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "uuid": "^9.0.1",
     "winston": "^3.17.0"
   },

packages/contentstack-audit/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {

packages/contentstack-bootstrap/package.json

@@ -4,6 +4,7 @@ import { cliux, pathValidator, sanitizePath } from '@contentstack/cli-utilities'
 import { continueBootstrapCommand } from '../bootstrap/interactive';
 import { AppConfig } from '../config';
 import messageHandler from '../messages';
+import { regions } from '@contentstack/cli-config/lib/utils/region-handler';
 
 interface EnvironmentVariables {
   api_key: string;
@@ -187,27 +188,59 @@ const envFileHandler = async (
   const cdnHost = region?.cda?.substring('8');
   const appHost = region?.uiHost?.substring(8);
   const isUSRegion = regionName === 'us' || regionName === 'na';
+  
+  const isPredefinedRegion = region?.name && Object.keys(regions).some(
+    key => key.toLowerCase() === region.name.toLowerCase()
+  );
+  
   if (regionName !== 'eu' && !isUSRegion) {
     customHost = region?.cma?.substring(8);
   }
-  let graphqlHost = "graphql.contentstack.com";
-  if(regionName != 'na'){
-    graphqlHost = `${regionName}-.graphql.contentstack.com`;
-  }
-
 
-  // Construct image hostname based on the actual host being used
-  let imageHostname = '*-images.contentstack.com'; // default fallback
-  if (region?.cda) {
+  const getGraphqlHost = (): string => {
+    if (!isPredefinedRegion) {
+      return cdnHost.replace('-cdn.', '-graphql.');
+    }
+    const normalizedRegion = regionName?.toLowerCase();
+    if (!normalizedRegion || normalizedRegion === 'na' || normalizedRegion === 'aws-na' || normalizedRegion === 'us') {
+      return cdnHost.replace('cdn.', 'graphql.').replace('.io', '.com');
+    }
+    return cdnHost.replace('-cdn.', '-graphql.');
+  };
+  const graphqlHost = getGraphqlHost();
+
+  let imageHostname: string;
+  if (isPredefinedRegion && region?.cda) {
     const baseHost = region.cda.replace(/^https?:\/\//, '').replace(/^[^.]+\./, '');
     imageHostname = `images.${baseHost}`;
+  } else if (region?.cda) {
+    const baseHost = region.cda.replace(/^https?:\/\//, '').replace(/^[^.]+\./, '');
+    imageHostname = `*-images.${baseHost}`;
+  } else {
+    //default
+    imageHostname = '*-images.contentstack.com';
   }
   const production = environmentVariables.environment === 'production' ? true : false;
   switch (appConfigKey) {
     case 'kickstart-next':
     case 'kickstart-next-ssr':
     case 'kickstart-next-ssg':
     case 'kickstart-next-middleware':
+      fileName = `.env`;
+      filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));
+      content = `NEXT_PUBLIC_CONTENTSTACK_API_KEY=${environmentVariables.api_key
+        }\nNEXT_PUBLIC_CONTENTSTACK_DELIVERY_TOKEN=${environmentVariables.deliveryToken
+        }\nNEXT_PUBLIC_CONTENTSTACK_PREVIEW_TOKEN=${environmentVariables.preview_token || ''
+        }\nNEXT_PUBLIC_CONTENTSTACK_ENVIRONMENT=${environmentVariables.environment
+        }\nNEXT_PUBLIC_CONTENTSTACK_REGION=${regionName
+        }\nNEXT_PUBLIC_CONTENTSTACK_PREVIEW=${livePreviewEnabled ? 'true' : 'false'
+        }\nNEXT_PUBLIC_CONTENTSTACK_CONTENT_DELIVERY = ${cdnHost
+        }\nNEXT_PUBLIC_CONTENTSTACK_CONTENT_APPLICATION = ${appHost
+        }\nNEXT_PUBLIC_CONTENTSTACK_PREVIEW_HOST = ${previewHost
+        }\nNEXT_PUBLIC_CONTENTSTACK_IMAGE_HOSTNAME=${imageHostname}`;
+
+      result = await writeEnvFile(content, filePath);
+      break;
     case 'kickstart-next-graphql':
       fileName = `.env`;
       filePath = pathValidator(path.join(sanitizePath(clonedDirectory), sanitizePath(fileName)));

packages/contentstack-bootstrap/src/bootstrap/utils.ts

@@ -11,7 +11,7 @@
     "@contentstack/cli-utilities": "~1.17.1",
     "chalk": "^4.1.2",
     "just-diff": "^6.0.2",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.23"
   },
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "~1.3.0",

packages/contentstack-branches/package.json

@@ -13,7 +13,7 @@
     "chalk": "^4.1.2",
     "dotenv": "^16.5.0",
     "inquirer": "8.2.7",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "winston": "^3.17.0"
   },
   "devDependencies": {

packages/contentstack-bulk-publish/package.json

@@ -14,7 +14,7 @@
     "@oclif/plugin-help": "^6.2.28",
     "chalk": "^4.1.2",
     "inquirer": "8.2.7",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "merge": "^2.1.1",
     "ora": "^5.4.1",
     "prompt": "^1.3.0",

packages/contentstack-clone/package.json

@@ -25,7 +25,7 @@
     "@contentstack/cli-utilities": "~1.17.1",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.23"
   },
   "devDependencies": {
     "@oclif/test": "^4.1.13",

packages/contentstack-config/package.json

@@ -22,7 +22,7 @@
   "license": "MIT",
   "dependencies": {
     "@oclif/core": "^4.3.0",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.23",
     "fancy-test": "^2.0.42",
     "@oclif/test": "^4.1.13"
   },