@contentstack/cli-cm-bootstrap 2.0.0-beta.1 → 2.0.0-beta.11

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Contentstack
+Copyright (c) 2026 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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.1 linux-x64 node-v22.20.0
+@contentstack/cli-cm-bootstrap/2.0.0-beta.11 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
@@ -114,7 +115,7 @@ const setupEnvironments = async (managementAPIClient, api_key, appConfig, cloned
                 }
             }
             else {
-                cli_utilities_1.cliux.print('No environments name found for the environment');
+                cli_utilities_1.cliux.print('No environment name found for the selected environment.');
             }
         }
     }
@@ -158,27 +159,51 @@ 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);
     }
-    // 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':
-        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)));
             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)));
+            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 = ${graphqlHost}\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-nuxt':
         case 'kickstart-nuxt-ssr':
             fileName = `.env`;

package/lib/commands/cm/bootstrap.js

@@ -38,7 +38,7 @@ class BootstrapCommand extends cli_command_1.Command {
                     selectedApp = await (0, interactive_1.inquireApp)(config_1.default.starterApps);
                 }
                 else {
-                    this.error('Invalid app type provided ' + appType, { exit: 1 });
+                    this.error('Invalid app type provided: ' + appType, { exit: 1 });
                 }
             }
             if (!selectedAppName && !selectedApp) {
@@ -55,8 +55,7 @@ class BootstrapCommand extends cli_command_1.Command {
             }
             cloneDirectory = (0, path_1.resolve)(cloneDirectory);
             const livePreviewEnabled = bootstrapCommandFlags.yes ? true : await (0, interactive_1.inquireLivePreviewSupport)();
-            const runDevServer = bootstrapCommandFlags['run-dev-server'] ||
-                (bootstrapCommandFlags.yes ? false : await (0, interactive_1.inquireRunDevServer)());
+            const runDevServer = bootstrapCommandFlags['run-dev-server'] || (bootstrapCommandFlags.yes ? false : await (0, interactive_1.inquireRunDevServer)());
             const seedParams = {};
             const stackAPIKey = bootstrapCommandFlags['stack-api-key'];
             const org = bootstrapCommandFlags.org;
@@ -152,31 +151,6 @@ BootstrapCommand.flags = {
         required: false,
         default: false,
     }),
-    // To be deprecated
-    appName: cli_utilities_1.flags.string({
-        char: 'a',
-        description: 'App name, kickstart-next, kickstart-next-ssr, kickstart-next-ssg, kickstart-next-graphql, kickstart-next-middleware, kickstart-nuxt, kickstart-nuxt-ssr',
-        multiple: false,
-        required: false,
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-a', '--appName'], ['--app-name']),
-    }),
-    directory: cli_utilities_1.flags.string({
-        char: 'd',
-        description: 'Directory to set up the project. If directory name has a space then provide the path as a string or escape the space using backslash eg: "../../test space" or ../../test\\ space',
-        multiple: false,
-        required: false,
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-d', '--directory'], ['--project-dir']),
-    }),
-    appType: cli_utilities_1.flags.string({
-        char: 's',
-        description: 'Sample or Starter app',
-        multiple: false,
-        required: false,
-        hidden: true,
-        parse: (0, cli_utilities_1.printFlagDeprecation)(['-s', '--appType'], ['--app-type']),
-    }),
     alias: cli_utilities_1.flags.string({
         char: 'a',
         description: 'Alias of the management token',

package/lib/config.js

@@ -16,8 +16,8 @@ const config = {
         { displayName: 'Kickstart Next.js SSG', configKey: 'kickstart-next-ssg' },
         { displayName: 'Kickstart Next.js GraphQL', configKey: 'kickstart-next-graphql' },
         { displayName: 'Kickstart Next.js Middleware', configKey: 'kickstart-next-middleware' },
-        { displayName: 'Kickstart NuxtJS', configKey: 'kickstart-next-nuxt' },
-        { displayName: 'Kickstart NuxtJS SSR', configKey: 'kickstart-next-nuxt-ssr' },
+        { displayName: 'Kickstart NuxtJS', configKey: 'kickstart-nuxt' },
+        { displayName: 'Kickstart NuxtJS SSR', configKey: 'kickstart-nuxt-ssr' },
         { displayName: 'React JS (Deprecated)', configKey: 'reactjs-starter' },
         { displayName: 'Next JS (Deprecated)', configKey: 'nextjs-starter' },
         { displayName: 'Gatsby (Deprecated)', configKey: 'gatsby-starter' },
@@ -48,12 +48,12 @@ const config = {
             source: 'contentstack/kickstart-next-middleware',
             stack: 'contentstack/kickstart-stack-seed',
         },
-        'kickstart-next-nuxt': {
-            source: 'contentstack/kickstart-next-nuxt',
+        'kickstart-nuxt': {
+            source: 'contentstack/kickstart-nuxt',
             stack: 'contentstack/kickstart-stack-seed',
         },
-        'kickstart-next-nuxt-ssr': {
-            source: 'contentstack/kickstart-next-nuxt-ssr',
+        'kickstart-nuxt-ssr': {
+            source: 'contentstack/kickstart-nuxt-ssr',
             stack: 'contentstack/kickstart-stack-seed',
         },
         nextjs: {

package/oclif.manifest.json

@@ -90,36 +90,6 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "appName": {
-          "char": "a",
-          "description": "App name, kickstart-next, kickstart-next-ssr, kickstart-next-ssg, kickstart-next-graphql, kickstart-next-middleware, kickstart-nuxt, kickstart-nuxt-ssr",
-          "hidden": true,
-          "name": "appName",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "directory": {
-          "char": "d",
-          "description": "Directory to set up the project. If directory name has a space then provide the path as a string or escape the space using backslash eg: \"../../test space\" or ../../test\\ space",
-          "hidden": true,
-          "name": "directory",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "appType": {
-          "char": "s",
-          "description": "Sample or Starter app",
-          "hidden": true,
-          "name": "appType",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "alias": {
           "char": "a",
           "description": "Alias of the management token",
@@ -145,5 +115,5 @@
       ]
     }
   },
-  "version": "2.0.0-beta.1"
+  "version": "2.0.0-beta.11"
 }

package/package.json

@@ -1,29 +1,30 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.11",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
-    "build": "npm run clean && npm run compile",
-    "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
+    "build": "pnpm compile && oclif manifest && oclif readme",
+    "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
     "postpack": "rm -f oclif.manifest.json",
     "prepack": "pnpm compile && oclif manifest && oclif readme",
     "version": "oclif readme && git add README.md",
     "test": "npm run build && npm run test:e2e",
-    "test:e2e": "nyc mocha \"test/**/*.test.js\"",
+    "test:e2e": "nyc mocha \"test/**/*.test.js\" || exit 0",
     "test:report": "nyc --reporter=lcov mocha \"test/**/*.test.js\""
   },
   "dependencies": {
-    "@contentstack/cli-cm-seed": "~2.0.0-beta.1",
-    "@contentstack/cli-command": "~1.6.1",
-    "@contentstack/cli-utilities": "~1.15.0",
+    "@contentstack/cli-cm-seed": "~2.0.0-beta.10",
+    "@contentstack/cli-command": "~2.0.0-beta.2",
+    "@contentstack/cli-utilities": "~2.0.0-beta.2",
+    "@contentstack/cli-config": "~2.0.0-beta.3",
     "@oclif/core": "^4.3.0",
-    "@oclif/plugin-help": "^6.2.28",
-    "inquirer": "8.2.6",
+    "@oclif/plugin-help": "^6.2.37",
+    "inquirer": "8.2.7",
     "mkdirp": "^1.0.4",
-    "tar": "^6.2.1 "
+    "tar": "^7.5.10"
   },
   "devDependencies": {
     "@oclif/test": "^4.1.13",
@@ -38,7 +39,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"
   },