@ms-cloudpack/config 0.20.12 → 0.20.14

package/lib/cleanGeneratedConfig.d.ts

@@ -0,0 +1,8 @@
+import type { GeneratedConfig } from '@ms-cloudpack/common-types';
+/**
+ * Due to optimization, some package settings may end up with a "match" key but nothing else.
+ * These would add useless bloat, so filter them out before writing the generated config.
+ * This function removes those settings by mutating the input generated config.
+ */
+export declare function cleanGeneratedConfig(config: GeneratedConfig): void;
+//# sourceMappingURL=cleanGeneratedConfig.d.ts.map

package/lib/cleanGeneratedConfig.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/cleanGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,4BAA4B,CAAC;AAEnF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,QAE3D"}

package/lib/cleanGeneratedConfig.js

@@ -0,0 +1,16 @@
+/**
+ * Due to optimization, some package settings may end up with a "match" key but nothing else.
+ * These would add useless bloat, so filter them out before writing the generated config.
+ * This function removes those settings by mutating the input generated config.
+ */
+export function cleanGeneratedConfig(config) {
+    config.packageSettings = config.packageSettings?.filter(isValidSetting);
+}
+/**
+ * This function checks if a package setting is valid.
+ * This means that it has at least one key other than "match".
+ */
+function isValidSetting(setting) {
+    return Object.keys(setting).length > 1 && 'match' in setting;
+}
+//# sourceMappingURL=cleanGeneratedConfig.js.map

package/lib/cleanGeneratedConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cleanGeneratedConfig.js","sourceRoot":"","sources":["../src/cleanGeneratedConfig.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAuB;IAC1D,MAAM,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;AAC1E,CAAC;AAED;;;GAGG;AACH,SAAS,cAAc,CAAC,OAAwB;IAC9C,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,IAAI,OAAO,CAAC;AAC/D,CAAC","sourcesContent":["import type { GeneratedConfig, PackageSettings } from '@ms-cloudpack/common-types';\n\n/**\n * Due to optimization, some package settings may end up with a \"match\" key but nothing else.\n * These would add useless bloat, so filter them out before writing the generated config.\n * This function removes those settings by mutating the input generated config.\n */\nexport function cleanGeneratedConfig(config: GeneratedConfig) {\n  config.packageSettings = config.packageSettings?.filter(isValidSetting);\n}\n\n/**\n * This function checks if a package setting is valid.\n * This means that it has at least one key other than \"match\".\n */\nfunction isValidSetting(setting: PackageSettings) {\n  return Object.keys(setting).length > 1 && 'match' in setting;\n}\n"]}

package/lib/ensureGeneratedSettingsForPackage.d.ts

@@ -1,4 +1,4 @@
-import type { CloudpackConfig, PackageDefinitionsCache, PackageSettings } from '@ms-cloudpack/common-types';
+import type { CloudpackConfig, PackageDefinitionsCache, PackageJsonExports, PackageSettings } from '@ms-cloudpack/common-types';
 /**
  * Ensures the generated package setting for the package provided exists.
  * Used to consistently write to the generated config.
@@ -7,6 +7,7 @@ import type { CloudpackConfig, PackageDefinitionsCache, PackageSettings } from '
  */
 export declare function ensureGeneratedSettingsForPackage(options: {
     packagePath: string;
+    defaultExportsMap?: PackageJsonExports;
 }, context: {
     config: CloudpackConfig;
     packages: PackageDefinitionsCache;

package/lib/ensureGeneratedSettingsForPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensureGeneratedSettingsForPackage.d.ts","sourceRoot":"","sources":["../src/ensureGeneratedSettingsForPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAI5G;;;;;GAKG;AACH,wBAAsB,iCAAiC,CACrD,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,EAChC,OAAO,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GACtE,OAAO,CAAC,eAAe,CAAC,CA4B1B"}
+{"version":3,"file":"ensureGeneratedSettingsForPackage.d.ts","sourceRoot":"","sources":["../src/ensureGeneratedSettingsForPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EACf,uBAAuB,EACvB,kBAAkB,EAClB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AAIpC;;;;;GAKG;AACH,wBAAsB,iCAAiC,CACrD,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,kBAAkB,CAAA;CAAE,EACxE,OAAO,EAAE;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GACtE,OAAO,CAAC,eAAe,CAAC,CAiC1B"}

package/lib/ensureGeneratedSettingsForPackage.js

@@ -25,6 +25,9 @@ export async function ensureGeneratedSettingsForPackage(options, context) {
         generatedPackageSettings = {
             match: isExternalPackage(packagePath) ? { name, version: `^${version}` } : name,
         };
+        if (options.defaultExportsMap) {
+            generatedPackageSettings.exports = options.defaultExportsMap;
+        }
         packageSettings.push(generatedPackageSettings);
     }
     return generatedPackageSettings;

package/lib/ensureGeneratedSettingsForPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensureGeneratedSettingsForPackage.js","sourceRoot":"","sources":["../src/ensureGeneratedSettingsForPackage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,OAAgC,EAChC,OAAuE;IAEvE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAErC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,0CAA0C,WAAW,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACrC,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;IAElE,IAAI,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC;QACpD,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAAE;QAC1C,IAAI;QACJ,OAAO;QACP,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9B,wBAAwB,GAAG;YACzB,KAAK,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;SAChF,CAAC;QACF,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC","sourcesContent":["import type { CloudpackConfig, PackageDefinitionsCache, PackageSettings } from '@ms-cloudpack/common-types';\nimport { getPackageSettings } from './getPackageSettings.js';\nimport { isExternalPackage } from '@ms-cloudpack/package-utilities';\n\n/**\n * Ensures the generated package setting for the package provided exists.\n * Used to consistently write to the generated config.\n * Only call this function when you will create a package setting for the package.\n * Note: Does not write to disk.\n */\nexport async function ensureGeneratedSettingsForPackage(\n  options: { packagePath: string },\n  context: { config: CloudpackConfig; packages: PackageDefinitionsCache },\n): Promise<PackageSettings> {\n  const { packagePath } = options;\n  const { config, packages } = context;\n\n  const definition = await packages.get(packagePath);\n\n  if (!definition || !definition.name || !definition.version) {\n    throw new Error(`Valid package definition not found for ${packagePath}`);\n  }\n\n  const { name, version } = definition;\n  const packageSettings = (config.generated.packageSettings ??= []);\n\n  let { generatedPackageSettings } = getPackageSettings({\n    config: { generated: { packageSettings } },\n    name,\n    version,\n    firstMatch: true,\n  });\n\n  if (!generatedPackageSettings) {\n    generatedPackageSettings = {\n      match: isExternalPackage(packagePath) ? { name, version: `^${version}` } : name,\n    };\n    packageSettings.push(generatedPackageSettings);\n  }\n\n  return generatedPackageSettings;\n}\n"]}
+{"version":3,"file":"ensureGeneratedSettingsForPackage.js","sourceRoot":"","sources":["../src/ensureGeneratedSettingsForPackage.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,OAAwE,EACxE,OAAuE;IAEvE,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAErC,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC3D,MAAM,IAAI,KAAK,CAAC,0CAA0C,WAAW,EAAE,CAAC,CAAC;IAC3E,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACrC,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,KAAK,EAAE,CAAC,CAAC;IAElE,IAAI,EAAE,wBAAwB,EAAE,GAAG,kBAAkB,CAAC;QACpD,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,eAAe,EAAE,EAAE;QAC1C,IAAI;QACJ,OAAO;QACP,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9B,wBAAwB,GAAG;YACzB,KAAK,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;SAChF,CAAC;QAEF,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC9B,wBAAwB,CAAC,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC;QAC/D,CAAC;QAED,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC","sourcesContent":["import type {\n  CloudpackConfig,\n  PackageDefinitionsCache,\n  PackageJsonExports,\n  PackageSettings,\n} from '@ms-cloudpack/common-types';\nimport { getPackageSettings } from './getPackageSettings.js';\nimport { isExternalPackage } from '@ms-cloudpack/package-utilities';\n\n/**\n * Ensures the generated package setting for the package provided exists.\n * Used to consistently write to the generated config.\n * Only call this function when you will create a package setting for the package.\n * Note: Does not write to disk.\n */\nexport async function ensureGeneratedSettingsForPackage(\n  options: { packagePath: string; defaultExportsMap?: PackageJsonExports },\n  context: { config: CloudpackConfig; packages: PackageDefinitionsCache },\n): Promise<PackageSettings> {\n  const { packagePath } = options;\n  const { config, packages } = context;\n\n  const definition = await packages.get(packagePath);\n\n  if (!definition || !definition.name || !definition.version) {\n    throw new Error(`Valid package definition not found for ${packagePath}`);\n  }\n\n  const { name, version } = definition;\n  const packageSettings = (config.generated.packageSettings ??= []);\n\n  let { generatedPackageSettings } = getPackageSettings({\n    config: { generated: { packageSettings } },\n    name,\n    version,\n    firstMatch: true,\n  });\n\n  if (!generatedPackageSettings) {\n    generatedPackageSettings = {\n      match: isExternalPackage(packagePath) ? { name, version: `^${version}` } : name,\n    };\n\n    if (options.defaultExportsMap) {\n      generatedPackageSettings.exports = options.defaultExportsMap;\n    }\n\n    packageSettings.push(generatedPackageSettings);\n  }\n\n  return generatedPackageSettings;\n}\n"]}

package/lib/mergePackageSettings.d.ts.map

@@ -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;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,eAAe,EAAE,GAAG,eAAe,CA+DjF"}
+{"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,CAmEjF"}

package/lib/mergePackageSettings.js

@@ -57,6 +57,9 @@ export function mergePackageSettings(settings) {
         if (setting.dynamicImports) {
             acc.dynamicImports = [...(acc.dynamicImports || []), ...setting.dynamicImports];
         }
+        if (setting.ignoredBundlerWarnings) {
+            acc.ignoredBundlerWarnings = [...(acc.ignoredBundlerWarnings || []), ...setting.ignoredBundlerWarnings];
+        }
         return acc;
     }, {});
     return result;

package/lib/mergePackageSettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergePackageSettings.js","sourceRoot":"","sources":["../src/mergePackageSettings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageSettings, PackageJsonExports } from '@ms-cloudpack/common-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    if (setting.ignoreMissingExports !== undefined) {\n      acc.ignoreMissingExports = setting.ignoreMissingExports;\n    }\n\n    if (setting.dynamicImports) {\n      acc.dynamicImports = [...(acc.dynamicImports || []), ...setting.dynamicImports];\n    }\n\n    return acc;\n  }, {} as PackageSettings);\n\n  return result;\n}\n"]}
+{"version":3,"file":"mergePackageSettings.js","sourceRoot":"","sources":["../src/mergePackageSettings.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageSettings, PackageJsonExports } from '@ms-cloudpack/common-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    if (setting.ignoreMissingExports !== undefined) {\n      acc.ignoreMissingExports = setting.ignoreMissingExports;\n    }\n\n    if (setting.dynamicImports) {\n      acc.dynamicImports = [...(acc.dynamicImports || []), ...setting.dynamicImports];\n    }\n\n    if (setting.ignoredBundlerWarnings) {\n      acc.ignoredBundlerWarnings = [...(acc.ignoredBundlerWarnings || []), ...setting.ignoredBundlerWarnings];\n    }\n\n    return acc;\n  }, {} as PackageSettings);\n\n  return result;\n}\n"]}

package/lib/writeGeneratedConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"writeGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/writeGeneratedConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAKlE;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,iBASlF"}
+{"version":3,"file":"writeGeneratedConfig.d.ts","sourceRoot":"","sources":["../src/writeGeneratedConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAMlE;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,iBAWlF"}

package/lib/writeGeneratedConfig.js

@@ -2,12 +2,14 @@ import { writeJson } from '@ms-cloudpack/json-utilities';
 import { getConfigPath } from './getConfigPath.js';
 import { generatedAppConfigSchemaUrl } from './schemaUrls.js';
 import { sortGeneratedConfig } from './sortGeneratedConfig.js';
+import { cleanGeneratedConfig } from './cleanGeneratedConfig.js';
 /**
  * Writes generated config. This is used for `init` to provide package overrides needed.
  */
 export async function writeGeneratedConfig(config, appPath) {
     const { generatedConfigPath } = getConfigPath(appPath);
     sortGeneratedConfig(config);
+    cleanGeneratedConfig(config);
     return writeJson(generatedConfigPath, {
         $schema: generatedAppConfigSchemaUrl,
         ...config,

package/lib/writeGeneratedConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"writeGeneratedConfig.js","sourceRoot":"","sources":["../src/writeGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAAuB,EAAE,OAAe;IACjF,MAAM,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvD,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,OAAO,SAAS,CAAC,mBAAmB,EAAE;QACpC,OAAO,EAAE,2BAA2B;QACpC,GAAG,MAAM;KACV,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport type { GeneratedConfig } from '@ms-cloudpack/common-types';\nimport { getConfigPath } from './getConfigPath.js';\nimport { generatedAppConfigSchemaUrl } from './schemaUrls.js';\nimport { sortGeneratedConfig } from './sortGeneratedConfig.js';\n\n/**\n * Writes generated config. This is used for `init` to provide package overrides needed.\n */\nexport async function writeGeneratedConfig(config: GeneratedConfig, appPath: string) {\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  sortGeneratedConfig(config);\n\n  return writeJson(generatedConfigPath, {\n    $schema: generatedAppConfigSchemaUrl,\n    ...config,\n  });\n}\n"]}
+{"version":3,"file":"writeGeneratedConfig.js","sourceRoot":"","sources":["../src/writeGeneratedConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,MAAuB,EAAE,OAAe;IACjF,MAAM,EAAE,mBAAmB,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IAEvD,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAE5B,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE7B,OAAO,SAAS,CAAC,mBAAmB,EAAE;QACpC,OAAO,EAAE,2BAA2B;QACpC,GAAG,MAAM;KACV,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport type { GeneratedConfig } from '@ms-cloudpack/common-types';\nimport { getConfigPath } from './getConfigPath.js';\nimport { generatedAppConfigSchemaUrl } from './schemaUrls.js';\nimport { sortGeneratedConfig } from './sortGeneratedConfig.js';\nimport { cleanGeneratedConfig } from './cleanGeneratedConfig.js';\n\n/**\n * Writes generated config. This is used for `init` to provide package overrides needed.\n */\nexport async function writeGeneratedConfig(config: GeneratedConfig, appPath: string) {\n  const { generatedConfigPath } = getConfigPath(appPath);\n\n  sortGeneratedConfig(config);\n\n  cleanGeneratedConfig(config);\n\n  return writeJson(generatedConfigPath, {\n    $schema: generatedAppConfigSchemaUrl,\n    ...config,\n  });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/config",
-  "version": "0.20.12",
+  "version": "0.20.14",
   "description": "Configuration handling for cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -14,9 +14,9 @@
     }
   },
   "dependencies": {
-    "@ms-cloudpack/common-types": "^0.6.1",
+    "@ms-cloudpack/common-types": "^0.7.0",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-utilities": "^7.4.10",
+    "@ms-cloudpack/package-utilities": "^7.5.0",
     "import-meta-resolve": "^4.0.0",
     "merge": "^2.1.1",
     "semver": "^7.6.0"