@ms-cloudpack/config 0.17.7 → 0.17.8
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/lib/compareSettings.js +4 -4
- package/lib/compareSettings.js.map +1 -1
- package/lib/createPackageOverrideTransform.js +2 -2
- package/lib/createPackageOverrideTransform.js.map +1 -1
- package/lib/mergePackageSettings.d.ts +6 -1
- package/lib/mergePackageSettings.d.ts.map +1 -1
- package/lib/mergePackageSettings.js +6 -1
- package/lib/mergePackageSettings.js.map +1 -1
- package/lib/processConfig.js +1 -1
- package/lib/processConfig.js.map +1 -1
- package/package.json +4 -4
package/lib/compareSettings.js
CHANGED
|
@@ -11,13 +11,13 @@ export function compareSettings(a, b) {
|
|
|
11
11
|
return aMatch.localeCompare(bMatch);
|
|
12
12
|
}
|
|
13
13
|
else if (isAString) {
|
|
14
|
-
return 1;
|
|
14
|
+
return -1;
|
|
15
15
|
}
|
|
16
16
|
else if (isBString) {
|
|
17
|
-
return
|
|
17
|
+
return 1;
|
|
18
18
|
}
|
|
19
|
-
const { name: aName = '', version: aVersion = '*' } = aMatch
|
|
20
|
-
const { name: bName = '', version: bVersion = '*' } = bMatch
|
|
19
|
+
const { name: aName = '', version: aVersion = '*' } = aMatch;
|
|
20
|
+
const { name: bName = '', version: bVersion = '*' } = bMatch;
|
|
21
21
|
if (aName === bName) {
|
|
22
22
|
return aVersion.localeCompare(bVersion);
|
|
23
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compareSettings.js","sourceRoot":"","sources":["../src/compareSettings.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAAC,CAAkB,EAAE,CAAkB;IACpE,wEAAwE;IACxE,qDAAqD;IACrD,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC;IAEvB,kCAAkC;IAClC,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC;IAE7C,qDAAqD;IACrD,IAAI,SAAS,IAAI,SAAS,EAAE;QAC1B,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;KACrC;SAAM,IAAI,SAAS,EAAE;QACpB,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"compareSettings.js","sourceRoot":"","sources":["../src/compareSettings.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAAC,CAAkB,EAAE,CAAkB;IACpE,wEAAwE;IACxE,qDAAqD;IACrD,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC;IAEvB,kCAAkC;IAClC,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC;IAC7C,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC;IAE7C,qDAAqD;IACrD,IAAI,SAAS,IAAI,SAAS,EAAE;QAC1B,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;KACrC;SAAM,IAAI,SAAS,EAAE;QACpB,OAAO,CAAC,CAAC,CAAC;KACX;SAAM,IAAI,SAAS,EAAE;QACpB,OAAO,CAAC,CAAC;KACV;IAED,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE,EAAE,OAAO,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,CAAC;IAC7D,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,EAAE,EAAE,OAAO,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,MAAM,CAAC;IAE7D,IAAI,KAAK,KAAK,KAAK,EAAE;QACnB,OAAO,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;KACzC;IAED,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AACpC,CAAC","sourcesContent":["import type { PackageSettings } from '@ms-cloudpack/config-types';\n\nexport function compareSettings(a: PackageSettings, b: PackageSettings): number {\n // TypeScript's type narrowing doesn't work well with object properties,\n // so we can assign them to variables to help it out.\n const aMatch = a.match;\n const bMatch = b.match;\n\n // Check if the match is a string.\n const isAString = typeof aMatch === 'string';\n const isBString = typeof bMatch === 'string';\n\n // Place string matches at the beginning of the list.\n if (isAString && isBString) {\n return aMatch.localeCompare(bMatch);\n } else if (isAString) {\n return -1;\n } else if (isBString) {\n return 1;\n }\n\n const { name: aName = '', version: aVersion = '*' } = aMatch;\n const { name: bName = '', version: bVersion = '*' } = bMatch;\n\n if (aName === bName) {\n return aVersion.localeCompare(bVersion);\n }\n\n return aName.localeCompare(bName);\n}\n"]}
|
|
@@ -44,8 +44,8 @@ export function createPackageOverrideTransform(config) {
|
|
|
44
44
|
...(userPackageSettings?.excludedDependencies || []),
|
|
45
45
|
...(generatedPackageSettings?.excludedDependencies || []),
|
|
46
46
|
];
|
|
47
|
-
if (excludedDependencies?.length) {
|
|
48
|
-
result.dependencies = Object.fromEntries(Object.entries(result.dependencies
|
|
47
|
+
if (excludedDependencies?.length && result.dependencies) {
|
|
48
|
+
result.dependencies = Object.fromEntries(Object.entries(result.dependencies).filter(([dep]) => !excludedDependencies?.includes(dep)));
|
|
49
49
|
}
|
|
50
50
|
return result;
|
|
51
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createPackageOverrideTransform.js","sourceRoot":"","sources":["../src/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAuB;IACpE,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE;QACrD,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;QAC/C,MAAM,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAExG,IAAI,CAAC,mBAAmB,IAAI,CAAC,wBAAwB,EAAE;YACrD,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,MAAM,GAAG;YACb,GAAG,UAAU;YACb,OAAO;YACL,uCAAuC;YACvC,mBAAmB,EAAE,OAAO;gBAC5B,uDAAuD;gBACvD,UAAU,CAAC,OAAO;gBAClB,+CAA+C;gBAC/C,CAAC,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;SACxF,CAAC;QAEF,8CAA8C;QAC9C,IAAI,wBAAwB,EAAE,OAAO,EAAE;YACrC,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC;SACrE;QAED,8CAA8C;QAC9C,MAAM,oBAAoB,GAAG;YAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;YACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;SAC1D,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE;gBAC/B,mDAAmD;gBACnD,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC;gBAE3B,4DAA4D;gBAC5D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;oBACtB,MAAM,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;aAChH;SACF;QAED,iDAAiD;QACjD,MAAM,oBAAoB,GAAG;YAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;YACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;SAC1D,CAAC;QAEF,IAAI,oBAAoB,EAAE,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"createPackageOverrideTransform.js","sourceRoot":"","sources":["../src/createPackageOverrideTransform.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAEhE;;;GAGG;AACH,MAAM,UAAU,8BAA8B,CAAC,MAAuB;IACpE,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,EAAE;QACrD,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;QAC/C,MAAM,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAExG,IAAI,CAAC,mBAAmB,IAAI,CAAC,wBAAwB,EAAE;YACrD,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,MAAM,GAAG;YACb,GAAG,UAAU;YACb,OAAO;YACL,uCAAuC;YACvC,mBAAmB,EAAE,OAAO;gBAC5B,uDAAuD;gBACvD,UAAU,CAAC,OAAO;gBAClB,+CAA+C;gBAC/C,CAAC,MAAM,aAAa,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;SACxF,CAAC;QAEF,8CAA8C;QAC9C,IAAI,wBAAwB,EAAE,OAAO,EAAE;YACrC,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,CAAC;SACrE;QAED,8CAA8C;QAC9C,MAAM,oBAAoB,GAAG;YAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;YACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;SAC1D,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,GAAG,CAAC,EAAE;gBAC/B,mDAAmD;gBACnD,MAAM,CAAC,YAAY,KAAK,EAAE,CAAC;gBAE3B,4DAA4D;gBAC5D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC;oBACtB,MAAM,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;aAChH;SACF;QAED,iDAAiD;QACjD,MAAM,oBAAoB,GAAG;YAC3B,GAAG,CAAC,mBAAmB,EAAE,oBAAoB,IAAI,EAAE,CAAC;YACpD,GAAG,CAAC,wBAAwB,EAAE,oBAAoB,IAAI,EAAE,CAAC;SAC1D,CAAC;QAEF,IAAI,oBAAoB,EAAE,MAAM,IAAI,MAAM,CAAC,YAAY,EAAE;YACvD,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAC5F,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import type { PackageDefinitionTransform } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config-types';\nimport { getPackageSettings } from './getPackageSettings.js';\nimport { getExportsMap } from '@ms-cloudpack/package-utilities';\n\n/**\n * Creates a transform to be registered with a PackageDefinitions registry for applying overrides to from the config\n * to package.json definitions.\n */\nexport function createPackageOverrideTransform(config: CloudpackConfig): PackageDefinitionTransform {\n return async ({ definition, packagePath, packages }) => {\n const { name = '', version = '' } = definition;\n const { userPackageSettings, generatedPackageSettings } = getPackageSettings({ name, version, config });\n\n if (!userPackageSettings && !generatedPackageSettings) {\n return undefined;\n }\n\n const result = {\n ...definition,\n exports:\n // See if the user has defined exports.\n userPackageSettings?.exports ||\n // If not, see if we have exports from past transforms.\n definition.exports ||\n // If not, generate exports with no transforms.\n (await getExportsMap({ packagePath, disableTransforms: true }, { packages, config })),\n };\n\n // If we have generated overrides, apply them.\n if (generatedPackageSettings?.exports) {\n result.exports = [result.exports, generatedPackageSettings.exports];\n }\n\n // If we have included dependencies, add them.\n const includedDependencies = [\n ...(userPackageSettings?.includedDependencies || []),\n ...(generatedPackageSettings?.includedDependencies || []),\n ];\n\n for (const dep of includedDependencies) {\n if (!result.dependencies?.[dep]) {\n // Initialize dependencies map if it doesn't exist.\n result.dependencies ??= {};\n\n // Add the dependency from other sources, or use a wildcard.\n result.dependencies[dep] =\n result.devDependencies?.[dep] || result.peerDependencies?.[dep] || result.optionalDependencies?.[dep] || '*';\n }\n }\n\n // If we have excluded dependencies, remove them.\n const excludedDependencies = [\n ...(userPackageSettings?.excludedDependencies || []),\n ...(generatedPackageSettings?.excludedDependencies || []),\n ];\n\n if (excludedDependencies?.length && result.dependencies) {\n result.dependencies = Object.fromEntries(\n Object.entries(result.dependencies).filter(([dep]) => !excludedDependencies?.includes(dep)),\n );\n }\n\n return result;\n };\n}\n"]}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import type { PackageSettings } from '@ms-cloudpack/config-types';
|
|
2
2
|
/**
|
|
3
|
-
* Merges package settings together.
|
|
3
|
+
* Merges package settings together.
|
|
4
|
+
*
|
|
5
|
+
* TODO: This "merges" exports maps by concatenating them in an array, which is not correct per the
|
|
6
|
+
* spec in Node. However, merging them properly is much more difficult to implement (depends on the
|
|
7
|
+
* conditions that will be applied at the time the map is used), so more thought would be required
|
|
8
|
+
* for how to handle multiple exports maps properly.
|
|
4
9
|
*/
|
|
5
10
|
export declare function mergePackageSettings(settings: PackageSettings[]): PackageSettings;
|
|
6
11
|
//# sourceMappingURL=mergePackageSettings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergePackageSettings.d.ts","sourceRoot":"","sources":["../src/mergePackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,4BAA4B,CAAC;AAItF
|
|
1
|
+
{"version":3,"file":"mergePackageSettings.d.ts","sourceRoot":"","sources":["../src/mergePackageSettings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAsB,MAAM,4BAA4B,CAAC;AAItF;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,eAAe,CAuDjF"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
const defaultInputPaths = ['src/**', '*.json', '!**/node_modules/**'];
|
|
2
2
|
/**
|
|
3
|
-
* Merges package settings together.
|
|
3
|
+
* Merges package settings together.
|
|
4
|
+
*
|
|
5
|
+
* TODO: This "merges" exports maps by concatenating them in an array, which is not correct per the
|
|
6
|
+
* spec in Node. However, merging them properly is much more difficult to implement (depends on the
|
|
7
|
+
* conditions that will be applied at the time the map is used), so more thought would be required
|
|
8
|
+
* for how to handle multiple exports maps properly.
|
|
4
9
|
*/
|
|
5
10
|
export function mergePackageSettings(settings) {
|
|
6
11
|
const result = settings.reduce((acc, setting) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergePackageSettings.js","sourceRoot":"","sources":["../src/mergePackageSettings.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;AAEtE
|
|
1
|
+
{"version":3,"file":"mergePackageSettings.js","sourceRoot":"","sources":["../src/mergePackageSettings.ts"],"names":[],"mappings":"AAEA,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC;AAEtE;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAA2B;IAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAE5B,IAAI,OAAO,EAAE;YACX,iDAAiD;YACjD,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;gBAChB,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC;aACvB;iBAAM;gBACL,iEAAiE;gBACjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;oBAC/B,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBAC7B;gBAED,iGAAiG;gBACjG,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;oBACzB,GAAG,CAAC,OAAgC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;iBACxD;qBAAM;oBACJ,GAAG,CAAC,OAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACrD;aACF;SACF;QAED,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,GAAG,CAAC,oBAAoB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;SACnG;QAED,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,GAAG,CAAC,oBAAoB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;SACnG;QAED,IAAI,OAAO,CAAC,mBAAmB,EAAE;YAC/B,GAAG,CAAC,mBAAmB,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,mBAAmB,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;SAChG;QAED,IAAI,OAAO,CAAC,WAAW,EAAE;YACvB,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;SACvC;QAED,IAAI,OAAO,CAAC,cAAc,EAAE;YAC1B,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;SAC7C;QAED,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,MAAM,sBAAsB,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,sBAAsB,GAAG,CAAC,CAAC,EAAE;gBAC/B,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC,EAAE,GAAG,iBAAiB,CAAC,CAAC;aAC5E;YACD,GAAG,CAAC,UAAU,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;SACrE;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAqB,CAAC,CAAC;IAE1B,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["import type { PackageSettings, PackageJsonExports } from '@ms-cloudpack/config-types';\n\nconst defaultInputPaths = ['src/**', '*.json', '!**/node_modules/**'];\n\n/**\n * Merges package settings together.\n *\n * TODO: This \"merges\" exports maps by concatenating them in an array, which is not correct per the\n * spec in Node. However, merging them properly is much more difficult to implement (depends on the\n * conditions that will be applied at the time the map is used), so more thought would be required\n * for how to handle multiple exports maps properly.\n */\nexport function mergePackageSettings(settings: PackageSettings[]): PackageSettings {\n const result = settings.reduce((acc, setting) => {\n const { exports } = setting;\n\n if (exports) {\n // If we don't have any exports yet, just set it.\n if (!acc.exports) {\n acc.exports = exports;\n } else {\n // If we have an exports but it's not an array, make it an array.\n if (!Array.isArray(acc.exports)) {\n acc.exports = [acc.exports];\n }\n\n // If the accumulated exports is an array, expand the array to `push`; else push the single item.\n if (Array.isArray(exports)) {\n (acc.exports as PackageJsonExports[]).push(...exports);\n } else {\n (acc.exports as PackageJsonExports[]).push(exports);\n }\n }\n }\n\n if (setting.includedDependencies) {\n acc.includedDependencies = [...(acc.includedDependencies || []), ...setting.includedDependencies];\n }\n\n if (setting.excludedDependencies) {\n acc.excludedDependencies = [...(acc.excludedDependencies || []), ...setting.excludedDependencies];\n }\n\n if (setting.inlinedDependencies) {\n acc.inlinedDependencies = [...(acc.inlinedDependencies || []), ...setting.inlinedDependencies];\n }\n\n if (setting.bundlerType) {\n acc.bundlerType = setting.bundlerType;\n }\n\n if (setting.bundlerOptions) {\n acc.bundlerOptions = setting.bundlerOptions;\n }\n\n if (setting.inputPaths) {\n const defaultInputPathsIndex = setting.inputPaths.indexOf('...');\n if (defaultInputPathsIndex > -1) {\n setting.inputPaths.splice(defaultInputPathsIndex, 1, ...defaultInputPaths);\n }\n acc.inputPaths = [...(acc.inputPaths || []), ...setting.inputPaths];\n }\n\n return acc;\n }, {} as PackageSettings);\n\n return result;\n}\n"]}
|
package/lib/processConfig.js
CHANGED
|
@@ -7,7 +7,7 @@ export function processConfig(config) {
|
|
|
7
7
|
// Convert package overrides into settings to preserve the deprecated support.
|
|
8
8
|
if (packageOverrides) {
|
|
9
9
|
config.packageSettings = config.packageSettings || [];
|
|
10
|
-
for (const override of packageOverrides
|
|
10
|
+
for (const override of packageOverrides) {
|
|
11
11
|
const settings = {
|
|
12
12
|
match: { name: override.name, version: override.versionRequirement },
|
|
13
13
|
exports: override.overrides.exports,
|
package/lib/processConfig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processConfig.js","sourceRoot":"","sources":["../src/processConfig.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAwB;IACpD,6CAA6C;IAC7C,MAAM,gBAAgB,GAAG,MAAM,EAAE,gBAAgB,CAAC;IAElD,8EAA8E;IAC9E,IAAI,gBAAgB,EAAE;QACpB,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,gBAAgB,
|
|
1
|
+
{"version":3,"file":"processConfig.js","sourceRoot":"","sources":["../src/processConfig.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,MAAwB;IACpD,6CAA6C;IAC7C,MAAM,gBAAgB,GAAG,MAAM,EAAE,gBAAgB,CAAC;IAElD,8EAA8E;IAC9E,IAAI,gBAAgB,EAAE;QACpB,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC;QAEtD,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;YACvC,MAAM,QAAQ,GAAoB;gBAChC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,kBAAkB,EAAE;gBACpE,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,OAAO;aACpC,CAAC;YACF,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvC;QAED,6CAA6C;QAC7C,OAAO,MAAM,CAAC,gBAAgB,CAAC;KAChC;AACH,CAAC","sourcesContent":["import type { GeneratedConfig, PackageSettings } from '@ms-cloudpack/config-types';\n\n/**\n * An internal function for processing a config object after reading the json values.\n */\nexport function processConfig(config?: GeneratedConfig) {\n // eslint-disable-next-line etc/no-deprecated\n const packageOverrides = config?.packageOverrides;\n\n // Convert package overrides into settings to preserve the deprecated support.\n if (packageOverrides) {\n config.packageSettings = config.packageSettings || [];\n\n for (const override of packageOverrides) {\n const settings: PackageSettings = {\n match: { name: override.name, version: override.versionRequirement },\n exports: override.overrides.exports,\n };\n config.packageSettings.push(settings);\n }\n\n // eslint-disable-next-line etc/no-deprecated\n delete config.packageOverrides;\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ms-cloudpack/config",
|
|
3
|
-
"version": "0.17.
|
|
3
|
+
"version": "0.17.8",
|
|
4
4
|
"description": "Configuration handling for cloudpack.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@ms-cloudpack/bundler-types": "^0.23.
|
|
18
|
-
"@ms-cloudpack/config-types": "^0.3.
|
|
17
|
+
"@ms-cloudpack/bundler-types": "^0.23.6",
|
|
18
|
+
"@ms-cloudpack/config-types": "^0.3.1",
|
|
19
19
|
"@ms-cloudpack/json-utilities": "^0.1.2",
|
|
20
|
-
"@ms-cloudpack/package-utilities": "^5.7.
|
|
20
|
+
"@ms-cloudpack/package-utilities": "^5.7.2",
|
|
21
21
|
"semver": "^7.3.7"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|