@ms-cloudpack/cli 0.47.6 → 0.47.8

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;GAEG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,WAAW,CAAC,CAyGvB"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAO1D;;GAEG;AACH,wBAAsB,IAAI,CAAC,UAAU,EAAE;IACrC,OAAO,EAAE,WAAW,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,WAAW,CAAC,CA2GvB"}

package/lib/commands/init/init.js

@@ -30,7 +30,7 @@ export async function init(parameters) {
     const generatedConfig = config.generated;
     // Ensure generatedConfig.packageSettings is initialized.
     generatedConfig.packageSettings ??= [];
-    return new Promise((resolve, reject) => {
+    const summary = await new Promise((resolve, reject) => {
         let pending = 0;
         const visitedSet = new Set();
         // Create a function to enqueue more paths.
@@ -40,57 +40,57 @@ export async function init(parameters) {
             }
             // Iterate through the given paths.
             for (const path of newPaths) {
-                if (!visitedSet.has(path)) {
-                    const shouldForce = refreshPaths.delete(path);
-                    visitedSet.add(path);
-                    pending++;
-                    // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.
-                    evaluatePath({
-                        packagePath: path,
-                        generatedConfig,
-                        telemetryClient,
-                        resolveMap,
-                        shouldForce,
-                        initOptions: options,
-                        summaryData,
-                        ctx,
-                    })
-                        .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {
-                        pending--;
-                        if (shouldExit) {
-                            isExitingPrematurely = true;
-                        }
-                        if (!isExitingPrematurely && pathsToEvaluate?.size) {
-                            // If there are paths that need to be rebuilt, add them to the refresh set so that on re-enqueuing
-                            // we pass the `shouldRerun` flag through
-                            pathsToRefresh?.forEach((refreshPath) => {
-                                refreshPaths.add(refreshPath);
-                                visitedSet.delete(refreshPath);
-                            });
-                            // Try to enqueue the new paths.
-                            enqueuePaths(Array.from(pathsToEvaluate));
-                        }
-                        // If nothing is pending after this call, we're complete.
-                        if (!pending) {
-                            resolve(summaryData.summarize());
-                        }
-                    })
-                        .catch((error) => {
-                        reject(error);
-                    });
+                if (visitedSet.has(path)) {
+                    continue;
                 }
+                const shouldForce = refreshPaths.delete(path);
+                visitedSet.add(path);
+                pending++;
+                // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.
+                evaluatePath({
+                    packagePath: path,
+                    generatedConfig,
+                    telemetryClient,
+                    resolveMap,
+                    shouldForce,
+                    initOptions: options,
+                    summaryData,
+                    ctx,
+                })
+                    .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {
+                    pending--;
+                    if (shouldExit) {
+                        isExitingPrematurely = true;
+                    }
+                    if (!isExitingPrematurely && pathsToEvaluate?.size) {
+                        // If there are paths that need to be rebuilt, add them to the refresh set so that on re-enqueuing
+                        // we pass the `shouldRerun` flag through
+                        pathsToRefresh?.forEach((refreshPath) => {
+                            refreshPaths.add(refreshPath);
+                            visitedSet.delete(refreshPath);
+                        });
+                        // Try to enqueue the new paths.
+                        enqueuePaths(Array.from(pathsToEvaluate));
+                    }
+                    // If nothing is pending after this call, we're complete.
+                    if (!pending) {
+                        resolve(summaryData.summarize());
+                    }
+                })
+                    .catch((error) => {
+                    reject(error);
+                });
             }
         }
         // Start with the app path.
         enqueuePaths([appPath]);
-    }).then(async (summary) => {
-        const { totalChanges } = summary;
-        if (!options.check && totalChanges && generatedConfig.packageSettings?.length) {
-            sortExportKeys(generatedConfig);
-            await writeGeneratedConfig(generatedConfig, appPath);
-        }
-        return summary;
     });
+    const { totalChanges } = summary;
+    if (!options.check && totalChanges && generatedConfig.packageSettings?.length) {
+        sortExportKeys(generatedConfig);
+        await writeGeneratedConfig(generatedConfig, appPath);
+    }
+    return summary;
 }
 function sortExportKeys({ packageSettings = [] }) {
     for (const settings of packageSettings) {

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

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageJsonExportsObject, PackageJsonExportsValue } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, GeneratedConfig } from '@ms-cloudpack/config';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server/apis';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  appPath: string;\n  config: CloudpackConfig;\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  telemetryClient: TelemetryClient;\n}): Promise<InitSummary> {\n  const { options, appPath, config, reporter, autoDispose, telemetryClient } = parameters;\n  let isExitingPrematurely = false;\n\n  // Don't allow --check and --reset together.\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const summaryData = new InitSummaryData();\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      appPath,\n      config,\n      reporter,\n      telemetryClient,\n      items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],\n    }),\n  );\n  const { session } = ctx;\n  const { resolveMap } = session;\n  const refreshPaths = new Set<string>();\n  const generatedConfig = config.generated;\n\n  // Ensure generatedConfig.packageSettings is initialized.\n  generatedConfig.packageSettings ??= [];\n\n  return new Promise<InitSummary>((resolve, reject) => {\n    let pending = 0;\n    const visitedSet = new Set<string>();\n\n    // Create a function to enqueue more paths.\n    function enqueuePaths(newPaths: string[]) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const path of newPaths) {\n        if (!visitedSet.has(path)) {\n          const shouldForce = refreshPaths.delete(path);\n\n          visitedSet.add(path);\n          pending++;\n\n          // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n          evaluatePath({\n            packagePath: path,\n            generatedConfig,\n            telemetryClient,\n            resolveMap,\n            shouldForce,\n            initOptions: options,\n            summaryData,\n            ctx,\n          })\n            .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n              pending--;\n\n              if (shouldExit) {\n                isExitingPrematurely = true;\n              }\n\n              if (!isExitingPrematurely && pathsToEvaluate?.size) {\n                // If there are paths that need to be rebuilt, add them to the refresh set so that on re-enqueuing\n                // we pass the `shouldRerun` flag through\n                pathsToRefresh?.forEach((refreshPath) => {\n                  refreshPaths.add(refreshPath);\n                  visitedSet.delete(refreshPath);\n                });\n\n                // Try to enqueue the new paths.\n                enqueuePaths(Array.from(pathsToEvaluate));\n              }\n\n              // If nothing is pending after this call, we're complete.\n              if (!pending) {\n                resolve(summaryData.summarize());\n              }\n            })\n            .catch((error) => {\n              reject(error);\n            });\n        }\n      }\n    }\n\n    // Start with the app path.\n    enqueuePaths([appPath]);\n  }).then(async (summary: InitSummary) => {\n    const { totalChanges } = summary;\n\n    if (!options.check && totalChanges && generatedConfig.packageSettings?.length) {\n      sortExportKeys(generatedConfig);\n\n      await writeGeneratedConfig(generatedConfig, appPath);\n    }\n\n    return summary;\n  });\n}\n\nfunction sortExportKeys({ packageSettings = [] }: GeneratedConfig) {\n  for (const settings of packageSettings) {\n    if (settings.exports) {\n      const unsortedExports = settings.exports as Record<string, PackageJsonExportsValue>;\n      const sortedKeys = Object.keys(settings.exports).sort();\n\n      settings.exports = sortedKeys.reduce((p, n) => {\n        p[n] = unsortedExports[n];\n        return p;\n      }, {} as PackageJsonExportsObject);\n    }\n  }\n}\n"]}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/init/init.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PackageJsonExportsObject, PackageJsonExportsValue } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig, GeneratedConfig } from '@ms-cloudpack/config';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { TelemetryClient } from '@ms-cloudpack/telemetry';\nimport type { AutoDispose } from '../../types/AutoDispose.js';\nimport type { InitOptions } from './types/InitOptions.js';\nimport type { InitSummary } from './types/InitSummary.js';\n\nimport { createPartialApiContext } from '@ms-cloudpack/api-server/apis';\nimport { writeGeneratedConfig } from '@ms-cloudpack/config';\nimport { InitSummaryData } from './InitSummaryData.js';\nimport { evaluatePath } from './evaluatePath.js';\n\n/**\n * Init execution function.\n */\nexport async function init(parameters: {\n  options: InitOptions;\n  appPath: string;\n  config: CloudpackConfig;\n  autoDispose: AutoDispose;\n  reporter: TaskReporter;\n  telemetryClient: TelemetryClient;\n}): Promise<InitSummary> {\n  const { options, appPath, config, reporter, autoDispose, telemetryClient } = parameters;\n  let isExitingPrematurely = false;\n\n  // Don't allow --check and --reset together.\n  if (options.check && options.reset) {\n    throw Error('Cannot use --check and --reset together.');\n  }\n\n  // If --reset is specified, reset the generated config.\n  if (options.reset) {\n    config.generated = {};\n  }\n\n  const summaryData = new InitSummaryData();\n  const [ctx] = autoDispose(\n    await createPartialApiContext({\n      appPath,\n      config,\n      reporter,\n      telemetryClient,\n      items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],\n    }),\n  );\n  const { session } = ctx;\n  const { resolveMap } = session;\n  const refreshPaths = new Set<string>();\n  const generatedConfig = config.generated;\n\n  // Ensure generatedConfig.packageSettings is initialized.\n  generatedConfig.packageSettings ??= [];\n\n  const summary = await new Promise<InitSummary>((resolve, reject) => {\n    let pending = 0;\n    const visitedSet = new Set<string>();\n\n    // Create a function to enqueue more paths.\n    function enqueuePaths(newPaths: string[]) {\n      if (isExitingPrematurely) {\n        return;\n      }\n\n      // Iterate through the given paths.\n      for (const path of newPaths) {\n        if (visitedSet.has(path)) {\n          continue;\n        }\n\n        const shouldForce = refreshPaths.delete(path);\n\n        visitedSet.add(path);\n        pending++;\n\n        // Evaluate this path, but don't await - when we're done, we'll re-enqueue newly discovered paths.\n        evaluatePath({\n          packagePath: path,\n          generatedConfig,\n          telemetryClient,\n          resolveMap,\n          shouldForce,\n          initOptions: options,\n          summaryData,\n          ctx,\n        })\n          .then(({ pathsToEvaluate, pathsToRefresh, shouldExit }) => {\n            pending--;\n\n            if (shouldExit) {\n              isExitingPrematurely = true;\n            }\n\n            if (!isExitingPrematurely && pathsToEvaluate?.size) {\n              // If there are paths that need to be rebuilt, add them to the refresh set so that on re-enqueuing\n              // we pass the `shouldRerun` flag through\n              pathsToRefresh?.forEach((refreshPath) => {\n                refreshPaths.add(refreshPath);\n                visitedSet.delete(refreshPath);\n              });\n\n              // Try to enqueue the new paths.\n              enqueuePaths(Array.from(pathsToEvaluate));\n            }\n\n            // If nothing is pending after this call, we're complete.\n            if (!pending) {\n              resolve(summaryData.summarize());\n            }\n          })\n          .catch((error) => {\n            reject(error);\n          });\n      }\n    }\n\n    // Start with the app path.\n    enqueuePaths([appPath]);\n  });\n\n  const { totalChanges } = summary;\n\n  if (!options.check && totalChanges && generatedConfig.packageSettings?.length) {\n    sortExportKeys(generatedConfig);\n\n    await writeGeneratedConfig(generatedConfig, appPath);\n  }\n\n  return summary;\n}\n\nfunction sortExportKeys({ packageSettings = [] }: GeneratedConfig) {\n  for (const settings of packageSettings) {\n    if (settings.exports) {\n      const unsortedExports = settings.exports as Record<string, PackageJsonExportsValue>;\n      const sortedKeys = Object.keys(settings.exports).sort();\n\n      settings.exports = sortedKeys.reduce((p, n) => {\n        p[n] = unsortedExports[n];\n        return p;\n      }, {} as PackageJsonExportsObject);\n    }\n  }\n}\n"]}

package/lib/commands/start/execute.js

@@ -9,7 +9,7 @@ import { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performanc
 import { getStartingAppPath } from './getStartingAppPath.js';
 import { mergeFeatures } from './mergeFeatures.js';
 import { openBrowser } from './openBrowser.js';
-import { runPrereqs } from './runPrereqs.js';
+import { runPrerequisites } from '../../common/runPrerequisites.js';
 let cleanupFunctions = [];
 /** Stop all started cloudpack instances, for testing */
 export async function stopServers() {
@@ -39,7 +39,7 @@ export const execute = async ({ options, cwd, initialize, reporter, autoDispose
     const { config, telemetryClient } = await initialize(appPath);
     console.log('App path:', yellow(appPath));
     process.chdir(appPath);
-    runPrereqs(config, appPath);
+    runPrerequisites(config, appPath);
     // Merge in any additional features from the command line.
     config.features = mergeFeatures({
         configFeatures: config.features,

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

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { StartOptions } from './types/StartOptions.js';\n\nimport { createBundleRequestForPackage, createBundleTask, createSession } from '@ms-cloudpack/api-server';\nimport { createPackageDefinitions } from '@ms-cloudpack/config';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { findResolveMapEntry, resolve } from '@ms-cloudpack/package-utilities';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { getStartingAppPath } from './getStartingAppPath.js';\nimport { mergeFeatures } from './mergeFeatures.js';\nimport { openBrowser } from './openBrowser.js';\nimport { runPrereqs } from './runPrereqs.js';\n\nlet cleanupFunctions: Array<() => Promise<void>> = [];\n\n/** Stop all started cloudpack instances, for testing */\nexport async function stopServers() {\n  for (const func of cleanupFunctions) {\n    await func();\n  }\n  cleanupFunctions = [];\n}\n\nasync function createAppBundleTask(\n  options: { packageName: string },\n  context: { session: Session; config: CloudpackConfig; packages: PackageDefinitionsCache },\n) {\n  const { packageName } = options;\n  const { session } = context;\n  const packageEntry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n  });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${packageName} in the resolve map.`);\n  }\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, context);\n\n  return createBundleTask(bundleRequest);\n}\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async ({ options, cwd, initialize, reporter, autoDispose }) => {\n  const appPath = await getStartingAppPath(cwd, options.app);\n  const { config, telemetryClient } = await initialize(appPath);\n\n  console.log('App path:', yellow(appPath));\n\n  process.chdir(appPath);\n\n  runPrereqs(config, appPath);\n\n  // Merge in any additional features from the command line.\n  config.features = mergeFeatures({\n    configFeatures: config.features,\n    commandLineFeatures: options.features,\n  });\n\n  const enabledFeatureNames = Object.entries(config.features)\n    .filter(([, value]) => value)\n    .map(([key]) => key);\n\n  if (enabledFeatureNames.length) {\n    console.log(`Enabled features: ${enabledFeatureNames.map((f) => yellow(f)).join(', ')}`);\n  }\n\n  // Initialize package overrides.\n  const packages = createPackageDefinitions({ config });\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.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(\n    {\n      appPath,\n      config,\n      overlayPath: await resolve('@ms-cloudpack/overlay', path.dirname(fileURLToPath(import.meta.url))),\n    },\n    { reporter, packages },\n  );\n\n  // Set shared telemetry attributes which will be sent with all telemetry events.\n  telemetryClient.setSharedSpanAttribute('sessionId', session.id);\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  const { startApiServer } = await import('@ms-cloudpack/api-server');\n\n  // Start api server for tracking status and handling remote requests.\n  const apiServer = await startApiServer({\n    session,\n    telemetryClient,\n    reporter,\n    packages,\n  });\n\n  // Kick off bundling app package as soon as api server is ready.\n  void apiServer.addTask(await createAppBundleTask({ packageName: definition.name }, { session, config, packages }));\n\n  // Then start bundle and app servers for hosting the app.\n  const { startBundleServer } = await import('./startBundleServer.js');\n  const bundleServer = await startBundleServer({ apiServer, session, reporter, packages });\n\n  // Finally start the app server.\n  const { startAppServer } = await import('./appServer/startAppServer.js');\n  const appServer = await startAppServer({\n    session,\n    definition,\n    bundleServer,\n    apiServer,\n    config,\n    reporter,\n    packages,\n  });\n\n  const cleanup = async () => {\n    const servers = [\n      ['appServer', appServer] as const,\n      ['apiServer', apiServer] as const,\n      ['bundleServer', bundleServer] as const,\n    ];\n\n    await Promise.all(\n      servers.map(async ([name, server]) => {\n        console.info(`Closing ${name}: ${server.url}`);\n        try {\n          await server.close();\n          console.info(`Closed ${name}: ${server.url}`);\n        } catch (err) {\n          console.warn('Error closing server:', err);\n        }\n      }),\n    );\n  };\n\n  autoDispose({\n    dispose: cleanup,\n  });\n\n  cleanupFunctions.push(cleanup);\n\n  const url = appServer.url;\n\n  performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n\n  // Open the browser.\n  if (options.open !== false) {\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  } else {\n    console.log('Please open the browser manually to:', url);\n  }\n};\n\n// cspell:ignore Prereqs\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/start/execute.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Session } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport type { StartOptions } from './types/StartOptions.js';\n\nimport { createBundleRequestForPackage, createBundleTask, createSession } from '@ms-cloudpack/api-server';\nimport { createPackageDefinitions } from '@ms-cloudpack/config';\nimport { writeJson } from '@ms-cloudpack/json-utilities';\nimport { findResolveMapEntry, resolve } from '@ms-cloudpack/package-utilities';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport path from 'path';\nimport { fileURLToPath } from 'url';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { getStartingAppPath } from './getStartingAppPath.js';\nimport { mergeFeatures } from './mergeFeatures.js';\nimport { openBrowser } from './openBrowser.js';\nimport { runPrerequisites } from '../../common/runPrerequisites.js';\n\nlet cleanupFunctions: Array<() => Promise<void>> = [];\n\n/** Stop all started cloudpack instances, for testing */\nexport async function stopServers() {\n  for (const func of cleanupFunctions) {\n    await func();\n  }\n  cleanupFunctions = [];\n}\n\nasync function createAppBundleTask(\n  options: { packageName: string },\n  context: { session: Session; config: CloudpackConfig; packages: PackageDefinitionsCache },\n) {\n  const { packageName } = options;\n  const { session } = context;\n  const packageEntry = findResolveMapEntry({\n    packageName,\n    resolveMap: session.resolveMap,\n  });\n\n  if (!packageEntry) {\n    throw new Error(`Could not find package ${packageName} in the resolve map.`);\n  }\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, context);\n\n  return createBundleTask(bundleRequest);\n}\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport const execute: CommandAction<StartOptions> = async ({ options, cwd, initialize, reporter, autoDispose }) => {\n  const appPath = await getStartingAppPath(cwd, options.app);\n  const { config, telemetryClient } = await initialize(appPath);\n\n  console.log('App path:', yellow(appPath));\n\n  process.chdir(appPath);\n\n  runPrerequisites(config, appPath);\n\n  // Merge in any additional features from the command line.\n  config.features = mergeFeatures({\n    configFeatures: config.features,\n    commandLineFeatures: options.features,\n  });\n\n  const enabledFeatureNames = Object.entries(config.features)\n    .filter(([, value]) => value)\n    .map(([key]) => key);\n\n  if (enabledFeatureNames.length) {\n    console.log(`Enabled features: ${enabledFeatureNames.map((f) => yellow(f)).join(', ')}`);\n  }\n\n  // Initialize package overrides.\n  const packages = createPackageDefinitions({ config });\n\n  // Make sure the package has a valid definition.\n  const definition = await packages.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(\n    {\n      appPath,\n      config,\n      overlayPath: await resolve('@ms-cloudpack/overlay', path.dirname(fileURLToPath(import.meta.url))),\n    },\n    { reporter, packages },\n  );\n\n  // Set shared telemetry attributes which will be sent with all telemetry events.\n  telemetryClient.setSharedSpanAttribute('sessionId', session.id);\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  const { startApiServer } = await import('@ms-cloudpack/api-server');\n\n  // Start api server for tracking status and handling remote requests.\n  const apiServer = await startApiServer({\n    session,\n    telemetryClient,\n    reporter,\n    packages,\n  });\n\n  // Kick off bundling app package as soon as api server is ready.\n  void apiServer.addTask(await createAppBundleTask({ packageName: definition.name }, { session, config, packages }));\n\n  // Then start bundle and app servers for hosting the app.\n  const { startBundleServer } = await import('./startBundleServer.js');\n  const bundleServer = await startBundleServer({ apiServer, session, reporter, packages });\n\n  // Finally start the app server.\n  const { startAppServer } = await import('./appServer/startAppServer.js');\n  const appServer = await startAppServer({\n    session,\n    definition,\n    bundleServer,\n    apiServer,\n    config,\n    reporter,\n    packages,\n  });\n\n  const cleanup = async () => {\n    const servers = [\n      ['appServer', appServer] as const,\n      ['apiServer', apiServer] as const,\n      ['bundleServer', bundleServer] as const,\n    ];\n\n    await Promise.all(\n      servers.map(async ([name, server]) => {\n        console.info(`Closing ${name}: ${server.url}`);\n        try {\n          await server.close();\n          console.info(`Closed ${name}: ${server.url}`);\n        } catch (err) {\n          console.warn('Error closing server:', err);\n        }\n      }),\n    );\n  };\n\n  autoDispose({\n    dispose: cleanup,\n  });\n\n  cleanupFunctions.push(cleanup);\n\n  const url = appServer.url;\n\n  performance.measure(PerfMeasurementOpenBrowser, PerfMarkerCliEntry);\n\n  // Open the browser.\n  if (options.open !== false) {\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  } else {\n    console.log('Please open the browser manually to:', url);\n  }\n};\n\n// cspell:ignore Prereqs\n"]}

package/lib/commands/start/startBundleServer.js

@@ -5,7 +5,7 @@ import { isFolder } from '@ms-cloudpack/path-utilities';
 import path from 'path';
 import { createBundleTask, createBundleRequestForPackage, parseRequestInfo } from '@ms-cloudpack/api-server';
 import { fileURLToPath } from 'url';
-const currentPath = fileURLToPath(import.meta.url);
+const currentFolder = path.dirname(fileURLToPath(import.meta.url));
 /**
  * The bundle server handles package requests and returns bundled resources.
  * Resources are bundled on demand and cached locally to avoid re-bundling
@@ -67,46 +67,43 @@ async function handleRequest(options, context) {
         if (fullPath.length < packageEntry.path.length) {
             console.debug(`Response (400): "${packageName}@${version}${filePath}"`);
             res.status(400).send(`Invalid file path.`);
-            return;
         }
-        console.debug(`Unbundled response returning: "${packageName}@${version}${filePath}"`);
-        // If the package is external, set cache headers.
-        if (isExternalPackage(packageEntry.path)) {
-            res.setHeader('Cache-Control', 'public, max-age=31536000');
+        else {
+            console.debug(`Unbundled response returning: "${packageName}@${version}${filePath}"`);
+            // If the package is external, set cache headers.
+            if (isExternalPackage(packageEntry.path)) {
+                res.setHeader('Cache-Control', 'public, max-age=31536000');
+            }
+            res.sendFile(path.join(packageEntry.path, filePath));
         }
-        res.sendFile(path.join(packageEntry.path, filePath));
         return;
     }
     const bundleRequest = await createBundleRequestForPackage({ packageEntry }, { config, packages });
     // Set up for bundling.
-    const rerun = !(await isFolder(bundleRequest.outputPath)) || force;
+    const rerun = force || !(await isFolder(bundleRequest.outputPath));
+    let hasError = false;
     if (features.enableLage) {
         console.debug(`Trying to bundle "${packageName}@${version}" with lage task scheduler`);
         try {
             await apiServer.scheduleTask(bundleRequest, {
-                // TODO: we may want to have away to let users add more types of tasks here
-                bundle: path.resolve(currentPath, '../../../tasks/bundleTaskWorker.js'),
+                // TODO: we may want to have a way to let users add more types of tasks here
+                bundle: path.resolve(currentFolder, '../../tasks/bundleTaskWorker.js'),
             }, { rerun });
-            console.debug(`Bundle returning: "${packageName}@${version}${filePath}"`);
-            // Try to return the result.
-            if (bundleRequest.isExternal) {
-                res.setHeader('Cache-Control', 'public, max-age=31536000');
-            }
-            return res.sendFile(path.join(bundleRequest.outputPath, filePath));
         }
         catch (err) {
-            return res.status(500).type('json').send(bundleRequest);
+            console.error(`Error bundling "${packageName}@${version}": ${err}`);
+            hasError = true;
         }
     }
-    console.debug(`Trying to bundle "${packageName}@${version}"`);
-    const bundleTask = createBundleTask(bundleRequest, { force }, reporter);
-    await apiServer.addTask(bundleTask, { rerun });
-    // At this point we should have a Task completed.
-    if ((bundleRequest.result?.errors?.length || 0) > 0) {
-        res.status(500).type('json').send(bundleRequest);
-    }
     else {
-        if (features.enqueueDependencies && bundleRequest.result?.imports) {
+        console.debug(`Trying to bundle "${packageName}@${version}"`);
+        const bundleTask = createBundleTask(bundleRequest, { force }, reporter);
+        await apiServer.addTask(bundleTask, { rerun });
+        // At this point we should have a Task completed.
+        if (bundleRequest.result?.errors?.length) {
+            hasError = true;
+        }
+        else if (features.enqueueDependencies && bundleRequest.result?.imports) {
             // Enqueue all dependencies to be bundled.
             for (const dependency of Object.keys(bundleRequest.result.imports)) {
                 const dependencyBundleRequest = await createBundleRequestForPackage({ packageEntry: resolveMap[dependency] }, { ...context, config });
@@ -114,6 +111,11 @@ async function handleRequest(options, context) {
                 void apiServer.addTask(createBundleTask(dependencyBundleRequest, { force }, reporter));
             }
         }
+    }
+    if (hasError) {
+        res.status(500).type('json').send(bundleRequest);
+    }
+    else {
         console.debug(`Bundle returning: "${packageName}@${version}${filePath}"`);
         // Try to return the result.
         if (bundleRequest.isExternal) {

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 type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { createExpressApp, type Express, type Request, type Response } from '@ms-cloudpack/create-express-app';\nimport { isExternalPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport type { BundleServer } from '../../types/BundleServer.js';\nimport { createBundleTask, createBundleRequestForPackage, parseRequestInfo } from '@ms-cloudpack/api-server';\nimport { fileURLToPath } from 'url';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nconst currentPath = fileURLToPath(import.meta.url);\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(options: {\n  apiServer: ApiServer;\n  session: Session;\n  reporter: TaskReporter;\n  packages: PackageDefinitionsCache;\n}): Promise<BundleServer> {\n  const { apiServer, session, reporter, packages } = options;\n  const { config } = session;\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, reporter, packages }).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(\n  options: {\n    req: Request;\n    res: Response;\n  },\n  context: {\n    session: Session;\n    apiServer: ApiServer;\n    reporter: TaskReporter;\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { req, res } = options;\n  const { session, apiServer, reporter, packages } = context;\n  const { resolveMap, config } = session;\n  const { features = {} } = config;\n  const requestPath = slash(req.path.substring(1));\n  const force = req.query.force !== undefined;\n  const { packageName, version, bundled, filePath } = parseRequestInfo(requestPath);\n  const packageEntry = findResolveMapEntry({ packageName, version, resolveMap });\n\n  if (!packageEntry) {\n    // If the package is missing, invalid arguments.\n    console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n    res.status(404).send(`Unrecognized package \"${packageName}\".`);\n    return;\n  }\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    res.redirect(`/${packageName}@${packageEntry.version}${filePath}`);\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(packageEntry.path, filePath);\n\n    if (fullPath.length < packageEntry.path.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(packageEntry.path)) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    res.sendFile(path.join(packageEntry.path, filePath));\n    return;\n  }\n\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, { config, packages });\n\n  // Set up for bundling.\n  const rerun = !(await isFolder(bundleRequest.outputPath)) || force;\n\n  if (features.enableLage) {\n    console.debug(`Trying to bundle \"${packageName}@${version}\" with lage task scheduler`);\n\n    try {\n      await apiServer.scheduleTask(\n        bundleRequest,\n        {\n          // TODO: we may want to have away to let users add more types of tasks here\n          bundle: path.resolve(currentPath, '../../../tasks/bundleTaskWorker.js'),\n        },\n        { rerun },\n      );\n\n      console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n      // Try to return the result.\n      if (bundleRequest.isExternal) {\n        res.setHeader('Cache-Control', 'public, max-age=31536000');\n      }\n\n      return res.sendFile(path.join(bundleRequest.outputPath, filePath));\n    } catch (err) {\n      return res.status(500).type('json').send(bundleRequest);\n    }\n  }\n\n  console.debug(`Trying to bundle \"${packageName}@${version}\"`);\n\n  const bundleTask = createBundleTask(bundleRequest, { force }, reporter);\n  await apiServer.addTask(bundleTask, { rerun });\n\n  // At this point we should have a Task completed.\n  if ((bundleRequest.result?.errors?.length || 0) > 0) {\n    res.status(500).type('json').send(bundleRequest);\n  } else {\n    if (features.enqueueDependencies && bundleRequest.result?.imports) {\n      // Enqueue all dependencies to be bundled.\n      for (const dependency of Object.keys(bundleRequest.result.imports)) {\n        const dependencyBundleRequest = await createBundleRequestForPackage(\n          { packageEntry: resolveMap[dependency] },\n          { ...context, config },\n        );\n\n        // No need to await, we don't want to wait until the bundle is completed.\n        void apiServer.addTask(createBundleTask(dependencyBundleRequest, { force }, reporter));\n      }\n    }\n\n    console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n    // Try to return the result.\n    if (bundleRequest.isExternal) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    // The below header is need to be able to track the browser cache hit ratio.\n    res.setHeader('Timing-Allow-Origin', '*');\n\n    res.sendFile(path.join(bundleRequest.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 type { ApiServer, Session } from '@ms-cloudpack/api-server';\nimport { createExpressApp, type Express, type Request, type Response } from '@ms-cloudpack/create-express-app';\nimport { isExternalPackage, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { isFolder } from '@ms-cloudpack/path-utilities';\nimport path from 'path';\nimport type { BundleServer } from '../../types/BundleServer.js';\nimport { createBundleTask, createBundleRequestForPackage, parseRequestInfo } from '@ms-cloudpack/api-server';\nimport { fileURLToPath } from 'url';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nconst currentFolder = path.dirname(fileURLToPath(import.meta.url));\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(options: {\n  apiServer: ApiServer;\n  session: Session;\n  reporter: TaskReporter;\n  packages: PackageDefinitionsCache;\n}): Promise<BundleServer> {\n  const { apiServer, session, reporter, packages } = options;\n  const { config } = session;\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, reporter, packages }).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(\n  options: {\n    req: Request;\n    res: Response;\n  },\n  context: {\n    session: Session;\n    apiServer: ApiServer;\n    reporter: TaskReporter;\n    packages: PackageDefinitionsCache;\n  },\n) {\n  const { req, res } = options;\n  const { session, apiServer, reporter, packages } = context;\n  const { resolveMap, config } = session;\n  const { features = {} } = config;\n  const requestPath = slash(req.path.substring(1));\n  const force = req.query.force !== undefined;\n  const { packageName, version, bundled, filePath } = parseRequestInfo(requestPath);\n  const packageEntry = findResolveMapEntry({ packageName, version, resolveMap });\n\n  if (!packageEntry) {\n    // If the package is missing, invalid arguments.\n    console.debug(`Response (404): Unrecognized package \"${packageName}\"`);\n    res.status(404).send(`Unrecognized package \"${packageName}\".`);\n    return;\n  }\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    res.redirect(`/${packageName}@${packageEntry.version}${filePath}`);\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(packageEntry.path, filePath);\n\n    if (fullPath.length < packageEntry.path.length) {\n      console.debug(`Response (400): \"${packageName}@${version}${filePath}\"`);\n\n      res.status(400).send(`Invalid file path.`);\n    } else {\n      console.debug(`Unbundled response returning: \"${packageName}@${version}${filePath}\"`);\n      // If the package is external, set cache headers.\n      if (isExternalPackage(packageEntry.path)) {\n        res.setHeader('Cache-Control', 'public, max-age=31536000');\n      }\n\n      res.sendFile(path.join(packageEntry.path, filePath));\n    }\n    return;\n  }\n\n  const bundleRequest = await createBundleRequestForPackage({ packageEntry }, { config, packages });\n\n  // Set up for bundling.\n  const rerun = force || !(await isFolder(bundleRequest.outputPath));\n  let hasError = false;\n\n  if (features.enableLage) {\n    console.debug(`Trying to bundle \"${packageName}@${version}\" with lage task scheduler`);\n\n    try {\n      await apiServer.scheduleTask(\n        bundleRequest,\n        {\n          // TODO: we may want to have a way to let users add more types of tasks here\n          bundle: path.resolve(currentFolder, '../../tasks/bundleTaskWorker.js'),\n        },\n        { rerun },\n      );\n    } catch (err) {\n      console.error(`Error bundling \"${packageName}@${version}\": ${err}`);\n      hasError = true;\n    }\n  } else {\n    console.debug(`Trying to bundle \"${packageName}@${version}\"`);\n\n    const bundleTask = createBundleTask(bundleRequest, { force }, reporter);\n    await apiServer.addTask(bundleTask, { rerun });\n\n    // At this point we should have a Task completed.\n    if (bundleRequest.result?.errors?.length) {\n      hasError = true;\n    } else if (features.enqueueDependencies && bundleRequest.result?.imports) {\n      // Enqueue all dependencies to be bundled.\n      for (const dependency of Object.keys(bundleRequest.result.imports)) {\n        const dependencyBundleRequest = await createBundleRequestForPackage(\n          { packageEntry: resolveMap[dependency] },\n          { ...context, config },\n        );\n\n        // No need to await, we don't want to wait until the bundle is completed.\n        void apiServer.addTask(createBundleTask(dependencyBundleRequest, { force }, reporter));\n      }\n    }\n  }\n\n  if (hasError) {\n    res.status(500).type('json').send(bundleRequest);\n  } else {\n    console.debug(`Bundle returning: \"${packageName}@${version}${filePath}\"`);\n    // Try to return the result.\n    if (bundleRequest.isExternal) {\n      res.setHeader('Cache-Control', 'public, max-age=31536000');\n    }\n\n    // The below header is need to be able to track the browser cache hit ratio.\n    res.setHeader('Timing-Allow-Origin', '*');\n\n    res.sendFile(path.join(bundleRequest.outputPath, filePath));\n  }\n}\n"]}

package/lib/commands/sync/execute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAIlE,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CA0C9C,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAKlE,eAAO,MAAM,OAAO,EAAE,aAAa,CAAC,WAAW,CA4C9C,CAAC"}

package/lib/commands/sync/execute.js

@@ -1,5 +1,6 @@
 import { isCIBuild } from '../../utilities/isCIBuild.js';
 import { createPartialApiContext, syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';
+import { runPrerequisites } from '../../common/runPrerequisites.js';
 export const execute = async ({ options, cwd, reporter, initialize, exit, autoDispose, }) => {
     const { config, telemetryClient } = await initialize(cwd);
     const { nonInteractiveLogin, upload } = options;
@@ -13,6 +14,7 @@ export const execute = async ({ options, cwd, reporter, initialize, exit, autoDi
     };
     const apiContextOptions = { appPath: cwd, config, reporter, telemetryClient };
     if (upload) {
+        runPrerequisites(config, cwd);
         const [ctx] = autoDispose(await createPartialApiContext({
             ...apiContextOptions,
             items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],

package/lib/commands/sync/execute.js.map

@@ -1 +1 @@
-{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAElG,MAAM,CAAC,MAAM,OAAO,GAA+B,KAAK,EAAE,EACxD,OAAO,EACP,GAAG,EACH,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,WAAW,GACZ,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;IAC7C,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,CAAC,IAAI,CACV,gHAAgH,CACjH,CAAC;QACF,OAAO;KACR;IAED,MAAM,KAAK,GAAG;QACZ,kBAAkB,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,mBAAmB,CAAC;KAC1D,CAAC;IAEF,MAAM,iBAAiB,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC9E,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CACvB,MAAM,uBAAuB,CAAC;YAC5B,GAAG,iBAAiB;YACpB,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC;SAC/D,CAAC,CACH,CAAC;QACF,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;KAClC;SAAM;QACL,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CACvB,MAAM,uBAAuB,CAAC;YAC5B,GAAG,iBAAiB;YACpB,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC;SAC/B,CAAC,CACH,CAAC;QACF,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;KACpC;IAED,MAAM,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC","sourcesContent":["import type { SyncOptions } from './types/SyncOptions.js';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { isCIBuild } from '../../utilities/isCIBuild.js';\nimport { createPartialApiContext, syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';\n\nexport const execute: CommandAction<SyncOptions> = async ({\n  options,\n  cwd,\n  reporter,\n  initialize,\n  exit,\n  autoDispose,\n}) => {\n  const { config, telemetryClient } = await initialize(cwd);\n  const { nonInteractiveLogin, upload } = options;\n  const remoteCacheConfig = config.remoteCache;\n  if (!remoteCacheConfig) {\n    console.warn(\n      'Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.',\n    );\n    return;\n  }\n\n  const input = {\n    isInteractiveLogin: !(isCIBuild() || nonInteractiveLogin),\n  };\n\n  const apiContextOptions = { appPath: cwd, config, reporter, telemetryClient };\n  if (upload) {\n    const [ctx] = autoDispose(\n      await createPartialApiContext({\n        ...apiContextOptions,\n        items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],\n      }),\n    );\n    await syncUpload({ input, ctx });\n  } else {\n    const [ctx] = autoDispose(\n      await createPartialApiContext({\n        ...apiContextOptions,\n        items: ['packages', 'session'],\n      }),\n    );\n    await syncDownload({ input, ctx });\n  }\n\n  await exit({ exitCode: 0 });\n};\n"]}
+{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/commands/sync/execute.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAClG,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,MAAM,CAAC,MAAM,OAAO,GAA+B,KAAK,EAAE,EACxD,OAAO,EACP,GAAG,EACH,QAAQ,EACR,UAAU,EACV,IAAI,EACJ,WAAW,GACZ,EAAE,EAAE;IACH,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;IAC1D,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAChD,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;IAC7C,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,CAAC,IAAI,CACV,gHAAgH,CACjH,CAAC;QACF,OAAO;KACR;IAED,MAAM,KAAK,GAAG;QACZ,kBAAkB,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,mBAAmB,CAAC;KAC1D,CAAC;IAEF,MAAM,iBAAiB,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC9E,IAAI,MAAM,EAAE;QACV,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAE9B,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CACvB,MAAM,uBAAuB,CAAC;YAC5B,GAAG,iBAAiB;YACpB,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC;SAC/D,CAAC,CACH,CAAC;QACF,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;KAClC;SAAM;QACL,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CACvB,MAAM,uBAAuB,CAAC;YAC5B,GAAG,iBAAiB;YACpB,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC;SAC/B,CAAC,CACH,CAAC;QACF,MAAM,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;KACpC;IAED,MAAM,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;AAC9B,CAAC,CAAC","sourcesContent":["import type { SyncOptions } from './types/SyncOptions.js';\nimport type { CommandAction } from '../../types/CommandAction.js';\nimport { isCIBuild } from '../../utilities/isCIBuild.js';\nimport { createPartialApiContext, syncDownload, syncUpload } from '@ms-cloudpack/api-server/apis';\nimport { runPrerequisites } from '../../common/runPrerequisites.js';\n\nexport const execute: CommandAction<SyncOptions> = async ({\n  options,\n  cwd,\n  reporter,\n  initialize,\n  exit,\n  autoDispose,\n}) => {\n  const { config, telemetryClient } = await initialize(cwd);\n  const { nonInteractiveLogin, upload } = options;\n  const remoteCacheConfig = config.remoteCache;\n  if (!remoteCacheConfig) {\n    console.warn(\n      'Remote cache is not configured. Please add remoteCache to your cloudpack.config.json file to use this feature.',\n    );\n    return;\n  }\n\n  const input = {\n    isInteractiveLogin: !(isCIBuild() || nonInteractiveLogin),\n  };\n\n  const apiContextOptions = { appPath: cwd, config, reporter, telemetryClient };\n  if (upload) {\n    runPrerequisites(config, cwd);\n\n    const [ctx] = autoDispose(\n      await createPartialApiContext({\n        ...apiContextOptions,\n        items: ['bus', 'taskRunner', 'watcher', 'packages', 'session'],\n      }),\n    );\n    await syncUpload({ input, ctx });\n  } else {\n    const [ctx] = autoDispose(\n      await createPartialApiContext({\n        ...apiContextOptions,\n        items: ['packages', 'session'],\n      }),\n    );\n    await syncDownload({ input, ctx });\n  }\n\n  await exit({ exitCode: 0 });\n};\n"]}

package/lib/{commands/start/runPrereqs.d.ts → common/runPrerequisites.d.ts}

@@ -1,7 +1,7 @@
 import type { CloudpackConfig } from '@ms-cloudpack/config';
 /**
  * Runs the pre-requisites specified in the given Cloudpack config
- * @param config - The Cloudpack config of containing a list of prereqs to run
+ * @param config - The Cloudpack config of containing a list of prerequisites to run
  */
-export declare function runPrereqs(config: CloudpackConfig | undefined, cwd: string): void;
-//# sourceMappingURL=runPrereqs.d.ts.map
+export declare function runPrerequisites(config: CloudpackConfig | undefined, cwd: string): void;
+//# sourceMappingURL=runPrerequisites.d.ts.map

package/lib/common/runPrerequisites.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runPrerequisites.d.ts","sourceRoot":"","sources":["../../src/common/runPrerequisites.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,QAQhF"}

package/lib/{commands/start/runPrereqs.js → common/runPrerequisites.js}

@@ -1,9 +1,9 @@
 import spawn from 'cross-spawn';
 /**
  * Runs the pre-requisites specified in the given Cloudpack config
- * @param config - The Cloudpack config of containing a list of prereqs to run
+ * @param config - The Cloudpack config of containing a list of prerequisites to run
  */
-export function runPrereqs(config, cwd) {
+export function runPrerequisites(config, cwd) {
     const dependsOn = config?.dependsOn;
     if (dependsOn) {
         for (const [command, args] of dependsOn) {
@@ -11,5 +11,4 @@ export function runPrereqs(config, cwd) {
         }
     }
 }
-// cspell:ignore Prereqs
-//# sourceMappingURL=runPrereqs.js.map
+//# sourceMappingURL=runPrerequisites.js.map

package/lib/common/runPrerequisites.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runPrerequisites.js","sourceRoot":"","sources":["../../src/common/runPrerequisites.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAmC,EAAE,GAAW;IAC/E,MAAM,SAAS,GAAG,MAAM,EAAE,SAAS,CAAC;IAEpC,IAAI,SAAS,EAAE;QACb,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,SAAS,EAAE;YACvC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;SACtD;KACF;AACH,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/config';\nimport spawn from 'cross-spawn';\n\n/**\n * Runs the pre-requisites specified in the given Cloudpack config\n * @param config - The Cloudpack config of containing a list of prerequisites to run\n */\nexport function runPrerequisites(config: CloudpackConfig | undefined, cwd: string) {\n  const dependsOn = config?.dependsOn;\n\n  if (dependsOn) {\n    for (const [command, args] of dependsOn) {\n      spawn.sync(command, args, { stdio: 'inherit', cwd });\n    }\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/cli",
-  "version": "0.47.6",
+  "version": "0.47.8",
   "description": "The Cloudpack command line interface - a tool for managing fast inner and outer looping in web apps.",
   "license": "MIT",
   "type": "module",
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@lage-run/target-graph": "^0.8.7",
-    "@ms-cloudpack/api-server": "^0.19.2",
-    "@ms-cloudpack/config": "^0.12.5",
-    "@ms-cloudpack/create-express-app": "^1.3.9",
+    "@ms-cloudpack/api-server": "^0.20.1",
+    "@ms-cloudpack/config": "^0.12.6",
+    "@ms-cloudpack/create-express-app": "^1.3.10",
     "@ms-cloudpack/json-utilities": "^0.0.7",
-    "@ms-cloudpack/overlay": "^0.15.0",
-    "@ms-cloudpack/package-utilities": "^5.1.7",
-    "@ms-cloudpack/path-string-parsing": "^1.0.3",
-    "@ms-cloudpack/path-utilities": "^2.3.2",
+    "@ms-cloudpack/overlay": "^0.15.2",
+    "@ms-cloudpack/package-utilities": "^5.1.8",
+    "@ms-cloudpack/path-string-parsing": "^1.1.0",
+    "@ms-cloudpack/path-utilities": "^2.3.3",
     "@ms-cloudpack/task-reporter": "^0.8.0",
     "@ms-cloudpack/telemetry": "^0.3.8",
     "commander": "^11.0.0",

package/lib/commands/start/runPrereqs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"runPrereqs.d.ts","sourceRoot":"","sources":["../../../src/commands/start/runPrereqs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,QAQ1E"}

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

@@ -1 +0,0 @@
-{"version":3,"file":"runPrereqs.js","sourceRoot":"","sources":["../../../src/commands/start/runPrereqs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC;;;GAGG;AACH,MAAM,UAAU,UAAU,CAAC,MAAmC,EAAE,GAAW;IACzE,MAAM,SAAS,GAAG,MAAM,EAAE,SAAS,CAAC;IAEpC,IAAI,SAAS,EAAE;QACb,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,SAAS,EAAE;YACvC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;SACtD;KACF;AACH,CAAC;AAED,wBAAwB","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/config';\nimport spawn from 'cross-spawn';\n\n/**\n * Runs the pre-requisites specified in the given Cloudpack config\n * @param config - The Cloudpack config of containing a list of prereqs to run\n */\nexport function runPrereqs(config: CloudpackConfig | undefined, cwd: string) {\n  const dependsOn = config?.dependsOn;\n\n  if (dependsOn) {\n    for (const [command, args] of dependsOn) {\n      spawn.sync(command, args, { stdio: 'inherit', cwd });\n    }\n  }\n}\n\n// cspell:ignore Prereqs\n"]}