@sitecore-content-sdk/cli 0.1.0-beta.23 → 0.1.0-beta.25

package/dist/cjs/scripts/scaffold.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.builder = builder;
 exports.args = args;
 exports.handler = handler;
-const path_1 = __importDefault(require("path"));
 const tools_1 = require("@sitecore-content-sdk/core/tools");
 const load_config_1 = __importDefault(require("../utils/load-config"));
 const config_1 = require("@sitecore-content-sdk/core/config");
@@ -63,8 +62,7 @@ dashes, or underscores. It can also contain slashes to indicate a subfolder`);
     const cliConfig = (0, load_config_1.default)(argv.config);
     const componentPath = regExResult[1];
     const componentName = regExResult[2];
-    const filename = `${componentName}.tsx`;
-    const outputFilePath = path_1.default.join(componentPath || 'src/components', filename);
+    const outputFolder = componentPath || 'src/components';
     const templateName = (_a = argv.templateName) !== null && _a !== void 0 ? _a : (argv.byoc ? config_1.ComponentTemplateType.BYOC : config_1.ComponentTemplateType.DEFAULT);
-    (0, tools_1.scaffoldComponent)(outputFilePath, componentName, templateName, cliConfig.scaffold.templates);
+    (0, tools_1.scaffoldComponent)(outputFolder, componentName, templateName, cliConfig.scaffold.templates);
 }

package/dist/cjs/utils/load-config.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = loadCliConfig;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const process_env_1 = __importDefault(require("./process-env"));
 const tsx = require('tsx/cjs/api');
 /**
  * Loads Sitecore Content SDK CLI configuration from the specified file.
@@ -21,6 +22,15 @@ function loadCliConfig(configFile) {
             configFile = './sitecore.cli.config.js';
         }
     }
+    else {
+        // configuration file/filepath has been provided
+        // the env variables have been already loaded from the current working directory, however the current command may be running outside of a context of a project
+        // if so try loading the env vars from the directory of the provided config file
+        const configFileDirectory = path_1.default.dirname(path_1.default.resolve(process.cwd(), configFile));
+        if (process.cwd() !== configFileDirectory) {
+            (0, process_env_1.default)(configFileDirectory);
+        }
+    }
     let cliConfig;
     try {
         cliConfig = tsx.require(path_1.default.resolve(process.cwd(), configFile), __filename);

package/dist/esm/scripts/scaffold.js

@@ -1,4 +1,3 @@
-import path from 'path';
 import { scaffoldComponent } from '@sitecore-content-sdk/core/tools';
 import loadCliConfig from '../utils/load-config';
 import { ComponentTemplateType } from '@sitecore-content-sdk/core/config';
@@ -55,8 +54,7 @@ dashes, or underscores. It can also contain slashes to indicate a subfolder`);
     const cliConfig = loadCliConfig(argv.config);
     const componentPath = regExResult[1];
     const componentName = regExResult[2];
-    const filename = `${componentName}.tsx`;
-    const outputFilePath = path.join(componentPath || 'src/components', filename);
+    const outputFolder = componentPath || 'src/components';
     const templateName = (_a = argv.templateName) !== null && _a !== void 0 ? _a : (argv.byoc ? ComponentTemplateType.BYOC : ComponentTemplateType.DEFAULT);
-    scaffoldComponent(outputFilePath, componentName, templateName, cliConfig.scaffold.templates);
+    scaffoldComponent(outputFolder, componentName, templateName, cliConfig.scaffold.templates);
 }

package/dist/esm/utils/load-config.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import fs from 'fs';
+import processEnv from './process-env';
 const tsx = require('tsx/cjs/api');
 /**
  * Loads Sitecore Content SDK CLI configuration from the specified file.
@@ -15,6 +16,15 @@ export default function loadCliConfig(configFile) {
             configFile = './sitecore.cli.config.js';
         }
     }
+    else {
+        // configuration file/filepath has been provided
+        // the env variables have been already loaded from the current working directory, however the current command may be running outside of a context of a project
+        // if so try loading the env vars from the directory of the provided config file
+        const configFileDirectory = path.dirname(path.resolve(process.cwd(), configFile));
+        if (process.cwd() !== configFileDirectory) {
+            processEnv(configFileDirectory);
+        }
+    }
     let cliConfig;
     try {
         cliConfig = tsx.require(path.resolve(process.cwd(), configFile), __filename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/cli",
-  "version": "0.1.0-beta.23",
+  "version": "0.1.0-beta.25",
   "description": "Sitecore JSS command-line",
   "main": "dist/cjs/cli.js",
   "module": "dist/esm/cli.js",
@@ -34,7 +34,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-content-sdk/core": "0.1.0-beta.23",
+    "@sitecore-content-sdk/core": "0.1.0-beta.25",
     "dotenv": "^16.4.7",
     "dotenv-expand": "^12.0.1",
     "resolve": "^1.22.10",
@@ -61,7 +61,7 @@
     "ts-node": "^10.9.1",
     "typescript": "~5.7.3"
   },
-  "gitHead": "e51a9eb11fceedefb6f378a5e8427cac40f05784",
+  "gitHead": "68a72d5756c881644e1ea36b853af1e0843ca938",
   "files": [
     "dist",
     "types"