@contentstack/cli-cm-bootstrap 2.0.0-beta.5 → 2.0.0-beta.7

package/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/2.0.0-beta.5 linux-x64 node-v22.22.0
+@contentstack/cli-cm-bootstrap/2.0.0-beta.7 linux-x64 node-v22.22.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/bootstrap/utils.js

@@ -6,6 +6,7 @@ const path = require("path");
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const interactive_1 = require("../bootstrap/interactive");
 const messages_1 = require("../messages");
+const region_handler_1 = require("@contentstack/cli-config/lib/utils/region-handler");
 /**
  * @description Setup the environment for a given app for each environment
  * Loads the environments for a given stack
@@ -158,25 +159,45 @@ const envFileHandler = async (appConfigKey, environmentVariables, clonedDirector
     const cdnHost = (_d = region === null || region === void 0 ? void 0 : region.cda) === null || _d === void 0 ? void 0 : _d.substring('8');
     const appHost = (_e = region === null || region === void 0 ? void 0 : region.uiHost) === null || _e === void 0 ? void 0 : _e.substring(8);
     const isUSRegion = regionName === 'us' || regionName === 'na';
+    const isPredefinedRegion = (region === null || region === void 0 ? void 0 : region.name) && Object.keys(region_handler_1.regions).some(key => key.toLowerCase() === region.name.toLowerCase());
     if (regionName !== 'eu' && !isUSRegion) {
         customHost = (_f = region === null || region === void 0 ? void 0 : region.cma) === null || _f === void 0 ? void 0 : _f.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 === null || region === void 0 ? void 0 : region.cda) {
+    const getGraphqlHost = () => {
+        if (!isPredefinedRegion) {
+            return cdnHost.replace('-cdn.', '-graphql.');
+        }
+        const normalizedRegion = regionName === null || regionName === void 0 ? void 0 : 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;
+    if (isPredefinedRegion && (region === null || region === void 0 ? void 0 : region.cda)) {
         const baseHost = region.cda.replace(/^https?:\/\//, '').replace(/^[^.]+\./, '');
         imageHostname = `images.${baseHost}`;
     }
+    else if (region === null || region === void 0 ? void 0 : 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 = (0, cli_utilities_1.pathValidator)(path.join((0, cli_utilities_1.sanitizePath)(clonedDirectory), (0, cli_utilities_1.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 = (0, cli_utilities_1.pathValidator)(path.join((0, cli_utilities_1.sanitizePath)(clonedDirectory), (0, cli_utilities_1.sanitizePath)(fileName)));

package/oclif.manifest.json

@@ -115,5 +115,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.5"
+  "version": "2.0.0-beta.7"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -16,14 +16,14 @@
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~2.0.0-beta.5",
+    "@contentstack/cli-cm-seed": "~2.0.0-beta.7",
     "@contentstack/cli-command": "~1.7.2",
-    "@contentstack/cli-utilities": "~1.17.0",
+    "@contentstack/cli-utilities": "~1.17.2",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
+    "@oclif/plugin-help": "^6.2.37",
     "inquirer": "8.2.7",
     "mkdirp": "^1.0.4",
-    "tar": "^7.5.6 "
+    "tar": "^7.5.7"
   },
   "devDependencies": {
     "@oclif/test": "^4.1.13",
@@ -38,7 +38,7 @@
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
     "oclif": "^4.17.46",
-    "tmp": "^0.2.3",
+    "tmp": "^0.2.5",
     "ts-node": "^8.10.2",
     "typescript": "^4.9.5"
   },