@sitecore-jss/sitecore-jss-dev-tools 22.5.0-beta.11 → 22.5.0-beta.12

package/dist/cjs/auth/fetch-bearer-token.js

@@ -38,6 +38,9 @@ const fetchBearerToken = () => __awaiter(void 0, void 0, void 0, function* () {
                 grant_type: 'client_credentials',
             }),
         });
+        if (!authenticateResponse.ok) {
+            throw new Error(`Status: ${authenticateResponse.status} Mesage: ${authenticateResponse.statusText}`);
+        }
         const jsonResponse = yield authenticateResponse.json();
         return jsonResponse.access_token;
     }

package/dist/cjs/codegen/{extract-components.js → extract-files.js}

@@ -12,41 +12,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractComponents = extractComponents;
+exports.extractFiles = extractFiles;
 const utils_1 = require("./utils");
 const fetch_bearer_token_1 = require("../auth/fetch-bearer-token");
 const chalk_1 = __importDefault(require("chalk"));
+const path_1 = __importDefault(require("path"));
 /**
  * Handler for the extract-component API command
  * Reads imports from the componentBuilder.ts file and posts the code to the mesh endpoint
- * @param {ExtractComponentOptions} [args] - The options for code extraction
+ * @param {ExtracFilesOptions} [args] - The options for code extraction
  * @returns {Promise<void>} void
  */
-function extractComponents() {
+function extractFiles() {
     return __awaiter(this, arguments, void 0, function* (args = {}) {
         if (!validateDeployContext()) {
             console.log(chalk_1.default.yellow('Skipping code extraction, not in deploy context'));
             return;
         }
-        // TODO: add alternative consent procedure when refining later
+        // TODO: add alternative consent procedure
         if (!process.env.EXTRACT_CONSENT) {
             console.log(chalk_1.default.yellow('Skipping code extraction, EXTRACT_CONSENT is not set'));
             return;
         }
         const basePath = process.cwd();
         try {
-            const bearer = yield (0, fetch_bearer_token_1.fetchBearerToken)();
-            if (!bearer) {
+            const token = yield (0, fetch_bearer_token_1.fetchBearerToken)();
+            if (!token) {
                 console.error(chalk_1.default.red('Failed to get bearer token, aborting code extraction'));
                 return;
             }
             const componentPaths = yield (0, utils_1.resolveComponentImportFiles)(basePath, args.componentBuilderPath);
-            const codeDispatches = Array.from(componentPaths, (mapEntry) => (0, utils_1.sendCode)({
+            const fileDispatches = Array.from(componentPaths, (mapEntry) => (0, utils_1.sendCode)({
                 name: mapEntry[0],
                 path: mapEntry[1],
                 type: utils_1.ExtractedFileType.Component,
-            }, bearer));
-            yield Promise.all(codeDispatches);
+            }, token));
+            fileDispatches.push((0, utils_1.sendCode)({
+                name: 'package.json',
+                path: path_1.default.resolve(basePath, './package.json'),
+                type: utils_1.ExtractedFileType.PackageJson,
+            }, token));
+            yield Promise.all(fileDispatches);
         }
         catch (error) {
             console.error(chalk_1.default.red('Error during component extraction:', error));

package/dist/cjs/codegen/utils.js

@@ -41,9 +41,10 @@ const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const ts = __importStar(require("typescript"));
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
-// TODO:adjust when mesh endpoint is live
-const meshEndpoint = `${process.env.SITECORE_EDGE_URL ||
-    sitecore_jss_1.constants.SITECORE_EDGE_URL_DEFAULT}/api/v1/mesh`;
+// MESH_URL is temporary option to use until mesh is onboarded into Edge Proxy
+const meshEndpoint = `${process.env.SITECORE_MESH_URL ||
+    process.env.SITECORE_EDGE_URL ||
+    sitecore_jss_1.constants.SITECORE_EDGE_URL_DEFAULT}/api/v1/contentsdk/code/extracted`;
 /**
  * Type of file to be sent to the mesh endpoint
  */
@@ -51,7 +52,7 @@ var ExtractedFileType;
 (function (ExtractedFileType) {
     ExtractedFileType["Component"] = "component";
     ExtractedFileType["Json"] = "json";
-    ExtractedFileType["Package"] = "package.json";
+    ExtractedFileType["PackageJson"] = "package.json";
 })(ExtractedFileType || (exports.ExtractedFileType = ExtractedFileType = {}));
 /**
  * Parses the componentBuilder.ts file and returns a map of component names
@@ -99,8 +100,13 @@ const resolveComponentImportFiles = (appPath, componentBuilderPath = './src/temp
             const resolvedModule = ts.nodeModuleNameResolver(moduleName, componentBuilderFullPath, tsOptions, tsHost);
             const resolvedFile = (_a = resolvedModule === null || resolvedModule === void 0 ? void 0 : resolvedModule.resolvedModule) === null || _a === void 0 ? void 0 : _a.resolvedFileName;
             // module imports paths will be resolved to /node_modules location - we don't support that yet
-            if (resolvedFile && resolvedFile.indexOf('node_modules') === -1) {
-                importStringsMap[childNode.importClause.getText()] = path_1.default.resolve(resolvedFile);
+            if (resolvedFile) {
+                if (resolvedFile.indexOf('node_modules') === -1 && !resolvedFile.endsWith('.d.ts')) {
+                    importStringsMap[childNode.importClause.getText()] = path_1.default.resolve(resolvedFile);
+                }
+            }
+            else {
+                console.warn('Could not resolve a file for import %s', moduleName);
             }
         }
         else if (ts.isExpressionStatement(childNode)) {
@@ -149,27 +155,38 @@ const sendCode = (file, token) => __awaiter(void 0, void 0, void 0, function* ()
         return;
     }
     const code = fs_1.default.readFileSync(file.path);
-    const response = yield fetch(meshEndpoint, {
-        method: 'POST',
-        headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            name: file.name,
-            content: code.toString(),
-            labels: {
-                properties: {
+    try {
+        const response = yield fetch(meshEndpoint, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                // EnvironmentId can have any value - but it's required
+                EnvironmentId: 'JSS',
+                name: file.name,
+                content: code.toString(),
+                labels: {
                     type: file.type,
                 },
-            },
-        }),
-    });
-    if (!response.ok) {
-        console.error(chalk_1.default.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            }),
+        });
+        if (!response.ok) {
+            console.error(chalk_1.default.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            sitecore_jss_1.debug.http('Error details: %o', {
+                status: response.status,
+                text: yield response.text(),
+                url: response.url,
+                headers: response.headers,
+            });
+            return;
+        }
     }
-    else {
-        console.log(chalk_1.default.green(`Code from ${file.path} extracted and sent to mesh endpoint`));
+    catch (error) {
+        console.error(chalk_1.default.red(`Fetch request to send extracted code from ${file.path} failed: ${JSON.stringify(error)}`));
+        return;
     }
+    console.log(chalk_1.default.green(`Code from ${file.path} extracted and sent to mesh endpoint`));
 });
 exports.sendCode = sendCode;

package/dist/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractComponents = exports.fetchBearerToken = exports.constants = exports.resolveScJssConfig = exports.createDefaultDisconnectedServer = exports.createDefaultDocumentMiddleware = exports.createDisconnectedDictionaryService = exports.createDisconnectedLayoutService = exports.createDisconnectedAssetMiddleware = exports.packageGenerate = exports.packageDeploy = exports.clean = exports.deploy = exports.mergeFs = exports.verifySetup = exports.userConfigPath = exports.setup = exports.replaceConfigTokens = void 0;
+exports.extractFiles = exports.fetchBearerToken = exports.constants = exports.resolveScJssConfig = exports.createDefaultDisconnectedServer = exports.createDefaultDocumentMiddleware = exports.createDisconnectedDictionaryService = exports.createDisconnectedLayoutService = exports.createDisconnectedAssetMiddleware = exports.packageGenerate = exports.packageDeploy = exports.clean = exports.deploy = exports.mergeFs = exports.verifySetup = exports.userConfigPath = exports.setup = exports.replaceConfigTokens = void 0;
 var jss_config_1 = require("./setup/jss-config");
 Object.defineProperty(exports, "replaceConfigTokens", { enumerable: true, get: function () { return jss_config_1.replaceConfigTokens; } });
 var setup_1 = require("./setup/setup");
@@ -48,8 +48,8 @@ var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return sitecore_jss_1.constants; } });
 var fetch_bearer_token_1 = require("./auth/fetch-bearer-token");
 Object.defineProperty(exports, "fetchBearerToken", { enumerable: true, get: function () { return fetch_bearer_token_1.fetchBearerToken; } });
-var extract_components_1 = require("./codegen/extract-components");
-Object.defineProperty(exports, "extractComponents", { enumerable: true, get: function () { return extract_components_1.extractComponents; } });
+var extract_files_1 = require("./codegen/extract-files");
+Object.defineProperty(exports, "extractFiles", { enumerable: true, get: function () { return extract_files_1.extractFiles; } });
 __exportStar(require("./templating"), exports);
 __exportStar(require("./manifest"), exports);
 __exportStar(require("./pipelines"), exports);

package/dist/esm/auth/fetch-bearer-token.js

@@ -32,6 +32,9 @@ export const fetchBearerToken = () => __awaiter(void 0, void 0, void 0, function
                 grant_type: 'client_credentials',
             }),
         });
+        if (!authenticateResponse.ok) {
+            throw new Error(`Status: ${authenticateResponse.status} Mesage: ${authenticateResponse.statusText}`);
+        }
         const jsonResponse = yield authenticateResponse.json();
         return jsonResponse.access_token;
     }

package/dist/esm/codegen/{extract-components.js → extract-files.js}

@@ -10,37 +10,43 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { ExtractedFileType, resolveComponentImportFiles, sendCode } from './utils';
 import { fetchBearerToken } from '../auth/fetch-bearer-token';
 import chalk from 'chalk';
+import path from 'path';
 /**
  * Handler for the extract-component API command
  * Reads imports from the componentBuilder.ts file and posts the code to the mesh endpoint
- * @param {ExtractComponentOptions} [args] - The options for code extraction
+ * @param {ExtracFilesOptions} [args] - The options for code extraction
  * @returns {Promise<void>} void
  */
-export function extractComponents() {
+export function extractFiles() {
     return __awaiter(this, arguments, void 0, function* (args = {}) {
         if (!validateDeployContext()) {
             console.log(chalk.yellow('Skipping code extraction, not in deploy context'));
             return;
         }
-        // TODO: add alternative consent procedure when refining later
+        // TODO: add alternative consent procedure
         if (!process.env.EXTRACT_CONSENT) {
             console.log(chalk.yellow('Skipping code extraction, EXTRACT_CONSENT is not set'));
             return;
         }
         const basePath = process.cwd();
         try {
-            const bearer = yield fetchBearerToken();
-            if (!bearer) {
+            const token = yield fetchBearerToken();
+            if (!token) {
                 console.error(chalk.red('Failed to get bearer token, aborting code extraction'));
                 return;
             }
             const componentPaths = yield resolveComponentImportFiles(basePath, args.componentBuilderPath);
-            const codeDispatches = Array.from(componentPaths, (mapEntry) => sendCode({
+            const fileDispatches = Array.from(componentPaths, (mapEntry) => sendCode({
                 name: mapEntry[0],
                 path: mapEntry[1],
                 type: ExtractedFileType.Component,
-            }, bearer));
-            yield Promise.all(codeDispatches);
+            }, token));
+            fileDispatches.push(sendCode({
+                name: 'package.json',
+                path: path.resolve(basePath, './package.json'),
+                type: ExtractedFileType.PackageJson,
+            }, token));
+            yield Promise.all(fileDispatches);
         }
         catch (error) {
             console.error(chalk.red('Error during component extraction:', error));

package/dist/esm/codegen/utils.js

@@ -11,10 +11,11 @@ import chalk from 'chalk';
 import path from 'path';
 import fs from 'fs';
 import * as ts from 'typescript';
-import { constants } from '@sitecore-jss/sitecore-jss';
-// TODO:adjust when mesh endpoint is live
-const meshEndpoint = `${process.env.SITECORE_EDGE_URL ||
-    constants.SITECORE_EDGE_URL_DEFAULT}/api/v1/mesh`;
+import { constants, debug } from '@sitecore-jss/sitecore-jss';
+// MESH_URL is temporary option to use until mesh is onboarded into Edge Proxy
+const meshEndpoint = `${process.env.SITECORE_MESH_URL ||
+    process.env.SITECORE_EDGE_URL ||
+    constants.SITECORE_EDGE_URL_DEFAULT}/api/v1/contentsdk/code/extracted`;
 /**
  * Type of file to be sent to the mesh endpoint
  */
@@ -22,7 +23,7 @@ export var ExtractedFileType;
 (function (ExtractedFileType) {
     ExtractedFileType["Component"] = "component";
     ExtractedFileType["Json"] = "json";
-    ExtractedFileType["Package"] = "package.json";
+    ExtractedFileType["PackageJson"] = "package.json";
 })(ExtractedFileType || (ExtractedFileType = {}));
 /**
  * Parses the componentBuilder.ts file and returns a map of component names
@@ -70,8 +71,13 @@ export const resolveComponentImportFiles = (appPath, componentBuilderPath = './s
             const resolvedModule = ts.nodeModuleNameResolver(moduleName, componentBuilderFullPath, tsOptions, tsHost);
             const resolvedFile = (_a = resolvedModule === null || resolvedModule === void 0 ? void 0 : resolvedModule.resolvedModule) === null || _a === void 0 ? void 0 : _a.resolvedFileName;
             // module imports paths will be resolved to /node_modules location - we don't support that yet
-            if (resolvedFile && resolvedFile.indexOf('node_modules') === -1) {
-                importStringsMap[childNode.importClause.getText()] = path.resolve(resolvedFile);
+            if (resolvedFile) {
+                if (resolvedFile.indexOf('node_modules') === -1 && !resolvedFile.endsWith('.d.ts')) {
+                    importStringsMap[childNode.importClause.getText()] = path.resolve(resolvedFile);
+                }
+            }
+            else {
+                console.warn('Could not resolve a file for import %s', moduleName);
             }
         }
         else if (ts.isExpressionStatement(childNode)) {
@@ -119,26 +125,37 @@ export const sendCode = (file, token) => __awaiter(void 0, void 0, void 0, funct
         return;
     }
     const code = fs.readFileSync(file.path);
-    const response = yield fetch(meshEndpoint, {
-        method: 'POST',
-        headers: {
-            Authorization: `Bearer ${token}`,
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-            name: file.name,
-            content: code.toString(),
-            labels: {
-                properties: {
+    try {
+        const response = yield fetch(meshEndpoint, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${token}`,
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                // EnvironmentId can have any value - but it's required
+                EnvironmentId: 'JSS',
+                name: file.name,
+                content: code.toString(),
+                labels: {
                     type: file.type,
                 },
-            },
-        }),
-    });
-    if (!response.ok) {
-        console.error(chalk.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            }),
+        });
+        if (!response.ok) {
+            console.error(chalk.red(`Failed to send extracted code from ${file.path}: ${response.statusText}`));
+            debug.http('Error details: %o', {
+                status: response.status,
+                text: yield response.text(),
+                url: response.url,
+                headers: response.headers,
+            });
+            return;
+        }
     }
-    else {
-        console.log(chalk.green(`Code from ${file.path} extracted and sent to mesh endpoint`));
+    catch (error) {
+        console.error(chalk.red(`Fetch request to send extracted code from ${file.path} failed: ${JSON.stringify(error)}`));
+        return;
     }
+    console.log(chalk.green(`Code from ${file.path} extracted and sent to mesh endpoint`));
 });

package/dist/esm/index.js

@@ -14,7 +14,7 @@ export { createDefaultDisconnectedServer, } from './disconnected-server/create-d
 export { resolveScJssConfig } from './resolve-scjssconfig';
 export { constants } from '@sitecore-jss/sitecore-jss';
 export { fetchBearerToken } from './auth/fetch-bearer-token';
-export { extractComponents } from './codegen/extract-components';
+export { extractFiles } from './codegen/extract-files';
 export * from './templating';
 export * from './manifest';
 export * from './pipelines';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-dev-tools",
-  "version": "22.5.0-beta.11",
+  "version": "22.5.0-beta.12",
   "description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.24.0",
-    "@sitecore-jss/sitecore-jss": "22.5.0-beta.11",
+    "@sitecore-jss/sitecore-jss": "22.5.0-beta.12",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "del": "^6.0.0",
@@ -85,7 +85,7 @@
     "typescript": "~5.6.3"
   },
   "types": "types/index.d.ts",
-  "gitHead": "60c1594cdbc7ff5c173965d4b95020778fae1d7f",
+  "gitHead": "7e0753049a5b53583287f5b6569a5dc4233745bb",
   "files": [
     "dist",
     "types",

package/types/codegen/{extract-components.d.ts → extract-files.d.ts}

@@ -1,11 +1,11 @@
-type ExtractComponentOptions = {
+type ExtracFilesOptions = {
     componentBuilderPath?: string;
 };
 /**
  * Handler for the extract-component API command
  * Reads imports from the componentBuilder.ts file and posts the code to the mesh endpoint
- * @param {ExtractComponentOptions} [args] - The options for code extraction
+ * @param {ExtracFilesOptions} [args] - The options for code extraction
  * @returns {Promise<void>} void
  */
-export declare function extractComponents(args?: ExtractComponentOptions): Promise<void>;
+export declare function extractFiles(args?: ExtracFilesOptions): Promise<void>;
 export {};

package/types/codegen/utils.d.ts

@@ -12,7 +12,7 @@ export type ExtractedFile = {
 export declare enum ExtractedFileType {
     Component = "component",
     Json = "json",
-    Package = "package.json"
+    PackageJson = "package.json"
 }
 /**
  * Parses the componentBuilder.ts file and returns a map of component names

package/types/index.d.ts

@@ -16,7 +16,7 @@ export { ScJssConfig, JssConfiguration, resolveScJssConfig } from './resolve-scj
 export { Metadata } from '@sitecore-jss/sitecore-jss/editing';
 export { constants } from '@sitecore-jss/sitecore-jss';
 export { fetchBearerToken } from './auth/fetch-bearer-token';
-export { extractComponents } from './codegen/extract-components';
+export { extractFiles } from './codegen/extract-files';
 export * from './templating';
 export * from './manifest';
 export * from './pipelines';