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

package/LICENSE.txt

@@ -1,202 +1,202 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -1,12 +1,12 @@
-# Sitecore JavaScript Rendering SDK Developer Tools
-
-This module is provided as a part of Sitecore JavaScript Rendering SDK (JSS). It contains developer tooling, such as development proxies and deployment scripts.
-
-<!---
-@TODO: Update to next version docs before release
--->
-[Documentation (Experience Platform)](https://doc.sitecore.com/xp/en/developers/hd/22/sitecore-headless-development/sitecore-javascript-rendering-sdks--jss-.html)
-
-[Documentation (XM Cloud)](https://doc.sitecore.com/xmc/en/developers/xm-cloud/sitecore-javascript-rendering-sdks--jss-.html)
-
-[API reference documentation](/ref-docs/sitecore-jss-dev-tools/)
+# Sitecore JavaScript Rendering SDK Developer Tools
+
+This module is provided as a part of Sitecore JavaScript Rendering SDK (JSS). It contains developer tooling, such as development proxies and deployment scripts.
+
+<!---
+@TODO: Update to next version docs before release
+-->
+[Documentation (Experience Platform)](https://doc.sitecore.com/xp/en/developers/hd/22/sitecore-headless-development/sitecore-javascript-rendering-sdks--jss-.html)
+
+[Documentation (XM Cloud)](https://doc.sitecore.com/xmc/en/developers/xm-cloud/sitecore-javascript-rendering-sdks--jss-.html)
+
+[API reference documentation](/ref-docs/sitecore-jss-dev-tools/)

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.3.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.3.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": "82ba9acfab1c96dd12c5ff801d8b5672e4f3018e",
+  "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): {