@ms-cloudpack/cli 0.39.17 → 0.40.0

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

@@ -1,5 +1,5 @@
 import type { BundleServer } from '../../../types/BundleServer.js';
-import type { PackageJson } from '@ms-cloudpack/bundler-types';
+import type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';
 import { type TaskReporter } from '@ms-cloudpack/task-reporter';
 import type { CloudpackConfig } from '@ms-cloudpack/config';
 import type { ApiServer, Session } from '@ms-cloudpack/api-server';
@@ -11,12 +11,13 @@ import type { ApiServer, Session } from '@ms-cloudpack/api-server';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export declare function startAppServer({ session, bundleServer, apiServer, definition, config, reporter, }: {
+export declare function startAppServer({ session, bundleServer, apiServer, definition, config, packages, reporter, }: {
     session: Session;
     definition: PackageJson;
     bundleServer: BundleServer;
     apiServer: ApiServer;
     config: CloudpackConfig;
+    packages: PackageDefinitionsCache;
     reporter: TaskReporter;
 }): Promise<{
     close: () => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAG/D,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,EAC9B,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,YAAY,CAAC;CACxB;;;;GA6CA"}
+{"version":3,"file":"startAppServer.d.ts","sourceRoot":"","sources":["../../../../src/commands/start/appServer/startAppServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGxF,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnE;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAA8B,EAC9B,QAAQ,EACR,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,WAAW,CAAC;IACxB,YAAY,EAAE,YAAY,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;IAClC,QAAQ,EAAE,YAAY,CAAC;CACxB;;;;GA8CA"}

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

@@ -10,7 +10,7 @@ import { cyan } from '@ms-cloudpack/task-reporter';
  * can support whichever routes the app needs, while the bundle server can provide package
  * assets in various forms using its own routing.
  */
-export async function startAppServer({ session, bundleServer, apiServer, definition, config = {}, reporter, }) {
+export async function startAppServer({ session, bundleServer, apiServer, definition, config = {}, packages, reporter, }) {
     const { devServer = {} } = config || {};
     // Read the port from the config file or default to array of ports.
     const requireSpecifiedPort = devServer?.port !== undefined;
@@ -34,6 +34,7 @@ export async function startAppServer({ session, bundleServer, apiServer, definit
                 bundleServer,
                 apiServer,
                 config,
+                packages,
             }),
         });
         task.complete({ message: `Available @ ${cyan(url)}`, forceShow: true });

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,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAItE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,GAQT;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/BundleServer.js';\nimport type { PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { type TaskReporter, 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  reporter,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  reporter: TaskReporter;\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,EAAqB,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAItE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,OAAO,EACP,YAAY,EACZ,SAAS,EACT,UAAU,EACV,MAAM,GAAG,EAAqB,EAC9B,QAAQ,EACR,QAAQ,GAST;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;gBACN,QAAQ;aACT,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/BundleServer.js';\nimport type { PackageDefinitionsCache, PackageJson } from '@ms-cloudpack/bundler-types';\nimport { createRoutes } from './createRoutes.js';\nimport { exitIfPortUnavailable } from './exitIfPortUnavailable.js';\nimport { type TaskReporter, 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  packages,\n  reporter,\n}: {\n  session: Session;\n  definition: PackageJson;\n  bundleServer: BundleServer;\n  apiServer: ApiServer;\n  config: CloudpackConfig;\n  packages: PackageDefinitionsCache;\n  reporter: TaskReporter;\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          packages,\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/createBundleRequestForPackage.d.ts

@@ -1,5 +1,11 @@
-import type { Features } from '@ms-cloudpack/config';
+import type { CloudpackConfig } from '@ms-cloudpack/config';
 import type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';
 import type { BundleRequest } from '../../types/BundleRequest.js';
-export declare function createBundleRequestForPackage(packageEntry: ResolveMapEntry, features?: Features): Promise<BundleRequest>;
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+export declare function createBundleRequestForPackage(options: {
+    packageEntry: ResolveMapEntry;
+}, context: {
+    config: CloudpackConfig;
+    packages: PackageDefinitionsCache;
+}): Promise<BundleRequest>;
 //# sourceMappingURL=createBundleRequestForPackage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createBundleRequestForPackage.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAsB,6BAA6B,CACjD,YAAY,EAAE,eAAe,EAC7B,QAAQ,CAAC,EAAE,QAAQ,GAClB,OAAO,CAAC,aAAa,CAAC,CAexB"}
+{"version":3,"file":"createBundleRequestForPackage.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,wBAAsB,6BAA6B,CACjD,OAAO,EAAE;IACP,YAAY,EAAE,eAAe,CAAC;CAC/B,EACD,OAAO,EAAE;IACP,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GACA,OAAO,CAAC,aAAa,CAAC,CAmBxB"}

package/lib/commands/start/createBundleRequestForPackage.js

@@ -1,7 +1,10 @@
 import { getBundleDetails } from '../../common/getBundleDetails.js';
-export async function createBundleRequestForPackage(packageEntry, features) {
+export async function createBundleRequestForPackage(options, context) {
+    const { packageEntry } = options;
+    const { config } = context;
+    const { features = {} } = config;
     const { path, version, name } = packageEntry;
-    const { bundleId, isExternal, outputPath } = await getBundleDetails(path);
+    const { bundleId, isExternal, outputPath } = await getBundleDetails({ packagePath: path }, context);
     return {
         id: bundleId,
         packagePath: path,
@@ -9,9 +12,10 @@ export async function createBundleRequestForPackage(packageEntry, features) {
         isExternal,
         outputPath,
         version,
-        disableSourceMaps: features?.disableSourceMaps,
-        enableFindImports: features?.enqueueDependencies,
-        enableCacheInternalPackages: features?.cacheInternalPackages,
+        disableSourceMaps: features.disableSourceMaps,
+        enableFindImports: features.enqueueDependencies,
+        enableCacheInternalPackages: features.cacheInternalPackages,
+        ...context,
     };
 }
 //# sourceMappingURL=createBundleRequestForPackage.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"createBundleRequestForPackage.js","sourceRoot":"","sources":["../../../src/commands/start/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,YAA6B,EAC7B,QAAmB;IAEnB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;IAC7C,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAE1E,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,IAAI;QACjB,UAAU;QACV,UAAU;QACV,OAAO;QACP,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB;QAC9C,iBAAiB,EAAE,QAAQ,EAAE,mBAAmB;QAChD,2BAA2B,EAAE,QAAQ,EAAE,qBAAqB;KAC7D,CAAC;AACJ,CAAC","sourcesContent":["import type { Features } from '@ms-cloudpack/config';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\n\nexport async function createBundleRequestForPackage(\n  packageEntry: ResolveMapEntry,\n  features?: Features,\n): Promise<BundleRequest> {\n  const { path, version, name } = packageEntry;\n  const { bundleId, isExternal, outputPath } = await getBundleDetails(path);\n\n  return {\n    id: bundleId,\n    packagePath: path,\n    packageName: name,\n    isExternal,\n    outputPath,\n    version,\n    disableSourceMaps: features?.disableSourceMaps,\n    enableFindImports: features?.enqueueDependencies,\n    enableCacheInternalPackages: features?.cacheInternalPackages,\n  };\n}\n"]}
+{"version":3,"file":"createBundleRequestForPackage.js","sourceRoot":"","sources":["../../../src/commands/start/createBundleRequestForPackage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAIpE,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OAEC,EACD,OAGC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAC3B,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;IAC7C,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEpG,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,WAAW,EAAE,IAAI;QACjB,WAAW,EAAE,IAAI;QACjB,UAAU;QACV,UAAU;QACV,OAAO;QACP,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;QAC7C,iBAAiB,EAAE,QAAQ,CAAC,mBAAmB;QAC/C,2BAA2B,EAAE,QAAQ,CAAC,qBAAqB;QAC3D,GAAG,OAAO;KACX,CAAC;AACJ,CAAC","sourcesContent":["import type { CloudpackConfig } from '@ms-cloudpack/config';\nimport type { ResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport { getBundleDetails } from '../../common/getBundleDetails.js';\nimport type { BundleRequest } from '../../types/BundleRequest.js';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nexport async function createBundleRequestForPackage(\n  options: {\n    packageEntry: ResolveMapEntry;\n  },\n  context: {\n    config: CloudpackConfig;\n    packages: PackageDefinitionsCache;\n  },\n): Promise<BundleRequest> {\n  const { packageEntry } = options;\n  const { config } = context;\n  const { features = {} } = config;\n  const { path, version, name } = packageEntry;\n  const { bundleId, isExternal, outputPath } = await getBundleDetails({ packagePath: path }, context);\n\n  return {\n    id: bundleId,\n    packagePath: path,\n    packageName: name,\n    isExternal,\n    outputPath,\n    version,\n    disableSourceMaps: features.disableSourceMaps,\n    enableFindImports: features.enqueueDependencies,\n    enableCacheInternalPackages: features.cacheInternalPackages,\n    ...context,\n  };\n}\n"]}

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

@@ -1,4 +1,12 @@
 import { type Session } from '@ms-cloudpack/api-server';
-import type { TaskContext } from '../../types/TaskContext.js';
-export declare function createSession(context: TaskContext): Promise<Session>;
+import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+import type { CloudpackConfig } from '@ms-cloudpack/config';
+export declare function createSession(options: {
+    appPath: string;
+    config: CloudpackConfig;
+}, context: {
+    reporter: TaskReporter;
+    packages: PackageDefinitionsCache;
+}): Promise<Session>;
 //# sourceMappingURL=createSession.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAO3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAK9D,wBAAsB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAwD1E"}
+{"version":3,"file":"createSession.d.ts","sourceRoot":"","sources":["../../../src/commands/start/createSession.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAO3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,wBAAsB,aAAa,CACjC,OAAO,EAAE;IACP,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,eAAe,CAAC;CACzB,EACD,OAAO,EAAE;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,uBAAuB,CAAA;CAAE,GACrE,OAAO,CAAC,OAAO,CAAC,CA0DlB"}

package/lib/commands/start/createSession.js

@@ -8,11 +8,12 @@ import { fileURLToPath } from 'url';
 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(context) {
-    const { appPath, config } = context;
+export async function createSession(options, context) {
+    const { appPath, config } = options;
     const projectName = path.basename(appPath);
     const id = uuid();
     const resolveMap = await resolveDependenciesTask({
+        appPath,
         additionalPaths: [dashboardPackagePath],
     }, context);
     if (!resolveMap) {
@@ -45,7 +46,7 @@ export async function createSession(context) {
             }
         },
         incrementTargetVersion: (inputPath) => {
-            targetVersions[inputPath] || (targetVersions[inputPath] = 0);
+            targetVersions[inputPath] ??= 0;
             targetVersions[inputPath]++;
             importMap = undefined;
             // eslint-disable-next-line no-restricted-syntax -- this function can't be async

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 { getLocalCachePath, type Session } from '@ms-cloudpack/api-server';\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 { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport type { TaskContext } from '../../types/TaskContext.js';\n\nconst dashboardPackageName = '@ms-cloudpack/overlay';\nconst dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';\n\nexport async function createSession(context: TaskContext): Promise<Session> {\n  const { appPath, config } = context;\n  const projectName = path.basename(appPath);\n  const id = uuid();\n  const resolveMap = await resolveDependenciesTask(\n    {\n      additionalPaths: [dashboardPackagePath],\n    },\n    context,\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      // eslint-disable-next-line no-restricted-syntax -- this function can't be async\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 { getLocalCachePath, type Session } from '@ms-cloudpack/api-server';\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 { resolveDependenciesTask } from '../../tasks/resolveDependenciesTask.js';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\n\nconst dashboardPackageName = '@ms-cloudpack/overlay';\nconst dashboardPackagePath = (await resolve(dashboardPackageName, path.dirname(fileURLToPath(import.meta.url)))) || '';\n\nexport async function createSession(\n  options: {\n    appPath: string;\n    config: CloudpackConfig;\n  },\n  context: { reporter: TaskReporter; packages: PackageDefinitionsCache },\n): Promise<Session> {\n  const { appPath, config } = options;\n\n  const projectName = path.basename(appPath);\n  const id = uuid();\n  const resolveMap = await resolveDependenciesTask(\n    {\n      appPath,\n      additionalPaths: [dashboardPackagePath],\n    },\n    context,\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      // eslint-disable-next-line no-restricted-syntax -- this function can't be async\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/start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAQ5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAgB9D;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,iBAoH5F"}
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/commands/start/start.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAU5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAqB9D;;GAEG;AACH,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,WAAW,iBAsH5F"}

package/lib/commands/start/start.js

@@ -1,16 +1,18 @@
 import { writeJson } from '@ms-cloudpack/json-utilities';
-import { PackageDefinitions, findResolveMapEntry } from '@ms-cloudpack/package-utilities';
+import { findResolveMapEntry } from '@ms-cloudpack/package-utilities';
 import path from 'path';
-import { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';
 import { createSession } from './createSession.js';
 import { openBrowser } from './openBrowser.js';
+import { createPackageDefinitions } from '@ms-cloudpack/config';
 import { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';
 import { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';
 import { createBundleRequestForPackage } from './createBundleRequestForPackage.js';
 import { createBundleTask } from './createBundleTask.js';
 import { mergeFeatures } from './mergeFeatures.js';
 import { yellow } from '@ms-cloudpack/task-reporter';
-async function createAppBundleTask(session, packageName, features) {
+async function createAppBundleTask(options, context) {
+    const { packageName } = options;
+    const { session } = context;
     const packageEntry = findResolveMapEntry({
         packageName,
         resolveMap: session.resolveMap,
@@ -18,7 +20,7 @@ async function createAppBundleTask(session, packageName, features) {
     if (!packageEntry) {
         throw new Error(`Could not find package ${packageName} in the resolve map.`);
     }
-    const bundleRequest = await createBundleRequestForPackage(packageEntry, features);
+    const bundleRequest = await createBundleRequestForPackage({ packageEntry }, context);
     return createBundleTask(bundleRequest);
 }
 /**
@@ -36,9 +38,9 @@ export async function start(options, { reporter, appPath, config }) {
             console.log(`Enabled features: ${featureNames.map((f) => yellow(f)).join(', ')}`);
         }
         // Initialize package overrides.
-        PackageDefinitions.getInstance().registerTransform(createPackageOverrideTransform(config));
+        const packages = createPackageDefinitions({ config });
         // Make sure the package has a valid definition.
-        const definition = await PackageDefinitions.getInstance().get(appPath);
+        const definition = await packages.get(appPath);
         if (!definition) {
             throw new Error(`There was no package.json located at "${appPath}".`);
         }
@@ -46,7 +48,7 @@ export async function start(options, { reporter, appPath, config }) {
             throw new Error(`The package.json at "${appPath}" did not have a name and/or version.`);
         }
         // Initialize session definition.
-        const session = await createSession({ config, reporter, appPath });
+        const session = await createSession({ appPath, config }, { reporter, packages });
         // Set shared telemetry attributes which will be sent with all telemetry events.
         setSharedTelemetryAttribute('sessionId', session.id);
         if (options.logResolveMap) {
@@ -59,13 +61,14 @@ export async function start(options, { reporter, appPath, config }) {
             session,
             rootSpan,
             reporter,
-            appPath,
+            packages,
         });
         // Kick off bundling app package as soon as api server is ready.
-        void apiServer.addTask(await createAppBundleTask(session, definition.name, config.features));
+        void apiServer.addTask(await createAppBundleTask({ packageName: definition.name }, { session, config, packages }));
         // Then start bundle and app servers for hosting the app.
         const { startBundleServer } = await import('./startBundleServer.js');
-        const bundleServer = await startBundleServer({ session, apiServer, reporter });
+        const bundleServer = await startBundleServer({ apiServer, session, reporter, packages });
+        // Finally start the app server.
         const { startAppServer } = await import('./appServer/startAppServer.js');
         const appServer = await startAppServer({
             session,
@@ -74,6 +77,7 @@ export async function start(options, { reporter, appPath, config }) {
             apiServer,
             config,
             reporter,
+            packages,
         });
         const cleanup = async () => {
             for (const [name, server] of [

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, findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createPackageOverrideTransform } from '../../common/createPackageOverrideTransform.js';\nimport { createSession } from './createSession.js';\nimport { openBrowser } from './openBrowser.js';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { StartOptions } from './types/StartOptions.js';\nimport type { Features } from '@ms-cloudpack/config';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';\nimport { createBundleRequestForPackage } from './createBundleRequestForPackage.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport { mergeFeatures } from './mergeFeatures.js';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport type { TaskContext } from '../../types/TaskContext.js';\n\nasync function createAppBundleTask(session: Session, packageName: string, features?: Features) {\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, features);\n\n  return createBundleTask(bundleRequest);\n}\n\n/**\n * Defines the \"start\" verb entry point.\n */\nexport async function start(options: StartOptions, { reporter, appPath, config }: TaskContext) {\n  try {\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 featureNames = Object.keys(config.features);\n\n    if (featureNames.length) {\n      console.log(`Enabled features: ${featureNames.map((f) => yellow(f)).join(', ')}`);\n    }\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({ config, reporter, appPath });\n\n    // Set shared telemetry attributes which will be sent with all telemetry events.\n    setSharedTelemetryAttribute('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      rootSpan,\n      reporter,\n      appPath,\n    });\n\n    // Kick off bundling app package as soon as api server is ready.\n    void apiServer.addTask(await createAppBundleTask(session, definition.name, config.features));\n\n    // Then start bundle and app servers for hosting the app.\n    const { startBundleServer } = await import('./startBundleServer.js');\n    const bundleServer = await startBundleServer({ session, apiServer, reporter });\n\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    });\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    console.error(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 { findResolveMapEntry } from '@ms-cloudpack/package-utilities';\nimport path from 'path';\nimport { createSession } from './createSession.js';\nimport { openBrowser } from './openBrowser.js';\nimport type { Session } from '@ms-cloudpack/api-server';\nimport type { StartOptions } from './types/StartOptions.js';\nimport { createPackageDefinitions } from '@ms-cloudpack/config';\nimport type { CloudpackConfig } from '@ms-cloudpack/config';\nimport { PerfMarkerCliEntry, PerfMeasurementOpenBrowser } from '../../performance/markers.js';\nimport { setSharedTelemetryAttribute, stopTelemetry, rootSpan } from '../../initTelemetry.js';\nimport { createBundleRequestForPackage } from './createBundleRequestForPackage.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport { mergeFeatures } from './mergeFeatures.js';\nimport { yellow } from '@ms-cloudpack/task-reporter';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\nimport type { TaskContext } from '../../types/TaskContext.js';\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 async function start(options: StartOptions, { reporter, appPath, config }: TaskContext) {\n  try {\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 featureNames = Object.keys(config.features);\n\n    if (featureNames.length) {\n      console.log(`Enabled features: ${featureNames.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({ appPath, config }, { reporter, packages });\n\n    // Set shared telemetry attributes which will be sent with all telemetry events.\n    setSharedTelemetryAttribute('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      rootSpan,\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      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    console.error(err);\n    reporter.complete();\n    process.exit(1);\n  }\n}\n"]}

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

@@ -1,14 +1,16 @@
 import type { ApiServer, Session } from '@ms-cloudpack/api-server';
 import type { BundleServer } from '../../types/BundleServer.js';
 import type { TaskReporter } from '@ms-cloudpack/task-reporter';
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
 /**
  * The bundle server handles package requests and returns bundled resources.
  * Resources are bundled on demand and cached locally to avoid re-bundling
  * on each request.
  */
-export declare function startBundleServer({ session, apiServer, reporter, }: {
-    session: Session;
+export declare function startBundleServer(options: {
     apiServer: ApiServer;
+    session: Session;
     reporter: TaskReporter;
+    packages: PackageDefinitionsCache;
 }): Promise<BundleServer>;
 //# sourceMappingURL=startBundleServer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"startBundleServer.d.ts","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,SAAS,EACT,QAAQ,GACT,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,YAAY,CAAC;CACxB,GAAG,OAAO,CAAC,YAAY,CAAC,CAsBxB"}
+{"version":3,"file":"startBundleServer.d.ts","sourceRoot":"","sources":["../../../src/commands/start/startBundleServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAI3E;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,uBAAuB,CAAC;CACnC,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBxB"}

package/lib/commands/start/startBundleServer.js

@@ -13,7 +13,8 @@ const currentPath = fileURLToPath(import.meta.url);
  * Resources are bundled on demand and cached locally to avoid re-bundling
  * on each request.
  */
-export async function startBundleServer({ session, apiServer, reporter, }) {
+export async function startBundleServer(options) {
+    const { apiServer, session, reporter, packages } = options;
     const { config } = session;
     const { port, close, url } = await createExpressApp({
         portRange: [5500, 5501, 5502, 5503],
@@ -22,7 +23,7 @@ export async function startBundleServer({ session, apiServer, reporter, }) {
         setupCallback: (app) => {
             // Set up the express app routes.
             app.get('*', (req, res) => {
-                handleRequest(req, res, session, apiServer, reporter).catch((err) => {
+                handleRequest({ req, res }, { session, apiServer, reporter, packages }).catch((err) => {
                     console.error(err?.stack || err);
                     res.status(500).send(`Error bundling: ${err}`);
                 });
@@ -35,7 +36,9 @@ export async function startBundleServer({ session, apiServer, reporter, }) {
         url,
     };
 }
-async function handleRequest(req, res, session, apiServer, reporter) {
+async function handleRequest(options, context) {
+    const { req, res } = options;
+    const { session, apiServer, reporter, packages } = context;
     const { resolveMap, config } = session;
     const { features = {} } = config;
     const requestPath = slash(req.path.substring(1));
@@ -89,7 +92,7 @@ async function handleRequest(req, res, session, apiServer, reporter) {
         res.sendFile(path.join(packageEntry.path, filePath));
         return;
     }
-    const bundleRequest = await createBundleRequestForPackage(packageEntry, features);
+    const bundleRequest = await createBundleRequestForPackage({ packageEntry }, { config, packages });
     // Set up for bundling.
     const rerun = !(await isFolder(bundleRequest.outputPath)) || force;
     if (features.enableLage) {
@@ -121,7 +124,7 @@ async function handleRequest(req, res, session, apiServer, reporter) {
         if (features.enqueueDependencies && bundleRequest.result?.dependencies) {
             // Enqueue all dependencies to be bundled.
             for (const dependency of bundleRequest.result.dependencies) {
-                const dependencyBundleRequest = await createBundleRequestForPackage(resolveMap[dependency], features);
+                const dependencyBundleRequest = await createBundleRequestForPackage({ packageEntry: resolveMap[dependency] }, { ...context, config });
                 // No need to await, we don't want to wait until the bundle is completed.
                 void apiServer.addTask(createBundleTask(dependencyBundleRequest, { force }, reporter));
             }

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 { createBundleRequestForPackage } from './createBundleRequestForPackage.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport { parseRequestInfo } from './parseRequestInfo.js';\nimport { fileURLToPath } from 'url';\nimport type { TaskReporter } from '@ms-cloudpack/task-reporter';\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({\n  session,\n  apiServer,\n  reporter,\n}: {\n  session: Session;\n  apiServer: ApiServer;\n  reporter: TaskReporter;\n}): Promise<BundleServer> {\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).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  req: Request,\n  res: Response,\n  session: Session,\n  apiServer: ApiServer,\n  reporter: TaskReporter,\n) {\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    if (!packageEntry) {\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}@${packageEntry.version}${filePath}`);\n    return;\n  }\n\n  // If it's an unrecognized package, 404.\n  if (!packageEntry) {\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(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, features);\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?.dependencies) {\n      // Enqueue all dependencies to be bundled.\n      for (const dependency of bundleRequest.result.dependencies) {\n        const dependencyBundleRequest = await createBundleRequestForPackage(resolveMap[dependency], features);\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    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 { createBundleRequestForPackage } from './createBundleRequestForPackage.js';\nimport { createBundleTask } from './createBundleTask.js';\nimport { parseRequestInfo } from './parseRequestInfo.js';\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    if (!packageEntry) {\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}@${packageEntry.version}${filePath}`);\n    return;\n  }\n\n  // If it's an unrecognized package, 404.\n  if (!packageEntry) {\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(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?.dependencies) {\n      // Enqueue all dependencies to be bundled.\n      for (const dependency of bundleRequest.result.dependencies) {\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    res.sendFile(path.join(bundleRequest.outputPath, filePath));\n  }\n}\n"]}

package/lib/common/getBundleDetails.d.ts

@@ -1,4 +1,9 @@
-export declare function getBundleDetails(packagePath: string): Promise<{
+import type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';
+export declare function getBundleDetails(options: {
+    packagePath: string;
+}, context: {
+    packages: PackageDefinitionsCache;
+}): Promise<{
     bundleId: string;
     isExternal: boolean;
     outputPath: string;

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

@@ -1 +1 @@
-{"version":3,"file":"getBundleDetails.d.ts","sourceRoot":"","sources":["../../src/common/getBundleDetails.ts"],"names":[],"mappings":"AAMA,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,MAAM;;;;GA4BzD"}
+{"version":3,"file":"getBundleDetails.d.ts","sourceRoot":"","sources":["../../src/common/getBundleDetails.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAE3E,wBAAsB,gBAAgB,CACpC,OAAO,EAAE;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,EAChC,OAAO,EAAE;IAAE,QAAQ,EAAE,uBAAuB,CAAA;CAAE;;;;GA+B/C"}

package/lib/common/getBundleDetails.js

@@ -1,10 +1,12 @@
-import { isExternalPackage, PackageDefinitions } from '@ms-cloudpack/package-utilities';
+import { isExternalPackage } from '@ms-cloudpack/package-utilities';
 import hash from 'object-hash';
 import filenamify from 'filenamify';
 import path from 'path';
 import { getCachePath } from '@ms-cloudpack/api-server';
-export async function getBundleDetails(packagePath) {
-    const definition = await PackageDefinitions.getInstance().get(packagePath);
+export async function getBundleDetails(options, context) {
+    const { packagePath } = options;
+    const { packages } = context;
+    const definition = await packages.get(packagePath);
     if (!definition) {
         throw new Error(`Package definition (package.json) missing or invalid at "${packagePath}"`);
     }

package/lib/common/getBundleDetails.js.map

@@ -1 +1 @@
-{"version":3,"file":"getBundleDetails.js","sourceRoot":"","sources":["../../src/common/getBundleDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACxF,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,WAAmB;IACxD,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAE3E,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;KAC7F;IAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAElD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;KACvF;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,EAAE,WAAW;QACjB,GAAG,UAAU;QACb,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,WAAW;KAC7D,CAAC,CAAC;IAEH,qCAAqC;IACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC,CAAC;IAElG,OAAO;QACL,QAAQ;QACR,UAAU;QACV,UAAU;KACX,CAAC;AACJ,CAAC","sourcesContent":["import { isExternalPackage, PackageDefinitions } from '@ms-cloudpack/package-utilities';\nimport hash from 'object-hash';\nimport filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from '@ms-cloudpack/api-server';\n\nexport async function getBundleDetails(packagePath: string) {\n  const definition = await PackageDefinitions.getInstance().get(packagePath);\n\n  if (!definition) {\n    throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n  }\n\n  const { name: packageName, version } = definition;\n\n  if (!packageName) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const isExternal = isExternalPackage(packagePath);\n  const bundleId = hash({\n    name: packageName,\n    ...definition,\n    version: (isExternal ? version : packagePath) || packagePath,\n  });\n\n  // Derive where the output should be.\n  const outputPath = path.join(getCachePath(), `${filenamify(packageName)}-${version}-${bundleId}`);\n\n  return {\n    bundleId,\n    isExternal,\n    outputPath,\n  };\n}\n"]}
+{"version":3,"file":"getBundleDetails.js","sourceRoot":"","sources":["../../src/common/getBundleDetails.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,OAAgC,EAChC,OAA8C;IAE9C,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAEnD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,4DAA4D,WAAW,GAAG,CAAC,CAAC;KAC7F;IAED,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAElD,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,sDAAsD,WAAW,GAAG,CAAC,CAAC;KACvF;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,EAAE,WAAW;QACjB,GAAG,UAAU;QACb,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,WAAW;KAC7D,CAAC,CAAC;IAEH,qCAAqC;IACrC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC,CAAC;IAElG,OAAO;QACL,QAAQ;QACR,UAAU;QACV,UAAU;KACX,CAAC;AACJ,CAAC","sourcesContent":["import { isExternalPackage } from '@ms-cloudpack/package-utilities';\nimport hash from 'object-hash';\nimport filenamify from 'filenamify';\nimport path from 'path';\nimport { getCachePath } from '@ms-cloudpack/api-server';\nimport type { PackageDefinitionsCache } from '@ms-cloudpack/bundler-types';\n\nexport async function getBundleDetails(\n  options: { packagePath: string },\n  context: { packages: PackageDefinitionsCache },\n) {\n  const { packagePath } = options;\n  const { packages } = context;\n  const definition = await packages.get(packagePath);\n\n  if (!definition) {\n    throw new Error(`Package definition (package.json) missing or invalid at \"${packagePath}\"`);\n  }\n\n  const { name: packageName, version } = definition;\n\n  if (!packageName) {\n    throw new Error(`Package definition (package.json) missing name at \"${packagePath}\"`);\n  }\n\n  const isExternal = isExternalPackage(packagePath);\n  const bundleId = hash({\n    name: packageName,\n    ...definition,\n    version: (isExternal ? version : packagePath) || packagePath,\n  });\n\n  // Derive where the output should be.\n  const outputPath = path.join(getCachePath(), `${filenamify(packageName)}-${version}-${bundleId}`);\n\n  return {\n    bundleId,\n    isExternal,\n    outputPath,\n  };\n}\n"]}

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAKb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAYpC;;;GAGG;AACH,wBAAsB,IAAI,CAAC,WAAW,CAAC,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,iBA8EA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EAKb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAcpC;;;GAGG;AACH,wBAAsB,IAAI,CAAC,WAAW,CAAC,EAAE;IACvC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC;IACvB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;CAChD,iBAyEA"}

package/lib/index.js

@@ -1,4 +1,4 @@
-import { PackageDefinitions, getVersion } from '@ms-cloudpack/package-utilities';
+import { getVersion } from '@ms-cloudpack/package-utilities';
 import { TaskReporter, bold, debugLoggingConfig, defaultLoggingConfig, verboseLoggingConfig, } from '@ms-cloudpack/task-reporter';
 import { Command } from 'commander';
 import glob from 'glob';
@@ -7,8 +7,9 @@ import { fileURLToPath, pathToFileURL } from 'url';
 import { initTelemetry, setSharedTelemetryAttributes } from './initTelemetry.js';
 import { PerfMarkerCliEntry } from './performance/markers.js';
 import { readConfig } from '@ms-cloudpack/config';
-const filename = fileURLToPath(import.meta.url);
-const dirname = path.dirname(filename);
+import { readJson } from '@ms-cloudpack/json-utilities';
+const currentFilePath = fileURLToPath(import.meta.url);
+const currentPath = path.dirname(currentFilePath);
 /**
  * Entry point for the cloudpack CLI.
  * Resolves all commands defined within the "./commands" folder.
@@ -41,26 +42,22 @@ export async function main(testOptions) {
         useVerboseLogging,
         telemetryConfig: config.telemetry,
     }, reporter);
-    // Make sure the package has a valid definition.
-    const definition = await PackageDefinitions.getInstance().get(appPath);
-    if (!definition) {
-        throw new Error(`There was no package.json located at "${appPath}".`);
-    }
+    const definition = (await readJson(path.join(appPath, 'package.json')));
     setSharedTelemetryAttributes({
         verb,
         arguments: argv.slice(3).join(' '),
         environment: process.env.CI || process.env.TF_BUILD ? 'ci' : 'local',
-        appName: definition.name || '<unkown>',
+        appName: definition.name || '<unknown>',
     });
     // Ensure the glob works in tests
-    const commandsGlob = `commands/*/index${path.extname(filename)}`;
-    const commands = glob.sync(commandsGlob, { cwd: dirname });
+    const commandsGlob = `commands/*/index${path.extname(currentFilePath)}`;
+    const commands = glob.sync(commandsGlob, { cwd: currentPath });
     if (!commands.length) {
         // There was an issue with the glob above not working in tests, so make sure that doesn't happen again
-        throw new Error(`No commands found under "${dirname}".`);
+        throw new Error(`No commands found under "${currentPath}".`);
     }
     for (const commandPath of commands) {
-        const commandFunction = (await import(pathToFileURL(path.join(dirname, commandPath)).toString()));
+        const commandFunction = (await import(pathToFileURL(path.join(currentPath, commandPath)).toString()));
         commandFunction.init(program, { reporter, appPath, config });
     }
     program.option('-v, --verbose', 'Show additional details about the running tasks. (default: false)');