@sitecore-jss/sitecore-jss-dev-tools 22.4.0-canary.1 → 22.4.0-canary.10

package/dist/cjs/package-deploy.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -45,11 +22,12 @@ exports.extractProxy = extractProxy;
 exports.getHttpsTransport = getHttpsTransport;
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = __importDefault(require("fs"));
-const https_1 = __importStar(require("https"));
+const https_1 = __importDefault(require("https"));
 const path_1 = __importDefault(require("path"));
 const form_data_1 = __importDefault(require("form-data"));
-const axios_1 = __importDefault(require("axios"));
 const digest_1 = require("./digest");
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+const undici_1 = require("undici");
 // Node does not use system level trusted CAs. This causes issues because SIF likes to install
 // using a Windows trusted CA - so SSL connections to Sitecore will fail from Node.
 // If the options.acceptCertificate is passed, we disable normal SSL validation and use this function
@@ -161,24 +139,20 @@ function watchJobStatus(options, taskName) {
         const warnings = [];
         const factors = [options.appName, taskName, `${options.importServiceUrl}/status`];
         const mac = (0, digest_1.hmac)(factors, options.secret);
-        const isHttps = options.importServiceUrl.startsWith('https');
         const requestBaseOptions = {
-            transport: isHttps ? getHttpsTransport(options) : undefined,
             headers: {
                 'User-Agent': 'Sitecore/JSS-Import',
                 'Cache-Control': 'no-cache',
                 'X-JSS-Auth': mac,
             },
-            proxy: extractProxy(options.proxy),
-            maxRedirects: 0,
-            httpsAgent: isHttps
-                ? new https_1.Agent({
-                    // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
+            dispatcher: new undici_1.ProxyAgent({
+                uri: options.proxy || '',
+                maxRedirections: 0,
+                connect: {
                     rejectUnauthorized: options.acceptCertificate ? false : true,
-                    // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                })
-                : undefined,
+                },
+            }),
         };
         if (options.debugSecurity) {
             console.log(`Deployment status security factors: ${factors}`);
@@ -189,12 +163,12 @@ function watchJobStatus(options, taskName) {
              * Send job status request
              */
             function sendJobStatusRequest() {
-                axios_1.default
+                new sitecore_jss_1.NativeDataFetcher()
                     .get(`${options.importServiceUrl}/status?appName=${options.appName}&jobName=${taskName}&after=${logOffset}`, requestBaseOptions)
                     .then((response) => {
                     const body = response.data;
                     try {
-                        const { state, messages } = body;
+                        const { state, messages } = body.data;
                         messages.forEach((entry) => {
                             logOffset++;
                             const entryBits = /^(\[([A-Z]+)\] )?(.+)/.exec(entry);
@@ -270,24 +244,22 @@ function packageDeploy(options) {
         const formData = new form_data_1.default();
         formData.append('path', fs_1.default.createReadStream(packageFile));
         formData.append('appName', options.appName);
-        const isHttps = options.importServiceUrl.startsWith('https');
         const requestBaseOptions = {
-            transport: isHttps ? getHttpsTransport(options) : undefined,
             headers: Object.assign({ 'User-Agent': 'Sitecore/JSS-Import', 'Cache-Control': 'no-cache', 'X-JSS-Auth': (0, digest_1.hmac)(factors, options.secret) }, formData.getHeaders()),
-            proxy: extractProxy(options.proxy),
-            httpsAgent: isHttps
-                ? new https_1.Agent({
+            dispatcher: new undici_1.ProxyAgent({
+                uri: options.proxy ? options.proxy : '',
+                maxRedirections: 0,
+                connect: {
                     // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
                     rejectUnauthorized: options.acceptCertificate ? false : true,
                     // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                })
-                : undefined,
-            maxRedirects: 0,
+                },
+            }),
         };
         console.log(`Sending package ${packageFile} to ${options.importServiceUrl}...`);
         return new Promise((resolve, reject) => {
-            axios_1.default
+            new sitecore_jss_1.NativeDataFetcher()
                 .post(options.importServiceUrl, formData, requestBaseOptions)
                 .then((response) => {
                 const body = response.data;
@@ -309,7 +281,7 @@ function packageDeploy(options) {
     });
 }
 /**
- * Creates valid proxy object which fit to axios configuration
+ * Creates valid proxy object
  * @param {string} [proxy] proxy url
  */
 function extractProxy(proxy) {
@@ -329,9 +301,7 @@ function extractProxy(proxy) {
     }
 }
 /**
- * Provides way to customize axios request adapter
- * in order to execute certificate pinning before request sent:
- * {@link https://github.com/axios/axios/issues/2808}
+ * Provides way to customize request adapter
  * @param {PackageDeployOptions} options
  */
 function getHttpsTransport(options) {

package/dist/esm/package-deploy.js

@@ -9,11 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import chalk from 'chalk';
 import fs from 'fs';
-import https, { Agent as HttpsAgent } from 'https';
+import https from 'https';
 import path from 'path';
 import FormData from 'form-data';
-import axios from 'axios';
 import { digest, hmac } from './digest';
+import { NativeDataFetcher } from '@sitecore-jss/sitecore-jss';
+import { ProxyAgent } from 'undici';
 // Node does not use system level trusted CAs. This causes issues because SIF likes to install
 // using a Windows trusted CA - so SSL connections to Sitecore will fail from Node.
 // If the options.acceptCertificate is passed, we disable normal SSL validation and use this function
@@ -125,24 +126,20 @@ function watchJobStatus(options, taskName) {
         const warnings = [];
         const factors = [options.appName, taskName, `${options.importServiceUrl}/status`];
         const mac = hmac(factors, options.secret);
-        const isHttps = options.importServiceUrl.startsWith('https');
         const requestBaseOptions = {
-            transport: isHttps ? getHttpsTransport(options) : undefined,
             headers: {
                 'User-Agent': 'Sitecore/JSS-Import',
                 'Cache-Control': 'no-cache',
                 'X-JSS-Auth': mac,
             },
-            proxy: extractProxy(options.proxy),
-            maxRedirects: 0,
-            httpsAgent: isHttps
-                ? new HttpsAgent({
-                    // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
+            dispatcher: new ProxyAgent({
+                uri: options.proxy || '',
+                maxRedirections: 0,
+                connect: {
                     rejectUnauthorized: options.acceptCertificate ? false : true,
-                    // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                })
-                : undefined,
+                },
+            }),
         };
         if (options.debugSecurity) {
             console.log(`Deployment status security factors: ${factors}`);
@@ -153,12 +150,12 @@ function watchJobStatus(options, taskName) {
              * Send job status request
              */
             function sendJobStatusRequest() {
-                axios
+                new NativeDataFetcher()
                     .get(`${options.importServiceUrl}/status?appName=${options.appName}&jobName=${taskName}&after=${logOffset}`, requestBaseOptions)
                     .then((response) => {
                     const body = response.data;
                     try {
-                        const { state, messages } = body;
+                        const { state, messages } = body.data;
                         messages.forEach((entry) => {
                             logOffset++;
                             const entryBits = /^(\[([A-Z]+)\] )?(.+)/.exec(entry);
@@ -234,24 +231,22 @@ export function packageDeploy(options) {
         const formData = new FormData();
         formData.append('path', fs.createReadStream(packageFile));
         formData.append('appName', options.appName);
-        const isHttps = options.importServiceUrl.startsWith('https');
         const requestBaseOptions = {
-            transport: isHttps ? getHttpsTransport(options) : undefined,
             headers: Object.assign({ 'User-Agent': 'Sitecore/JSS-Import', 'Cache-Control': 'no-cache', 'X-JSS-Auth': hmac(factors, options.secret) }, formData.getHeaders()),
-            proxy: extractProxy(options.proxy),
-            httpsAgent: isHttps
-                ? new HttpsAgent({
+            dispatcher: new ProxyAgent({
+                uri: options.proxy ? options.proxy : '',
+                maxRedirections: 0,
+                connect: {
                     // we turn off normal CA cert validation when we are whitelisting a single cert thumbprint
                     rejectUnauthorized: options.acceptCertificate ? false : true,
                     // needed to allow whitelisting a cert thumbprint if a connection is reused
                     maxCachedSessions: options.acceptCertificate ? 0 : undefined,
-                })
-                : undefined,
-            maxRedirects: 0,
+                },
+            }),
         };
         console.log(`Sending package ${packageFile} to ${options.importServiceUrl}...`);
         return new Promise((resolve, reject) => {
-            axios
+            new NativeDataFetcher()
                 .post(options.importServiceUrl, formData, requestBaseOptions)
                 .then((response) => {
                 const body = response.data;
@@ -273,7 +268,7 @@ export function packageDeploy(options) {
     });
 }
 /**
- * Creates valid proxy object which fit to axios configuration
+ * Creates valid proxy object
  * @param {string} [proxy] proxy url
  */
 export function extractProxy(proxy) {
@@ -293,9 +288,7 @@ export function extractProxy(proxy) {
     }
 }
 /**
- * Provides way to customize axios request adapter
- * in order to execute certificate pinning before request sent:
- * {@link https://github.com/axios/axios/issues/2808}
+ * Provides way to customize request adapter
  * @param {PackageDeployOptions} options
  */
 export function getHttpsTransport(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-dev-tools",
-  "version": "22.4.0-canary.1",
+  "version": "22.4.0-canary.10",
   "description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -33,8 +33,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.24.0",
-    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.1",
-    "axios": "^1.3.2",
+    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.10",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
     "del": "^6.0.0",
@@ -51,6 +50,7 @@
     "recast": "^0.23.5",
     "resolve": "^1.22.1",
     "ts-node": "^10.9.1",
+    "undici": "^7.2.1",
     "url-join": "^4.0.1",
     "uuid": "^9.0.0",
     "yargs": "^17.6.2"
@@ -86,7 +86,7 @@
     "typescript": "~5.6.3"
   },
   "types": "types/index.d.ts",
-  "gitHead": "d3ecb29aed9eb83d3d4db8df8ee58870aae6e74f",
+  "gitHead": "1220b71aa4c565d5f8dffde56f362543d6fda3f7",
   "files": [
     "dist",
     "types",

package/types/package-deploy.d.ts

@@ -54,7 +54,7 @@ export declare function logJobStatus({ message, entryLevel, warnings, errors, }:
  */
 export declare function packageDeploy(options: PackageDeployOptions): Promise<unknown>;
 /**
- * Creates valid proxy object which fit to axios configuration
+ * Creates valid proxy object
  * @param {string} [proxy] proxy url
  */
 export declare function extractProxy(proxy?: string): {
@@ -63,9 +63,7 @@ export declare function extractProxy(proxy?: string): {
     port: number;
 } | undefined;
 /**
- * Provides way to customize axios request adapter
- * in order to execute certificate pinning before request sent:
- * {@link https://github.com/axios/axios/issues/2808}
+ * Provides way to customize request adapter
  * @param {PackageDeployOptions} options
  */
 export declare function getHttpsTransport(options: PackageDeployOptions): {