@travetto/pack 6.0.0-rc.0 → 6.0.0-rc.2

package/README.md

@@ -34,12 +34,12 @@ Options:
   -o, --output <string>                Output location
   --main-scripts, --no-main-scripts    Create entry scripts (default: true)
   -f, --main-name <string>             Main name for build artifact
-  -e, --entry-point <string>           Entry point (default: "@travetto/cli/support/entry.trv")
+  -e, --entry-point <string>           Entry point (default: "@travetto/cli/support/entry.trv.ts")
   --minify, --no-minify                Minify output (default: true)
   -sm, --sourcemap                     Bundle source maps (default: false)
   -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/rollup/build")
+  -r, --rollup-configuration <string>  Rollup configuration file (default: "@travetto/pack/support/rollup/build.ts")
   --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)
@@ -100,12 +100,12 @@ Options:
   -o, --output <string>                Output location (default: "travetto_pack.zip")
   --main-scripts, --no-main-scripts    Create entry scripts (default: true)
   -f, --main-name <string>             Main name for build artifact
-  -e, --entry-point <string>           Entry point (default: "@travetto/cli/support/entry.trv")
+  -e, --entry-point <string>           Entry point (default: "@travetto/cli/support/entry.trv.ts")
   --minify, --no-minify                Minify output (default: true)
   -sm, --sourcemap                     Bundle source maps (default: false)
   -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/rollup/build")
+  -r, --rollup-configuration <string>  Rollup configuration file (default: "@travetto/pack/support/rollup/build.ts")
   --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)
@@ -129,18 +129,18 @@ Options:
   -o, --output <string>                  Output location
   --main-scripts, --no-main-scripts      Create entry scripts (default: true)
   -f, --main-name <string>               Main name for build artifact
-  -e, --entry-point <string>             Entry point (default: "@travetto/cli/support/entry.trv")
+  -e, --entry-point <string>             Entry point (default: "@travetto/cli/support/entry.trv.ts")
   --minify, --no-minify                  Minify output (default: true)
   -sm, --sourcemap                       Bundle source maps (default: false)
   -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/rollup/build")
+  -r, --rollup-configuration <string>    Rollup configuration file (default: "@travetto/pack/support/rollup/build.ts")
   --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)
   -np, --npm-package <string>            External NPM Packages (default: [])
-  -df, --docker-factory <string>         Docker Factory source (default: "@travetto/pack/support/pack.dockerfile")
-  -di, --docker-image <string>           Docker Image to extend (default: "node:22-alpine")
+  -df, --docker-factory <string>         Docker Factory source (default: "@travetto/pack/support/pack.dockerfile.ts")
+  -di, --docker-image <string>           Docker Image to extend (default: "node:23-alpine")
   -dn, --docker-name <string>            Docker Image Name (default: "travetto_pack")
   -ru, --runtime-user <string>           Docker Runtime user
   -rp, --runtime-package <string>        Docker Runtime Packages (default: [])
@@ -167,7 +167,7 @@ As indicated, any of the pack operations can be ejected, and produce an output t
 
 **Terminal: Sample Ejected File**
 ```bash
-$ trv pack:docker -x /dev/stdout run:rest
+$ trv pack:docker -x /dev/stdout web:http
 
 #!/bin/sh
 export DIST=/tmp/<temp-folder>
@@ -198,21 +198,21 @@ echo "Writing package.json"
 
 echo "{\"type\":\"commonjs\",\"main\":\"todo-app.js\"}" > $DIST/package.json
 
-# Writing entry scripts todo-app.sh args=(run:rest) 
+# Writing entry scripts todo-app.sh args=(web:http) 
 
-echo "Writing entry scripts todo-app.sh args=(run:rest)"
+echo "Writing entry scripts todo-app.sh args=(web:http)"
 
 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 todo-app.js web:http \$@" >> $DIST/todo-app.sh
 chmod 755 $DIST/todo-app.sh
 
-# Writing entry scripts todo-app.cmd args=(run:rest) 
+# Writing entry scripts todo-app.cmd args=(web:http) 
 
-echo "Writing entry scripts todo-app.cmd args=(run:rest)"
+echo "Writing entry scripts todo-app.cmd args=(web:http)"
 
 echo "cd %~p0" > $DIST/todo-app.cmd
-echo "node todo-app.js run:rest %*" >> $DIST/todo-app.cmd
+echo "node todo-app.js web:http %*" >> $DIST/todo-app.cmd
 chmod 755 $DIST/todo-app.cmd
 
 # Copying over module resources 
@@ -227,9 +227,9 @@ echo "Writing Manifest manifest.json"
 
 TRV_MODULE=$MOD npx trvc manifest --prod $DIST/manifest.json
 
-# Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.trv 
+# Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.trv.ts 
 
-echo "Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.trv"
+echo "Bundling Output minify=true sourcemap=false entryPoint=@travetto/cli/support/entry.trv.ts"
 
 export BUNDLE_ENTRY=node_modules/@travetto/cli/support/entry.trv.js
 export BUNDLE_MAIN_FILE=todo-app.js
@@ -244,21 +244,21 @@ cd $TRV_OUT
 npx rollup -c $TRV_OUT/node_modules/@travetto/pack/support/rollup/build.js
 cd $ROOT
 
-# Pulling Docker Base Image node:22-alpine 
+# Pulling Docker Base Image node:23-alpine 
 
-echo "Pulling Docker Base Image node:22-alpine"
+echo "Pulling Docker Base Image node:23-alpine"
 
-docker pull node:22-alpine
+docker pull node:23-alpine
 
-# Detected Image OS node:22-alpine as alpine 
+# Detected Image OS node:23-alpine as alpine 
 
-echo "Detected Image OS node:22-alpine as alpine"
+echo "Detected Image OS node:23-alpine as alpine"
 
-# Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile 
+# Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile.ts 
 
-echo "Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile"
+echo "Generating Docker File $DIST/Dockerfile @travetto/pack/support/pack.dockerfile.ts"
 
-echo "FROM node:22-alpine" > $DIST/Dockerfile
+echo "FROM node:23-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/__index__.ts

@@ -1,2 +1,2 @@
-export type { CommonPackConfig, DockerPackFactory, DockerPackConfig } from './src/types';
-export { PackConfigUtil } from './src/config-util';
+export type { CommonPackConfig, DockerPackFactory, DockerPackConfig } from './src/types.ts';
+export { PackConfigUtil } from './src/config-util.ts';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/pack",
-  "version": "6.0.0-rc.0",
+  "version": "6.0.0-rc.2",
   "description": "Code packing utilities",
   "keywords": [
     "travetto",
@@ -25,16 +25,16 @@
     "directory": "module/pack"
   },
   "dependencies": {
-    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-commonjs": "^28.0.3",
     "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.0",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-terser": "^0.4.4",
-    "@travetto/runtime": "^6.0.0-rc.0",
-    "@travetto/terminal": "^6.0.0-rc.0",
-    "rollup": "^4.31.0"
+    "@travetto/runtime": "^6.0.0-rc.2",
+    "@travetto/terminal": "^6.0.0-rc.2",
+    "rollup": "^4.40.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^6.0.0-rc.0"
+    "@travetto/cli": "^6.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/config-util.ts

@@ -1,4 +1,4 @@
-import { DockerPackConfig } from './types';
+import { DockerPackConfig } from './types.ts';
 
 /**
  * Common utils for setting up pack config

package/support/bin/docker-operation.ts

@@ -4,10 +4,10 @@ import path from 'node:path';
 import { Runtime } from '@travetto/runtime';
 import { cliTpl } from '@travetto/cli';
 
-import { ActiveShellCommand } from './shell';
-import { DockerPackConfig, DockerPackFactoryModule } from '../../src/types';
-import { PackOperation } from './operation';
-import { PackUtil } from './util';
+import { ActiveShellCommand } from './shell.ts';
+import { DockerPackConfig, DockerPackFactoryModule } from '../../src/types.ts';
+import { PackOperation } from './operation.ts';
+import { PackUtil } from './util.ts';
 
 export class DockerPackOperation {
 
@@ -82,7 +82,7 @@ export class DockerPackOperation {
       yield ActiveShellCommand.chdir(path.resolve());
     } else {
       await PackUtil.runCommand(cmd, { cwd: cfg.buildDir, stdio: [0, 'pipe', 2] });
-      const [image] = JSON.parse(await PackUtil.runCommand(['docker', 'inspect', cfg.dockerImage]));
+      const [image]: [{ Size: number }] = 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

@@ -4,9 +4,9 @@ import path from 'node:path';
 import { cliTpl } from '@travetto/cli';
 import { Env, Runtime, RuntimeIndex } from '@travetto/runtime';
 
-import { CommonPackConfig } from '../../src/types';
-import { PackUtil } from './util';
-import { ActiveShellCommand, ShellCommands } from './shell';
+import { CommonPackConfig } from '../../src/types.ts';
+import { PackUtil } from './util.ts';
+import { ActiveShellCommand, ShellCommands } from './shell.ts';
 
 /**
  * General pack operations
@@ -89,7 +89,7 @@ export class PackOperation {
       yield bundleCommand;
       yield ActiveShellCommand.chdir(path.resolve());
     } else {
-      await PackUtil.runCommand(bundleCommand, { cwd, env: { ...process.env, ...env } });
+      await PackUtil.runCommand(bundleCommand, { cwd, env: { ...process.env, ...env }, stdio: [0, 'pipe', 2] });
       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) }}`];
     }

package/support/bin/shell.ts

@@ -1,7 +1,7 @@
 import util from 'node:util';
 import path from 'node:path';
 
-import { ShellCommandImpl } from '../../src/types';
+import { ShellCommandImpl } from '../../src/types.ts';
 
 const escape = (text: string): string =>
   text

package/support/bin/util.ts

@@ -4,7 +4,7 @@ import path from 'node:path';
 
 import { AppError, ExecUtil, RuntimeIndex } from '@travetto/runtime';
 
-import { ActiveShellCommand } from './shell';
+import { ActiveShellCommand } from './shell.ts';
 
 export class PackUtil {
   /**
@@ -12,7 +12,7 @@ export class PackUtil {
    */
   static buildEnvFile(env: Record<string, string | number | boolean | undefined>): string[] {
     return Object.entries(env)
-      .filter(([k, v]) => (v !== undefined))
+      .filter(([, v]) => (v !== undefined))
       .map(([k, v]) => `${k}=${v}`);
   }
 

package/support/cli.pack_docker.ts

@@ -4,9 +4,9 @@ import { RuntimeIndex } from '@travetto/runtime';
 import { CliCommand, CliFlag, CliUtil, CliValidationError } from '@travetto/cli';
 import { Ignore, Required } from '@travetto/schema';
 
-import { DockerPackOperation } from './bin/docker-operation';
+import { DockerPackOperation } from './bin/docker-operation.ts';
 import { BasePackCommand, PackOperationShape } from './pack.base';
-import { DockerPackConfig } from '../src/types';
+import { DockerPackConfig } from '../src/types.ts';
 
 const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
 
@@ -16,7 +16,7 @@ const NODE_MAJOR = process.version.match(/\d+/)?.[0] ?? '22';
 @CliCommand({ with: { module: true } })
 export class PackDockerCommand extends BasePackCommand {
   @CliFlag({ desc: 'Docker Factory source', short: 'df', envVars: ['PACK_DOCKER_FACTORY'] })
-  dockerFactory = '@travetto/pack/support/pack.dockerfile';
+  dockerFactory = '@travetto/pack/support/pack.dockerfile.ts';
   @CliFlag({ desc: 'Docker Image to extend', short: 'di', envVars: ['PACK_DOCKER_IMAGE'] })
   dockerImage = `node:${NODE_MAJOR}-alpine`;
   @CliFlag({ desc: 'Docker Image Name', short: 'dn', envVars: ['PACK_DOCKER_IMAGE'] })
@@ -53,7 +53,7 @@ export class PackDockerCommand extends BasePackCommand {
   @Ignore()
   defaultUserId = 2000;
 
-  async validate(...args: string[]): Promise<CliValidationError[] | undefined> {
+  async validate(): Promise<CliValidationError[] | undefined> {
     const errs: CliValidationError[] = [];
     if (this.dockerPort?.length) {
       for (let i = 0; i < this.dockerPort.length; i++) {

package/support/cli.pack_zip.ts

@@ -1,6 +1,6 @@
 import { CliCommand, CliUtil } from '@travetto/cli';
 
-import { PackOperation } from './bin/operation';
+import { PackOperation } from './bin/operation.ts';
 import { BasePackCommand, PackOperationShape } from './pack.base';
 
 /**

package/support/pack.base.ts

@@ -7,8 +7,8 @@ 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';
+import { PackOperation } from './bin/operation.ts';
+import { PackUtil } from './bin/util.ts';
 
 export type PackOperationShape<T> = ((config: T) => AsyncIterable<string[]>);
 
@@ -46,7 +46,7 @@ export abstract class BasePackCommand implements CliCommandShape {
 
   @CliFlag({ desc: 'Entry point', short: 'e' })
   @Required(false)
-  entryPoint: string = '@travetto/cli/support/entry.trv';
+  entryPoint: string = '@travetto/cli/support/entry.trv.ts';
 
   @CliFlag({ desc: 'Minify output' })
   minify = true;
@@ -61,7 +61,7 @@ export abstract class BasePackCommand implements CliCommandShape {
   ejectFile?: string;
 
   @CliFlag({ desc: 'Rollup configuration file', short: 'r' })
-  rollupConfiguration = '@travetto/pack/support/rollup/build';
+  rollupConfiguration = '@travetto/pack/support/rollup/build.ts';
 
   @CliFlag({ desc: 'Env Flag File Name' })
   envFile = '.env';

package/support/pack.dockerfile.ts

@@ -1,4 +1,4 @@
-import { DockerPackFactory } from '../src/types';
-import { PackConfigUtil } from '../src/config-util';
+import { DockerPackFactory } from '../src/types.ts';
+import { PackConfigUtil } from '../src/config-util.ts';
 
 export const factory: DockerPackFactory = cfg => PackConfigUtil.dockerStandardFile(cfg);

package/support/rollup/build.ts

@@ -4,10 +4,10 @@ import terser from '@rollup/plugin-terser';
 import jsonImport from '@rollup/plugin-json';
 import type { RollupOptions } from 'rollup';
 
-import { getCoreConfig } from './config';
-import { travettoImportPlugin } from './rollup-travetto-import';
-import { travettoSourcemaps } from './rollup-travetto-sourcemaps';
-import { travettoEntryPlugin } from './rollup-travetto-entry';
+import { getCoreConfig } from './config.ts';
+import { travettoImportPlugin } from './rollup-travetto-import.ts';
+import { travettoSourcemaps } from './rollup-travetto-sourcemaps.ts';
+import { travettoEntryPlugin } from './rollup-travetto-entry.ts';
 
 export default function buildConfig(): RollupOptions {
   // Load up if not defined

package/support/rollup/config.ts

@@ -6,7 +6,7 @@ import type terser from '@rollup/plugin-terser';
 import { type ManifestModule, ManifestModuleUtil, type NodeModuleType } from '@travetto/manifest';
 import { EnvProp, Runtime, RuntimeIndex } from '@travetto/runtime';
 
-import { CoreRollupConfig } from '../../src/types';
+import { CoreRollupConfig } from '../../src/types.ts';
 
 function getFilesFromModule(m: ManifestModule): string[] {
   return [
@@ -55,7 +55,7 @@ export function getFiles(entry?: string): string[] {
     .map(x => RuntimeIndex.getManifestModule(x))
     .filter(m => m.prod)
     .flatMap(getFilesFromModule)
-    .filter(x => (!entry || !x.endsWith(entry)) && !x.includes('@travetto/pack/support'));
+    .filter(x => (!entry || !x.endsWith(entry)) && !x.includes('@travetto/pack/support/'));
 }
 
 export function getIgnoredModules(): ManifestModule[] {

package/support/rollup/rollup-travetto-entry.ts

@@ -3,7 +3,7 @@ import { Plugin } from 'rollup';
 
 import { RuntimeIndex } from '@travetto/runtime';
 
-import { CoreRollupConfig } from '../../src/types';
+import { CoreRollupConfig } from '../../src/types.ts';
 
 export const GLOBAL_IMPORT = '__trv_imp';
 
@@ -27,7 +27,7 @@ globalThis.${GLOBAL_IMPORT} = trvImp;
     name: 'travetto-entry',
 
     intro() {
-      return readFileSync(RuntimeIndex.getFromImport('@travetto/pack/support/bin/preamble')!.outputFile, 'utf8')
+      return readFileSync(RuntimeIndex.getFromImport('@travetto/pack/support/bin/preamble.ts')!.outputFile, 'utf8')
         .replaceAll('%%ENV_FILE%%', config.envFile ?? '')
         .replace(/\/\/# source.*$/m, '');
     },

package/support/rollup/rollup-travetto-import.ts

@@ -2,18 +2,21 @@ import { AstNode, Plugin } from 'rollup';
 import { walk } from 'estree-walker';
 import magicString from 'magic-string';
 
-import { GLOBAL_IMPORT } from './rollup-travetto-entry';
-import { CoreRollupConfig } from '../../src/types';
+import { GLOBAL_IMPORT } from './rollup-travetto-entry.ts';
+import { CoreRollupConfig } from '../../src/types.ts';
 
 type TNode = AstNode & { source?: { type: string }, callee?: TNode & { name?: string }, args?: TNode[] };
 
+/**
+ * Handles importing via non-static strings (e.g. ClassSource)
+ */
 export function travettoImportPlugin(config: CoreRollupConfig): Plugin {
   const fileSet = new Set(config.files);
 
   const out: Plugin = {
     name: 'travetto-import',
 
-    resolveDynamicImport(specifier, importer, options) {
+    resolveDynamicImport(specifier, _importer, _options) {
       const key = typeof specifier === 'string' ? specifier : '';
       if (config.ignore.has(key)) {
         return false;

package/support/rollup/rollup-travetto-sourcemaps.ts

@@ -3,7 +3,7 @@ import fs from 'node:fs/promises';
 
 import { LoadResult, Plugin, PluginContext } from 'rollup';
 
-import { CoreRollupConfig } from '../../src/types';
+import { CoreRollupConfig } from '../../src/types.ts';
 
 function toString(error: unknown): string {
   return error instanceof Error ? error.stack ?? error.toString() : JSON.stringify(error);