@contentful/app-scripts 1.27.0 → 1.29.0

package/lib/upload/build-upload-settings.d.ts

@@ -1,2 +1,3 @@
 import { UploadOptions, UploadSettings } from '../types';
 export declare function buildAppUploadSettings(options: UploadOptions): Promise<UploadSettings>;
+export declare function hostProtocolFilter(input: string): string;

package/lib/upload/build-upload-settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAppUploadSettings = void 0;
+exports.hostProtocolFilter = exports.buildAppUploadSettings = void 0;
 const inquirer_1 = require("inquirer");
 const get_app_info_1 = require("../get-app-info");
 const utils_1 = require("../utils");
@@ -37,6 +37,7 @@ async function buildAppUploadSettings(options) {
             name: 'host',
             message: `Contentful CMA endpoint URL:`,
             default: constants_1.DEFAULT_CONTENTFUL_API_HOST,
+            filter: hostProtocolFilter,
         });
     }
     const { activateBundle, ...appUploadSettings } = await (0, inquirer_1.prompt)(prompts);
@@ -53,3 +54,7 @@ async function buildAppUploadSettings(options) {
     };
 }
 exports.buildAppUploadSettings = buildAppUploadSettings;
+function hostProtocolFilter(input) {
+    return input.replace(/^https?:\/\//, '');
+}
+exports.hostProtocolFilter = hostProtocolFilter;

package/lib/utils.js

@@ -27,7 +27,22 @@ const throwValidationException = (subject, message, details) => {
 };
 exports.throwValidationException = throwValidationException;
 const isValidNetwork = (address) => {
-    const addressRegex = /^(?:localhost|(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|(\[(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}\]|(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}))(?::\d{1,5})?$/;
+    // Regular expression to validate network addresses
+    const addressRegex = new RegExp('^(?:' + // Start of the non-capturing group for the entire address
+        '(?:' + // Start of the non-capturing group for domain names
+        '(?:\\*\\.)' + // Matches wildcard domains like *.example.com
+        '(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\\.)' + // Matches a single subdomain
+        '[a-zA-Z]{2,6}' + // Matches the top-level domain (TLD)
+        '|' + // OR
+        '(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\\.)+' + // Matches standard domains with one or more subdomains
+        '[a-zA-Z]{2,6}' + // Matches the top-level domain (TLD)
+        ')|' + // End of the non-capturing group for domain names, OR
+        '(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}' + // Matches the first three octets of an IPv4 address
+        '(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|' + // Matches the last octet of an IPv4 address
+        '(\\[(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4}\\]' + // Matches IPv6 addresses in square brackets
+        '|(?:[A-Fa-f0-9]{1,4}:){7}[A-Fa-f0-9]{1,4})' + // Matches IPv6 addresses without square brackets
+        ')(?::\\d{1,5})?$' // Matches an optional port number (1 to 5 digits)
+    );
     return addressRegex.test(address);
 };
 exports.isValidNetwork = isValidNetwork;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentful/app-scripts",
-  "version": "1.27.0",
+  "version": "1.29.0",
   "description": "A collection of scripts for building Contentful Apps",
   "author": "Contentful GmbH",
   "license": "MIT",
@@ -48,33 +48,33 @@
   },
   "dependencies": {
     "@segment/analytics-node": "^2.0.0",
-    "adm-zip": "0.5.15",
+    "adm-zip": "0.5.16",
     "bottleneck": "2.19.5",
     "chalk": "4.1.2",
     "commander": "12.1.0",
-    "contentful-management": "11.31.9",
+    "contentful-management": "11.35.1",
     "dotenv": "16.4.5",
-    "ignore": "5.3.2",
+    "ignore": "6.0.2",
     "inquirer": "8.2.6",
     "lodash": "4.17.21",
     "open": "8.4.2",
     "ora": "5.4.1"
   },
-  "gitHead": "a2c683683c29974787b17871fe525d384fe295a6",
+  "gitHead": "2179b34098340843ad4e6eeaa09e341f34286164",
   "devDependencies": {
     "@tsconfig/node18": "18.2.4",
     "@types/adm-zip": "0.5.5",
     "@types/analytics-node": "3.1.14",
     "@types/chai": "4.3.16",
     "@types/inquirer": "8.2.1",
-    "@types/lodash": "4.17.7",
-    "@types/mocha": "10.0.7",
+    "@types/lodash": "4.17.9",
+    "@types/mocha": "10.0.8",
     "@types/proxyquire": "1.3.31",
     "@types/sinon": "17.0.3",
     "chai": "4.5.0",
     "mocha": "10.7.3",
     "proxyquire": "2.1.3",
-    "sinon": "18.0.0",
+    "sinon": "19.0.2",
     "ts-mocha": "10.0.0",
     "ts-node": "10.9.2"
   }