Merge pull request #1347 from mikepenz/feature/depency_upgrades_20240726

Dependency upgrades | `semver 7.6.3`
2024-07-26 09:31:14 +02:00
parent 4d5a5160cb 542703f95e
commit ef820d296c
4 changed files with 1118 additions and 481 deletions
@@ -264,7 +264,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
    });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.filterCommits = exports.convertCommitsToPrs = exports.Commits = exports.DefaultDiffInfo = void 0;
+exports.Commits = exports.DefaultDiffInfo = void 0;
+exports.convertCommitsToPrs = convertCommitsToPrs;
+exports.filterCommits = filterCommits;
 const core = __importStar(__nccwpck_require__(2186));
 const utils_1 = __nccwpck_require__(9613);
 exports.DefaultDiffInfo = {
@@ -370,7 +372,6 @@ function convertCommitsToPrs(options, diffInfo) {
    });
    return [diffInfo, prs];
 }
-exports.convertCommitsToPrs = convertCommitsToPrs;
 /**
 * Filters out all commits which match the exclude pattern
 */
@@ -393,7 +394,6 @@ function filterCommits(commits, excludeMergeBranches) {
    }
    return filteredCommits;
 }
-exports.filterCommits = filterCommits;


 /***/ }),
@@ -436,7 +436,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
    });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.createCommandManager = void 0;
+exports.createCommandManager = createCommandManager;
 const exec = __importStar(__nccwpck_require__(1514));
 const io = __importStar(__nccwpck_require__(7436));
 const utils_1 = __nccwpck_require__(9613);
@@ -445,7 +445,6 @@ function createCommandManager(workingDirectory) {
        return yield GitCommandManager.createCommandManager(workingDirectory);
    });
 }
-exports.createCommandManager = createCommandManager;
 class GitCommandManager {
    // Private constructor; use createCommandManager()
    constructor() {
@@ -556,7 +555,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
    });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.pullData = exports.PullRequestCollector = void 0;
+exports.PullRequestCollector = void 0;
+exports.pullData = pullData;
 const core = __importStar(__nccwpck_require__(2186));
 const tags_1 = __nccwpck_require__(6906);
 const utils_1 = __nccwpck_require__(9613);
@@ -664,7 +664,6 @@ function pullData(repositoryUtils, options) {
        };
    });
 }
-exports.pullData = pullData;


 /***/ }),
@@ -710,7 +709,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.retrieveProperty = exports.compare = exports.sortPullRequests = exports.PullRequests = exports.EMPTY_COMMENT_INFO = exports.EMPTY_PULL_REQUEST_INFO = void 0;
+exports.PullRequests = exports.EMPTY_COMMENT_INFO = exports.EMPTY_PULL_REQUEST_INFO = void 0;
+exports.sortPullRequests = sortPullRequests;
+exports.compare = compare;
+exports.retrieveProperty = retrieveProperty;
 const core = __importStar(__nccwpck_require__(2186));
 const moment_1 = __importDefault(__nccwpck_require__(9623));
 const commits_1 = __nccwpck_require__(234);
@@ -902,7 +904,6 @@ function sortPullRequests(pullRequests, sort) {
    }
    return pullRequests;
 }
-exports.sortPullRequests = sortPullRequests;
 function compare(a, b, sort) {
    if (sort.on_property === 'mergedAt') {
        const aa = a.mergedAt || a.createdAt;
@@ -920,7 +921,6 @@ function compare(a, b, sort) {
        return a.title.localeCompare(b.title);
    }
 }
-exports.compare = compare;
 /**
 * Helper function to retrieve a property from the PullRequestInfo
 */
@@ -941,7 +941,6 @@ function retrieveProperty(pr, property, useCase) {
    }
    return value;
 }
-exports.retrieveProperty = retrieveProperty;


 /***/ }),
@@ -975,7 +974,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.transformStringToValue = exports.transformStringToOptionalValue = exports.transformStringToValues = exports.buildRegex = exports.validateRegex = void 0;
+exports.validateRegex = validateRegex;
+exports.buildRegex = buildRegex;
+exports.transformStringToValues = transformStringToValues;
+exports.transformStringToOptionalValue = transformStringToOptionalValue;
+exports.transformStringToValue = transformStringToValue;
 const core = __importStar(__nccwpck_require__(2186));
 function validateRegex(regex) {
    if (regex === undefined) {
@@ -1002,7 +1005,6 @@ function validateRegex(regex) {
        return null;
    }
 }
-exports.validateRegex = validateRegex;
 /**
 * Constructs the RegExp, providing the configured Regex and additional values
 */
@@ -1022,7 +1024,6 @@ function buildRegex(regex, target, onProperty, method, onEmpty) {
        return null;
    }
 }
-exports.buildRegex = buildRegex;
 function transformStringToValues(value, extractor) {
    if (extractor.pattern == null) {
        return null;
@@ -1056,7 +1057,6 @@ function transformStringToValues(value, extractor) {
    }
    return null;
 }
-exports.transformStringToValues = transformStringToValues;
 function transformStringToOptionalValue(value, extractor) {
    const result = transformStringToValues(value, extractor);
    if (result != null && result.length > 0) {
@@ -1066,11 +1066,9 @@ function transformStringToOptionalValue(value, extractor) {
        return null;
    }
 }
-exports.transformStringToOptionalValue = transformStringToOptionalValue;
 function transformStringToValue(value, extractor) {
    return transformStringToOptionalValue(value, extractor) || '';
 }
-exports.transformStringToValue = transformStringToValue;
 function transformRegexr(regex, source, target) {
    /**
     * Util function extracted from regexr and is licensed under:
@@ -1145,7 +1143,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
    });
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.prepareAndSortTags = exports.transformTags = exports.filterTags = exports.Tags = void 0;
+exports.Tags = void 0;
+exports.filterTags = filterTags;
+exports.transformTags = transformTags;
+exports.prepareAndSortTags = prepareAndSortTags;
 const core = __importStar(__nccwpck_require__(2186));
 const github = __importStar(__nccwpck_require__(5438));
 const semver = __importStar(__nccwpck_require__(1383));
@@ -1322,7 +1323,6 @@ function filterTags(tags, filterRegex) {
        return tags;
    }
 }
-exports.filterTags = filterTags;
 /**
 * Helper function to transform the tag name given the transformer
 */
@@ -1342,7 +1342,6 @@ function transformTags(tags, transformer) {
        }
    });
 }
-exports.transformTags = transformTags;
 /*
  Sorts an array of tags as shown below:
  
@@ -1366,7 +1365,6 @@ function prepareAndSortTags(tags, tagResolver) {
        return semVerTags(tags);
    }
 }
-exports.prepareAndSortTags = prepareAndSortTags;
 function semVerTags(tags) {
    // filter out tags which do not follow semver
    const validatedTags = tags.filter(tag => {
@@ -1450,7 +1448,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.directoryExistsSync = exports.failOrError = void 0;
+exports.failOrError = failOrError;
+exports.directoryExistsSync = directoryExistsSync;
 const core = __importStar(__nccwpck_require__(2186));
 const fs = __importStar(__nccwpck_require__(7147));
 /**
@@ -1466,7 +1465,6 @@ function failOrError(message, failOnError) {
        core.error(message);
    }
 }
-exports.failOrError = failOrError;
 /**
 * Checks if a given directory exists
 */
@@ -1495,7 +1493,6 @@ function directoryExistsSync(inputPath, required) {
    }
    throw new Error(`Directory '${inputPath}' does not exist`);
 }
-exports.directoryExistsSync = directoryExistsSync;


 /***/ }),
@@ -1529,7 +1526,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.matchesRules = void 0;
+exports.matchesRules = matchesRules;
 const core = __importStar(__nccwpck_require__(2186));
 const pullRequests_1 = __nccwpck_require__(4012);
 const regexUtils_1 = __nccwpck_require__(5351);
@@ -1549,7 +1546,6 @@ function matchesRules(rules, pr, exhaustive) {
        });
    }
 }
-exports.matchesRules = matchesRules;
 /**
 * Checks if the configured property results in a positive `test` with the regex.
 */
@@ -2553,7 +2549,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.replaceEmptyTemplate = exports.buildChangelog = exports.clear = void 0;
+exports.clear = clear;
+exports.buildChangelog = buildChangelog;
+exports.replaceEmptyTemplate = replaceEmptyTemplate;
 const core = __importStar(__nccwpck_require__(2186));
 const utils_1 = __nccwpck_require__(918);
 const pullRequests_1 = __nccwpck_require__(4012);
@@ -2564,7 +2562,6 @@ let CLEAR = false;
 function clear() {
    CLEAR = true;
 }
-exports.clear = clear;
 function buildChangelog(diffInfo, origPrs, options) {
    core.startGroup('📦 Build changelog');
    let prs = origPrs;
@@ -2825,7 +2822,6 @@ function buildChangelog(diffInfo, origPrs, options) {
    core.endGroup();
    return transformedChangelog;
 }
-exports.buildChangelog = buildChangelog;
 function recursiveCategorizePr(category, pr, body) {
    let matched = false;
    let consumed = false;
@@ -2921,7 +2917,6 @@ function replaceEmptyTemplate(template, options) {
    fillAdditionalPlaceholders(options, placeholderMap);
    return replacePlaceholders(template, EMPTY_MAP, placeholderMap, placeholders, undefined, options.configuration);
 }
-exports.replaceEmptyTemplate = replaceEmptyTemplate;
 function fillAdditionalPlaceholders(options, placeholderMap /* placeholderKey and original value */) {
    var _a, _b;
    placeholderMap.set('OWNER', options.owner);
@@ -3178,7 +3173,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.haveEveryElementsArr = exports.haveEveryElements = exports.haveCommonElementsArr = exports.haveCommonElements = exports.createOrSet = exports.writeOutput = exports.mergeConfiguration = exports.parseConfiguration = exports.resolveConfiguration = exports.resolveMode = exports.checkExportedData = exports.writeCacheData = exports.retrieveRepositoryPath = void 0;
+exports.retrieveRepositoryPath = retrieveRepositoryPath;
+exports.writeCacheData = writeCacheData;
+exports.checkExportedData = checkExportedData;
+exports.resolveMode = resolveMode;
+exports.resolveConfiguration = resolveConfiguration;
+exports.parseConfiguration = parseConfiguration;
+exports.mergeConfiguration = mergeConfiguration;
+exports.writeOutput = writeOutput;
+exports.createOrSet = createOrSet;
+exports.haveCommonElements = haveCommonElements;
+exports.haveCommonElementsArr = haveCommonElementsArr;
+exports.haveEveryElements = haveEveryElements;
+exports.haveEveryElementsArr = haveEveryElementsArr;
 const core = __importStar(__nccwpck_require__(2186));
 const fs = __importStar(__nccwpck_require__(7147));
 const path = __importStar(__nccwpck_require__(1017));
@@ -3200,7 +3207,6 @@ function retrieveRepositoryPath(providedPath) {
    core.debug(`repositoryPath = '${repositoryPath}'`);
    return repositoryPath;
 }
-exports.retrieveRepositoryPath = retrieveRepositoryPath;
 function writeCacheData(data, cacheOutput) {
    let cacheFile;
    if (cacheOutput && !cacheOutput.startsWith('{')) {
@@ -3224,7 +3230,6 @@ function writeCacheData(data, cacheOutput) {
        core.warning(`Failed to write cache file. (${error})`);
    }
 }
-exports.writeCacheData = writeCacheData;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function replacer(key, value) {
    if (key === 'repositoryUtils')
@@ -3290,7 +3295,6 @@ function checkExportedData(exportCache, cacheInput) {
        return null;
    }
 }
-exports.checkExportedData = checkExportedData;
 function resolveMode(mode, commitMode) {
    if (commitMode === false || mode === undefined) {
        if (commitMode === true) {
@@ -3311,7 +3315,6 @@ function resolveMode(mode, commitMode) {
    }
    return 'PR';
 }
-exports.resolveMode = resolveMode;
 /**
 * Retrieves the configuration given the file path, if not found it will fallback to the `DefaultConfiguration`
 */
@@ -3337,7 +3340,6 @@ function resolveConfiguration(githubWorkspacePath, configurationFile) {
    }
    return undefined;
 }
-exports.resolveConfiguration = resolveConfiguration;
 /**
 * Reads in the configuration from the JSON file
 */
@@ -3368,7 +3370,6 @@ function parseConfiguration(config) {
        return undefined;
    }
 }
-exports.parseConfiguration = parseConfiguration;
 /**
 * Merges the configurations, will fallback to the DefaultConfiguration value
 */
@@ -3400,7 +3401,6 @@ function mergeConfiguration(jc, fc, mode) {
        trim_values: (jc === null || jc === void 0 ? void 0 : jc.trim_values) || (fc === null || fc === void 0 ? void 0 : fc.trim_values) || def.trim_values
    };
 }
-exports.mergeConfiguration = mergeConfiguration;
 /**
 * Writes the changelog to the given the file
 */
@@ -3416,7 +3416,6 @@ function writeOutput(githubWorkspacePath, outputFile, changelog) {
        }
    }
 }
-exports.writeOutput = writeOutput;
 function createOrSet(map, key, value) {
    const entry = map.get(key);
    if (!entry) {
@@ -3426,23 +3425,18 @@ function createOrSet(map, key, value) {
        entry.push(value);
    }
 }
-exports.createOrSet = createOrSet;
 function haveCommonElements(arr1, arr2) {
    return arr1.some(item => arr2.has(item));
 }
-exports.haveCommonElements = haveCommonElements;
 function haveCommonElementsArr(arr1, arr2) {
    return haveCommonElements(arr1, new Set(arr2));
 }
-exports.haveCommonElementsArr = haveCommonElementsArr;
 function haveEveryElements(arr1, arr2) {
    return arr1.every(item => arr2.has(item));
 }
-exports.haveEveryElements = haveEveryElements;
 function haveEveryElementsArr(arr1, arr2) {
    return haveEveryElements(arr1, new Set(arr2));
 }
-exports.haveEveryElementsArr = haveEveryElementsArr;


 /***/ }),
@@ -20811,7 +20805,7 @@ class HttpsProxyAgent extends agent_base_1.Agent {
            const servername = this.connectOpts.servername || this.connectOpts.host;
            socket = tls.connect({
                ...this.connectOpts,
-                servername: servername && net.isIP(servername) ? undefined : servername,
+                servername,
            });
        }
        else {
@@ -20852,7 +20846,7 @@ class HttpsProxyAgent extends agent_base_1.Agent {
                return tls.connect({
                    ...omit(opts, 'host', 'path', 'port'),
                    socket,
-                    servername: net.isIP(servername) ? undefined : servername,
+                    servername,
                });
            }
            return socket;
@@ -27074,6 +27068,8 @@ const Range = __nccwpck_require__(9828)
 /***/ 9828:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

+const SPACE_CHARACTERS = /\s+/g
+
 // hoisted class for cyclic dependency
 class Range {
  constructor (range, options) {
@@ -27094,7 +27090,7 @@ class Range {
      // just put it in the set and return
      this.raw = range.value
      this.set = [[range]]
-      this.format()
+      this.formatted = undefined
      return this
    }

@@ -27105,10 +27101,7 @@ class Range {
    // First reduce all whitespace as much as possible so we do not have to rely
    // on potentially slow regexes like \s*. This is then stored and used for
    // future error messages as well.
-    this.raw = range
-      .trim()
-      .split(/\s+/)
-      .join(' ')
+    this.raw = range.trim().replace(SPACE_CHARACTERS, ' ')

    // First, split on ||
    this.set = this.raw
@@ -27142,14 +27135,29 @@ class Range {
      }
    }

-    this.format()
+    this.formatted = undefined
+  }
+
+  get range () {
+    if (this.formatted === undefined) {
+      this.formatted = ''
+      for (let i = 0; i < this.set.length; i++) {
+        if (i > 0) {
+          this.formatted += '||'
+        }
+        const comps = this.set[i]
+        for (let k = 0; k < comps.length; k++) {
+          if (k > 0) {
+            this.formatted += ' '
+          }
+          this.formatted += comps[k].toString().trim()
+        }
+      }
+    }
+    return this.formatted
  }

  format () {
-    this.range = this.set
-      .map((comps) => comps.join(' ').trim())
-      .join('||')
-      .trim()
    return this.range
  }

@@ -41,27 +41,27 @@
    "@actions/github": "^6.0.0",
    "@octokit/rest": "^20.1.1",
    "gitea-js": "^1.22.0",
-    "https-proxy-agent": "^7.0.4",
+    "https-proxy-agent": "^7.0.5",
    "moment": "^2.30.1",
-    "semver": "^7.6.2"
+    "semver": "^7.6.3"
  },
  "devDependencies": {
    "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.6",
+    "@types/node": "^20.14.12",
    "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@typescript-eslint/eslint-plugin": "^7.17.0",
+    "@typescript-eslint/parser": "^7.17.0",
    "@vercel/ncc": "^0.38.1",
    "eslint": "^8.57.0",
    "eslint-plugin-github": "^5.0.1",
    "eslint-plugin-import": "^2.29.1",
    "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
    "jest": "^29.7.0",
    "jest-circus": "^29.7.0",
    "js-yaml": "^4.1.0",
-    "prettier": "3.3.2",
-    "ts-jest": "^29.1.5",
-    "typescript": "^5.4.5"
+    "prettier": "3.3.3",
+    "ts-jest": "^29.2.3",
+    "typescript": "^5.5.4"
  }
 }