@travetto/pack 5.0.14 → 5.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "5.0.14",
+  "version": "5.0.16",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,12 +29,12 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.3.0",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/runtime": "^5.0.11",
-    "@travetto/terminal": "^5.0.13",
+    "@travetto/runtime": "^5.0.13",
+    "@travetto/terminal": "^5.0.15",
     "rollup": "^4.24.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.14"
+    "@travetto/cli": "^5.0.16"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config-util.ts

@@ -35,10 +35,13 @@ export class PackConfigUtil {
   static dockerNodePackageInstall(cfg: DockerPackConfig): string {
     const out: string[] = [];
     for (const item of cfg.externalDependencies ?? []) {
-      out.push(item.endsWith(':from-source') ?
-        `RUN npm_config_build_from_source=true npm install ${item.split(':')[0]} --build-from-source` :
-        `RUN npm install ${item}`
-      );
+      const [name, directive] = item.split(':');
+      switch (directive) {
+        case 'from-source':
+          out.push(`RUN npm_config_build_from_source=true npm install ${name} --build-from-source`); break;
+        default:
+          out.push(`RUN npm install ${name}`); break;
+      }
     }
     if (out.length) {
       out.unshift(`WORKDIR ${cfg.dockerRuntime.folder}`);

package/support/bin/operation.ts

@@ -68,7 +68,7 @@ export class PackOperation {
         ['BUNDLE_OUTPUT', cfg.buildDir],
         ['BUNDLE_FORMAT', Runtime.workspace.type],
         ['BUNDLE_ENV_FILE', cfg.envFile],
-        ['BUNDLE_EXTERNAL', cfg.externalDependencies.join(',')]
+        ['BUNDLE_EXTERNAL', cfg.externalDependencies.map(x => x.split(':')[0]).join(',')]
       ] as const)
         .filter(x => x[1] === false || x[1])
         .map(x => [x[0], `${x[1]}`])

package/support/pack.base.ts

@@ -5,6 +5,7 @@ import { CliCommandShape, CliFlag, ParsedState, cliTpl } from '@travetto/cli';
 import { TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 import { Terminal } from '@travetto/terminal';
 import { Ignore, Required, Schema } from '@travetto/schema';
+import { PackageUtil } from '@travetto/manifest';
 
 import { PackOperation } from './bin/operation';
 import { PackUtil } from './bin/util';
@@ -111,6 +112,19 @@ export abstract class BasePackCommand implements CliCommandShape {
     }
   }
 
+  /**
+   * Get all binary dependencies
+   */
+  getBinaryDependencies(): string[] {
+    return [...RuntimeIndex.getModuleList('all')]
+      .map(m => RuntimeIndex.getModule(m))
+      .filter(m => !!m)
+      .filter(m => m.prod)
+      .map(m => PackageUtil.readPackage(m?.sourcePath))
+      .map(p => p?.travetto?.build?.binaryDependencies ?? [])
+      .flat();
+  }
+
   async main(args: string[] = []): Promise<void> {
     // Resolve all files to absolute paths
     this.output = this.output ? path.resolve(this.output) : undefined!;
@@ -123,6 +137,10 @@ export abstract class BasePackCommand implements CliCommandShape {
     this.mainName ??= path.basename(this.module);
     this.mainFile = `${this.mainName}.js`;
 
+    // Collect binary dependencies
+    const binaryDeps = await this.getBinaryDependencies();
+    this.externalDependencies = [...this.externalDependencies, ...binaryDeps];
+
     const stream = this.runOperations();
 
     // Eject to file