@ms-cloudpack/cli 0.55.7 → 0.55.8

package/lib/commands/init/evaluateImportsForOverrides.d.ts

@@ -15,11 +15,14 @@ export declare function evaluateImportsForOverrides(options: {
     /** Config so far. This will be modified if new overrides are needed. */
     config: CloudpackConfig;
     resolveMap: ResolveMap;
+    importerContext: PackageImporterContext | undefined;
 }): Promise<{
     /** Changes made to the generated config */
     changes: GeneratedPackageChanges[];
     /** Any errors encountered */
     errors: string[];
+    /** Any warnings generated */
+    warnings: string[];
     /** Map from new package path (to be evaluated) to info about the parent. */
     pathsToEvaluate: Map<string, PackageImporterContext | undefined>;
     /** Package paths for which new exports were added, so the package should be re-processed. */

package/lib/commands/init/evaluateImportsForOverrides.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAmB,MAAM,4BAA4B,CAAC;AAEhG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AASlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAGlF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;CACxB,GAAG,OAAO,CAAC;IACV,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CA2HD"}
+{"version":3,"file":"evaluateImportsForOverrides.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAmB,MAAM,4BAA4B,CAAC;AAEhG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAUlE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAIlF;;;GAGG;AACH,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IACzD,QAAQ,EAAE,uBAAuB,CAAC;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;CACrD,GAAG,OAAO,CAAC;IACV,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,6BAA6B;IAC7B,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,6BAA6B;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IACjE,6FAA6F;IAC7F,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAkLD"}

package/lib/commands/init/evaluateImportsForOverrides.js

@@ -1,62 +1,109 @@
 import { getPackageSettings } from '@ms-cloudpack/config';
-import { addExportsMapEntry, findResolveMapEntry, flattenExportsMap, getDependencies, getExportsMap, } from '@ms-cloudpack/package-utilities';
+import { addExportsMapEntry, findResolveMapEntry, flattenExportsMap, getDependencies, getUnusedDependencies, getExportsMap, } from '@ms-cloudpack/package-utilities';
 import { bulletedList, cyan } from '@ms-cloudpack/task-reporter';
 import { isBuiltin } from 'module';
+import { getConsumedPaths } from '@ms-cloudpack/api-server';
 /**
  * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.
  * If so, updates package overrides in the config.
  */
 export async function evaluateImportsForOverrides(options) {
-    const { packages, info, definition, packagePath, config, resolveMap } = options;
-    const displayName = `${definition.name}@${definition.version}`;
+    const { packages, info, definition, packagePath, config, resolveMap, importerContext } = options;
+    const { name: packageName, version: packageVersion } = definition;
+    const displayName = `${packageName}@${packageVersion}`;
+    if (!packageName || !packageVersion) {
+        throw new Error(`Package "${displayName}" is missing a name or version.`);
+    }
     const changes = [];
-    const errors = new Set();
+    const errors = [];
+    const warnings = [];
     const pathsToEvaluate = new Map();
     const pathsToRefresh = new Set();
-    const dependencyVersions = getDependencies(definition);
+    const dependencies = getDependencies(definition);
+    const unusedDependencies = getUnusedDependencies(definition);
+    const consumedPaths = getConsumedPaths(info);
     // Iterate through imports and find their path from the resolve map.
-    for (const entryInfo of Object.values(info.entry)) {
-        // iterate through all package names of result.info.entry.consumes
-        for (const consume of entryInfo.consumes) {
-            const dependencyName = consume.packageName;
-            const dependencyImportPath = consume.importPath;
-            const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
-            const dependencyPath = resolveEntry?.path;
-            const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
-            // If the dependency is not found, add an error.
-            if (!dependencyPath || !dependencyDefinition) {
-                if (isBuiltin(dependencyName)) {
-                    // If the dependency is a node built-in, add a special error message.
-                    errors.add(`Package "${displayName}" imports from the node built-in "${dependencyName}" but no browser-friendly version was found in dependencies. ` +
-                        `This can be fixed by forcing package "${displayName}" to use "bundlerType": of "rollup" in package settings, or by adding a polyfill browser-friendly dependency.`);
-                }
-                else {
-                    errors.add(`Package "${displayName}" imports from the package "${dependencyName}" but it couldn't be found. ` +
-                        `Ensure that "${dependencyName}" is listed in dependencies of "${displayName}".`);
-                }
-                continue;
-            }
-            const { name, version } = dependencyDefinition;
-            if (!name || !version) {
-                throw new Error(`Package "${displayName}" depends on "${dependencyName}" but it is missing a name or version.`);
-            }
-            let importerContext;
-            const versionRequirement = dependencyVersions[dependencyName];
-            if (versionRequirement && definition.name && definition.version) {
-                importerContext = {
-                    parentName: definition.name,
-                    parentVersion: definition.version,
-                    importedName: dependencyName,
-                    versionRequirement,
-                };
+    for (const [dependencyName, dependencyImportPaths] of Object.entries(consumedPaths)) {
+        const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
+        const dependencyPath = resolveEntry?.path;
+        const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
+        const message = `Package "${displayName}" imports from the package "${dependencyName}" but it couldn't be found. ` +
+            `Ensure that "${dependencyName}" is listed in dependencies of "${displayName}".`;
+        // If the dependency is a node built-in, add a special error message.
+        const messageBuiltin = `Package "${displayName}" imports from the node built-in "${dependencyName}" but no browser-friendly version was found in dependencies. ` +
+            `This can be fixed by forcing package "${displayName}" to use "bundlerType": of "rollup" in package settings, or by adding a polyfill browser-friendly dependency.`;
+        // If the dependency is not resolved, add an error.
+        if (!dependencyPath || !dependencyDefinition) {
+            isBuiltin(dependencyName) ? errors.push(messageBuiltin) : errors.push(message);
+            // If the dependency is not resolved, we can't continue to evaluate it.
+            continue;
+        }
+        // If the dependency is not listed as a dependency add to includedDependencies.
+        if (!dependencies[dependencyName] && dependencyName !== definition.name) {
+            // Survive from the case where it is not a dependency in the package.json
+            // and it is resolvable, but warn the user.
+            if (!unusedDependencies[dependencyName]) {
+                isBuiltin(dependencyName) ? warnings.push(messageBuiltin) : warnings.push(message);
             }
             // Make sure to add the package to the list of packages to evaluate.
-            pathsToEvaluate.set(dependencyPath, importerContext);
-            // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.
-            const exports = await getExportsMap({ packagePath: dependencyPath }, { packages, config });
-            const flattenedExports = flattenExportsMap(exports);
+            pathsToEvaluate.set(packagePath, importerContext);
+            // Add to includedDependencies
             const packageSettings = (config.generated.packageSettings ??= []);
-            let generatedPackageSettings;
+            let generatedPackageSettings = getPackageSettings({
+                config: { generated: { packageSettings } },
+                name: packageName,
+                version: packageVersion,
+                firstMatch: true,
+            }).generatedPackageSettings;
+            if (!generatedPackageSettings) {
+                generatedPackageSettings = {
+                    match: { name: packageName, version: `^${packageVersion}` },
+                };
+                packageSettings.push(generatedPackageSettings);
+            }
+            generatedPackageSettings.includedDependencies ??= [];
+            // Add to includedDependencies if it is not already included.
+            if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {
+                continue;
+            }
+            generatedPackageSettings.includedDependencies.push(dependencyName);
+            changes.push({
+                name: packageName,
+                version: packageVersion,
+                path: packagePath,
+                changes: [
+                    {
+                        type: 'included-dependency',
+                        change: dependencyName,
+                        reason: `Imported by "${displayName}"`,
+                    },
+                ],
+            });
+            pathsToRefresh.add(packagePath);
+        }
+        const { name, version } = dependencyDefinition;
+        if (!name || !version) {
+            throw new Error(`Package "${displayName}" depends on "${dependencyName}" but it is missing a name or version.`);
+        }
+        let dependencyImporterContext;
+        const versionRequirement = dependencies[dependencyName];
+        if (versionRequirement && definition.name && definition.version) {
+            dependencyImporterContext = {
+                parentName: definition.name,
+                parentVersion: definition.version,
+                importedName: dependencyName,
+                versionRequirement,
+            };
+        }
+        // Make sure to add the package to the list of packages to evaluate.
+        pathsToEvaluate.set(dependencyPath, dependencyImporterContext);
+        // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.
+        const exports = await getExportsMap({ packagePath: dependencyPath }, { packages, config });
+        const flattenedExports = flattenExportsMap(exports);
+        const packageSettings = (config.generated.packageSettings ??= []);
+        let generatedPackageSettings;
+        // iterate through all the import paths.
+        for (const dependencyImportPath of dependencyImportPaths) {
             if (flattenedExports[dependencyImportPath]) {
                 continue;
             }
@@ -98,10 +145,10 @@ export async function evaluateImportsForOverrides(options) {
             }
             else {
                 const errorMessage = `Imported "${cyan(dependencyImportPath.replace('.', dependencyName))}" but a corresponding file couldn't be found. Either correct the import or adjust the "${cyan(dependencyName)}" package version to one that supports this import path.\n${bulletedList([`${cyan(displayName)}: ${packagePath}`, `${cyan(dependencyName)}: ${dependencyPath}`], 2)}`;
-                errors.add(errorMessage);
+                errors.push(errorMessage);
             }
         }
     }
-    return { changes, errors: Array.from(errors), pathsToEvaluate, pathsToRefresh };
+    return { changes, errors, warnings, pathsToEvaluate, pathsToRefresh };
 }
 //# sourceMappingURL=evaluateImportsForOverrides.js.map

package/lib/commands/init/evaluateImportsForOverrides.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson, PackageSettings } from '@ms-cloudpack/config-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\n  getExportsMap,\n} from '@ms-cloudpack/package-utilities';\nimport { bulletedList, cyan } from '@ms-cloudpack/task-reporter';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { isBuiltin } from 'module';\n\n/**\n * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.\n * If so, updates package overrides in the config.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  info: BundleInfo;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n}): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any errors encountered */\n  errors: string[];\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { packages, info, definition, packagePath, config, resolveMap } = options;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const errors = new Set<string>();\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencyVersions = getDependencies(definition);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const entryInfo of Object.values(info.entry)) {\n    // iterate through all package names of result.info.entry.consumes\n    for (const consume of entryInfo.consumes) {\n      const dependencyName = consume.packageName;\n      const dependencyImportPath = consume.importPath;\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n      // If the dependency is not found, add an error.\n      if (!dependencyPath || !dependencyDefinition) {\n        if (isBuiltin(dependencyName)) {\n          // If the dependency is a node built-in, add a special error message.\n          errors.add(\n            `Package \"${displayName}\" imports from the node built-in \"${dependencyName}\" but no browser-friendly version was found in dependencies. ` +\n              `This can be fixed by forcing package \"${displayName}\" to use \"bundlerType\": of \"rollup\" in package settings, or by adding a polyfill browser-friendly dependency.`,\n          );\n        } else {\n          errors.add(\n            `Package \"${displayName}\" imports from the package \"${dependencyName}\" but it couldn't be found. ` +\n              `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`,\n          );\n        }\n        continue;\n      }\n\n      const { name, version } = dependencyDefinition as Required<PackageJson>;\n      if (!name || !version) {\n        throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n      }\n\n      let importerContext: PackageImporterContext | undefined;\n      const versionRequirement = dependencyVersions[dependencyName];\n      if (versionRequirement && definition.name && definition.version) {\n        importerContext = {\n          parentName: definition.name,\n          parentVersion: definition.version,\n          importedName: dependencyName,\n          versionRequirement,\n        };\n      }\n\n      // Make sure to add the package to the list of packages to evaluate.\n      pathsToEvaluate.set(dependencyPath, importerContext);\n\n      // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.\n      const exports = await getExportsMap({ packagePath: dependencyPath }, { packages, config });\n      const flattenedExports = flattenExportsMap(exports);\n      const packageSettings = (config.generated.packageSettings ??= []);\n      let generatedPackageSettings: PackageSettings | undefined;\n\n      if (flattenedExports[dependencyImportPath]) {\n        continue;\n      }\n\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      generatedPackageSettings ??= getPackageSettings({\n        config: { generated: { packageSettings } },\n        name,\n        version,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        generatedPackageSettings = {\n          match: { name, version: `^${version}` },\n          exports: {},\n        };\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.exports ??= {};\n\n      const addedEntry = await addExportsMapEntry(\n        {\n          exports: generatedPackageSettings.exports,\n          packagePath: dependencyPath,\n          importPath: dependencyImportPath,\n        },\n        { packages, config },\n      );\n\n      if (addedEntry) {\n        changes.push({\n          name: dependencyName,\n          version: dependencyDefinition.version || '',\n          path: dependencyPath,\n          changes: [\n            {\n              type: 'added-export',\n              change: dependencyImportPath,\n              reason: `Imported by \"${displayName}\"`,\n            },\n          ],\n        });\n\n        // Since we've found a missing export, we need to re-enqueue the dependency for evaluation.\n        pathsToRefresh.add(dependencyPath);\n      } else {\n        const errorMessage = `Imported \"${cyan(\n          dependencyImportPath.replace('.', dependencyName),\n        )}\" but a corresponding file couldn't be found. Either correct the import or adjust the \"${cyan(\n          dependencyName,\n        )}\" package version to one that supports this import path.\\n${bulletedList(\n          [`${cyan(displayName)}: ${packagePath}`, `${cyan(dependencyName)}: ${dependencyPath}`],\n          2,\n        )}`;\n        errors.add(errorMessage);\n      }\n    }\n  }\n\n  return { changes, errors: Array.from(errors), pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"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","sourcesContent":["import type { BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache, PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson, PackageSettings } from '@ms-cloudpack/config-types';\nimport { getPackageSettings } from '@ms-cloudpack/config';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport {\n  addExportsMapEntry,\n  findResolveMapEntry,\n  flattenExportsMap,\n  getDependencies,\n  getUnusedDependencies,\n  getExportsMap,\n} from '@ms-cloudpack/package-utilities';\nimport { bulletedList, cyan } from '@ms-cloudpack/task-reporter';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\nimport { isBuiltin } from 'module';\nimport { getConsumedPaths } from '@ms-cloudpack/api-server';\n\n/**\n * Evaluate the imports depended on by a package to determine if missing exports map paths need to be added.\n * If so, updates package overrides in the config.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  info: BundleInfo;\n  definition: PackageJson;\n  packagePath: string;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  importerContext: PackageImporterContext | undefined;\n}): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any errors encountered */\n  errors: string[];\n  /** Any warnings generated */\n  warnings: string[];\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { packages, info, definition, packagePath, config, resolveMap, importerContext } = options;\n\n  const { name: packageName, version: packageVersion } = definition;\n  const displayName = `${packageName}@${packageVersion}`;\n  if (!packageName || !packageVersion) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const changes: GeneratedPackageChanges[] = [];\n  const errors = [];\n  const warnings = [];\n  const pathsToEvaluate = new Map<string, PackageImporterContext | undefined>();\n  const pathsToRefresh = new Set<string>();\n  const dependencies = getDependencies(definition);\n  const unusedDependencies = getUnusedDependencies(definition);\n  const consumedPaths = getConsumedPaths(info);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of Object.entries(consumedPaths)) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n    const dependencyPath = resolveEntry?.path;\n    const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n\n    const message =\n      `Package \"${displayName}\" imports from the package \"${dependencyName}\" but it couldn't be found. ` +\n      `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`;\n    // If the dependency is a node built-in, add a special error message.\n    const messageBuiltin =\n      `Package \"${displayName}\" imports from the node built-in \"${dependencyName}\" but no browser-friendly version was found in dependencies. ` +\n      `This can be fixed by forcing package \"${displayName}\" to use \"bundlerType\": of \"rollup\" in package settings, or by adding a polyfill browser-friendly dependency.`;\n\n    // If the dependency is not resolved, add an error.\n    if (!dependencyPath || !dependencyDefinition) {\n      isBuiltin(dependencyName) ? errors.push(messageBuiltin) : errors.push(message);\n      // If the dependency is not resolved, we can't continue to evaluate it.\n      continue;\n    }\n\n    // If the dependency is not listed as a dependency add to includedDependencies.\n    if (!dependencies[dependencyName] && dependencyName !== definition.name) {\n      // Survive from the case where it is not a dependency in the package.json\n      // and it is resolvable, but warn the user.\n      if (!unusedDependencies[dependencyName]) {\n        isBuiltin(dependencyName) ? warnings.push(messageBuiltin) : warnings.push(message);\n      }\n      // Make sure to add the package to the list of packages to evaluate.\n      pathsToEvaluate.set(packagePath, importerContext);\n\n      // Add to includedDependencies\n      const packageSettings = (config.generated.packageSettings ??= []);\n      let generatedPackageSettings = getPackageSettings({\n        config: { generated: { packageSettings } },\n        name: packageName,\n        version: packageVersion,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        generatedPackageSettings = {\n          match: { name: packageName, version: `^${packageVersion}` },\n        };\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.includedDependencies ??= [];\n\n      // Add to includedDependencies if it is not already included.\n      if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n        continue;\n      }\n\n      generatedPackageSettings.includedDependencies.push(dependencyName);\n\n      changes.push({\n        name: packageName,\n        version: packageVersion,\n        path: packagePath,\n        changes: [\n          {\n            type: 'included-dependency',\n            change: dependencyName,\n            reason: `Imported by \"${displayName}\"`,\n          },\n        ],\n      });\n\n      pathsToRefresh.add(packagePath);\n    }\n\n    const { name, version } = dependencyDefinition as Required<PackageJson>;\n    if (!name || !version) {\n      throw new Error(`Package \"${displayName}\" depends on \"${dependencyName}\" but it is missing a name or version.`);\n    }\n\n    let dependencyImporterContext: PackageImporterContext | undefined;\n    const versionRequirement = dependencies[dependencyName];\n    if (versionRequirement && definition.name && definition.version) {\n      dependencyImporterContext = {\n        parentName: definition.name,\n        parentVersion: definition.version,\n        importedName: dependencyName,\n        versionRequirement,\n      };\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.set(dependencyPath, dependencyImporterContext);\n\n    // Get the flattened bundle-able exports map for this dependency and iterate through our import paths to ensure nothing is missing.\n    const exports = await getExportsMap({ packagePath: dependencyPath }, { packages, config });\n    const flattenedExports = flattenExportsMap(exports);\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings: PackageSettings | undefined;\n    // iterate through all the import paths.\n    for (const dependencyImportPath of dependencyImportPaths) {\n      if (flattenedExports[dependencyImportPath]) {\n        continue;\n      }\n\n      // We are missing an import path. We need to add this entry to the exports map in package settings.\n      generatedPackageSettings ??= getPackageSettings({\n        config: { generated: { packageSettings } },\n        name,\n        version,\n        firstMatch: true,\n      }).generatedPackageSettings;\n\n      if (!generatedPackageSettings) {\n        generatedPackageSettings = {\n          match: { name, version: `^${version}` },\n          exports: {},\n        };\n        packageSettings.push(generatedPackageSettings);\n      }\n\n      generatedPackageSettings.exports ??= {};\n\n      const addedEntry = await addExportsMapEntry(\n        {\n          exports: generatedPackageSettings.exports,\n          packagePath: dependencyPath,\n          importPath: dependencyImportPath,\n        },\n        { packages, config },\n      );\n\n      if (addedEntry) {\n        changes.push({\n          name: dependencyName,\n          version: dependencyDefinition.version || '',\n          path: dependencyPath,\n          changes: [\n            {\n              type: 'added-export',\n              change: dependencyImportPath,\n              reason: `Imported by \"${displayName}\"`,\n            },\n          ],\n        });\n\n        // Since we've found a missing export, we need to re-enqueue the dependency for evaluation.\n        pathsToRefresh.add(dependencyPath);\n      } else {\n        const errorMessage = `Imported \"${cyan(\n          dependencyImportPath.replace('.', dependencyName),\n        )}\" but a corresponding file couldn't be found. Either correct the import or adjust the \"${cyan(\n          dependencyName,\n        )}\" package version to one that supports this import path.\\n${bulletedList(\n          [`${cyan(displayName)}: ${packagePath}`, `${cyan(dependencyName)}: ${dependencyPath}`],\n          2,\n        )}`;\n        errors.push(errorMessage);\n      }\n    }\n  }\n\n  return { changes, errors, warnings, pathsToEvaluate, pathsToRefresh };\n}\n"]}

package/lib/commands/init/evaluatePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,2BAA2B,CAAC;CAClC,GAAG,OAAO,CAAC;IACV,4EAA4E;IAC5E,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAClE,6FAA6F;IAC7F,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,CAsHD"}
+{"version":3,"file":"evaluatePath.d.ts","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAM1D;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,wBAAwB;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,wCAAwC;IACxC,eAAe,EAAE,sBAAsB,GAAG,SAAS,CAAC;IACpD,wEAAwE;IACxE,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,eAAe,CAAC;IAC7B,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,EAAE,2BAA2B,CAAC;CAClC,GAAG,OAAO,CAAC;IACV,4EAA4E;IAC5E,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,GAAG,SAAS,CAAC,CAAC;IAClE,6FAA6F;IAC7F,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,6CAA6C;IAC7C,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC,CA8HD"}

package/lib/commands/init/evaluatePath.js

@@ -44,7 +44,15 @@ export async function evaluatePath(options) {
         return {};
     }
     // Given the package imports, find the missing exports maps and update packageOverrides.
-    const { changes, errors: evalErrors, pathsToEvaluate, pathsToRefresh, } = await evaluateImportsForOverrides({ definition, packagePath, packages, info, config, resolveMap });
+    const { changes, errors: evalErrors, pathsToEvaluate, pathsToRefresh, } = await evaluateImportsForOverrides({
+        definition,
+        packagePath,
+        packages,
+        info,
+        config,
+        resolveMap,
+        importerContext,
+    });
     if (evalErrors.length) {
         summaryData.recordResult({
             packageResult: {
@@ -64,7 +72,7 @@ export async function evaluatePath(options) {
     let importWarnings = [];
     let importChanges = [];
     if (features?.optimizeDependencies) {
-        ({ warnings: importWarnings, changes: importChanges } = await optimizeDependencies({ definition, packagePath, info, resolveMap }, { packages, config }));
+        ({ warnings: importWarnings, changes: importChanges } = optimizeDependencies({ definition, packagePath, info, resolveMap }, { packages, config }));
         if (importWarnings.length) {
             summaryData.recordResult({
                 packageResult: {

package/lib/commands/init/evaluatePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"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","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server/apis';\nimport type { CloudpackConfig } from '@ms-cloudpack/config-types';\nimport type { PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  shouldForce: boolean;\n  ctx: EnsurePackageBundledContext;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const {\n    packagePath,\n    config,\n    initOptions,\n    telemetryClient,\n    resolveMap,\n    summaryData,\n    shouldForce,\n    ctx,\n    importerContext,\n  } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition || {};\n\n  if (!definition || !name || !version) {\n    // Unsure why a package would be missing a definition/name/version - we've built the resolve map already.\n    throw new Error(\n      `${packagePath} evaluation failed because the package.json with a name/version was not found or not readable.`,\n    );\n  }\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info } = result;\n\n  // Record the results for the summary.\n  const resultIdentifier = {\n    name: definition.name || '',\n    version: definition.version || '',\n    path: packagePath,\n  };\n\n  summaryData.recordResult({ packageResult: { ...resultIdentifier, errors, warnings, info } });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info?.entry) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    changes,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({ definition, packagePath, packages, info, config, resolveMap });\n\n  if (evalErrors.length) {\n    summaryData.recordResult({\n      packageResult: {\n        ...resultIdentifier,\n        errors: evalErrors.map((text) => ({ text })),\n      },\n      append: true,\n    });\n  } else {\n    summaryData.recordGeneratedChanges(changes);\n  }\n\n  // Conditionally scan dependency usage so that we can populate\n  // include/excludeDependencies automatically, ensuring the dep list\n  // is both minimal (remove unused deps) and complete (include\n  // specific devDeps.)\n  let importWarnings = [];\n  let importChanges = [];\n  if (features?.optimizeDependencies) {\n    ({ warnings: importWarnings, changes: importChanges } = await optimizeDependencies(\n      { definition, packagePath, info, resolveMap },\n      { packages, config },\n    ));\n\n    if (importWarnings.length) {\n      summaryData.recordResult({\n        packageResult: {\n          ...resultIdentifier,\n          warnings: importWarnings.map((text) => ({ text })),\n        },\n        append: true,\n      });\n    }\n    summaryData.recordGeneratedChanges(importChanges);\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (changes.length || evalErrors.length || importChanges.length)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      reason: changes.length || importChanges.length ? 'Config needs to be updated.' : evalErrors,\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}
+{"version":3,"file":"evaluatePath.js","sourceRoot":"","sources":["../../../src/commands/init/evaluatePath.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAalC;IAQC,MAAM,EACJ,WAAW,EACX,MAAM,EACN,WAAW,EACX,eAAe,EACf,UAAU,EACV,WAAW,EACX,WAAW,EACX,GAAG,EACH,eAAe,GAChB,GAAG,OAAO,CAAC;IACZ,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC;IACzB,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5B,yFAAyF;IACzF,+FAA+F;IAC/F,kGAAkG;IAClG,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IAE3C,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,yGAAyG;QACzG,MAAM,IAAI,KAAK,CACb,GAAG,WAAW,gGAAgG,CAC/G,CAAC;IACJ,CAAC;IAED,yDAAyD;IACzD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC;QAC5C,KAAK,EAAE;YACL,IAAI;YACJ,OAAO;YACP,aAAa,EAAE,KAAK;YACpB,mBAAmB,EAAE,IAAI;YACzB,WAAW;YACX,WAAW,EAAE,WAAW;SACzB;QACD,GAAG;KACJ,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAE1C,sCAAsC;IACtC,MAAM,gBAAgB,GAAG;QACvB,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;QAC3B,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,EAAE;QACjC,IAAI,EAAE,WAAW;KAClB,CAAC;IAEF,WAAW,CAAC,YAAY,CAAC,EAAE,aAAa,EAAE,EAAE,GAAG,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IAE7F,oDAAoD;IACpD,IAAI,MAAM,EAAE,MAAM,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wFAAwF;IACxF,MAAM,EACJ,OAAO,EACP,MAAM,EAAE,UAAU,EAClB,eAAe,EACf,cAAc,GACf,GAAG,MAAM,2BAA2B,CAAC;QACpC,UAAU;QACV,WAAW;QACX,QAAQ;QACR,IAAI;QACJ,MAAM;QACN,UAAU;QACV,eAAe;KAChB,CAAC,CAAC;IAEH,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,WAAW,CAAC,YAAY,CAAC;YACvB,aAAa,EAAE;gBACb,GAAG,gBAAgB;gBACnB,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;aAC7C;YACD,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,WAAW,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,8DAA8D;IAC9D,mEAAmE;IACnE,6DAA6D;IAC7D,qBAAqB;IACrB,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,IAAI,QAAQ,EAAE,oBAAoB,EAAE,CAAC;QACnC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,oBAAoB,CAC1E,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,EAC7C,EAAE,QAAQ,EAAE,MAAM,EAAE,CACrB,CAAC,CAAC;QAEH,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;YAC1B,WAAW,CAAC,YAAY,CAAC;gBACvB,aAAa,EAAE;oBACb,GAAG,gBAAgB;oBACnB,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;iBACnD;gBACD,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;QACL,CAAC;QACD,WAAW,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;IACpD,CAAC;IAED,iGAAiG;IACjG,6EAA6E;IAC7E,wFAAwF;IACxF,qEAAqE;IAErE,IAAI,WAAW,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACvF,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,EAAE;YACrD,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,UAAU;SAC5F,CAAC,CAAC;QAEH,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,eAAe;QACf,cAAc;KACf,CAAC;AACJ,CAAC","sourcesContent":["import type { EnsurePackageBundledContext } from '@ms-cloudpack/api-server/apis';\nimport type { CloudpackConfig } from '@ms-cloudpack/config-types';\nimport type { PackageImporterContext } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { InitSummaryData } from './InitSummaryData.js';\nimport type { InitOptions } from './types/InitOptions.js';\n\nimport { ensurePackageBundled } from '@ms-cloudpack/api-server/apis';\nimport { evaluateImportsForOverrides } from './evaluateImportsForOverrides.js';\nimport { optimizeDependencies } from './optimizeDependencies.js';\n\n/**\n * A helper which given the packagePath, tries to evaluate the path by bundling things, finding imports,\n * and cross checking the imports with explicit exports. If any exports are missing, they are documented\n * in the generated config.\n */\nexport async function evaluatePath(options: {\n  /** Path to evaluate. */\n  packagePath: string;\n  /** Info about how the parent package */\n  importerContext: PackageImporterContext | undefined;\n  /** Config so far. This will be modified if new overrides are needed. */\n  config: CloudpackConfig;\n  resolveMap: ResolveMap;\n  telemetryClient: TelemetryClient;\n  initOptions: InitOptions;\n  summaryData: InitSummaryData;\n  shouldForce: boolean;\n  ctx: EnsurePackageBundledContext;\n}): Promise<{\n  /** Map from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate?: Map<string, PackageImporterContext | undefined>;\n  /** Package paths for which new exports were added, so the package should be re-processed. */\n  pathsToRefresh?: Set<string>;\n  /** Whether a fatal error was encountered. */\n  shouldExit?: boolean;\n}> {\n  const {\n    packagePath,\n    config,\n    initOptions,\n    telemetryClient,\n    resolveMap,\n    summaryData,\n    shouldForce,\n    ctx,\n    importerContext,\n  } = options;\n  const { packages } = ctx;\n  const { features } = config;\n\n  // This line is the reason we have to track the importerContext for packages to evaluate:\n  // otherwise if a non-semver package is read here, we'd lose the modifications from the initial\n  // time the package was read (and getNonSemverTransform was called) when building the resolve map.\n  const definition = await packages.get(packagePath, { refresh: true, importerContext });\n  const { name, version } = definition || {};\n\n  if (!definition || !name || !version) {\n    // Unsure why a package would be missing a definition/name/version - we've built the resolve map already.\n    throw new Error(\n      `${packagePath} evaluation failed because the package.json with a name/version was not found or not readable.`,\n    );\n  }\n\n  // Bundle the package and find the imports it depends on.\n  const { result } = await ensurePackageBundled({\n    input: {\n      name,\n      version,\n      isIncremental: false,\n      shouldGetBundleInfo: true,\n      shouldForce,\n      shouldRerun: shouldForce,\n    },\n    ctx,\n  });\n\n  const { errors, warnings, info } = result;\n\n  // Record the results for the summary.\n  const resultIdentifier = {\n    name: definition.name || '',\n    version: definition.version || '',\n    path: packagePath,\n  };\n\n  summaryData.recordResult({ packageResult: { ...resultIdentifier, errors, warnings, info } });\n\n  // If there were errors or no imports, return early.\n  if (errors?.length || !info?.entry) {\n    return {};\n  }\n\n  // Given the package imports, find the missing exports maps and update packageOverrides.\n  const {\n    changes,\n    errors: evalErrors,\n    pathsToEvaluate,\n    pathsToRefresh,\n  } = await evaluateImportsForOverrides({\n    definition,\n    packagePath,\n    packages,\n    info,\n    config,\n    resolveMap,\n    importerContext,\n  });\n\n  if (evalErrors.length) {\n    summaryData.recordResult({\n      packageResult: {\n        ...resultIdentifier,\n        errors: evalErrors.map((text) => ({ text })),\n      },\n      append: true,\n    });\n  } else {\n    summaryData.recordGeneratedChanges(changes);\n  }\n\n  // Conditionally scan dependency usage so that we can populate\n  // include/excludeDependencies automatically, ensuring the dep list\n  // is both minimal (remove unused deps) and complete (include\n  // specific devDeps.)\n  let importWarnings = [];\n  let importChanges = [];\n  if (features?.optimizeDependencies) {\n    ({ warnings: importWarnings, changes: importChanges } = optimizeDependencies(\n      { definition, packagePath, info, resolveMap },\n      { packages, config },\n    ));\n\n    if (importWarnings.length) {\n      summaryData.recordResult({\n        packageResult: {\n          ...resultIdentifier,\n          warnings: importWarnings.map((text) => ({ text })),\n        },\n        append: true,\n      });\n    }\n    summaryData.recordGeneratedChanges(importChanges);\n  }\n\n  // Uncomment this when #1694 init does not cache packages correctly after editing config is fixed\n  // and the heap does not reach the limit as almost every package is enqueued.\n  // importPathsToEvaluate?.forEach((path) => pathsToEvaluate.set(path, importerContext));\n  // importPathsToRefresh?.forEach((path) => pathsToRefresh.add(path));\n\n  if (initOptions.check && (changes.length || evalErrors.length || importChanges.length)) {\n    telemetryClient.rootSpan.addEvent('INIT_CHECK_FAILED', {\n      reason: changes.length || importChanges.length ? 'Config needs to be updated.' : evalErrors,\n    });\n\n    return { shouldExit: true };\n  }\n\n  return {\n    pathsToEvaluate,\n    pathsToRefresh,\n  };\n}\n"]}

package/lib/commands/init/optimizeDependencies.d.ts

@@ -15,7 +15,7 @@ export declare function optimizeDependencies(options: {
 }, context: {
     packages: PackageDefinitionsCache;
     config: CloudpackConfig;
-}): Promise<{
+}): {
     /** Changes made to the generated config */
     changes: GeneratedPackageChanges[];
     /** Any warnings encountered */
@@ -24,5 +24,5 @@ export declare function optimizeDependencies(options: {
     pathsToEvaluate: Set<string>;
     /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */
     pathsToRefresh: Set<string>;
-}>;
+};
 //# sourceMappingURL=optimizeDependencies.d.ts.map

package/lib/commands/init/optimizeDependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAEvF,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAElF;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;CACzB,GACA,OAAO,CAAC;IACT,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,8GAA8G;IAC9G,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAAC,CAwJD"}
+{"version":3,"file":"optimizeDependencies.d.ts","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC/E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAIlF;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE;IACP,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,UAAU,CAAC;CACxB,EACD,OAAO,EAAE;IACP,QAAQ,EAAE,uBAAuB,CAAC;IAClC,MAAM,EAAE,eAAe,CAAC;CACzB,GACA;IACD,2CAA2C;IAC3C,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACnC,+BAA+B;IAC/B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,4EAA4E;IAC5E,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,8GAA8G;IAC9G,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B,CAwEA"}

package/lib/commands/init/optimizeDependencies.js

@@ -1,14 +1,14 @@
 import { getPackageSettings } from '@ms-cloudpack/config';
-import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
-import { isBuiltin } from 'module';
+import { getDependencies } from '@ms-cloudpack/package-utilities';
 import { getConsumedDependencies } from '@ms-cloudpack/api-server';
+const defaultNeverExcludeDependencies = ['tslib', '@babel/runtime'];
 /**
  * Optimizes the dependencies of a package to determine if there are any missing or unused.
  * If so, adds the the missing dependencies to included and the unused dependencies to excluded.
  */
-export async function optimizeDependencies(options, context) {
-    const { info, definition, packagePath, resolveMap } = options;
-    const { packages, config } = context;
+export function optimizeDependencies(options, context) {
+    const { info, definition, packagePath } = options;
+    const { config } = context;
     const displayName = `${definition.name}@${definition.version}`;
     const changes = [];
     const warnings = [];
@@ -18,82 +18,16 @@ export async function optimizeDependencies(options, context) {
     if (!name || !version) {
         throw new Error(`Package "${displayName}" is missing a name or version.`);
     }
+    const dependencies = getDependencies(definition);
     const consumedDependencies = getConsumedDependencies(info);
-    // Iterate through imports and find their path from the resolve map.
-    for (const dependencyName of consumedDependencies) {
-        // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.
-        if (definition.dependencies?.[dependencyName] ||
-            definition.peerDependencies?.[dependencyName] ||
-            dependencyName === name) {
-            // Skip if it is listed as a dependency, peer dependency or it is importing itself.
-            continue;
-        }
-        // If the dependency is not listed in the package.json, add an error or warning.
-        if (!definition.devDependencies?.[dependencyName]) {
-            const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });
-            const dependencyPath = resolveEntry?.path;
-            const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;
-            if (!dependencyPath || !dependencyDefinition) {
-                // If the dependency is not found in the resolve map, add an error.
-                // Error is already caught by evaluateImportsForOverrides.
-                continue;
-            }
-            else {
-                // If the dependency is found in the resolve map, add a warning.
-                if (isBuiltin(dependencyName)) {
-                    // If the dependency is a node built-in, add a special error message.
-                    warnings.push(`Optimize Dependencies: Package "${displayName}" imports from the node built-in "${dependencyName}" but no browser-friendly version was found in dependencies. ` +
-                        `This can be fixed by forcing package "${displayName}" to use "bundlerType": of "rollup" in package settings, or by adding a polyfill browser-friendly dependency.`);
-                }
-                else {
-                    warnings.push(`Optimize Dependencies: Package "${displayName}" imports from the package "${dependencyName}" but it is not listed in dependencies. ` +
-                        `Ensure that "${dependencyName}" is listed in dependencies of "${displayName}".`);
-                }
-            }
-        }
-        // Make sure to add the package to the list of packages to evaluate.
-        pathsToEvaluate.add(packagePath);
-        // Add to includedDependencies
-        const packageSettings = (config.generated.packageSettings ??= []);
-        let generatedPackageSettings = getPackageSettings({
-            config: { generated: { packageSettings } },
-            name,
-            version,
-            firstMatch: true,
-        }).generatedPackageSettings;
-        if (!generatedPackageSettings) {
-            generatedPackageSettings = {
-                match: { name, version: `^${version}` },
-            };
-            packageSettings.push(generatedPackageSettings);
-        }
-        generatedPackageSettings.includedDependencies ??= [];
-        // Add to includedDependencies if it is not already included.
-        if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {
-            continue;
-        }
-        generatedPackageSettings.includedDependencies.push(dependencyName);
-        changes.push({
-            name,
-            version,
-            path: packagePath,
-            changes: [
-                {
-                    type: 'included-dependency',
-                    change: dependencyName,
-                    reason: `Imported by "${displayName}"`,
-                },
-            ],
-        });
-        pathsToRefresh.add(packagePath);
-    }
-    const dependencies = new Set([
-        ...Object.keys(definition.dependencies ?? {}),
-        ...Object.keys(definition.peerDependencies ?? {}),
-    ]);
     // Iterate through dependencies and find unused.
-    for (const dependencyName of dependencies) {
-        if (consumedDependencies.has(dependencyName)) {
+    for (const dependencyName of Object.keys(dependencies)) {
+        // Set never exclude to the default if it is not set. Replace string '...' with default if set.
+        const neverExclude = config.neverExcludeDependencies ?? defaultNeverExcludeDependencies;
+        if (neverExclude.includes('...')) {
+            neverExclude.splice(neverExclude.indexOf('...'), 1, ...defaultNeverExcludeDependencies);
+        }
+        if (consumedDependencies.has(dependencyName) || neverExclude.includes(dependencyName)) {
             continue;
         }
         pathsToEvaluate.add(packagePath);

package/lib/commands/init/optimizeDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPackageSettings } from '@ms-cloudpack/config';\nimport { findResolveMapEntry, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { isBuiltin } from 'module';\nimport { getConsumedDependencies, type BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n */\nexport async function optimizeDependencies(\n  options: {\n    info: BundleInfo;\n    definition: PackageJson;\n    packagePath: string;\n    resolveMap: ResolveMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n  },\n): Promise<{\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any warnings encountered */\n  warnings: string[];\n  /** Set from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Set<string>;\n  /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n}> {\n  const { info, definition, packagePath, resolveMap } = options;\n  const { packages, config } = context;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const warnings: string[] = [];\n  const pathsToEvaluate = new Set<string>();\n  const pathsToRefresh = new Set<string>();\n\n  const { name, version } = definition;\n  if (!name || !version) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const consumedDependencies = getConsumedDependencies(info);\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const dependencyName of consumedDependencies) {\n    // Add to includedDependencies if it is not listed as a dependency or peer dependency in the package.json.\n    if (\n      definition.dependencies?.[dependencyName] ||\n      definition.peerDependencies?.[dependencyName] ||\n      dependencyName === name\n    ) {\n      // Skip if it is listed as a dependency, peer dependency or it is importing itself.\n      continue;\n    }\n\n    // If the dependency is not listed in the package.json, add an error or warning.\n    if (!definition.devDependencies?.[dependencyName]) {\n      const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n      const dependencyPath = resolveEntry?.path;\n      const dependencyDefinition = dependencyPath ? await packages.get(dependencyPath) : undefined;\n      if (!dependencyPath || !dependencyDefinition) {\n        // If the dependency is not found in the resolve map, add an error.\n        // Error is already caught by evaluateImportsForOverrides.\n        continue;\n      } else {\n        // If the dependency is found in the resolve map, add a warning.\n        if (isBuiltin(dependencyName)) {\n          // If the dependency is a node built-in, add a special error message.\n          warnings.push(\n            `Optimize Dependencies: Package \"${displayName}\" imports from the node built-in \"${dependencyName}\" but no browser-friendly version was found in dependencies. ` +\n              `This can be fixed by forcing package \"${displayName}\" to use \"bundlerType\": of \"rollup\" in package settings, or by adding a polyfill browser-friendly dependency.`,\n          );\n        } else {\n          warnings.push(\n            `Optimize Dependencies: Package \"${displayName}\" imports from the package \"${dependencyName}\" but it is not listed in dependencies. ` +\n              `Ensure that \"${dependencyName}\" is listed in dependencies of \"${displayName}\".`,\n          );\n        }\n      }\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    pathsToEvaluate.add(packagePath);\n\n    // Add to includedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.includedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.includedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.includedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'included-dependency',\n          change: dependencyName,\n          reason: `Imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n\n  const dependencies = new Set([\n    ...Object.keys(definition.dependencies ?? {}),\n    ...Object.keys(definition.peerDependencies ?? {}),\n  ]);\n\n  // Iterate through dependencies and find unused.\n  for (const dependencyName of dependencies) {\n    if (consumedDependencies.has(dependencyName)) {\n      continue;\n    }\n\n    pathsToEvaluate.add(packagePath);\n\n    // Add to excludedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.excludedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.excludedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'excluded-dependency',\n          change: dependencyName,\n          reason: `Not imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n  return { warnings, changes, pathsToEvaluate, pathsToRefresh };\n}\n"]}
+{"version":3,"file":"optimizeDependencies.js","sourceRoot":"","sources":["../../../src/commands/init/optimizeDependencies.ts"],"names":[],"mappings":"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","sourcesContent":["import { getPackageSettings } from '@ms-cloudpack/config';\nimport { getDependencies, type ResolveMap } from '@ms-cloudpack/package-utilities';\nimport { getConsumedDependencies, type BundleInfo } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, PackageJson } from '@ms-cloudpack/config-types';\nimport type { GeneratedPackageChanges } from './types/GeneratedPackageChanges.js';\n\nconst defaultNeverExcludeDependencies = ['tslib', '@babel/runtime'];\n\n/**\n * Optimizes the dependencies of a package to determine if there are any missing or unused.\n * If so, adds the the missing dependencies to included and the unused dependencies to excluded.\n */\nexport function optimizeDependencies(\n  options: {\n    info: BundleInfo;\n    definition: PackageJson;\n    packagePath: string;\n    resolveMap: ResolveMap;\n  },\n  context: {\n    packages: PackageDefinitionsCache;\n    config: CloudpackConfig;\n  },\n): {\n  /** Changes made to the generated config */\n  changes: GeneratedPackageChanges[];\n  /** Any warnings encountered */\n  warnings: string[];\n  /** Set from new package path (to be evaluated) to info about the parent. */\n  pathsToEvaluate: Set<string>;\n  /** Package paths for which dependencies where included or excluded, so the package should be re-processed. */\n  pathsToRefresh: Set<string>;\n} {\n  const { info, definition, packagePath } = options;\n  const { config } = context;\n  const displayName = `${definition.name}@${definition.version}`;\n  const changes: GeneratedPackageChanges[] = [];\n  const warnings: string[] = [];\n  const pathsToEvaluate = new Set<string>();\n  const pathsToRefresh = new Set<string>();\n\n  const { name, version } = definition;\n  if (!name || !version) {\n    throw new Error(`Package \"${displayName}\" is missing a name or version.`);\n  }\n\n  const dependencies = getDependencies(definition);\n  const consumedDependencies = getConsumedDependencies(info);\n\n  // Iterate through dependencies and find unused.\n  for (const dependencyName of Object.keys(dependencies)) {\n    // Set never exclude to the default if it is not set. Replace string '...' with default if set.\n    const neverExclude = config.neverExcludeDependencies ?? defaultNeverExcludeDependencies;\n    if (neverExclude.includes('...')) {\n      neverExclude.splice(neverExclude.indexOf('...'), 1, ...defaultNeverExcludeDependencies);\n    }\n\n    if (consumedDependencies.has(dependencyName) || neverExclude.includes(dependencyName)) {\n      continue;\n    }\n\n    pathsToEvaluate.add(packagePath);\n\n    // Add to excludedDependencies\n    const packageSettings = (config.generated.packageSettings ??= []);\n    let generatedPackageSettings = getPackageSettings({\n      config: { generated: { packageSettings } },\n      name,\n      version,\n      firstMatch: true,\n    }).generatedPackageSettings;\n\n    if (!generatedPackageSettings) {\n      generatedPackageSettings = {\n        match: { name, version: `^${version}` },\n      };\n      packageSettings.push(generatedPackageSettings);\n    }\n\n    generatedPackageSettings.excludedDependencies ??= [];\n\n    // Add to includedDependencies if it is not already included.\n    if (generatedPackageSettings.excludedDependencies.includes(dependencyName)) {\n      continue;\n    }\n\n    generatedPackageSettings.excludedDependencies.push(dependencyName);\n\n    changes.push({\n      name,\n      version,\n      path: packagePath,\n      changes: [\n        {\n          type: 'excluded-dependency',\n          change: dependencyName,\n          reason: `Not imported by \"${displayName}\"`,\n        },\n      ],\n    });\n\n    pathsToRefresh.add(packagePath);\n  }\n  return { warnings, changes, pathsToEvaluate, pathsToRefresh };\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.55.7",
+  "version": "0.55.8",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -10,17 +10,17 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.30.7",
-    "@ms-cloudpack/bundle-server": "^0.2.22",
-    "@ms-cloudpack/config": "^0.17.27",
-    "@ms-cloudpack/config-types": "^0.4.4",
+    "@ms-cloudpack/api-server": "^0.30.8",
+    "@ms-cloudpack/bundle-server": "^0.2.23",
+    "@ms-cloudpack/config": "^0.17.28",
+    "@ms-cloudpack/config-types": "^0.5.0",
     "@ms-cloudpack/feature-flags": "^0.0.2",
     "@ms-cloudpack/json-utilities": "^0.1.4",
-    "@ms-cloudpack/package-utilities": "^5.10.2",
+    "@ms-cloudpack/package-utilities": "^5.10.3",
     "@ms-cloudpack/path-string-parsing": "^1.1.3",
     "@ms-cloudpack/path-utilities": "^2.5.0",
     "@ms-cloudpack/remote-cache": "^0.4.7",
-    "@ms-cloudpack/app-server": "^0.1.25",
+    "@ms-cloudpack/app-server": "^0.1.26",
     "@ms-cloudpack/task-reporter": "^0.11.1",
     "@ms-cloudpack/telemetry": "^0.4.6",
     "@yarnpkg/lockfile": "^1.1.0",