renovate 44.186.1 → 44.186.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/config/utils.js +25 -28
- package/dist/config/utils.js.map +1 -1
- package/dist/config/validation.js +1 -1
- package/dist/workers/repository/extract/index.js +1 -1
- package/dist/workers/repository/process/fetch.js +1 -1
- package/dist/workers/repository/process/index.js +1 -1
- package/dist/workers/repository/process/vulnerabilities.js +1 -1
- package/package.json +1 -1
- package/renovate-schema.json +2 -2
package/dist/config/utils.js
CHANGED
|
@@ -1,38 +1,35 @@
|
|
|
1
1
|
import { logger } from "../logger/index.js";
|
|
2
2
|
import { clone } from "../util/clone.js";
|
|
3
3
|
import { getOptions } from "./options/index.js";
|
|
4
|
-
import { instrument } from "../instrumentation/index.js";
|
|
5
4
|
import { getHighestVulnerabilitySeverity } from "../util/vulnerability/utils.js";
|
|
6
5
|
//#region lib/config/utils.ts
|
|
7
6
|
function mergeChildConfig(parent, child) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
7
|
+
logger.trace({
|
|
8
|
+
parent,
|
|
9
|
+
child
|
|
10
|
+
}, `mergeChildConfig`);
|
|
11
|
+
if (!child) return parent;
|
|
12
|
+
const parentConfig = clone(parent);
|
|
13
|
+
const childConfig = clone(child);
|
|
14
|
+
const config = {
|
|
15
|
+
...parentConfig,
|
|
16
|
+
...childConfig
|
|
17
|
+
};
|
|
18
|
+
if (config.isVulnerabilityAlert && (parent.vulnerabilitySeverity !== void 0 || child.vulnerabilitySeverity !== void 0)) config.vulnerabilitySeverity = getHighestVulnerabilitySeverity(parent, child);
|
|
19
|
+
for (const option of getOptions()) if (option.mergeable && childConfig[option.name] && parentConfig[option.name]) {
|
|
20
|
+
logger.trace(`mergeable option: ${option.name}`);
|
|
21
|
+
if (option.name === "constraints") config[option.name] = {
|
|
22
|
+
...parentConfig[option.name],
|
|
23
|
+
...childConfig[option.name]
|
|
19
24
|
};
|
|
20
|
-
if (
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
else config[option.name] = mergeChildConfig(parentConfig[option.name], childConfig[option.name]);
|
|
29
|
-
logger.trace({ result: config[option.name] }, `Merged config.${option.name}`);
|
|
30
|
-
}
|
|
31
|
-
return {
|
|
32
|
-
...config,
|
|
33
|
-
...config.force
|
|
34
|
-
};
|
|
35
|
-
});
|
|
25
|
+
else if (option.type === "array") config[option.name] = parentConfig[option.name].concat(config[option.name]);
|
|
26
|
+
else config[option.name] = mergeChildConfig(parentConfig[option.name], childConfig[option.name]);
|
|
27
|
+
logger.trace({ result: config[option.name] }, `Merged config.${option.name}`);
|
|
28
|
+
}
|
|
29
|
+
return {
|
|
30
|
+
...config,
|
|
31
|
+
...config.force
|
|
32
|
+
};
|
|
36
33
|
}
|
|
37
34
|
//#endregion
|
|
38
35
|
export { mergeChildConfig };
|
package/dist/config/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","names":["options.getOptions"],"sources":["../../lib/config/utils.ts"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"utils.js","names":["options.getOptions"],"sources":["../../lib/config/utils.ts"],"sourcesContent":["import { logger } from '../logger/index.ts';\nimport { clone } from '../util/clone.ts';\nimport { getHighestVulnerabilitySeverity } from '../util/vulnerability/utils.ts';\nimport * as options from './options/index.ts';\nimport type { RenovateConfig } from './types.ts';\n\nexport function mergeChildConfig<\n T extends Record<string, any>,\n TChild extends Record<string, any> | undefined,\n>(parent: T, child: TChild): T & TChild {\n logger.trace({ parent, child }, `mergeChildConfig`);\n if (!child) {\n return parent as never;\n }\n const parentConfig = clone(parent);\n const childConfig = clone(child);\n const config: Record<string, any> = { ...parentConfig, ...childConfig };\n\n // Ensure highest severity survives parent / child merge\n if (\n config.isVulnerabilityAlert &&\n (parent.vulnerabilitySeverity !== undefined ||\n child.vulnerabilitySeverity !== undefined)\n ) {\n config.vulnerabilitySeverity = getHighestVulnerabilitySeverity(\n parent,\n child,\n );\n }\n\n for (const option of options.getOptions()) {\n if (\n option.mergeable &&\n childConfig[option.name] &&\n parentConfig[option.name]\n ) {\n logger.trace(`mergeable option: ${option.name}`);\n\n if (option.name === 'constraints') {\n config[option.name] = {\n ...parentConfig[option.name],\n ...childConfig[option.name],\n };\n } else if (option.type === 'array') {\n config[option.name] = (parentConfig[option.name] as unknown[]).concat(\n config[option.name],\n );\n } else {\n config[option.name] = mergeChildConfig(\n parentConfig[option.name] as RenovateConfig,\n childConfig[option.name] as RenovateConfig,\n );\n }\n logger.trace(\n { result: config[option.name] },\n `Merged config.${option.name}`,\n );\n }\n }\n return { ...config, ...config.force };\n}\n"],"mappings":";;;;;AAMA,SAAgB,iBAGd,QAAW,OAA2B;CACtC,OAAO,MAAM;EAAE;EAAQ;CAAM,GAAG,kBAAkB;CAClD,IAAI,CAAC,OACH,OAAO;CAET,MAAM,eAAe,MAAM,MAAM;CACjC,MAAM,cAAc,MAAM,KAAK;CAC/B,MAAM,SAA8B;EAAE,GAAG;EAAc,GAAG;CAAY;CAGtE,IACE,OAAO,yBACN,OAAO,0BAA0B,KAAA,KAChC,MAAM,0BAA0B,KAAA,IAElC,OAAO,wBAAwB,gCAC7B,QACA,KACF;CAGF,KAAK,MAAM,UAAUA,WAAmB,GACtC,IACE,OAAO,aACP,YAAY,OAAO,SACnB,aAAa,OAAO,OACpB;EACA,OAAO,MAAM,qBAAqB,OAAO,MAAM;EAE/C,IAAI,OAAO,SAAS,eAClB,OAAO,OAAO,QAAQ;GACpB,GAAG,aAAa,OAAO;GACvB,GAAG,YAAY,OAAO;EACxB;OACK,IAAI,OAAO,SAAS,SACzB,OAAO,OAAO,QAAS,aAAa,OAAO,KAAK,CAAe,OAC7D,OAAO,OAAO,KAChB;OAEA,OAAO,OAAO,QAAQ,iBACpB,aAAa,OAAO,OACpB,YAAY,OAAO,KACrB;EAEF,OAAO,MACL,EAAE,QAAQ,OAAO,OAAO,MAAM,GAC9B,iBAAiB,OAAO,MAC1B;CACF;CAEF,OAAO;EAAE,GAAG;EAAQ,GAAG,OAAO;CAAM;AACtC"}
|
|
@@ -13,8 +13,8 @@ import { allowedStatusCheckStrings, allowedStatusCheckWhenValues } from "./types
|
|
|
13
13
|
import { describeAllowedLocations, getAllowedParents } from "./options/scopes.js";
|
|
14
14
|
import { getOptions } from "./options/index.js";
|
|
15
15
|
import { parseUrl } from "../util/url.js";
|
|
16
|
-
import { instrument } from "../instrumentation/index.js";
|
|
17
16
|
import { migrateConfig } from "./migration.js";
|
|
17
|
+
import { instrument } from "../instrumentation/index.js";
|
|
18
18
|
import { validate } from "../util/template/index.js";
|
|
19
19
|
import { isCustomManager } from "../modules/manager/custom/index.js";
|
|
20
20
|
import { packageCacheNamespaces } from "../util/cache/package/namespaces.js";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { coerceArray } from "../../../util/array.js";
|
|
2
2
|
import { logger } from "../../../logger/index.js";
|
|
3
|
-
import { instrument } from "../../../instrumentation/index.js";
|
|
4
3
|
import { mergeChildConfig } from "../../../config/utils.js";
|
|
4
|
+
import { instrument } from "../../../instrumentation/index.js";
|
|
5
5
|
import { isCustomManager } from "../../../modules/manager/custom/index.js";
|
|
6
6
|
import { scm } from "../../../modules/platform/scm.js";
|
|
7
7
|
import { hashMap } from "../../../modules/manager/fingerprint.generated.js";
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { logger } from "../../../logger/index.js";
|
|
2
2
|
import { clone } from "../../../util/clone.js";
|
|
3
3
|
import { withoutUrlCredentials } from "../../../util/url.js";
|
|
4
|
+
import { mergeChildConfig } from "../../../config/utils.js";
|
|
4
5
|
import { LookupStats } from "../../../util/stats.js";
|
|
5
6
|
import { instrument } from "../../../instrumentation/index.js";
|
|
6
|
-
import { mergeChildConfig } from "../../../config/utils.js";
|
|
7
7
|
import { ExternalHostError } from "../../../types/errors/external-host-error.js";
|
|
8
8
|
import { Result } from "../../../util/result.js";
|
|
9
9
|
import { all } from "../../../util/promises.js";
|
|
@@ -3,9 +3,9 @@ import { GlobalConfig } from "../../../config/global.js";
|
|
|
3
3
|
import { getRegexPredicate } from "../../../util/string-match.js";
|
|
4
4
|
import { addMeta, logger, removeMeta } from "../../../logger/index.js";
|
|
5
5
|
import { clone } from "../../../util/clone.js";
|
|
6
|
+
import { mergeChildConfig } from "../../../config/utils.js";
|
|
6
7
|
import { ATTR_RENOVATE_SPLIT } from "../../../instrumentation/types.js";
|
|
7
8
|
import { instrument } from "../../../instrumentation/index.js";
|
|
8
|
-
import { mergeChildConfig } from "../../../config/utils.js";
|
|
9
9
|
import { resolveConfigPresets } from "../../../config/presets/index.js";
|
|
10
10
|
import { getCache } from "../../../util/cache/repository/index.js";
|
|
11
11
|
import { getBranchList } from "../../../util/git/index.js";
|
|
@@ -2,9 +2,9 @@ import { regEx } from "../../../util/regex.js";
|
|
|
2
2
|
import { coerceArray } from "../../../util/array.js";
|
|
3
3
|
import { titleCase } from "../../../util/string.js";
|
|
4
4
|
import { logger } from "../../../logger/index.js";
|
|
5
|
-
import { instrument } from "../../../instrumentation/index.js";
|
|
6
5
|
import { getFixedVersionConstraint, getLastAffectedVersionConstraint } from "../../../util/vulnerability/utils.js";
|
|
7
6
|
import { mergeChildConfig } from "../../../config/utils.js";
|
|
7
|
+
import { instrument } from "../../../instrumentation/index.js";
|
|
8
8
|
import { get } from "../../../modules/versioning/index.js";
|
|
9
9
|
import { all } from "../../../util/promises.js";
|
|
10
10
|
import { getDefaultVersioning } from "../../../modules/datasource/common.js";
|
package/package.json
CHANGED
package/renovate-schema.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$id": "https://docs.renovatebot.com/renovate-schema.json",
|
|
3
|
-
"title": "JSON schema for Renovate 44.186.
|
|
3
|
+
"title": "JSON schema for Renovate 44.186.2 config files (https://renovatebot.com/)",
|
|
4
4
|
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
5
|
-
"x-renovate-version": "44.186.
|
|
5
|
+
"x-renovate-version": "44.186.2",
|
|
6
6
|
"allowComments": true,
|
|
7
7
|
"type": "object",
|
|
8
8
|
"definitions": {
|