@travetto/pack 3.4.9 → 4.0.0-rc.0

package/README.md

@@ -40,7 +40,9 @@ Options:
   -is, --include-sources               Include source with source maps (default: false)
   -x, --eject-file <string>            Eject commands to file
   -r, --rollup-configuration <string>  Rollup configuration file (default: "@travetto/pack/support/bin/rollup")
-  -m, --module <string>                Module to run for
+  --env-file <string>                  Env Flag File Name (default: ".env")
+  --manifest-file <string>             Manifest File Name (default: "manifest.json")
+  -m, --module <module>                Module to run for
   -h, --help                           display help for command
 ```
 
@@ -102,7 +104,9 @@ Options:
   -is, --include-sources               Include source with source maps (default: false)
   -x, --eject-file <string>            Eject commands to file
   -r, --rollup-configuration <string>  Rollup configuration file (default: "@travetto/pack/support/bin/rollup")
-  -m, --module <string>                Module to run for
+  --env-file <string>                  Env Flag File Name (default: ".env")
+  --manifest-file <string>             Manifest File Name (default: "manifest.json")
+  -m, --module <module>                Module to run for
   -h, --help                           display help for command
 ```
 
@@ -127,6 +131,8 @@ Options:
   -is, --include-sources                 Include source with source maps (default: false)
   -x, --eject-file <string>              Eject commands to file
   -r, --rollup-configuration <string>    Rollup configuration file (default: "@travetto/pack/support/bin/rollup")
+  --env-file <string>                    Env Flag File Name (default: ".env")
+  --manifest-file <string>               Manifest File Name (default: "manifest.json")
   -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")
   -dn, --docker-name <string>            Docker Image Name  (default: "travetto_pack")
@@ -136,7 +142,7 @@ Options:
   -db, --docker-build-platform <string>  Docker Build Platform
   -dr, --docker-registry <string>        Docker Registry
   -du, --docker-runtime-user <string>    Docker Runtime user
-  -m, --module <string>                  Module to run for
+  -m, --module <module>                  Module to run for
   -h, --help                             display help for command
 ```
 
@@ -168,13 +174,14 @@ echo "Cleaning Output $DIST"
 rm -rf $DIST
 mkdir -p $DIST
 
-# Writing .env.js 
+# Writing $DIST/.env 
 
-echo "Writing .env.js"
+echo "Writing $DIST/.env"
 
-echo "process.env.TRV_MANIFEST = 'manifest.json';" > $DIST/.env.js
-echo "process.env.TRV_MODULE = '$MOD';" >> $DIST/.env.js
-echo "process.env.TRV_CLI_IPC = '';" >> $DIST/.env.js
+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
 
 # Writing package.json 
 
@@ -188,7 +195,7 @@ echo "Writing entry scripts todo-app.sh args=(run:rest)"
 
 echo "#!/bin/sh" > $DIST/todo-app.sh
 echo "cd \$(dirname \"\$0\")" >> $DIST/todo-app.sh
-echo "node todo-app.js run:rest \$@" >> $DIST/todo-app.sh
+echo "node --env-file=.env todo-app.js run:rest \$@" >> $DIST/todo-app.sh
 chmod 755 $DIST/todo-app.sh
 
 # Writing entry scripts todo-app.cmd args=(run:rest) 
@@ -197,7 +204,7 @@ echo "Writing entry scripts todo-app.cmd args=(run:rest)"
 
 echo "" > $DIST/todo-app.cmd
 echo "cd %~p0" >> $DIST/todo-app.cmd
-echo "node todo-app.js run:rest %*" >> $DIST/todo-app.cmd
+echo "node --env-file=.env todo-app.js run:rest %*" >> $DIST/todo-app.cmd
 chmod 755 $DIST/todo-app.cmd
 
 # Copying over resources 
@@ -210,7 +217,7 @@ cp -r -p $ROOT/resources $DIST/resources
 
 echo "Writing Manifest manifest.json"
 
-TRV_MODULE=$MOD npx trvc manifest $DIST/manifest.json prod
+TRV_MODULE=$MOD npx trvc manifest --prod $DIST/manifest.json
 
 # Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.trv 
 
@@ -223,6 +230,7 @@ export BUNDLE_SOURCEMAP=false
 export BUNDLE_SOURCES=false
 export BUNDLE_OUTPUT=$DIST
 export BUNDLE_FORMAT=commonjs
+export BUNDLE_ENV_FILE=.env
 export TRV_MANIFEST=$TRV_OUT/node_modules/$MOD
 cd $TRV_OUT
 npx rollup -c $TRV_OUT/node_modules/@travetto/pack/support/bin/rollup.js
@@ -236,6 +244,7 @@ echo "FROM node:20-alpine" > $DIST/Dockerfile
 echo "RUN which useradd && (groupadd --gid 2000 app && useradd -u 2000 -g app app) || (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
+echo "ENV NODE_OPTIONS=\"--disable-proto=delete\"" >> $DIST/Dockerfile
 echo "USER app" >> $DIST/Dockerfile
 echo "WORKDIR /app" >> $DIST/Dockerfile
 echo "ENTRYPOINT [\"/app/todo-app.sh\"]" >> $DIST/Dockerfile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "3.4.9",
+  "version": "4.0.0-rc.0",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -28,11 +28,12 @@
     "@rollup/plugin-json": "^6.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/base": "^3.4.2",
-    "rollup": "^4.5.0"
+    "@travetto/base": "^4.0.0-rc.0",
+    "@travetto/terminal": "^4.0.0-rc.0",
+    "rollup": "^4.6.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.7"
+    "@travetto/cli": "^4.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/bin/config-util.ts

@@ -22,7 +22,6 @@ export class PackConfigUtil {
 
   /**
    * Setup docker user
-   * @returns
    */
   static dockerUser(cfg: DockerPackConfig): string {
     const { user, group, uid, gid } = cfg.dockerRuntime;
@@ -35,6 +34,18 @@ export class PackConfigUtil {
     ].join('\n');
   }
 
+  /**
+   * Setup Env Vars for NODE_OPTIONS and other standard environment variables
+   */
+  static dockerEnvVars(cfg: DockerPackConfig): string {
+    return [
+      `ENV NODE_OPTIONS="${[
+        '--disable-proto=delete',  // Security enforcement
+        ...(cfg.sourcemap ? ['--enable-source-maps'] : []),
+      ].join(' ')}"`,
+    ].join('\n');
+  }
+
   /**
    * Setup docker runtime folder
    */
@@ -73,6 +84,7 @@ export class PackConfigUtil {
       this.dockerUser(cfg),
       this.dockerAppFolder(cfg),
       this.dockerAppFiles(cfg),
+      this.dockerEnvVars(cfg),
     ].filter(x => !!x).join('\n');
   }
 

package/support/bin/config.ts

@@ -1,24 +1,27 @@
+import type fs from 'node:fs';
 import type { OutputOptions } from 'rollup';
-import { __importStar } from 'tslib';
 
 import type terser from '@rollup/plugin-terser';
 
-import { Env } from '@travetto/base';
-import { ManifestModule, ManifestModuleUtil, Package, path, RootIndex } from '@travetto/manifest';
+import { ManifestModule, ManifestModuleUtil, NodeModuleType, path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { EnvProp } from '@travetto/base';
 
-const makeIntro = (doImport: (name: string) => string, ...extra: string[]): string => [
-  `try { globalThis.crypto = ${doImport('crypto')}; } catch {}`,
-  `try { ${doImport('./.env.js')} } catch {}`,
-  ...extra
-].map(x => x.trim()).join('\n');
+// eslint-disable-next-line @typescript-eslint/naming-convention
+function __envImport(mod: typeof fs, file: string): void {
+  if (process.env.TRV_MODULE) { return; }
+  try {
+    mod.readFileSync(file, 'utf8')
+      .split('\n')
+      .map(x => x.match(/\s*(?<key>[^ =]+)\s*=\s*(?<value>\S+)/)?.groups)
+      .filter((x): x is Exclude<typeof x, null | undefined> => !!x)
+      .forEach(x => process.env[x.key] = x.value);
+  } catch { }
+}
 
-const INTRO = {
-  commonjs: makeIntro(
-    v => `require('${v}')`,
-    __importStar.toString().replace(/function([^(]+)/, 'function __importStar'),
-  ),
-  module: makeIntro(v => `await import('${v}')`)
-};
+const INTRO = (envFile: string | undefined): Record<NodeModuleType, string[]> => ({
+  commonjs: !envFile ? [] : [`(${__envImport.toString()})(require('node:fs'), '${envFile}')`],
+  module: !envFile ? [] : [`(${__envImport.toString()})(await import('node:fs'), '${envFile}')`]
+});
 
 function getFilesFromModule(m: ManifestModule): string[] {
   return [
@@ -34,20 +37,19 @@ function getFilesFromModule(m: ManifestModule): string[] {
 }
 
 export function getOutput(): OutputOptions {
-  const format: Package['type'] = Env.get('BUNDLE_FORMAT', 'commonjs');
-  const dir = Env.get('BUNDLE_OUTPUT')!;
-  const mainFile = Env.get('BUNDLE_MAIN_FILE')!;
+  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+  const format = (process.env.BUNDLE_FORMAT ?? 'commonjs') as NodeModuleType;
+  const dir = process.env.BUNDLE_OUTPUT!;
+  const mainFile = process.env.BUNDLE_MAIN_FILE!;
   return {
     format,
-    intro: INTRO[format],
+    interop: format === 'commonjs' ? 'auto' : undefined,
+    intro: INTRO(new EnvProp('BUNDLE_ENV_FILE').val)[format].join(';\n'),
     sourcemapPathTransform: (src, map): string =>
-      path.resolve(path.dirname(map), src).replace(`${RootIndex.manifest.workspacePath}/`, ''),
-    sourcemap:
-      Env.getBoolean('BUNDLE_SOURCEMAP') ?? false,
-    sourcemapExcludeSources:
-      !(Env.getBoolean('BUNDLE_SOURCES') ?? false),
-    compact:
-      Env.getBoolean('BUNDLE_COMPRESS') ?? true,
+      path.resolve(path.dirname(map), src).replace(`${RuntimeContext.workspace.path}/`, ''),
+    sourcemap: new EnvProp('BUNDLE_SOURCEMAP').bool ?? false,
+    sourcemapExcludeSources: !(new EnvProp('BUNDLE_SOURCES').bool ?? false),
+    compact: new EnvProp('BUNDLE_COMPRESS').bool ?? true,
     file: path.resolve(dir, mainFile),
     ...(format === 'commonjs' ? {} : {
       inlineDynamicImports: true
@@ -56,19 +58,19 @@ export function getOutput(): OutputOptions {
 }
 
 export function getEntry(): string {
-  return Env.get('BUNDLE_ENTRY')!;
+  return process.env.BUNDLE_ENTRY!;
 }
 
 export function getFiles(): string[] {
-  return [...RootIndex.getModuleList('all')]
-    .map(x => RootIndex.manifest.modules[x])
+  return [...RuntimeIndex.getModuleList('all')]
+    .map(x => RuntimeIndex.getManifestModule(x))
     .filter(m => m.prod)
     .flatMap(getFilesFromModule);
 }
 
 export function getIgnoredModules(): string[] {
-  return [...RootIndex.getModuleList('all')]
-    .map(x => RootIndex.manifest.modules[x])
+  return [...RuntimeIndex.getModuleList('all')]
+    .map(x => RuntimeIndex.getManifestModule(x))
     .filter(m => !m.prod)
     .map(m => m.name);
 }

package/support/bin/docker-operation.ts

@@ -1,6 +1,6 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 
-import { path, RootIndex } from '@travetto/manifest';
+import { path, RuntimeIndex } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
 
 import { ActiveShellCommand } from './shell';
@@ -20,7 +20,7 @@ export class DockerPackOperation {
   static async* writeDockerFile(cfg: DockerPackConfig): AsyncIterable<string[]> {
     const dockerFile = path.resolve(cfg.workspace, 'Dockerfile');
 
-    const factory = RootIndex.getFromImport(cfg.dockerFactory);
+    const factory = RuntimeIndex.getFromImport(cfg.dockerFactory);
     if (!factory) {
       throw new Error(`Unable to resolve docker factory at ${cfg.dockerFactory}`);
     }

package/support/bin/operation.ts

@@ -1,16 +1,13 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 
-import { path, RootIndex } from '@travetto/manifest';
+import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { cliTpl } from '@travetto/cli';
+import { Env } from '@travetto/base';
 
 import { CommonPackConfig } from './types';
 import { PackUtil } from './util';
 import { ActiveShellCommand, ShellCommands } from './shell';
 
-async function writeRawFile(file: string, contents: string, mode?: string): Promise<void> {
-  await fs.writeFile(file, contents, { encoding: 'utf8', mode });
-}
-
 /**
  * General pack operations
  */
@@ -54,25 +51,29 @@ export class PackOperation {
    * Invoke bundler (rollup) to produce output in workspace folder
    */
   static async * bundle(cfg: CommonPackConfig): AsyncIterable<string[]> {
-    const cwd = RootIndex.outputRoot;
-
-    const bundleCommand = ['npx', 'rollup', '-c', RootIndex.resolveFileImport(cfg.rollupConfiguration)];
-
-    const entryPointFile = RootIndex.getFromImport(cfg.entryPoint)!.outputFile.split(`${RootIndex.manifest.outputFolder}/`)[1];
-
-    const env = Object.fromEntries(([
-      ['BUNDLE_ENTRY', entryPointFile],
-      ['BUNDLE_MAIN_FILE', `${cfg.mainName}.js`],
-      ['BUNDLE_COMPRESS', cfg.minify],
-      ['BUNDLE_SOURCEMAP', cfg.sourcemap],
-      ['BUNDLE_SOURCES', cfg.includeSources],
-      ['BUNDLE_OUTPUT', cfg.workspace],
-      ['BUNDLE_FORMAT', RootIndex.manifest.moduleType],
-      ['TRV_MANIFEST', RootIndex.getModule(cfg.module)!.outputPath]
-    ] as const)
-      .filter(x => x[1] === false || x[1])
-      .map(x => [x[0], `${x[1]}`])
-    );
+    const cwd = RuntimeIndex.outputRoot;
+    const out = RuntimeIndex.manifest.build.outputFolder;
+
+    const bundleCommand = ['npx', 'rollup', '-c', RuntimeIndex.resolveFileImport(cfg.rollupConfiguration)];
+
+    const entryPointFile = RuntimeIndex.getFromImport(cfg.entryPoint)!.outputFile.split(`${out}/`)[1];
+
+    const env = {
+      ...Object.fromEntries(([
+        ['BUNDLE_ENTRY', entryPointFile],
+        ['BUNDLE_MAIN_FILE', cfg.mainFile],
+        ['BUNDLE_COMPRESS', cfg.minify],
+        ['BUNDLE_SOURCEMAP', cfg.sourcemap],
+        ['BUNDLE_SOURCES', cfg.includeSources],
+        ['BUNDLE_OUTPUT', cfg.workspace],
+        ['BUNDLE_FORMAT', RuntimeContext.workspace.type],
+        ['BUNDLE_ENV_FILE', cfg.envFile]
+      ] as const)
+        .filter(x => x[1] === false || x[1])
+        .map(x => [x[0], `${x[1]}`])
+      ),
+      ...Env.TRV_MANIFEST.export(RuntimeIndex.getModule(cfg.module)!.outputPath),
+    };
 
     const props = (['minify', 'sourcemap', 'entryPoint'] as const)
       .map(k => cliTpl`${{ subtitle: k }}=${{ param: cfg[k] }}`).join(' ');
@@ -88,7 +89,7 @@ export class PackOperation {
       yield ActiveShellCommand.chdir(path.cwd());
     } else {
       await PackUtil.runCommand(bundleCommand, { cwd, env });
-      const stat = await fs.stat(path.resolve(cfg.workspace, `${cfg.mainName}.js`));
+      const stat = await fs.stat(path.resolve(cfg.workspace, cfg.mainFile));
       yield [cliTpl`${{ title: 'Bundled Output ' }} ${{ identifier: 'sizeKb' }}=${{ param: Math.trunc(stat.size / 2 ** 10) }}`];
     }
   }
@@ -98,7 +99,7 @@ export class PackOperation {
    */
   static async * writePackageJson(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const file = 'package.json';
-    const pkg = { type: RootIndex.manifest.moduleType, main: `${cfg.mainName}.js` };
+    const pkg = { type: RuntimeContext.workspace.type, main: cfg.mainFile };
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing' }} ${{ path: file }}`);
 
@@ -108,9 +109,9 @@ export class PackOperation {
         [JSON.stringify(pkg)]
       );
     } else {
-      await writeRawFile(
+      await PackUtil.writeRawFile(
         path.resolve(cfg.workspace, file),
-        JSON.stringify(pkg, null, 2)
+        [JSON.stringify(pkg, null, 2)]
       );
     }
   }
@@ -119,11 +120,12 @@ export class PackOperation {
    * Define .env.js file to control manifest location
    */
   static async * writeEnv(cfg: CommonPackConfig): AsyncIterable<string[]> {
-    const file = '.env.js';
+    const file = path.resolve(cfg.workspace, cfg.envFile);
     const env = {
-      TRV_MANIFEST: 'manifest.json',
-      TRV_MODULE: cfg.module,
-      TRV_CLI_IPC: ''
+      ...Env.NODE_ENV.export('production'),
+      ...Env.TRV_MANIFEST.export(cfg.manifestFile),
+      ...Env.TRV_MODULE.export(cfg.module),
+      ...Env.TRV_CLI_IPC.export(undefined)
     };
 
     yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing' }} ${{ path: file }}`);
@@ -131,12 +133,12 @@ export class PackOperation {
     if (cfg.ejectFile) {
       yield* ActiveShellCommand.createFile(
         path.resolve(cfg.workspace, file),
-        PackUtil.buildEnvJS(env)
+        PackUtil.buildEnvFile(env)
       );
     } else {
-      await writeRawFile(
+      await PackUtil.writeRawFile(
         path.resolve(cfg.workspace, file),
-        PackUtil.buildEnvJS(env).join('\n')
+        PackUtil.buildEnvFile(env)
       );
     }
   }
@@ -158,7 +160,7 @@ export class PackOperation {
         text: [
           ShellCommands[type].scriptOpen(),
           ShellCommands[type].chdirScript(),
-          ShellCommands[type].callCommandWithAllArgs('node', `${cfg.mainName}.js`, ...cfg.entryArguments),
+          ShellCommands[type].callCommandWithAllArgs('node', `--env-file=${cfg.envFile}`, cfg.mainFile, ...cfg.entryArguments),
         ].map(x => x.join(' '))
       }));
 
@@ -170,7 +172,7 @@ export class PackOperation {
     } else {
       for (const { fileTitle, text, file } of files) {
         yield* PackOperation.title(cfg, fileTitle);
-        await writeRawFile(path.resolve(cfg.workspace, file), text.join('\n'), '755');
+        await PackUtil.writeRawFile(path.resolve(cfg.workspace, file), text, '755');
       }
     }
   }
@@ -180,8 +182,8 @@ export class PackOperation {
    */
   static async * copyResources(cfg: CommonPackConfig): AsyncIterable<string[]> {
     const resources = {
-      count: RootIndex.mainModule.files.resources?.length ?? 0,
-      src: path.resolve(RootIndex.mainModule.sourcePath, 'resources'),
+      count: RuntimeIndex.mainModule.files.resources?.length ?? 0,
+      src: path.resolve(RuntimeIndex.mainModule.sourcePath, 'resources'),
       dest: path.resolve(cfg.workspace, 'resources')
     };
 
@@ -203,11 +205,11 @@ export class PackOperation {
    * Produce the output manifest, only including prod dependencies
    */
   static async * writeManifest(cfg: CommonPackConfig): AsyncIterable<string[]> {
-    const out = path.resolve(cfg.workspace, 'manifest.json');
-    const cmd = ['npx', 'trvc', 'manifest', out, 'prod'];
-    const env = { TRV_MODULE: cfg.module };
+    const out = path.resolve(cfg.workspace, cfg.manifestFile);
+    const cmd = ['npx', 'trvc', 'manifest', '--prod', out];
+    const env = { ...Env.TRV_MODULE.export(cfg.module) };
 
-    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing Manifest' }} ${{ path: 'manifest.json' }}`);
+    yield* PackOperation.title(cfg, cliTpl`${{ title: 'Writing Manifest' }} ${{ path: cfg.manifestFile }}`);
 
     if (cfg.ejectFile) {
       yield [...Object.entries(env).map(([k, v]) => `${k}=${v}`), ...cmd];

package/support/bin/rollup-sourcemaps.ts

@@ -1,5 +1,5 @@
-import path from 'path';
-import fs from 'fs/promises';
+import path from 'node:path';
+import fs from 'node:fs/promises';
 
 import { LoadResult, Plugin, PluginContext } from 'rollup';
 

package/support/bin/rollup.ts

@@ -4,7 +4,7 @@ import terser from '@rollup/plugin-terser';
 import jsonImport from '@rollup/plugin-json';
 import type { RollupOptions } from 'rollup';
 
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeContext } from '@travetto/manifest';
 
 import { getEntry, getOutput, getTerserConfig, getFiles, getIgnoredModules } from './config';
 import { travettoImportPlugin } from './rollup-esm-dynamic-import';
@@ -26,7 +26,7 @@ export default function buildConfig(): RollupOptions {
       jsonImport(),
       commonjsRequire({
         ignore: id => ignoreRe.test(id) || NEVER_INCLUDE.has(id),
-        dynamicRequireRoot: RootIndex.manifest.workspacePath,
+        dynamicRequireRoot: RuntimeContext.workspace.path,
         dynamicRequireTargets: (output.format === 'commonjs' ? files : [])
       }),
       ...(output.format === 'module' ? [travettoImportPlugin(entry, files)] : []),

package/support/bin/shell.ts

@@ -1,5 +1,5 @@
 import { path } from '@travetto/manifest';
-import { stripAnsiCodes } from '@travetto/terminal';
+import { StyleUtil } from '@travetto/terminal';
 
 import { ShellCommandImpl } from './types';
 
@@ -30,8 +30,8 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
     mkdir: (dest) => ['md', dest],
     export: (key, value) => ['set', `${key}=${value}`],
     chdir: (dest) => ['cd', dest],
-    comment: (message) => ['\nREM', stripAnsiCodes(message), '\n'],
-    echo: (message) => ['echo', `"${escape(stripAnsiCodes(message))}"\n`],
+    comment: (message) => ['\nREM', StyleUtil.cleanText(message), '\n'],
+    echo: (message) => ['echo', `"${escape(StyleUtil.cleanText(message))}"\n`],
     zip: (outputFile) => ['powershell', 'Compress-Archive', '-Path', '.', '-DestinationPath', outputFile]
   },
   posix: {
@@ -50,8 +50,8 @@ export const ShellCommands: Record<'win32' | 'posix', ShellCommandImpl> = {
     mkdir: (dest) => ['mkdir', '-p', dest],
     export: (key, value) => ['export', `${key}=${value}`],
     chdir: (dest) => ['cd', dest],
-    comment: (message) => ['\n#', stripAnsiCodes(message), '\n'],
-    echo: (message) => ['echo', `"${escape(stripAnsiCodes(message))}"\n`],
+    comment: (message) => ['\n#', StyleUtil.cleanText(message), '\n'],
+    echo: (message) => ['echo', `"${escape(StyleUtil.cleanText(message))}"\n`],
     zip: (outputFile) => ['zip', '-r', outputFile, '.']
   },
 };

package/support/bin/types.ts

@@ -4,8 +4,11 @@ export type CommonPackConfig = {
   clean: boolean;
   ejectFile?: string;
   mainName: string;
+  mainFile: string;
   mainScripts?: boolean;
   module: string;
+  envFile: string;
+  manifestFile: string;
 
   // Bundle
   rollupConfiguration: string;

package/support/bin/util.ts

@@ -1,19 +1,18 @@
-import fs from 'fs/promises';
+import fs from 'node:fs/promises';
 
-import { path, RootIndex } from '@travetto/manifest';
+import { path, RuntimeIndex } from '@travetto/manifest';
 import { AppError, ExecUtil, ExecutionOptions } from '@travetto/base';
 
 import { ActiveShellCommand } from './shell';
 
 export class PackUtil {
   /**
-   * Generate env.js
+   * Generate .env file
    */
-  static buildEnvJS(env: Record<string, string | number | boolean | undefined>): string[] {
-    const entries = Object.entries(env)
+  static buildEnvFile(env: Record<string, string | number | boolean | undefined>): string[] {
+    return Object.entries(env)
       .filter(([k, v]) => (v !== undefined))
-      .map(([k, v]) => [k, `${v}`]);
-    return entries.map(([k, v]) => `process.env.${k} = '${v}';`);
+      .map(([k, v]) => `${k}=${v}`);
   }
 
   /**
@@ -34,7 +33,7 @@ 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: RootIndex.outputRoot, ROOT: path.cwd(), MOD: module };
+    const vars = { DIST: workspace, TRV_OUT: RuntimeIndex.outputRoot, ROOT: path.cwd(), MOD: module };
 
     const replaceArgs = (text: string): string => Object.entries(vars)
       .reduce((str, [k, v]) => str.replaceAll(v, ActiveShellCommand.var(k)), text);
@@ -78,4 +77,11 @@ export class PackUtil {
     }
     return stdout;
   }
+
+  /**
+   * Write a file directly
+   */
+  static async writeRawFile(file: string, contents: string[], mode?: string): Promise<void> {
+    await fs.writeFile(file, contents.join('\n'), { encoding: 'utf8', mode });
+  }
 }

package/support/cli.pack_docker.ts

@@ -1,12 +1,12 @@
-import { path, RootIndex } from '@travetto/manifest';
+import { path, RuntimeIndex } from '@travetto/manifest';
 import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
-import { GlobalEnv } from '@travetto/base';
 import { Ignore, Required } from '@travetto/schema';
 
 import { DockerPackOperation } from './bin/docker-operation';
 import { BasePackCommand, PackOperationShape } from './pack.base';
 import { DockerPackConfig } from './bin/types';
 
+const NODE_MAJOR = +process.version.match(/\d+/)![0];
 const DEFAULT_USER_ID = 2000;
 const DEFAULT_USER = 'app';
 
@@ -18,7 +18,7 @@ export class PackDockerCommand extends BasePackCommand {
   @CliFlag({ desc: 'Docker Factory source ', short: 'df', envVars: ['PACK_DOCKER_FACTORY'] })
   dockerFactory = '@travetto/pack/support/pack.dockerfile';
   @CliFlag({ desc: 'Docker Image to extend ', short: 'di', envVars: ['PACK_DOCKER_IMAGE'] })
-  dockerImage = `node:${GlobalEnv.nodeVersion}-alpine`;
+  dockerImage = `node:${NODE_MAJOR}-alpine`;
   @CliFlag({ desc: 'Docker Image Name ', short: 'dn', envVars: ['PACK_DOCKER_IMAGE'] })
   @Required(false)
   dockerName: string;
@@ -54,7 +54,7 @@ export class PackDockerCommand extends BasePackCommand {
 
   preMain(): void {
     if (this.dockerFactory.startsWith('.')) {
-      this.dockerFactory = RootIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
+      this.dockerFactory = RuntimeIndex.getFromSource(path.resolve(this.dockerFactory))?.import ?? this.dockerFactory;
     }
     this.dockerName ??= CliUtil.getSimpleModuleName('<module>', this.module || undefined);
 

package/support/pack.base.ts

@@ -1,9 +1,9 @@
-import os from 'os';
+import os from 'node:os';
 
-import { CliCommandShape, CliFlag, CliParseUtil, cliTpl } from '@travetto/cli';
-import { path, RootIndex } from '@travetto/manifest';
+import { CliCommandShape, CliFlag, ParsedState, cliTpl } from '@travetto/cli';
+import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
 import { TimeUtil } from '@travetto/base';
-import { GlobalTerminal } from '@travetto/terminal';
+import { Terminal } from '@travetto/terminal';
 import { Ignore, Required, Schema } from '@travetto/schema';
 
 import { PackOperation } from './bin/operation';
@@ -15,7 +15,7 @@ export type PackOperationShape<T> = ((config: T) => AsyncIterable<string[]>);
 export abstract class BasePackCommand implements CliCommandShape {
 
   static get entryPoints(): string[] {
-    return RootIndex.find({
+    return RuntimeIndex.find({
       module: m => m.prod,
       folder: f => f === 'support',
       file: f => f.sourceFile.includes('entry.')
@@ -23,8 +23,11 @@ export abstract class BasePackCommand implements CliCommandShape {
       .map(x => x.import.replace(/[.][^.]+s$/, ''));
   }
 
+  @Ignore()
+  _parsed: ParsedState;
+
   @CliFlag({ desc: 'Workspace for building', short: 'w' })
-  workspace: string = path.resolve(os.tmpdir(), RootIndex.mainModule.sourcePath.replace(/[\/\\: ]/g, '_'));
+  workspace: string = path.resolve(os.tmpdir(), RuntimeIndex.mainModule.sourcePath.replace(/[\/\\: ]/g, '_'));
 
   @CliFlag({ desc: 'Clean workspace' })
   clean = true;
@@ -59,9 +62,18 @@ export abstract class BasePackCommand implements CliCommandShape {
   @CliFlag({ desc: 'Rollup configuration file', short: 'r' })
   rollupConfiguration = '@travetto/pack/support/bin/rollup';
 
+  @CliFlag({ desc: 'Env Flag File Name' })
+  envFile = '.env';
+
+  @CliFlag({ desc: 'Manifest File Name' })
+  manifestFile = 'manifest.json';
+
   @Ignore()
   module: string;
 
+  @Ignore()
+  mainFile: string;
+
   /** Entry arguments */
   @Ignore()
   entryArguments: string[] = [];
@@ -96,9 +108,10 @@ export abstract class BasePackCommand implements CliCommandShape {
     this.workspace = path.resolve(this.workspace);
 
     // Update entry points
-    this.entryArguments = [...this.entryArguments ?? [], ...args, ...CliParseUtil.getState(this)?.unknown ?? []];
-    this.module ||= RootIndex.mainModuleName;
+    this.entryArguments = [...this.entryArguments ?? [], ...args, ...this._parsed.unknown];
+    this.module ||= RuntimeContext.main.name;
     this.mainName ??= path.basename(this.module);
+    this.mainFile = `${this.mainName}.js`;
 
     const stream = this.runOperations();
 
@@ -107,19 +120,15 @@ export abstract class BasePackCommand implements CliCommandShape {
       await PackUtil.writeEjectOutput(this.workspace, this.module, stream, this.ejectFile);
     } else {
       const start = Date.now();
+      const term = new Terminal();
+
+      await term.streamLines(stream);
 
-      await GlobalTerminal.streamLinesWithWaiting(stream, {
-        initialDelay: 0,
-        cycleDelay: 100,
-        end: false,
-        position: 'inline',
-        committedPrefix: String.fromCharCode(171)
-      });
       let msg = cliTpl`${{ success: 'Success' }} (${{ identifier: TimeUtil.prettyDeltaSinceTime(start) }}) ${{ subtitle: 'module' }}=${{ param: this.module }}`;
       if (this.output) {
         msg = cliTpl`${msg} ${{ subtitle: 'output' }}=${{ path: this.output }}`;
       }
-      await GlobalTerminal.writeLines(msg);
+      await term.writer.writeLine(msg).commit();
     }
   }
 }