@travetto/pack 4.1.2 → 5.0.0-rc.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 ArcSine Technologies
+Copyright (c) 2023 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -29,7 +29,7 @@ $ trv pack --help
 Usage: pack [options]
 
 Options:
-  -w, --workspace <string>             Workspace for building (default: "/tmp/<temp-folder>")
+  -b, --build-dir <string>             Workspace for building (default: "/tmp/<temp-folder>")
   --clean, --no-clean                  Clean workspace (default: true)
   -o, --output <string>                Output location
   --main-scripts, --no-main-scripts    Create entry scripts (default: true)
@@ -42,6 +42,7 @@ Options:
   -r, --rollup-configuration <string>  Rollup configuration file (default: "@travetto/pack/support/rollup/build")
   --env-file <string>                  Env Flag File Name (default: ".env")
   --manifest-file <string>             Manifest File Name (default: "manifest.json")
+  -wr, --include-workspace-resources   Include workspace resources (default: false)
   -m, --module <module>                Module to run for
   -h, --help                           display help for command
 ```
@@ -93,7 +94,7 @@ $ trv pack:zip --help
 Usage: pack:zip [options]
 
 Options:
-  -w, --workspace <string>             Workspace for building (default: "/tmp/<temp-folder>")
+  -b, --build-dir <string>             Workspace for building (default: "/tmp/<temp-folder>")
   --clean, --no-clean                  Clean workspace (default: true)
   -o, --output <string>                Output location (default: "travetto_pack.zip")
   --main-scripts, --no-main-scripts    Create entry scripts (default: true)
@@ -106,6 +107,7 @@ Options:
   -r, --rollup-configuration <string>  Rollup configuration file (default: "@travetto/pack/support/rollup/build")
   --env-file <string>                  Env Flag File Name (default: ".env")
   --manifest-file <string>             Manifest File Name (default: "manifest.json")
+  -wr, --include-workspace-resources   Include workspace resources (default: false)
   -m, --module <module>                Module to run for
   -h, --help                           display help for command
 ```
@@ -120,7 +122,7 @@ $ trv pack:docker --help
 Usage: pack:docker [options]
 
 Options:
-  -w, --workspace <string>               Workspace for building (default: "/tmp/<temp-folder>")
+  -b, --build-dir <string>               Workspace for building (default: "/tmp/<temp-folder>")
   --clean, --no-clean                    Clean workspace (default: true)
   -o, --output <string>                  Output location
   --main-scripts, --no-main-scripts      Create entry scripts (default: true)
@@ -133,8 +135,9 @@ Options:
   -r, --rollup-configuration <string>    Rollup configuration file (default: "@travetto/pack/support/rollup/build")
   --env-file <string>                    Env Flag File Name (default: ".env")
   --manifest-file <string>               Manifest File Name (default: "manifest.json")
+  -wr, --include-workspace-resources     Include workspace resources (default: false)
   -df, --docker-factory <string>         Docker Factory source (default: "@travetto/pack/support/pack.dockerfile")
-  -di, --docker-image <string>           Docker Image to extend (default: "node:20-alpine")
+  -di, --docker-image <string>           Docker Image to extend (default: "node:22-alpine")
   -dn, --docker-name <string>            Docker Image Name (default: "travetto_pack")
   -dt, --docker-tag <string>             Docker Image Tag (default: ["latest"])
   -dp, --docker-port <number>            Docker Image Port (default: [])
@@ -183,6 +186,7 @@ echo "NODE_ENV=production" > $DIST/.env
 echo "TRV_MANIFEST=manifest.json" >> $DIST/.env
 echo "TRV_MODULE=$MOD" >> $DIST/.env
 echo "TRV_CLI_IPC=" >> $DIST/.env
+echo "TRV_RESOURCE_OVERRIDES=@#resources=@@#resources" >> $DIST/.env
 
 # Writing package.json 
 
@@ -203,16 +207,15 @@ chmod 755 $DIST/todo-app.sh
 
 echo "Writing entry scripts todo-app.cmd args=(run:rest)"
 
-echo "" > $DIST/todo-app.cmd
-echo "cd %~p0" >> $DIST/todo-app.cmd
+echo "cd %~p0" > $DIST/todo-app.cmd
 echo "node todo-app.js run:rest %*" >> $DIST/todo-app.cmd
 chmod 755 $DIST/todo-app.cmd
 
-# Copying over resources 
+# Copying over module resources 
 
-echo "Copying over resources"
+echo "Copying over module resources"
 
-cp -r -p $ROOT/resources $DIST/resources
+cp -r -p $ROOT/resources/* $DIST/resources
 
 # Writing Manifest manifest.json 
 
@@ -237,21 +240,21 @@ cd $TRV_OUT
 npx rollup -c $TRV_OUT/node_modules/@travetto/pack/support/rollup/build.js
 cd $ROOT
 
-# Pulling Docker Base Image node:20-alpine 
+# Pulling Docker Base Image node:22-alpine 
 
-echo "Pulling Docker Base Image node:20-alpine"
+echo "Pulling Docker Base Image node:22-alpine"
 
-docker pull node:20-alpine
+docker pull node:22-alpine
 
-# Detected Image OS node:20-alpine as alpine 
+# Detected Image OS node:22-alpine as alpine 
 
-echo "Detected Image OS node:20-alpine as alpine"
+echo "Detected Image OS node:22-alpine as alpine"
 
 # Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile 
 
 echo "Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile"
 
-echo "FROM node:20-alpine" > $DIST/Dockerfile
+echo "FROM node:22-alpine" > $DIST/Dockerfile
 echo "RUN addgroup -g 2000 app && adduser -D -G app -u 2000 app" >> $DIST/Dockerfile
 echo "RUN mkdir /app && chown app:app /app" >> $DIST/Dockerfile
 echo "COPY --chown=\"app:app\" . /app" >> $DIST/Dockerfile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "4.1.2",
+  "version": "5.0.0-rc.0",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -29,12 +29,12 @@
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^4.1.2",
-    "@travetto/terminal": "^4.1.1",
+    "@travetto/base": "^5.0.0-rc.0",
+    "@travetto/terminal": "^5.0.0-rc.0",
     "rollup": "^4.18.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.1.2"
+    "@travetto/cli": "^5.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/types.ts

@@ -2,7 +2,7 @@ import { type OutputOptions } from 'rollup';
 import type terser from '@rollup/plugin-terser';
 
 export type CommonPackConfig = {
-  workspace: string;
+  buildDir: string;
   output: string;
   clean: boolean;
   ejectFile?: string;
@@ -13,6 +13,7 @@ export type CommonPackConfig = {
   envFile: string;
   env?: string;
   manifestFile: string;
+  workspaceResourceFolder: string;
 
   // Bundle
   rollupConfiguration: string;
@@ -49,8 +50,6 @@ export type DockerPackConfig = {
 export type ShellCommandImpl = {
   var(name: string): string;
   createFile(file: string, text: string[], mode?: string): string[][];
-  scriptOpen(): string[];
-  chdirScript(): string[];
   callCommandWithAllArgs(cmd: string, ...args: string[]): string[];
   copy(src: string, dest: string): string[];
   copyRecursive(src: string, dest: string, inclusive?: boolean): string[];
@@ -61,6 +60,7 @@ export type ShellCommandImpl = {
   comment(message: string): string[];
   echo(text: string): string[];
   zip(output: string): string[];
+  script(lines: string[], chdir?: boolean): { ext: string, contents: string[] };
 };
 
 export type DockerPackFactory = (cfg: DockerPackConfig) => (string | Promise<string>);

package/support/bin/docker-operation.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
+import path from 'node:path';
 
-import { path, RuntimeIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
 
 import { ActiveShellCommand } from './shell';
@@ -30,7 +31,7 @@ export class DockerPackOperation {
    * Write Docker File
    */
   static async* writeDockerFile(cfg: DockerPackConfig): AsyncIterable<string[]> {
-    const dockerFile = path.resolve(cfg.workspace, 'Dockerfile');
+    const dockerFile = path.resolve(cfg.buildDir, 'Dockerfile');
 
     const factory = RuntimeIndex.getFromImport(cfg.dockerFactory);
     if (!factory) {
@@ -76,11 +77,11 @@ export class DockerPackOperation {
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Building Docker Container' }} ${{ param: cfg.dockerTag?.join(',') }}`);
 
     if (cfg.ejectFile) {
-      yield ActiveShellCommand.chdir(cfg.workspace);
+      yield ActiveShellCommand.chdir(cfg.buildDir);
       yield cmd;
-      yield ActiveShellCommand.chdir(path.cwd());
+      yield ActiveShellCommand.chdir(path.resolve());
     } else {
-      await PackUtil.runCommand(cmd, { cwd: cfg.workspace, stdio: [0, 'pipe', 2] });
+      await PackUtil.runCommand(cmd, { cwd: cfg.buildDir, stdio: [0, 'pipe', 2] });
       const [image] = JSON.parse(await PackUtil.runCommand(['docker', 'inspect', cfg.dockerImage]));
       yield [cliTpl`${{ title: 'Built Docker Container  ' }} ${{ identifier: 'sizeMb' }}=${{ param: Math.trunc(image.Size / 2 ** 20) }}`];
     }

package/support/bin/operation.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
+import path from 'node:path';
 
-import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
 import { Env } from '@travetto/base';
 
@@ -30,20 +31,20 @@ export class PackOperation {
       return;
     }
 
-    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Cleaning Output' }} ${{ path: cfg.workspace }}`);
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Cleaning Output' }} ${{ path: cfg.buildDir }}`);
 
     if (cfg.ejectFile) {
-      yield ActiveShellCommand.rmRecursive(cfg.workspace);
+      yield ActiveShellCommand.rmRecursive(cfg.buildDir);
       if (cfg.output) {
         yield ActiveShellCommand.rmRecursive(cfg.output);
       }
-      yield ActiveShellCommand.mkdir(cfg.workspace);
+      yield ActiveShellCommand.mkdir(cfg.buildDir);
     } else {
-      await fs.rm(cfg.workspace, { recursive: true, force: true });
+      await fs.rm(cfg.buildDir, { recursive: true, force: true });
       if (cfg.output) {
         await fs.rm(cfg.output, { recursive: true, force: true });
       }
-      await fs.mkdir(cfg.workspace, { recursive: true });
+      await fs.mkdir(cfg.buildDir, { recursive: true });
     }
   }
 
@@ -65,7 +66,7 @@ export class PackOperation {
         ['BUNDLE_COMPRESS', cfg.minify],
         ['BUNDLE_SOURCEMAP', cfg.sourcemap],
         ['BUNDLE_SOURCES', cfg.includeSources],
-        ['BUNDLE_OUTPUT', cfg.workspace],
+        ['BUNDLE_OUTPUT', cfg.buildDir],
         ['BUNDLE_FORMAT', RuntimeContext.workspace.type],
         ['BUNDLE_ENV_FILE', cfg.envFile]
       ] as const)
@@ -86,10 +87,10 @@ export class PackOperation {
       );
       yield ActiveShellCommand.chdir(cwd);
       yield bundleCommand;
-      yield ActiveShellCommand.chdir(path.cwd());
+      yield ActiveShellCommand.chdir(path.resolve());
     } else {
       await PackUtil.runCommand(bundleCommand, { cwd, env: { ...process.env, ...env } });
-      const stat = await fs.stat(path.resolve(cfg.workspace, cfg.mainFile));
+      const stat = await fs.stat(path.resolve(cfg.buildDir, cfg.mainFile));
       yield [cliTpl`${{ title: 'Bundled Output ' }} ${{ identifier: 'sizeKb' }}=${{ param: Math.trunc(stat.size / 2 ** 10) }}`];
     }
   }
@@ -105,12 +106,12 @@ export class PackOperation {
 
     if (cfg.ejectFile) {
       yield* ActiveShellCommand.createFile(
-        path.resolve(cfg.workspace, file),
+        path.resolve(cfg.buildDir, file),
         [JSON.stringify(pkg)]
       );
     } else {
       await PackUtil.writeRawFile(
-        path.resolve(cfg.workspace, file),
+        path.resolve(cfg.buildDir, file),
         [JSON.stringify(pkg, null, 2)]
       );
     }
@@ -120,24 +121,30 @@ export class PackOperation {
    * Define .env.js file to control manifest location
    */
   static async * writeEnv(cfg: CommonPackConfig): AsyncIterable<string[]> {
-    const file = path.resolve(cfg.workspace, cfg.envFile);
+    const file = path.resolve(cfg.buildDir, cfg.envFile);
     const env = {
       ...Env.NODE_ENV.export('production'),
       ...Env.TRV_MANIFEST.export(cfg.manifestFile),
       ...Env.TRV_MODULE.export(cfg.module),
-      ...Env.TRV_CLI_IPC.export(undefined)
+      ...Env.TRV_CLI_IPC.export(undefined),
+      ...Env.TRV_RESOURCE_OVERRIDES.export({
+        '@#resources': '@@#resources',
+        ...(cfg.includeWorkspaceResources ? {
+          '@@#resources': `@@#${cfg.workspaceResourceFolder}`
+        } : {})
+      })
     };
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing' }} ${{ path: file }}`);
 
     if (cfg.ejectFile) {
       yield* ActiveShellCommand.createFile(
-        path.resolve(cfg.workspace, file),
+        path.resolve(cfg.buildDir, file),
         PackUtil.buildEnvFile(env)
       );
     } else {
       await PackUtil.writeRawFile(
-        path.resolve(cfg.workspace, file),
+        path.resolve(cfg.buildDir, file),
         PackUtil.buildEnvFile(env)
       );
     }
@@ -152,27 +159,21 @@ export class PackOperation {
     }
 
     const title = 'Writing entry scripts';
+    for (const sh of [ShellCommands.posix, ShellCommands.win32]) {
+      const { ext, contents } = sh.script(
 
-    const files = ([['posix', 'sh'], ['win32', 'cmd']] as const)
-      .map(([type, ext]) => ({
-        fileTitle: cliTpl`${{ title }} ${{ path: `${cfg.mainName}.${ext}` }} args=(${{ param: cfg.entryArguments.join(' ') }})`,
-        file: `${cfg.mainName}.${ext}`,
-        text: [
-          ShellCommands[type].scriptOpen(),
-          ShellCommands[type].chdirScript(),
-          ShellCommands[type].callCommandWithAllArgs('node', cfg.mainFile, ...cfg.entryArguments),
-        ].map(x => x.join(' '))
-      }));
+        sh.callCommandWithAllArgs('node', cfg.mainFile, ...cfg.entryArguments), true
+      );
+      const file = `${cfg.mainName}${ext}`;
+      const args = cfg.entryArguments.join(' ');
 
-    if (cfg.ejectFile) {
-      for (const { fileTitle, text, file } of files) {
-        yield* PackOperation.title(cfg, fileTitle);
-        yield* ActiveShellCommand.createFile(path.resolve(cfg.workspace, file), text, '755');
-      }
-    } else {
-      for (const { fileTitle, text, file } of files) {
-        yield* PackOperation.title(cfg, fileTitle);
-        await PackUtil.writeRawFile(path.resolve(cfg.workspace, file), text, '755');
+      yield* PackOperation.title(cfg, cliTpl`${{ title }} ${{ path: file }} args=(${{ param: args }})`);
+
+      if (cfg.ejectFile) {
+        yield* ActiveShellCommand.createFile(path.resolve(cfg.buildDir, file), contents, '755');
+
+      } else {
+        await PackUtil.writeRawFile(path.resolve(cfg.buildDir, file), contents, '755');
       }
     }
   }
@@ -187,13 +188,12 @@ export class PackOperation {
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over workspace resources' }}`);
 
-    const dest = path.resolve(cfg.workspace, 'workspace-resources');
+    const dest = path.resolve(cfg.buildDir, cfg.workspaceResourceFolder);
     const src = RuntimeContext.workspaceRelative('resources');
 
     if (cfg.ejectFile) {
       yield ActiveShellCommand.copyRecursive(src, dest, true);
     } else {
-      await fs.mkdir(dest, { recursive: true });
       await PackUtil.copyRecursive(src, dest, true);
     }
   }
@@ -205,19 +205,18 @@ export class PackOperation {
     const resources = {
       count: RuntimeIndex.mainModule.files.resources?.length ?? 0,
       src: path.resolve(RuntimeIndex.mainModule.sourcePath, 'resources'),
-      dest: path.resolve(cfg.workspace, 'resources')
+      dest: path.resolve(cfg.buildDir, 'resources')
     };
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Copying over module resources' }}`);
 
     if (cfg.ejectFile) {
       if (resources.count) {
-        yield ActiveShellCommand.copyRecursive(resources.src, path.resolve(cfg.workspace, 'resources'));
+        yield ActiveShellCommand.copyRecursive(resources.src, path.resolve(cfg.buildDir, 'resources'), true);
       }
     } else {
       if (resources.count) {
-        await fs.mkdir(path.dirname(resources.dest), { recursive: true });
-        await PackUtil.copyRecursive(resources.src, resources.dest);
+        await PackUtil.copyRecursive(resources.src, resources.dest, true);
       }
     }
   }
@@ -226,7 +225,7 @@ export class PackOperation {
    * Produce the output manifest, only including prod dependencies
    */
   static async * writeManifest(cfg: CommonPackConfig): AsyncIterable<string[]> {
-    const out = path.resolve(cfg.workspace, cfg.manifestFile);
+    const out = path.resolve(cfg.buildDir, cfg.manifestFile);
     const cmd = ['npx', 'trvc', 'manifest', '--prod', out];
     const env = { ...Env.TRV_MODULE.export(cfg.module) };
 
@@ -247,13 +246,13 @@ export class PackOperation {
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Compressing' }} ${{ path: cfg.output }}`);
 
     if (cfg.ejectFile) {
-      yield ActiveShellCommand.chdir(cfg.workspace);
       await ActiveShellCommand.mkdir(path.dirname(cfg.output));
+      yield ActiveShellCommand.chdir(cfg.buildDir);
       yield ActiveShellCommand.zip(cfg.output);
-      yield ActiveShellCommand.chdir(path.cwd());
+      yield ActiveShellCommand.chdir(path.resolve());
     } else {
       await fs.mkdir(path.dirname(cfg.output), { recursive: true });
-      await PackUtil.runCommand(ActiveShellCommand.zip(cfg.output), { cwd: cfg.workspace });
+      await PackUtil.runCommand(ActiveShellCommand.zip(cfg.output), { cwd: cfg.buildDir });
     }
   }
 }

package/support/bin/shell.ts

@@ -1,6 +1,5 @@
 import util from 'node:util';
-
-import { path } from '@travetto/manifest';
+import path from 'node:path';
 
 import { ShellCommandImpl } from '../../src/types';
 
@@ -13,12 +12,12 @@ const escapedArgs = (args: string[]): string[] => args.map(x =>
   x.includes(' ') || x.includes('"') ? `'${x}'` : (x.includes("'") ? `"${x}"` : x)
 );
 
+const toWin = (file: string): string => file.replace(/[\\\/]+/g, path.win32.sep);
+
 export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
   win32: {
     var: (name: string) => `%${name}%`,
-    scriptOpen: () => [],
-    chdirScript: () => ['cd', '%~p0'],
-    callCommandWithAllArgs: (cmd, ...args) => [cmd, ...escapedArgs(args), '%*'],
+    callCommandWithAllArgs: (cmd, ...args) => [[cmd, ...escapedArgs(args), '%*'].join(' ')],
     createFile: (file, text) => [
       ['@echo', 'off'],
       ...text.map((line, i) =>
@@ -27,20 +26,25 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
     ],
     copy: (src, dest) => ['copy', src, dest],
     copyRecursive: (src, dest, inclusive) =>
-      ['xcopy', '/y', '/h', '/s', inclusive ? `${path.toNative(src)}\\*.*` : path.toNative(src), path.toNative(dest)],
+      ['xcopy', '/y', '/h', '/s', inclusive ? `${toWin(src)}\\*.*` : toWin(src), toWin(dest)],
     rmRecursive: (dest) => ['rmdir', '/Q', '/S', dest],
     mkdir: (dest) => ['md', dest],
     export: (key, value) => ['set', `${key}=${value}`],
     chdir: (dest) => ['cd', dest],
     comment: (message) => ['\nREM', util.stripVTControlCharacters(message), '\n'],
     echo: (message) => ['echo', `"${escape(util.stripVTControlCharacters(message))}"\n`],
-    zip: (outputFile) => ['powershell', 'Compress-Archive', '-Path', '.', '-DestinationPath', outputFile]
+    zip: (outputFile) => ['powershell', 'Compress-Archive', '-Path', '.', '-DestinationPath', outputFile],
+    script: (lines: string[], changeDir: boolean = false) => ({
+      ext: '.cmd',
+      contents: [
+        ...(changeDir ? ['cd %~p0'] : []),
+        ...lines,
+      ]
+    })
   },
   posix: {
     var: (name: string) => `$${name}`,
-    scriptOpen: () => ['#!/bin/sh'],
-    chdirScript: () => ['cd', '$(dirname "$0")'],
-    callCommandWithAllArgs: (cmd, ...args) => [cmd, ...escapedArgs(args), '$@'],
+    callCommandWithAllArgs: (cmd, ...args) => [[cmd, ...escapedArgs(args), '$@'].join(' ')],
     createFile: (file, text, mode) => [
       ...text.map((line, i) =>
         ['echo', `"${escape(line)}"`, i === 0 ? '>' : '>>', file]),
@@ -55,7 +59,15 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
     chdir: (dest) => ['cd', dest],
     comment: (message) => ['\n#', util.stripVTControlCharacters(message), '\n'],
     echo: (message) => ['echo', `"${escape(util.stripVTControlCharacters(message))}"\n`],
-    zip: (outputFile) => ['zip', '-r', outputFile, '.']
+    zip: (outputFile) => ['zip', '-r', outputFile, '.'],
+    script: (lines: string[], changeDir: boolean = false) => ({
+      ext: '.sh',
+      contents: [
+        '#!/bin/sh',
+        ...(changeDir ? ['cd $(dirname "$0")'] : []),
+        ...lines,
+      ]
+    })
   },
 };
 

package/support/bin/util.ts

@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises';
 import { spawn, SpawnOptions } from 'node:child_process';
+import path from 'node:path';
 
-import { path, RuntimeIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/manifest';
 import { AppError, ExecUtil } from '@travetto/base';
 
 import { ActiveShellCommand } from './shell';
@@ -20,13 +21,19 @@ export class PackUtil {
    * Remove directory, determine if errors should be ignored
    * @param src The folder to copy
    * @param dest The folder to copy to
-   * @param ignore Should errors be ignored
    */
-  static async copyRecursive(src: string, dest: string, inclusive: boolean = false, ignore = false): Promise<void> {
-    const [cmd, ...args] = ActiveShellCommand.copyRecursive(src, dest, inclusive);
-    const res = await ExecUtil.getResult(spawn(cmd, args, { shell: true }), { catch: true });
-    if (res.code && !ignore) {
-      throw new Error(`Failed to copy ${src} to ${dest}`);
+  static async copyRecursive(src: string, dest: string, inclusive: boolean = false, ignoreFailure = false): Promise<void> {
+    try {
+      let final = dest;
+      if (!inclusive) {
+        final = path.resolve(dest, path.basename(src));
+      }
+      await fs.mkdir(final, { recursive: true });
+      await fs.cp(src, final, { recursive: true });
+    } catch (err) {
+      if (!ignoreFailure) {
+        throw new Error(`Failed to copy ${src} to ${dest}`);
+      }
     }
   }
 
@@ -34,15 +41,14 @@ export class PackUtil {
    * Finalize eject output
    */
   static async writeEjectOutput(workspace: string, module: string, output: AsyncIterable<string>, file: string): Promise<void> {
-    const vars = { DIST: workspace, TRV_OUT: RuntimeIndex.outputRoot, ROOT: path.cwd(), MOD: module };
+    const vars = { DIST: workspace, TRV_OUT: RuntimeIndex.outputRoot, ROOT: path.resolve(), MOD: module };
 
     const replaceArgs = (text: string): string => Object.entries(vars)
       .reduce((str, [k, v]) => str.replaceAll(v, ActiveShellCommand.var(k)), text);
 
-    const preamble = [
-      ActiveShellCommand.scriptOpen(),
-      ...Object.entries(vars).map(([k, v]) => ActiveShellCommand.export(k, v).join(' ')),
-    ].join('\n');
+    const preamble = ActiveShellCommand.script(
+      Object.entries(vars).map(([k, v]) => ActiveShellCommand.export(k, v).join(' ')),
+    ).contents;
 
     let stream: fs.FileHandle | undefined;
 
@@ -54,7 +60,9 @@ export class PackUtil {
 
     const write = (text: string): Promise<unknown> | unknown => stream ? stream.write(`${text}\n`) : process.stdout.write(`${text}\n`);
 
-    await write(preamble);
+    for (const line of preamble) {
+      write(line);
+    }
     for await (const line of output) {
       await write(replaceArgs(line));
     }

package/support/cli.pack_docker.ts

@@ -1,4 +1,6 @@
-import { path, RuntimeIndex } from '@travetto/manifest';
+import path from 'node:path';
+
+import { RuntimeIndex } from '@travetto/manifest';
 import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
 import { Ignore, Required } from '@travetto/schema';
 
@@ -6,9 +8,7 @@ import { DockerPackOperation } from './bin/docker-operation';
 import { BasePackCommand, PackOperationShape } from './pack.base';
 import { DockerPackConfig } from '../src/types';
 
-const NODE_MAJOR = +process.version.match(/\d+/)![0];
-const DEFAULT_USER_ID = 2000;
-const DEFAULT_USER = 'app';
+const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
 
 /**
  * Standard docker support for pack
@@ -40,6 +40,15 @@ export class PackDockerCommand extends BasePackCommand {
   @Ignore()
   dockerRuntime: DockerPackConfig['dockerRuntime'];
 
+  @Ignore()
+  appFolder = 'app';
+
+  @Ignore()
+  defaultUser = this.appFolder;
+
+  @Ignore()
+  defaultUserId = 2000;
+
   async validate(...args: string[]): Promise<CliValidationError[] | undefined> {
     const errs: CliValidationError[] = [];
     if (this.dockerPort?.length) {
@@ -65,11 +74,11 @@ export class PackDockerCommand extends BasePackCommand {
     const groupIsNum = /^\d+$/.test(groupOrGid);
     const userIsNum = /^\d+$/.test(userOrUid);
 
-    const uid = userIsNum ? +userOrUid : DEFAULT_USER_ID;
-    const gid = groupIsNum ? +groupOrGid : DEFAULT_USER_ID;
-    const group = (!groupIsNum ? groupOrGid : undefined) || DEFAULT_USER;
-    const user = (!userIsNum ? userOrUid : undefined) || DEFAULT_USER;
-    this.dockerRuntime = { user, uid, group, gid, folder: `/${DEFAULT_USER}`, packages: this.dockerRuntimePackages };
+    const uid = userIsNum ? +userOrUid : this.defaultUserId;
+    const gid = groupIsNum ? +groupOrGid : this.defaultUserId;
+    const group = (!groupIsNum ? groupOrGid : undefined) || this.defaultUser;
+    const user = (!userIsNum ? userOrUid : undefined) || this.defaultUser;
+    this.dockerRuntime = { user, uid, group, gid, folder: `/${this.appFolder}`, packages: this.dockerRuntimePackages };
   }
 
   preHelp(): void {

package/support/pack.base.ts

@@ -1,7 +1,8 @@
 import os from 'node:os';
+import path from 'node:path';
 
 import { CliCommandShape, CliFlag, ParsedState, cliTpl } from '@travetto/cli';
-import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { TimeUtil } from '@travetto/base';
 import { Terminal } from '@travetto/terminal';
 import { Ignore, Required, Schema } from '@travetto/schema';
@@ -26,8 +27,8 @@ export abstract class BasePackCommand implements CliCommandShape {
   @Ignore()
   _parsed: ParsedState;
 
-  @CliFlag({ desc: 'Workspace for building', short: 'w' })
-  workspace: string = path.resolve(os.tmpdir(), RuntimeIndex.mainModule.sourcePath.replace(/[\/\\: ]/g, '_'));
+  @CliFlag({ desc: 'Workspace for building', short: 'b' })
+  buildDir: string = path.resolve(os.tmpdir(), RuntimeIndex.mainModule.sourcePath.replace(/[\/\\: ]/g, '_'));
 
   @CliFlag({ desc: 'Clean workspace' })
   clean = true;
@@ -81,6 +82,9 @@ export abstract class BasePackCommand implements CliCommandShape {
   @Ignore()
   entryArguments: string[] = [];
 
+  @Ignore()
+  workspaceResourceFolder: string = 'resources-workspace';
+
   getOperations(): PackOperationShape<this>[] {
     return [
       PackOperation.clean,
@@ -109,7 +113,7 @@ export abstract class BasePackCommand implements CliCommandShape {
     // Resolve all files to absolute paths
     this.output = this.output ? path.resolve(this.output) : undefined!;
     this.ejectFile = this.ejectFile ? path.resolve(this.ejectFile) : undefined;
-    this.workspace = path.resolve(this.workspace);
+    this.buildDir = path.resolve(this.buildDir);
 
     // Update entry points
     this.entryArguments = [...this.entryArguments ?? [], ...args, ...this._parsed.unknown];
@@ -121,14 +125,14 @@ export abstract class BasePackCommand implements CliCommandShape {
 
     // Eject to file
     if (this.ejectFile) {
-      await PackUtil.writeEjectOutput(this.workspace, this.module, stream, this.ejectFile);
+      await PackUtil.writeEjectOutput(this.buildDir, this.module, stream, this.ejectFile);
     } else {
       const start = Date.now();
       const term = new Terminal();
 
       await term.streamLines(stream);
 
-      let msg = cliTpl`${{ success: 'Success' }} (${{ identifier: TimeUtil.prettyDeltaSinceTime(start) }}) ${{ subtitle: 'module' }}=${{ param: this.module }}`;
+      let msg = cliTpl`${{ success: 'Success' }} (${{ identifier: TimeUtil.asClock(Date.now() - start) }}) ${{ subtitle: 'module' }}=${{ param: this.module }}`;
       if (this.output) {
         msg = cliTpl`${msg} ${{ subtitle: 'output' }}=${{ path: this.output }}`;
       }

package/support/rollup/config.ts

@@ -1,8 +1,9 @@
-import type { OutputOptions } from 'rollup';
+import path from 'node:path';
 
+import type { OutputOptions } from 'rollup';
 import type terser from '@rollup/plugin-terser';
 
-import { ManifestModule, ManifestModuleUtil, NodeModuleType, path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { ManifestModule, ManifestModuleUtil, NodeModuleType, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { EnvProp } from '@travetto/base';
 import { CoreRollupConfig } from '../../src/types';