@ms-cloudpack/cli 0.32.0 → 0.33.0

package/lib/commands/bundle/bundle.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { PackageDefinitions } from '@ms-cloudpack/package-utilities';
 import { reporter } from '../../reporter.js';
 export async function bundle(options) {
-    const { bundler: bundlerType, outdir = 'dist/browser-esm' } = options || {};
+    const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options || {};
     const packagePath = process.cwd();
     const definition = await PackageDefinitions.getInstance().get(packagePath);
     const { name = 'unknown', version = '0.0.0' } = definition || {};
@@ -16,6 +16,7 @@ export async function bundle(options) {
         outputPath,
         isExternal: true,
         bundlerType,
+        disableSourceMaps,
     };
     await bundleTask({
         bundleRequest,

package/lib/commands/bundle/bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAuB;IAClD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC5E,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;KACZ,CAAC;IAEF,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACzB,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC","sourcesContent":["import { bundleTask } from '../../tasks/bundleTask.js';\nimport path from 'path';\nimport type { BundleOptions } from './types.js';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { reporter } from '../../reporter.js';\nimport type { BundleRequest } from '../../types.js';\n\nexport async function bundle(options?: BundleOptions) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm' } = options || {};\n  const packagePath = process.cwd();\n  const definition = await PackageDefinitions.getInstance().get(packagePath);\n  const { name = 'unknown', version = '0.0.0' } = definition || {};\n  const outputPath = path.resolve(packagePath, outdir);\n  const bundleRequest: BundleRequest = {\n    id: 'bundle',\n    packageName: name,\n    version,\n    packagePath,\n    outputPath,\n    isExternal: true,\n    bundlerType,\n  };\n\n  await bundleTask({\n    bundleRequest,\n    options: { force: true },\n  });\n\n  reporter.complete();\n  process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);\n}\n"]}
+{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../src/commands/bundle/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAuB;IAClD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAC/F,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3E,MAAM,EAAE,IAAI,GAAG,SAAS,EAAE,OAAO,GAAG,OAAO,EAAE,GAAG,UAAU,IAAI,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACrD,MAAM,aAAa,GAAkB;QACnC,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,OAAO;QACP,WAAW;QACX,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,WAAW;QACX,iBAAiB;KAClB,CAAC;IAEF,MAAM,UAAU,CAAC;QACf,aAAa;QACb,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACzB,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACpB,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC","sourcesContent":["import { bundleTask } from '../../tasks/bundleTask.js';\nimport path from 'path';\nimport type { BundleOptions } from './types.js';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport { reporter } from '../../reporter.js';\nimport type { BundleRequest } from '../../types.js';\n\nexport async function bundle(options?: BundleOptions) {\n  const { bundler: bundlerType, outdir = 'dist/browser-esm', disableSourceMaps } = options || {};\n  const packagePath = process.cwd();\n  const definition = await PackageDefinitions.getInstance().get(packagePath);\n  const { name = 'unknown', version = '0.0.0' } = definition || {};\n  const outputPath = path.resolve(packagePath, outdir);\n  const bundleRequest: BundleRequest = {\n    id: 'bundle',\n    packageName: name,\n    version,\n    packagePath,\n    outputPath,\n    isExternal: true,\n    bundlerType,\n    disableSourceMaps,\n  };\n\n  await bundleTask({\n    bundleRequest,\n    options: { force: true },\n  });\n\n  reporter.complete();\n  process.exit(bundleRequest.result?.errors?.length === 0 ? 0 : 1);\n}\n"]}

package/lib/commands/bundle/types.d.ts

@@ -3,6 +3,10 @@ export interface BundleOptions {
      * Forces use of a specific bundler. 'ori' | 'rollup' | 'auto'. Defaults to "auto".
      */
     bundler?: string;
+    /**
+     * Disables source maps.
+     */
+    disableSourceMaps?: boolean;
     /**
      * Path to drop the bundle output, relative to current path. Defaults to "dist".
      */

package/lib/commands/bundle/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/bundle/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface BundleOptions {\n  /**\n   * Forces use of a specific bundler. 'ori' | 'rollup' | 'auto'. Defaults to \"auto\".\n   */\n  bundler?: string;\n\n  /**\n   * Path to drop the bundle output, relative to current path. Defaults to \"dist\".\n   */\n  outdir?: string;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/bundle/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface BundleOptions {\n  /**\n   * Forces use of a specific bundler. 'ori' | 'rollup' | 'auto'. Defaults to \"auto\".\n   */\n  bundler?: string;\n\n  /**\n   * Disables source maps.\n   */\n  disableSourceMaps?: boolean;\n\n  /**\n   * Path to drop the bundle output, relative to current path. Defaults to \"dist\".\n   */\n  outdir?: string;\n}\n"]}

package/lib/commands/init/evaluateImportsForOverrides.js

@@ -35,7 +35,6 @@ export async function evaluateImportsForOverrides(options) {
             if (!flattenedExports[dependencyImportPath]) {
                 preparePackageOverride({
                     packageOverrides,
-                    definition,
                     dependencyDefinition,
                     exports,
                     isInternal: !isExternalPackage(resolveEntry.path),

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

@@ -1 +1 @@
-{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAKrE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OASjD;IACC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAC9G,OAAO,CAAC;IACV,MAAM,WAAW,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;IAC/D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,oEAAoE;IACpE,KAAK,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QACvE,MAAM,YAAY,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;QAElG,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,YAAY,GAAG,YAAY,WAAW,iBAAiB,cAAc,2DAA2D,cAAc,+BAA+B,WAAW,GAAG,CAAC;YAClM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE1B,SAAS;SACV;QAED,kCAAkC;QAClC,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnE,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,YAAY,GAAG,YAAY,WAAW,iBAAiB,cAAc,SAAS,YAAY,CAAC,IAAI,0CAA0C,CAAC;YAChJ,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE1B,SAAS;SACV;QAED,oEAAoE;QACpE,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE9C,mIAAmI;QACnI,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEpD,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE;YACxD,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,sBAAsB,CAAC;oBACrB,gBAAgB;oBAChB,UAAU;oBACV,oBAAoB;oBACpB,OAAO;oBACP,UAAU,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC;iBAClD,CAAC,CAAC;gBAEH,MAAM,kBAAkB,CAAC;oBACvB,OAAO;oBACP,QAAQ;oBACR,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,UAAU,EAAE,oBAAoB;iBACjC,CAAC,CAAC;gBAEH,yEAAyE;gBACzE,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAEjB,WAAW,EAAE,CAAC;gBAEd,4FAA4F;gBAC5F,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC9C,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aAC7C;SACF;KACF;IAED,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC","sourcesContent":["import {\n  flattenExportsMap,\n  addExportsMapEntry,\n  getExportsMap,\n  findResolveMapEntry,\n  isExternalPackage,\n} from '@ms-cloudpack/package-utilities';\nimport { preparePackageOverride } from './preparePackageOverride.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { PackageOverride } from '../../types.js';\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 to the given packageOverrides array.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  packagePath: string;\n  imports: Map<string, Set<string>>;\n  definition: PackageJson;\n  packageOverrides: PackageOverride[];\n  packagePathsToEvaluate: Set<string>;\n  evaluatedPackages: Set<string>;\n  resolveMap: ResolveMap;\n}): Promise<{ changeCount: number; errors: string[] }> {\n  const { packages, imports, definition, packageOverrides, packagePathsToEvaluate, evaluatedPackages, resolveMap } =\n    options;\n  const displayName = `${definition.name}@${definition.version}`;\n  let changeCount = 0;\n  const errors: string[] = [];\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of imports.entries()) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n\n    if (!resolveEntry) {\n      const errorMessage = `Package \"${displayName}\" depends on \"${dependencyName}\" but it was not found in the resolve map. Ensure that \"${dependencyName}\" listed in dependencies of ${displayName}.`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Load the dependency definition.\n    const dependencyDefinition = await packages.get(resolveEntry.path);\n\n    if (!dependencyDefinition) {\n      const errorMessage = `Package \"${displayName}\" depends on \"${dependencyName}\" at \"${resolveEntry.path}\" but its definition couldn't be loaded.`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    packagePathsToEvaluate.add(resolveEntry.path);\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(resolveEntry.path, { packages });\n    const flattenedExports = flattenExportsMap(exports);\n\n    for (const dependencyImportPath of dependencyImportPaths) {\n      if (!flattenedExports[dependencyImportPath]) {\n        preparePackageOverride({\n          packageOverrides,\n          definition,\n          dependencyDefinition,\n          exports,\n          isInternal: !isExternalPackage(resolveEntry.path),\n        });\n\n        await addExportsMapEntry({\n          exports,\n          packages,\n          packagePath: resolveEntry.path,\n          importPath: dependencyImportPath,\n        });\n\n        // Clear cache when we've mutated an override. Transforms need to re-run.\n        packages.clear();\n\n        changeCount++;\n\n        // Since we've found a missing exports, we need to re-enqueue the dependency for evaluation.\n        packagePathsToEvaluate.add(resolveEntry.path);\n        evaluatedPackages.delete(resolveEntry.path);\n      }\n    }\n  }\n\n  return { changeCount, errors };\n}\n"]}
+{"version":3,"file":"evaluateImportsForOverrides.js","sourceRoot":"","sources":["../../../src/commands/init/evaluateImportsForOverrides.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,mBAAmB,EACnB,iBAAiB,GAClB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAKrE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,OASjD;IACC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAC9G,OAAO,CAAC;IACV,MAAM,WAAW,GAAG,GAAG,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;IAC/D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,oEAAoE;IACpE,KAAK,MAAM,CAAC,cAAc,EAAE,qBAAqB,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;QACvE,MAAM,YAAY,GAAG,mBAAmB,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC;QAElG,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,YAAY,GAAG,YAAY,WAAW,iBAAiB,cAAc,2DAA2D,cAAc,+BAA+B,WAAW,GAAG,CAAC;YAClM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE1B,SAAS;SACV;QAED,kCAAkC;QAClC,MAAM,oBAAoB,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnE,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,YAAY,GAAG,YAAY,WAAW,iBAAiB,cAAc,SAAS,YAAY,CAAC,IAAI,0CAA0C,CAAC;YAChJ,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAE1B,SAAS;SACV;QAED,oEAAoE;QACpE,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAE9C,mIAAmI;QACnI,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrE,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEpD,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE;YACxD,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,sBAAsB,CAAC;oBACrB,gBAAgB;oBAChB,oBAAoB;oBACpB,OAAO;oBACP,UAAU,EAAE,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,CAAC;iBAClD,CAAC,CAAC;gBAEH,MAAM,kBAAkB,CAAC;oBACvB,OAAO;oBACP,QAAQ;oBACR,WAAW,EAAE,YAAY,CAAC,IAAI;oBAC9B,UAAU,EAAE,oBAAoB;iBACjC,CAAC,CAAC;gBAEH,yEAAyE;gBACzE,QAAQ,CAAC,KAAK,EAAE,CAAC;gBAEjB,WAAW,EAAE,CAAC;gBAEd,4FAA4F;gBAC5F,sBAAsB,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAC9C,iBAAiB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;aAC7C;SACF;KACF;IAED,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC;AACjC,CAAC","sourcesContent":["import {\n  flattenExportsMap,\n  addExportsMapEntry,\n  getExportsMap,\n  findResolveMapEntry,\n  isExternalPackage,\n} from '@ms-cloudpack/package-utilities';\nimport { preparePackageOverride } from './preparePackageOverride.js';\nimport type { PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { PackageOverride } from '../../types.js';\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 to the given packageOverrides array.\n */\nexport async function evaluateImportsForOverrides(options: {\n  packages: PackageDefinitionsCache;\n  packagePath: string;\n  imports: Map<string, Set<string>>;\n  definition: PackageJson;\n  packageOverrides: PackageOverride[];\n  packagePathsToEvaluate: Set<string>;\n  evaluatedPackages: Set<string>;\n  resolveMap: ResolveMap;\n}): Promise<{ changeCount: number; errors: string[] }> {\n  const { packages, imports, definition, packageOverrides, packagePathsToEvaluate, evaluatedPackages, resolveMap } =\n    options;\n  const displayName = `${definition.name}@${definition.version}`;\n  let changeCount = 0;\n  const errors: string[] = [];\n\n  // Iterate through imports and find their path from the resolve map.\n  for (const [dependencyName, dependencyImportPaths] of imports.entries()) {\n    const resolveEntry = findResolveMapEntry({ definition, packageName: dependencyName, resolveMap });\n\n    if (!resolveEntry) {\n      const errorMessage = `Package \"${displayName}\" depends on \"${dependencyName}\" but it was not found in the resolve map. Ensure that \"${dependencyName}\" listed in dependencies of ${displayName}.`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Load the dependency definition.\n    const dependencyDefinition = await packages.get(resolveEntry.path);\n\n    if (!dependencyDefinition) {\n      const errorMessage = `Package \"${displayName}\" depends on \"${dependencyName}\" at \"${resolveEntry.path}\" but its definition couldn't be loaded.`;\n      console.error(errorMessage);\n      errors.push(errorMessage);\n\n      continue;\n    }\n\n    // Make sure to add the package to the list of packages to evaluate.\n    packagePathsToEvaluate.add(resolveEntry.path);\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(resolveEntry.path, { packages });\n    const flattenedExports = flattenExportsMap(exports);\n\n    for (const dependencyImportPath of dependencyImportPaths) {\n      if (!flattenedExports[dependencyImportPath]) {\n        preparePackageOverride({\n          packageOverrides,\n          dependencyDefinition,\n          exports,\n          isInternal: !isExternalPackage(resolveEntry.path),\n        });\n\n        await addExportsMapEntry({\n          exports,\n          packages,\n          packagePath: resolveEntry.path,\n          importPath: dependencyImportPath,\n        });\n\n        // Clear cache when we've mutated an override. Transforms need to re-run.\n        packages.clear();\n\n        changeCount++;\n\n        // Since we've found a missing exports, we need to re-enqueue the dependency for evaluation.\n        packagePathsToEvaluate.add(resolveEntry.path);\n        evaluatedPackages.delete(resolveEntry.path);\n      }\n    }\n  }\n\n  return { changeCount, errors };\n}\n"]}

package/lib/commands/init/init.test.js

@@ -78,7 +78,7 @@ describe('init', () => {
                 },
               },
             },
-            "versionRequirement": "1.0.0",
+            "versionRequirement": "^1.0.0",
           },
         ],
       }
@@ -163,7 +163,7 @@ describe('init', () => {
                 },
               },
             },
-            "versionRequirement": "1.0.0",
+            "versionRequirement": "^1.0.0",
           },
         ],
       }

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

@@ -1 +1 @@
-{"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../../src/commands/init/init.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { afterEach, describe, it, expect, beforeAll } from '@jest/globals';\nimport { init } from './init.js';\nimport fs from 'fs';\nimport path from 'path';\nimport { isFile } from '@ms-cloudpack/path-utilities';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createTestFileStructure } from '@ms-cloudpack/test-utilities';\nimport { noLoggingConfig } from '@ms-cloudpack/task-reporter';\nimport { reporter } from '../../reporter.js';\nimport { getConfigPath, readConfig } from '@ms-cloudpack/config';\n\nconst { rm } = fs.promises;\n\ndescribe('init', () => {\n  let testPath: string | undefined;\n\n  beforeAll(() => {\n    reporter.setOptions(noLoggingConfig);\n  });\n\n  afterEach(async () => {\n    if (testPath) {\n      await rm(testPath, { recursive: true });\n      testPath = undefined;\n    }\n  });\n\n  it('can make no changes to a package that has no config and needs no changes', async () => {\n    testPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-package',\n        version: '1.0.0',\n        main: 'lib/index.js',\n        dependencies: {\n          foo: '1.0.0',\n        },\n      },\n      'src/index.ts': 'import foo from \"foo\"; console.log(foo);',\n      'node_modules/foo/package.json': {\n        name: 'foo',\n        version: '1.0.0',\n        main: 'lib/index.js',\n      },\n      'node_modules/foo/lib/index.js': 'export default \"foo\";',\n    });\n\n    await init({ cwd: testPath });\n\n    expect(await isFile(getConfigPath(testPath))).toBe(false);\n  });\n\n  it('can create a config when a package needs to have an exports map defined', async () => {\n    testPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-package',\n        version: '1.0.0',\n        main: 'lib/index.js',\n        dependencies: {\n          foo: '1.0.0',\n        },\n      },\n      'src/index.ts': 'import foo from \"foo/lib/bar\"; console.log(foo);',\n      'node_modules/foo/package.json': {\n        name: 'foo',\n        version: '1.0.0',\n        main: 'lib/index.js',\n      },\n      'node_modules/foo/lib/index.js': 'export default \"index\";',\n      'node_modules/foo/lib/bar.js': 'export default \"foo\";',\n    });\n\n    expect(await init({ cwd: testPath })).toEqual({ changeCount: 1 });\n\n    const configPath = getConfigPath(testPath);\n    expect(await isFile(configPath)).toBe(true);\n    expect(await readJson(configPath)).toMatchInlineSnapshot(`\n      {\n        \"packageOverrides\": [\n          {\n            \"name\": \"foo\",\n            \"overrides\": {\n              \"exports\": {\n                \".\": {\n                  \"default\": \"./lib/index.js\",\n                },\n                \"./lib/bar\": {\n                  \"default\": \"./lib/bar.js\",\n                },\n              },\n            },\n            \"versionRequirement\": \"1.0.0\",\n          },\n        ],\n      }\n    `);\n  });\n\n  it('can modify inner-repo packages if the fix option is specified and a package needs an override', async () => {\n    testPath = await createTestFileStructure(\n      {\n        'app/package.json': {\n          name: 'test-package',\n          version: '1.0.0',\n          main: 'lib/index.js',\n          dependencies: {\n            library: '1.0.0',\n          },\n        },\n        'app/src/index.ts': 'import foo from \"library/lib/bar\"; console.log(foo);',\n        'library/package.json': {\n          name: 'library',\n          version: '1.0.0',\n          main: 'lib/index.js',\n        },\n        'library/lib/index.js': 'export default \"index\";',\n        'library/lib/bar.js': 'export default \"bar\";',\n      },\n      { links: { 'app/node_modules/library': 'library' } },\n    );\n\n    await init({ cwd: path.join(testPath, 'app'), fix: true });\n\n    // There are no overrides required in this scenario; everything is fixed locally, so no\n    // config file should be created.\n    expect(await isFile(getConfigPath(testPath))).toBe(false);\n\n    // Both the app and the library should have been fixed to have the correct exports map.\n\n    // The app package shouldn't require an exports map; no changes expected.\n    const appDefinition = (await readJson(path.join(testPath, 'app/package.json'))) as PackageJson;\n    expect(appDefinition.exports).toBeUndefined();\n\n    // The library exports should have the main entry hoisted (\".\"), as well as the \"./lib/bar\" import that the app\n    // depends on. There should be no source/typings as the library only has a js file and no src/*.ts\n    // files.\n    const libraryDefinition = (await readJson(path.join(testPath, 'library/package.json'))) as PackageJson;\n    expect(libraryDefinition.exports).toMatchInlineSnapshot(`\n      {\n        \".\": {\n          \"default\": \"./lib/index.js\",\n        },\n        \"./lib/bar\": {\n          \"default\": \"./lib/bar.js\",\n        },\n      }\n    `);\n  });\n\n  it('can avoids modifying external packages if the fix option is specified and a package needs an override', async () => {\n    testPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-package',\n        version: '1.0.0',\n        main: 'lib/index.js',\n        dependencies: {\n          library: '1.0.0',\n        },\n      },\n      'src/index.ts': 'import foo from \"library/lib/bar\"; console.log(foo);',\n      'node_modules/library/package.json': {\n        name: 'library',\n        version: '1.0.0',\n        main: 'lib/index.js',\n      },\n      'node_modules/library/lib/index.js': 'export default \"index\";',\n      'node_modules/library/lib/bar.js': 'export default \"bar\";',\n    });\n\n    await init({ cwd: testPath, fix: true });\n\n    // An override config would be created for this scenario.\n    const config = await readConfig(testPath);\n    expect(config).toMatchInlineSnapshot(`\n      {\n        \"packageOverrides\": [\n          {\n            \"name\": \"library\",\n            \"overrides\": {\n              \"exports\": {\n                \".\": {\n                  \"default\": \"./lib/index.js\",\n                },\n                \"./lib/bar\": {\n                  \"default\": \"./lib/bar.js\",\n                },\n              },\n            },\n            \"versionRequirement\": \"1.0.0\",\n          },\n        ],\n      }\n    `);\n\n    // The library package shouldn't be modified.\n    const libraryDefinition = (await readJson(path.join(testPath, 'node_modules/library/package.json'))) as PackageJson;\n    expect(libraryDefinition.exports).toBeUndefined();\n  });\n\n  it('can update an existing exports map when fix is provided', async () => {\n    testPath = await createTestFileStructure(\n      {\n        'app/package.json': {\n          name: 'test-package',\n          version: '1.0.0',\n          main: 'lib/index.js',\n          dependencies: {\n            library: '1.0.0',\n          },\n        },\n        'app/src/index.ts': 'import bar from \"library/lib/bar\"; console.log(bar);',\n        'library/package.json': {\n          name: 'library',\n          version: '1.0.0',\n          exports: {\n            '.': {\n              default: './lib/index.js',\n            },\n          },\n        },\n        'library/lib/index.js': 'export default \"index\";',\n        'library/lib/bar.js': 'export default \"bar\";',\n      },\n      { links: { 'app/node_modules/library': 'library' } },\n    );\n\n    await init({ cwd: path.join(testPath, 'app'), fix: true });\n\n    expect(await isFile(getConfigPath(testPath))).toBe(false);\n    expect(await readJson(path.join(testPath, 'library/package.json'))).toMatchInlineSnapshot(`\n      {\n        \"exports\": {\n          \".\": {\n            \"default\": \"./lib/index.js\",\n          },\n          \"./lib/bar\": {\n            \"default\": \"./lib/bar.js\",\n          },\n        },\n        \"name\": \"library\",\n        \"version\": \"1.0.0\",\n      }\n    `);\n  });\n});\n"]}
+{"version":3,"file":"init.test.js","sourceRoot":"","sources":["../../../src/commands/init/init.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAExD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEjE,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC;AAE3B,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE;IACpB,IAAI,QAA4B,CAAC;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,IAAI,QAAQ,EAAE;YACZ,MAAM,EAAE,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,QAAQ,GAAG,SAAS,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;QACxF,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE;oBACZ,GAAG,EAAE,OAAO;iBACb;aACF;YACD,cAAc,EAAE,0CAA0C;YAC1D,+BAA+B,EAAE;gBAC/B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;aACrB;YACD,+BAA+B,EAAE,uBAAuB;SACzD,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE9B,MAAM,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE;oBACZ,GAAG,EAAE,OAAO;iBACb;aACF;YACD,cAAc,EAAE,kDAAkD;YAClE,+BAA+B,EAAE;gBAC/B,IAAI,EAAE,KAAK;gBACX,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;aACrB;YACD,+BAA+B,EAAE,yBAAyB;YAC1D,6BAA6B,EAAE,uBAAuB;SACvD,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;QAElE,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;KAmBxD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+FAA+F,EAAE,KAAK,IAAI,EAAE;QAC7G,QAAQ,GAAG,MAAM,uBAAuB,CACtC;YACE,kBAAkB,EAAE;gBAClB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE;oBACZ,OAAO,EAAE,OAAO;iBACjB;aACF;YACD,kBAAkB,EAAE,sDAAsD;YAC1E,sBAAsB,EAAE;gBACtB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;aACrB;YACD,sBAAsB,EAAE,yBAAyB;YACjD,oBAAoB,EAAE,uBAAuB;SAC9C,EACD,EAAE,KAAK,EAAE,EAAE,0BAA0B,EAAE,SAAS,EAAE,EAAE,CACrD,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3D,uFAAuF;QACvF,iCAAiC;QACjC,MAAM,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE1D,uFAAuF;QAEvF,yEAAyE;QACzE,MAAM,aAAa,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAgB,CAAC;QAC/F,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;QAE9C,+GAA+G;QAC/G,kGAAkG;QAClG,SAAS;QACT,MAAM,iBAAiB,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAgB,CAAC;QACvG,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;KASvD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uGAAuG,EAAE,KAAK,IAAI,EAAE;QACrH,QAAQ,GAAG,MAAM,uBAAuB,CAAC;YACvC,cAAc,EAAE;gBACd,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE;oBACZ,OAAO,EAAE,OAAO;iBACjB;aACF;YACD,cAAc,EAAE,sDAAsD;YACtE,mCAAmC,EAAE;gBACnC,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;aACrB;YACD,mCAAmC,EAAE,yBAAyB;YAC9D,iCAAiC,EAAE,uBAAuB;SAC3D,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAEzC,yDAAyD;QACzD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;KAmBpC,CAAC,CAAC;QAEH,6CAA6C;QAC7C,MAAM,iBAAiB,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,mCAAmC,CAAC,CAAC,CAAgB,CAAC;QACpH,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACvE,QAAQ,GAAG,MAAM,uBAAuB,CACtC;YACE,kBAAkB,EAAE;gBAClB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,OAAO;gBAChB,IAAI,EAAE,cAAc;gBACpB,YAAY,EAAE;oBACZ,OAAO,EAAE,OAAO;iBACjB;aACF;YACD,kBAAkB,EAAE,sDAAsD;YAC1E,sBAAsB,EAAE;gBACtB,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE;oBACP,GAAG,EAAE;wBACH,OAAO,EAAE,gBAAgB;qBAC1B;iBACF;aACF;YACD,sBAAsB,EAAE,yBAAyB;YACjD,oBAAoB,EAAE,uBAAuB;SAC9C,EACD,EAAE,KAAK,EAAE,EAAE,0BAA0B,EAAE,SAAS,EAAE,EAAE,CACrD,CAAC;QAEF,MAAM,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1D,MAAM,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;KAazF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import { afterEach, describe, it, expect, beforeAll } from '@jest/globals';\nimport { init } from './init.js';\nimport fs from 'fs';\nimport path from 'path';\nimport { isFile } from '@ms-cloudpack/path-utilities';\nimport { readJson } from '@ms-cloudpack/json-utilities';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createTestFileStructure } from '@ms-cloudpack/test-utilities';\nimport { noLoggingConfig } from '@ms-cloudpack/task-reporter';\nimport { reporter } from '../../reporter.js';\nimport { getConfigPath, readConfig } from '@ms-cloudpack/config';\n\nconst { rm } = fs.promises;\n\ndescribe('init', () => {\n  let testPath: string | undefined;\n\n  beforeAll(() => {\n    reporter.setOptions(noLoggingConfig);\n  });\n\n  afterEach(async () => {\n    if (testPath) {\n      await rm(testPath, { recursive: true });\n      testPath = undefined;\n    }\n  });\n\n  it('can make no changes to a package that has no config and needs no changes', async () => {\n    testPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-package',\n        version: '1.0.0',\n        main: 'lib/index.js',\n        dependencies: {\n          foo: '1.0.0',\n        },\n      },\n      'src/index.ts': 'import foo from \"foo\"; console.log(foo);',\n      'node_modules/foo/package.json': {\n        name: 'foo',\n        version: '1.0.0',\n        main: 'lib/index.js',\n      },\n      'node_modules/foo/lib/index.js': 'export default \"foo\";',\n    });\n\n    await init({ cwd: testPath });\n\n    expect(await isFile(getConfigPath(testPath))).toBe(false);\n  });\n\n  it('can create a config when a package needs to have an exports map defined', async () => {\n    testPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-package',\n        version: '1.0.0',\n        main: 'lib/index.js',\n        dependencies: {\n          foo: '1.0.0',\n        },\n      },\n      'src/index.ts': 'import foo from \"foo/lib/bar\"; console.log(foo);',\n      'node_modules/foo/package.json': {\n        name: 'foo',\n        version: '1.0.0',\n        main: 'lib/index.js',\n      },\n      'node_modules/foo/lib/index.js': 'export default \"index\";',\n      'node_modules/foo/lib/bar.js': 'export default \"foo\";',\n    });\n\n    expect(await init({ cwd: testPath })).toEqual({ changeCount: 1 });\n\n    const configPath = getConfigPath(testPath);\n    expect(await isFile(configPath)).toBe(true);\n    expect(await readJson(configPath)).toMatchInlineSnapshot(`\n      {\n        \"packageOverrides\": [\n          {\n            \"name\": \"foo\",\n            \"overrides\": {\n              \"exports\": {\n                \".\": {\n                  \"default\": \"./lib/index.js\",\n                },\n                \"./lib/bar\": {\n                  \"default\": \"./lib/bar.js\",\n                },\n              },\n            },\n            \"versionRequirement\": \"^1.0.0\",\n          },\n        ],\n      }\n    `);\n  });\n\n  it('can modify inner-repo packages if the fix option is specified and a package needs an override', async () => {\n    testPath = await createTestFileStructure(\n      {\n        'app/package.json': {\n          name: 'test-package',\n          version: '1.0.0',\n          main: 'lib/index.js',\n          dependencies: {\n            library: '1.0.0',\n          },\n        },\n        'app/src/index.ts': 'import foo from \"library/lib/bar\"; console.log(foo);',\n        'library/package.json': {\n          name: 'library',\n          version: '1.0.0',\n          main: 'lib/index.js',\n        },\n        'library/lib/index.js': 'export default \"index\";',\n        'library/lib/bar.js': 'export default \"bar\";',\n      },\n      { links: { 'app/node_modules/library': 'library' } },\n    );\n\n    await init({ cwd: path.join(testPath, 'app'), fix: true });\n\n    // There are no overrides required in this scenario; everything is fixed locally, so no\n    // config file should be created.\n    expect(await isFile(getConfigPath(testPath))).toBe(false);\n\n    // Both the app and the library should have been fixed to have the correct exports map.\n\n    // The app package shouldn't require an exports map; no changes expected.\n    const appDefinition = (await readJson(path.join(testPath, 'app/package.json'))) as PackageJson;\n    expect(appDefinition.exports).toBeUndefined();\n\n    // The library exports should have the main entry hoisted (\".\"), as well as the \"./lib/bar\" import that the app\n    // depends on. There should be no source/typings as the library only has a js file and no src/*.ts\n    // files.\n    const libraryDefinition = (await readJson(path.join(testPath, 'library/package.json'))) as PackageJson;\n    expect(libraryDefinition.exports).toMatchInlineSnapshot(`\n      {\n        \".\": {\n          \"default\": \"./lib/index.js\",\n        },\n        \"./lib/bar\": {\n          \"default\": \"./lib/bar.js\",\n        },\n      }\n    `);\n  });\n\n  it('can avoids modifying external packages if the fix option is specified and a package needs an override', async () => {\n    testPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-package',\n        version: '1.0.0',\n        main: 'lib/index.js',\n        dependencies: {\n          library: '1.0.0',\n        },\n      },\n      'src/index.ts': 'import foo from \"library/lib/bar\"; console.log(foo);',\n      'node_modules/library/package.json': {\n        name: 'library',\n        version: '1.0.0',\n        main: 'lib/index.js',\n      },\n      'node_modules/library/lib/index.js': 'export default \"index\";',\n      'node_modules/library/lib/bar.js': 'export default \"bar\";',\n    });\n\n    await init({ cwd: testPath, fix: true });\n\n    // An override config would be created for this scenario.\n    const config = await readConfig(testPath);\n    expect(config).toMatchInlineSnapshot(`\n      {\n        \"packageOverrides\": [\n          {\n            \"name\": \"library\",\n            \"overrides\": {\n              \"exports\": {\n                \".\": {\n                  \"default\": \"./lib/index.js\",\n                },\n                \"./lib/bar\": {\n                  \"default\": \"./lib/bar.js\",\n                },\n              },\n            },\n            \"versionRequirement\": \"^1.0.0\",\n          },\n        ],\n      }\n    `);\n\n    // The library package shouldn't be modified.\n    const libraryDefinition = (await readJson(path.join(testPath, 'node_modules/library/package.json'))) as PackageJson;\n    expect(libraryDefinition.exports).toBeUndefined();\n  });\n\n  it('can update an existing exports map when fix is provided', async () => {\n    testPath = await createTestFileStructure(\n      {\n        'app/package.json': {\n          name: 'test-package',\n          version: '1.0.0',\n          main: 'lib/index.js',\n          dependencies: {\n            library: '1.0.0',\n          },\n        },\n        'app/src/index.ts': 'import bar from \"library/lib/bar\"; console.log(bar);',\n        'library/package.json': {\n          name: 'library',\n          version: '1.0.0',\n          exports: {\n            '.': {\n              default: './lib/index.js',\n            },\n          },\n        },\n        'library/lib/index.js': 'export default \"index\";',\n        'library/lib/bar.js': 'export default \"bar\";',\n      },\n      { links: { 'app/node_modules/library': 'library' } },\n    );\n\n    await init({ cwd: path.join(testPath, 'app'), fix: true });\n\n    expect(await isFile(getConfigPath(testPath))).toBe(false);\n    expect(await readJson(path.join(testPath, 'library/package.json'))).toMatchInlineSnapshot(`\n      {\n        \"exports\": {\n          \".\": {\n            \"default\": \"./lib/index.js\",\n          },\n          \"./lib/bar\": {\n            \"default\": \"./lib/bar.js\",\n          },\n        },\n        \"name\": \"library\",\n        \"version\": \"1.0.0\",\n      }\n    `);\n  });\n});\n"]}

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

@@ -4,7 +4,6 @@ import type { PackageJson, PackageJsonExports } from '@ms-cloudpack/bundler-type
  * Returns an existing package override, or if missing, creates one and returns that.
  */
 export declare function preparePackageOverride(options: {
-    definition: PackageJson;
     dependencyDefinition: PackageJson;
     exports: PackageJsonExports;
     isInternal: boolean;

package/lib/commands/init/preparePackageOverride.js

@@ -3,15 +3,12 @@ import { findPackageOverride } from '../../common/findPackageOverride.js';
  * Returns an existing package override, or if missing, creates one and returns that.
  */
 export function preparePackageOverride(options) {
-    const { definition, dependencyDefinition, exports, isInternal, packageOverrides } = options;
-    const versionRequirement = definition.dependencies?.[dependencyDefinition.name || ''] ||
-        definition.peerDependencies?.[dependencyDefinition.name || ''] ||
-        '*';
+    const { dependencyDefinition, exports, isInternal, packageOverrides } = options;
     let entryOverride = findPackageOverride(packageOverrides, dependencyDefinition.name || '', dependencyDefinition.version || '');
     if (!entryOverride) {
         entryOverride = {
             name: dependencyDefinition.name || '',
-            versionRequirement,
+            versionRequirement: `^${dependencyDefinition.version}`,
             overrides: {
                 exports,
             },

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

@@ -1 +1 @@
-{"version":3,"file":"preparePackageOverride.js","sourceRoot":"","sources":["../../../src/commands/init/preparePackageOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAI1E;;GAEG;AAEH,MAAM,UAAU,sBAAsB,CAAC,OAMtC;IACC,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAC5F,MAAM,kBAAkB,GACtB,UAAU,CAAC,YAAY,EAAE,CAAC,oBAAoB,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1D,UAAU,CAAC,gBAAgB,EAAE,CAAC,oBAAoB,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9D,GAAG,CAAC;IAEN,IAAI,aAAa,GAAG,mBAAmB,CACrC,gBAAgB,EAChB,oBAAoB,CAAC,IAAI,IAAI,EAAE,EAC/B,oBAAoB,CAAC,OAAO,IAAI,EAAE,CACnC,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE;QAClB,aAAa,GAAG;YACd,IAAI,EAAE,oBAAoB,CAAC,IAAI,IAAI,EAAE;YACrC,kBAAkB;YAElB,SAAS,EAAE;gBACT,OAAO;aACR;SACF,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC;SACjC;QAED,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACtC;IAED,OAAO,aAAiF,CAAC;AAC3F,CAAC","sourcesContent":["import { findPackageOverride } from '../../common/findPackageOverride.js';\nimport type { PackageOverride } from '../../types.js';\nimport type { PackageJson, PackageJsonExports } from '@ms-cloudpack/bundler-types';\n\n/**\n * Returns an existing package override, or if missing, creates one and returns that.\n */\n\nexport function preparePackageOverride(options: {\n  definition: PackageJson;\n  dependencyDefinition: PackageJson;\n  exports: PackageJsonExports;\n  isInternal: boolean;\n  packageOverrides: PackageOverride[];\n}): PackageOverride & { overrides: { exports: PackageJsonExports } } {\n  const { definition, dependencyDefinition, exports, isInternal, packageOverrides } = options;\n  const versionRequirement =\n    definition.dependencies?.[dependencyDefinition.name || ''] ||\n    definition.peerDependencies?.[dependencyDefinition.name || ''] ||\n    '*';\n\n  let entryOverride = findPackageOverride(\n    packageOverrides,\n    dependencyDefinition.name || '',\n    dependencyDefinition.version || '',\n  );\n\n  if (!entryOverride) {\n    entryOverride = {\n      name: dependencyDefinition.name || '',\n      versionRequirement,\n\n      overrides: {\n        exports,\n      },\n    };\n\n    if (isInternal) {\n      entryOverride.isInternal = true;\n    }\n\n    packageOverrides.push(entryOverride);\n  }\n\n  return entryOverride as PackageOverride & { overrides: { exports: PackageJsonExports } };\n}\n"]}
+{"version":3,"file":"preparePackageOverride.js","sourceRoot":"","sources":["../../../src/commands/init/preparePackageOverride.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAI1E;;GAEG;AAEH,MAAM,UAAU,sBAAsB,CAAC,OAKtC;IACC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC;IAEhF,IAAI,aAAa,GAAG,mBAAmB,CACrC,gBAAgB,EAChB,oBAAoB,CAAC,IAAI,IAAI,EAAE,EAC/B,oBAAoB,CAAC,OAAO,IAAI,EAAE,CACnC,CAAC;IAEF,IAAI,CAAC,aAAa,EAAE;QAClB,aAAa,GAAG;YACd,IAAI,EAAE,oBAAoB,CAAC,IAAI,IAAI,EAAE;YACrC,kBAAkB,EAAE,IAAI,oBAAoB,CAAC,OAAO,EAAE;YAEtD,SAAS,EAAE;gBACT,OAAO;aACR;SACF,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC;SACjC;QAED,gBAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KACtC;IAED,OAAO,aAAiF,CAAC;AAC3F,CAAC","sourcesContent":["import { findPackageOverride } from '../../common/findPackageOverride.js';\nimport type { PackageOverride } from '../../types.js';\nimport type { PackageJson, PackageJsonExports } from '@ms-cloudpack/bundler-types';\n\n/**\n * Returns an existing package override, or if missing, creates one and returns that.\n */\n\nexport function preparePackageOverride(options: {\n  dependencyDefinition: PackageJson;\n  exports: PackageJsonExports;\n  isInternal: boolean;\n  packageOverrides: PackageOverride[];\n}): PackageOverride & { overrides: { exports: PackageJsonExports } } {\n  const { dependencyDefinition, exports, isInternal, packageOverrides } = options;\n\n  let entryOverride = findPackageOverride(\n    packageOverrides,\n    dependencyDefinition.name || '',\n    dependencyDefinition.version || '',\n  );\n\n  if (!entryOverride) {\n    entryOverride = {\n      name: dependencyDefinition.name || '',\n      versionRequirement: `^${dependencyDefinition.version}`,\n\n      overrides: {\n        exports,\n      },\n    };\n\n    if (isInternal) {\n      entryOverride.isInternal = true;\n    }\n\n    packageOverrides.push(entryOverride);\n  }\n\n  return entryOverride as PackageOverride & { overrides: { exports: PackageJsonExports } };\n}\n"]}

package/lib/commands/start/appServer/createRoutes.d.ts

@@ -1,7 +1,7 @@
 import type { PackageJson } from '@ms-cloudpack/bundler-types';
 import type { Express } from '@ms-cloudpack/create-express-app';
-import type { BundleServer, Session } from '../../../types.js';
-import type { ApiServer } from '@ms-cloudpack/api-server';
+import type { BundleServer } from '../../../types.js';
+import type { ApiServer, Session } from '@ms-cloudpack/api-server';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
 /**
  * Creates the routes for the express app, considering how the config is defined.

package/lib/commands/start/appServer/createRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/createRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { Express, Request, Response } from '@ms-cloudpack/create-express-app';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { createImportMap } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleServer, Session } from '../../../types.js';\nimport { error } from './error.js';\nimport { getHtmlResponse } from './getHtmlResponse.js';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { handleSessionVersion } from './handleSessionVersion.js';\nimport { log } from './log.js';\nimport { setHeaders } from './setHeaders.js';\nimport type { ApiServer } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Creates the routes for the express app, considering how the config is defined.\n */\nexport function createRoutes({\n  app,\n  url,\n  session,\n  definition,\n  bundleServer,\n  apiServer,\n  config,\n}: {\n  app: Express;\n  url: string;\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}) {\n  const routes = [...(config.devServer?.routes || [])];\n  const hasDefaultRoute = routes.some((route) => route.match === '*' || route.match === '/');\n\n  if (!hasDefaultRoute) {\n    routes.push({\n      match: '*',\n      exportEntry: '.',\n    });\n  }\n\n  for (const route of routes) {\n    if (route.staticPath) {\n      app.use(route.match, express.static(path.resolve(session.appPath, route.staticPath)));\n    } else {\n      app.get(route.match, (req: Request, res: Response) => {\n        (async () => {\n          // Build the import map if it hasn't been built yet for this session version.\n          const sessionVersion = handleSessionVersion(session, req);\n          const importMap =\n            session.getImportMap() ||\n            session.setImportMap(\n              await createImportMap(session.resolveMap, bundleServer.url, {\n                sessionVersion,\n                targetVersions: session.targetVersions,\n              }),\n            );\n\n          // Parse the request path, extension, grab the overlay script path.\n          const requestPath = slash(req.path.substring(1));\n          const requestExt = path.extname(requestPath);\n          const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n          const entryScript =\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n            route.exportEntry && importMap.imports[slash(path.join(definition.name!, route.exportEntry))];\n\n          // Set the apppropriate Cloudpack headers/cookies in the response.\n          // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code\n          // that can only accept changing the scripts. We should consider moving to a model where an initial script\n          // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.\n          setHeaders({ res, session, apiServer });\n\n          const inlineScripts = await getInlineScripts();\n          const { html, statusCode } = await getHtmlResponse({\n            route,\n            baseUrl: url,\n            importMap,\n            overlayScript,\n            entryScript,\n            session,\n            definition,\n            inlineScripts,\n          });\n\n          // Send the result.\n          res.status(statusCode).send(html).end();\n\n          log(`App server: Request: ${requestPath}, ext: ${requestExt}`);\n        })().catch((err) => {\n          error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    }\n  }\n}\n"]}
+{"version":3,"file":"createRoutes.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/createRoutes.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport type { Express, Request, Response } from '@ms-cloudpack/create-express-app';\nimport { express } from '@ms-cloudpack/create-express-app';\nimport { createImportMap } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport type { BundleServer } from '../../../types.js';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { error } from './error.js';\nimport { getHtmlResponse } from './getHtmlResponse.js';\nimport { getInlineScripts } from './inlineScripts/getInlineScripts.js';\nimport { handleSessionVersion } from './handleSessionVersion.js';\nimport { log } from './log.js';\nimport { setHeaders } from './setHeaders.js';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * Creates the routes for the express app, considering how the config is defined.\n */\nexport function createRoutes({\n  app,\n  url,\n  session,\n  definition,\n  bundleServer,\n  apiServer,\n  config,\n}: {\n  app: Express;\n  url: string;\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}) {\n  const routes = [...(config.devServer?.routes || [])];\n  const hasDefaultRoute = routes.some((route) => route.match === '*' || route.match === '/');\n\n  if (!hasDefaultRoute) {\n    routes.push({\n      match: '*',\n      exportEntry: '.',\n    });\n  }\n\n  for (const route of routes) {\n    if (route.staticPath) {\n      app.use(route.match, express.static(path.resolve(session.appPath, route.staticPath)));\n    } else {\n      app.get(route.match, (req: Request, res: Response) => {\n        (async () => {\n          // Build the import map if it hasn't been built yet for this session version.\n          const sessionVersion = handleSessionVersion(session, req);\n          const importMap =\n            session.getImportMap() ||\n            session.setImportMap(\n              await createImportMap(session.resolveMap, bundleServer.url, {\n                sessionVersion,\n                targetVersions: session.targetVersions,\n              }),\n            );\n\n          // Parse the request path, extension, grab the overlay script path.\n          const requestPath = slash(req.path.substring(1));\n          const requestExt = path.extname(requestPath);\n          const overlayScript = importMap.imports['@ms-cloudpack/overlay'];\n          const entryScript =\n            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n            route.exportEntry && importMap.imports[slash(path.join(definition.name!, route.exportEntry))];\n\n          // Set the apppropriate Cloudpack headers/cookies in the response.\n          // TODO: setting the headers here prohibits cases where the page rendering is owned by existing server code\n          // that can only accept changing the scripts. We should consider moving to a model where an initial script\n          // fetch loads the import map and sets Cloudpack settings in local storage rather than headers/cookies.\n          setHeaders({ res, session, apiServer });\n\n          const inlineScripts = await getInlineScripts();\n          const { html, statusCode } = await getHtmlResponse({\n            route,\n            baseUrl: url,\n            importMap,\n            overlayScript,\n            entryScript,\n            session,\n            definition,\n            inlineScripts,\n          });\n\n          // Send the result.\n          res.status(statusCode).send(html).end();\n\n          log(`App server: Request: ${requestPath}, ext: ${requestExt}`);\n        })().catch((err) => {\n          error((err as Error)?.stack || err);\n          res.status(500).send(`Error loading app: ${err}`);\n        });\n      });\n    }\n  }\n}\n"]}

package/lib/commands/start/appServer/handleSessionVersion.d.ts

@@ -1,5 +1,5 @@
 import type { Request } from '@ms-cloudpack/create-express-app';
-import type { Session } from '../../../types.js';
+import type { Session } from '@ms-cloudpack/api-server';
 /**
  * Get the latest refresh version either from the cookie in request or from the session.
  * Update the session with the latest refresh version.

package/lib/commands/start/appServer/handleSessionVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleSessionVersion.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/handleSessionVersion.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAgB,EAAE,GAAY;IACjE,MAAM,kBAAkB,GAAG,MAAM,CAC/B,GAAG,CAAC,OAAO,CAAC,MAAM;QAChB,EAAE,KAAK,CAAC,WAAW,GAAG,4BAA4B,OAAO,CAAC,WAAW,EAAE,GAAG,kBAAkB,CAAC;QAC7F,EAAE,GAAG,EAAE,IAAI,GAAG,CACjB,CAAC;IACF,OAAO,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC,iBAAiB,EAAE,CAAC;AACrC,CAAC","sourcesContent":["import type { Request } from '@ms-cloudpack/create-express-app';\nimport type { Session } from '../../../types.js';\n\n/**\n * Get the latest refresh version either from the cookie in request or from the session.\n * Update the session with the latest refresh version.\n */\nexport function handleSessionVersion(session: Session, req: Request) {\n  const lastSessionVersion = Number(\n    req.headers.cookie\n      ?.match('(^|;)\\\\s*' + `cloudpack-sessionVersion-${session.projectName}` + '\\\\s*=\\\\s*([^;]+)')\n      ?.pop() || '0',\n  );\n  session.incrementSessionVersion(lastSessionVersion);\n\n  return session.getSessionVersion();\n}\n"]}
+{"version":3,"file":"handleSessionVersion.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/handleSessionVersion.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAgB,EAAE,GAAY;IACjE,MAAM,kBAAkB,GAAG,MAAM,CAC/B,GAAG,CAAC,OAAO,CAAC,MAAM;QAChB,EAAE,KAAK,CAAC,WAAW,GAAG,4BAA4B,OAAO,CAAC,WAAW,EAAE,GAAG,kBAAkB,CAAC;QAC7F,EAAE,GAAG,EAAE,IAAI,GAAG,CACjB,CAAC;IACF,OAAO,CAAC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC,iBAAiB,EAAE,CAAC;AACrC,CAAC","sourcesContent":["import type { Request } from '@ms-cloudpack/create-express-app';\nimport type { Session } from '@ms-cloudpack/api-server';\n\n/**\n * Get the latest refresh version either from the cookie in request or from the session.\n * Update the session with the latest refresh version.\n */\nexport function handleSessionVersion(session: Session, req: Request) {\n  const lastSessionVersion = Number(\n    req.headers.cookie\n      ?.match('(^|;)\\\\s*' + `cloudpack-sessionVersion-${session.projectName}` + '\\\\s*=\\\\s*([^;]+)')\n      ?.pop() || '0',\n  );\n  session.incrementSessionVersion(lastSessionVersion);\n\n  return session.getSessionVersion();\n}\n"]}

package/lib/commands/start/appServer/setHeaders.d.ts

@@ -1,6 +1,5 @@
 import type { Response } from '@ms-cloudpack/create-express-app';
-import type { Session } from '../../../types.js';
-import type { ApiServer } from '@ms-cloudpack/api-server';
+import type { ApiServer, Session } from '@ms-cloudpack/api-server';
 /**
  * Set the Cloudpack headers and cookies in the response.
  */

package/lib/commands/start/appServer/setHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/setHeaders.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAA6D;IAC/G,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAE/C,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,GAAG,CAAC,MAAM,CAAC,4BAA4B,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC3F,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC","sourcesContent":["import type { Response } from '@ms-cloudpack/create-express-app';\nimport type { Session } from '../../../types.js';\nimport type { ApiServer } from '@ms-cloudpack/api-server';\n\n/**\n * Set the Cloudpack headers and cookies in the response.\n */\nexport function setHeaders({ res, session, apiServer }: { res: Response; session: Session; apiServer: ApiServer }) {\n  res.header('Content-Type', 'text/html');\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  res.cookie('cloudpack-session-id', session.id);\n  res.cookie('cloudpack-session-sequence', session.sequence);\n  res.cookie(`cloudpack-sessionVersion-${session.projectName}`, session.getSessionVersion());\n  res.cookie('cloudpack-api-url', apiServer.url);\n}\n"]}
+{"version":3,"file":"setHeaders.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/setHeaders.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAA6D;IAC/G,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;IACxC,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IAE/C,GAAG,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/C,GAAG,CAAC,MAAM,CAAC,4BAA4B,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,GAAG,CAAC,MAAM,CAAC,4BAA4B,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC3F,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;AACjD,CAAC","sourcesContent":["import type { Response } from '@ms-cloudpack/create-express-app';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\n\n/**\n * Set the Cloudpack headers and cookies in the response.\n */\nexport function setHeaders({ res, session, apiServer }: { res: Response; session: Session; apiServer: ApiServer }) {\n  res.header('Content-Type', 'text/html');\n  res.header('Cache-Control', 'no-cache');\n  res.header('Access-Control-Allow-Origin', '*');\n\n  res.cookie('cloudpack-session-id', session.id);\n  res.cookie('cloudpack-session-sequence', session.sequence);\n  res.cookie(`cloudpack-sessionVersion-${session.projectName}`, session.getSessionVersion());\n  res.cookie('cloudpack-api-url', apiServer.url);\n}\n"]}

package/lib/commands/start/appServer/startAppServer.d.ts

@@ -1,7 +1,7 @@
-import type { BundleServer, Session } from '../../../types.js';
+import type { BundleServer } from '../../../types.js';
 import type { PackageJson } from '@ms-cloudpack/bundler-types';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
-import type { ApiServer } from '@ms-cloudpack/api-server';
+import type { ApiServer, Session } from '@ms-cloudpack/api-server';
 /**
  * The app server hosts the appropriate routes for the web app, primarily returning html content
  * which loads resources from the bundle server.

package/lib/commands/start/appServer/startAppServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAInD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,GAO/B;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAErD,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAClD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAC1B,YAAY,CAAC;gBACX,GAAG;gBACH,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;aACP,CAAC;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer, Session } from '../../../types.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { reporter } from '../../../reporter.js';\nimport { cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ApiServer } from '@ms-cloudpack/api-server';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}) {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask('Starting app server');\n\n  try {\n    const { close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      setupCallback: (app, url) =>\n        createRoutes({\n          app,\n          url,\n          session,\n          definition,\n          bundleServer,\n          apiServer,\n          config,\n        }),\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    exitIfPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}
+{"version":3,"file":"startAppServer.js","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAInD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,GAO/B;IACC,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,MAAM,IAAK,EAAsB,CAAC;IAE7D,mEAAmE;IACnE,MAAM,oBAAoB,GAAG,SAAS,EAAE,IAAI,KAAK,SAAS,CAAC;IAC3D,MAAM,KAAK,GAAG,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAE1D,mEAAmE;IACnE,+EAA+E;IAC/E,oEAAoE;IAEpE,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAErD,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,gBAAgB,CAAC;YAClD,SAAS,EAAE,KAAK;YAChB,oBAAoB;YACpB,QAAQ,EAAE,SAAS,EAAE,MAAM;YAC3B,UAAU,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK;YACnC,cAAc;YACd,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAC1B,YAAY,CAAC;gBACX,GAAG;gBACH,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,YAAY;gBACZ,SAAS;gBACT,MAAM;aACP,CAAC;SACL,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,eAAe,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAExE,OAAO;YACL,KAAK;YACL,IAAI;YACJ,GAAG;SACJ,CAAC;KACH;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1F,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAEvD,MAAM,GAAG,CAAC;KACX;AACH,CAAC","sourcesContent":["import { createExpressApp } from '@ms-cloudpack/create-express-app';\nimport type { BundleServer } from '../../../types.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { reporter } from '../../../reporter.js';\nimport { cyan } from '@ms-cloudpack/task-reporter';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\n\n/**\n * The app server hosts the appropriate routes for the web app, primarily returning html content\n * which loads resources from the bundle server.\n *\n * Separating the app server from the bundle service keeps the routes separate - the app server\n * can support whichever routes the app needs, while the bundle server can provide package\n * assets in various forms using its own routing.\n */\nexport async function startAppServer({\n  session,\n  bundleServer,\n  apiServer,\n  definition,\n  config = {} as CloudpackConfig,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}) {\n  const { devServer = {} } = config || ({} as CloudpackConfig);\n\n  // Read the port from the config file or default to array of ports.\n  const requireSpecifiedPort = devServer?.port !== undefined;\n  const ports = devServer?.port ?? [5000, 5001, 5002, 5003];\n\n  // Directory to serve as plain static assets. Defaults to \"public\".\n  // Can be overridden by setting the 'publicDir' option in the cloudpack config.\n  // const publicDir = path.resolve(devServer.publicPath ?? 'public');\n\n  const task = reporter.addTask('Starting app server');\n\n  try {\n    const { close, port, url } = await createExpressApp({\n      portRange: ports,\n      requireSpecifiedPort,\n      hostname: devServer?.domain,\n      sslOptions: config.devServer?.https,\n      //  publicDir,\n      setupCallback: (app, url) =>\n        createRoutes({\n          app,\n          url,\n          session,\n          definition,\n          bundleServer,\n          apiServer,\n          config,\n        }),\n    });\n\n    task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });\n\n    return {\n      close,\n      port,\n      url,\n    };\n  } catch (err: unknown) {\n    task.complete({ status: 'fail', message: 'Failed to start app server', forceShow: true });\n    exitIfPortUnavailable(err, session.projectName, ports);\n\n    throw err;\n  }\n}\n"]}

package/lib/commands/start/createSession.d.ts

@@ -1,5 +1,7 @@
-import type { Session } from '../../types.js';
+import type { Session } from '@ms-cloudpack/api-server';
+import type { CloudpackConfig } from '@ms-cloudpack/config';
 export interface SessionOptions {
     appPath: string;
+    config: CloudpackConfig;
 }
 export declare function createSession(options: SessionOptions): Promise<Session>;

package/lib/commands/start/createSession.js

@@ -9,7 +9,7 @@ import { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js'
 const dashboardPackageName = '@ms-cloudpack/overlay';
 const dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';
 export async function createSession(options) {
-    const { appPath } = options;
+    const { appPath, config } = options;
     const projectName = path.basename(appPath);
     const id = uuid();
     const resolveMap = await resolveDependenciesTask({
@@ -31,6 +31,7 @@ export async function createSession(options) {
     return {
         id,
         appPath,
+        config,
         projectName,
         type: 'web-app',
         mode: 'library',

package/lib/commands/start/createSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import { v4 as uuid } from 'uuid';\nimport type { Session } from '../../types.js';\nimport { resolve, type ImportMap } from '@ms-cloudpack/package-utilities';\nimport fs from 'fs';\nimport fsExtra from 'fs-extra';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { getLocalCachePath } from '../../common/getCachePath.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\n\nconst dashboardPackageName = '@ms-cloudpack/overlay';\nconst dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';\n\nexport interface SessionOptions {\n  appPath: string;\n}\n\nexport async function createSession(options: SessionOptions): Promise<Session> {\n  const { appPath } = options;\n  const projectName = path.basename(appPath);\n  const id = uuid();\n  const resolveMap = await resolveDependenciesTask({\n    appPath,\n    additionalPaths: [dashboardPackagePath],\n  });\n\n  if (!resolveMap) {\n    throw new Error('Could not resolve dependencies.');\n  }\n\n  let importMap: ImportMap | undefined = undefined;\n  let sessionVersion = 0;\n\n  await fsExtra.ensureDir(getLocalCachePath(appPath));\n  const targetVersionsPath = path.join(getLocalCachePath(appPath), 'targetVersions.json');\n  const fileExists = await fsExtra.pathExists(targetVersionsPath);\n  if (!fileExists) {\n    await fsExtra.writeJson(targetVersionsPath, {}, { spaces: 2 });\n  }\n  const targetVersions = (await fsExtra.readJSON(targetVersionsPath)) as Record<string, number>;\n\n  return {\n    id,\n    appPath,\n    projectName,\n    type: 'web-app',\n    mode: 'library',\n    resolveMap,\n    sequence: 0,\n    targetVersions,\n    getSessionVersion: () => sessionVersion,\n    incrementSessionVersion: (version?: number) => {\n      if (version === undefined || version > sessionVersion) {\n        sessionVersion = version ?? sessionVersion + 1;\n        importMap = undefined;\n      }\n    },\n    incrementTargetVersion: (inputPath: string) => {\n      targetVersions[inputPath] ||= 0;\n      targetVersions[inputPath]++;\n      importMap = undefined;\n      fs.writeFileSync(targetVersionsPath, JSON.stringify(targetVersions, null, 2));\n    },\n    getImportMap: () => importMap,\n    setImportMap: (newImportMap: ImportMap) => {\n      importMap = newImportMap;\n      return importMap;\n    },\n  };\n}\n"]}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import { v4 as uuid } from 'uuid';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { resolve, type ImportMap } from '@ms-cloudpack/package-utilities';\nimport fs from 'fs';\nimport fsExtra from 'fs-extra';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { getLocalCachePath } from '../../common/getCachePath.js';\nimport { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\n\nconst dashboardPackageName = '@ms-cloudpack/overlay';\nconst dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';\n\nexport interface SessionOptions {\n  appPath: string;\n  config: CloudpackConfig;\n}\n\nexport async function createSession(options: SessionOptions): Promise<Session> {\n  const { appPath, config } = options;\n  const projectName = path.basename(appPath);\n  const id = uuid();\n  const resolveMap = await resolveDependenciesTask({\n    appPath,\n    additionalPaths: [dashboardPackagePath],\n  });\n\n  if (!resolveMap) {\n    throw new Error('Could not resolve dependencies.');\n  }\n\n  let importMap: ImportMap | undefined = undefined;\n  let sessionVersion = 0;\n\n  await fsExtra.ensureDir(getLocalCachePath(appPath));\n  const targetVersionsPath = path.join(getLocalCachePath(appPath), 'targetVersions.json');\n  const fileExists = await fsExtra.pathExists(targetVersionsPath);\n  if (!fileExists) {\n    await fsExtra.writeJson(targetVersionsPath, {}, { spaces: 2 });\n  }\n  const targetVersions = (await fsExtra.readJSON(targetVersionsPath)) as Record<string, number>;\n\n  return {\n    id,\n    appPath,\n    config,\n    projectName,\n    type: 'web-app',\n    mode: 'library',\n    resolveMap,\n    sequence: 0,\n    targetVersions,\n    getSessionVersion: () => sessionVersion,\n    incrementSessionVersion: (version?: number) => {\n      if (version === undefined || version > sessionVersion) {\n        sessionVersion = version ?? sessionVersion + 1;\n        importMap = undefined;\n      }\n    },\n    incrementTargetVersion: (inputPath: string) => {\n      targetVersions[inputPath] ||= 0;\n      targetVersions[inputPath]++;\n      importMap = undefined;\n      fs.writeFileSync(targetVersionsPath, JSON.stringify(targetVersions, null, 2));\n    },\n    getImportMap: () => importMap,\n    setImportMap: (newImportMap: ImportMap) => {\n      importMap = newImportMap;\n      return importMap;\n    },\n  };\n}\n"]}

package/lib/commands/start/createSession.test.js

@@ -36,7 +36,7 @@ describe('createSession', () => {
         await rm(tempFolderPath, { recursive: true });
     });
     it('can set and get import map', async () => {
-        const session = await createSession({ appPath: tempFolderPath });
+        const session = await createSession({ appPath: tempFolderPath, config: {} });
         expect(session.getImportMap()).toBeUndefined();
         const importMap = await createImportMap(session.resolveMap, 'http://localhost/', {
             sessionVersion: session.getSessionVersion(),
@@ -50,7 +50,7 @@ describe('createSession', () => {
         console.log(session.resolveMap);
     });
     it('can get and increment session version', async () => {
-        const session = await createSession({ appPath: tempFolderPath });
+        const session = await createSession({ appPath: tempFolderPath, config: {} });
         expect(session.getSessionVersion()).toBe(0);
         session.setImportMap(await createImportMap(session.resolveMap, 'http://localhost/', {
             sessionVersion: session.getSessionVersion(),
@@ -75,7 +75,7 @@ describe('createSession', () => {
         expect(session.getImportMap()).not.toBeUndefined();
     });
     it('can increment target versions', async () => {
-        const session = await createSession({ appPath: tempFolderPath });
+        const session = await createSession({ appPath: tempFolderPath, config: {} });
         session.setImportMap(await createImportMap(session.resolveMap, 'http://localhost/', {
             sessionVersion: session.getSessionVersion(),
             targetVersions: session.targetVersions,

package/lib/commands/start/createSession.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.test.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, it, expect, beforeAll, beforeEach, afterEach } from '@jest/globals';\nimport fs from 'fs';\nimport { createSession } from './createSession.js';\nimport { createTestFileStructure } from '@ms-cloudpack/test-utilities';\nimport { createImportMap } from '@ms-cloudpack/package-utilities';\nimport { reporter, noLoggingConfig } from '../../reporter.js';\n\nconst { rm } = fs.promises;\n\nlet tempFolderPath: string;\n\ndescribe('createSession', () => {\n  beforeAll(() => {\n    reporter.setOptions(noLoggingConfig);\n  });\n\n  beforeEach(async () => {\n    tempFolderPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-project-1',\n        version: '0.0.1',\n        type: 'module',\n        exports: {\n          '.': './lib/index.js',\n        },\n        dependencies: {\n          b: '^1.0.0',\n        },\n      },\n      'src/index.ts': `import { b } from 'b'; export const a = 'a' + b();`,\n      'node_modules/b/package.json': {\n        name: 'b',\n        version: '1.0.0',\n        main: 'index.js',\n      },\n      'node_modules/b/index.js': `export const b = () => 'b';`,\n    });\n  });\n\n  afterEach(async () => {\n    await rm(tempFolderPath, { recursive: true });\n  });\n\n  it('can set and get import map', async () => {\n    const session = await createSession({ appPath: tempFolderPath });\n    expect(session.getImportMap()).toBeUndefined();\n    const importMap = await createImportMap(session.resolveMap, 'http://localhost/', {\n      sessionVersion: session.getSessionVersion(),\n      targetVersions: session.targetVersions,\n    });\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    expect(session.getImportMap()).toEqual(importMap);\n    console.log(session.resolveMap);\n  });\n\n  it('can get and increment session version', async () => {\n    const session = await createSession({ appPath: tempFolderPath });\n    expect(session.getSessionVersion()).toBe(0);\n\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementSessionVersion();\n    expect(session.getSessionVersion()).toBe(1);\n    expect(session.getImportMap()).toBeUndefined();\n\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementSessionVersion(30);\n    expect(session.getSessionVersion()).toBe(30);\n    expect(session.getImportMap()).toBeUndefined();\n\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementSessionVersion(5);\n    expect(session.getSessionVersion()).toBe(30);\n    expect(session.getImportMap()).not.toBeUndefined();\n  });\n\n  it('can increment target versions', async () => {\n    const session = await createSession({ appPath: tempFolderPath });\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementTargetVersion(tempFolderPath);\n    expect(session.targetVersions).toEqual({ [tempFolderPath]: 1 });\n    expect(session.getImportMap()).toBeUndefined();\n  });\n});\n"]}
+{"version":3,"file":"createSession.test.js","sourceRoot":"","sources":["../../../src/commands/start/createSession.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { describe, it, expect, beforeAll, beforeEach, afterEach } from '@jest/globals';\nimport fs from 'fs';\nimport { createSession } from './createSession.js';\nimport { createTestFileStructure } from '@ms-cloudpack/test-utilities';\nimport { createImportMap } from '@ms-cloudpack/package-utilities';\nimport { reporter, noLoggingConfig } from '../../reporter.js';\n\nconst { rm } = fs.promises;\n\nlet tempFolderPath: string;\n\ndescribe('createSession', () => {\n  beforeAll(() => {\n    reporter.setOptions(noLoggingConfig);\n  });\n\n  beforeEach(async () => {\n    tempFolderPath = await createTestFileStructure({\n      'package.json': {\n        name: 'test-project-1',\n        version: '0.0.1',\n        type: 'module',\n        exports: {\n          '.': './lib/index.js',\n        },\n        dependencies: {\n          b: '^1.0.0',\n        },\n      },\n      'src/index.ts': `import { b } from 'b'; export const a = 'a' + b();`,\n      'node_modules/b/package.json': {\n        name: 'b',\n        version: '1.0.0',\n        main: 'index.js',\n      },\n      'node_modules/b/index.js': `export const b = () => 'b';`,\n    });\n  });\n\n  afterEach(async () => {\n    await rm(tempFolderPath, { recursive: true });\n  });\n\n  it('can set and get import map', async () => {\n    const session = await createSession({ appPath: tempFolderPath, config: {} });\n    expect(session.getImportMap()).toBeUndefined();\n    const importMap = await createImportMap(session.resolveMap, 'http://localhost/', {\n      sessionVersion: session.getSessionVersion(),\n      targetVersions: session.targetVersions,\n    });\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    expect(session.getImportMap()).toEqual(importMap);\n    console.log(session.resolveMap);\n  });\n\n  it('can get and increment session version', async () => {\n    const session = await createSession({ appPath: tempFolderPath, config: {} });\n    expect(session.getSessionVersion()).toBe(0);\n\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementSessionVersion();\n    expect(session.getSessionVersion()).toBe(1);\n    expect(session.getImportMap()).toBeUndefined();\n\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementSessionVersion(30);\n    expect(session.getSessionVersion()).toBe(30);\n    expect(session.getImportMap()).toBeUndefined();\n\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementSessionVersion(5);\n    expect(session.getSessionVersion()).toBe(30);\n    expect(session.getImportMap()).not.toBeUndefined();\n  });\n\n  it('can increment target versions', async () => {\n    const session = await createSession({ appPath: tempFolderPath, config: {} });\n    session.setImportMap(\n      await createImportMap(session.resolveMap, 'http://localhost/', {\n        sessionVersion: session.getSessionVersion(),\n        targetVersions: session.targetVersions,\n      }),\n    );\n    session.incrementTargetVersion(tempFolderPath);\n    expect(session.targetVersions).toEqual({ [tempFolderPath]: 1 });\n    expect(session.getImportMap()).toBeUndefined();\n  });\n});\n"]}

package/lib/commands/start/start.js

@@ -30,7 +30,7 @@ export async function start(options) {
             throw new Error(`The package.json at "${appPath}" did not have a name and/or version.`);
         }
         // Initialize session definition.
-        const session = await createSession({ appPath });
+        const session = await createSession({ appPath, config });
         // Set shared telemetry attributes which will be sent with all telemetry events.
         setSharedTelemetryAttribute('sessionId', session.id);
         setSharedTelemetryAttribute('appName', definition.name);

package/lib/commands/start/start.js.map

@@ -1 +1 @@
-{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';\nimport { startAppServer } from './appServer/startAppServer.js';\nimport { createSession } from './createSession.js';\nimport { openBrowser } from './openBrowser.js';\nimport { startApiServer } from '@ms-cloudpack/api-server';\nimport { startBundleServer } from './startBundleServer.js';\nimport type { StartOptions } from './types.js';\nimport { reporter } from '../../reporter.js';\nimport { readConfig } from '@ms-cloudpack/config';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport async function start(options: StartOptions) {\n  const appPath = process.cwd();\n\n  try {\n    // Parse config if it exists.\n    const config = await readConfig(appPath);\n\n    // Initialize package overrides.\n    PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(config));\n\n    // Make sure the package has a valid definition.\n    const definition = await PackageDefinitions.getInstance().get(appPath);\n\n    if (!definition) {\n      throw new Error(`There was no package.json located at \"${appPath}\".`);\n    }\n\n    if (!definition.name || !definition.version) {\n      throw new Error(`The package.json at \"${appPath}\" did not have a name and/or version.`);\n    }\n\n    // Initialize session definition.\n    const session = await createSession({ appPath });\n\n    // Set shared telemetry attributes which will be sent with all telemetry events.\n    setSharedTelemetryAttribute('sessionId', session.id);\n    setSharedTelemetryAttribute('appName', definition.name);\n\n    if (options.logResolveMap) {\n      // Write the resolve map to disk.\n      await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n    }\n\n    // Start api server for tracking status and handling remote requests.\n    const apiServer = await startApiServer({ session, config, rootSpan });\n\n    // Then start bundle and app servers for hosting the app.\n    const bundleServer = await startBundleServer({ session, apiServer, config });\n\n    const appServer = await startAppServer({\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n    });\n\n    const cleanup = async () => {\n      for (const [name, server] of [\n        ['appServer', appServer] as const,\n        ['apiServer', apiServer] as const,\n        ['bundleServer', bundleServer] as const,\n      ]) {\n        console.info(`Closing ${name}: ${server.url}`);\n        try {\n          await server.close();\n        } catch (err) {\n          console.warn('Error closing server:', err);\n        }\n      }\n\n      // Complete the reporting and list pending tasks as aborted.\n      reporter.complete();\n\n      // Flush and close telemetry.\n      await stopTelemetry();\n    };\n\n    // Setup cleanup and close things on completion.\n    let sigintCount = 0;\n\n    process.on('SIGINT', () => {\n      sigintCount++;\n      if (sigintCount > 1) {\n        console.debug('Forcing exit');\n        process.exit(1);\n      }\n\n      cleanup().finally(() => {\n        process.exit(0);\n      });\n    });\n\n    // Open the browser.\n    const url = appServer.url;\n\n    performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n    openBrowser(url).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', url);\n    });\n  } catch (err) {\n    reporter.complete();\n    process.exit(1);\n  }\n}\n"]}
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"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","sourcesContent":["import { writeJson } from '@ms-cloudpack/json-utilities';\nimport { PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';\nimport { startAppServer } from './appServer/startAppServer.js';\nimport { createSession } from './createSession.js';\nimport { openBrowser } from './openBrowser.js';\nimport { startApiServer } from '@ms-cloudpack/api-server';\nimport { startBundleServer } from './startBundleServer.js';\nimport type { StartOptions } from './types.js';\nimport { reporter } from '../../reporter.js';\nimport { readConfig } from '@ms-cloudpack/config';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport async function start(options: StartOptions) {\n  const appPath = process.cwd();\n\n  try {\n    // Parse config if it exists.\n    const config = await readConfig(appPath);\n\n    // Initialize package overrides.\n    PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(config));\n\n    // Make sure the package has a valid definition.\n    const definition = await PackageDefinitions.getInstance().get(appPath);\n\n    if (!definition) {\n      throw new Error(`There was no package.json located at \"${appPath}\".`);\n    }\n\n    if (!definition.name || !definition.version) {\n      throw new Error(`The package.json at \"${appPath}\" did not have a name and/or version.`);\n    }\n\n    // Initialize session definition.\n    const session = await createSession({ appPath, config });\n\n    // Set shared telemetry attributes which will be sent with all telemetry events.\n    setSharedTelemetryAttribute('sessionId', session.id);\n    setSharedTelemetryAttribute('appName', definition.name);\n\n    if (options.logResolveMap) {\n      // Write the resolve map to disk.\n      await writeJson(path.join(appPath, 'resolve-map.json'), session.resolveMap);\n    }\n\n    // Start api server for tracking status and handling remote requests.\n    const apiServer = await startApiServer({ session, config, rootSpan });\n\n    // Then start bundle and app servers for hosting the app.\n    const bundleServer = await startBundleServer({ session, apiServer, config });\n\n    const appServer = await startAppServer({\n      session,\n      definition,\n      bundleServer,\n      apiServer,\n      config,\n    });\n\n    const cleanup = async () => {\n      for (const [name, server] of [\n        ['appServer', appServer] as const,\n        ['apiServer', apiServer] as const,\n        ['bundleServer', bundleServer] as const,\n      ]) {\n        console.info(`Closing ${name}: ${server.url}`);\n        try {\n          await server.close();\n        } catch (err) {\n          console.warn('Error closing server:', err);\n        }\n      }\n\n      // Complete the reporting and list pending tasks as aborted.\n      reporter.complete();\n\n      // Flush and close telemetry.\n      await stopTelemetry();\n    };\n\n    // Setup cleanup and close things on completion.\n    let sigintCount = 0;\n\n    process.on('SIGINT', () => {\n      sigintCount++;\n      if (sigintCount > 1) {\n        console.debug('Forcing exit');\n        process.exit(1);\n      }\n\n      cleanup().finally(() => {\n        process.exit(0);\n      });\n    });\n\n    // Open the browser.\n    const url = appServer.url;\n\n    performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n    openBrowser(url).catch((err) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      console.warn('Error opening browser:', err?.stack || err);\n      console.warn('Please open the browser manually to:', url);\n    });\n  } catch (err) {\n    reporter.complete();\n    process.exit(1);\n  }\n}\n"]}

package/lib/commands/start/startBundleServer.js

@@ -91,6 +91,7 @@ async function handleRequest(req, res, session, apiServer) {
         packagePath,
         outputPath,
         isExternal,
+        disableSourceMaps: session.config.features?.disableSourceMaps,
     };
     console.debug(`Trying to bundle "${packageName}@${version}"`);
     const bundleTask = createBundleTask(taskResult, { force });

package/lib/commands/start/startBundleServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"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","sourcesContent":["import { createExpressApp, type Express, type Request, type Response } from '@ms-cloudpack/create-express-app';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport type { BundleRequest, BundleServer } from '../../types.js';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport { isExternalPackage } from '@ms-cloudpack/package-utilities';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * The bundle server handles package requests and returns bundled resources.\n * Resources are bundled on demand and cached locally to avoid re-bundling\n * on each request.\n */\nexport async function startBundleServer({\n  session,\n  apiServer,\n  config = {} as CloudpackConfig,\n}: {\n  session: Session;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}): Promise<BundleServer> {\n  const { port, close, url } = await createExpressApp({\n    portRange: [5500, 5501, 5502, 5503],\n    hostname: config.devServer?.domain,\n    sslOptions: config.devServer?.https,\n    setupCallback: (app: Express) => {\n      // Set up the express app routes.\n      app.get('*', (req, res) => {\n        handleRequest(req, res, session, apiServer).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error bundling: ${err}`);\n        });\n      });\n    },\n  });\n\n  return {\n    close,\n    port,\n    url,\n  };\n}\n\nasync function handleRequest(req: Request, res: Response, session: Session, apiServer: ApiServer) {\n  const { resolveMap } = session;\n  const requestPath = slash(req.path.substring(1));\n  const { packageName, version, bundled, filePath } = parseRequestInfo(requestPath);\n  const packageEntry = resolveMap[packageName];\n  const packagePath =\n    version && packageEntry?.version === version ? packageEntry?.path : packageEntry?.scopedVersions?.[version]?.path;\n  const force = req.query.force !== undefined;\n\n  console.debug(`Request: \"${packageName}@${version}${filePath}\"`);\n\n  // If the package is missing, invalid arguments.\n  if (!requestPath || !packageName) {\n    console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n    res.status(400).send(`Requests must be in the format \"/{packageName}@{version}/{type}/path/file.ext\".`);\n    return;\n  }\n\n  // If the version is missing, redirect to the primary version.\n  if (!version) {\n    const resolvedPackage = resolveMap[packageName];\n\n    if (!resolvedPackage) {\n      console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n\n      res.status(404).send(`Unrecognized package \"${packageName}\".`);\n      return;\n    }\n\n    res.redirect(`/${packageName}@${resolvedPackage.version}${filePath}`);\n    return;\n  }\n\n  // If it's an unrecognized package, 404.\n  if (!packagePath) {\n    console.debug(`Response (404): \"${packageName}@${version}${filePath}\"`);\n\n    res\n      .status(404)\n      .send(`The requested package \"${packageName}@${version}${filePath}\" was not found in the resolve map.`);\n\n    return;\n  }\n\n  // If we are accessing a non-bundled asset, return the file directly.\n  if (!bundled) {\n    const fullPath = path.join(packagePath, filePath);\n\n    if (fullPath.length < packagePath.length) {\n      console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n      res.status(400).send(`Invalid file path.`);\n      return;\n    }\n\n    console.debug(`Unbundled response returning: \"${packageName}@${version}${filePath}\"`);\n    // If the package is external, set cache headers.\n    if (isExternalPackage(packagePath)) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(packagePath, filePath));\n    return;\n  }\n\n  const { isExternal, bundleId, outputPath } = await getBundleDetails(packagePath);\n\n  // Set up for bundling.\n  const rerun = !(await isFolder(outputPath)) || force;\n  const taskResult: BundleRequest = {\n    id: bundleId,\n    packageName,\n    version,\n    packagePath,\n    outputPath,\n    isExternal,\n  };\n\n  console.debug(`Trying to bundle \"${packageName}@${version}\"`);\n\n  const bundleTask = createBundleTask(taskResult, { force });\n  await apiServer.addTask(bundleTask, { rerun });\n\n  // At this point we should have a Task completed.\n  if ((taskResult.result?.errors?.length || 0) > 0) {\n    res.status(500).type('json').send(taskResult);\n  } else {\n    console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n    // Try to return the result.\n    if (isExternal) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(outputPath, filePath));\n  }\n}\n"]}
+{"version":3,"file":"startBundleServer.js","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"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","sourcesContent":["import { createExpressApp, type Express, type Request, type Response } from '@ms-cloudpack/create-express-app';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport path from 'path';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport type { BundleRequest, BundleServer } from '../../types.js';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport { isExternalPackage } from '@ms-cloudpack/package-utilities';\nimport type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\n/**\n * The bundle server handles package requests and returns bundled resources.\n * Resources are bundled on demand and cached locally to avoid re-bundling\n * on each request.\n */\nexport async function startBundleServer({\n  session,\n  apiServer,\n  config = {} as CloudpackConfig,\n}: {\n  session: Session;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n}): Promise<BundleServer> {\n  const { port, close, url } = await createExpressApp({\n    portRange: [5500, 5501, 5502, 5503],\n    hostname: config.devServer?.domain,\n    sslOptions: config.devServer?.https,\n    setupCallback: (app: Express) => {\n      // Set up the express app routes.\n      app.get('*', (req, res) => {\n        handleRequest(req, res, session, apiServer).catch((err) => {\n          console.error((err as Error)?.stack || err);\n          res.status(500).send(`Error bundling: ${err}`);\n        });\n      });\n    },\n  });\n\n  return {\n    close,\n    port,\n    url,\n  };\n}\n\nasync function handleRequest(req: Request, res: Response, session: Session, apiServer: ApiServer) {\n  const { resolveMap } = session;\n  const requestPath = slash(req.path.substring(1));\n  const { packageName, version, bundled, filePath } = parseRequestInfo(requestPath);\n  const packageEntry = resolveMap[packageName];\n  const packagePath =\n    version && packageEntry?.version === version ? packageEntry?.path : packageEntry?.scopedVersions?.[version]?.path;\n  const force = req.query.force !== undefined;\n\n  console.debug(`Request: \"${packageName}@${version}${filePath}\"`);\n\n  // If the package is missing, invalid arguments.\n  if (!requestPath || !packageName) {\n    console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n    res.status(400).send(`Requests must be in the format \"/{packageName}@{version}/{type}/path/file.ext\".`);\n    return;\n  }\n\n  // If the version is missing, redirect to the primary version.\n  if (!version) {\n    const resolvedPackage = resolveMap[packageName];\n\n    if (!resolvedPackage) {\n      console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n\n      res.status(404).send(`Unrecognized package \"${packageName}\".`);\n      return;\n    }\n\n    res.redirect(`/${packageName}@${resolvedPackage.version}${filePath}`);\n    return;\n  }\n\n  // If it's an unrecognized package, 404.\n  if (!packagePath) {\n    console.debug(`Response (404): \"${packageName}@${version}${filePath}\"`);\n\n    res\n      .status(404)\n      .send(`The requested package \"${packageName}@${version}${filePath}\" was not found in the resolve map.`);\n\n    return;\n  }\n\n  // If we are accessing a non-bundled asset, return the file directly.\n  if (!bundled) {\n    const fullPath = path.join(packagePath, filePath);\n\n    if (fullPath.length < packagePath.length) {\n      console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n      res.status(400).send(`Invalid file path.`);\n      return;\n    }\n\n    console.debug(`Unbundled response returning: \"${packageName}@${version}${filePath}\"`);\n    // If the package is external, set cache headers.\n    if (isExternalPackage(packagePath)) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(packagePath, filePath));\n    return;\n  }\n\n  const { isExternal, bundleId, outputPath } = await getBundleDetails(packagePath);\n\n  // Set up for bundling.\n  const rerun = !(await isFolder(outputPath)) || force;\n  const taskResult: BundleRequest = {\n    id: bundleId,\n    packageName,\n    version,\n    packagePath,\n    outputPath,\n    isExternal,\n    disableSourceMaps: session.config.features?.disableSourceMaps,\n  };\n\n  console.debug(`Trying to bundle \"${packageName}@${version}\"`);\n\n  const bundleTask = createBundleTask(taskResult, { force });\n  await apiServer.addTask(bundleTask, { rerun });\n\n  // At this point we should have a Task completed.\n  if ((taskResult.result?.errors?.length || 0) > 0) {\n    res.status(500).type('json').send(taskResult);\n  } else {\n    console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n    // Try to return the result.\n    if (isExternal) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(outputPath, filePath));\n  }\n}\n"]}

package/lib/commands/start/types.d.ts

@@ -1,3 +1,4 @@
 export interface StartOptions {
     logResolveMap?: boolean;
+    sourcemap?: boolean;
 }

package/lib/commands/start/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/start/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface StartOptions {\n  logResolveMap?: boolean;\n}\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/commands/start/types.ts"],"names":[],"mappings":"","sourcesContent":["export interface StartOptions {\n  logResolveMap?: boolean;\n  sourcemap?: boolean;\n}\n"]}

package/lib/index.d.ts

@@ -3,6 +3,6 @@
  * within the "./commands" folder.
  */
 export declare function main(): Promise<void>;
-export type { BundleRequest, BundleServer, BundleTaskOptions, CreateHtmlFunction, CreateHtmlOptions, CreateHtmlResult, CreateHtmlScript, PackageOverride, Session, Watcher, } from './types.js';
-export type { ApiServer, DevServer, Route, SessionStats, Task, TaskDescription, TaskEndDescription, TaskError, TaskOptions, TaskStartDescription, } from '@ms-cloudpack/api-server';
-export type { CloudpackConfig, TelemetryConfig } from '@ms-cloudpack/config';
+export type { BundleRequest, BundleServer, BundleTaskOptions, CreateHtmlFunction, CreateHtmlOptions, CreateHtmlResult, CreateHtmlScript, PackageOverride, Watcher, } from './types.js';
+export type { ApiServer, DevServer, SessionStats, Task, TaskDescription, TaskEndDescription, TaskError, TaskOptions, TaskStartDescription, } from '@ms-cloudpack/api-server';
+export type { CloudpackConfig, Route, TelemetryConfig } from '@ms-cloudpack/config';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,kBAAkB,EAClB,oBAAoB,EACpB,QAAQ,EACR,oBAAoB,GACrB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAEjE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,IAAI;IACxB,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAErC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEzF,oDAAoD;IACpD,kBAAkB,CAAC;QACjB,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,yEAAyE;IACzE,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxF,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,QAAQ,CAAC;IAEjH,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IAExE,kBAAkB,CAAC;QACjB,WAAW;QACX,OAAO;QACP,WAAW,EAAE,YAAY,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG;QACjE,GAAG,oBAAoB;QACvB,GAAG,CAAC,iBAAiB,IAAI,oBAAoB,CAAC;QAC9C,GAAG,CAAC,eAAe,IAAI,kBAAkB,CAAC;KAC3C,CAAC,CAAC;IAEH,MAAM,aAAa,CAAC;QAClB,eAAe;QACf,iBAAiB;KAClB,CAAC,CAAC;IAEH,4BAA4B,CAAC;QAC3B,IAAI;QACJ,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC1C,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO;KACrE,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAExE,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;QAClC,MAAM,OAAO,GAAG,CAAC,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAE9F,CAAC;QAEF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KACvB;IAED,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,mEAAmE,CAAC,CAAC;IACrG,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,kEAAkE,CAAC,CAAC;IAClG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,gDAAgD,CAAC,CAAC;IAEnF,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC","sourcesContent":["import {\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  gradient,\n  verboseLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { Command } from 'commander';\nimport glob from 'glob';\nimport path from 'path';\nimport { fileURLToPath, pathToFileURL } from 'url';\nimport { getVersion } from './getVersion.js';\nimport { PerfMarkerCliEntry } from './performance/markers.js';\nimport { initTelemetry, setSharedTelemetryAttributes } from './initTelemetry.js';\nimport { setReporterOptions } from './reporter.js';\n\nconst currentPath = path.dirname(fileURLToPath(import.meta.url));\n\n/**\n * Entry point for the cloudpack CLI. Resolves all commands defined\n * within the \"./commands\" folder.\n */\nexport async function main() {\n  performance.mark(PerfMarkerCliEntry);\n\n  const program = new Command();\n  const plainTextMode = process.argv.includes('--no-color') || process.argv.includes('-n');\n\n  // Initialize the color setting as soon as possible.\n  setReporterOptions({\n    plainTextMode,\n  });\n\n  const version = getVersion();\n  // the name \"Cloudpack\" preceed by an emoji representing sun behind cloud\n  const productName = gradient(`Cloudpack`);\n  const useDebugLogging = process.argv.includes('--debug') || process.argv.includes('-d');\n  const verb = process.argv[2];\n  const useVerboseLogging = process.argv.includes('--verbose') || process.argv.includes('-v') || verb === 'bundle';\n\n  program.name(productName).version(version).usage('<command> [options]');\n\n  setReporterOptions({\n    productName,\n    version,\n    description: `Running \"${bold(process.argv.slice(2).join(' '))}\"`,\n    ...defaultLoggingConfig,\n    ...(useVerboseLogging && verboseLoggingConfig),\n    ...(useDebugLogging && debugLoggingConfig),\n  });\n\n  await initTelemetry({\n    useDebugLogging,\n    useVerboseLogging,\n  });\n\n  setSharedTelemetryAttributes({\n    verb,\n    arguments: process.argv.slice(3).join(' '),\n    environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',\n  });\n\n  const commands = glob.sync('commands/*/index.js', { cwd: currentPath });\n\n  for (const commandPath of commands) {\n    const command = (await import(pathToFileURL(path.resolve(currentPath, commandPath)).toString())) as {\n      init: (cmd: Command) => void;\n    };\n\n    command.init(program);\n  }\n\n  program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');\n  program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');\n  program.option('-n, --no-color', 'Disable colors in the output. (default: false)');\n\n  program.parse(process.argv);\n\n  if (program.args.length === 0) {\n    program.help();\n  }\n}\n\nexport type {\n  BundleRequest,\n  BundleServer,\n  BundleTaskOptions,\n  CreateHtmlFunction,\n  CreateHtmlOptions,\n  CreateHtmlResult,\n  CreateHtmlScript,\n  PackageOverride,\n  Session,\n  Watcher,\n} from './types.js';\n\nexport type {\n  ApiServer,\n  DevServer,\n  Route,\n  SessionStats,\n  Task,\n  TaskDescription,\n  TaskEndDescription,\n  TaskError,\n  TaskOptions,\n  TaskStartDescription,\n} from '@ms-cloudpack/api-server';\n\nexport type { CloudpackConfig, TelemetryConfig } from '@ms-cloudpack/config';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  bold,\n  debugLoggingConfig,\n  defaultLoggingConfig,\n  gradient,\n  verboseLoggingConfig,\n} from '@ms-cloudpack/task-reporter';\nimport { Command } from 'commander';\nimport glob from 'glob';\nimport path from 'path';\nimport { fileURLToPath, pathToFileURL } from 'url';\nimport { getVersion } from './getVersion.js';\nimport { PerfMarkerCliEntry } from './performance/markers.js';\nimport { initTelemetry, setSharedTelemetryAttributes } from './initTelemetry.js';\nimport { setReporterOptions } from './reporter.js';\n\nconst currentPath = path.dirname(fileURLToPath(import.meta.url));\n\n/**\n * Entry point for the cloudpack CLI. Resolves all commands defined\n * within the \"./commands\" folder.\n */\nexport async function main() {\n  performance.mark(PerfMarkerCliEntry);\n\n  const program = new Command();\n  const plainTextMode = process.argv.includes('--no-color') || process.argv.includes('-n');\n\n  // Initialize the color setting as soon as possible.\n  setReporterOptions({\n    plainTextMode,\n  });\n\n  const version = getVersion();\n  // the name \"Cloudpack\" preceed by an emoji representing sun behind cloud\n  const productName = gradient(`Cloudpack`);\n  const useDebugLogging = process.argv.includes('--debug') || process.argv.includes('-d');\n  const verb = process.argv[2];\n  const useVerboseLogging = process.argv.includes('--verbose') || process.argv.includes('-v') || verb === 'bundle';\n\n  program.name(productName).version(version).usage('<command> [options]');\n\n  setReporterOptions({\n    productName,\n    version,\n    description: `Running \"${bold(process.argv.slice(2).join(' '))}\"`,\n    ...defaultLoggingConfig,\n    ...(useVerboseLogging && verboseLoggingConfig),\n    ...(useDebugLogging && debugLoggingConfig),\n  });\n\n  await initTelemetry({\n    useDebugLogging,\n    useVerboseLogging,\n  });\n\n  setSharedTelemetryAttributes({\n    verb,\n    arguments: process.argv.slice(3).join(' '),\n    environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',\n  });\n\n  const commands = glob.sync('commands/*/index.js', { cwd: currentPath });\n\n  for (const commandPath of commands) {\n    const command = (await import(pathToFileURL(path.resolve(currentPath, commandPath)).toString())) as {\n      init: (cmd: Command) => void;\n    };\n\n    command.init(program);\n  }\n\n  program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');\n  program.option('-d, --debug', 'Show debug information (superset of --verbose). (default: false)');\n  program.option('-n, --no-color', 'Disable colors in the output. (default: false)');\n\n  program.parse(process.argv);\n\n  if (program.args.length === 0) {\n    program.help();\n  }\n}\n\nexport type {\n  BundleRequest,\n  BundleServer,\n  BundleTaskOptions,\n  CreateHtmlFunction,\n  CreateHtmlOptions,\n  CreateHtmlResult,\n  CreateHtmlScript,\n  PackageOverride,\n  Watcher,\n} from './types.js';\n\nexport type {\n  ApiServer,\n  DevServer,\n  SessionStats,\n  Task,\n  TaskDescription,\n  TaskEndDescription,\n  TaskError,\n  TaskOptions,\n  TaskStartDescription,\n} from '@ms-cloudpack/api-server';\n\nexport type { CloudpackConfig, Route, TelemetryConfig } from '@ms-cloudpack/config';\n"]}

package/lib/tasks/bundleTask.js

@@ -51,7 +51,7 @@ export async function bundleTask({ bundleRequest, options = {}, }) {
     return bundleRequest;
 }
 async function bundle(bundleRequest, force) {
-    const { packagePath, outputPath, isExternal } = bundleRequest;
+    const { packagePath, outputPath, isExternal, disableSourceMaps } = bundleRequest;
     // Rehydrate the result if not incremental.
     if (isExternal && !force) {
         bundleRequest.result = (await readJson(path.join(outputPath, 'result.json')));
@@ -68,6 +68,7 @@ async function bundle(bundleRequest, force) {
             outputPath,
             incremental: !isExternal,
             packages: bundleRequest.packages,
+            sourcemap: disableSourceMaps ? undefined : 'linked',
         });
         // Write the result to disk.
         if (isExternal) {

package/lib/tasks/bundleTask.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundlePackage } from '@ms-cloudpack/bundler';\nimport type { BundleResult } from '@ms-cloudpack/bundler-types';\nimport { bulletedList, formatPackageName, type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';\nimport { readJson, writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport { formatBundleErrors } from './formatBundleErrors.js';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport { reporter } from '../reporter.js';\nimport type { BundleRequest, BundleTaskOptions } from '../types.js';\n\nexport async function bundleTask({\n  bundleRequest,\n  options = {},\n}: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n}) {\n  const { packageName, version } = bundleRequest;\n  const { force } = options || {};\n\n  // If force is set, dispose the existing result.\n  if (force && bundleRequest?.result?.dispose) {\n    bundleRequest.result.dispose();\n    bundleRequest.result = undefined;\n  }\n\n  const { rebuild } = bundleRequest?.result || {};\n  const taskName = `${rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({ name: packageName, version })}`;\n\n  await reporter.runTask(taskName, async (): Promise<TaskReporterTaskResult> => {\n    if (rebuild) {\n      bundleRequest.result = await rebuild();\n    } else {\n      await bundle(bundleRequest, force);\n    }\n\n    const result = (bundleRequest.result ||= {});\n\n    result.outputFiles ||= [];\n    result.errors ||= [];\n    result.warnings ||= [];\n\n    if (!result.outputFiles.length) {\n      result.warnings.push({\n        text: `No output files were found for \"${packageName}\" in \"${bundleRequest.outputPath}\"`,\n      });\n    }\n\n    return {\n      status: result.errors.length ? 'fail' : 'complete',\n      ...formatBundleErrors(result.errors),\n      extended: bulletedList([\n        `Bundler: ${result.bundlerName || 'unknown'}`,\n        `Input path: ${bundleRequest.packagePath}`,\n        `Entries:\\n${bulletedList(Object.keys(result.entries || {}), 2)}`,\n        `Output path: ${bundleRequest.outputPath}`,\n        ...(result.outputFiles.length\n          ? [\n              `Output files:`,\n              result.outputFiles.map((file) => path.relative(bundleRequest.outputPath, file.outputPath)),\n            ]\n          : []),\n      ]),\n    };\n  });\n\n  return bundleRequest;\n}\n\nasync function bundle(bundleRequest: BundleRequest, force?: boolean): Promise<BundleRequest> {\n  const { packagePath, outputPath, isExternal } = bundleRequest;\n\n  // Rehydrate the result if not incremental.\n  if (isExternal && !force) {\n    bundleRequest.result = (await readJson(path.join(outputPath, 'result.json'))) as BundleResult;\n  }\n\n  if (bundleRequest.result?.errors?.length === 0) {\n    bundleRequest.resultFromCache = true;\n  } else {\n    bundleRequest.resultFromCache = false;\n\n    // Only use cached result if it's successful.\n    await prepareOutputPath(outputPath);\n\n    bundleRequest.result = await bundlePackage({\n      inputPath: packagePath,\n      outputPath,\n      incremental: !isExternal,\n      packages: bundleRequest.packages,\n    });\n\n    // Write the result to disk.\n    if (isExternal) {\n      bundleRequest.result.rawInput = bundleRequest.result.rawOutput = undefined;\n      await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);\n    }\n  }\n\n  return bundleRequest;\n}\n"]}
+{"version":3,"file":"bundleTask.js","sourceRoot":"","sources":["../../src/tasks/bundleTask.ts"],"names":[],"mappings":"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","sourcesContent":["import { bundlePackage } from '@ms-cloudpack/bundler';\nimport type { BundleResult } from '@ms-cloudpack/bundler-types';\nimport { bulletedList, formatPackageName, type TaskReporterTaskResult } from '@ms-cloudpack/task-reporter';\nimport { readJson, writeJson } from '@ms-cloudpack/json-utilities';\nimport path from 'path';\nimport { formatBundleErrors } from './formatBundleErrors.js';\nimport { prepareOutputPath } from '../common/prepareOutputPath.js';\nimport { reporter } from '../reporter.js';\nimport type { BundleRequest, BundleTaskOptions } from '../types.js';\n\nexport async function bundleTask({\n  bundleRequest,\n  options = {},\n}: {\n  bundleRequest: BundleRequest;\n  options?: BundleTaskOptions;\n}) {\n  const { packageName, version } = bundleRequest;\n  const { force } = options || {};\n\n  // If force is set, dispose the existing result.\n  if (force && bundleRequest?.result?.dispose) {\n    bundleRequest.result.dispose();\n    bundleRequest.result = undefined;\n  }\n\n  const { rebuild } = bundleRequest?.result || {};\n  const taskName = `${rebuild ? `Re-bundle` : `Bundle`} ${formatPackageName({ name: packageName, version })}`;\n\n  await reporter.runTask(taskName, async (): Promise<TaskReporterTaskResult> => {\n    if (rebuild) {\n      bundleRequest.result = await rebuild();\n    } else {\n      await bundle(bundleRequest, force);\n    }\n\n    const result = (bundleRequest.result ||= {});\n\n    result.outputFiles ||= [];\n    result.errors ||= [];\n    result.warnings ||= [];\n\n    if (!result.outputFiles.length) {\n      result.warnings.push({\n        text: `No output files were found for \"${packageName}\" in \"${bundleRequest.outputPath}\"`,\n      });\n    }\n\n    return {\n      status: result.errors.length ? 'fail' : 'complete',\n      ...formatBundleErrors(result.errors),\n      extended: bulletedList([\n        `Bundler: ${result.bundlerName || 'unknown'}`,\n        `Input path: ${bundleRequest.packagePath}`,\n        `Entries:\\n${bulletedList(Object.keys(result.entries || {}), 2)}`,\n        `Output path: ${bundleRequest.outputPath}`,\n        ...(result.outputFiles.length\n          ? [\n              `Output files:`,\n              result.outputFiles.map((file) => path.relative(bundleRequest.outputPath, file.outputPath)),\n            ]\n          : []),\n      ]),\n    };\n  });\n\n  return bundleRequest;\n}\n\nasync function bundle(bundleRequest: BundleRequest, force?: boolean): Promise<BundleRequest> {\n  const { packagePath, outputPath, isExternal, disableSourceMaps } = bundleRequest;\n\n  // Rehydrate the result if not incremental.\n  if (isExternal && !force) {\n    bundleRequest.result = (await readJson(path.join(outputPath, 'result.json'))) as BundleResult;\n  }\n\n  if (bundleRequest.result?.errors?.length === 0) {\n    bundleRequest.resultFromCache = true;\n  } else {\n    bundleRequest.resultFromCache = false;\n\n    // Only use cached result if it's successful.\n    await prepareOutputPath(outputPath);\n\n    bundleRequest.result = await bundlePackage({\n      inputPath: packagePath,\n      outputPath,\n      incremental: !isExternal,\n      packages: bundleRequest.packages,\n      sourcemap: disableSourceMaps ? undefined : 'linked',\n    });\n\n    // Write the result to disk.\n    if (isExternal) {\n      bundleRequest.result.rawInput = bundleRequest.result.rawOutput = undefined;\n      await writeJson(path.join(outputPath, 'result.json'), bundleRequest.result);\n    }\n  }\n\n  return bundleRequest;\n}\n"]}

package/lib/types.d.ts

@@ -1,69 +1,7 @@
-import type { ImportMap, ResolveMap } from '@ms-cloudpack/package-utilities';
+import type { ImportMap } from '@ms-cloudpack/package-utilities';
 import type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
-import type { Route } from '@ms-cloudpack/api-server';
-export interface Session {
-    /**
-     * The session id, used for identifying
-     */
-    id: string;
-    /**
-     * The primary application path to monitor.
-     */
-    appPath: string;
-    /**
-     * The type of session controls how the code is served via start.
-     * Web apps require app server and asset hosting, while libraries
-     * only need a bundle service.
-     */
-    type: 'web-app' | 'library';
-    /**
-     * The mode of the session controls how the code is bundled. Library
-     * mode bundles each package in isolation, while development and
-     * production modes bundle the full app graph together. Library
-     * mode is fastest but packages must be complaint for loading in
-     * the browser.
-     */
-    mode: 'library' | 'development' | 'production';
-    /**
-     * Used to resolve packages in the dependency graph.
-     */
-    resolveMap: ResolveMap;
-    /**
-     * Reload sequence to ensure that the client is always
-     * up to date with the latest changes.
-     */
-    sequence: number;
-    /**
-     * Get session version.
-     * Used to force a hard refresh on the client.
-     */
-    getSessionVersion: () => number;
-    /**
-     * Used to increment the session version.
-     * If version is undefined, the version will be incremented by 1.
-     * If version is greater than the current version, the version will be set to the new value.
-     */
-    incrementSessionVersion: (version?: number) => void;
-    /**
-     * The name of the project folder.
-     * Used to differentiate between multiple projects.
-     */
-    projectName: string;
-    /**
-     * The version of each target.
-     * Used to force a client cache refresh on a single target.
-     */
-    targetVersions: Record<string, number>;
-    /**
-     * Increments the version for the given target.
-     */
-    incrementTargetVersion: (inputPath: string) => void;
-    /**
-     * The import map for the session.
-     */
-    getImportMap: () => ImportMap | undefined;
-    setImportMap: (newImportMap: ImportMap) => ImportMap;
-}
+import type { Route } from '@ms-cloudpack/config';
+import type { Session } from '@ms-cloudpack/api-server';
 /**
  * Tracks a given bundle request and its result.
  */
@@ -78,6 +16,7 @@ export interface BundleRequest {
     result?: BundleResult;
     resultFromCache?: boolean;
     isRebuildRequired?: boolean;
+    disableSourceMaps?: boolean;
     packages?: PackageDefinitionsCache;
 }
 export interface BundleTaskOptions {

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap, ResolveMap } from '@ms-cloudpack/package-utilities';\nimport type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { Route } from '@ms-cloudpack/api-server';\n\nexport interface Session {\n  /**\n   * The session id, used for identifying\n   */\n  id: string;\n\n  /**\n   * The primary application path to monitor.\n   */\n  appPath: string;\n\n  /**\n   * The type of session controls how the code is served via start.\n   * Web apps require app server and asset hosting, while libraries\n   * only need a bundle service.\n   */\n  type: 'web-app' | 'library';\n\n  /**\n   * The mode of the session controls how the code is bundled. Library\n   * mode bundles each package in isolation, while development and\n   * production modes bundle the full app graph together. Library\n   * mode is fastest but packages must be complaint for loading in\n   * the browser.\n   */\n  mode: 'library' | 'development' | 'production';\n\n  /**\n   * Used to resolve packages in the dependency graph.\n   */\n  resolveMap: ResolveMap;\n\n  /**\n   * Reload sequence to ensure that the client is always\n   * up to date with the latest changes.\n   */\n  sequence: number;\n\n  /**\n   * Get session version.\n   * Used to force a hard refresh on the client.\n   */\n  getSessionVersion: () => number;\n\n  /**\n   * Used to increment the session version.\n   * If version is undefined, the version will be incremented by 1.\n   * If version is greater than the current version, the version will be set to the new value.\n   */\n  incrementSessionVersion: (version?: number) => void;\n\n  /**\n   * The name of the project folder.\n   * Used to differentiate between multiple projects.\n   */\n  projectName: string;\n\n  /**\n   * The version of each target.\n   * Used to force a client cache refresh on a single target.\n   */\n  targetVersions: Record<string, number>;\n\n  /**\n   * Increments the version for the given target.\n   */\n  incrementTargetVersion: (inputPath: string) => void;\n\n  /**\n   * The import map for the session.\n   */\n  getImportMap: () => ImportMap | undefined;\n\n  setImportMap: (newImportMap: ImportMap) => ImportMap;\n}\n\n/**\n * Tracks a given bundle request and its result.\n */\nexport interface BundleRequest {\n  id: string;\n  packageName: string;\n  version: string;\n  packagePath: string;\n  outputPath: string;\n  isExternal: boolean;\n  bundlerType?: string;\n  result?: BundleResult;\n  resultFromCache?: boolean;\n  isRebuildRequired?: boolean;\n  packages?: PackageDefinitionsCache;\n}\n\nexport interface BundleTaskOptions {\n  force?: boolean;\n}\n\nexport interface BundleServer {\n  url: string;\n  port: number;\n  close: () => Promise<void>;\n}\n\nexport interface PackageOverride {\n  name: string;\n  versionRequirement: string;\n  isInternal?: boolean;\n  overrides: PackageJson;\n}\n\nexport interface Watcher {\n  watch: (bundleRequest: BundleRequest) => void;\n}\n\n/**\n * The input options for a createHtml custom server render function.\n */\nexport type CreateHtmlOptions = {\n  session: Session;\n  route: Route;\n  baseUrl: string;\n  definition: PackageJson;\n  importMap: ImportMap;\n  overlayScript: string | undefined;\n  entryScript: string | undefined;\n  inlineScripts: string[];\n};\n\n/**\n * The expected result of the createHtml custom server render function.\n */\nexport type CreateHtmlResult =\n  | string\n  | {\n      html: string;\n      statusCode: number;\n    };\n\n/**\n * A custom server render function that can be used to override the default HTML response.\n */\nexport type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;\n\n/**\n * The expected shape of the createHtml custom server render function script.\n */\nexport type CreateHtmlScript = { default: CreateHtmlFunction };\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ImportMap } from '@ms-cloudpack/package-utilities';\nimport type { BundleResult, PackageJson, PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { Route } from '@ms-cloudpack/config';\nimport type { Session } from '@ms-cloudpack/api-server';\n\n/**\n * Tracks a given bundle request and its result.\n */\nexport interface BundleRequest {\n  id: string;\n  packageName: string;\n  version: string;\n  packagePath: string;\n  outputPath: string;\n  isExternal: boolean;\n  bundlerType?: string;\n  result?: BundleResult;\n  resultFromCache?: boolean;\n  isRebuildRequired?: boolean;\n  disableSourceMaps?: boolean;\n  packages?: PackageDefinitionsCache;\n}\n\nexport interface BundleTaskOptions {\n  force?: boolean;\n}\n\nexport interface BundleServer {\n  url: string;\n  port: number;\n  close: () => Promise<void>;\n}\n\nexport interface PackageOverride {\n  name: string;\n  versionRequirement: string;\n  isInternal?: boolean;\n  overrides: PackageJson;\n}\n\nexport interface Watcher {\n  watch: (bundleRequest: BundleRequest) => void;\n}\n\n/**\n * The input options for a createHtml custom server render function.\n */\nexport type CreateHtmlOptions = {\n  session: Session;\n  route: Route;\n  baseUrl: string;\n  definition: PackageJson;\n  importMap: ImportMap;\n  overlayScript: string | undefined;\n  entryScript: string | undefined;\n  inlineScripts: string[];\n};\n\n/**\n * The expected result of the createHtml custom server render function.\n */\nexport type CreateHtmlResult =\n  | string\n  | {\n      html: string;\n      statusCode: number;\n    };\n\n/**\n * A custom server render function that can be used to override the default HTML response.\n */\nexport type CreateHtmlFunction = (options: CreateHtmlOptions) => Promise<CreateHtmlResult> | CreateHtmlResult;\n\n/**\n * The expected shape of the createHtml custom server render function script.\n */\nexport type CreateHtmlScript = { default: CreateHtmlFunction };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -16,14 +16,14 @@
     "cloudpack": "./bin/cloudpack.js"
   },
   "dependencies": {
-    "@ms-cloudpack/api-server": "^0.2.0",
-    "@ms-cloudpack/bundler": "^0.11.18",
-    "@ms-cloudpack/config": "^0.2.0",
+    "@ms-cloudpack/api-server": "^0.3.0",
+    "@ms-cloudpack/bundler": "^0.11.19",
+    "@ms-cloudpack/config": "^0.3.0",
     "@ms-cloudpack/create-express-app": "^1.3.0",
     "@ms-cloudpack/data-bus": "^0.1.1",
     "@ms-cloudpack/json-utilities": "^0.0.5",
     "@ms-cloudpack/overlay": "^0.13.0",
-    "@ms-cloudpack/package-utilities": "^2.3.10",
+    "@ms-cloudpack/package-utilities": "^2.3.11",
     "@ms-cloudpack/path-utilities": "^2.1.1",
     "@ms-cloudpack/path-string-parsing": "^1.0.1",
     "@ms-cloudpack/task-reporter": "^0.3.0",